diff --git a/pages.json b/pages.json index ec3712d..51256f7 100644 --- a/pages.json +++ b/pages.json @@ -257,7 +257,7 @@ { "path": "pages/good/shoppCart", "style": { - "navigationBarTitleText": "购物车", + "navigationBarTitleText": "购菜车", "enablePullDownRefresh": false } }, @@ -282,7 +282,8 @@ { "path": "pages/good/reservation", "style": { - "navigationStyle": "custom" + "navigationStyle": "custom", + "disableScroll": true } }, { @@ -349,7 +350,7 @@ ], "globalStyle": { "navigationBarTextStyle": "white", - "navigationBarTitleText": "云菜窖", + "navigationBarTitleText": "惠享云菜窖", "navigationBarBackgroundColor": "#FE9039", "backgroundColor": "#FE9039" }, diff --git a/pages/good/reservation.vue b/pages/good/reservation.vue index d967570..ca9a32f 100644 --- a/pages/good/reservation.vue +++ b/pages/good/reservation.vue @@ -1,21 +1,21 @@ @@ -217,10 +237,12 @@ this.request() this.getSun() - this.pickingUpGoods = JSON.parse(options.pickingUpGoods) + this.pickingUpGoods = JSON.parse(decodeURIComponent(options.pickingUpGoods)) this.affiliation = options.affiliation - - console.log(">>>>>",options); + + console.log(">>>>>", options); + console.log(">>>>>", this.pickingUpGoods); + console.log(">>>>>", this.affiliation); }, onUnload() { @@ -299,6 +321,12 @@ }, congirmExtract() { let _this = this + + if (_this.info.storeSid == '') { + this.shortToast('请完善提货点信息') + return + } + if (_this.info.reserveDate == '') { this.shortToast('请选择日期') diff --git a/pages/good/shoppCart.vue b/pages/good/shoppCart.vue index daf3843..d68ab26 100644 --- a/pages/good/shoppCart.vue +++ b/pages/good/shoppCart.vue @@ -57,6 +57,19 @@ + + + + + + 购菜车是空的 + 去逛逛 + + + { console.log("resp", resp); _this.data = resp - + + _this.notData = resp.length==0 // _this.getallPrice() // _this.getweight() _this.getAllPriceOrWeight() - // 无数据 - if (_this.data.length == 0) { - _this.$nextTick(() => { - _this.$refs.pageView.setLoadState(100) - }) - } - }).catch(e => { // 错误 1 _this.$nextTick(() => { @@ -250,8 +263,6 @@ _this.page.weight = resp.totalWeight _this.page.remarks = resp.remarks - _this.initPrice = resp.totalPrice - _this.initWeight = resp.totalWeight _this.$nextTick(() => { _this.$refs.pageView.setLoadState(2) diff --git a/pages/home/cloudCard2.vue b/pages/home/cloudCard2.vue index 158babd..cf9a6af 100644 --- a/pages/home/cloudCard2.vue +++ b/pages/home/cloudCard2.vue @@ -108,6 +108,19 @@ + + + + + 菜窖还在补充中~ + + + + @@ -149,16 +162,16 @@ - ￥{{page.price}} + style="font-size: 15px;color: #FF5006;margin-left: 5px;height: 20px;line-height: 20px;margin-top: 5px;font-weight: bold;">￥{{page.price}} {{page.remarks}} + style="font-size: 10px;color: #666;margin-left: 5px; height: 10px;line-height: 10px;margin-bottom: 5px;">{{page.remarks}} @@ -199,6 +212,7 @@ export default { data() { return { + notData: false, dialogContent: "这里是协议内容，这里是协议内容,这里是协议内容，这里是协议内容,这里是协议内容，这里是协议内容,这里是协议内容，这里是协议内容这里是协议内容，这里是协议内容", confirmText: "我知道了（5s）", dialogBeforeClose: false, @@ -353,6 +367,7 @@ _this.$api.getGoodsByType(_this.searchInfo).then((resp) => { _this.goods = resp + _this.notData = resp.length == 0 _this.getAllPriceOrWeight() }).catch(e => { _this.$nextTick(() => { @@ -581,19 +596,19 @@ // console.log('aaaa', "用户点击了取消") // } // } - + let _this = this const promise = new Promise(resolve => { // 模拟网络请求 setTimeout(() => { - - var params ={ - customerSid:getApp().globalData.sid + + var params = { + customerSid: getApp().globalData.sid } - + _this.$api.recommendNewUsers(params).then((resp) => { - - + + let shareData = JSON.stringify({ // params: { // code: resp.transferCode, @@ -602,32 +617,33 @@ // functionName: 'bindCard', // url: '/pages/bind/bind_cloudCard?code=' + resp // .transferCode + "&codeKey=" + resp.sid - - url: '/pages/home/myCellar?shareSid=' + getApp().globalData.sid+"&orderSid=" + resp.sid, + + url: '/pages/home/myCellar?shareSid=' + getApp() + .globalData.sid + "&orderSid=" + resp.sid, functionName: 'share' }) // 转码传输 let value = encodeURIComponent(shareData) - + resolve({ title: '汇融惠享-云菜窖', // ② path: '/pages/login/login?data=' + value, imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_invite.png', //自定义图片路径，显示图片长宽比是 5:4。 - + }) - + }).catch(e => { _this.shortToast('发生错误,请稍后再试.') return }) - + }, 0) }) - + return promise - - + + }, } diff --git a/pages/home/myCellar.vue b/pages/home/myCellar.vue index 144c616..aeee6f0 100644 --- a/pages/home/myCellar.vue +++ b/pages/home/myCellar.vue @@ -131,7 +131,8 @@ @click="transfer()">转赠亲友 + display: flex;flex-direction: row;align-items: center;box-sizing: border-box;justify-content: center;" + @click="gotoCart()"> 已选中 @@ -250,7 +251,7 @@ " bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll"> - @@ -309,6 +310,17 @@ + + + + + 请添加~ + + + + @@ -330,7 +342,7 @@ --> - + @@ -344,6 +356,8 @@ export default { data() { return { + butdisabled: true, + transferNotData: true, notData: false, showModal: false, showModal2: false, @@ -391,9 +405,7 @@ newPerGiftList: [ ], - transferInfo: { - - }, + transferInfo: {}, newporGiftSid: "", orderSid: "", shareSid: "" @@ -471,7 +483,7 @@ _this.data = resp _this.pickingUpGoods = [] _this.baseDataSuccess = true - _this.selectIndex = 0 + // _this.selectIndex = 0 _this.getgoods() }).catch(e => { _this.$nextTick(() => { @@ -514,6 +526,7 @@ this.getcount() this.addGoods(item) + }, getcount() { @@ -524,6 +537,9 @@ } this.page.count = num + + this.butdisabled = this.page.count == 0 + }, addGoods(goods) { @@ -544,6 +560,9 @@ } + this.transferNotData = this.pickingUpGoods.length == 0 + + }, itemClick(goodsSid) { @@ -568,10 +587,11 @@ }, reservation() { + console.log(">>>>>>>>>>",this.pickingUpGoods); if (this.pickingUpGoods.length > 0) { uni.navigateTo({ - url: '/pages/good/reservation?pickingUpGoods=' + JSON.stringify(this.pickingUpGoods) + + url: '/pages/good/reservation?pickingUpGoods=' + encodeURIComponent(JSON.stringify(this.pickingUpGoods)) + "&affiliation=" + this.data[this.selectIndex].id, }) diff --git a/pages/home/myHome.vue b/pages/home/myHome.vue index fc66447..22658e2 100644 --- a/pages/home/myHome.vue +++ b/pages/home/myHome.vue @@ -156,6 +156,7 @@ export default { data() { return { + butdisabled: true, page: { startHeight: 0, endHeight: 0