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 @@ + + + \ 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 @@ 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 @@