Browse Source

加入分享

更改为订单商城
master
Mr-Wong-Git 7 days ago
parent
commit
be03e00481
  1. 4
      common/request.api.js
  2. 2
      pages.json
  3. 4
      pages/bind/bind_enterpriseCard.vue
  4. 2
      pages/bind/bind_enterpriseCard2.vue
  5. 4
      pages/bind/bind_giftCard.vue
  6. 4
      pages/bind/bind_giftCard2.vue
  7. 4
      pages/bind/bind_personCard.vue
  8. 4
      pages/bind/bind_personCard2.vue
  9. 6
      pages/bind/bind_pickUpCard.vue
  10. 6
      pages/bind/bind_pickUpCard2.vue
  11. 2
      pages/card/card_detail.vue
  12. 2
      pages/card/card_detail2.vue
  13. 2
      pages/cloud/detail_cloudCard.vue
  14. 6
      pages/cloud/optionalCard.vue
  15. 2
      pages/detail/detail_affeection.vue
  16. 2
      pages/detail/detail_affeection2.vue
  17. 2
      pages/detail/detail_enterprise.vue
  18. 2
      pages/detail/detail_enterprise2.vue
  19. 2
      pages/detail/detail_family.vue
  20. 2
      pages/detail/detail_family2.vue
  21. 2
      pages/enterprise/corporate_card_detail.vue
  22. 2
      pages/enterprise/corporate_card_detail2.vue
  23. 2
      pages/enterprise/welfare_card_detail.vue
  24. 2
      pages/enterprise/welfare_card_detail2.vue
  25. 843
      pages/good/goodsDetail.vue
  26. 2
      pages/good/goodsDetail2.vue
  27. 2
      pages/good/shoppCart.vue
  28. 6
      pages/good/transfer.vue
  29. 2
      pages/home/cloudCard.vue
  30. 2407
      pages/home/cloudCard2.vue
  31. 10
      pages/home/myCellar.vue
  32. 8
      pages/home/myHome.vue
  33. 2
      pages/records/transferRecords.vue
  34. 2
      pages/records/transferRecords2.vue

4
common/request.api.js

@ -64,9 +64,9 @@ export default {
// 新绑定提货卡 // 新绑定提货卡
pickUpCardBind: (params = {}) => request.post("/lpkgiftcard/bindAllCard", params), pickUpCardBind: (params = {}) => request.post("/lpkgiftcard/bindAllCard", params),
// 云菜窖列表 // 订单商城列表
appletGiftBagList: (params = {}) => request.get("/appletgiftbag/appletGiftBagList", params), appletGiftBagList: (params = {}) => request.get("/appletgiftbag/appletGiftBagList", params),
// 云菜窖列表 // 订单商城列表
getGiftBagBySid: (params = {}) => request.get("/appletgiftbag/getGiftBagBySid/" + params, params), getGiftBagBySid: (params = {}) => request.get("/appletgiftbag/getGiftBagBySid/" + params, params),
// 自选菜窖 商品信息 // 自选菜窖 商品信息
getAllGiftBag: (params = {}) => request.get("/lpkgoods/getAllGiftBag", params), getAllGiftBag: (params = {}) => request.get("/lpkgoods/getAllGiftBag", params),

2
pages.json

@ -434,7 +434,7 @@
], ],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"navigationBarTitleText": "惠享云菜窖", "navigationBarTitleText": "惠享订单商城",
"navigationBarBackgroundColor": "#FE9039", "navigationBarBackgroundColor": "#FE9039",
"backgroundColor": "#FE9039" "backgroundColor": "#FE9039"
}, },

4
pages/bind/bind_enterpriseCard.vue

@ -2,7 +2,7 @@
<view style="display: flex;flex-direction: column;background-color: #fff;"> <view style="display: flex;flex-direction: column;background-color: #fff;">
<view class="top"> <view class="top">
<NavBar ref="nav" navTitle="绑定云菜窖卡" :showIcon="true" :start-change-height="page.startHeight" <NavBar ref="nav" navTitle="绑定订单商城卡" :showIcon="true" :start-change-height="page.startHeight"
:end-change-height="page.endHeight"> :end-change-height="page.endHeight">
</NavBar> </NavBar>
<view> <view>
@ -15,7 +15,7 @@
<!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;"> <!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;">
<view <view
style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;"> style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;">
<view style="margin: 15px;">绑定云菜窖</view> <view style="margin: 15px;">绑定订单商城</view>
<view <view
style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;"> style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;">
<input maxlength="20" placeholder="请输入/扫码 提货编码" <input maxlength="20" placeholder="请输入/扫码 提货编码"

2
pages/bind/bind_enterpriseCard2.vue

@ -18,7 +18,7 @@
<!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;"> <!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;">
<view <view
style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;"> style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;">
<view style="margin: 15px;">绑定云菜窖</view> <view style="margin: 15px;">绑定订单商城</view>
<view <view
style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;"> style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;">
<input maxlength="20" placeholder="请输入/扫码 提货编码" <input maxlength="20" placeholder="请输入/扫码 提货编码"

4
pages/bind/bind_giftCard.vue

@ -2,7 +2,7 @@
<view style="display: flex;flex-direction: column;background-color: #fff;"> <view style="display: flex;flex-direction: column;background-color: #fff;">
<view class="top"> <view class="top">
<NavBar ref="nav" navTitle="绑定云菜窖卡" :showIcon="true" :start-change-height="page.startHeight" <NavBar ref="nav" navTitle="绑定订单商城卡" :showIcon="true" :start-change-height="page.startHeight"
:end-change-height="page.endHeight"> :end-change-height="page.endHeight">
</NavBar> </NavBar>
<view> <view>
@ -15,7 +15,7 @@
<!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;"> <!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;">
<view <view
style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;"> style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;">
<view style="margin: 15px;">绑定云菜窖</view> <view style="margin: 15px;">绑定订单商城</view>
<view <view
style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;"> style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;">
<input maxlength="20" placeholder="请输入/扫码 提货编码" <input maxlength="20" placeholder="请输入/扫码 提货编码"

4
pages/bind/bind_giftCard2.vue

@ -5,7 +5,7 @@
<view style="display: flex;flex-direction: column;background-color: #fff;"> <view style="display: flex;flex-direction: column;background-color: #fff;">
<view class="top"> <view class="top">
<NavBar ref="nav" navTitle="绑定云菜窖卡" :showIcon="true" :start-change-height="page.startHeight" <NavBar ref="nav" navTitle="绑定订单商城卡" :showIcon="true" :start-change-height="page.startHeight"
:end-change-height="page.endHeight"> :end-change-height="page.endHeight">
</NavBar> </NavBar>
<view> <view>
@ -18,7 +18,7 @@
<!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;"> <!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;">
<view <view
style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;"> style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;">
<view style="margin: 15px;">绑定云菜窖</view> <view style="margin: 15px;">绑定订单商城</view>
<view <view
style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;"> style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;">
<input maxlength="20" placeholder="请输入/扫码 提货编码" <input maxlength="20" placeholder="请输入/扫码 提货编码"

