| @@ -2,35 +2,44 @@ | |||||
| "ext": { | "ext": { | ||||
| "attr": { | "attr": { | ||||
| "car": { | "car": { | ||||
| "tjd": { | |||||
| "payPath": "", | |||||
| "tjdAppId": "wx6945d1bda68d7993" | |||||
| }, | |||||
| "etcp": { | "etcp": { | ||||
| "etcpAppId": "wx192b7d2e8dcbefd0", | |||||
| "etcpVersion": "release", | |||||
| "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" | |||||
| } | |||||
| "payPath": "pages/pay/order-pay-open/main", | |||||
| "etcpAppId": "wxc07f9d67923d676d", | |||||
| "etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback" | |||||
| }, | |||||
| "bolink": { | |||||
| "payPath": "pages/park/park", | |||||
| "bolinkAppId": "wxbd08b4baa10fcc1d" | |||||
| }, | |||||
| "version": "release" | |||||
| }, | }, | ||||
| "mchId": "1604439800", | |||||
| "mchId": "1539123951", | |||||
| "imgProxy": [ | "imgProxy": [ | ||||
| { | { | ||||
| "newUrl": "https://ctest.malls.iformall.com/img", | |||||
| "newUrl": "https://c.malls.iformall.com/img", | |||||
| "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" | "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" | ||||
| }, | }, | ||||
| { | { | ||||
| "newUrl": "https://ctest.malls.iformall.com/img1", | |||||
| "newUrl": "https://c.malls.iformall.com/img1", | |||||
| "orgUrl": "https://formall.oss-accelerate.aliyuncs.com" | "orgUrl": "https://formall.oss-accelerate.aliyuncs.com" | ||||
| }, | }, | ||||
| { | { | ||||
| "newUrl": "https://ctest.malls.iformall.com/img2", | |||||
| "newUrl": "https://c.malls.iformall.com/img2", | |||||
| "orgUrl": "https://wx.qlogo.cn" | "orgUrl": "https://wx.qlogo.cn" | ||||
| } | } | ||||
| ], | ], | ||||
| "configUrl": "https://ctest.malls.iformall.com/C/api", | |||||
| "businessSwitch": "1", | |||||
| "configUrl": "https://c.malls.iformall.com/C/api", | |||||
| "ifStoreApp": "0", | |||||
| "ifHaveWebSocket": "0", | "ifHaveWebSocket": "0", | ||||
| "ifHaveCarModular": "1" | "ifHaveCarModular": "1" | ||||
| }, | }, | ||||
| "name": "金泸商务", | |||||
| "weappId": "wx649b3be73c1afe47", | |||||
| "appVersion": "C.test.5.2.0" | |||||
| "name": "欢乐城万象金街", | |||||
| "weappId": "wxde54451891094c16", | |||||
| "appVersion": "C.5.1.1" | |||||
| }, | }, | ||||
| "debug": false, | "debug": false, | ||||
| "tabBar": { | "tabBar": { | ||||
| @@ -66,8 +75,7 @@ | |||||
| "selectedIconPath": "assets/images/user-a.png" | "selectedIconPath": "assets/images/user-a.png" | ||||
| } | } | ||||
| ], | ], | ||||
| "color": "#abb1be", | |||||
| "selectedColor": "#b2743d" | |||||
| "custom": true | |||||
| }, | }, | ||||
| "window": { | "window": { | ||||
| "backgroundTextStyle": "dark", | "backgroundTextStyle": "dark", | ||||
| @@ -76,22 +84,14 @@ | |||||
| "navigationBarBackgroundColor": "#FFFFFF" | "navigationBarBackgroundColor": "#FFFFFF" | ||||
| }, | }, | ||||
| "plugins": { | "plugins": { | ||||
| "auto-points-plugin": { | |||||
| "version": "1.3.0", | |||||
| "provider": "wxfab2bf944bfc4da6" | |||||
| }, | |||||
| "live-player-plugin": { | "live-player-plugin": { | ||||
| "version": "1.3.4", | |||||
| "version": "1.2.5", | |||||
| "provider": "wx2b03c6e691cd7370" | "provider": "wx2b03c6e691cd7370" | ||||
| } | } | ||||
| }, | }, | ||||
| "extAppid": "wx649b3be73c1afe47", | |||||
| "extAppid": "wxde54451891094c16", | |||||
| "extEnable": true, | "extEnable": true, | ||||
| "permission": { | |||||
| "scope.userLocation": { | |||||
| "desc": "你的位置信息将用于小程序位置接口的效果展示" | |||||
| } | |||||
| }, | |||||
| "permission": {}, | |||||
| "directCommit": false, | "directCommit": false, | ||||
| "networkTimeout": { | "networkTimeout": { | ||||
| "request": 30000, | "request": 30000, | ||||
| @@ -17,7 +17,7 @@ | |||||
| }, | }, | ||||
| "version": "release" | "version": "release" | ||||
| }, | }, | ||||
| "mchId": "1604439800", | |||||
| "mchId": "1539123951", | |||||
| "imgProxy": [ | "imgProxy": [ | ||||
| { | { | ||||
| "newUrl": "https://c.malls.iformall.com/img", | "newUrl": "https://c.malls.iformall.com/img", | ||||
| @@ -36,10 +36,10 @@ | |||||
| "ifStoreApp": "0", | "ifStoreApp": "0", | ||||
| "businessSwitch": "1", | "businessSwitch": "1", | ||||
| "ifHaveWebSocket": "0", | "ifHaveWebSocket": "0", | ||||
| "ifHaveCarModular": "0" | |||||
| "ifHaveCarModular": "1" | |||||
| }, | }, | ||||
| "name": "富茂链客生产版", | |||||
| "weappId": "wx6a2524a8286d687f", | |||||
| "name": "欢乐城", | |||||
| "weappId": "wx8e5cab05e850bc91", | |||||
| "appVersion": "C.5.1.1" | "appVersion": "C.5.1.1" | ||||
| }, | }, | ||||
| "debug": false, | "debug": false, | ||||
| @@ -90,11 +90,11 @@ | |||||
| "provider": "wxfab2bf944bfc4da6" | "provider": "wxfab2bf944bfc4da6" | ||||
| }, | }, | ||||
| "live-player-plugin": { | "live-player-plugin": { | ||||
| "version": "1.3.5", | |||||
| "version": "1.2.5", | |||||
| "provider": "wx2b03c6e691cd7370" | "provider": "wx2b03c6e691cd7370" | ||||
| } | } | ||||
| }, | }, | ||||
| "extAppid": "wx6a2524a8286d687f", | |||||
| "extAppid": "wx8e5cab05e850bc91", | |||||
| "extEnable": true, | "extEnable": true, | ||||
| "permission": { | "permission": { | ||||
| "scope.userLocation": { | "scope.userLocation": { | ||||
| @@ -155,6 +155,12 @@ Page({ | |||||
| }) | }) | ||||
| }, | }, | ||||
| goToInfo() { | |||||
| wx.navigateTo({ | |||||
| url: '/pages3/setUserInfo/index', | |||||
| }) | |||||
| }, | |||||
| /* 判断是否授权*/ | /* 判断是否授权*/ | ||||
| userAuthorization() { | userAuthorization() { | ||||
| Http.get({ | Http.get({ | ||||
| @@ -534,6 +540,7 @@ Page({ | |||||
| console.log(res) | console.log(res) | ||||
| }) | }) | ||||
| }, | }, | ||||
| /** | /** | ||||
| * 生命周期函数--监听页面显示 | * 生命周期函数--监听页面显示 | ||||
| */ | */ | ||||
| @@ -127,6 +127,13 @@ | |||||
| </view> | </view> | ||||
| <view class='btns_bg'> | <view class='btns_bg'> | ||||
| <view bindtap="goToInfo"> | |||||
| <view class="particulars_list"> | |||||
| <view class="particulars_name">个人信息</view> | |||||
| <view class="particulars_go">></view> | |||||
| </view> | |||||
| </view> | |||||
| <view bindtap="goToBargain"> | <view bindtap="goToBargain"> | ||||
| <view class="particulars_list"> | <view class="particulars_list"> | ||||
| <view class="particulars_name">我的砍价</view> | <view class="particulars_name">我的砍价</view> | ||||
| @@ -202,6 +209,11 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class="particulars_list" bindtap="handleOpenPrivacyContract"> | |||||
| <view class="particulars_name">隐私协议</view> | |||||
| <view class="particulars_go">></view> | |||||
| </view> | |||||
| <navigator url="/pages/mallInfo/mallInfo" open-type="navigate"> | <navigator url="/pages/mallInfo/mallInfo" open-type="navigate"> | ||||
| <view class="particulars_list"> | <view class="particulars_list"> | ||||
| <view class="particulars_name">关于我们</view> | <view class="particulars_name">关于我们</view> | ||||
| @@ -570,7 +570,7 @@ Page({ | |||||
| checkDialog() { | checkDialog() { | ||||
| const isAgreeProtocol = wx.getStorageSync('isAgreeProtocol') | const isAgreeProtocol = wx.getStorageSync('isAgreeProtocol') | ||||
| // if (isAgreeProtocol) return | |||||
| if (isAgreeProtocol) return | |||||
| Http.get({ | Http.get({ | ||||
| url: config.api.needAgreeProtocol, | url: config.api.needAgreeProtocol, | ||||
| }).then(res => { | }).then(res => { | ||||
| @@ -157,7 +157,7 @@ Page({ | |||||
| const data = { | const data = { | ||||
| avatarUrl: that.data.avatarUrl, | avatarUrl: that.data.avatarUrl, | ||||
| nickName: e.detail.value.nickname.trim(), | nickName: e.detail.value.nickname.trim(), | ||||
| name: e.detail.value.username, | |||||
| name: e.detail.value.username || "und", | |||||
| sex: 1 * that.data.gender + 1, | sex: 1 * that.data.gender + 1, | ||||
| birthdate: birthdate, | birthdate: birthdate, | ||||
| height: e.detail.value.height ? e.detail.value.height : that.data.height, | height: e.detail.value.height ? e.detail.value.height : that.data.height, | ||||
| @@ -171,13 +171,15 @@ Page({ | |||||
| icon: 'error', | icon: 'error', | ||||
| duration: 2000 | duration: 2000 | ||||
| }) | }) | ||||
| } else if (!data.name) { | |||||
| wx.showToast({ | |||||
| title: '请输入真实姓名', | |||||
| icon: 'error', | |||||
| duration: 2000 | |||||
| }) | |||||
| } else if (data.nickName.length > 16) { | |||||
| } | |||||
| // else if (!data.name) { | |||||
| // wx.showToast({ | |||||
| // title: '请输入真实姓名', | |||||
| // icon: 'error', | |||||
| // duration: 2000 | |||||
| // }) | |||||
| // } | |||||
| else if (data.nickName.length > 16) { | |||||
| wx.showToast({ | wx.showToast({ | ||||
| title: '昵称上限为16字符', | title: '昵称上限为16字符', | ||||
| icon: 'none', | icon: 'none', | ||||
| @@ -200,10 +202,29 @@ Page({ | |||||
| } | } | ||||
| }).catch(err => { | }).catch(err => { | ||||
| console.log(err); | console.log(err); | ||||
| wx.showToast({ | |||||
| title: err.message || "提交失败", | |||||
| icon: 'none', | |||||
| duration: 1500, | |||||
| }) | |||||
| }) | }) | ||||
| } | } | ||||
| }, | }, | ||||
| goCanelAccount() { | |||||
| wx.showModal({ | |||||
| title: '提示', | |||||
| content: '是否要注销账号?', | |||||
| success(res) { | |||||
| if (res.confirm) { | |||||
| console.log('用户点击确定') | |||||
| } else if (res.cancel) { | |||||
| console.log('用户点击取消') | |||||
| } | |||||
| } | |||||
| }) | |||||
| }, | |||||
| /** | /** | ||||
| * 生命周期函数--监听页面加载 | * 生命周期函数--监听页面加载 | ||||
| */ | */ | ||||
| @@ -21,13 +21,13 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class="item"> | |||||
| <!-- <view class="item"> | |||||
| <text>真实姓名<text class="red">*</text></text> | <text>真实姓名<text class="red">*</text></text> | ||||
| <view class="right"> | <view class="right"> | ||||
| <input name='username' class="input" placeholder="请输入姓名" value='{{username}}' /> | <input name='username' class="input" placeholder="请输入姓名" value='{{username}}' /> | ||||
| <image class="next" src="/assets/images/next.png"></image> | <image class="next" src="/assets/images/next.png"></image> | ||||
| </view> | </view> | ||||
| </view> | |||||
| </view> --> | |||||
| <view class="item"> | <view class="item"> | ||||
| <text>性别<text class="red">*</text></text> | <text>性别<text class="red">*</text></text> | ||||
| @@ -55,7 +55,7 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class="item"> | |||||
| <!-- <view class="item"> | |||||
| <text>身高</text> | <text>身高</text> | ||||
| <view class="right"> | <view class="right"> | ||||
| <input name='height' class="input" placeholder="请输入身高" value='{{height}}' /><text>cm</text> | <input name='height' class="input" placeholder="请输入身高" value='{{height}}' /><text>cm</text> | ||||
| @@ -69,9 +69,9 @@ | |||||
| <input name='weight' class="input" placeholder="请输入体重" value='{{weight}}' /><text>kg</text> | <input name='weight' class="input" placeholder="请输入体重" value='{{weight}}' /><text>kg</text> | ||||
| <image class="next" src="/assets/images/next.png"></image> | <image class="next" src="/assets/images/next.png"></image> | ||||
| </view> | </view> | ||||
| </view> | |||||
| </view> --> | |||||
| <view class='itemAdress' bindtap='setAddress'> | |||||
| <!-- <view class='itemAdress' bindtap='setAddress'> | |||||
| <text>家庭住址</text> | <text>家庭住址</text> | ||||
| <view class="right"> | <view class="right"> | ||||
| <view class='input' wx:if="{{address}}">{{address}}</view> | <view class='input' wx:if="{{address}}">{{address}}</view> | ||||
| @@ -86,7 +86,7 @@ | |||||
| <view class="input greyFont">前往设置</view> | <view class="input greyFont">前往设置</view> | ||||
| <image class="next" src="/assets/images/next.png"></image> | <image class="next" src="/assets/images/next.png"></image> | ||||
| </view> | </view> | ||||
| </view> | |||||
| </view> --> | |||||
| <view class='item' bindtap="goSetAdress"> | <view class='item' bindtap="goSetAdress"> | ||||
| <text>收货地址</text> | <text>收货地址</text> | ||||
| @@ -97,6 +97,7 @@ | |||||
| </view> | </view> | ||||
| <button class="submit" type="primary" form-type='submit'>确定</button> | <button class="submit" type="primary" form-type='submit'>确定</button> | ||||
| <button class="danger" type="danger" bindtap="goCanelAccount">注销账号</button> | |||||
| <!-- <button class="submit" type="primary" bindtap="test">测试</button> --> | <!-- <button class="submit" type="primary" bindtap="test">测试</button> --> | ||||
| </form> | </form> | ||||
| </view> | </view> | ||||
| @@ -47,8 +47,9 @@ | |||||
| padding-bottom: 20rpx; | padding-bottom: 20rpx; | ||||
| border-bottom: solid 1px #dddddd; | border-bottom: solid 1px #dddddd; | ||||
| } | } | ||||
| .item .red { | .item .red { | ||||
| color: red; | |||||
| color: red; | |||||
| } | } | ||||
| .itemAdress { | .itemAdress { | ||||
| @@ -75,4 +76,10 @@ | |||||
| .submit { | .submit { | ||||
| margin-top: 50rpx; | margin-top: 50rpx; | ||||
| } | |||||
| .danger { | |||||
| color: #ffffff; | |||||
| background-color: red; | |||||
| margin-top: 50rpx; | |||||
| } | } | ||||
| @@ -35,7 +35,7 @@ | |||||
| }, | }, | ||||
| "compileType": "miniprogram", | "compileType": "miniprogram", | ||||
| "libVersion": "2.11.2", | "libVersion": "2.11.2", | ||||
| "appid": "wxfa336cad86ed598d", | |||||
| "appid": "wx453ae0d37f3550d0", | |||||
| "projectname": "C", | "projectname": "C", | ||||
| "simulatorType": "wechat", | "simulatorType": "wechat", | ||||
| "simulatorPluginLibVersion": {}, | "simulatorPluginLibVersion": {}, | ||||
| @@ -7,7 +7,7 @@ | |||||
| "preloadBackgroundData": false, | "preloadBackgroundData": false, | ||||
| "useIsolateContext": true | "useIsolateContext": true | ||||
| }, | }, | ||||
| "libVersion": "3.0.1", | |||||
| "libVersion": "3.11.2", | |||||
| "condition": { | "condition": { | ||||
| "miniprogram": { | "miniprogram": { | ||||
| "list": [ | "list": [ | ||||