111111111
This commit is contained in:
@@ -104,7 +104,10 @@ export default {
|
|||||||
orderDetails: (params = {}) => request.get("/empsreservoorder/OrderDetails/"+params, params, {}, {}, true),
|
orderDetails: (params = {}) => request.get("/empsreservoorder/OrderDetails/"+params, params, {}, {}, true),
|
||||||
// 我的 订单详情 修改订单状态
|
// 我的 订单详情 修改订单状态
|
||||||
changePayState: (params = {}) => request.get("/empsreservoorder/changePayState/"+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 新需求
|
// 2024-1-15 新需求
|
||||||
@@ -113,9 +116,9 @@ export default {
|
|||||||
// 获取补充菜窖 商品分类列表
|
// 获取补充菜窖 商品分类列表
|
||||||
getAllGoodsType: (params = {}) => request.get("/lpkgiftcard/getAllGoodsType/" + params, params),
|
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),
|
addShoppingCart: (params = {}) => request.post("/shoppingcart/addShoppingCart", params),
|
||||||
// 购物车列表
|
// 购物车列表
|
||||||
|
|||||||
@@ -59,8 +59,8 @@
|
|||||||
</view>
|
</view>
|
||||||
<!-- </scroll-view> -->
|
<!-- </scroll-view> -->
|
||||||
|
|
||||||
<view style="height: 15vw; width: 100%; display: flex;flex-direction: column;position: fixed;bottom: 0;overflow:hidden;
|
<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;padding-bottom: 10px;">
|
justify-content: center;align-items: center; background: #fff;padding-top: 10px;">
|
||||||
|
|
||||||
<view id="bomView" style="display: flex;flex-direction: row;align-items: center;">
|
<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;">
|
<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 ref="inputDialog" type="dialog">
|
||||||
<uni-popup-dialog ref="inputClose" mode="base" title="起订说明" :showConfirm="true"
|
<uni-popup-dialog ref="inputClose" mode="base" title="起订说明" :showConfirm="true"
|
||||||
:beforeClose="dialogBeforeClose" @confirm="dialogInputConfirm"
|
: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>
|
</uni-popup>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -188,7 +188,7 @@
|
|||||||
<uni-popup ref="inputDialog2" type="dialog">
|
<uni-popup ref="inputDialog2" type="dialog">
|
||||||
<uni-popup-dialog ref="inputClose" mode="base" title="起订说明" :showConfirm="true"
|
<uni-popup-dialog ref="inputClose" mode="base" title="起订说明" :showConfirm="true"
|
||||||
:beforeClose="dialogBeforeClose2" @confirm="dialogInputConfirm2"
|
: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>
|
</uni-popup>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
@@ -549,38 +549,85 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
onShareAppMessage: function(res) {
|
onShareAppMessage: function(res) {
|
||||||
console.log("res", res)
|
// console.log("res", res)
|
||||||
console.log("data", res.target.dataset)
|
// console.log("data", res.target.dataset)
|
||||||
var data = res.target.dataset.info
|
// 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({
|
let shareData = JSON.stringify({
|
||||||
// params: {
|
// params: {
|
||||||
// code: data.code,
|
// code: resp.transferCode,
|
||||||
// codeKey: data.codeKey,
|
// codeKey: resp.sid
|
||||||
// customerSid: ''
|
|
||||||
// },
|
// },
|
||||||
// functionName: 'bindCard',
|
// functionName: 'bindCard',
|
||||||
// url: '/pages/detail/detail_affeection?sid=' + data.sid
|
// url: '/pages/bind/bind_cloudCard?code=' + resp
|
||||||
|
// .transferCode + "&codeKey=" + resp.sid
|
||||||
|
|
||||||
url: '/pages/home/cloudCard2?shareSid=' + getApp().globalData.sid,
|
url: '/pages/home/myCellar?shareSid=' + getApp().globalData.sid+"&orderSid=" + resp.sid,
|
||||||
functionName: 'share'
|
functionName: 'share'
|
||||||
})
|
})
|
||||||
// 转码传输
|
// 转码传输
|
||||||
let value = encodeURIComponent(shareData)
|
let value = encodeURIComponent(shareData)
|
||||||
|
|
||||||
return {
|
resolve({
|
||||||
title: '汇融惠享-云菜窖',
|
title: '汇融惠享-云菜窖',
|
||||||
// ②
|
// ②
|
||||||
path: '/pages/login/login?data=' + value,
|
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_invite.png', //自定义图片路径,显示图片长宽比是 5:4。
|
||||||
success: function(res) {
|
|
||||||
console.log('aaaa', "分享成功")
|
})
|
||||||
},
|
|
||||||
fail: function(res) {
|
}).catch(e => {
|
||||||
// 转发失败
|
_this.shortToast('发生错误,请稍后再试.')
|
||||||
console.log('aaaa', "用户点击了取消")
|
return
|
||||||
}
|
})
|
||||||
}
|
|
||||||
|
}, 0)
|
||||||
|
})
|
||||||
|
|
||||||
|
return promise
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -131,12 +131,12 @@
|
|||||||
@click="transfer()">转赠亲友</text>
|
@click="transfer()">转赠亲友</text>
|
||||||
|
|
||||||
<view style="border: 1px #FF5006 solid;margin-left: 5px;margin-right: 5px;padding: 0px 10px;height: 42px;flex: 1;
|
<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"
|
<!-- image src="../../static/shoppCart_icon.png" mode="aspectFill"
|
||||||
style="height: 20px;width: 25px;"></image> -->
|
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: 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>
|
</view>
|
||||||
<text style="background: #FF9900; color: #fff;font-size: 13px; padding: 0px 15px;height: 40px;line-height: 40px;
|
<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;"
|
border: 1px #FF5006 solid; border-top-right-radius: 25px; border-bottom-right-radius: 25px;flex-shrink: 0;"
|
||||||
@@ -395,6 +395,8 @@
|
|||||||
|
|
||||||
},
|
},
|
||||||
newporGiftSid: "",
|
newporGiftSid: "",
|
||||||
|
orderSid: "",
|
||||||
|
shareSid: ""
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -418,7 +420,9 @@
|
|||||||
onLoad(options) {
|
onLoad(options) {
|
||||||
|
|
||||||
this.shareSid = options.shareSid
|
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();
|
let info = uni.getSystemInfoSync();
|
||||||
|
|
||||||
@@ -434,8 +438,17 @@
|
|||||||
},
|
},
|
||||||
shareGift() {
|
shareGift() {
|
||||||
// 邀请新人 助力礼包 isNewUser==1 可以助力
|
// 邀请新人 助力礼包 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 => {})
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -234,39 +234,103 @@
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
onShareAppMessage: function(res) {
|
onShareAppMessage: function(res) {
|
||||||
console.log("res", res)
|
// console.log("res", res)
|
||||||
console.log("data", res.target.dataset)
|
// console.log("data", res.target.dataset)
|
||||||
var data = res.target.dataset.info
|
// 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({
|
let shareData = JSON.stringify({
|
||||||
// params: {
|
// params: {
|
||||||
// code: data.code,
|
// code: resp.transferCode,
|
||||||
// codeKey: data.codeKey,
|
// codeKey: resp.sid
|
||||||
// customerSid: ''
|
|
||||||
// },
|
// },
|
||||||
// functionName: 'bindCard',
|
// functionName: 'bindCard',
|
||||||
// url: '/pages/detail/detail_affeection?sid=' + data.sid
|
// url: '/pages/bind/bind_cloudCard?code=' + resp
|
||||||
|
// .transferCode + "&codeKey=" + resp.sid
|
||||||
|
|
||||||
url: '/pages/home/cloudCard2?shareSid=' + getApp().globalData.sid,
|
url: '/pages/home/myCellar?shareSid=' + getApp().globalData.sid+"&orderSid=" + resp.sid,
|
||||||
functionName: 'share'
|
functionName: 'share'
|
||||||
})
|
})
|
||||||
// 转码传输
|
// 转码传输
|
||||||
let value = encodeURIComponent(shareData)
|
let value = encodeURIComponent(shareData)
|
||||||
|
|
||||||
return {
|
resolve({
|
||||||
title: '汇融惠享-云菜窖',
|
title: '汇融惠享-云菜窖',
|
||||||
// ②
|
// ②
|
||||||
path: '/pages/login/login?data=' + value,
|
path: '/pages/login/login?data=' + value,
|
||||||
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_invite.png', //自定义图片路径,显示图片长宽比是 5:4。
|
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_invite.png', //自定义图片路径,显示图片长宽比是 5:4。
|
||||||
success: function(res) {
|
|
||||||
console.log('aaaa', "分享成功")
|
})
|
||||||
|
|
||||||
|
}).catch(e => {
|
||||||
|
_this.shortToast('发生错误,请稍后再试.')
|
||||||
|
return
|
||||||
|
})
|
||||||
|
|
||||||
|
}, 0)
|
||||||
|
})
|
||||||
|
|
||||||
|
return promise
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
fail: function(res) {
|
shareCard() {
|
||||||
// 转发失败
|
let _this = this
|
||||||
console.log('aaaa', "用户点击了取消")
|
|
||||||
}
|
var params ={
|
||||||
|
customerSid:getApp().globalData.sid
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_this.$api.recommendNewUsers(params).then((resp) => {
|
||||||
|
|
||||||
|
|
||||||
|
}).catch(e => {})
|
||||||
},
|
},
|
||||||
|
|
||||||
itemClick(type) {
|
itemClick(type) {
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
|
|||||||
Reference in New Issue
Block a user