4
pages/bind/bind_personCard.vue

@ -2,7 +2,7 @@
<view style="display: flex;flex-direction: column;background-color: #fff;"> <view style="display: flex;flex-direction: column;background-color: #fff;">
<view class="top"> <view class="top">
<NavBar ref="nav" navTitle="绑定云菜窖卡" :showIcon="true" :start-change-height="page.startHeight" <NavBar ref="nav" navTitle="绑定订单商城卡" :showIcon="true" :start-change-height="page.startHeight"
:end-change-height="page.endHeight"> :end-change-height="page.endHeight">
</NavBar> </NavBar>
<view> <view>
@ -15,7 +15,7 @@
<!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;"> <!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;">
<view <view
style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;"> style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;">
<view style="margin: 15px;">绑定云菜窖</view> <view style="margin: 15px;">绑定订单商城</view>
<view <view
style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;"> style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;">
<input maxlength="20" placeholder="请输入/扫码 提货编码" <input maxlength="20" placeholder="请输入/扫码 提货编码"

4
pages/bind/bind_personCard2.vue

@ -5,7 +5,7 @@
<view style="display: flex;flex-direction: column;background-color: #fff;"> <view style="display: flex;flex-direction: column;background-color: #fff;">
<view class="top"> <view class="top">
<NavBar ref="nav" navTitle="绑定云菜窖卡" :showIcon="true" :start-change-height="page.startHeight" <NavBar ref="nav" navTitle="绑定订单商城卡" :showIcon="true" :start-change-height="page.startHeight"
:end-change-height="page.endHeight"> :end-change-height="page.endHeight">
</NavBar> </NavBar>
<view> <view>
@ -18,7 +18,7 @@
<!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;"> <!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;">
<view <view
style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;"> style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;">
<view style="margin: 15px;">绑定云菜窖</view> <view style="margin: 15px;">绑定订单商城</view>
<view <view
style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;"> style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;">
<input maxlength="20" placeholder="请输入/扫码 提货编码" <input maxlength="20" placeholder="请输入/扫码 提货编码"

6
pages/bind/bind_pickUpCard.vue

@ -2,7 +2,7 @@
<view style="display: flex;flex-direction: column;background-color: #fff;"> <view style="display: flex;flex-direction: column;background-color: #fff;">
<view class="top"> <view class="top">
<NavBar ref="nav" navTitle="绑定云菜窖" :showIcon="true" :start-change-height="page.startHeight" <NavBar ref="nav" navTitle="绑定订单商城" :showIcon="true" :start-change-height="page.startHeight"
:end-change-height="page.endHeight"> :end-change-height="page.endHeight">
</NavBar> </NavBar>
<view> <view>
@ -15,7 +15,7 @@
<!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;"> <!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;">
<view <view
style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;"> style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;">
<view style="margin: 15px;">绑定云菜窖</view> <view style="margin: 15px;">绑定订单商城</view>
<view <view
style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;"> style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;">
<input maxlength="20" placeholder="请输入/扫码 提货编码" <input maxlength="20" placeholder="请输入/扫码 提货编码"
@ -42,7 +42,7 @@
<view style="display: flex;flex-direction: row;align-items: center;"> <view style="display: flex;flex-direction: row;align-items: center;">
<view style="background: #FF9D33; border-radius: 50%;width: 12px;height: 12px;"></view> <view style="background: #FF9D33; border-radius: 50%;width: 12px;height: 12px;"></view>
<view style="background: #FFDAB2; border-radius: 50%;width: 12px;height: 12px;"></view> <view style="background: #FFDAB2; border-radius: 50%;width: 12px;height: 12px;"></view>
<text style="margin-left: 8px;font-size: 18px;color: #333;">绑定云菜窖</text> <text style="margin-left: 8px;font-size: 18px;color: #333;">绑定订单商城</text>
</view> </view>
<text style="margin-left: 8px;font-size: 14px;color: #333;margin-top: 20px;">提货编码</text> <text style="margin-left: 8px;font-size: 14px;color: #333;margin-top: 20px;">提货编码</text>

6
pages/bind/bind_pickUpCard2.vue

@ -5,7 +5,7 @@
<view style="display: flex;flex-direction: column;background-color: #fff;"> <view style="display: flex;flex-direction: column;background-color: #fff;">
<view class="top"> <view class="top">
<NavBar ref="nav" navTitle="绑定云菜窖" :showIcon="true" :start-change-height="page.startHeight" <NavBar ref="nav" navTitle="绑定订单商城" :showIcon="true" :start-change-height="page.startHeight"
:end-change-height="page.endHeight"> :end-change-height="page.endHeight">
</NavBar> </NavBar>
<view> <view>
@ -18,7 +18,7 @@
<!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;"> <!-- <view style="display: flex;flex-direction: column;margin-top: -10vw;box-sizing: border-box;">
<view <view
style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;"> style="display: flex;flex-direction: column;border-radius: 20rpx;background: #FFFFFF;z-index: 1;align-items: center;box-sizing: border-box;">
<view style="margin: 15px;">绑定云菜窖</view> <view style="margin: 15px;">绑定订单商城</view>
<view <view
style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;"> style="display: flex;flex-direction: row;justify-content: space-between;box-sizing: border-box;width: calc(100vw - 60px);align-items: center;">
<input maxlength="20" placeholder="请输入/扫码 提货编码" <input maxlength="20" placeholder="请输入/扫码 提货编码"
@ -45,7 +45,7 @@
<view style="display: flex;flex-direction: row;align-items: center;"> <view style="display: flex;flex-direction: row;align-items: center;">
<view style="background: #FF9D33; border-radius: 50%;width: 12px;height: 12px;"></view> <view style="background: #FF9D33; border-radius: 50%;width: 12px;height: 12px;"></view>
<view style="background: #FFDAB2; border-radius: 50%;width: 12px;height: 12px;"></view> <view style="background: #FFDAB2; border-radius: 50%;width: 12px;height: 12px;"></view>
<text style="margin-left: 8px;font-size: 18px;color: #333;">绑定云菜窖</text> <text style="margin-left: 8px;font-size: 18px;color: #333;">绑定订单商城</text>
</view> </view>
<text style="margin-left: 8px;font-size: 14px;color: #333;margin-top: 20px;">提货编码</text> <text style="margin-left: 8px;font-size: 14px;color: #333;margin-top: 20px;">提货编码</text>

2
pages/card/card_detail.vue

