| @@ -51,7 +51,7 @@ Page({ | |||
| } | |||
| }, | |||
| loadFun:function(){ | |||
| this.getOrderInfo(); | |||
| this.getOrderInfo(); | |||
| }, | |||
| /** | |||
| * 生命周期函数--监听页面初次渲染完成 | |||
| @@ -127,9 +127,7 @@ Page({ | |||
| }) | |||
| }, | |||
| showAppointment:function(){ | |||
| this.setData({ | |||
| isAppointmentShow:true | |||
| }) | |||
| this.getUserLocation();//获取用户当前位置 | |||
| }, | |||
| provinceChane: function (e) {//选中省 | |||
| this.setData({ | |||
| @@ -194,7 +192,7 @@ Page({ | |||
| }, | |||
| complete: (res) => { | |||
| this.setData({ | |||
| siteSelect: true, | |||
| isAppointmentShow: true | |||
| }) | |||
| } | |||
| }) | |||
| @@ -342,7 +340,7 @@ Page({ | |||
| }, | |||
| showSite: function () {//显示地址选择框 | |||
| if (!this.data.siteSelect) { | |||
| this.getUserLocation();//获取用户当前位置 | |||
| } | |||
| }, | |||
| enterMyCenter: function () { | |||
| @@ -15,10 +15,10 @@ | |||
| </view> | |||
| </view> | |||
| <view class="codeGroup"> | |||
| <input class="inputCode" bindfocus="showSite" bindinput="getCaptcha" value="{{subscribeData.captcha}}" placeholder="验证码"></input> | |||
| <input class="inputCode" bindinput="getCaptcha" value="{{subscribeData.captcha}}" placeholder="验证码"></input> | |||
| <view class="codeTime" bindtap="getCode">{{verificationCode}}</view> | |||
| </view> | |||
| <view wx:if="{{siteSelect}}"> | |||
| <!-- <view wx:if="{{siteSelect}}"> --> | |||
| <picker mode='selector' range="{{provinceArr}}" range-key="province" value="{{provinceValue}}" bindchange="provinceChane"> | |||
| <view class="selectGroup"> | |||
| <text class="selectName">{{provinceArr[provinceValue].province}}</text> | |||
| @@ -37,7 +37,7 @@ | |||
| <image src="{{imgUrl+'/images/selectIcon.png'}}" class="selectIcon"></image> | |||
| </view> | |||
| </picker> | |||
| </view> | |||
| <!-- </view> --> | |||
| <view class="subscribeBtn" bindtap="subscribeFun"> | |||
| <image style="width:100%;height:100%;" src="{{imgUrl+'/btns/indexMake.png'}}"></image> | |||
| <button wx:if="{{!userData}}" class="getUserMsgBtn" open-type="getUserInfo" lang="zh_CN" bindgetuserinfo="getUserWxMsg" style="width:100%;height:100%;min-height:0;"></button> | |||
| @@ -76,6 +76,7 @@ Component({ | |||
| } | |||
| }, | |||
| loadFun: function () { | |||
| this.getUserLocation();//获取用户当前位置 | |||
| if (app.globalData.userMobile) { | |||
| this.data.subscribeData.mobile = app.globalData.userMobile; | |||
| this.setData({ | |||
| @@ -194,7 +195,7 @@ Component({ | |||
| }, | |||
| showSite: function () {//显示地址选择框 | |||
| if (!this.data.siteSelect) { | |||
| this.getUserLocation();//获取用户当前位置 | |||
| } | |||
| }, | |||
| agreementState: function () {//协议 | |||
| @@ -18,10 +18,10 @@ | |||
| </view> | |||
| </view> | |||
| <view class="codeGroup"> | |||
| <input class="userInput" bindfocus="showSite" bindinput="getCaptcha" style="width:350rpx;" placeholder="请输入您的验证码"></input> | |||
| <input class="userInput" bindinput="getCaptcha" style="width:350rpx;" placeholder="请输入您的验证码"></input> | |||
| <view class="getCode" bindtap="getCode">{{verificationCode}}</view> | |||
| </view> | |||
| <view wx:if="{{siteSelect}}" class="pickerGroup"> | |||
| <!-- <view wx:if="{{siteSelect}}" class="pickerGroup"> --> | |||
| <view class="inputGroup"> | |||
| <view class="userTitle">当前城市</view> | |||
| <picker mode='multiSelector' range="{{provinceDataArr}}" value="{{provinceDataValue}}" bindcolumnchange="provinceDataChange" bindchange="provinceDataChane"> | |||
| @@ -40,7 +40,7 @@ | |||
| </view> | |||
| </picker> | |||
| </view> | |||
| </view> | |||
| <!-- </view> --> | |||
| <view class="agreementGroup"> | |||
| <image class="agreeIcon" bindtap="agreementState" src="{{imgUrl+(isAgreement?'/images/agreeIcon.png?v=003':'/images/disagreeIcon.png?v=002')}}"></image> | |||
| <view class="agreementText"> | |||
| @@ -49,11 +49,11 @@ | |||
| </view> | |||
| </view> | |||
| <view class="subscribeBtn" bindtap="subscribeFun"> | |||
| <image style="width:100%;height:100%;" src="{{imgUrl+'/btns/myCenterBtn1.png'}}"></image> | |||
| <image style="width:100%;height:100%;" src="{{imgUrl+'/newIcon/20.png'}}"></image> | |||
| <button wx:if="{{userData}}" class="getUserMsgBtn" open-type="getUserInfo" lang="zh_CN" bindgetuserinfo="getUserWxMsg" style="width:100%;height:100%;min-height:0;padding:0;margin:0;"></button> | |||
| </view> | |||
| <view class="subscribeBtn" bindtap="lookMore"> | |||
| <image style="width:100%;height:100%;" src="{{imgUrl+'/btns/myCenterBtn2.png'}}"></image> | |||
| <image style="width:100%;height:100%;" src="{{imgUrl+'/newIcon/21.png'}}"></image> | |||
| </view> | |||
| </view> | |||
| <agreement bindmyevent="agreementControl" wx:if="{{agreement}}"></agreement> | |||