From 160c1b9b4d63635d56c2198bda758b3f02529986 Mon Sep 17 00:00:00 2001
From: myTest383
Date: Fri, 14 Feb 2025 17:44:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A2=84=E8=AE=A2=E5=95=86?=
=?UTF-8?q?=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/config.js | 4 +-
common/request.api.js | 3 +
custom-tab-bar/index.wxss | 72 ++++----
pages/SelectAddressActivity.vue | 10 +-
pages/bind/bind_cloudCard.vue | 2 +-
pages/bind/bind_enterpriseCard.vue | 2 +-
pages/bind/bind_enterpriseCard2.vue | 2 +-
pages/bind/bind_giftCard.vue | 2 +-
pages/bind/bind_giftCard2.vue | 2 +-
pages/bind/bind_personCard.vue | 2 +-
pages/bind/bind_personCard2.vue | 2 +-
pages/bind/bind_pickUpCard.vue | 2 +-
pages/bind/bind_pickUpCard2.vue | 2 +-
pages/card/card-2023-12-13.vue | 12 +-
pages/card/card_detail.vue | 16 +-
pages/card/card_detail2.vue | 16 +-
pages/cloud/detail_cloudCard.vue | 2 +-
pages/cloud/optionalCard.vue | 2 +-
pages/detail/detail_affeection.vue | 16 +-
pages/detail/detail_affeection2.vue | 16 +-
pages/detail/detail_enterprise.vue | 16 +-
pages/detail/detail_enterprise2.vue | 16 +-
pages/detail/detail_family.vue | 16 +-
pages/detail/detail_family2.vue | 16 +-
pages/enterprise/corporate_card_detail.vue | 14 +-
pages/enterprise/corporate_card_detail2.vue | 14 +-
pages/enterprise/welfare_card_detail.vue | 14 +-
pages/enterprise/welfare_card_detail2.vue | 14 +-
pages/good/reservation.vue | 1 +
pages/good/shoppCart.vue | 2 +-
pages/home/cloudCard.vue | 8 +-
pages/home/cloudCard2.vue | 20 +--
pages/home/corporateCard.vue | 14 +-
pages/home/giftCard.vue | 14 +-
pages/home/myCellar.vue | 8 +-
pages/home/myHome.vue | 36 +++-
pages/home/personCard.vue | 14 +-
pages/home/pickUpCard.vue | 30 ++--
pages/home/recordList.vue | 24 +--
pages/home/recordList2.vue | 24 +--
pages/me/makeInvoice.vue | 2 +-
pages/records/recommendRecords.vue | 2 +-
pages/records/reservationRecords3.vue | 186 +++++++++++++++-----
pages/records/reservationRecords4.vue | 4 +-
pages/records/transferRecords.vue | 2 +-
pages/records/transferRecords2.vue | 2 +-
46 files changed, 411 insertions(+), 289 deletions(-)
diff --git a/common/config.js b/common/config.js
index 9ede646..e7931dc 100644
--- a/common/config.js
+++ b/common/config.js
@@ -7,10 +7,10 @@
*/
module.exports = {
// baseUrl: 'http://uv32vz.natappfree.cc', // 本地
- baseUrl: 'http://192.168.0.105:8116/mall', // 本地
+ // baseUrl: 'http://192.168.0.105:8116/mall', // 本地
// baseUrl: 'https://39.104.100.138/lpkapi', // 测试服务器
// baseUrl: 'https://lpk.yyundong.com/mallapi', // 测试服务器
- // baseUrl: 'https://ordermall.yxtsoft.com/lpkapi/mall', // 正式服务器
+ baseUrl: 'https://ordermall.yxtsoft.com/lpkapi/mall', // 正式服务器
// tokenName: "Authorization", // 请求头中token的名字,与服务器端对应
loginTimeoutCode: "5001", // 登录超时或失效的情况下,服务器端返回的错误码
loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下,跳转到的登录页面
diff --git a/common/request.api.js b/common/request.api.js
index ed36831..93ffc21 100644
--- a/common/request.api.js
+++ b/common/request.api.js
@@ -76,6 +76,9 @@ export default {
orderListByUserSid: (params = {}) => request.post("/lpksreservoorder/orderListByUserSid", params, {}, {}),
// 取消预约记录
cancelReservation: (params = {}) => request.get("/lpksreservoorders/cancelReservation/" + params, params, {}, {}),
+ // 取消预约记录 提交申请和理由
+ subCancelReservation: (params = {}) => request.post("/lpksreservoorders/subCancelReservation", params),
+
// 转赠记录
transferRecordsList: (params = {}) => request.post("/transferrecords/transferRecordsList", params, {}, {}),
diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss
index 7cb7fac..7d9fea7 100644
--- a/custom-tab-bar/index.wxss
+++ b/custom-tab-bar/index.wxss
@@ -1,46 +1,46 @@
.tab-bar {
- pointer-events: auto;
- position: absolute;
- bottom: 0;
- left: 0;
- right: 0;
- height: 50px;
- /* background: #F69448; */
- display: flex;
- padding-top: 5px;
- padding-bottom: 5px;
- /* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/bom_navigation.png);
- /* 让背景图基于容器大小伸缩 */
- background-size: 100% 100%;
- /* padding-bottom: env(safe-area-inset-bottom); */
+ pointer-events: auto;
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ height: 50px;
+ /* background: #F69448; */
+ display: flex;
+ padding-top: 5px;
+ padding-bottom: 5px;
+ /* 加载背景图 */
+ background-image: url(https://ordermall.yxtsoft.com/image/bom_navigation.png);
+ /* 让背景图基于容器大小伸缩 */
+ background-size: 100% 100%;
+ /* padding-bottom: env(safe-area-inset-bottom); */
}
-
+
.tab-bar-border {
- background-color: rgba(246, 148, 72, 0.3);
- position: absolute;
- left: 0;
- top: 0;
- width: 100%;
- height: 1px;
- transform: scaleY(0.5);
+ background-color: rgba(246, 148, 72, 0.3);
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 1px;
+ transform: scaleY(0.5);
}
-
+
.tab-bar-item {
- flex: 1;
- text-align: center;
- display: flex;
- justify-content: center;
- align-items: center;
- flex-direction: column;
+ flex: 1;
+ text-align: center;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-direction: column;
}
-
+
.tab-bar-item cover-image {
- width: 27px;
- height: 27px;
+ width: 27px;
+ height: 27px;
}
-
+
.tab-bar-item cover-view {
- margin-top: 3px;
- font-size: 10px;
+ margin-top: 3px;
+ font-size: 10px;
}
\ No newline at end of file
diff --git a/pages/SelectAddressActivity.vue b/pages/SelectAddressActivity.vue
index a27c878..7fd7f2a 100644
--- a/pages/SelectAddressActivity.vue
+++ b/pages/SelectAddressActivity.vue
@@ -80,16 +80,16 @@
{{item.name}}
-
+
营业时间:{{item.businessHours}}
-
+
门店地址:{{item.address}}
-
@@ -97,14 +97,14 @@
padding-left: 30px;padding-right:30px;">
-
电话咨询
-
+
预约自提
diff --git a/pages/bind/bind_cloudCard.vue b/pages/bind/bind_cloudCard.vue
index d8b075d..9df5470 100644
--- a/pages/bind/bind_cloudCard.vue
+++ b/pages/bind/bind_cloudCard.vue
@@ -6,7 +6,7 @@
:end-change-height="page.endHeight">
-
diff --git a/pages/bind/bind_enterpriseCard.vue b/pages/bind/bind_enterpriseCard.vue
index b400e2e..e8236bb 100644
--- a/pages/bind/bind_enterpriseCard.vue
+++ b/pages/bind/bind_enterpriseCard.vue
@@ -6,7 +6,7 @@
:end-change-height="page.endHeight">
-
diff --git a/pages/bind/bind_enterpriseCard2.vue b/pages/bind/bind_enterpriseCard2.vue
index 86071e1..55acaab 100644
--- a/pages/bind/bind_enterpriseCard2.vue
+++ b/pages/bind/bind_enterpriseCard2.vue
@@ -9,7 +9,7 @@
:end-change-height="page.endHeight">
-
diff --git a/pages/bind/bind_giftCard.vue b/pages/bind/bind_giftCard.vue
index ebde0c4..4f89e59 100644
--- a/pages/bind/bind_giftCard.vue
+++ b/pages/bind/bind_giftCard.vue
@@ -6,7 +6,7 @@
:end-change-height="page.endHeight">
-
diff --git a/pages/bind/bind_giftCard2.vue b/pages/bind/bind_giftCard2.vue
index 39c6345..da45639 100644
--- a/pages/bind/bind_giftCard2.vue
+++ b/pages/bind/bind_giftCard2.vue
@@ -9,7 +9,7 @@
:end-change-height="page.endHeight">
-
diff --git a/pages/bind/bind_personCard.vue b/pages/bind/bind_personCard.vue
index b83c26b..561fc17 100644
--- a/pages/bind/bind_personCard.vue
+++ b/pages/bind/bind_personCard.vue
@@ -6,7 +6,7 @@
:end-change-height="page.endHeight">
-
diff --git a/pages/bind/bind_personCard2.vue b/pages/bind/bind_personCard2.vue
index 3a17208..e79df62 100644
--- a/pages/bind/bind_personCard2.vue
+++ b/pages/bind/bind_personCard2.vue
@@ -9,7 +9,7 @@
:end-change-height="page.endHeight">
-
diff --git a/pages/bind/bind_pickUpCard.vue b/pages/bind/bind_pickUpCard.vue
index c578d25..b4bdea0 100644
--- a/pages/bind/bind_pickUpCard.vue
+++ b/pages/bind/bind_pickUpCard.vue
@@ -6,7 +6,7 @@
:end-change-height="page.endHeight">
-
diff --git a/pages/bind/bind_pickUpCard2.vue b/pages/bind/bind_pickUpCard2.vue
index 574a230..716c476 100644
--- a/pages/bind/bind_pickUpCard2.vue
+++ b/pages/bind/bind_pickUpCard2.vue
@@ -9,7 +9,7 @@
:end-change-height="page.endHeight">
-
diff --git a/pages/card/card-2023-12-13.vue b/pages/card/card-2023-12-13.vue
index a425f7a..44047b6 100644
--- a/pages/card/card-2023-12-13.vue
+++ b/pages/card/card-2023-12-13.vue
@@ -8,7 +8,7 @@
-
+
绑定新卡
@@ -33,10 +33,10 @@
-
-
@@ -177,7 +177,7 @@
/* height: 126.66vw; */
height: 85vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/hmoe_bj.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/hmoe_bj.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
@@ -196,7 +196,7 @@
.item {
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/card_item.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/card_item.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
width: calc(100% - 18px);
@@ -204,7 +204,7 @@
.item2 {
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/card_item2.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/card_item2.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
width: calc(100% - 18px);
diff --git a/pages/card/card_detail.vue b/pages/card/card_detail.vue
index df820ed..bbb8429 100644
--- a/pages/card/card_detail.vue
+++ b/pages/card/card_detail.vue
@@ -24,7 +24,7 @@
style="display: flex;flex-direction: row;justify-content: center;
background-color: #fff;height: 25vw; border-top-left-radius: 25px;border-top-right-radius: 25px;margin-top: -9.06vw;">
-
-
提货时间:{{item.reserveDate}}
-
提货地点:{{item.store}}
-
提 货 人:{{item.userName}}
-
联系电话:{{item.userPhone}}
@@ -134,7 +134,7 @@
border-bottom: 1px #F1F2F3 solid; padding-left: 10px; padding-right: 10px; padding-bottom: 10px;">
-
@@ -532,7 +532,7 @@
return {
title: '汇融农链-云菜窖',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
- imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareGift.png', //自定义图片路径,显示图片长宽比是 5:4。
+ imageUrl: 'https://ordermall.yxtsoft.com/image/shareGift.png', //自定义图片路径,显示图片长宽比是 5:4。
success: function(res) {
console.log('aaaa', "分享成功")
},
@@ -608,7 +608,7 @@
/* height: 126.66vw; */
height: 65vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/detail_bj1.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/detail_bj1.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/card/card_detail2.vue b/pages/card/card_detail2.vue
index b7cfbb2..c5dc507 100644
--- a/pages/card/card_detail2.vue
+++ b/pages/card/card_detail2.vue
@@ -24,7 +24,7 @@
style="display: flex;flex-direction: row;justify-content: center;
background-color: #fff;height: 25vw; border-top-left-radius: 25px;border-top-right-radius: 25px;margin-top: -9.06vw;">
-
-
提货时间:{{item.reserveDate}}
-
提货地点:{{item.store}}
-
提 货 人:{{item.userName}}
-
联系电话:{{item.userPhone}}
@@ -133,7 +133,7 @@
border-bottom: 1px #F1F2F3 solid;padding-left: 10px; padding-right: 10px; padding-bottom: 10px;">
-
@@ -246,7 +246,7 @@
return {
title: '汇融农链-云菜窖',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
- imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareGift.png', //自定义图片路径,显示图片长宽比是 5:4。
+ imageUrl: 'https://ordermall.yxtsoft.com/image/shareGift.png', //自定义图片路径,显示图片长宽比是 5:4。
success: function(res) {
console.log('aaaa', "分享成功")
},
@@ -323,7 +323,7 @@
/* height: 126.66vw; */
height: 65vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/detail_bj4.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/detail_bj4.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/cloud/detail_cloudCard.vue b/pages/cloud/detail_cloudCard.vue
index 0b179d8..6be4d9d 100644
--- a/pages/cloud/detail_cloudCard.vue
+++ b/pages/cloud/detail_cloudCard.vue
@@ -277,7 +277,7 @@
/* height: 126.66vw; */
height: 95vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/home_bj1.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/home_bj1.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/cloud/optionalCard.vue b/pages/cloud/optionalCard.vue
index c7e7e9f..496e09c 100644
--- a/pages/cloud/optionalCard.vue
+++ b/pages/cloud/optionalCard.vue
@@ -298,7 +298,7 @@
/* height: 126.66vw; */
height: 95vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/home_bj1.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/home_bj1.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/detail/detail_affeection.vue b/pages/detail/detail_affeection.vue
index 8548bc9..b6358a3 100644
--- a/pages/detail/detail_affeection.vue
+++ b/pages/detail/detail_affeection.vue
@@ -25,7 +25,7 @@
background-color: #fff;height: 25vw; border-top-left-radius: 25px;border-top-right-radius: 25px;margin-top: -9.06vw;">
-
-
提货时间:{{item.reserveDate}}
-
提货地点:{{item.store}}
-
提 货 人:{{item.userName}}
-
联系电话:{{item.userPhone}}
@@ -148,7 +148,7 @@
border-bottom: 1px #F1F2F3 solid; width: 100%;padding-left: 10px; padding-right: 10px; padding-bottom: 10px;">
-
@@ -613,7 +613,7 @@
title: '汇融农链ss-云菜窖',
// ②
path: '/pages/login/login?data=' + value,
- imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', //自定义图片路径,显示图片长宽比是 5:4。
+ imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', //自定义图片路径,显示图片长宽比是 5:4。
success: function(res) {
console.log('aaaa', "分享成功")
},
@@ -689,7 +689,7 @@
/* height: 126.66vw; */
height: 65vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/detail_bj1.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/detail_bj1.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/detail/detail_affeection2.vue b/pages/detail/detail_affeection2.vue
index afd39bd..214d1dd 100644
--- a/pages/detail/detail_affeection2.vue
+++ b/pages/detail/detail_affeection2.vue
@@ -25,7 +25,7 @@
background-color: #fff;height: 25vw; border-top-left-radius: 25px;border-top-right-radius: 25px;margin-top: -9.06vw;">
-
-
提货时间:{{item.reserveDate}}
-
提货地点:{{item.store}}
-
提 货 人:{{item.userName}}
-
联系电话:{{item.userPhone}}
@@ -143,7 +143,7 @@
border-bottom: 1px #F1F2F3 solid; width: 100%;padding-left: 10px; padding-right: 10px; padding-bottom: 10px;">
-
@@ -279,7 +279,7 @@
title: '汇融农链-云菜窖',
// ②
path: '/pages/login/login?data=' + value,
- imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', //自定义图片路径,显示图片长宽比是 5:4。
+ imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', //自定义图片路径,显示图片长宽比是 5:4。
success: function(res) {
console.log('aaaa', "分享成功")
},
@@ -356,7 +356,7 @@
/* height: 126.66vw; */
height: 65vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/detail_bj4.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/detail_bj4.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/detail/detail_enterprise.vue b/pages/detail/detail_enterprise.vue
index 8a5a722..3424b89 100644
--- a/pages/detail/detail_enterprise.vue
+++ b/pages/detail/detail_enterprise.vue
@@ -25,7 +25,7 @@
background-color: #fff;height: 25vw; border-top-left-radius: 25px;border-top-right-radius: 25px;margin-top: -9.06vw;">
-
-
提货时间:{{item.reserveDate}}
-
提货地点:{{item.store}}
-
提 货 人:{{item.userName}}
-
联系电话:{{item.userPhone}}
@@ -146,7 +146,7 @@
border-bottom: 1px #F1F2F3 solid; width: 100%;padding-left: 10px; padding-right: 10px; padding-bottom: 10px;">
-
@@ -623,7 +623,7 @@
title: '汇融农链-云菜窖',
// ②
path: '/pages/login/login?data=' + value,
- imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', //自定义图片路径,显示图片长宽比是 5:4。
+ imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', //自定义图片路径,显示图片长宽比是 5:4。
success: function(res) {
console.log('aaaa', "分享成功")
},
@@ -707,7 +707,7 @@
/* height: 126.66vw; */
height: 65vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/detail_bj1.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/detail_bj1.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/detail/detail_enterprise2.vue b/pages/detail/detail_enterprise2.vue
index fa0a9b7..728cfa8 100644
--- a/pages/detail/detail_enterprise2.vue
+++ b/pages/detail/detail_enterprise2.vue
@@ -25,7 +25,7 @@
background-color: #fff;height: 25vw; border-top-left-radius: 25px;border-top-right-radius: 25px;margin-top: -9.06vw;">
-
-
提货时间:{{item.reserveDate}}
-
提货地点:{{item.store}}
-
提 货 人:{{item.userName}}
-
联系电话:{{item.userPhone}}
@@ -141,7 +141,7 @@
border-bottom: 1px #F1F2F3 solid; width: 100%;padding-left: 10px; padding-right: 10px; padding-bottom: 10px;">
-
@@ -275,7 +275,7 @@
title: '汇融农链-云菜窖',
// ②
path: '/pages/login/login?data=' + value,
- imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', //自定义图片路径,显示图片长宽比是 5:4。
+ imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', //自定义图片路径,显示图片长宽比是 5:4。
success: function(res) {
console.log('aaaa', "分享成功")
},
@@ -348,7 +348,7 @@
/* height: 126.66vw; */
height: 65vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/detail_bj4.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/detail_bj4.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/detail/detail_family.vue b/pages/detail/detail_family.vue
index b594026..b65037e 100644
--- a/pages/detail/detail_family.vue
+++ b/pages/detail/detail_family.vue
@@ -24,7 +24,7 @@
style="display: flex;flex-direction: row;justify-content: center;
background-color: #fff;height: 25vw; border-top-left-radius: 25px;border-top-right-radius: 25px;margin-top: -9.06vw;">
-
-
提货时间:{{item.reserveDate}}
-
提货地点:{{item.store}}
-
提 货 人:{{item.userName}}
-
联系电话:{{item.userPhone}}
@@ -146,7 +146,7 @@
border-bottom: 1px #F1F2F3 solid; width: 100%;padding-left: 10px; padding-right: 10px; padding-bottom: 10px;">
-
@@ -616,7 +616,7 @@
title: '汇融农链-云菜窖',
// ②
path: '/pages/login/login?data=' + value,
- imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', //自定义图片路径,显示图片长宽比是 5:4。
+ imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', //自定义图片路径,显示图片长宽比是 5:4。
success: function(res) {
console.log('aaaa', "分享成功")
},
@@ -692,7 +692,7 @@
/* height: 126.66vw; */
height: 65vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/detail_bj1.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/detail_bj1.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/detail/detail_family2.vue b/pages/detail/detail_family2.vue
index 455e907..29c414b 100644
--- a/pages/detail/detail_family2.vue
+++ b/pages/detail/detail_family2.vue
@@ -24,7 +24,7 @@
style="display: flex;flex-direction: row;justify-content: center;
background-color: #fff;height: 25vw; border-top-left-radius: 25px;border-top-right-radius: 25px;margin-top: -9.06vw;">
-
-
提货时间:{{item.reserveDate}}
-
提货地点:{{item.store}}
-
提 货 人:{{item.userName}}
-
联系电话:{{item.userPhone}}
@@ -143,7 +143,7 @@
border-bottom: 1px #F1F2F3 solid; width: 100%;padding-left: 10px; padding-right: 10px; padding-bottom: 10px;">
-
@@ -279,7 +279,7 @@
title: '汇融农链-云菜窖',
// ②
path: '/pages/login/login?data=' + value,
- imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareAffeection.png', //自定义图片路径,显示图片长宽比是 5:4。
+ imageUrl: 'https://ordermall.yxtsoft.com/image/shareAffeection.png', //自定义图片路径,显示图片长宽比是 5:4。
success: function(res) {
console.log('aaaa', "分享成功")
},
@@ -356,7 +356,7 @@
/* height: 126.66vw; */
height: 65vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/detail_bj4.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/detail_bj4.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/enterprise/corporate_card_detail.vue b/pages/enterprise/corporate_card_detail.vue
index b771fce..e620730 100644
--- a/pages/enterprise/corporate_card_detail.vue
+++ b/pages/enterprise/corporate_card_detail.vue
@@ -71,27 +71,27 @@
-
提货时间:{{item.reserveDate}}
-
提货地点:{{item.store}}
-
提 货 人:{{item.userName}}
-
联系电话:{{item.userPhone}}
@@ -124,7 +124,7 @@
border-bottom: 1px #F1F2F3 solid; width: 100%;padding-left: 10px; padding-right: 10px; padding-bottom: 10px;">
-
@@ -547,7 +547,7 @@
return {
title: '汇融农链-云菜窖',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
- imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share.png', //自定义图片路径,显示图片长宽比是 5:4。
+ imageUrl: 'https://ordermall.yxtsoft.com/image/share.png', //自定义图片路径,显示图片长宽比是 5:4。
success: function(res) {
console.log('aaaa', "分享成功")
},
@@ -631,7 +631,7 @@
/* height: 126.66vw; */
height: 65vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/detail_bj3.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/detail_bj3.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/enterprise/corporate_card_detail2.vue b/pages/enterprise/corporate_card_detail2.vue
index 8a86e61..7bd3def 100644
--- a/pages/enterprise/corporate_card_detail2.vue
+++ b/pages/enterprise/corporate_card_detail2.vue
@@ -71,27 +71,27 @@
-
提货时间:{{item.reserveDate}}
-
提货地点:{{item.store}}
-
提 货 人:{{item.userName}}
-
联系电话:{{item.userPhone}}
@@ -124,7 +124,7 @@
border-bottom: 1px #F1F2F3 solid; width: 100%;padding-left: 10px; padding-right: 10px; padding-bottom: 10px;">
-
@@ -233,7 +233,7 @@
return {
title: '汇融农链-云菜窖',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
- imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share.png', //自定义图片路径,显示图片长宽比是 5:4。
+ imageUrl: 'https://ordermall.yxtsoft.com/image/share.png', //自定义图片路径,显示图片长宽比是 5:4。
success: function(res) {
console.log('aaaa', "分享成功")
},
@@ -306,7 +306,7 @@
/* height: 126.66vw; */
height: 65vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/detail_bj6.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/detail_bj6.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/enterprise/welfare_card_detail.vue b/pages/enterprise/welfare_card_detail.vue
index 6cdd289..cb3333f 100644
--- a/pages/enterprise/welfare_card_detail.vue
+++ b/pages/enterprise/welfare_card_detail.vue
@@ -71,27 +71,27 @@
-
提货时间:{{item.reserveDate}}
-
提货地点:{{item.store}}
-
提 货 人:{{item.userName}}
-
联系电话:{{item.userPhone}}
@@ -122,7 +122,7 @@
border-bottom: 1px #F1F2F3 solid;padding-left: 10px; padding-right: 10px; padding-bottom: 10px;">
-
@@ -515,7 +515,7 @@
return {
title: '汇融农链-云菜窖',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
- imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareGift.png', //自定义图片路径,显示图片长宽比是 5:4。
+ imageUrl: 'https://ordermall.yxtsoft.com/image/shareGift.png', //自定义图片路径,显示图片长宽比是 5:4。
success: function(res) {
console.log('aaaa', "分享成功")
},
@@ -591,7 +591,7 @@
/* height: 126.66vw; */
height: 65vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/detail_bj2.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/detail_bj2.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/enterprise/welfare_card_detail2.vue b/pages/enterprise/welfare_card_detail2.vue
index cd45d09..7986f8c 100644
--- a/pages/enterprise/welfare_card_detail2.vue
+++ b/pages/enterprise/welfare_card_detail2.vue
@@ -72,27 +72,27 @@
-
提货时间:{{item.reserveDate}}
-
提货地点:{{item.store}}
-
提 货 人:{{item.userName}}
-
联系电话:{{item.userPhone}}
@@ -123,7 +123,7 @@
border-bottom: 1px #F1F2F3 solid;padding-left: 10px; padding-right: 10px; padding-bottom: 10px;">
-
@@ -235,7 +235,7 @@
return {
title: '汇融农链-云菜窖',
path: '/pages/bind/bind_giftCard?code=' + data.code + '&codeKey=' + data.codeKey,
- imageUrl: 'https://supervise.yxtsoft.com/lpk/image/shareGift.png', //自定义图片路径,显示图片长宽比是 5:4。
+ imageUrl: 'https://ordermall.yxtsoft.com/image/shareGift.png', //自定义图片路径,显示图片长宽比是 5:4。
success: function(res) {
console.log('aaaa', "分享成功")
},
@@ -312,7 +312,7 @@
/* height: 126.66vw; */
height: 65vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/detail_bj5.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/detail_bj5.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/good/reservation.vue b/pages/good/reservation.vue
index 1879ba4..ad20e64 100644
--- a/pages/good/reservation.vue
+++ b/pages/good/reservation.vue
@@ -372,6 +372,7 @@
var params = {
customerSid: getApp().globalData.sid,
+ orgPath: getApp().globalData.orgPath,
affiliation: _this.affiliation,
reserveDate: _this.info.reserveDate,
storeSid: _this.info.storeSid,
diff --git a/pages/good/shoppCart.vue b/pages/good/shoppCart.vue
index 2e1a934..9321df8 100644
--- a/pages/good/shoppCart.vue
+++ b/pages/good/shoppCart.vue
@@ -61,7 +61,7 @@
-
购菜车是空的
diff --git a/pages/home/cloudCard.vue b/pages/home/cloudCard.vue
index e4264dd..05e27a7 100644
--- a/pages/home/cloudCard.vue
+++ b/pages/home/cloudCard.vue
@@ -221,7 +221,7 @@
/* height: 126.66vw; */
height: 75vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/clound_bj1.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/clound_bj1.png);
/* background-image: url(../../static/clound_bj1.png); */
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
@@ -252,14 +252,14 @@
justify-content: center;
align-items: center;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/bindBtn_bj1.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/bindBtn_bj1.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
.item {
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/carPerson.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/carPerson.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
width: calc(100% - 18px);
@@ -267,7 +267,7 @@
.item2 {
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/caradLose.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/caradLose.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
width: calc(100% - 18px);
diff --git a/pages/home/cloudCard2.vue b/pages/home/cloudCard2.vue
index 42cf6c7..d22b169 100644
--- a/pages/home/cloudCard2.vue
+++ b/pages/home/cloudCard2.vue
@@ -63,7 +63,7 @@
style="display: flex;flex-direction: column; justify-content: center;align-items: center;margin-right: 10px; flex: 1;"
@click.stop="brandClick(index2)">
-
@@ -137,8 +137,8 @@
-
+
商品还在补充中~
@@ -284,10 +284,10 @@
-
-
-
@@ -1110,7 +1110,7 @@
// title: '汇融农链-云菜窖',
// // ②
// path: '/pages/login/login?data=' + value,
- // imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_invite.png', //自定义图片路径,显示图片长宽比是 5:4。
+ // imageUrl: 'https://ordermall.yxtsoft.com/image/share_invite.png', //自定义图片路径,显示图片长宽比是 5:4。
// success: function(res) {
// console.log('aaaa', "分享成功")
// },
@@ -1152,7 +1152,7 @@
title: '汇融农链-云菜窖',
// ②
path: '/pages/login/login?data=' + value,
- imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_invite.png', //自定义图片路径,显示图片长宽比是 5:4。
+ imageUrl: 'https://ordermall.yxtsoft.com/image/share_invite.png', //自定义图片路径,显示图片长宽比是 5:4。
})
@@ -1302,7 +1302,7 @@
.newpor_bom {
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/newpor_bom.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/newpor_bom.png);
/* background-image: url(../../static/clound_bj1.png); */
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
@@ -1315,7 +1315,7 @@
/* height: 126.66vw; */
height: 50vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/banner.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/banner.png);
/* background-image: url(../../static/clound_bj1.png); */
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
diff --git a/pages/home/corporateCard.vue b/pages/home/corporateCard.vue
index b31959d..a866b1d 100644
--- a/pages/home/corporateCard.vue
+++ b/pages/home/corporateCard.vue
@@ -7,7 +7,7 @@
-
+
绑定企业卡
@@ -31,10 +31,10 @@
-
-
@@ -169,7 +169,7 @@
/* height: 126.66vw; */
height: 85vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/home_bj3.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/home_bj3.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
@@ -186,14 +186,14 @@
align-items: center;
height: 13vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/bindBtn_bj3.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/bindBtn_bj3.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
.item {
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/cardEnterprise.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/cardEnterprise.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
width: calc(100% - 18px);
@@ -201,7 +201,7 @@
.item2 {
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/caradLose.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/caradLose.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
width: calc(100% - 18px);
diff --git a/pages/home/giftCard.vue b/pages/home/giftCard.vue
index 41ceb3f..e607672 100644
--- a/pages/home/giftCard.vue
+++ b/pages/home/giftCard.vue
@@ -8,7 +8,7 @@
-
+
绑定福礼卡
@@ -34,10 +34,10 @@
-
-
@@ -174,7 +174,7 @@
/* height: 126.66vw; */
height: 85vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/home_bj2.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/home_bj2.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
@@ -191,14 +191,14 @@
justify-content: center;
align-items: center;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/bindBtn_bj2.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/bindBtn_bj2.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
.item {
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/cardGift.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/cardGift.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
width: calc(100% - 18px);
@@ -206,7 +206,7 @@
.item2 {
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/caradLose.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/caradLose.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
width: calc(100% - 18px);
diff --git a/pages/home/myCellar.vue b/pages/home/myCellar.vue
index 96d942d..02f65ff 100644
--- a/pages/home/myCellar.vue
+++ b/pages/home/myCellar.vue
@@ -146,7 +146,7 @@
-
您的订单为空,请
@@ -271,7 +271,7 @@
-
预约记录
-
-
+
+
- 待提取
+ 预约单
+
+
+
-
+
+
@@ -371,7 +382,7 @@
// title: '汇融农链-云菜窖',
// // ②
// path: '/pages/login/login?data=' + value,
- // imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_invite.png', //自定义图片路径,显示图片长宽比是 5:4。
+ // imageUrl: 'https://ordermall.yxtsoft.com/image/share_invite.png', //自定义图片路径,显示图片长宽比是 5:4。
// success: function(res) {
// console.log('aaaa', "分享成功")
// },
@@ -414,7 +425,7 @@
title: '汇融农链-云菜窖',
// ②
path: '/pages/login/login?data=' + value,
- imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_invite.png', //自定义图片路径,显示图片长宽比是 5:4。
+ imageUrl: 'https://ordermall.yxtsoft.com/image/share_invite.png', //自定义图片路径,显示图片长宽比是 5:4。
})
@@ -446,6 +457,15 @@
itemClick(type) {
switch (type) {
+ case "预约单":
+ // uni.navigateTo({
+ // url: '/pages/records/reservationRecords',
+ // })
+
+ uni.navigateTo({
+ url: '/pages/records/reservationRecords3',
+ })
+ break;
case "待提菜":
// uni.navigateTo({
// url: '/pages/records/reservationRecords',
@@ -518,7 +538,7 @@
/* height: 126.66vw; */
height: 65vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/my_bj.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/my_bj.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
diff --git a/pages/home/personCard.vue b/pages/home/personCard.vue
index 8b115c4..8b6e3d9 100644
--- a/pages/home/personCard.vue
+++ b/pages/home/personCard.vue
@@ -8,7 +8,7 @@
-
+
绑定个人卡
@@ -32,10 +32,10 @@
-
-
@@ -174,7 +174,7 @@
/* height: 126.66vw; */
height: 85vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/home_bj1.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/home_bj1.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
@@ -191,14 +191,14 @@
justify-content: center;
align-items: center;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/bindBtn_bj1.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/bindBtn_bj1.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
.item {
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/carPerson.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/carPerson.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
width: calc(100% - 18px);
@@ -206,7 +206,7 @@
.item2 {
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/caradLose.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/caradLose.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
width: calc(100% - 18px);
diff --git a/pages/home/pickUpCard.vue b/pages/home/pickUpCard.vue
index 97ddb2c..2dffa36 100644
--- a/pages/home/pickUpCard.vue
+++ b/pages/home/pickUpCard.vue
@@ -8,14 +8,14 @@
-
@@ -42,10 +42,10 @@
-
-
@@ -116,11 +116,11 @@
-
-
@@ -193,11 +193,11 @@
-
-
@@ -414,7 +414,7 @@
/* height: 126.66vw; */
height: 85vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/home_bj1.png);
+ background-image: url(https://ordermall.yxtsoft.com/image/home_bj1.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
@@ -431,7 +431,7 @@
justify-content: center;
align-items: center;
/* 加载背景图 */
- /* background-image: url(https://supervise.yxtsoft.com/lpk/image/bindBtn_bj1.png); */
+ /* background-image: url(https://ordermall.yxtsoft.com/image/bindBtn_bj1.png); */
/* 让背景图基于容器大小伸缩 */
/* background-size: 100% 100%; */
}
@@ -446,7 +446,7 @@
.item2 {
/* 加载背景图 */
- /* background-image: url(https://supervise.yxtsoft.com/lpk/image/home_itemBj_lose.png); */
+ /* background-image: url(https://ordermall.yxtsoft.com/image/home_itemBj_lose.png); */
/* 让背景图基于容器大小伸缩 */
/* background-size: 100% 100%; */
/* width: calc(100% - 5px); */
@@ -460,7 +460,7 @@
.item3 {
/* 加载背景图 */
- /* background-image: url(https://supervise.yxtsoft.com/lpk/image/home_itemBj_affection.png); */
+ /* background-image: url(https://ordermall.yxtsoft.com/image/home_itemBj_affection.png); */
/* 让背景图基于容器大小伸缩 */
/* background-size: 100% 100%; */
/* width: calc(100% - 5px); */
@@ -473,7 +473,7 @@
.item4 {
/* 加载背景图 */
- /* background-image: url(https://supervise.yxtsoft.com/lpk/image/home_itemBj_lose.png); */
+ /* background-image: url(https://ordermall.yxtsoft.com/image/home_itemBj_lose.png); */
/* 让背景图基于容器大小伸缩 */
/* background-size: 100% 100%; */
/* width: calc(100% - 5px); */
@@ -488,7 +488,7 @@
.item5 {
/* 加载背景图 */
- /* background-image: url(https://supervise.yxtsoft.com/lpk/image/home_itemBj_enterprise.png); */
+ /* background-image: url(https://ordermall.yxtsoft.com/image/home_itemBj_enterprise.png); */
/* 让背景图基于容器大小伸缩 */
/* background-size: 100% 100%; */
/* width: calc(100% - 5px); */
@@ -502,7 +502,7 @@
.item6 {
/* 加载背景图 */
- /* background-image: url(https://supervise.yxtsoft.com/lpk/image/home_itemBj_lose.png); */
+ /* background-image: url(https://ordermall.yxtsoft.com/image/home_itemBj_lose.png); */
/* 让背景图基于容器大小伸缩 */
/* background-size: 100% 100%; */
/* width: calc(100% - 5px); */
diff --git a/pages/home/recordList.vue b/pages/home/recordList.vue
index 768b121..dfd1177 100644
--- a/pages/home/recordList.vue
+++ b/pages/home/recordList.vue
@@ -10,10 +10,10 @@
style="display: flex;flex-direction: row;padding: 25px 15px; ">
-
-
@@ -67,10 +67,10 @@
-
-
@@ -121,10 +121,10 @@
-
-
@@ -226,42 +226,42 @@