From 5923633532a3e7e14afcd26ddbbd7c527b55de90 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Sun, 21 Jan 2024 12:25:47 +0800 Subject: [PATCH] 11111111 --- common/request.api.js | 2 + pages.json | 22 ++++ pages/bind/bind_cloudCard.vue | 160 ++++++++++++++++++++++++++++ pages/bind/bind_pickUpCard.vue | 2 +- pages/bind/bind_pickUpCard2.vue | 2 +- pages/home/myCellar.vue | 117 +++++++++++++++++--- pages/home/myHome.vue | 16 +-- pages/records/transferRecords.vue | 165 +++++++++++++++++++++++++++++ pages/records/transferRecords2.vue | 165 +++++++++++++++++++++++++++++ 9 files changed, 625 insertions(+), 26 deletions(-) create mode 100644 pages/bind/bind_cloudCard.vue create mode 100644 pages/records/transferRecords.vue create mode 100644 pages/records/transferRecords2.vue diff --git a/common/request.api.js b/common/request.api.js index b8279dd..050050f 100644 --- a/common/request.api.js +++ b/common/request.api.js @@ -118,6 +118,8 @@ export default { vegeCellarTypeList: (params = {}) => request.post("/lpkgoods/vegeCellarTypeList", params), // 我的菜窖 商品列表 vegeCellarList: (params = {}) => request.post("/lpkgoods/vegeCellarList", params), + // 我的菜窖 转赠亲友 + transSubmission: (params = {}) => request.post("/transferrecords/submission", params), // 我的菜窖 预约提菜 getStoreBySid: (params = {}) => request.get("/customerstore/getStoreBySid/" + params, params), // 我的菜窖 预约提菜 选择时间范围 diff --git a/pages.json b/pages.json index 1af8e5a..238b98a 100644 --- a/pages.json +++ b/pages.json @@ -299,6 +299,22 @@ "enablePullDownRefresh" : false } }, + { + "path" : "pages/records/transferRecords", + "style" : + { + "navigationBarTitleText" : "转赠记录", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/records/transferRecords2", + "style" : + { + "navigationBarTitleText" : "转赠记录", + "enablePullDownRefresh" : false + } + }, { "path" : "pages/records/reservationRecords2", "style" : @@ -306,6 +322,12 @@ "navigationBarTitleText" : "预约记录", "enablePullDownRefresh" : false } + }, + { + "path" : "pages/bind/bind_cloudCard", + "style": { + "navigationStyle": "custom" + } } diff --git a/pages/bind/bind_cloudCard.vue b/pages/bind/bind_cloudCard.vue new file mode 100644 index 0000000..e540761 --- /dev/null +++ b/pages/bind/bind_cloudCard.vue @@ -0,0 +1,160 @@ + + + + + \ No newline at end of file diff --git a/pages/bind/bind_pickUpCard.vue b/pages/bind/bind_pickUpCard.vue index 989f860..1def8d9 100644 --- a/pages/bind/bind_pickUpCard.vue +++ b/pages/bind/bind_pickUpCard.vue @@ -139,7 +139,7 @@ return; } else { uni.switchTab({ - url: '/pages/home/pickUpCard' + url: '/pages/home/myCellar' }) } diff --git a/pages/bind/bind_pickUpCard2.vue b/pages/bind/bind_pickUpCard2.vue index 3631918..21f75d8 100644 --- a/pages/bind/bind_pickUpCard2.vue +++ b/pages/bind/bind_pickUpCard2.vue @@ -186,7 +186,7 @@ _this.$api.pickUpCardBind(this.page).then((resp) => { bus.$emit('order', "监听回调"); uni.switchTab({ - url: '/pages/home/pickUpCard' + url: '/pages/home/myCellar' }) }).catch(e => { diff --git a/pages/home/myCellar.vue b/pages/home/myCellar.vue index 3dc3675..e9a95c9 100644 --- a/pages/home/myCellar.vue +++ b/pages/home/myCellar.vue @@ -509,9 +509,14 @@ }, gotoShopp() { - uni.switchTab({ - url: '/pages/home/cloudCard2', + // uni.switchTab({ + // url: '/pages/home/cloudCard2', + // }) + + uni.navigateTo({ + url: '/pages/bind/bind_cloudCard' }) + }, transfer() { @@ -553,21 +558,82 @@ this.showModal3 = false }, onShareAppMessage: function(res) { + wx.showLoading({ + title: '加载中', + icon: 'loading', + duration: 10000 + }); + + let _this = this + + var list = [] + for (var i = 0; i < this.pickingUpGoods.length; i++) { + var item = this.pickingUpGoods[i] - const promise = new Promise(resolve => { - // 模拟网络请求 - setTimeout(()=>{ - resolve({ - title: '标题', - path: '页面' + if (item.count > 0) { + list.push({ + goodsSid: item.goodsSid, + select: item.count }) - },3000) - }) + } - return { - promise } + var params = { + customerSid: getApp().globalData.sid, + brandId: this.brandType, + vos: list + } + + console.log("=========0", params); + + _this.$api.transSubmission(params).then((resp) => { + + console.log("=========", resp); + + const promise = new Promise(resolve => { + // 模拟网络请求 + setTimeout(() => { + wx.hideLoading() + this.showModal3 = false + resolve({ + title: '标题', + path: '页面' + }) + }, 3000) + }) + + return { + promise + } + + }).catch(e => { + this.shortToast('发生错误,请稍后再试.') + return + }) + + // this.shareCard() + // wx.showLoading({ + // title: '加载中', + // icon: 'loading', + // duration: 10000 + // }); + // const promise = new Promise(resolve => { + // // 模拟网络请求 + // setTimeout(() => { + // wx.hideLoading() + // this.showModal3 = false + // resolve({ + // title: '标题', + // path: '页面' + // }) + // }, 3000) + // }) + + // return { + // promise + // } + // console.log("res", res) // console.log("data", res.target.dataset) // var data = res.target.dataset.info @@ -603,17 +669,34 @@ // } }, - shareCard(sid) { + shareCard() { let _this = this - _this.$api.shareEmpCard(sid).then((resp) => { + var list = [] + for (var i = 0; i < this.pickingUpGoods.length; i++) { + var item = this.pickingUpGoods[i] + + if (item.count > 0) { + list.push({ + goodsSid: item.goodsSid, + select: item.count + }) + } + + } - var item = _this.data.empCardGiftVos.find(item => item.sid === sid) - console.log("item", item); + var params = { + customerSid: getApp().globalData.sid, + brandId: this.brandType, + vos: list + } + + console.log("=========0", params); - item.share = '2' + _this.$api.transSubmission(params).then((resp) => { + console.log("=========", resp); }).catch(e => {}) } diff --git a/pages/home/myHome.vue b/pages/home/myHome.vue index 06966c5..04edaff 100644 --- a/pages/home/myHome.vue +++ b/pages/home/myHome.vue @@ -29,7 +29,7 @@ - {{data.count}} + 待提菜 @@ -47,10 +47,9 @@ - + @@ -59,7 +58,6 @@ 待付款 - @@ -70,7 +68,7 @@ - + --> 转赠记录 @@ -286,10 +284,14 @@ break; case "赠与我的": - + uni.navigateTo({ + url: '/pages/records/transferRecords', + }) break; case "我的转赠": - + uni.navigateTo({ + url: '/pages/records/transferRecords2', + }) break; } } diff --git a/pages/records/transferRecords.vue b/pages/records/transferRecords.vue new file mode 100644 index 0000000..bbf0d73 --- /dev/null +++ b/pages/records/transferRecords.vue @@ -0,0 +1,165 @@ + + + + + \ No newline at end of file diff --git a/pages/records/transferRecords2.vue b/pages/records/transferRecords2.vue new file mode 100644 index 0000000..bbf0d73 --- /dev/null +++ b/pages/records/transferRecords2.vue @@ -0,0 +1,165 @@ + + + + + \ No newline at end of file