diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue index 4fa2e4d..52307f3 100644 --- a/components/productWindow/index.vue +++ b/components/productWindow/index.vue @@ -59,7 +59,7 @@ - - + + diff --git a/config/app.js b/config/app.js index 3c22e78..c4a7778 100644 --- a/config/app.js +++ b/config/app.js @@ -22,8 +22,8 @@ if (process.env.NODE_ENV === "development") { // httpApiThree = 'baseUrlTest' // h5跨域配置 // #endif } else if (process.env.NODE_ENV === 'production') { - // httpApi = 'https://shop.lihaink.cn' // 生产 - httpApi = "https://crmeb-test.shop.lihaink.cn" + httpApi = 'https://shop.lihaink.cn' // 生产 + // httpApi = "https://crmeb-test.shop.lihaink.cn" httpApiTwo = 'https://nk.lihaink.cn' // 生产 httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产 } diff --git a/manifest.json b/manifest.json index 28a6c13..786a1a7 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "CRMEB", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.0.6", - "versionCode" : 129, + "versionName" : "1.0.9", + "versionCode" : 132, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index ee1a357..e65379f 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -1430,19 +1430,7 @@ }, SubOrder: function(e) { console.log(this.active); - if (this.active == 0) { - uni.requestPayment({ - "provider": "wxpay", //固定值为"wxpay" - "orderInfo": '1231032132', - success: function(res) { - // var rawdata = JSON.parse(res.rawdata); - console.log(res); - }, - fail: function(err) { - console.log(err); - } - }); - } + let that = this, data = {}; if (!that.payType) return that.$util.Tips({