diff --git a/common/config.js b/common/config.js
index 5ce3327..807c0a0 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:7211', // 本地
+ baseUrl: 'http://192.168.0.105:7211', // 本地
// baseUrl: 'https://39.104.100.138/lpkapi', // 测试服务器
// baseUrl: 'https://lpk.yyundong.com/mallapi', // 测试服务器
- baseUrl: 'https://supervise.yxtsoft.com/lpkapi', // 正式服务器
+ // baseUrl: 'https://ordermall.yxtsoft.com/ycjapi', // 正式服务器
// tokenName: "Authorization", // 请求头中token的名字,与服务器端对应
loginTimeoutCode: "5001", // 登录超时或失效的情况下,服务器端返回的错误码
loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下,跳转到的登录页面
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index 9a55df6..51227fb 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -13,7 +13,7 @@ Component({
// },
{
"pagePath": "/pages/home/cloudCard2",
- "text": "产品分类",
+ "text": "补充菜窖",
"iconPath": "/static/bomicon/bom_notCloudCard.png",
"selectedIconPath": "/static/bomicon/bom_cloudCard.png"
},
@@ -25,7 +25,7 @@ Component({
// },
{
"pagePath": "/pages/home/myCellar",
- "text": "我的订单",
+ "text": "我的菜窖",
"iconPath": "/static/bomicon/bom_notPickUp.png",
"selectedIconPath": "/static/bomicon/bom_pickUp.png"
},
diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss
index 7cb7fac..e274ddd 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/lpkui/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/manifest.json b/manifest.json
index c5bd04f..9b401e4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -50,7 +50,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "wx4724e3a3c27f36b5",
+ "appid" : "wx11565021714ba796",
"setting" : {
"urlCheck" : false,
"postcss" : true,
diff --git a/pages/SelectAddressActivity.vue b/pages/SelectAddressActivity.vue
index aed6dd5..d8f321a 100644
--- a/pages/SelectAddressActivity.vue
+++ b/pages/SelectAddressActivity.vue
@@ -1,32 +1,33 @@
-
-
-
-
-
-
-
- 搜索
-
-
-
+
+
+
+ 搜索
+
+
+
-
+
-
-
-
+
+
-
- {{item.name}}
+ {{item.name}}
-
-
-
- 营业时间:{{item.businessHours}}
-
+
+
+
+ 营业时间:{{item.businessHours}}
+
-
-
-
- 门店地址:{{item.address}}
-
-
-
-
-
-
-
-
- 电话咨询
-
-
-
-
-
- 预约自提
-
-
-
-
+
+
+
+ 电话咨询
+
+
+
+
+
+ 预约自提
+
+
+
+
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/pages/bind/bind_cloudCard.vue b/pages/bind/bind_cloudCard.vue
index 288d14b..9c59657 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..d68d824 100644
--- a/pages/bind/bind_enterpriseCard.vue
+++ b/pages/bind/bind_enterpriseCard.vue
@@ -1,18 +1,18 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
+
-
-
-
- 绑定企业卡
-
+
+
+
+ 绑定企业卡
+
- 提货编码
- 提货编码
+
-
-
-
-
- 提货密码
-
+
+
+
+ 提货密码
+
-
-
+
+
-
- 绑定
-
-
+ 绑定
+
+
\ No newline at end of file
diff --git a/pages/bind/bind_enterpriseCard2.vue b/pages/bind/bind_enterpriseCard2.vue
index 86071e1..187d03f 100644
--- a/pages/bind/bind_enterpriseCard2.vue
+++ b/pages/bind/bind_enterpriseCard2.vue
@@ -1,21 +1,21 @@
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
+
-
-
-
- 绑定企业卡
-
+
+
+
+ 绑定企业卡
+
- 提货编码
- 提货编码
+
-
-
-
-
- 提货密码
-
+
+
+
+ 提货密码
+
-
-
+
+
-
- 绑定
-
-
+ 绑定
+
+
\ No newline at end of file
diff --git a/pages/bind/bind_giftCard2.vue b/pages/bind/bind_giftCard2.vue
index 39c6345..b1f34da 100644
--- a/pages/bind/bind_giftCard2.vue
+++ b/pages/bind/bind_giftCard2.vue
@@ -1,21 +1,21 @@
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
+
-
-
-
- 绑定福礼卡
-
+
+
+
+ 绑定福礼卡
+
- 提货编码
- 提货编码
+
-
-
-
-
- 提货密码
-
+
+
+
+ 提货密码
+
-
-
+
+
-
- 绑定
-
-
+ 绑定
+
+
\ No newline at end of file
diff --git a/pages/bind/bind_personCard2.vue b/pages/bind/bind_personCard2.vue
index 3a17208..f9d2998 100644
--- a/pages/bind/bind_personCard2.vue
+++ b/pages/bind/bind_personCard2.vue
@@ -1,21 +1,21 @@
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
+
-
-
-
- 绑定个人卡
-
+
+
+
+ 绑定个人卡
+
- 提货编码
- 提货编码
+
-
-
-
-
- 提货密码
-
+
+
+
+ 提货密码
+
-
-
+
+
-
- 绑定
-
-
+ 绑定
+
+
\ No newline at end of file
diff --git a/pages/bind/bind_pickUpCard2.vue b/pages/bind/bind_pickUpCard2.vue
index 574a230..a969e78 100644
--- a/pages/bind/bind_pickUpCard2.vue
+++ b/pages/bind/bind_pickUpCard2.vue
@@ -1,21 +1,21 @@
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
+
-
-
-
- 绑定云菜窖
-
+
+
+
+ 绑定云菜窖
+
- 提货编码
- 提货编码
+
-
-
-
-
- 提货密码
-
+
+
+
+ 提货密码
+
-
-
+
+
-
- 接收
-
-
+ 接收
+
+
\ No newline at end of file
diff --git a/pages/card/card_detail.vue b/pages/card/card_detail.vue
index df820ed..b8d182c 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/lpkui/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/lpkui/image/detail_bj1.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/card/card_detail2.vue b/pages/card/card_detail2.vue
index b7cfbb2..3295fc5 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/lpkui/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/lpkui/image/detail_bj4.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/cloud/detail_cloudCard.vue b/pages/cloud/detail_cloudCard.vue
index 0b179d8..cfe6fff 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/lpkui/image/home_bj1.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/cloud/optionalCard.vue b/pages/cloud/optionalCard.vue
index c7e7e9f..f7fcfc9 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/lpkui/image/home_bj1.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/detail/detail_affeection.vue b/pages/detail/detail_affeection.vue
index 8548bc9..f3330bb 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/lpkui/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/lpkui/image/detail_bj1.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/detail/detail_affeection2.vue b/pages/detail/detail_affeection2.vue
index afd39bd..8d70181 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/lpkui/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/lpkui/image/detail_bj4.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/detail/detail_enterprise.vue b/pages/detail/detail_enterprise.vue
index 8a5a722..663dce7 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/lpkui/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/lpkui/image/detail_bj1.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/detail/detail_enterprise2.vue b/pages/detail/detail_enterprise2.vue
index fa0a9b7..aa90a65 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/lpkui/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/lpkui/image/detail_bj4.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/detail/detail_family.vue b/pages/detail/detail_family.vue
index b594026..f67004b 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/lpkui/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/lpkui/image/detail_bj1.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/detail/detail_family2.vue b/pages/detail/detail_family2.vue
index 455e907..6e6c92f 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/lpkui/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/lpkui/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..d81ae99 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/lpkui/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/lpkui/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..3af4e88 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/lpkui/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/lpkui/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..82a79a6 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/lpkui/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/lpkui/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..ccf991c 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/lpkui/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/lpkui/image/detail_bj5.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
}
diff --git a/pages/good/goodsDetail.vue b/pages/good/goodsDetail.vue
index b110a06..c52e258 100644
--- a/pages/good/goodsDetail.vue
+++ b/pages/good/goodsDetail.vue
@@ -14,14 +14,14 @@
- 单 价
+ 规 格
{{data.weight}}{{data.specificationUnit}}/{{data.unitName}}
-
+
diff --git a/pages/good/goodsDetail2.vue b/pages/good/goodsDetail2.vue
index ef66b08..c88c4a9 100644
--- a/pages/good/goodsDetail2.vue
+++ b/pages/good/goodsDetail2.vue
@@ -14,14 +14,14 @@
- 单 价
+ 规 格
{{data.weight}}{{data.specificationUnit}}/{{data.unitName}}
-
+
diff --git a/pages/good/reservation.vue b/pages/good/reservation.vue
index 325ba99..073f67f 100644
--- a/pages/good/reservation.vue
+++ b/pages/good/reservation.vue
@@ -44,7 +44,7 @@
-
+
{{info.businessHours}}
@@ -53,7 +53,7 @@
-
{{info.address}}
diff --git a/pages/good/shoppCart.vue b/pages/good/shoppCart.vue
index 2e1a934..273837d 100644
--- a/pages/good/shoppCart.vue
+++ b/pages/good/shoppCart.vue
@@ -61,7 +61,7 @@
-
购菜车是空的
diff --git a/pages/good/transfer.vue b/pages/good/transfer.vue
index 446a0f4..4b0f3ce 100644
--- a/pages/good/transfer.vue
+++ b/pages/good/transfer.vue
@@ -74,7 +74,7 @@
-
没有商品咯,请添加~
@@ -236,7 +236,7 @@
title: '汇融农链-云菜窖',
// ②
path: '/pages/login/login?data=' + value,
- imageUrl: 'https://supervise.yxtsoft.com/lpk/image/share_transfer.png', //自定义图片路径,显示图片长宽比是 5:4。
+ imageUrl: 'https://ordermall.yxtsoft.com/lpkui/image/share_transfer.png', //自定义图片路径,显示图片长宽比是 5:4。
})
diff --git a/pages/home/cloudCard.vue b/pages/home/cloudCard.vue
index e4264dd..08fb4c8 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/lpkui/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/lpkui/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/lpkui/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/lpkui/image/caradLose.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
width: calc(100% - 18px);
diff --git a/pages/home/cloudCard2.vue b/pages/home/cloudCard2.vue
index c0fe1f0..725f3dc 100644
--- a/pages/home/cloudCard2.vue
+++ b/pages/home/cloudCard2.vue
@@ -10,7 +10,7 @@
-
+
@@ -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)">
-
@@ -99,8 +99,8 @@
style="display: flex;flex-direction: row;align-items: center;margin-top: 8px;">
{{item.weight}}{{item.specificationUnit}}/{{item.unitName}}
- {{item.remarks}}
+
@@ -137,7 +137,7 @@
-
@@ -169,9 +169,9 @@
-
+
-
+
-
+
-
+
@@ -284,10 +284,10 @@
-
-
-
@@ -981,13 +981,13 @@
settlement() {
// 支付
- // if (this.page.weight < parseInt(this.data.brandVos[this.selectIndex2].qssl)) {
- // this.shortToast('满' + this.data.brandVos[this.selectIndex2].qssl + '斤才可定制云菜窖哦,请继续选菜吧。')
- // return
- // }
+ if (this.page.weight < parseInt(this.data.brandVos[this.selectIndex2].qssl)) {
+ this.shortToast('满' + this.data.brandVos[this.selectIndex2].qssl + '斤才可定制云菜窖哦,请继续选菜吧。')
+ return
+ }
- // this.showPop()
- this.saveGoods()
+ this.showPop()
+ // this.saveGoods()
},
showPop() {
@@ -1101,7 +1101,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/lpkui/image/share_invite.png', //自定义图片路径,显示图片长宽比是 5:4。
// success: function(res) {
// console.log('aaaa', "分享成功")
// },
@@ -1143,7 +1143,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/lpkui/image/share_invite.png', //自定义图片路径,显示图片长宽比是 5:4。
})
@@ -1293,7 +1293,7 @@
.newpor_bom {
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/newpor_bom.png);
+ background-image: url(https://ordermall.yxtsoft.com/lpkui/image/newpor_bom.png);
/* background-image: url(../../static/clound_bj1.png); */
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
@@ -1306,7 +1306,7 @@
/* height: 126.66vw; */
height: 50vw;
/* 加载背景图 */
- background-image: url(https://supervise.yxtsoft.com/lpk/image/banner.png);
+ background-image: url(https://ordermall.yxtsoft.com/lpkui/image/banner.png);
/* background-image: url(../../static/clound_bj1.png); */
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
@@ -1321,7 +1321,7 @@
position: relative;
left: 50%;
/* 轮播图总高度 50vw-指示器点的大小12rxp-覆盖的高度15px - 覆盖的到指示器的高度5px */
- top: calc(50vw - 20px - 12rpx);
+ top: calc(45vw - 20px - 12rpx);
}
.swiper /deep/ .wx-swiper-dot {
diff --git a/pages/home/corporateCard.vue b/pages/home/corporateCard.vue
index b31959d..34df8ec 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/lpkui/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/lpkui/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/lpkui/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/lpkui/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..87cb7a5 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/lpkui/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/lpkui/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/lpkui/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/lpkui/image/caradLose.png);
/* 让背景图基于容器大小伸缩 */
background-size: 100% 100%;
width: calc(100% - 18px);
diff --git a/pages/home/myCellar.vue b/pages/home/myCellar.vue
index 152c8ea..e52e724 100644
--- a/pages/home/myCellar.vue
+++ b/pages/home/myCellar.vue
@@ -142,8 +142,8 @@
-
+
您的订单为空,请
-
-
+
绑定个人卡
@@ -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/lpkui/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/lpkui/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/lpkui/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/lpkui/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..7981c3f 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/lpkui/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/lpkui/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/lpkui/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/lpkui/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/lpkui/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/lpkui/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/lpkui/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..1ec62e4 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 @@