@@ -52,7 +52,7 @@ Page({ | |||||
success: function (res) { | success: function (res) { | ||||
console.log(res); | console.log(res); | ||||
that.setData({ | that.setData({ | ||||
name: res.name, | |||||
name: res.name+'('+res.address+')', | |||||
address: JSON.stringify(res), | address: JSON.stringify(res), | ||||
}) | }) | ||||
}, | }, | ||||
@@ -153,7 +153,7 @@ Page({ | |||||
if (res.data.address && JSON.parse(res.data.address).name) { | if (res.data.address && JSON.parse(res.data.address).name) { | ||||
that.setData({ | that.setData({ | ||||
address: res.data.address, | address: res.data.address, | ||||
name: JSON.parse(res.data.address).name, | |||||
name: JSON.parse(res.data.address).name +'('+JSON.parse(res.data.address).address+')', | |||||
}) | }) | ||||
} | } | ||||
if (!JSON.parse(res.data.address).name) { | if (!JSON.parse(res.data.address).name) { | ||||
@@ -19,10 +19,10 @@ | |||||
</radio> | </radio> | ||||
</radio-group> | </radio-group> | ||||
</view> | </view> | ||||
<view class='section' bindtap='address'> | |||||
<view class='address' bindtap='address'> | |||||
<text>住址</text> | <text>住址</text> | ||||
<input wx:if="{{name}}" type="text" placeholder='{{name}}' disabled/> | |||||
<input wx:if="{{!name}}" type="text" placeholder='请输入地址' disabled/> | |||||
<view class='names' wx:if="{{name}}">{{name}}</view> | |||||
<view class='names' wx:if="{{!name}}">请输入地址</view> | |||||
</view> | </view> | ||||
<button class='btn' formType="submit" hover-class='active'>修改会员资料</button> | <button class='btn' formType="submit" hover-class='active'>修改会员资料</button> | ||||
</form> | </form> |
@@ -17,6 +17,12 @@ input { | |||||
margin: 0 auto; | margin: 0 auto; | ||||
border-bottom: 1px solid #eee; | border-bottom: 1px solid #eee; | ||||
} | } | ||||
.address{ | |||||
width: 710rpx; | |||||
margin: 0 auto; | |||||
border-bottom: 1px solid #eee; | |||||
padding-bottom: 10rpx; | |||||
} | |||||
.radio{ | .radio{ | ||||
margin-right: 30rpx; | margin-right: 30rpx; | ||||
} | } | ||||
@@ -39,6 +45,11 @@ radio { | |||||
display: inline-block; | display: inline-block; | ||||
margin-right: 20rpx; | margin-right: 20rpx; | ||||
} | } | ||||
.address > text:nth-of-type(1) { | |||||
font-size: 32rpx; | |||||
display: inline-block; | |||||
margin-right: 20rpx; | |||||
} | |||||
.btn{ | .btn{ | ||||
width: 400rpx; | width: 400rpx; | ||||
color: #fff; | color: #fff; | ||||
@@ -64,4 +75,9 @@ radio { | |||||
bottom: 0; | bottom: 0; | ||||
margin: auto; | margin: auto; | ||||
background: #fff; | background: #fff; | ||||
} | |||||
.names{ | |||||
font-size: 26rpx; | |||||
line-height: 46rpx; | |||||
color: #999; | |||||
} | } |
@@ -70,10 +70,11 @@ | |||||
<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.1.9</view> | |||||
<view wx:if="{{flag=='show'}}">版本号:2.2.5</view> | |||||
<view wx:if="{{flag=='hidden'}}"></view> | <view wx:if="{{flag=='hidden'}}"></view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
<view class='of'> | <view class='of'> | ||||
<official-account wx:if="{{canIUse}}" class="gzh"></official-account> | <official-account wx:if="{{canIUse}}" class="gzh"></official-account> | ||||
</view> | </view> |