Commit 41705f5d by 程默

fix2

parent ba289fd9
...@@ -6,7 +6,7 @@ module.exports = merge(prodEnv, {//zjgyl ...@@ -6,7 +6,7 @@ module.exports = merge(prodEnv, {//zjgyl
SHOP_MIXID:"'antgood'", SHOP_MIXID:"'antgood'",
NODE_ENV: '"development"', NODE_ENV: '"development"',
// BASE_URL:"'https://shop.mayi888.com'", // BASE_URL:"'https://shop.mayi888.com'",
BASE_URL:"'http://192.168.1.146:30004'", BASE_URL:"'https://test-m-shop.mayi888.cn'",
OLSHOP_URL:'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"', OLSHOP_URL:'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"',
// OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"', // OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
......
...@@ -46,6 +46,8 @@ export default { ...@@ -46,6 +46,8 @@ export default {
onShow() { onShow() {
console.log("onshow", this.openSetting); console.log("onshow", this.openSetting);
if (this.openSetting) { if (this.openSetting) {
this.openSetting = false;
this.init(); this.init();
} }
}, },
...@@ -64,13 +66,12 @@ export default { ...@@ -64,13 +66,12 @@ export default {
fail: function(res) { fail: function(res) {
// chooseAddress:fail auth deny ---用户拒绝后msg // chooseAddress:fail auth deny ---用户拒绝后msg
// chooseAddress:fail cancel ---用户点击取消按钮 // chooseAddress:fail cancel ---用户点击取消按钮
console.log(res,'-------------------65') console.log(res, "-------------------65");
//用户取消 //用户取消
console.log(5); console.log(5);
if(res.errMsg.indexOf("cancel")!=-1){ if (res.errMsg.indexOf("cancel") != -1) {
this.openSetting=false;
wx.navigateBack(); wx.navigateBack();
}else{ } else {
that.getSett(); that.getSett();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment