Browse Source

111111111

master
guoxing 1 year ago
parent
commit
23a47b708e
  1. 9
      common/request.api.js
  2. 6
      pages/good/shoppCart.vue
  3. 111
      pages/home/cloudCard2.vue
  4. 29
      pages/home/myCellar.vue
  5. 124
      pages/home/myHome.vue

9
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),
// 购物车列表

6
pages/good/shoppCart.vue

@ -59,8 +59,8 @@
</view>
<!-- </scroll-view> -->
<view style="height: 15vw; width: 100%; display: flex;flex-direction: column;position: fixed;bottom: 0;overflow:hidden;
justify-content: center;align-items: center; background: #fff;padding-top: 10px;padding-bottom: 10px;">
<view style=" width: 100%; display: flex;flex-direction: column;position: fixed;bottom: 0;overflow:hidden;
justify-content: center;align-items: center; background: #fff;padding-top: 10px;">
<view id="bomView" style="display: flex;flex-direction: row;align-items: center;">
<view style="color: #888;font-size: 10px;height: 10px;line-height: 10px;margin-top: 5px;">
@ -107,7 +107,7 @@
<uni-popup ref="inputDialog" type="dialog">
<uni-popup-dialog ref="inputClose" mode="base" title="起订说明" :showConfirm="true"
:beforeClose="dialogBeforeClose" @confirm="dialogInputConfirm"
content="菜窖起订量为20斤,\n\n20-100斤需额外支付10%附加费用,\n\n101斤-200斤需额外支付5%附加费用,\n\n200斤以上无附加费。"></uni-popup-dialog>
content="百姓菜窖及精品菜窖起订量为20斤,\n\n20斤-99斤需额外支付10%附加费用,\n\n100斤-199斤需额外支付5%附加费用,\n\n满200斤及以上无附加费。"></uni-popup-dialog>
</uni-popup>
</view>

111
pages/home/cloudCard2.vue

@ -188,7 +188,7 @@
<uni-popup ref="inputDialog2" type="dialog">
<uni-popup-dialog ref="inputClose" mode="base" title="起订说明" :showConfirm="true"
:beforeClose="dialogBeforeClose2" @confirm="dialogInputConfirm2"
content="菜窖起订量为20斤,\n\n20-100斤需额外支付10%附加费用,\n\n101斤-200斤需额外支付5%附加费用,\n\n200斤以上无附加费。"></uni-popup-dialog>
content="百姓菜窖及精品菜窖起订量为20斤,\n\n20斤-99斤需额外支付10%附加费用,\n\n100斤-199斤需额外支付5%附加费用,\n\n满200斤及以上无附加费。"></uni-popup-dialog>
</uni-popup>
</view>
@ -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
},
}

29
pages/home/myCellar.vue

@ -131,12 +131,12 @@
@click="transfer()">转赠亲友</text>
<view style="border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 0px 10px;height: 42px;flex: 1;
display: flex;flex-direction: row;align-items: center;box-sizing: border-box;" @click="gotoCart()">
display: flex;flex-direction: row;align-items: center;box-sizing: border-box;justify-content: center;" @click="gotoCart()">
<!-- image src="../../static/shoppCart_icon.png" mode="aspectFill"
style="height: 20px;width: 25px;"></image> -->
<text style="font-size: 12px;color: #666;margin-left: 10px; ">选中</text>
<text style="font-size: 12px;color: #666;margin-left: 10px; ">选中</text>
<text style="font-size: 15px;color: #FF5006;margin-left: 10px; ">{{page.count}}</text>
<text style="font-size: 12px;color: #666;margin-left: 10px; ">蔬菜</text>
<text style="font-size: 12px;color: #666;margin-left: 10px; "></text>
</view>
<text style="background: #FF9900; color: #fff;font-size: 13px; padding: 0px 15px;height: 40px;line-height: 40px;
border: 1px #FF5006 solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;flex-shrink: 0;"
@ -395,6 +395,8 @@
},
newporGiftSid: "",
orderSid: "",
shareSid: ""
}
},
@ -418,7 +420,9 @@
onLoad(options) {
this.shareSid = options.shareSid
// console.log("shareSid>>>>", 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 => {
//

124
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) {

Loading…
Cancel
Save