diff --git a/common/request.api.js b/common/request.api.js index 5c99ef6..9be4557 100644 --- a/common/request.api.js +++ b/common/request.api.js @@ -139,6 +139,8 @@ export default { vegeCellarList: (params = {}) => request.post("/lpkgoods/vegeCellarList", params), // 我的菜窖 转赠亲友 transSubmission: (params = {}) => request.post("/transferrecords/submission", params), + // 我的菜窖 获取转赠内容 + getTransferByCode: (params = {}) => request.post("/transferrecords/getTransferByCode/"+params, params), // 我的菜窖 领取/绑定转赠菜窖 receiveTransferGoods: (params = {}) => request.post("/vegetablecellar/receiveTransferGoods", params), // 我的菜窖 绑定之前发出的礼品卡 diff --git a/pages.json b/pages.json index 51256f7..3d13284 100644 --- a/pages.json +++ b/pages.json @@ -344,6 +344,13 @@ { "navigationBarTitleText" : "订单详情" } + }, + { + "path" : "pages/good/transfer", + "style": { + "navigationBarTitleText" : "转赠亲友", + "disableScroll": true + } } diff --git a/pages/bind/bind_cloudCard.vue b/pages/bind/bind_cloudCard.vue index 76d6184..6af34a7 100644 --- a/pages/bind/bind_cloudCard.vue +++ b/pages/bind/bind_cloudCard.vue @@ -64,6 +64,22 @@ type="number" :value="page.codeKey" @input="onKeyInput2" /> --> + 转赠内容 + + + + + + {{item.goodsName}} + {{item.remarks}} + + + + + + @@ -85,6 +101,7 @@ startHeight: 0, endHeight: 0 }, + data:[] } }, onLoad(options) { @@ -98,8 +115,20 @@ this.page.startHeight = info.windowWidth * 0.6 this.page.endHeight = info.windowWidth * 0.8 + this.getData() }, methods: { + + getData(){ + let _this = this + _this.$api.getTransferByCode(this.page.code).then((resp) => { + _this.data = resp + + }).catch(e => { + _this.longToast(e.msg) + }) + }, + onKeyInput1(event) { this.page.code = event.target.value }, diff --git a/pages/good/reservation.vue b/pages/good/reservation.vue index ca9a32f..4750dc9 100644 --- a/pages/good/reservation.vue +++ b/pages/good/reservation.vue @@ -33,7 +33,7 @@ style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;"> 暂无提货单信息 + style="font-size: 16px;color: #000; font-weight: 600;font-family: sans-serif;">暂无提货点信息 去完善 @@ -94,7 +94,7 @@ - 请完善 + 去完善 diff --git a/pages/good/shoppCart.vue b/pages/good/shoppCart.vue index d68ab26..c63155d 100644 --- a/pages/good/shoppCart.vue +++ b/pages/good/shoppCart.vue @@ -57,10 +57,9 @@ - - - + + + @@ -69,7 +68,7 @@ background: -webkit-linear-gradient(left,#FFC369,#FF9901);margin-top: 10px;" @click="gotoShopp()">去逛逛 - + + :beforeClose="dialogBeforeClose" @confirm="dialogInputConfirm" :content="page.qdxy"> @@ -130,7 +128,7 @@ export default { data() { return { - notData:false, + notData: false, dialogBeforeClose: false, page: { affiliation: '', @@ -138,7 +136,8 @@ price: "0", reduce: "0", remarks: "", - qssl: "" + qssl: "", + qdxy: "" }, data: [ @@ -148,16 +147,17 @@ onLoad(options) { this.page.affiliation = options.affiliation this.page.qssl = options.weight + this.page.qdxy = options.qdxy console.log(" options", options); - + }, onShow() { this.request() }, methods: { - gotoShopp(){ + gotoShopp() { uni.reLaunch({ - url:"/pages/home/cloudCard2" + url: "/pages/home/cloudCard2" }) }, showPop() { @@ -180,8 +180,8 @@ _this.$api.shoppingCartList(params).then((resp) => { console.log("resp", resp); _this.data = resp - - _this.notData = resp.length==0 + + _this.notData = resp.length == 0 // _this.getallPrice() // _this.getweight() _this.getAllPriceOrWeight() @@ -342,8 +342,7 @@ // console.log("resp", resp); this.$pay(resp) - }).catch(e => { - }) + }).catch(e => {}) }, diff --git a/pages/good/transfer.vue b/pages/good/transfer.vue new file mode 100644 index 0000000..f49a068 --- /dev/null +++ b/pages/good/transfer.vue @@ -0,0 +1,267 @@ + + + + + \ No newline at end of file diff --git a/pages/home/cloudCard2.vue b/pages/home/cloudCard2.vue index cf9a6af..8fdeaae 100644 --- a/pages/home/cloudCard2.vue +++ b/pages/home/cloudCard2.vue @@ -16,7 +16,7 @@ - + @@ -158,7 +158,7 @@ + style="display: flex;flex-direction: row; justify-content: center;align-items: center;margin-top: 5px;padding: 0px 10px;"> @@ -201,7 +201,7 @@ + :content="data.brandVos[selectIndex2].qdxy"> @@ -554,7 +554,7 @@ gotoCart() { uni.navigateTo({ url: '/pages/good/shoppCart?affiliation=' + this.data.brandVos[this.selectIndex2].id + - "&weight=" + this.data.brandVos[this.selectIndex2].qssl + "&weight=" + this.data.brandVos[this.selectIndex2].qssl+"&qdxy=" + this.data.brandVos[this.selectIndex2].qdxy }) }, showPop2() { @@ -645,6 +645,13 @@ }, + onShareTimeline() { + return { + title: '邀请您使用XXX小程序', // 分享出的卡片标题 + path: '/pages/index/index', // 他人通过卡片进入小程序的路径，可以在后面拼接URL的形式带参数 + imageUrl: '/static/logo_icon.png', // 分享出去的图片，默认为当前页面的截图。图片路径可以是本地文件路径或者网络图片路径。支持PNG及JPG。 + }; + }, } } @@ -685,6 +692,7 @@ display: flex; flex-direction: row; /* 这里注意，影响弹窗 */ + height: calc(100vh - 120px - 50vw); background-color: #f7f7f7; border-radius: 15px; overflow: hidden; @@ -697,7 +705,6 @@ border-top: 1px solid #F8F8F8; padding-top: 5px; flex-shrink: 0; - margin-bottom: 10px; } .label { diff --git a/pages/home/myCellar.vue b/pages/home/myCellar.vue index aeee6f0..95f1d6f 100644 --- a/pages/home/myCellar.vue +++ b/pages/home/myCellar.vue @@ -316,7 +316,8 @@ - 请添加~ + 请添加~ @@ -449,11 +450,13 @@ this.transferInfo.remarks = event.target.value }, shareGift() { + console.log("shareGift>>>>", this.shareSid); + // 邀请新人 助力礼包 isNewUser==1 可以助力 if (this.shareSid != '' && getApp().globalData.isNewUser == '1') { var params = { - customerSid: this.shareSid, + customerSid: getApp().globalData.sid, orderSid: this.orderSid } @@ -583,15 +586,25 @@ }, transfer() { - this.showModal3 = true + if (this.pickingUpGoods.length > 0) { + + // this.showModal3 = true + uni.navigateTo({ + url: '/pages/good/transfer?pickingUpGoods=' + encodeURIComponent(JSON.stringify(this + .pickingUpGoods)) + "&affiliation=" + this.data[this.selectIndex].id, + }) + } else { + this.shortToast('请先选择商品') + } }, reservation() { - console.log(">>>>>>>>>>",this.pickingUpGoods); + console.log(">>>>>>>>>>", this.pickingUpGoods); if (this.pickingUpGoods.length > 0) { uni.navigateTo({ - url: '/pages/good/reservation?pickingUpGoods=' + encodeURIComponent(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 22658e2..4427341 100644 --- a/pages/home/myHome.vue +++ b/pages/home/myHome.vue @@ -125,24 +125,24 @@ 邀请新朋友后，您将获得“蔬菜品鉴礼包”。 - - - + --> - + - --> + diff --git a/pages/records/transferRecords.vue b/pages/records/transferRecords.vue index 8b179fb..ba83816 100644 --- a/pages/records/transferRecords.vue +++ b/pages/records/transferRecords.vue @@ -95,7 +95,7 @@ title: '汇融惠享-云菜窖', // ② path: '/pages/login/login?data=' + value, - imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', //自定义图片路径，显示图片长宽比是 5:4。 + imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_transfer.png', //自定义图片路径，显示图片长宽比是 5:4。 success: function(res) { console.log('aaaa', "分享成功") },