优化弹框背景图，优化个人资料填写

@@ -42,16 +42,17 @@ Page({
             }else {
                 this.setData({
                     phone_number_params: this.data.phone_number,
+                    'user.tel':this.data.phone_number,
                     is_wrong_phone:false,
                 });
                 console.log('params', this.data.phone_number_params);
             }
         }
         if(e.detail.value === '') {
-            console.log('手机号为空',this.data.is_wrong_phone,this.data.phone_number,this.data.is_choose_phone);
+            console.log('手机号为空',this.data.is_wrong_phone,this.data.phone_number_params,this.data.is_choose_phone);
             this.setData({is_change:false});//按钮置灰
         }
-        if((this.data.is_choose_phone&&this.data.phone_number !== '') &&
+        if((this.data.is_choose_phone&&this.data.phone_number_params !== '') &&
             this.data.user.country !== null &&
             this.data.user.city !== null &&
             this.data.user.introduce !== null
@@ -193,7 +194,7 @@ Page({
             wx.showToast({title:'请填写国家',icon:'none'})
         }else if(this.data.city === ''  && this.data.user.city === null) {
             wx.showToast({title:'请填写城市',icon:'none'})
-        }else if (this.data.user.tel === null) {
+        }else if (this.data.user.tel === null && this.data.phone_number === '') {
             wx.showToast({title:'请获取手机号',icon:'none'})
         }else if(this.data.is_wrong_phone){
             wx.showToast({title:'手机号格式错误',icon:'none'})
@@ -207,7 +208,7 @@ Page({
             let sex = this.data.userInfo.gender;
             let params = {
                 token: wx.getStorageSync('token'),
-                sex: choose_sex || (this.data.is_sex_change === undefined?sex:''),
+                sex: choose_sex || (this.data.is_sex_change === undefined&&this.data.user.sex?this.data.user.sex:sex),
                 country:this.data.is_choose_country?this.data.country:this.data.user.country,
                 city:this.data.is_choose_city?this.data.city:this.data.user.city,
                 // tel:(this.data.is_choose_phone&&this.data.phone_number !== '')?this.data.phone_number:this.data.user.tel,
@@ -248,6 +249,9 @@ Page({
                 }else {
                     this.setData({is_change:true});
                 }
+                if(this.data.user.tel !== null) {
+                    // this.setData({phone_number:this.data.user.tel});
+                }
             }
         });
     },
@@ -259,7 +263,7 @@ Page({
         if(this.data.userInfo.tel !== null) {
             this.setData({is_wrong_phone:false})
         }
-        // console.log('userInfo', this.data.userInfo);
+        console.log('userInfo', this.data.userInfo);
         this.getDetail();
 
     },

@@ -6,7 +6,7 @@
             <!--{{userInfo.gender === 1?'男':userInfo.gender === 2?'女':'未知'}}-->
             <picker bindchange="sexPickerChange" value="{{current_sex}}" range="{{sexList}}" class="picker">
                 <view class="sex-picker">
-                    <text class="variety-text">{{sexList[current_sex] || userInfo.gender === 1?'男':userInfo.gender === 2?'女':''}}</text>
+                    <text class="variety-text">{{current_sex!==undefined?sexList[current_sex]:(user.sex===1?'男':user.sex===2?'女':(userInfo.gender === 1?'男':userInfo.gender === 2?'女':''))}}</text>
                     <!--<text class="variety-text" wx:else>{{pet_info.sex===2?'MM':'GG'}}</text>-->
                     <!--<view class="iconfont icon-arrow-down"></view>-->
                 </view>

@@ -25,6 +25,7 @@
     justify-content: space-between;
 }
 .variety-text {
+    width:40%;
     font-size: 26rpx;
     color: #666666;
 }

@@ -340,7 +340,7 @@
 }
 .normal-box {
     height: 540rpx;
-    background-image: url('http://pk86rwhci.bkt.clouddn.com/safsfdsghk@2x.png');
+    background-image: url('http://qiniuyun.wmatchrd.com/safsfdsghk@2x.png');
 }
 .normal-box .close-btn {
     margin-top: 52rpx;

@@ -61,7 +61,7 @@
             <text class="cancel-btn gray" wx:if="{{detail.status === 3}}">未拼成</text>
             <block wx:if="{{detail.is_canCheck === 1}}">
                 <!--1是可以点-->
-                <text class="confirm-btn light" wx:if="{{detail.status === 4}}" bindtap="confirm">完成</text><!--待完成时并且活动时间已开始，发布人可点击完成-->
+                <text class="confirm-btn light add-width" wx:if="{{detail.status === 4}}" bindtap="confirm">完成</text><!--待完成时并且活动时间已开始，发布人可点击完成-->
             </block>
             <block wx:if="{{detail.is_canCheck === 2}}">
                 <!--2是不可以点,且灰色-->
@@ -76,6 +76,5 @@
             <text class="confirm-btn gray add-width" wx:if="{{detail.status === 4}}">待完成</text>
             <text class="confirm-btn add-width gray" wx:if="{{detail.status === 6}}">已完成</text>
         </block>
-
     </view>
 </view>

@@ -259,7 +259,7 @@
 }
 .normal-box {
     height: 540rpx;
-    background-image: url('http://pk86rwhci.bkt.clouddn.com/safsfdsghk@2x.png');
+    background-image: url('http://qiniuyun.wmatchrd.com/safsfdsghk@2x.png');
 }
 .normal-box .close-btn {
     margin-top: 52rpx;

@@ -387,7 +387,7 @@
 }
 .normal-box {
     height: 540rpx;
-    background-image: url('http://pk86rwhci.bkt.clouddn.com/safsfdsghk@2x.png');
+    background-image: url('http://qiniuyun.wmatchrd.com/safsfdsghk@2x.png');
 }
 .normal-box .close-btn {
     margin-top: 52rpx;