1

app.js

@@ -5,14 +5,6 @@ App({
     url: 'http://yhbdemo.niufangw.com/v1/'
   },
 
-
-
-  share() {   //分享
-    wx.showShareMenu();
-    console.log(1);
-  },
-
-
   judge_Land() {
     try {
       const value = wx.getStorageSync('wx_id')
@@ -234,7 +226,7 @@ App({
 
 
 getApp().judge_Land(); //判断登陆
-getApp().share();  //分享
+
 
 
 

app.json

@@ -1,9 +1,10 @@
 {
   "pages": [
+      "pages/Setup/Opinion/Opinion",
   "pages/Setup/Publicaddress/Publicaddress",
   "pages/Setup/Contactus/Contactus",
   "pages/Setup/Aboutus/Aboutus",
-  "pages/Setup/Opinion/Opinion",
+
   "pages/Setup/modify/modify",
   "pages/Landpage/Land/Land",
   "pages/zheo_More/zheo_More",

pages/Setup/Opinion/Opinion.js

@@ -5,52 +5,203 @@ Page({
  
   data: {
 
-    selectArray: [], // 性别-数据
-    index: '',  // 性别-下标、
-    sex: '',     //  性别  
+    // selectArray: [], // 性别-数据
+    // index: '',  // 性别-下标、
+    // sex: '',     //  性别  
+
+    content:'', //反馈信息
+    scsfzImages:'', //图片
+    scsfzImagesNum: true,   //加号图标 显示
+    content_text:'',
   },
 
  
   onLoad: function (options) {
     var that =this;
-        //  性别 ajax
-        let p_url = 'public/paramsgather?type=sex';
-        let p_data = {
-          // pid: '0'
-        };
-        app.postRequest(p_url, p_data, function (res) {      //  性别 ajax
-          if (res.code == 201) {
-            // console.log(res.data);
-            that.setData({
-              selectArray: res.data
-            })
-
-          }
-          // let dictObject = res.data;
-          // // 对象转成数组
-          // var createArr = []
-          // for (let i in dictObject) {
-          //   createArr.push(dictObject[i]);
-          // }
-
-        })
+         //  性别 ajax
+        // let p_url = 'public/paramsgather?type=sex';
+        // let p_data = {
+        //   // pid: '0'
+        // };
+        // app.postRequest(p_url, p_data, function (res) {      //  性别 ajax
+        //   if (res.code == 201) {
+        //     // console.log(res.data);
+        //     that.setData({
+        //       selectArray: res.data
+        //     })
+
+        //   }
+        //   // let dictObject = res.data;
+        //   // // 对象转成数组
+        //   // var createArr = []
+        //   // for (let i in dictObject) {
+        //   //   createArr.push(dictObject[i]);
+        //   // }
+
+        // })
+  },
+
+
+  // GenderEvent: function (e) {   //  性别    单项选择器
+  //   // console.log(this);
+  //   // console.log(e);
+  //   // console.log(this.data.selectArray[e.detail.value]);
+  //   // console.log('picker发送选择改变，携带值为', e.detail.value)
+  //   this.setData({
+  //     index: e.detail.value,
+  //     sex: e.detail.value
+  //   })
+  // },
+
+  //获取反馈信息
+  click_content: function (e) {
+    var _content = e.detail.value;
+    console.log(_content);
+    this.setData({
+      content: _content
+    });
   },
 
 
+  // 上传学历
+  scsfzclick: function (e) {
+    var _this = this;
+    wx.chooseImage({
+      count: 1,
+      sizeType: ['original', 'compressed'],
+      sourceType: ['album', 'camera'],
+      success(res) {
+
+        let tempFilesSize = res.tempFiles[0].size;
+
+        if (tempFilesSize > 1024 * 1024 * 3) {
+
+          wx.showModal({
+            title: '提示',
+            content: '图片不得超过3MB',
+            showCancel: false,
+          })
+
+          return;
+        }
 
-  onShow: function () {
+        _this.setData({
+          scsfzImages: res.tempFilePaths[0],
+          scsfzImagesNum: false,
+        });
 
+
+
+      }
+    })
   },
 
-  GenderEvent: function (e) {   //  性别    单项选择器
-    // console.log(this);
-    // console.log(e);
-    // console.log(this.data.selectArray[e.detail.value]);
-    // console.log('picker发送选择改变，携带值为', e.detail.value)
-    this.setData({
-      index: e.detail.value,
-      sex: e.detail.value
+
+  // 相册点击放大
+  enlarge: function (e) {
+    var that = this;
+    // console.log(e.currentTarget.dataset.src)
+    wx.previewImage({
+      urls: [e.currentTarget.dataset.src], // 需要预览的图片http链接列表
+      current: e.currentTarget.dataset.src
     })
+
+  },
+
+
+
+  // //最后提交认证
+  Submission: function (e) {
+    var _this = this;
+
+    // console.log(_this.data.scsfzImages)
+
+
+    if (_this.data.scsfzImages != ''  &&   _this.data.content != '') {
+
+              //上传图片
+              wx.uploadFile({
+                url: app.globalData.url + 'my/other/suggestions',
+                filePath: _this.data.scsfzImages,
+                name: 'img',
+                formData: {
+                  key: wx.getStorageSync('access_key'),
+                  token: wx.getStorageSync('access_token'),
+                  content: _this.data.content
+                },
+                success: function (res) {
+                  console.log(res.data);
+                  var data = JSON.parse(res.data);
+
+                  if (data.code == 201) {
+
+                    wx.showToast({
+                      title: '提交成功',
+                      icon: 'success',
+                      duration: 2000
+                    })
+
+                    _this.setData({
+                      scsfzImagesNum:true,
+                      content_text:'',
+                      content: '',
+                    });
+
+                    return;
+                  }
+
+                  var _qrcode = data.msg
+                  getApp().Tips(_qrcode);
+
+                }, fail: function (d) {
+                  wx.showToast({     //这里提示失败
+                    title: '上传失败',
+                    icon: 'none',  // 不显示图标
+                    duration: 2000
+                  })
+                }
+              })
+
+    } else if (_this.data.content != '') {
+
+
+              let setwxqrcode_url = 'my/other/suggestions';
+              let setwxqrcode_data = {
+                content: _this.data.content,
+              };
+              app.postRequest(setwxqrcode_url, setwxqrcode_data, function (res) {
+                if (res.code == 201) {
+                  wx.showToast({
+                    title: '上传成功',
+                    icon: 'success',
+                    duration: 2000
+                  })
+
+                  _this.setData({
+                    scsfzImagesNum: true,
+                    content_text: '',
+                    content: '',
+                  });
+
+                  return;
+                }
+
+                var _qrcode = '上传失败'
+                getApp().Tips(_qrcode);
+
+              })
+
+
+
+    } else {
+
+              var _qrcode = '请描述您遇到的问题'
+              getApp().Tips(_qrcode);
+
+    }
+
+
+
   },
 
 

pages/Setup/Opinion/Opinion.wxml

@@ -2,7 +2,7 @@
 
 <view class='data_box'>
 
-        <view class="Choice_dx_box">     <!--  性别 单项选择器-->
+        <!-- <view class="Choice_dx_box">     
                     <picker  bindchange="GenderEvent" value="{{index}}" range="{{selectArray}}">
                             
                               <view class='Choice_dx c'>
@@ -16,22 +16,26 @@
                                         
                               </view>
                   </picker>
-        </view>
+        </view> -->
+
+
+        <view class='data_text'>请您提供准确信息，我们会在收到投诉后的一个工作日内与您联系，请尽量详细填写反馈问题描述，我们可以缩短处理时间。</view>
 
         <view class='index_box'>
-                 <input type='text' placeholder="请描述您遇到的问题" bindinput="getPhone"  value=""></input>
+                 <input type='text' placeholder="请描述您遇到的问题" bindinput="click_content"  value="{{content_text}}"></input>
         </view>
         
-        <view class='img_box'>
-                <image src='/image/ce1.jpg' mode="aspectFill"></image>
+        <view class='img_box'  hidden='{{scsfzImagesNum}}'>
+                <image src='{{scsfzImages}}' mode="aspectFill"  data-src='{{scsfzImages}}'   bindtap='enlarge'></image>
         </view>
 
-        <view class='upload_box'>
+        <view class='upload_box' bindtap='scsfzclick'>
                 <image src='/image/sctp1.png'  mode="widthFix"></image>
                 <text class='upload_text1'>上传相关截图说明</text>
                 <text class='upload_text2'>(可选)</text>
         </view>
 
-       <view class='NextStep'  bindtap='register'>提交</view>
+       <view class='NextStep'  bindtap='Submission'>提交</view>
+
 
 </view>

pages/Setup/Opinion/Opinion.wxss

@@ -1,6 +1,7 @@
 
 .data_box{width:90%;margin:auto;margin-top:44rpx;position:relative;}
 
+.data_text{border:1px dashed #DCDCDC;width:95%;margin:auto;background:#F5F5F5;padding:20rpx;border-radius:6rpx;font-size:24rpx;color:#999;line-height:50rpx;}
 
 .Choice_dx_box{border-bottom:1px solid #eee;padding-bottom:14rpx;color:#ECECEC;line-height:50rpx;margin-top:30rpx;}
 .Choice_dx_title{float:left;font-size:28rpx;color:#000;}
@@ -9,7 +10,7 @@
 .Choice_dx_text .picker text{display:block;float:right;}
 
 
-.index_box{border:1px solid #eee;height:80rpx;margin-top:30rpx;border-radius:10rpx;background:#F5F5F5;}
+.index_box{border:1px solid #eee;height:80rpx;margin-top:30rpx;border-radius:10rpx;background:#FFF;}
 .index_box input{height:100%;padding:0 30rpx;font-size:26rpx;display:block;}
 
 .img_box{width:220rpx;height:220rpx;margin-top:30rpx;}

pages/Setup/Publicaddress/Publicaddress.js

@@ -62,5 +62,9 @@ Page({
    */
   onShareAppMessage: function () {
 
-  }
+  },
+
+
+
+
 })

pages/index/index.wxml

@@ -51,9 +51,9 @@
         <view class='screen_styke'>
                 <picker  mode="multiSelector"  bindchange="AgeEvent"  value="{{AgeIndex}}" range="{{AgeArray}}">
                         <!-- <text wx:if='{{Ageid == 1}}'>{{AgeArray[0][AgeIndex[0]]}}-{{AgeArray[1][AgeIndex[1]]}}</text> -->
-                        <text wx:if='{{Ageid == 1}}'>{{age}}岁1</text>
+                        <text wx:if='{{Ageid == 1}}'>{{age}}</text>
                         <text wx:else>
-                                  <block wx:if='{{age != 0}}'>{{age}}岁2</block>
+                                  <block wx:if='{{age != 0}}'>{{age}}</block>
 
                                   <block wx:else>年龄</block>
                         </text>
@@ -67,9 +67,9 @@
         
         <view class='screen_styke'>
                 <picker mode="multiSelector" bindchange="heightEvent"  value="{{heightindex}}" range="{{heightArray}}">
-                        <text wx:if='{{heightid == 1}}'>{{height}}a</text>
+                        <text wx:if='{{heightid == 1}}'>{{height}}</text>
                         <text wx:else>
-                                  <block wx:if='{{height != 0}}'>{{height}}b</block>
+                                  <block wx:if='{{height != 0}}'>{{height}}</block>
 
                                   <block wx:else>身高</block>
                         </text>  
@@ -83,8 +83,11 @@
 
         <view class='screen_styke'>
                 <picker bindchange="MarriageEvent" value="{{Marriageindex}}" range="{{MarriageArray}}">
+                        <text wx:if='{{idmarry == 0}}'> 婚史</text>
+                        <block  wx:else>
                         <text wx:if='{{marry != 0}}'> {{MarriageArray[Marriageindex]}}</text>
                         <text wx:else>{{MarriageArray[Marriageindex] ? MarriageArray[Marriageindex]  : "婚史"}}</text>
+                         </block>
                         <image src='/image/search1.png' mode="aspectFill"></image>
                 </picker>
         </view>

pages/index_screen/index_screen.js

@@ -46,8 +46,11 @@ Page({
     area: '',     // 区
 
     age: '',      //  年龄  
+    agezx:0,
     height: '',      //  身高  
+    heightzx: 0,
     marry: '',    //   婚史 
+    idmarry:0,
     education: '',    //  学历  
     income: 0,     //  收入 
 
@@ -77,6 +80,7 @@ Page({
     var _provincename = option.provincename      //  省  
     var _cityname = option.cityname      //  市  
     var _areaname = option.areaname      //  区  
+    var _idmarry = option.idmarry      //  区  
 
     // console.log(_province)
     // console.log(_city)
@@ -85,6 +89,7 @@ Page({
       province: _province,
       city: _city,
       area: _area,
+      idmarry: _idmarry,
 
       provincename: _provincename,  // 省
       cityname: _cityname , // 市
@@ -117,12 +122,22 @@ Page({
     let Age_data = {
       // pid: '0'
     };
-
+    // console.log(option.agezx)
     var _age = option.age      //  年龄  
+    var _agezx = option.agezx    
+
+    if (_agezx == 0){
+      var agenewArry = _age.split("-");  //转成数组
+      var _age_min = agenewArry[0]
+      var _age_max = agenewArry[1]
+    }else{
+      var agenewArry = _agezx.split("-");  //转成数组
+      var _age_min = agenewArry[0]
+      var _age_max = agenewArry[1]
+    }
+
+
 
-    var agenewArry = _age.split("-");  //转成数组
-    var _age_min = agenewArry[0]
-    var _age_max = agenewArry[1]
     // console.log(_age_min)
     // console.log(_age_max)
     that.setData({
@@ -130,11 +145,17 @@ Page({
     })
     app.postRequest(Age_url, Age_data, function (res) {   //  年龄 ajax
       if (res.code == 201) {
-        for (let i = 0; i < res.data.length; i++) {    //已选中的数据处理
 
-          if (res.data[i] == _age_min) { var _min = i; }
+        let createArr1 = res.data;
+        let newarray1 = ['不限'];
+        createArr1 = newarray1.concat(createArr1);
+
+
+        for (let i = 0; i < createArr1.length; i++) {    //已选中的数据处理
 
-          if (res.data[i] == _age_max) { var _max = i; }
+          if (createArr1[i] == _age_min) { var _min = i; }
+
+          if (createArr1[i] == _age_max) { var _max = i; }
 
           that.setData({
             AgeIndex: [_min, _max]
@@ -148,6 +169,10 @@ Page({
         for (let i in dictObject) {
           createArr.push(dictObject[i] + "岁");
         }
+
+        let newarray = ['不限'];
+        createArr = newarray.concat(createArr);
+
         that.setData({
           AgeArray: [createArr, createArr],
         })
@@ -165,10 +190,22 @@ Page({
     };
 
     var _height = option.height      //  身高  
+    var _heightzx = option.heightzx      //  年龄  
+
+    if (_heightzx == 0) {
+
+      var heightnewArry = _height.split("-");  //转成数组
+      var heightSmall = heightnewArry[0]
+      var heightlarge = heightnewArry[1]
+
+    } else {
+
+      var heightnewArry = _heightzx.split("-");  //转成数组
+      var heightSmall = heightnewArry[0]
+      var heightlarge = heightnewArry[1]
+
+    }
 
-    var heightnewArry = _height.split("-");  //转成数组
-    var heightSmall = heightnewArry[0]
-    var heightlarge = heightnewArry[1]
     // console.log(heightSmall)
     // console.log(heightlarge)
     that.setData({
@@ -177,11 +214,15 @@ Page({
     app.postRequest(height_url, height_data, function (res) {      //  身高 ajax
       if (res.code == 201) {
 
-        for (let i = 0; i < res.data.length; i++) {    //已选中的数据处理
+        let createArr1 = res.data;
+        let newarray1 = ['不限'];
+        createArr1 = newarray1.concat(createArr1);
+        
+        for (let i = 0; i < createArr1.length; i++) {    //已选中的数据处理
           // console.log(res.data[i])
-          if (res.data[i] == heightSmall) { var _min = i; }
+          if (createArr1[i] == heightSmall) { var _min = i; }
 
-          if (res.data[i] == heightlarge) { var _max = i; }
+          if (createArr1[i] == heightlarge) { var _max = i; }
 
           that.setData({
             heightindex: [_min, _max]
@@ -195,6 +236,8 @@ Page({
           createArr.push(dictObject[i] + "cm");
         }
 
+        let newarray = ['不限'];
+        createArr = newarray.concat(createArr);
 
         that.setData({
           heightArray: [createArr, createArr],
@@ -211,23 +254,32 @@ Page({
       pid: '0'
     };
     var _marry = option.marry   //   婚史 
-    // console.log(_marry)
-    that.setData({
+    console.log(_marry)
+      that.setData({
       marry: _marry
     })
     app.postRequest(Marriage_url, Marriage_data, function (res) {      //  婚史 ajax
       if (res.code == 201) {
         // console.log(res.data);
-        for (let i = 0; i < res.data.length; i++) {    //已选中的数据处理
+        let createArr1 = res.data;
+        let newarray1 = ['不限'];
+        createArr1 = newarray1.concat(createArr1);
+        for (let i = 0; i < createArr1.length; i++) {    //已选中的数据处理
           if (i == _marry) {
             that.setData({
               Marriageindex: i,
             })
+            console.log(i);
           }
         }
 
+        let createArr = res.data;
+        let newarray = ['不限'];
+        createArr = newarray.concat(createArr);
+
         that.setData({
-          MarriageArray: res.data
+          MarriageArray: createArr,
+          idmarry: that.data.idmarry,
         })
 
       }
@@ -335,32 +387,125 @@ Page({
 
   // 年龄双选
   AgeEvent: function (e) {
+    var that = this;
     // console.log('picker发送选择改变，携带值为', e.detail.value)
+    var _value = e.detail.value;  //发送选择改变，携带值为
     var Small = this.data.AgeArray[0][e.detail.value[0]].substring(0, 2);
     var large = this.data.AgeArray[1][e.detail.value[1]].substring(0, 2);
-    var Agedata = Small + '-' + large;
 
-    // console.log(Agedata);
+    if (Small > large && Small != '不限' && large != '不限') {     //判断  最小值  大于  最大值  数据互换
+      //  console.log('调换')
+      var Agedata = large + '-' + Small;
+      that.Exchange(_value);    // 调用数组调换
+      that.setData({
+        agezx: 0,
+      })
+    } else if (Small == '不限' && large != '不限') {        //判断  最小值 = 不限      输出 最大的值以下
+      // console.log('以下')
+      var Agedata = large + '以下';
+      var Agedataxz = '不限' + '-' + large;
+      that.setData({
+        agezx: Agedataxz,
+      })
+
+    } else if (large == '不限' && Small != '不限') {   //判断  最大值 = 不限      输出 最小的值以上
+      // console.log('以上')
+      var Agedata = Small + '以上';
+      var Agedataxz = Small + '-' + '不限';
+      that.setData({
+        agezx: Agedataxz,
+      })
 
-    this.setData({
-      AgeIndex: e.detail.value,
+    } else if (Small == '不限' && large == '不限') {    //判断  大小值 = 不限      输出  不限
+      // console.log('不限')
+      var Agedata = '不限';
+      var Agedataxz = '不限' + '-' + '不限';
+      that.setData({
+        agezx: Agedataxz,
+      })
+    } else {
+
+      var Agedata = Small + '-' + large;    //否则正常选中
+      that.setData({
+        agezx: 0,
+      })
+    }
+
+    that.setData({
+      AgeIndex: _value,
       age: Agedata,
       Ageid: 1,
     })
+
   },
 
-  heightEvent: function (e) {   //  身高    
+  // 数组数据调换
+  Exchange: function (data) {
+    for (var i = 0; i < data.length / 2; i++) {
+      var data_i = data[i];
+      data[i] = data[data.length - 1 - i];
+      data[data.length - 1 - i] = data_i;
+    }
+    return;
+  },
+
+
+  heightEvent: function (e) {   //  身高   
+    var that=this; 
     // console.log(this);
     // console.log(e);
     // console.log(this.data.heightArray[e.detail.value]);
     // console.log('picker发送选择改变，携带值为', e.detail.value)
+    var _value = e.detail.value;  //发送选择改变，携带值为
+    var heightSmall = this.data.heightArray[0][e.detail.value[0]].substring(0, 3);  //最小值
+    var heightlarge = this.data.heightArray[1][e.detail.value[1]].substring(0, 3);   //最大值
+
+    if (heightSmall > heightlarge && heightSmall != '不限' && heightlarge != '不限') {     //判断  最小值  大于  最大值  数据互换
+      //  console.log('调换')
+      var heightdata = heightlarge + '-' + heightSmall;
+      that.Exchange(_value);    // 调用数组调换
+
+      that.setData({
+        heightzx: 0,
+      })
+
+    } else if (heightSmall == '不限' && heightlarge != '不限') {        //判断  最小值 = 不限      输出 最大的值以下
+      // console.log('以下')
+      var heightdata = heightlarge + '以下';
+      var heightdatazx = '不限' + '-' + heightlarge;
+      that.setData({
+        heightzx: heightdatazx,
+      })
+
+    } else if (heightlarge == '不限' && heightSmall != '不限') {   //判断  最大值 = 不限      输出 最小的值以上
+      // console.log('以上')
+      var heightdata = heightSmall + '以上';
+      var heightdatazx = heightSmall + '-' + '不限';
+      that.setData({
+        heightzx: heightdatazx,
+      })
+
+
+    } else if (heightSmall == '不限' && heightlarge == '不限') {    //判断  大小值 = 不限      输出  不限
+      // console.log('不限')
+      var heightdata = '不限';
+
+      var heightdatazx = '不限' + '-' + '不限';
+      that.setData({
+        heightzx: heightdatazx,
+      })
+
+    } else {
+
+      var heightdata = heightSmall + '-' + heightlarge;   //否则正常选中
+      that.setData({
+        heightzx: 0,
+      })
+    }
 
-    var heightSmall = this.data.heightArray[0][e.detail.value[0]].substring(0, 3);
-    var heightlarge = this.data.heightArray[1][e.detail.value[1]].substring(0, 3);
-    var heightdata = heightSmall + '-' + heightlarge;
 
     this.setData({
-      heightindex: e.detail.value,
+      heightindex: _value,
       height: heightdata,
       heightid: 1,
     })
@@ -373,7 +518,8 @@ Page({
     // console.log('picker发送选择改变，携带值为', e.detail.value)
     this.setData({
       Marriageindex: e.detail.value,
-      marry: e.detail.value
+      marry: e.detail.value,
+      idmarry:1,
     })
   },
 
@@ -682,9 +828,12 @@ Page({
 
     var nickname = this.data.nickname  //姓名
     var age = this.data.age                     //  年龄  
+    var agezx = this.data.agezx                     //  年龄  
     var height = this.data.height             //  身高  
+    var heightzx = this.data.heightzx             //  身高  
     var education = this.data.education  //  学历  
     var marry = this.data.marry                 //   婚史 
+    var idmarry = this.data.idmarry                 //   婚史 
     var income = this.data.income             //  收入 
 
     var province = this.data.province      // 市
@@ -700,8 +849,11 @@ Page({
 
     //设置全局变量(app已经定义 var app=getApp())     赋值要传的参数
     app.globalData.age = age;    //  年龄  
+    app.globalData.agezx = agezx;    //  年龄
     app.globalData.height = height;    //  身高  
+    app.globalData.heightzx = heightzx;    //  身高  
     app.globalData.marry = marry  //  婚史  
+    app.globalData.idmarry = idmarry  //  婚史  
     app.globalData.education = education  //  学历  
     app.globalData.income = income;     //  收入 
     app.globalData.Selection = 1;    //  是否选中   1 选中   0没选中
@@ -775,6 +927,7 @@ Page({
       AgeIndex: ['', ''],    //  年龄-下标
       age: 0,     //  年龄
       Ageid: 0,
+      agezx:0,
 
       heightindex: ['', ''],  // 身高-下标
       height: 0, //身高

pages/index_screen/index_screen.wxml

@@ -68,14 +68,14 @@
 
                                             <view class="Choice_dx_text picker" wx:if='{{Ageid == 0}}'>
                                                   <block wx:if='{{age != 0}}'>
-                                                    {{AgeArray[0][AgeIndex[0]]}}-{{AgeArray[1][AgeIndex[1]]}}
+                                                    {{age}}
                                                   </block>
 
                                                     <block wx:else>请选择</block>
                                             </view> 
 
                                             <view class="Choice_dx_text picker" wx:if='{{Ageid == 1}}'>
-                                                  {{AgeArray[0][AgeIndex[0]]}}-{{AgeArray[1][AgeIndex[1]]}}
+                                                 {{age}}
                                             </view> 
                                             
                                   </view>
@@ -93,14 +93,14 @@
                                 <view class="Choice_dx_text picker" wx:if='{{heightid == 0}}' data-asd="{{height}}">
 
                                      <block wx:if='{{height != 0}}'>
-                                        {{heightArray[0][heightindex[0]]}}-{{heightArray[1][heightindex[1]]}}
+                                       {{height}}
                                      </block>
                                      
                                       <block wx:else>请选择</block>
                                 </view> 
 
                                         <view class="Choice_dx_text picker" wx:else>
-                                              {{heightArray[0][heightindex[0]]}}-{{heightArray[1][heightindex[1]]}}
+                                         {{height}}
                                         </view>
                                             
                                   </view>
@@ -116,17 +116,19 @@
                                   <view class='Choice_dx c'>
                                         <view class="Choice_dx_title">婚史</view>
 
-                                        <view class='Choice_dx_text' wx:if='{{marry != 0}}'>
-                                          
-                                              {{MarriageArray[Marriageindex]}}
-                                            
-                                        </view>
-                                        <view class='Choice_dx_text' wx:else>
-                                          
-                                              {{MarriageArray[Marriageindex] ? MarriageArray[Marriageindex]  : "请选择"}}
-                                            
-                                        </view>
-                                            
+                                       <view class='Choice_dx_text' wx:if='{{idmarry == 0}}'> 请选择</view>
+                                        <block  wx:else>
+                                                <view class='Choice_dx_text' wx:if='{{marry != 0}}'>
+                                                  
+                                                      {{MarriageArray[Marriageindex]}}
+                                                    
+                                                </view>
+                                                <view class='Choice_dx_text' wx:else>
+                                                  
+                                                      {{MarriageArray[Marriageindex] ? MarriageArray[Marriageindex]  : "请选择"}}
+                                                    
+                                                </view>
+                                         </block>
                                   </view>
                       </picker>
             </view>

pages/personal_core/Adegreein/Adegreein.wxml

@@ -22,7 +22,7 @@
                             <view class='sfzyz_upload_rimg'  bindtap='scsfzclick' wx:elif='{{initial.status ==2}}'>   <!-- 未通过 -->
 
                                       <view class='sfzyz_wtg'   hidden='{{scsfzImagesNum}}'>
-                                              <image class='sfzyz_img'  src='{{initial.img}}  mode="aspectFill"'></image>
+                                              <image class='sfzyz_img'  src='{{initial.img}}'   mode="aspectFill"></image>
 
                                               <view class='sfzyz_zhez'>
                                                     <text>{{initial.status_str}}</text>