diff --git a/app.js b/app.js
index ade7531..6ddae6a 100644
--- a/app.js
+++ b/app.js
@@ -1,7 +1,7 @@
//app.js
App({
//----------------------------------------------globalData--------------------------------------
- evn: 0,//0:开发环境，1：测试环境，2：生产环境
+ evn: 1,//0:开发环境，1：测试环境，2：生产环境
tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'],
version: 152,
diff --git a/app.json b/app.json
index 1d2d40b..2db4308 100644
--- a/app.json
+++ b/app.json
@@ -18,6 +18,7 @@
"pages/home/tab3/index",
"pages/home/tab4/index",
"pages/home/tab5/index",
+ "pages/home/tab6/index",
"pages/home/attentionPaperList/index",
"pages/home/businessLicense/index",
"pages/shop/create/index",
diff --git a/pages/home/info/index.js b/pages/home/info/index.js
index 5a34253..c2d0225 100644
--- a/pages/home/info/index.js
+++ b/pages/home/info/index.js
@@ -400,6 +400,11 @@ Page({
url: '/pages/home/tab5/index'
})
},
+ toTab6: function () {
+ wx.navigateTo({
+ url: '/pages/home/tab6/index'
+ })
+ },
toTab3: function () {
wx.navigateTo({
url: '/pages/home/tab3/index'
diff --git a/pages/home/info/index.wxml b/pages/home/info/index.wxml
index a97b910..07d325f 100644
--- a/pages/home/info/index.wxml
+++ b/pages/home/info/index.wxml
@@ -78,6 +78,10 @@
希望出货品类
{{userInfo.numberOfProxyCategoriesTag || '点击修改希望出货品类'}}
+
+
+ 月出货量
+ {{userInfo.shipmentPerMonth || '点击月出货量'}}
打包站名
diff --git a/pages/home/tab6/index.js b/pages/home/tab6/index.js
new file mode 100644
index 0000000..31e5ceb
--- /dev/null
+++ b/pages/home/tab6/index.js
@@ -0,0 +1,137 @@
+// pages/home/tab6/index.js
+import {
+ updateUserInfo,
+ getBaseInfo
+} from '../../api/ztb'
+const storage = require('../../../utils/storage')
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ bidType: 0
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ this.getUerInfoFct()
+
+ },
+ toMyInfo: function () {
+ wx.redirectTo({
+ url: '/pages/index/index'
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ },
+ backspace: function () {
+ console.log('点击返回被触发3')
+ wx.redirectTo({
+ url: '/pages/home/tab2/index'
+ })
+
+ },
+ onTabChangeTop: function (e) {
+ if (this.data.bidType == Number(e.currentTarget.dataset.index)) {
+ return
+ }
+ var tabIndex = Number(e.currentTarget.dataset.index)
+ this.data.firstCategoryId = ''
+ this.setData({
+ ['bidType']: tabIndex
+ })
+ var model={
+ experienceTag:''
+ }
+ if (this.data.bidType == 1) {
+ model.shipmentPerMonth = '1000吨以下'
+ this.submitForm(model)
+ }
+ if (this.data.bidType == 2) {
+ model.shipmentPerMonth = '1000~2000吨'
+ this.submitForm(model)
+ }
+ if (this.data.bidType == 3) {
+ model.shipmentPerMonth = '2000吨以上'
+ this.submitForm(model)
+ }
+ },
+ submitForm: function (model) {
+ console.log(model)
+ updateUserInfo(model).then(result => {
+ setTimeout(() => this.toMyInfo(), 1000)
+ }).catch(err => {
+ this.data.loopRequesting = false
+ })
+ },
+ getUerInfoFct: function () {
+ getBaseInfo().then(res => {
+ if (res.data.shipmentPerMonth == '1000吨以下') {
+ this.setData({
+ bidType: 1
+ })
+
+ } else if (res.data.shipmentPerMonth == '1000~2000吨') {
+ this.setData({
+ bidType: 2
+ })
+
+ } else if (res.data.shipmentPerMonth == '2000吨以上') {
+ this.setData({
+ bidType: 3
+ })
+
+ }
+ })
+ }
+})
\ No newline at end of file
diff --git a/pages/home/tab6/index.json b/pages/home/tab6/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/home/tab6/index.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/home/tab6/index.wxml b/pages/home/tab6/index.wxml
new file mode 100644
index 0000000..1ad44b4
--- /dev/null
+++ b/pages/home/tab6/index.wxml
@@ -0,0 +1,40 @@
+
+
+ 经验
+
+
+
+
+
+
+
+
+ HI,\n欢迎使用纸通宝\n开启一站式废纸交易
+
+
+
+
+
+
+ 你的月出货量大约是？
+
+
+
+
+ 1000吨以下
+
+
+
+
+
+ 1000~2000吨
+
+
+
+
+
+ 2000吨以上
+
+
+
+
\ No newline at end of file
diff --git a/pages/home/tab6/index.wxss b/pages/home/tab6/index.wxss
new file mode 100644
index 0000000..eac1615
--- /dev/null
+++ b/pages/home/tab6/index.wxss
@@ -0,0 +1,79 @@
+/* pages/home/tab6/index.wxss */
+.bj {
+ background-color: white;
+ min-height: 900rpx;
+}
+
+.vip-btn {
+ /* height: 90rpx; */
+ width: 180rpx;
+ background: #F5F5F5;
+ float: right;
+ color: rgba(0, 0, 0, 0.45);
+ font-size: 28rpx;
+}
+
+.top {
+ height: 258rpx;
+ width: 100%;
+}
+
+.topText {
+ width: 440rpx;
+ height: 258rpx;
+ float: left;
+ padding-left: 48rpx;
+ padding-top: 60rpx;
+ font-size: 44rpx;
+ color: #000000;
+ font-family: PingFangSC-Medium;
+}
+
+.mid {
+ height: 150rpx;
+ padding-top: 100rpx;
+ padding-left: 48rpx;
+ font-family: PingFangSC-Medium;
+ font-size: 36rpx;
+ color: #000000;
+ letter-spacing: 2px;
+}
+
+.bottom {
+ height: 410rpx;
+ padding: 48rpx;
+}
+
+.btson1 {
+ height: 147rpx;
+ width: 315rpx;
+ float: left;
+ overflow: hidden;
+ border: 3rpx solid #D8D8D8;
+ border-radius: 10rpx;
+ border-radius: 10rpx;
+ padding: 22px 35px 22px 35px;
+}
+
+.btson2 {
+ height: 147rpx;
+ width: 315rpx;
+ float: right;
+ overflow: hidden;
+ border: 3rpx solid #D8D8D8;
+ border-radius: 10rpx;
+ border-radius: 10rpx;
+ padding: 22px 35px 22px 35px;
+}
+
+.btson3 {
+ height: 147rpx;
+ width: 315rpx;
+ float: left;
+ margin-top: 20rpx;
+ overflow: hidden;
+ border: 3rpx solid #D8D8D8;
+ border-radius: 10rpx;
+ border-radius: 10rpx;
+ padding: 22px 35px 22px 35px;
+}