@@ -1,9 +1,7 @@ | |||||
var config = { | var config = { | ||||
// url: "http://10.11.207.233:7000/C/api", | |||||
// url: "https://ciformall.youlane.cn/C/api", | // url: "https://ciformall.youlane.cn/C/api", | ||||
// url:"https://c.malls.iformall.com/C/api", | |||||
// url: "http://31adc9ce.ngrok.io/C/api", | |||||
url:'https://ctest.malls.iformall.com/C/api', | |||||
url:"https://c.malls.iformall.com/C/api", | |||||
// url:'https://ctest.malls.iformall.com/C/api', | |||||
api: { | api: { | ||||
/** | /** | ||||
* 接口用途:login | * 接口用途:login | ||||
@@ -168,7 +166,7 @@ var config = { | |||||
}, | }, | ||||
weapp: { | weapp: { | ||||
AppId: "wx649b3be73c1afe47" | |||||
AppId: "wx026ee7f6290aa336" | |||||
}, | }, | ||||
ErrorCode: { | ErrorCode: { | ||||
NICK_NOT_AUTH: 11004, | NICK_NOT_AUTH: 11004, | ||||
@@ -50,8 +50,7 @@ Page({ | |||||
wx.chooseLocation({ | wx.chooseLocation({ | ||||
success: function (res) { | success: function (res) { | ||||
that.setData({ | that.setData({ | ||||
name: res.name+'('+res.address+')', | |||||
address: JSON.stringify(res), | |||||
address: res.name + '(' + res.address + ')', | |||||
}) | }) | ||||
}, | }, | ||||
fail: function (error) { | fail: function (error) { | ||||
@@ -147,15 +146,10 @@ Page({ | |||||
url: config.api.getScore, | url: config.api.getScore, | ||||
data: {} | data: {} | ||||
}).then(res => { | }).then(res => { | ||||
if (res.data.address && JSON.parse(res.data.address).name) { | |||||
console.log(res); | |||||
if (res.data.address) { | |||||
that.setData({ | that.setData({ | ||||
address: res.data.address, | address: res.data.address, | ||||
name: JSON.parse(res.data.address).name +'('+JSON.parse(res.data.address).address+')', | |||||
}) | |||||
} | |||||
if (!JSON.parse(res.data.address).name) { | |||||
that.setData({ | |||||
name: null, | |||||
}) | }) | ||||
} | } | ||||
if (res.data.name) { | if (res.data.name) { | ||||
@@ -21,8 +21,8 @@ | |||||
</view> | </view> | ||||
<view class='address' bindtap='address'> | <view class='address' bindtap='address'> | ||||
<text>住址</text> | <text>住址</text> | ||||
<view class='names' wx:if="{{name}}">{{name}}</view> | |||||
<view class='names' wx:if="{{!name}}">请选择地址</view> | |||||
<view class='names' wx:if="{{address}}">{{address}}</view> | |||||
<view class='names' wx:if="{{!address}}">请选择地址</view> | |||||
</view> | </view> | ||||
<button class='btn' formType="submit" hover-class='active'>修改会员资料</button> | <button class='btn' formType="submit" hover-class='active'>修改会员资料</button> | ||||
</form> | </form> |
@@ -62,7 +62,7 @@ Page({ | |||||
}); | }); | ||||
} else { | } else { | ||||
wx.showToast({ | wx.showToast({ | ||||
title: err.errMsg, | |||||
title: err.message, | |||||
icon: 'none', | icon: 'none', | ||||
duration: 2000, | duration: 2000, | ||||
mask: false | mask: false | ||||
@@ -111,14 +111,14 @@ Page({ | |||||
}) | }) | ||||
.catch(err => { | .catch(err => { | ||||
console.log(err); | console.log(err); | ||||
if (err.errMsg == '请求超时,请检查您的网络设置!') { | |||||
if (err.message == '请求超时,请检查您的网络设置!') { | |||||
that.setData({ | that.setData({ | ||||
loading: false, | loading: false, | ||||
loadingtext: "请求超时,请检查您的网络设置!" | loadingtext: "请求超时,请检查您的网络设置!" | ||||
}) | }) | ||||
} | } | ||||
wx.showToast({ | wx.showToast({ | ||||
title: err.errMsg, | |||||
title: err.message, | |||||
icon: 'none', | icon: 'none', | ||||
duration: 2000, | duration: 2000, | ||||
mask: false | mask: false | ||||
@@ -48,18 +48,18 @@ Page({ | |||||
}, | }, | ||||
gotoetcp:function(){ | gotoetcp:function(){ | ||||
console.log(this.data.extraData) | console.log(this.data.extraData) | ||||
wx.navigateToMiniProgram({ | |||||
appId:'wx192b7d2e8dcbefd0', | |||||
extraData: this.data.extraData, | |||||
envVersion:'release', | |||||
path:"pages/main/main", | |||||
}) | |||||
// wx.navigateToMiniProgram({ | // wx.navigateToMiniProgram({ | ||||
// appId:'wxc07f9d67923d676d', | |||||
// appId:'wx192b7d2e8dcbefd0', | |||||
// extraData: this.data.extraData, | // extraData: this.data.extraData, | ||||
// envVersion:'release', | // envVersion:'release', | ||||
// path: "pages/main/main", | |||||
// path:"pages/main/main", | |||||
// }) | // }) | ||||
wx.navigateToMiniProgram({ | |||||
appId:'wxc07f9d67923d676d', | |||||
extraData: this.data.extraData, | |||||
envVersion:'release', | |||||
path: "pages/main/main", | |||||
}) | |||||
}, | }, | ||||
showquan: function() { | showquan: function() { | ||||
wx.navigateTo({ | wx.navigateTo({ | ||||
@@ -61,12 +61,12 @@ | |||||
<view class="buy-view" wx:if="{{stopFees.orderId}}"> | <view class="buy-view" wx:if="{{stopFees.orderId}}"> | ||||
<navigator bindfail="bindfail" path="pages/main/main" wx:if="{{canIUse}}" class='buy' target="miniProgram" open-type="navigate" app-id="wx192b7d2e8dcbefd0" extra-data='{{extraData}}' version="release"> | |||||
立即支付 | |||||
</navigator> | |||||
<!-- <navigator wx:if="{{canIUse}}" class='buy' path="pages/main/main" target="miniProgram" open-type="navigate" app-id="wxc07f9d67923d676d" extra-data='{{extraData}}' version="release"> | |||||
<!-- <navigator bindfail="bindfail" path="pages/main/main" wx:if="{{canIUse}}" class='buy' target="miniProgram" open-type="navigate" app-id="wx192b7d2e8dcbefd0" extra-data='{{extraData}}' version="release"> | |||||
立即支付 | 立即支付 | ||||
</navigator> --> | </navigator> --> | ||||
<navigator wx:if="{{canIUse}}" class='buy' path="pages/main/main" target="miniProgram" open-type="navigate" app-id="wxc07f9d67923d676d" extra-data='{{extraData}}' version="release"> | |||||
立即支付 | |||||
</navigator> | |||||
<view wx:if="{{!canIUse}}" class='buy' bindtap='gotoetcp'>立即支付</view> | <view wx:if="{{!canIUse}}" class='buy' bindtap='gotoetcp'>立即支付</view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
@@ -70,7 +70,7 @@ | |||||
<view class="margin"></view> | <view class="margin"></view> | ||||
<!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | <!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | ||||
<view bindlongtap='showVersion' class='version'> | <view bindlongtap='showVersion' class='version'> | ||||
<view wx:if="{{flag=='show'}}">版本号:2.2.8</view> | |||||
<view wx:if="{{flag=='show'}}">版本号:2.2.7</view> | |||||
<view wx:if="{{flag=='hidden'}}"></view> | <view wx:if="{{flag=='hidden'}}"></view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
@@ -12,7 +12,7 @@ | |||||
}, | }, | ||||
"compileType": "miniprogram", | "compileType": "miniprogram", | ||||
"libVersion": "2.0.9", | "libVersion": "2.0.9", | ||||
"appid": "wx649b3be73c1afe47", | |||||
"appid": "wx026ee7f6290aa336", | |||||
"projectname": "C", | "projectname": "C", | ||||
"isGameTourist": false, | "isGameTourist": false, | ||||
"condition": { | "condition": { | ||||