@ -530,7 +530,7 @@
var data = res.target.dataset.info var data = res.target.dataset.info
this.shareCard(data.sid) this.shareCard(data.sid)
return { return {
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey, path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
imageUrl: 'https://ordermall.yxtsoft.com/image/shareGift.png', // 5:4 imageUrl: 'https://ordermall.yxtsoft.com/image/shareGift.png', // 5:4
success: function(res) { success: function(res) {

2
pages/card/card_detail2.vue

@ -244,7 +244,7 @@
var data = res.target.dataset.info var data = res.target.dataset.info
this.shareCard(data.sid) this.shareCard(data.sid)
return { return {
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey, path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
imageUrl: 'https://ordermall.yxtsoft.com/image/shareGift.png', // 5:4 imageUrl: 'https://ordermall.yxtsoft.com/image/shareGift.png', // 5:4
success: function(res) { success: function(res) {

2
pages/cloud/detail_cloudCard.vue

@ -195,7 +195,7 @@
if (!Number(this.page.number) > 0) { if (!Number(this.page.number) > 0) {
this.shortToast('请输入要定制几份云菜窖') this.shortToast('请输入要定制几份订单商城')
return return
} }

6
pages/cloud/optionalCard.vue

@ -97,7 +97,7 @@
style="display: flex;flex-direction: row;align-items: center; border-bottom: 1px #F0F0F0 solid;padding-top: 5px; padding-bottom: 5px;padding-left: 20px;"> style="display: flex;flex-direction: row;align-items: center; border-bottom: 1px #F0F0F0 solid;padding-top: 5px; padding-bottom: 5px;padding-left: 20px;">
<view style="color: #888;font-size: 10px;">温馨提示已定制了</view> <view style="color: #888;font-size: 10px;">温馨提示已定制了</view>
<view style="color: #FF5006;font-size: 15px;">{{page.weight}}</view> <view style="color: #FF5006;font-size: 15px;">{{page.weight}}</view>
<view style="color: #888;font-size: 10px;">满200斤可定制云菜窖</view> <view style="color: #888;font-size: 10px;">满200斤可定制订单商城</view>
</view> </view>
<view <view
@ -239,12 +239,12 @@
// //
if (this.page.weight < 200) { if (this.page.weight < 200) {
this.shortToast('满200斤才可定制云菜窖哦,请继续选菜吧。') this.shortToast('满200斤才可定制订单商城哦,请继续选菜吧。')
return return
} }
if (!Number(this.page.number) > 0) { if (!Number(this.page.number) > 0) {
this.shortToast('请输入要定制几份云菜窖') this.shortToast('请输入要定制几份订单商城')
return return
} }

2
pages/detail/detail_affeection.vue

@ -610,7 +610,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
return { return {
title: '汇融农链ss-云菜窖', title: '汇融农链ss-订单商城',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', // 5:4 imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', // 5:4

2
pages/detail/detail_affeection2.vue

@ -276,7 +276,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
return { return {
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', // 5:4 imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', // 5:4

2
pages/detail/detail_enterprise.vue

@ -620,7 +620,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
return { return {
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', // 5:4 imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', // 5:4

2
pages/detail/detail_enterprise2.vue

@ -272,7 +272,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
return { return {
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', // 5:4 imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', // 5:4

2
pages/detail/detail_family.vue

@ -613,7 +613,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
return { return {
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', // 5:4 imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', // 5:4

2
pages/detail/detail_family2.vue

@ -276,7 +276,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
return { return {
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', // 5:4 imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', // 5:4

2
pages/enterprise/corporate_card_detail.vue

@ -545,7 +545,7 @@
var data = res.target.dataset.info var data = res.target.dataset.info
this.shareCard(data.sid) this.shareCard(data.sid)
return { return {
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey, path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
imageUrl: 'https://ordermall.yxtsoft.com/image/share.png', // 5:4 imageUrl: 'https://ordermall.yxtsoft.com/image/share.png', // 5:4
success: function(res) { success: function(res) {

2
pages/enterprise/corporate_card_detail2.vue

@ -231,7 +231,7 @@
var data = res.target.dataset.info var data = res.target.dataset.info
this.shareCard(data.sid) this.shareCard(data.sid)
return { return {
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey, path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
imageUrl: 'https://ordermall.yxtsoft.com/image/share.png', // 5:4 imageUrl: 'https://ordermall.yxtsoft.com/image/share.png', // 5:4
success: function(res) { success: function(res) {

2
pages/enterprise/welfare_card_detail.vue

@ -513,7 +513,7 @@
var data = res.target.dataset.info var data = res.target.dataset.info
this.shareCard(data.sid) this.shareCard(data.sid)
return { return {
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey, path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
imageUrl: 'https://ordermall.yxtsoft.com/image/shareGift.png', // 5:4 imageUrl: 'https://ordermall.yxtsoft.com/image/shareGift.png', // 5:4
success: function(res) { success: function(res) {

2
pages/enterprise/welfare_card_detail2.vue

@ -233,7 +233,7 @@
var data = res.target.dataset.info var data = res.target.dataset.info
this.shareCard(data.sid) this.shareCard(data.sid)
return { return {
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey, path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
imageUrl: 'https://ordermall.yxtsoft.com/image/shareGift.png', // 5:4 imageUrl: 'https://ordermall.yxtsoft.com/image/shareGift.png', // 5:4
success: function(res) { success: function(res) {

843
pages/good/goodsDetail.vue

@ -1,50 +1,50 @@
<template> <template>
<view style="height: 100vh;background: #fff;"> <view style="height: 100vh;background: #fff;">
<loading-state ref="pageView" @request="request"> <loading-state ref="pageView" @request="request">
<view style="height: 85vh;overflow: hidden;overflow-y: auto;"> <view style="height: 85vh;overflow: hidden;overflow-y: auto;">
<image :src="data.picUrl" style="width: 100vw;height: 80vw;"></image> <image :src="data.picUrl" style="width: 100vw;height: 80vw;"></image>
<view style="display: flex;flex-direction: column;background: #fff;padding: 20px 20px 0px 20px;margin-top: 10px; <view style="display: flex;flex-direction: column;background: #fff;padding: 20px 20px 0px 20px;margin-top: 10px;
border-top-left-radius: 20px;border-top-right-radius: 20px;height: 100%;"> border-top-left-radius: 20px;border-top-right-radius: 20px;height: 100%;">
<view style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;"> <view style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
<text <text
style="font-size: 18px;font-weight: 600;font-family: sans-serif;color: #333;">{{data.name}}</text> style="font-size: 18px;font-weight: 600;font-family: sans-serif;color: #333;">{{data.name}}</text>
<text style="font-size: 13px;color: #FF5006;">{{data.mefenPrice}}</text> <text style="font-size: 13px;color: #FF5006;">{{data.mefenPrice}}</text>
</view> </view>
<view style="display: flex;flex-direction: row;justify-content: space-between;margin-top: 10px;"> <view style="display: flex;flex-direction: row;justify-content: space-between;margin-top: 10px;">
<text style="font-size: 13px;color: #666;">&ensp;&ensp;&ensp;&ensp;</text> <text style="font-size: 13px;color: #666;">&ensp;&ensp;&ensp;&ensp;</text>
<text style="font-size: 13px;color: #999;">{{data.weight}}</text> <text style="font-size: 13px;color: #999;">{{data.weight}}</text>
</view> </view>
<view style="display: flex;flex-direction: row;justify-content: space-between;margin-top: 10px;"> <view style="display: flex;flex-direction: row;justify-content: space-between;margin-top: 10px;">
<text style="font-size: 13px;color: #666;">&ensp;&ensp;&ensp;&ensp;</text> <text style="font-size: 13px;color: #666;">&ensp;&ensp;&ensp;&ensp;</text>
<text <text
style="font-size: 13px;color: #999;">{{data.quantityOfPackage}}{{data.unitName}}/{{data.packUnit}}</text> style="font-size: 13px;color: #999;">{{data.quantityOfPackage}}{{data.unitName}}/{{data.packUnit}}</text>
</view> </view>
<view style="display: flex;flex-direction: row;align-items: center;margin-top: 20px;"> <view style="display: flex;flex-direction: row;align-items: center;margin-top: 20px;">
<view style="width: 2px;height: 15px;background: #FF7A11;margin-right: 10px;"></view> <view style="width: 2px;height: 15px;background: #FF7A11;margin-right: 10px;"></view>
<text style="font-size: 14px;font-weight: 600;font-family: sans-serif;color: #333;">商品详情</text> <text style="font-size: 14px;font-weight: 600;font-family: sans-serif;color: #333;">商品详情</text>
</view> </view>
<view style="margin-top: 10px;" v-show="!data.appContent==''"> <view style="margin-top: 10px;" v-show="!data.appContent==''">
<rich-text :nodes="data.appContent | formatRichText"></rich-text> <rich-text :nodes="data.appContent | formatRichText"></rich-text>
</view> </view>
</view> </view>
</view> </view>
</loading-state> </loading-state>
<!-- <view <!-- <view
style="position: absolute; bottom: 0px; display: flex;flex-direction: column;width: 100%; style="position: absolute; bottom: 0px; display: flex;flex-direction: column;width: 100%;
box-sizing: border-box; padding-left: 16px;padding-right: 16px;background: #fff; height: 12vh;border-top: 1px solid #EFEFEF;"> --> box-sizing: border-box; padding-left: 16px;padding-right: 16px;background: #fff; height: 12vh;border-top: 1px solid #EFEFEF;"> -->
<!-- <view <!-- <view
style="display: flex;flex-direction: row;align-items: center; justify-content: center; margin-top:10px;"> style="display: flex;flex-direction: row;align-items: center; justify-content: center; margin-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;">
@ -69,13 +69,13 @@
</view> </view>
</view> --> </view> -->
<!-- <view <!-- <view
style="display: flex;flex-direction: row; justify-content: center;align-items: center;margin-top: 10px;padding: 0px 10px;margin-bottom: 20px;"> style="display: flex;flex-direction: row; justify-content: center;align-items: center;margin-top: 10px;padding: 0px 10px;margin-bottom: 20px;">
<text style="background: #FF9900; color: #fff;font-size: 14px; padding: 0px 15px;height: 50px;line-height:50px;flex: 1;text-align: center; <text style="background: #FF9900; color: #fff;font-size: 14px; padding: 0px 15px;height: 50px;line-height:50px;flex: 1;text-align: center;
border: 1px #FF9900 solid; border-radius: 25px;" @click="showDialog()">加入购物车</text> --> border: 1px #FF9900 solid; border-radius: 25px;" @click="showDialog()">加入购物车</text> -->
<!-- <view style="border: 1px #FF9900 solid;border-top-right-radius: 25px; border-bottom-right-radius: 25px;padding: 0px 5px;height: 50px;line-height:50px;flex: 1; <!-- <view style="border: 1px #FF9900 solid;border-top-right-radius: 25px; border-bottom-right-radius: 25px;padding: 0px 5px;height: 50px;line-height:50px;flex: 1;
display: flex;flex-direction: row;align-items: center;box-sizing: border-box;justify-content: center;" display: flex;flex-direction: row;align-items: center;box-sizing: border-box;justify-content: center;"
@click="gotoCart()"> @click="gotoCart()">
<image src="../../static/shoppCart_icon.png" mode="aspectFill" <image src="../../static/shoppCart_icon.png" mode="aspectFill"
@ -89,76 +89,76 @@
</view> </view>
</view> --> </view> -->
<!-- </view> <!-- </view>
</view> --> </view> -->
<!-- 弹窗蒙版 --> <!-- 弹窗蒙版 -->
<view class="model" catchtouchmove='preventTouchMove' v-if='showModal'></view> <view class="model" catchtouchmove='preventTouchMove' v-if='showModal'></view>
<view class="modalDlg" catchtouchmove='preventTouchMove' v-if='showModal'> <view class="modalDlg" catchtouchmove='preventTouchMove' v-if='showModal'>
<view style="display: flex;flex-direction: row;padding: 16px 20px;margin-top: 10px;"> <view style="display: flex;flex-direction: row;padding: 16px 20px;margin-top: 10px;">
<image :src="data.picUrl" style="width: 90px;height: 90px;border-radius: 10px;" mode="scaleToFill"> <image :src="data.picUrl" style="width: 90px;height: 90px;border-radius: 10px;" mode="scaleToFill">
</image> </image>
<view style="display: flex;flex-direction: column;flex: 1;margin-left: 15px;"> <view style="display: flex;flex-direction: column;flex: 1;margin-left: 15px;">
<view style="display: flex;flex-direction: row;"> <view style="display: flex;flex-direction: row;">
<text style="flex: 1;margin-right: 10px;">{{data.name}}</text> <text style="flex: 1;margin-right: 10px;">{{data.name}}</text>
<image src="../../static/close2.png" style="width: 22px;height: 22px;" @click="colseDialog()"> <image src="../../static/close2.png" style="width: 22px;height: 22px;" @click="colseDialog()">
</image> </image>
</view> </view>
<view style="display: flex;flex-direction: row;margin-top: 8px;"> <view style="display: flex;flex-direction: row;margin-top: 8px;">
<text <text
style="color: #EE752F;border: 1px #EE752F solid; style="color: #EE752F;border: 1px #EE752F solid;
border-radius: 8px;padding: 1px 10px;font-size: 10px;">{{data.weight}}{{data.specificationUnit}}/{{data.unitName}}</text> border-radius: 8px;padding: 1px 10px;font-size: 10px;">{{data.weight}}{{data.specificationUnit}}/{{data.unitName}}</text>
<text style="margin-left: 10px;color: #EE752F;border: 1px #EE752F solid; <text style="margin-left: 10px;color: #EE752F;border: 1px #EE752F solid;
border-radius: 8px;padding: 1px 10px;font-size: 10px;">{{data.remarks}}</text> border-radius: 8px;padding: 1px 10px;font-size: 10px;">{{data.remarks}}</text>
</view> </view>
<!-- <text style="font-size: 12px;color: #E36443;margin-top: 8px;">提货截止日{{data.periodValidity}}</text> --> <!-- <text style="font-size: 12px;color: #E36443;margin-top: 8px;">提货截止日{{data.periodValidity}}</text> -->
<text style="font-size: 12px;color: #E36443;margin-top: 8px;">{{data.price}}</text> <text style="font-size: 12px;color: #E36443;margin-top: 8px;">{{data.price}}</text>
</view> </view>
</view> </view>
<view <view
style="display: flex;flex-direction: row;margin-top:10px;justify-content: space-between;padding: 16px 20px;"> style="display: flex;flex-direction: row;margin-top:10px;justify-content: space-between;padding: 16px 20px;">
<text style="font-size: 16px;font-weight: 600;font-family: sans-serif;">数量</text> <text style="font-size: 16px;font-weight: 600;font-family: sans-serif;">数量</text>
<view style="display: flex;flex-direction: row;align-items: center;"> <view style="display: flex;flex-direction: row;align-items: center;">
<image src="../../static/jian_icon.png" mode="aspectFill" style="width: 25px;height: 25px;" <image src="../../static/jian_icon.png" mode="aspectFill" style="width: 25px;height: 25px;"
@click.stop="jian(data)"> @click.stop="jian(data)">
</image> </image>
<text style="font-size: 16px;padding:5px; margin-left: 8px;margin-right: 8px;" <text style="font-size: 16px;padding:5px; margin-left: 8px;margin-right: 8px;"
@click.stop="numberClick(data)">{{data.goodsNumber}}</text> @click.stop="numberClick(data)">{{data.goodsNumber}}</text>
<image src="../../static/jia_icon.png" mode="aspectFill" style="width: 25px;height: 25px;" <image src="../../static/jia_icon.png" mode="aspectFill" style="width: 25px;height: 25px;"
@click.stop="jia(data)"> @click.stop="jia(data)">
</image> </image>
</view> </view>
</view> </view>
<view style="position: absolute; bottom: 0px; display: flex;flex-direction: column;width: 100%; <view style="position: absolute; bottom: 0px; display: flex;flex-direction: column;width: 100%;
box-sizing: border-box; padding-left: 16px;padding-right: 16px;background: #fff; height: 12vh; box-sizing: border-box; padding-left: 16px;padding-right: 16px;background: #fff; height: 12vh;
border-top: 1px solid #EFEFEF;"> border-top: 1px solid #EFEFEF;">
<!-- <view <!-- <view
style="display: flex;flex-direction: row;align-items: center; justify-content: center; margin-top:10px;"> style="display: flex;flex-direction: row;align-items: center; justify-content: center; margin-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;">
@ -183,384 +183,387 @@
</view> </view>
</view> --> </view> -->
<view <view
style="display: flex;flex-direction: row; justify-content: center;align-items: center;margin-top: 10px;padding: 0px 10px;margin-bottom: 20px;"> style="display: flex;flex-direction: row; justify-content: center;align-items: center;margin-top: 10px;padding: 0px 10px;margin-bottom: 20px;">
<text style="background: #FF9900; color: #fff;font-size: 14px; padding: 0px 15px;height: 50px;line-height:50px;flex: 1;text-align: center; <text style="background: #FF9900; color: #fff;font-size: 14px; padding: 0px 15px;height: 50px;line-height:50px;flex: 1;text-align: center;
border: 1px #FF9900 solid; border-radius: 25px;" @click="upDateShoppCart()">加入购物车</text> border: 1px #FF9900 solid; border-radius: 25px;" @click="upDateShoppCart()">加入购物车</text>
</view> </view>
</view> </view>
</view> </view>
<!-- 输入数量 --> <!-- 输入数量 -->
<view class="model" catchtouchmove='preventTouchMove' v-if='showModal1'></view> <view class="model" catchtouchmove='preventTouchMove' v-if='showModal1'></view>
<view class="modalDlg4" catchtouchmove='preventTouchMove' v-if='showModal1'> <view class="modalDlg4" catchtouchmove='preventTouchMove' v-if='showModal1'>
<view <view
style="display: flex;flex-direction: column;background: #fff; width: 80%; border-radius: 20px;box-sizing: border-box;"> style="display: flex;flex-direction: column;background: #fff; width: 80%; border-radius: 20px;box-sizing: border-box;">
<input type="number" placeholder="请输入数量" v-model="data.goodsNumber" <input type="number" placeholder="请输入数量" v-model="data.goodsNumber"
style="margin: 20px;border: 1px #bbb solid; padding: 5px;line-height: 30px;height: 30px;border-radius: 6px;" /> style="margin: 20px;border: 1px #bbb solid; padding: 5px;line-height: 30px;height: 30px;border-radius: 6px;" />
<view <view
style="flex-shrink: 0;display: flex;flex-direction: row;align-items: center;justify-content: center;"> style="flex-shrink: 0;display: flex;flex-direction: row;align-items: center;justify-content: center;">
<button class="button1" @click="colseDialog1()">取消</button> <button class="button1" @click="colseDialog1()">取消</button>
<button class="button2" @click="saveNum()">确定</button> <button class="button2" @click="saveNum()">确定</button>
</view> </view>
</view> </view>
</view> </view>
<uni-popup ref="inputDialog2" type="dialog"> <uni-popup ref="inputDialog2" type="dialog">
<uni-popup-dialog ref="inputClose" mode="more" title="起订说明" :showConfirm="true" <uni-popup-dialog ref="inputClose" mode="more" title="起订说明" :showConfirm="true"
:beforeClose="dialogBeforeClose2" @confirm="dialogInputConfirm2" :beforeClose="dialogBeforeClose2" @confirm="dialogInputConfirm2"
:content="data.qdxy"></uni-popup-dialog> :content="data.qdxy"></uni-popup-dialog>
</uni-popup> </uni-popup>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
showModal: false, showModal: false,
showModal1: false, showModal1: false,
page: { page: {
sid: '', sid: '',
weight: "", weight: "",
remarks: "", remarks: "",
price: "" price: ""
}, },
data: { data: {
picUrl: '', picUrl: '',
name: '', name: '',
price: '', price: '',
remarks: '', remarks: '',
appContent: "" appContent: ""
}, },
dialogContent: "这里是协议内容,这里是协议内容,这里是协议内容,这里是协议内容,这里是协议内容,这里是协议内容,这里是协议内容,这里是协议内容这里是协议内容,这里是协议内容", dialogContent: "这里是协议内容,这里是协议内容,这里是协议内容,这里是协议内容,这里是协议内容,这里是协议内容,这里是协议内容,这里是协议内容这里是协议内容,这里是协议内容",
confirmText: "我知道了(5s)", confirmText: "我知道了(5s)",
dialogBeforeClose: false, dialogBeforeClose: false,
dialogBeforeClose2: false, dialogBeforeClose2: false,
countdown: 5, countdown: 5,
} }
}, },
onLoad(options) { onLoad(options) {
this.page.sid = options.sid this.page.sid = options.sid
}, },
onShow() { onShow() {
this.request() this.request()
}, },
filters: { filters: {
/** /**
* 处理富文本里的图片宽度自适应 * 处理富文本里的图片宽度自适应
* 1.去掉img标签里的stylewidthheight属性 * 1.去掉img标签里的stylewidthheight属性
* 2.img标签添加style属性max-width:100%;height:auto * 2.img标签添加style属性max-width:100%;height:auto
* 3.修改所有style里的width属性为max-width:100% * 3.修改所有style里的width属性为max-width:100%
* 4.去掉<br/>标签 * 4.去掉<br/>标签
* @param html * @param html
* @returns {void|string|*} * @returns {void|string|*}
*/ */
formatRichText(html) { formatRichText(html) {
// //
if (html) { if (html) {
let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) { let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) {
match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, ''); match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, ''); match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, ''); match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
return match; return match;
}); });
newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) { newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) {
match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi, match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi,
'max-width:100%;'); 'max-width:100%;');
return match; return match;
}); });
newContent = newContent.replace(/<br[^>]*\/>/gi, ''); newContent = newContent.replace(/<br[^>]*\/>/gi, '');
newContent = newContent.replace(/\<img/gi, newContent = newContent.replace(/\<img/gi,
'<img style="max-width:100%;height:auto;display:block;margin:10rpx auto;"'); '<img style="max-width:100%;height:auto;display:block;margin:10rpx auto;"');
return newContent; return newContent;
} else { } else {
return '暂无商品详情'; return '暂无商品详情';
} }
}, },
}, },
methods: { methods: {
showDialog() { showDialog() {
this.showModal = true this.showModal = true
}, },
colseDialog() { colseDialog() {
this.showModal = false this.showModal = false
}, },
colseDialog1() { colseDialog1() {
this.showModal1 = false this.showModal1 = false
}, },
saveNum() { saveNum() {
this.showModal1 = false this.showModal1 = false
}, },
jian(item) { jian(item) {
if (Number(item.goodsNumber) > 0) { if (Number(item.goodsNumber) > 0) {
item.goodsNumber = Number(item.goodsNumber) - 1 item.goodsNumber = Number(item.goodsNumber) - 1
} }
}, },
jia(item) { jia(item) {
item.goodsNumber = Number(item.goodsNumber) + 1 item.goodsNumber = Number(item.goodsNumber) + 1
}, },
numberClick(item) { numberClick(item) {
this.showModal1 = true this.showModal1 = true
}, },
request() { request() {
var params = { var params = {
customerSid: getApp().globalData.sid, customerSid: getApp().globalData.sid,
sid: this.page.sid, sid: this.page.sid,
} }
console.log("request", params); console.log("request", params);
let _this = this let _this = this
_this.$api.goodsDetail(params).then((resp) => { _this.$api.goodsDetail(params).then((resp) => {
// console.log(resp); // console.log(resp);
_this.data = resp _this.data = resp
// _this.getAllPriceOrWeight() // _this.getAllPriceOrWeight()
_this.$nextTick(() => { _this.$nextTick(() => {
_this.$refs.pageView.setLoadState(2) _this.$refs.pageView.setLoadState(2)
}) })
}).catch(e => { }).catch(e => {
_this.$nextTick(() => { _this.$nextTick(() => {
_this.$refs.pageView.setLoadState(1) _this.$refs.pageView.setLoadState(1)
}) })
}) })
}, },
getAllPriceOrWeight() { getAllPriceOrWeight() {
// let _this = this // let _this = this
// var params = { // var params = {
// customerSid: getApp().globalData.sid, // customerSid: getApp().globalData.sid,
// brandId: _this.data.brandId, // brandId: _this.data.brandId,
// } // }
// console.log("getGoodsWeight", params); // console.log("getGoodsWeight", params);
// _this.$api.getGoodsWeight(params).then((resp) => { // _this.$api.getGoodsWeight(params).then((resp) => {
// console.log("getGoodsWeight", resp); // console.log("getGoodsWeight", resp);
// _this.page.price = resp.totalPrice // _this.page.price = resp.totalPrice
// _this.page.weight = resp.totalWeight // _this.page.weight = resp.totalWeight
// _this.page.remarks = resp.remarks // _this.page.remarks = resp.remarks
// _this.$nextTick(() => { // _this.$nextTick(() => {
// _this.$refs.pageView.setLoadState(2) // _this.$refs.pageView.setLoadState(2)
// }) // })
// }).catch(e => { // }).catch(e => {
// _this.$nextTick(() => { // _this.$nextTick(() => {
// _this.$refs.pageView.setLoadState(1) // _this.$refs.pageView.setLoadState(1)
// }) // })
// }) // })
}, },
inCart() { inCart() {
// this.data.goodsNumber = Number(this.data.goodsNumber) + 1 // this.data.goodsNumber = Number(this.data.goodsNumber) + 1
this.upDateShoppCart() this.upDateShoppCart()
}, },
upDateShoppCart() { upDateShoppCart() {
var good = { var good = {
goodsSid: this.data.sid, goodsSid: this.data.sid,
goodsName: this.data.name, goodsName: this.data.name,
goodsNumber: this.data.goodsNumber, goodsNumber: this.data.goodsNumber,
affiliation: this.data.brandId, affiliation: this.data.brandId,
price: this.data.mefenPrice, price: this.data.mefenPrice,
weight: this.data.weight, weight: this.data.weight,
customerSid: getApp().globalData.sid customerSid: getApp().globalData.sid
} }
let _this = this let _this = this
console.log("upDateShoppCart", good); console.log("upDateShoppCart", good);
_this.$api.addShoppingCart(good).then((resp) => { _this.$api.addShoppingCart(good).then((resp) => {
_this.shortToast('已加入购物车。') _this.shortToast('已加入购物车。')
_this.getAllPriceOrWeight() _this.getAllPriceOrWeight()
_this.showModal = false _this.showModal = false
uni.navigateBack() uni.navigateBack()
}).catch(e => { }).catch(e => {
_this.showModal = false _this.showModal = false
}) })
}, },
settlement() { settlement() {
// //
if (this.page.weight < parseInt(this.data.qssl)) { if (this.page.weight < parseInt(this.data.qssl)) {
this.shortToast('满' + this.data.qssl + '斤才可定制云菜窖哦,请继续选菜吧。') this.shortToast('满' + this.data.qssl + '斤才可定制订单商城哦,请继续选菜吧。')
return return
} }
this.showPop()
},
showPop() {
this.$refs.inputDialog.open()
this.showPop() let timeOut = setInterval(() => {
}, if (this.countdown == 1) {
showPop() { this.confirmText = "确定"
this.countdown = 5
this.dialogBeforeClose = false
clearInterval(timeOut)
this.$refs.inputDialog.open() } else {
this.dialogBeforeClose = true
this.countdown = this.countdown - 1;
this.confirmText = "我知道了" + "(" + this.countdown + "s)"
}
}, 1000)
},
saveGoods() {
var params = {
customerSid: getApp().globalData.sid,
// cardNumber: 1,
brandId: this.data.brandId,
totalTee: this.page.price,
let timeOut = setInterval(() => { // ordOrderDetailsVoList: list
}
console.log("params", params);
if (this.countdown == 1) { let _this = this
this.confirmText = "确定" _this.$api.createVegeOrder(params).then((resp) => {
this.countdown = 5
this.dialogBeforeClose = false
clearInterval(timeOut)
} else {
this.dialogBeforeClose = true
this.countdown = this.countdown - 1;
this.confirmText = "我知道了" + "(" + this.countdown + "s)"
}
}, 1000)
},
saveGoods() {
var params = {
customerSid: getApp().globalData.sid,
// cardNumber: 1,
brandId: this.data.brandId,
totalTee: this.page.price,
// ordOrderDetailsVoList: list // console.log("resp", resp);
} this.$pay(resp)
console.log("params", params); }).catch(e => {})
let _this = this
_this.$api.createVegeOrder(params).then((resp) => {
// console.log("resp", resp); },
this.$pay(resp)
}).catch(e => {}) gotoCart() {
uni.navigateTo({
url: 'shoppCart?affiliation=' + this.data.brandId + "&weight=" + this.data.qssl + "&qdxy=" +
this.data.qdxy
})
},
showPop2() {
this.$refs.inputDialog2.open()
},
dialogInputConfirm(val) {
if (this.confirmText == "确定") {
this.confirmText = "我知道了(5s)",
this.dialogBeforeClose = true,
this.countdown = 5
this.saveGoods()
}
},
dialogInputConfirm2(val) {
console.log(">>>>>>>>>>>", this.dialogBeforeClose2);
this.dialogBeforeClose2 = false
},
},
onShareAppMessage() {
}
}, }
gotoCart() {
uni.navigateTo({
url: 'shoppCart?affiliation=' + this.data.brandId + "&weight=" + this.data.qssl + "&qdxy=" +
this.data.qdxy
})
},
showPop2() {
this.$refs.inputDialog2.open()
},
dialogInputConfirm(val) {
if (this.confirmText == "确定") {
this.confirmText = "我知道了(5s)",
this.dialogBeforeClose = true,
this.countdown = 5
this.saveGoods()
}
},
dialogInputConfirm2(val) {
console.log(">>>>>>>>>>>", this.dialogBeforeClose2);
this.dialogBeforeClose2 = false
},
}
}
</script> </script>
<style> <style>
uni-page-body, uni-page-body,
page { page {
background: #f3f4f6; background: #f3f4f6;
} }
/* 弹窗样式 */ /* 弹窗样式 */
.model { .model {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #000; background: #000;
z-index: 1; z-index: 1;
opacity: 0.5; opacity: 0.5;
top: 0; top: 0;
left: 0; left: 0;
} }
.modalDlg { .modalDlg {
/* 设置超出滚动 */ /* 设置超出滚动 */
overflow: auto; overflow: auto;
width: 100%; width: 100%;
position: fixed; position: fixed;
top: 70vw; top: 70vw;
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
z-index: 1; z-index: 1;
background-color: #fff; background-color: #fff;
border-top-right-radius: 20px; border-top-right-radius: 20px;
border-top-left-radius: 20px; border-top-left-radius: 20px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.modalDlg4 { .modalDlg4 {
/* 设置超出滚动 */ /* 设置超出滚动 */
overflow: auto; overflow: auto;
position: fixed; position: fixed;
z-index: 2; z-index: 2;
display: flex; display: flex;
width: 100%; width: 100%;
height: 100%; height: 100%;
top: 0; top: 0;
left: 0; left: 0;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
button::after { button::after {
border: 0; border: 0;
} }
.button1 { .button1 {
background: #fff; background: #fff;
color: #666; color: #666;
flex: 1; flex: 1;
border-radius: 0px; border-radius: 0px;
border-bottom-left-radius: 20px; border-bottom-left-radius: 20px;
border: 1px solid #eee; border: 1px solid #eee;
} }
.button2 { .button2 {
background: #fff; background: #fff;
color: #FF9900; color: #FF9900;
border-radius: 0px; border-radius: 0px;
border-bottom-right-radius: 20px; border-bottom-right-radius: 20px;
flex: 1; flex: 1;
border: 1px solid #eee; border: 1px solid #eee;
} }
</style> </style>

2
pages/good/goodsDetail2.vue

@ -264,7 +264,7 @@
// //
if (this.page.weight < parseInt(this.data.qssl)) { if (this.page.weight < parseInt(this.data.qssl)) {
this.shortToast('满' + this.data.qssl + '斤才可定制云菜窖哦,请继续选菜吧。') this.shortToast('满' + this.data.qssl + '斤才可定制订单商城哦,请继续选菜吧。')
return return
} }

2
pages/good/shoppCart.vue

@ -340,7 +340,7 @@
// //
if (this.page.weight < parseInt(this.page.qssl)) { if (this.page.weight < parseInt(this.page.qssl)) {
this.shortToast('满' + this.page.qssl + '斤才可定制云菜窖哦,请继续选菜吧。') this.shortToast('满' + this.page.qssl + '斤才可定制订单商城哦,请继续选菜吧。')
return return
} }

6
pages/good/transfer.vue

@ -233,7 +233,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
resolve({ resolve({
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_transfer.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_transfer.png', // 5:4
@ -504,7 +504,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
resolve({ resolve({
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_transfer.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_transfer.png', // 5:4
@ -778,7 +778,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
resolve({ resolve({
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_transfer.png', // 5:4 imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_transfer.png', // 5:4

2
pages/home/cloudCard.vue

@ -109,7 +109,7 @@
<view slot="loadingMoreNoMore"> <view slot="loadingMoreNoMore">
<view style="display: flex;flex-direction: column;justify-content: center; align-items: center; margin-top: 20px; border-top: 2px #efefef solid; <view style="display: flex;flex-direction: column;justify-content: center; align-items: center; margin-top: 20px; border-top: 2px #efefef solid;
padding-top: 20px; margin-left:20px;margin-right: 20px;"> padding-top: 20px; margin-left:20px;margin-right: 20px;">
<text style="color: #888888; font-size: 13px;">您也可以自由选菜自建惠享云菜窖</text> <text style="color: #888888; font-size: 13px;">您也可以自由选菜自建惠享订单商城</text>
<text style="color: #fff; font-size: 16px; font-weight: 600; font-family: sans-serif; background: #FCA45C; border-radius: 8px; padding: 10px 15px; margin-top: 15px;;" @click="optionalClick()">补充菜窖</text> <text style="color: #fff; font-size: 16px; font-weight: 600; font-family: sans-serif; background: #FCA45C; border-radius: 8px; padding: 10px 15px; margin-top: 15px;;" @click="optionalClick()">补充菜窖</text>
</view> </view>

2407
pages/home/cloudCard2.vue

File diff suppressed because it is too large

10
pages/home/myCellar.vue

@ -349,12 +349,12 @@
<image src="../../static/logo_icon.png" style="width: 10vw;height: 10vw;" mode="scaleToFill"> <image src="../../static/logo_icon.png" style="width: 10vw;height: 10vw;" mode="scaleToFill">
</image> </image>
<text <text
style="margin-top: 5px;color: #333;font-size: 18px;font-weight: 600;font-family: sans-serif;">云菜窖</text> style="margin-top: 5px;color: #333;font-size: 18px;font-weight: 600;font-family: sans-serif;">订单商城</text>
</view> </view>
<view style="display: flex;margin-top: 10px;margin-left: 20px; margin-right: 20px;"> <view style="display: flex;margin-top: 10px;margin-left: 20px; margin-right: 20px;">
<text style="color: #999;text-indent:2em;">为确保您能正常体验小程序功能云菜窖需要获取您的手机号</text> <text style="color: #999;text-indent:2em;">为确保您能正常体验小程序功能订单商城需要获取您的手机号</text>
</view> </view>
@ -414,9 +414,9 @@
bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll"> bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
<view style="display: flex;flex-direction: column;justify-content: center;align-items: center;"> <view style="display: flex;flex-direction: column;justify-content: center;align-items: center;">
<text style="margin-top: 12px;font-size: 14px;color: #333; ">尊敬的客户 <text style="margin-top: 12px;font-size: 14px;color: #333; ">尊敬的客户
&ensp;&ensp;&ensp;&ensp;冬去春来惠享云菜窖已伴随您走过了120个平凡又温馨的日子首先向您表达诚挚的谢意正是您的支持与陪伴激励着我们不断对产品和程序进行改进升级也最终使得首期活动得以顺利开展圆满闭窖 &ensp;&ensp;&ensp;&ensp;冬去春来惠享订单商城已伴随您走过了120个平凡又温馨的日子首先向您表达诚挚的谢意正是您的支持与陪伴激励着我们不断对产品和程序进行改进升级也最终使得首期活动得以顺利开展圆满闭窖
&ensp;&ensp;&ensp;&ensp;平价优质便捷是我们给您的一贯承诺在活动中我们为您储备了基地直采的优质实惠的蔬菜和水果把绿色新鲜健康送到您的身边我们与您和社区的关系更加紧密也践行了助力乡村振兴的使命和担当 &ensp;&ensp;&ensp;&ensp;平价优质便捷是我们给您的一贯承诺在活动中我们为您储备了基地直采的优质实惠的蔬菜和水果把绿色新鲜健康送到您的身边我们与您和社区的关系更加紧密也践行了助力乡村振兴的使命和担当
&ensp;&ensp;&ensp;&ensp;在磨合中我们也发现菜品品种需要丰富服务水平需要加强配送效率需要提升等不足但是我们坚信拥有热忱便会进步我们会总结经验不断前行在2024年10月份的云菜窖正式开窖时给您更好的体验 &ensp;&ensp;&ensp;&ensp;在磨合中我们也发现菜品品种需要丰富服务水平需要加强配送效率需要提升等不足但是我们坚信拥有热忱便会进步我们会总结经验不断前行在2024年10月份的订单商城正式开窖时给您更好的体验
&ensp;&ensp;&ensp;&ensp;接下来我们即将开启汇融惠农家庭菜园家庭果园等活动期待得到您的持续关注与支持再次向您表达真诚的谢意祝您生活愉快身体健康 &ensp;&ensp;&ensp;&ensp;接下来我们即将开启汇融惠农家庭菜园家庭果园等活动期待得到您的持续关注与支持再次向您表达真诚的谢意祝您生活愉快身体健康
&ensp;&ensp;更多精彩请您扫码关注</text> &ensp;&ensp;更多精彩请您扫码关注</text>
@ -884,7 +884,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
resolve({ resolve({
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://ordermall.yxtsoft.com/image/share_transfer_old.png', // 5:4 imageUrl: 'https://ordermall.yxtsoft.com/image/share_transfer_old.png', // 5:4

8
pages/home/myHome.vue

@ -208,12 +208,12 @@
<image src="../../static/logo_icon.png" style="width: 10vw;height: 10vw;" mode="scaleToFill"> <image src="../../static/logo_icon.png" style="width: 10vw;height: 10vw;" mode="scaleToFill">
</image> </image>
<text <text
style="margin-top: 5px;color: #333;font-size: 18px;font-weight: 600;font-family: sans-serif;">云菜窖</text> style="margin-top: 5px;color: #333;font-size: 18px;font-weight: 600;font-family: sans-serif;">订单商城</text>
</view> </view>
<view style="display: flex;margin-top: 10px;margin-left: 20px; margin-right: 20px;"> <view style="display: flex;margin-top: 10px;margin-left: 20px; margin-right: 20px;">
<text style="color: #999;text-indent:2em;">为确保您能正常体验小程序功能云菜窖需要获取您的手机号</text> <text style="color: #999;text-indent:2em;">为确保您能正常体验小程序功能订单商城需要获取您的手机号</text>
</view> </view>
@ -379,7 +379,7 @@
// let value = encodeURIComponent(shareData) // let value = encodeURIComponent(shareData)
// return { // return {
// title: '-', // title: '-',
// // // //
// path: '/pages/login/login?data=' + value, // path: '/pages/login/login?data=' + value,
// imageUrl: 'https://ordermall.yxtsoft.com/image/share_invite.png', // 5:4 // imageUrl: 'https://ordermall.yxtsoft.com/image/share_invite.png', // 5:4
@ -422,7 +422,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
resolve({ resolve({
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://ordermall.yxtsoft.com/image/share_invite.png', // 5:4 imageUrl: 'https://ordermall.yxtsoft.com/image/share_invite.png', // 5:4

2
pages/records/transferRecords.vue

@ -91,7 +91,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
return { return {
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://ordermall.yxtsoft.com/image/share_transfer.png', // 5:4 imageUrl: 'https://ordermall.yxtsoft.com/image/share_transfer.png', // 5:4

2
pages/records/transferRecords2.vue

@ -90,7 +90,7 @@
let value = encodeURIComponent(shareData) let value = encodeURIComponent(shareData)
return { return {
title: '汇融农链-云菜窖', title: '汇融农链-订单商城',
// //
path: '/pages/login/login?data=' + value, path: '/pages/login/login?data=' + value,
imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', // 5:4 imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', // 5:4

Loading…
Cancel
Save