diff --git a/common/config.js b/common/config.js index bd2d42c..35be549 100644 --- a/common/config.js +++ b/common/config.js @@ -10,7 +10,7 @@ module.exports = { // baseUrl: 'https://lpk.yyundong.com/lpkapi', // 测试服务器 // baseUrl: 'https://lpk.yyundong.com/mallapi', // 测试服务器 baseUrl: 'https://supervise.yxtsoft.com/lpkapi', // 正式服务器 - tokenName: "Authorization", // 请求头中token的名字,与服务器端对应 + // tokenName: "Authorization", // 请求头中token的名字,与服务器端对应 loginTimeoutCode: "5001", // 登录超时或失效的情况下,服务器端返回的错误码 loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下,跳转到的登录页面 } \ No newline at end of file diff --git a/pages/bind/bind_cloudCard.vue b/pages/bind/bind_cloudCard.vue index f927580..f50f434 100644 --- a/pages/bind/bind_cloudCard.vue +++ b/pages/bind/bind_cloudCard.vue @@ -27,23 +27,23 @@ - + - {{item.goodsName}} + style="color: #000;font-size: 14px;font-weight: 600;font-family: sans-serif;" @click="itemClick(item.goodsSid)">{{item.goodsName}} {{item.goodsContent}} {{item.goodsFs}} {{item.goodsJs}} - {{item.price}} + diff --git a/pages/good/reservation.vue b/pages/good/reservation.vue index d338994..1d98d99 100644 --- a/pages/good/reservation.vue +++ b/pages/good/reservation.vue @@ -116,12 +116,12 @@ " bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll"> - - @@ -129,7 +129,7 @@ style="display: flex;flex-direction: column;flex: 1; padding-bottom: 15px; margin-left: 10px;" :style="{'border-bottom':(index == pickingUpGoods.length-1 ? 'none' : '1px #EFEFEF solid')}"> - {{item.name}} + {{item.name}} {{item.remark}} @@ -192,11 +192,11 @@ - 确认提菜 + @click="congirmExtract()" >确认提菜 @@ -217,6 +217,7 @@ disabledDate: [ // '2023-12-16' ], + btnDisabled:false } }, onLoad(options) { @@ -252,6 +253,11 @@ uni.$off('changePer'); }, methods: { + itemClick(goodsSid) { + uni.navigateTo({ + url: '/pages/good/goodsDetail?sid=' + goodsSid + }) + }, getSun() { let _this = this _this.$api.getExtractSaturAndSun().then((resp) => { @@ -324,6 +330,13 @@ congirmExtract() { let _this = this + if(this.btnDisabled){ + this.shortToast('请勿重复点击') + return + } + + this.btnDisabled = true + if (_this.info.storeSid == '') { this.shortToast('请完善提货点信息') return @@ -357,7 +370,6 @@ return } - var params = { customerSid: getApp().globalData.sid, affiliation: _this.affiliation, @@ -371,8 +383,10 @@ _this.$api.submissionExtract(params).then((resp) => { uni.navigateBack() + _this.btnDisabled = false }).catch(e => { console.log(e); + _this.btnDisabled = false }) }, } diff --git a/pages/good/shoppCart.vue b/pages/good/shoppCart.vue index 8190962..064a97f 100644 --- a/pages/good/shoppCart.vue +++ b/pages/good/shoppCart.vue @@ -7,18 +7,18 @@ bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll"> --> - - - {{item.goodsName}} + {{item.goodsName}} {{item.remarks}} diff --git a/pages/good/transfer.vue b/pages/good/transfer.vue index e3d27a0..0c79eba 100644 --- a/pages/good/transfer.vue +++ b/pages/good/transfer.vue @@ -23,7 +23,7 @@ style="display: flex;flex-direction: column;flex: 1; padding-bottom: 15px; margin-left: 10px;" :style="{'border-bottom':(index == goods.length-1 ? 'none' : '1px #EFEFEF solid')}"> - {{item.name}} + {{item.name}} {{item.remark}} @@ -136,6 +136,11 @@ this.$refs.nav.defaultColorBgAlpha(res) }, methods: { + itemClick(goodsSid) { + uni.navigateTo({ + url: '/pages/good/goodsDetail?sid=' + goodsSid + }) + }, onKeyInput(event) { this.transferInfo.remarks = event.target.value }, diff --git a/pages/home/cloudCard2.vue b/pages/home/cloudCard2.vue index abcb1fc..f2f9a29 100644 --- a/pages/home/cloudCard2.vue +++ b/pages/home/cloudCard2.vue @@ -82,7 +82,7 @@ - diff --git a/pages/home/myCellar.vue b/pages/home/myCellar.vue index 179fd8e..35ba6ef 100644 --- a/pages/home/myCellar.vue +++ b/pages/home/myCellar.vue @@ -64,7 +64,7 @@ 已失效 - diff --git a/pages/home/myHome.vue b/pages/home/myHome.vue index bc25004..5aac20f 100644 --- a/pages/home/myHome.vue +++ b/pages/home/myHome.vue @@ -262,7 +262,8 @@ methods: { makePhoneCall() { wx.makePhoneCall({ - phoneNumber: '15632127890', + // phoneNumber: '15632127890', + phoneNumber: '15511457061', }) }, diff --git a/pages/records/orderDetail.vue b/pages/records/orderDetail.vue index 65356cb..05bae5b 100644 --- a/pages/records/orderDetail.vue +++ b/pages/records/orderDetail.vue @@ -17,7 +17,7 @@ - + @@ -25,7 +25,7 @@ {{item.goodsName}} + style="flex: 1;font-weight: 600;font-family: sans-serif;font-size: 14px;" @click="itemClick(item.goodsSid)">{{item.goodsName}} ¥{{item.pricePart}} @@ -168,8 +168,12 @@ this.request() }, methods: { + itemClick(goodsSid) { + uni.navigateTo({ + url: '/pages/good/goodsDetail?sid=' + goodsSid + }) + }, // 获取数据 - request() { let _this = this diff --git a/pages/records/reservationRecords3.vue b/pages/records/reservationRecords3.vue index 6fdff80..9af487c 100644 --- a/pages/records/reservationRecords3.vue +++ b/pages/records/reservationRecords3.vue @@ -16,7 +16,7 @@ - 预约单号:{{item.reserveCode}} + 预约单号:{{item.newCode}} {{item.stateValue}} diff --git a/pages/records/reservationRecords4.vue b/pages/records/reservationRecords4.vue index b70e587..3cde30b 100644 --- a/pages/records/reservationRecords4.vue +++ b/pages/records/reservationRecords4.vue @@ -16,7 +16,7 @@ - 预约单号:{{item.reserveCode}} + 预约单号:{{item.newCode}} {{item.stateValue}} 转赠单号: - {{item.transferCode}} + {{item.newCode}} 转赠时间: diff --git a/pages/records/transferRecords2.vue b/pages/records/transferRecords2.vue index 012a977..59a8b33 100644 --- a/pages/records/transferRecords2.vue +++ b/pages/records/transferRecords2.vue @@ -9,7 +9,7 @@ 转赠单号: - {{item.transferCode}} + {{item.newCode}} 转赠时间: