diff --git a/common/request.api.js b/common/request.api.js index 5a1e8da..5c99ef6 100644 --- a/common/request.api.js +++ b/common/request.api.js @@ -104,7 +104,10 @@ export default { orderDetails: (params = {}) => request.get("/empsreservoorder/OrderDetails/"+params, params, {}, {}, true), // 我的 订单详情 修改订单状态 changePayState: (params = {}) => request.get("/empsreservoorder/changePayState/"+params, params, {}, {}, true), - + // 我的 推荐有礼 + recommendNewUsers: (params = {}) => request.post("/newcomerrecorecord/recommendNewUsers", params, {}, {}), + // 新人助力 + recommendedAssistance: (params = {}) => request.post("/newcomerrecorecord/recommendedAssistance", params, {}, {}), // 2024-1-15 新需求 @@ -113,9 +116,9 @@ export default { // 获取补充菜窖 商品分类列表 getAllGoodsType: (params = {}) => request.get("/lpkgiftcard/getAllGoodsType/" + params, params), // 获取补充菜窖 商品分类列表 - getGoodsByType: (params = {}) => request.post("/lpkgoods/getGoodsByType", params), + getGoodsByType: (params = {}) => request.post("/lpkgoods/getGoodsByType", params, {}, {}, true), // 获取当前购物车总价及总斤数 - getGoodsWeight: (params = {}) => request.post("/shoppingcart/getGoodsWeight", params), + getGoodsWeight: (params = {}) => request.post("/shoppingcart/getGoodsWeight", params, {}, {}, true), // 加入购物车 addShoppingCart: (params = {}) => request.post("/shoppingcart/addShoppingCart", params), // 购物车列表 diff --git a/pages/good/shoppCart.vue b/pages/good/shoppCart.vue index 6337a94..daf3843 100644 --- a/pages/good/shoppCart.vue +++ b/pages/good/shoppCart.vue @@ -59,8 +59,8 @@ - + @@ -107,7 +107,7 @@ + content="百姓菜窖及精品菜窖起订量为20斤,\n\n20斤-99斤需额外支付10%附加费用,\n\n100斤-199斤需额外支付5%附加费用,\n\n满200斤及以上无附加费。"> diff --git a/pages/home/cloudCard2.vue b/pages/home/cloudCard2.vue index bdd82bc..158babd 100644 --- a/pages/home/cloudCard2.vue +++ b/pages/home/cloudCard2.vue @@ -188,7 +188,7 @@ + content="百姓菜窖及精品菜窖起订量为20斤,\n\n20斤-99斤需额外支付10%附加费用,\n\n100斤-199斤需额外支付5%附加费用,\n\n满200斤及以上无附加费。"> @@ -549,38 +549,85 @@ }, onShareAppMessage: function(res) { - console.log("res", res) - console.log("data", res.target.dataset) - var data = res.target.dataset.info - // ① - let shareData = JSON.stringify({ - // params: { - // code: data.code, - // codeKey: data.codeKey, - // customerSid: '' - // }, - // functionName: 'bindCard', - // url: '/pages/detail/detail_affeection?sid=' + data.sid - - url: '/pages/home/cloudCard2?shareSid=' + getApp().globalData.sid, - functionName: 'share' + // console.log("res", res) + // console.log("data", res.target.dataset) + // var data = res.target.dataset.info + // // ① + // let shareData = JSON.stringify({ + // // params: { + // // code: data.code, + // // codeKey: data.codeKey, + // // customerSid: '' + // // }, + // // functionName: 'bindCard', + // // url: '/pages/detail/detail_affeection?sid=' + data.sid + + // url: '/pages/home/cloudCard2?shareSid=' + getApp().globalData.sid, + // functionName: 'share' + // }) + // // 转码传输 + // let value = encodeURIComponent(shareData) + + // return { + // title: '汇融惠享-云菜窖', + // // ② + // path: '/pages/login/login?data=' + value, + // imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_invite.png', //自定义图片路径,显示图片长宽比是 5:4。 + // success: function(res) { + // console.log('aaaa', "分享成功") + // }, + // fail: function(res) { + // // 转发失败 + // console.log('aaaa', "用户点击了取消") + // } + // } + + let _this = this + const promise = new Promise(resolve => { + // 模拟网络请求 + setTimeout(() => { + + var params ={ + customerSid:getApp().globalData.sid + } + + _this.$api.recommendNewUsers(params).then((resp) => { + + + let shareData = JSON.stringify({ + // params: { + // code: resp.transferCode, + // codeKey: resp.sid + // }, + // functionName: 'bindCard', + // url: '/pages/bind/bind_cloudCard?code=' + resp + // .transferCode + "&codeKey=" + 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) }) - // 转码传输 - let value = encodeURIComponent(shareData) - - return { - title: '汇融惠享-云菜窖', - // ② - path: '/pages/login/login?data=' + value, - imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', //自定义图片路径,显示图片长宽比是 5:4。 - success: function(res) { - console.log('aaaa', "分享成功") - }, - fail: function(res) { - // 转发失败 - console.log('aaaa', "用户点击了取消") - } - } + + return promise + + }, } diff --git a/pages/home/myCellar.vue b/pages/home/myCellar.vue index f1b970b..144c616 100644 --- a/pages/home/myCellar.vue +++ b/pages/home/myCellar.vue @@ -131,12 +131,12 @@ @click="transfer()">转赠亲友 + display: flex;flex-direction: row;align-items: center;box-sizing: border-box;justify-content: center;" @click="gotoCart()"> - 选中 + 已选中 {{page.count}} - 份蔬菜 + >>>", this.shareSid); + this.orderSid = options.orderSid + console.log("shareSid>>>>", this.shareSid); + console.log("orderSid>>>>", this.orderSid); let info = uni.getSystemInfoSync(); @@ -434,8 +438,17 @@ }, shareGift() { // 邀请新人 助力礼包 isNewUser==1 可以助力 - if (this.shareSid && getApp().globalData.isNewUser=='1') { - + if (this.shareSid != '' && getApp().globalData.isNewUser == '1') { + + var params = { + customerSid: this.shareSid, + orderSid: this.orderSid + } + + this.$api.recommendedAssistance(params).then((resp) => { + + + }).catch(e => {}) } }, @@ -605,7 +618,7 @@ // console.log("resp", resp); _this.$pay(resp) - _this.showModal2 = false + _this.showModal2 = false }).catch(e => {}) @@ -620,7 +633,7 @@ this.showModal3 = false }, onShareAppMessage: function(res) { - + let _this = this const promise = new Promise(resolve => { // 模拟网络请求 diff --git a/pages/home/myHome.vue b/pages/home/myHome.vue index 9cc944d..fc66447 100644 --- a/pages/home/myHome.vue +++ b/pages/home/myHome.vue @@ -234,39 +234,103 @@ }) }, onShareAppMessage: function(res) { - console.log("res", res) - console.log("data", res.target.dataset) - var data = res.target.dataset.info - // ① - let shareData = JSON.stringify({ - // params: { - // code: data.code, - // codeKey: data.codeKey, - // customerSid: '' - // }, - // functionName: 'bindCard', - // url: '/pages/detail/detail_affeection?sid=' + data.sid - - url: '/pages/home/cloudCard2?shareSid=' + getApp().globalData.sid, - functionName: 'share' + // console.log("res", res) + // console.log("data", res.target.dataset) + // var data = res.target.dataset.info + + // this.shareCard() + + // // ① + // let shareData = JSON.stringify({ + // // params: { + // // code: data.code, + // // codeKey: data.codeKey, + // // customerSid: '' + // // }, + // // functionName: 'bindCard', + // // url: '/pages/detail/detail_affeection?sid=' + data.sid + + // url: '/pages/home/myCellar?shareSid=' + getApp().globalData.sid, + // functionName: 'share' + // }) + // // 转码传输 + // let value = encodeURIComponent(shareData) + + // return { + // title: '汇融惠享-云菜窖', + // // ② + // path: '/pages/login/login?data=' + value, + // imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_invite.png', //自定义图片路径,显示图片长宽比是 5:4。 + // success: function(res) { + // console.log('aaaa', "分享成功") + // }, + // fail: function(res) { + // // 转发失败 + // console.log('aaaa', "用户点击了取消") + // } + // } + + + let _this = this + const promise = new Promise(resolve => { + // 模拟网络请求 + setTimeout(() => { + + var params ={ + customerSid:getApp().globalData.sid + } + + _this.$api.recommendNewUsers(params).then((resp) => { + + + let shareData = JSON.stringify({ + // params: { + // code: resp.transferCode, + // codeKey: resp.sid + // }, + // functionName: 'bindCard', + // url: '/pages/bind/bind_cloudCard?code=' + resp + // .transferCode + "&codeKey=" + 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) }) - // 转码传输 - let value = encodeURIComponent(shareData) - - return { - title: '汇融惠享-云菜窖', - // ② - path: '/pages/login/login?data=' + value, - imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_invite.png', //自定义图片路径,显示图片长宽比是 5:4。 - success: function(res) { - console.log('aaaa', "分享成功") - }, - fail: function(res) { - // 转发失败 - console.log('aaaa', "用户点击了取消") - } + + return promise + + + }, + shareCard() { + let _this = this + + var params ={ + customerSid:getApp().globalData.sid } + + _this.$api.recommendNewUsers(params).then((resp) => { + + + }).catch(e => {}) }, + itemClick(type) { switch (type) {