diff --git a/common/config.js b/common/config.js
index f1c858a..151b882 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,7 +1,6 @@
-// export const dev_host = 'https://app.wanjiashangchao.com'; // 开发环境域名
-export const dev_host = 'https://ltstore.stnav.com'; // 开发环境域名
-export const mock_host = 'https://ltstore.stnav.com'; // MOCK环境域名
-// export const mock_host = 'http://mock.zhongbenruanjian.com'; // MOCK环境域名
+export const dev_host = 'https://app.wanjiashangchao.com'; //线上环境域名
+// export const dev_host = 'https://ltstore.stnav.com'; // 开发环境域名
+export const mock_host = 'http://mock.zhongbenruanjian.com'; // MOCK环境域名
export const product_host = 'http://zbphp.zhongbenzx.com'; // 生产环境域名
export const WEBSOCKET = 'wss://zbphp.zhongbenzx.com/socket/';
export const PAAS_URL = 'https://yufabu.saizhuge.net'; // paas域名
diff --git a/manifest.json b/manifest.json
index d2df731..a0fc2cf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "萬家商超",
"appid" : "__UNI__21B1139",
"description" : "萬家商超",
- "versionName" : "1.1.4",
- "versionCode" : 114,
+ "versionName" : "1.1.7",
+ "versionCode" : 117,
"transformPx" : false,
"app-plus" : {
"usingComponents" : true,
diff --git a/pages/dpxq/immediatePayment/immediatePayment copy.vue b/pages/dpxq/immediatePayment/immediatePayment copy.vue
new file mode 100644
index 0000000..22b307c
--- /dev/null
+++ b/pages/dpxq/immediatePayment/immediatePayment copy.vue
@@ -0,0 +1,846 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 支付
+
+
+
+
+
+
+
+
+
+
+ ¥
+
+ {{pay_moeny}}
+ {{Number(pay_moeny)-Number(deduct_money) > 0 ? (Number(pay_moeny)-Number(deduct_money)).toFixed(2) : 0}}
+
+
+
+ {{oldMoney}}
+ {{Number(oldMoney)-Number(deduct_money) > 0 ? (Number(oldMoney)-Number(deduct_money)).toFixed(2) : 0}}
+
+
+
+ 支付剩余时间:
+
+
+ {{h}}
+
+ :
+
+ {{i}}
+
+ :
+
+ {{s}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 使用抵用券抵扣(当前可用抵用券:{{user_score}})
+ 抵扣{{deduct_money}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择支付方式
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确认离开收银台?
+ 您的订单还未完成支付,请尽快支付
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/dpxq/immediatePayment/immediatePayment.vue b/pages/dpxq/immediatePayment/immediatePayment.vue
index 379bb2e..40d7d0e 100644
--- a/pages/dpxq/immediatePayment/immediatePayment.vue
+++ b/pages/dpxq/immediatePayment/immediatePayment.vue
@@ -361,6 +361,7 @@
title: '正在支付',
mask: true
})
+
let paytype = that.select_id == '1' ? 3 : 2
let url = that.select_id == '1' ? global.apiUrls.wxPay : global.apiUrls.aliPay;
let params = {
@@ -382,6 +383,7 @@
res = res.data
if (res.code == 1) {
console.log('支付', res);
+
if (that.select_id == 2) {
// uni.requestPayment({
// provider: 'alipay',
@@ -422,7 +424,7 @@
console.log(err)
});
// clearInterval(this.payTimer)
- }, 3000)
+ }, 5000)
} else {
// console.log(JSON.stringify(res.data.result));
// #ifdef APP-PLUS
diff --git a/pages/dpxq/storeDetails/storeDetails.vue b/pages/dpxq/storeDetails/storeDetails.vue
index d42dc6d..45dfef7 100644
--- a/pages/dpxq/storeDetails/storeDetails.vue
+++ b/pages/dpxq/storeDetails/storeDetails.vue
@@ -1,432 +1,473 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
- {{info.store_name}}
-
-
- 积分
- {{info.score_rate}}
- %
-
-
-
-
-
-
-
-
-
- {{info.store_type}}
+
+
+
+
+
+
+ {{ info.store_name }}
+
+
+ 积分
+ {{ info.score_rate }}
+ %
+
-
-
- {{info.score}}
-
-
- 关注
- {{info.collect_num}}
-
-
- 营业:
- {{info.open_time}}
-
-
-
-
- 公告:公告:
- {{info.notice}}{{info.notice}}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{
+ info.store_type }}
+
+
+
+
+ {{ info.score }}
+
+
+ 关注
+ {{ info.collect_num }}
+
+
+ 营业:
+ {{ info.open_time }}
+
+
+
+
+ 公告:公告:
+ {{ info.notice }}{{ info.notice }}
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
- 商品
+ 商品
-
-
+
+
- 评价
+ 评价
- {{info.comment_num > 999 ? '999+' : info.comment_num }}
+ {{ info.comment_num > 999 ?
+ '999+' : info.comment_num }}
-
-
+
+
- 商家
+ 商家
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 商家评分
- {{info.score}}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 商家评分
+ {{ info.score }}
+
-
+
-
- 服务态度
- {{info.service_score}}
-
+
+ 服务态度
+ {{ info.service_score
+ }}
+
-
+
-
- 菜品口味
- {{info.goods_score}}
-
-
+
+ 菜品口味
+ {{ info.goods_score
+ }}
+
+
-
-
-
-
- {{item.name}}
- {{item.num > 999 ? '999+' : item.num}}
-
-
- {{item.name}}
- {{item.num > 999 ? '999+' : item.num}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.user_nickname}}
-
-
-
-
-
-
-
-
-
- {{item.create_time}}
-
-
-
- {{item.content}}
-
-
-
-
-
-
-
-
-
-
- 商家简介
- {{info.synopsis || '暂无简介'}}
-
+
+
+
+
+ {{ item.name }}
+ {{ item.num > 999
+ ? '999+' : item.num }}
+
+
+ {{ item.name }}
+ {{ item.num > 999
+ ? '999+' : item.num }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ item.user_nickname }}
+
+
+
+
+
+
+
+
+
+ {{ item.create_time
+ }}
+
+
+
+ {{ item.content }}
+
+
+
+
+
+
+
+
+
+
+ 商家简介
+ {{ info.synopsis || '暂无简介'
+ }}
+
-
- 营业时间
- {{info.open_time}}
-
+
+ 营业时间
+ {{ info.open_time }}
+
-
-
- 商家电话
-
-
- {{info.service_phone}}
-
-
-
-
+
+
+ 商家电话
+
+
+ {{ info.service_phone
+ }}
+
+
+
+
-
- 商家地址
- {{info.address_province + info.address_city + info.address_district + info.address_address}}
-
+
+ 商家地址
+ {{ info.address_province +
+ info.address_city +
+ info.address_district + info.address_address }}
+
-
- 商家资质
-
-
-
+
+ 商家资质
+
+
+
-
- 商家图片
-
-
-
+
+ 商家图片
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
- {{ item.name }}
- {{ item.num }}
-
-
-
-
-
-
-
-
+
+
+
+ {{ item.name }}
+ {{ item.num }}
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- {{ ele.name }}
- {{ ele.goods_name}}
-
-
-
-
- ¥{{ele.shop_price}}
- ¥{{ele.market_price}}
-
- 选规格
+
+
+
+
+
+
+ {{ ele.name }}
+ {{ ele.goods_name }}
+
+
+
+
+
+ ¥{{ ele.shop_price }}
+ ¥{{ ele.market_price }}
+
+ 选规格
+
-
-
- {{ele.num}}
-
-
- {{ele.num}}
-
-
-
+
+
+
+ {{ ele.num }}
+
+
+ {{ ele.num }}
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- 分享到
-
-
-
-
-
-
-
-
-
- 微信好友
-
-
+
+
+
+
+
+ 分享到
+
+
+
+
+
+
+
+
+
+ 微信好友
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
- {{selectGoodsItem.name}}
-
-
-
- {{specItem.name}}
-
-
-
- {{item.item}}
-
-
+
+
+
+
+
+
+ {{ selectGoodsItem.name }}
+
+
+
+ {{ specItem.name }}
+
+
+
+ {{ item.item }}
+
+
-
-
-
-
-
-
-
- 已选择规格:
- {{selectSku.key_name}}
-
-
-
-
- 售价
- ¥
-
- {{ selectSku.shop_price | frontPrice }}
- {{ selectSku.shop_price | laterPrice }}
-
- ¥
- {{selectSku.market_price}}
-
-
-
-
-
- {{isCartHasSelectSku(selectSku.sku_id)}}
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
- 购物车
- 打包费
- ¥
- {{packingMoney}}
-
-
- 清空购物车
-
-
+
+ 已选择规格:
+ {{ selectSku.key_name }}
+
+
+
+
+ 售价
+ ¥
+
+ {{ selectSku.shop_price |
+ frontPrice
+ }}
+ {{ selectSku.shop_price |
+ laterPrice
+ }}
+
+ ¥
+ {{
+ selectSku.market_price }}
+
-
-
-
-
-
-
-
- {{item.name}}
-
-
- {{item.attr_name}}
-
-
-
- ¥
- {{item.shop_price}}
- ¥
- {{item.market_price}}
-
-
-
- {{item.num}}
-
-
+
+
+
+
+
+
+
+ 购物车
+ 打包费
+ ¥
+ {{ packingMoney }}
+
+
+ 清空购物车
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ {{ item.attr_name }}
+
+
+
+ ¥
+ {{ item.shop_price }}
+ ¥
+ {{ item.market_price }}
+
+
+
+
+ {{ item.num }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- ¥
- {{cartMoney}}
-
-
-
- 去结算
-
-
-
-
-
-
-
-
-
-
-
-
- ¥
- {{cartMoney}}
-
-
-
- ¥
- {{cartMoney}}
+
+
+
-
-
-
-
- ¥
- {{info.start_price}}
- 起送
-
-
-
-
-
-
-
-
-
-
-
- ¥
- {{cartMoney}}
-
-
- ¥
- {{marketMoney}}
-
-
-
- 去结算
-
-
-
+
+
+
+
+
+
+
+
+
+ ¥
+ {{ cartMoney }}
+
+
+
+ 去结算
+
+
+
-
-
+
+
+
+
+
+
+
+
+ ¥
+ {{ cartMoney }}
+
+
+
+ ¥
+ {{ cartMoney }}
+
+
+
+
+
+ ¥
+ {{ info.start_price }}
+ 起送
+
+
+
+
+
+
+
+
+
+
+
+ ¥
+ {{ cartMoney }}
+
+
+ ¥
+ {{ marketMoney }}
+
+
+
+ 去结算
+
+
+
+
+
+
-
+
diff --git a/pages/my/merchantSettlement/merchantSettlement.vue b/pages/my/merchantSettlement/merchantSettlement.vue
index 0320aa6..6ad8f75 100644
--- a/pages/my/merchantSettlement/merchantSettlement.vue
+++ b/pages/my/merchantSettlement/merchantSettlement.vue
@@ -1,157 +1,177 @@
-
-
-
-
-
-
-
- 商家入驻
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 负责人姓名
-
-
-
- 店铺名称
-
-
-
- 店铺LOGO
-
-
-
-
-
-
-
-
- 店铺分类
-
-
-
-
-
-
-
- 店铺类型
-
- {{shopType ? shopType : '请选择'}}
-
-
-
+
+
+
+
+
-
- 抽佣比例
-
-
-
-
-
-
-
- 店铺地址
-
-
-
-
-
-
-
- 详细地址
-
-
+
+ 商家入驻
+
+
+
+
-
-
-
- 身份证
-
-
-
-
-
- 请上传身份证正反面
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+ 负责人姓名
+
+
+
+ 店铺名称
+
+
+
+ 店铺LOGO
+
+
+
+
+
+
+
+
+ 店铺分类
+
+
+
+
+
+
+
+ 店铺类型
+
+ {{
+ shopType ?
+ shopType : '请选择' }}
+
+
+
+
+
+ 抽佣比例
+
+
+
+
+
+
+
+ 信用代码
+
+
+
+ 店铺地址
+
+
+
+
+
+
+
+ 详细地址
+
+
- 身份证正面
-
-
-
-
-
-
-
-
-
+
+
+
+ 身份证
+
+
+
+
+
+ 请上传身份证正反面
+
+
+
- 身份证反面
-
+
+
+
+
+
+ 身份证正面
+
+
+
+
+
+
+
+
+
+
+ 身份证反面
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
- 营业执照
-
-
-
-
+
+
-
-
-
-
- 注:
-
- 为保证平台用户安全性,需要您进行实名认证,实名认证通过之后即可登录并在平台进行营业
-
-
-
-
-
-
-
+
+
+
+
+ 注:
+
+ 为保证平台用户安全性,需要您进行实名认证,实名认证通过之后即可登录并在平台进行营业
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
- 提交即默认同意
- 《商家认证协议》
-
-
+
+
+ 提交即默认同意
+ 《商家认证协议》
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/pages/tabBar/myOrder/myOrder.vue b/pages/tabBar/myOrder/myOrder.vue
index 31d8e1e..6a1fa90 100644
--- a/pages/tabBar/myOrder/myOrder.vue
+++ b/pages/tabBar/myOrder/myOrder.vue
@@ -55,7 +55,7 @@
:class="{ 'checkTitlefd1_0': tabls == '4', 'flex flex-wrap align-center myOrder_titlefd1_0_c7': true }"
@tap="tabClick(4)" :id="`benben_tabsfd1_0-title-item-${'4'}`">
- 待评价
+ 已完成
({{detailsnum.to_be_evaluated}})
@@ -280,7 +280,7 @@
case 6:
return '待到店自提';
case 7:
- return '待评价';
+ return '已评价';
case 8:
return '已完成';
case -1:
diff --git a/pages/tabBar/myPage/myPage.vue b/pages/tabBar/myPage/myPage.vue
index a619174..7b875fa 100644
--- a/pages/tabBar/myPage/myPage.vue
+++ b/pages/tabBar/myPage/myPage.vue
@@ -8,11 +8,11 @@
-
+
-
+
我的
@@ -49,7 +49,7 @@
-
+
-
+
付款码
-
+
@@ -239,27 +240,34 @@
-