1

app.json

@@ -1,6 +1,6 @@
 {
   "pages": [
-
+  "pages/personal_core/personaldata/personaldata",
   "pages/index/waitfor/waitfor",
   "pages/index/index",
   "pages/Jurisdiction/click_Jurisdiction/click_Jurisdiction",
@@ -11,7 +11,7 @@
   "pages/Landpage/Land/Land",
   "pages/zheo_More/zheo_More",
   "pages/details_More/details_More",
-  "pages/personal_core/personaldata/personaldata",
+
   "pages/Setup/Opinion/Opinion",
   "pages/Setup/Publicaddress/Publicaddress",
   "pages/Setup/Contactus/Contactus",

pages/index/index.js

@@ -13,8 +13,8 @@ Page({
     AgeArray: [],    //  年龄-数据
     AgeIndex: [0, 0],    //  年龄-下标
 
-    MarriageArray: [], // 婚史-数据
+    // MarriageArray: [], // 婚史-数据
-    Marriageindex: '',  // 婚史-下标
+    // Marriageindex: '',  // 婚史-下标
 
     EducationArray: [], // 学历-数据
     Educationindex: '',  // 学历-下标
@@ -28,8 +28,8 @@ Page({
 
     education: 0,    //  学历  
     educationid: 0,
-    marry: 0,    //   婚史 
+    // marry: 0,    //   婚史 
-    idmarry: 0,
+    // idmarry: 0,
     income: 0,
     // income: '',     //  收入 
     // occupation: '',     //  职业  
@@ -104,11 +104,11 @@ Page({
     var _income = app.globalData.income      //  收入  
 
 
-    if (app.globalData.idmarry) {
+    // if (app.globalData.idmarry) {
-      that.setData({
+    //   that.setData({
-        idmarry: app.globalData.idmarry
+    //     idmarry: app.globalData.idmarry
-      })
+    //   })
-    }
+    // }
 
     if (app.globalData.educationid) {
       that.setData({
@@ -309,42 +309,42 @@ Page({
 
 
     //  婚史 ajax
-    let Marriage_url = 'public/paramsgather?type=marriage';
+    // let Marriage_url = 'public/paramsgather?type=marriage';
-    let Marriage_data = {};
+    // let Marriage_data = {};
-
+
-    if (app.globalData.marry) {    //判断 是否从筛选页面传来的参数
+    // if (app.globalData.marry) {    //判断 是否从筛选页面传来的参数
-      // console.log(app.globalData.marry);
+    //   // console.log(app.globalData.marry);
-      var _marry = app.globalData.marry      //  婚姻 
+    //   var _marry = app.globalData.marry      //  婚姻 
-
+
-      that.setData({
+    //   that.setData({
-        marry: _marry
+    //     marry: _marry
-      })
+    //   })
-    } else if (app.globalData.marry == 0 && _Selection == 1) {     //判断筛选页面  是否清空数据   同时 是否选中，而不是返回
+    // } else if (app.globalData.marry == 0 && _Selection == 1) {     //判断筛选页面  是否清空数据   同时 是否选中，而不是返回
-      var _marry = app.globalData.marry   //  婚姻 
+    //   var _marry = app.globalData.marry   //  婚姻 
-      that.setData({
+    //   that.setData({
-        marry: _marry,
+    //     marry: _marry,
-        Marriageindex: "",  // 身高-下标
+    //     Marriageindex: "",  // 身高-下标
-      })
+    //   })
-    }
+    // }
-
+
-    app.postRequest(Marriage_url, Marriage_data, function (res) {      //  婚史 ajax
+    // app.postRequest(Marriage_url, Marriage_data, function (res) {      //  婚史 ajax
-      if (res.code == 201) {
+    //   if (res.code == 201) {
-        if (app.globalData.marry) {
+    //     if (app.globalData.marry) {
-          for (let i = 0; i < res.data.length; i++) {    //已选中的数据处理
+    //       for (let i = 0; i < res.data.length; i++) {    //已选中的数据处理
-            if (i == _marry) {
+    //         if (i == _marry) {
-              that.setData({
+    //           that.setData({
-                Marriageindex: i,
+    //             Marriageindex: i,
-              })
+    //           })
-            }
+    //         }
-          }
+    //       }
-        }
+    //     }
-
+
-        that.setData({
+    //     that.setData({
-          MarriageArray: res.data,
+    //       MarriageArray: res.data,
-          idmarry: that.data.idmarry,
+    //       idmarry: that.data.idmarry,
-        })
+    //     })
-      }
+    //   }
-    })
+    // })
 
 
     //  学历 ajax
@@ -490,24 +490,24 @@ Page({
   },
 
 
-  MarriageEvent: function (e) {   //  婚史    单项选择器
+  // MarriageEvent: function (e) {   //  婚史    单项选择器
-    var that = this;
+  //   var that = this;
-    // console.log(this);
+  //   // console.log(this);
-    // console.log(e);
+  //   // console.log(e);
-    // console.log(this.data.MarriageArray[e.detail.value]);
+  //   // console.log(this.data.MarriageArray[e.detail.value]);
-    // console.log('picker发送选择改变，携带值为', e.detail.value)
+  //   // console.log('picker发送选择改变，携带值为', e.detail.value)
-    this.setData({
+  //   this.setData({
-      Marriageindex: e.detail.value,
+  //     Marriageindex: e.detail.value,
-      marry: e.detail.value,
+  //     marry: e.detail.value,
-      page: 1,
+  //     page: 1,
-      idmarry: 1,
+  //     idmarry: 1,
-    })
+  //   })
 
-    that.list(); //调用筛选
+  //   that.list(); //调用筛选
 
-    app.globalData.Selection = 0;    //  是否选中  
+  //   app.globalData.Selection = 0;    //  是否选中  
-    app.globalData.marry = 0  //  婚史  
+  //   app.globalData.marry = 0  //  婚史  
-  },
+  // },
 
 
 
@@ -544,10 +544,10 @@ Page({
     // console.log(that.data.provinceName);
     // console.log(that.data.cityName);
     // console.log(that.data.areaName);
-
+    // '&marry=' + that.data.marry + '&idmarry=' + that.data.idmarry + 
 
     wx.navigateTo({
-      url: '/pages/index_screen/index_screen?age=' + that.data.age + '&height=' + that.data.height + '&marry=' + that.data.marry + '&idmarry=' + that.data.idmarry + '&education=' + that.data.education + '&income=' + that.data.income + '&educationid=' + that.data.educationid +'&city=' + that.data.city +  '&provinceName=' + that.data.provinceName + '&cityName=' + that.data.cityName + '&areaName=' + that.data.areaName +  ''
+      url: '/pages/index_screen/index_screen?age=' + that.data.age + '&height=' + that.data.height + '&education=' + that.data.education + '&income=' + that.data.income + '&educationid=' + that.data.educationid +'&city=' + that.data.city +  '&provinceName=' + that.data.provinceName + '&cityName=' + that.data.cityName + '&areaName=' + that.data.areaName +  ''
     })
 
 
@@ -588,7 +588,7 @@ Page({
         limit: that.data.limit,
         age: _age,      //  年龄  
         height: _height,   //  身高  
-        marry: that.data.marry,    //   婚史 
+        // marry: that.data.marry,    //   婚史 
         education: that.data.education,    //  学历  
         income: _income,  //收入
         city: that.data.city,                    // 市
@@ -672,7 +672,7 @@ Page({
         limit: that.data.limit,
         age: _age,      //  年龄  
         height: _height,   //  身高  
-        marry: that.data.marry,    //   婚史 
+        // marry: that.data.marry,    //   婚史 
         education: that.data.education,    //  学历  
         income: _income,  //收入
         city: that.data.city,                    // 市

pages/index/index.wxml

@@ -45,9 +45,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 == '不限-以上' ? '不限': age}}</text>
+                        <text wx:if='{{Ageid == 1}}'>{{AgeArray[0][AgeIndex[0]] +'-'+ AgeArray[1][AgeIndex[1]] =='不限-以上' ? '不限' : AgeArray[0][AgeIndex[0]] +'-'+ AgeArray[1][AgeIndex[1]]}}</text>
                         <text wx:else>
-                                  <block wx:if='{{age != 0}}'>{{age == '不限-以上' ? '不限': age}}</block>
+                                  <block wx:if='{{age != 0}}'>{{AgeArray[0][AgeIndex[0]] +'-'+ AgeArray[1][AgeIndex[1]] =='不限-以上' ? '不限' : AgeArray[0][AgeIndex[0]] +'-'+ AgeArray[1][AgeIndex[1]]}}</block>
 
                                   <block wx:else>年龄</block>
                         </text>
@@ -75,7 +75,7 @@
 
 
 
-        <view class='screen_styke'>
+        <!-- <view class='screen_styke'>
                 <picker bindchange="MarriageEvent" value="{{Marriageindex}}" range="{{MarriageArray}}">
                         <text wx:if='{{idmarry == 0}}'> 婚史</text>
                         <block  wx:else>
@@ -84,7 +84,7 @@
                         </block>
                         <image src='/image/search1.png' mode="aspectFill"></image>
                 </picker>
-        </view>
+        </view> -->
 
 
 
@@ -220,14 +220,14 @@
 
                                   <view class='m_Age c'>
                                       <text wx:if="{{item.number}}">ID: {{item.number}}</text>
-                                      <text wx:if="{{item.age}}">{{item.age}}</text>
+                                      <text wx:if="{{item.age}}">{{item.age}}岁</text>
                                   </view>
                                 
                                   <view class='m_text'>
-                                          <!-- <text wx:if="{{item.education}}">{{item.education}}</text> -->
+                                          <text wx:if="{{item.city_name}}">{{item.city_name}}</text>
-                                          <text wx:if="{{item.marry}}">{{item.marry}}</text>
+                                          <text wx:if="{{item.height}}">{{item.height}}cm</text>
-                                          <text wx:if="{{item.occupation}}">{{item.occupation}}</text>
+                                          <!-- <text wx:if="{{item.occupation}}">{{item.occupation}}</text> -->
-                                          <text wx:if="{{item.income}}">{{item.income}}/月</text>
+                                          <text wx:if="{{item.income}}">{{item.income}}</text>
                                   </view>
                         </view>
                 </view>

pages/index/index.wxss

@@ -13,7 +13,7 @@
 /* 筛选导航 */
 .screen_styke_box{border-bottom:1px solid #f8f8f8;width:100%;height:80rpx;border-top:1px solid #f8f8f8;margin-top:40rpx;}
 
-.screen_styke{width:20%;height:100%;float:left;}
+.screen_styke{width:25%;height:100%;float:left;}
 .screen_styke picker{width:100%;height:100%;text-align:center;line-height:80rpx;}
 .screen_styke text{font-size:26rpx;}
 .screen_styke image{width:14rpx;height:10rpx;margin-left:8rpx;position:relative;top:-4rpx;}

pages/index_details/index_details.wxml

@@ -66,9 +66,7 @@
 
       </view>
 
-      <view class='data_list c'>
+      <!-- <view class='data_zjlist c'>
-              <!-- <text wx:if='{{information.nickname}}'>{{information.nickname}}</text> -->
-              <!-- <text wx:if='{{information.sex}}'>{{information.sex}}</text> -->
               <text wx:if='{{information.age}}'>{{information.age}}</text>
               <text wx:if='{{information.height}}'>{{information.height}}</text>
               <text wx:if='{{information.education}}'>{{information.education}}</text>
@@ -77,7 +75,19 @@
               <text wx:if='{{information.nickname &&  information.province && information.city}}'>{{information.province}}-{{information.city}}-{{information.area}}</text>
               <text wx:if='{{information.occupation}}'>{{information.occupation}}</text>
 
+      </view> -->
+      <view class=' c data_zjlist'>
+              <text wx:if='{{information.nickname}}' class='on'>{{information.nickname}}</text>
+              <text wx:if='{{information.sex}}'  class='on'>{{information.sex}}</text>
+              <text wx:if='{{information.age}}'  class='on'>{{information.age}}</text>
+              <text wx:if='{{information.height}}' class='on'>{{information.height}}</text>
+              <text wx:if='{{information.education}}' class='on'>{{information.education}}</text>
+              <text wx:if='{{information.marry}}' class='on'>{{information.marry}}</text>
+              <text wx:if='{{information.income}}'>{{information.income}}</text>
+              <text wx:if='{{information.occupation}}'>{{information.occupation}}</text>
+              <text wx:if='{{information.nickname &&  information.province && information.city}}' class='in'>故乡：{{information.city_name}}</text>
       </view>
+      
 </view>
 
 <view style='height:10rpx;background:#fafafa;margin:20rpx 0;'></view>
@@ -93,7 +103,7 @@
                 </navigator>
       </view>
 
-      <view class='data_list c' wx:if='{{optioninfocode.code == 201}}'>
+      <!-- <view class='data_zolist c' wx:if='{{optioninfocode.code == 201}}'>
               <text  wx:if='{{optioninfo.age}}'>{{optioninfo.age}}</text>
               <text wx:if='{{optioninfo.marry}}'>{{optioninfo.marry}}</text>
               <text wx:if='{{optioninfo.height}}'>{{optioninfo.height}}</text>
@@ -101,8 +111,20 @@
               <text wx:if='{{optioninfo.income_min && optioninfo.income_max}}'>{{optioninfo.income_min}}-{{optioninfo.income_max}}</text>
               <text wx:if='{{optioninfo.occupation}}'>职业：{{optioninfo.occupation}}</text>
               <text wx:if='{{optioninfo.city}}'>{{optioninfo.city}}</text>
+      </view> -->
+
+      <view class='c data_zolist' wx:if='{{optioninfocode.code == 201}}'>
+              <text>年龄：{{optioninfo.age ? optioninfo.age : '无需求'}}</text>
+              <!-- <text wx:if='{{optioninfo.marry}}'>{{optioninfo.marry}}</text> -->
+              <text>身高：{{optioninfo.height ? optioninfo.height : '无需求'}}</text>
+              <text>地区：{{optioninfo.city? optioninfo.city : '无需求'}}</text>
+              <text>学历：{{optioninfo.education && optioninfo.education !=0 ? optioninfo.education : '无需求'}}</text>
+              <text>收入：{{optioninfo.income_min}}-{{optioninfo.income_max}}</text>
+              <text>职业：{{optioninfo.occupation && optioninfo.occupation !=0 ? optioninfo.occupation : '无需求'}}</text>
+ 
       </view>
 
+
       <view class='data_list c' wx:else>
               <view class='data_list_text'>暂无择偶信息</view>
       </view>

pages/index_details/index_details.wxss

@@ -8,7 +8,7 @@
 /* 个人相册 */
 .Album_box{margin-top:30rpx;}
 .Album_box  .Album:nth-child(4n){margin-right:0;}
-.Album{width:23.7%;height:161.8rpx;float:left;margin-right:13rpx;margin-bottom:13rpx;position:relative;}
+.Album{width:23.7%;height:161.8rpx;float:left;margin-right:1.7%;margin-bottom:13rpx;position:relative;border-radius:10rpx;overflow:hidden;}
 .Album .Album_img{width:100%;height:100%;}
 .Album_box text{display:block;text-align:center;font-size:28rpx;color:#333;}
 
@@ -33,9 +33,7 @@
 .data_title_r{float:right;font-size:24rpx;color:#A7A6A6;}
 .data_title_r image{width:10rpx;position:relative;top:-2rpx;margin-left:16rpx;height:0;}
 
-/* .data_list{margin-top:30rpx;} */
+
-.data_list text{border:1px solid #eee;display:block;float:left;padding:20rpx 30rpx;border-radius:100rpx;font-size:28rpx;color:#292828;margin-right:30rpx;margin-top:30rpx}
-.data_list_text{font-size:28rpx;color:#333;text-align:center;margin-top:60rpx;}
 
 /* 认证信息 */
 .data_rz_box{margin-top:30rpx;}
@@ -58,4 +56,25 @@
 .m_bottom_r{background: linear-gradient(to right, #FF9BCA , #FF79B8); width:468rpx;height:88rpx;float:right;position:relative;top:16rpx;right:34rpx;border-radius:10rpx;text-align:center;line-height:88rpx;}
 .m_bottom_r navigator{width:100%;height:100%;}
 .m_bottom_r image{width:42rpx;position:relative;top:9rpx;height:0;}
-.m_bottom_r text{font-size:28rpx;color:#FFF;margin-left:12rpx;}
+.m_bottom_r text{font-size:28rpx;color:#FFF;margin-left:12rpx;}
+
+
+/* .data_list{margin-top:30rpx;} */
+.data_list text{border:1px solid #eee;display:block;float:left;padding:20rpx 30rpx;border-radius:100rpx;font-size:28rpx;color:#292828;margin-right:30rpx;margin-top:30rpx}
+.data_list_text{font-size:28rpx;color:#333;text-align:center;margin-top:60rpx;}
+
+
+
+.data_zolist text{display:block;float:left;border-radius:8rpx;font-size:25rpx;color:#292828;margin-right:20rpx;margin-top:20rpx;width:47.9%;height:60rpx;text-align:center;line-height:60rpx;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;background:#ECF0FA;border:1px solid #E7EBF5;}
+.data_zolist text:nth-child(2n){margin-right:0;}
+
+
+
+
+
+.data_zjlist text{border:1px solid #E5E5E5;display:block;float:left;border-radius:8rpx;font-size:25rpx;color:#292828;margin-right:20rpx;margin-top:20rpx;width:47.9%;height:60rpx;text-align:center;line-height:60rpx;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;background:#F2F2F2;}
+.data_zjlist text.on{width:30.8%  !important;}
+.data_zjlist text.in{width:100%  !important;}
+.data_zjlist text:nth-child(3){margin-right:0;}
+.data_zjlist text:nth-child(6){margin-right:0;}
+.data_zjlist text:nth-child(8){margin-right:0;}

pages/index_screen/index_screen.js

@@ -14,8 +14,8 @@ Page({
     EducationArray: [], // 学历-数据
     Educationindex: '',  // 学历-下标
 
-    MarriageArray: [], // 婚史-数据
+    // MarriageArray: [], // 婚史-数据
-    Marriageindex: '',  // 婚史-下标
+    // Marriageindex: '',  // 婚史-下标
 
     incomeid: 0,
     incomeArray: [], // 收入-数据
@@ -25,8 +25,8 @@ Page({
 
     age: '',      //  年龄  
     height: '',      //  身高  
-    marry: '',    //   婚史 
+    // marry: '',    //   婚史 
-    idmarry: 0,
+    // idmarry: 0,
     education: '',    //  学历  
     educationid: 0,
     income: 0,     //  收入 
@@ -70,7 +70,7 @@ Page({
     app.globalData.Selection = 0;    //  是否选中  
     app.globalData.age = 0;    //  年龄  
     app.globalData.height = 0;    //  身高  
-    app.globalData.marry = 0  //  婚史  
+    // app.globalData.marry = 0  //  婚史  
     app.globalData.education = 0  //  学历  
     app.globalData.income = 0;     //  收入 
 
@@ -84,7 +84,7 @@ Page({
 
  
 
-    var _idmarry = option.idmarry
+    // var _idmarry = option.idmarry
     var _educationid = option.educationid    
 
 
@@ -94,7 +94,7 @@ Page({
       cityName: _cityname, // 市
       areaName: _areaname,  // 区
 
-      idmarry: _idmarry,
+      // idmarry: _idmarry,
       educationid: _educationid,
 
     })
@@ -243,34 +243,34 @@ Page({
 
 
     //  婚史 ajax
-    let Marriage_url = 'public/paramsgather?type=marriage';
+    // let Marriage_url = 'public/paramsgather?type=marriage';
-    let Marriage_data = {
+    // let Marriage_data = {
-      pid: '0'
+    //   pid: '0'
-    };
+    // };
-    var _marry = option.marry   //   婚史 
+    // var _marry = option.marry   //   婚史 
-    // console.log(_marry)
+    // // console.log(_marry)
-    that.setData({
+    // that.setData({
-      marry: _marry
+    //   marry: _marry
-    })
+    // })
-    app.postRequest(Marriage_url, Marriage_data, function (res) {      //  婚史 ajax
+    // app.postRequest(Marriage_url, Marriage_data, function (res) {      //  婚史 ajax
-      if (res.code == 201) {
+    //   if (res.code == 201) {
-        // console.log(res.data);
+    //     // console.log(res.data);
-        for (let i = 0; i < res.data.length; i++) {    //已选中的数据处理
+    //     for (let i = 0; i < res.data.length; i++) {    //已选中的数据处理
-          if (i == _marry) {
+    //       if (i == _marry) {
-            that.setData({
+    //         that.setData({
-              Marriageindex: i,
+    //           Marriageindex: i,
-            })
+    //         })
-          }
+    //       }
-        }
+    //     }
-
+
-        that.setData({
+    //     that.setData({
-          MarriageArray: res.data,
+    //       MarriageArray: res.data,
-          idmarry: that.data.idmarry,
+    //       idmarry: that.data.idmarry,
-        })
+    //     })
-
+
-      }
+    //   }
-
+
-    })
+    // })
 
 
     //  学历 ajax
@@ -471,17 +471,17 @@ Page({
     })
   },
 
-  MarriageEvent: function (e) {   //  婚史    单项选择器
+  // MarriageEvent: function (e) {   //  婚史    单项选择器
-    // console.log(this);
+  //   // console.log(this);
-    // console.log(e);
+  //   // console.log(e);
-    // console.log(this.data.MarriageArray[e.detail.value]);
+  //   // console.log(this.data.MarriageArray[e.detail.value]);
-    // console.log('picker发送选择改变，携带值为', e.detail.value)
+  //   // console.log('picker发送选择改变，携带值为', e.detail.value)
-    this.setData({
+  //   this.setData({
-      Marriageindex: e.detail.value,
+  //     Marriageindex: e.detail.value,
-      marry: e.detail.value,
+  //     marry: e.detail.value,
-      idmarry: 1,
+  //     idmarry: 1,
-    })
+  //   })
-  },
+  // },
 
 
 
@@ -568,8 +568,8 @@ Page({
     app.globalData.inputValue = String(_this.data.inputValue);     //用户ID
     app.globalData.age = String(_this.data.age);    //  年龄  
     app.globalData.height = String(_this.data.height);    //  身高  
-    app.globalData.marry = String(_this.data.marry)  //  婚史  
+    // app.globalData.marry = String(_this.data.marry)  //  婚史  
-    app.globalData.idmarry = String(_this.data.idmarry)  //  婚史  
+    // app.globalData.idmarry = String(_this.data.idmarry)  //  婚史  
     app.globalData.education = String(_this.data.education)  //  学历  
     app.globalData.educationid = String(_this.data.educationid)  //  学历  
     app.globalData.income = String(_this.data.income);     //  收入 
@@ -615,9 +615,9 @@ Page({
       height: 0, //身高
       heightid: 0,
 
-      Marriageindex: '',  // 婚史-下标
+      // Marriageindex: '',  // 婚史-下标
-      marry: 0,
+      // marry: 0,
-      idmarry: 0,
+      // idmarry: 0,
 
       Educationindex: '',    //学历
       education: 0,   //学历
@@ -639,8 +639,8 @@ Page({
     app.globalData.inputValue = String(_this.data.inputValue);     //用户ID
     app.globalData.age = String(_this.data.age);    //  年龄  
     app.globalData.height = String(_this.data.height);    //  身高  
-    app.globalData.marry = String(_this.data.marry)  //  婚史  
+    // app.globalData.marry = String(_this.data.marry)  //  婚史  
-    app.globalData.idmarry = String(_this.data.idmarry)  //  婚史  
+    // app.globalData.idmarry = String(_this.data.idmarry)  //  婚史  
     app.globalData.education = String(_this.data.education)  //  学历  
     app.globalData.educationid = String(_this.data.educationid)  //  学历  
     app.globalData.income = String(_this.data.income);     //  收入 

pages/index_screen/index_screen.wxml

@@ -118,8 +118,8 @@
 
 
 
-
+     <!--  婚史 单项选择器-->
-            <view class="Choice_dx_box">     <!--  婚史 单项选择器-->
+            <!-- <view class="Choice_dx_box">
                         <picker  bindchange="MarriageEvent" value="{{Marriageindex}}" range="{{MarriageArray}}">
                                 
                                   <view class='Choice_dx c'>
@@ -140,7 +140,7 @@
                                          </block>
                                   </view>
                       </picker>
-            </view>
+            </view> -->
             
 
 

pages/personal_core/personaldata/personaldata.js

@@ -16,16 +16,61 @@ Page({
     headurl: [],    //个人头像
 
 
-
+    uploadImages: [], //相册放大图集
+    albumimg: '', // 相册
+    albumimgurl: '',// 相册url
  
   },
 
 
+  // 相册点击放大
+  enlarge: function (e) {
+    var that = this;
+    // console.log(that.data.uploadImages)
+    wx.previewImage({
+      urls: that.data.uploadImages,
+      current: e.currentTarget.dataset.src
+    })
+
+  },
+
 
 
   onShow: function (options) {
     var that = this;
 
+    //    个人相册
+    let albumimg_url = 'my/images/albumchange';
+    let albumimg_data = {
+
+    };
+    app.postRequest(albumimg_url, albumimg_data, function (res) {
+      // console.log(res.data.url);
+   
+      if (res.code == 201) {
+
+        //  对象转数组
+        var itemList = res.data;
+        //声明一个空的数组
+        var items = [];
+        //遍历数据
+        for (let i in itemList) {
+          //push到空数组里
+          items.push( itemList[i].img);
+        }
+
+        that.setData({
+          albumimg: res.data,
+          uploadImages: items,
+        })
+   
+      }
+    })
+
+
+
+
+
   //  个人信息
     let information_url = 'my/personaldata/personal';
     let information_data = {
@@ -136,7 +181,7 @@ Page({
     var _this = this;
 
     wx.showActionSheet({
-      itemList: ['预览图片', '上传头像'],
+      itemList: ['预览头像', '上传头像'],
       success(res) {
         // console.log(res.tapIndex)
 
@@ -205,6 +250,7 @@ Page({
                                                   getApp().Tips(_qrcode2);
 
 
+
                                                 }, fail: function (d) {
 
                                                 }

pages/personal_core/personaldata/personaldata.wxml

@@ -67,6 +67,33 @@
 </view> -->
 
 
+<!-- 个人相册 -->
+<view class='data_box' style='margin-top:20rpx;'>
+      <view class='data_title c'>
+                <view class='data_title_l'> <image src='/image/xtb1.png'  mode="widthFix" style='position:relative;top:6px;width: 40rpx;'></image> 个人相册</view>
+
+                <navigator class='data_title_r' hover-class="none" url="/pages/personal_core/Album/Album">
+                        <text>编辑</text>
+                        <image src='/image/personal5.png' mode="widthFix"></image>
+                </navigator>
+
+      </view>
+
+      <view class='Album_box c' wx:if="{{albumimg}}">
+                  <block wx:for='{{albumimg}}'  wx:key="item">  
+                          <view class='Album'  >
+                                  <image mode="aspectFill" class='Album_img'  src='{{item.img}}'  data-src='{{item.img}}'  bindtap='enlarge'></image>
+                          </view>
+                  </block>
+      </view>
+
+      <view  class='Album_box c' wx:else>
+             <text>您还没上传相册图片</text>
+      </view>
+
+</view>
+
+
 <!-- 个人信息 -->
 <view class='data_box' style='margin-top:20rpx;'>
       <view class='data_title c'>
@@ -78,16 +105,16 @@
                 </navigator>
       </view>
 
-      <view class='data_list c'>
+      <view class=' c data_zjlist'>
-              <text wx:if='{{information.nickname}}'>{{information.nickname}}</text>
+              <text wx:if='{{information.nickname}}' class='on'>{{information.nickname}}</text>
-              <text wx:if='{{information.sex}}'>{{information.sex}}</text>
+              <text wx:if='{{information.sex}}'  class='on'>{{information.sex}}</text>
-              <text wx:if='{{information.age}}'>{{information.age}}</text>
+              <text wx:if='{{information.age}}'  class='on'>{{information.age}}</text>
-              <text wx:if='{{information.height}}'>{{information.height}}</text>
+              <text wx:if='{{information.height}}' class='on'>{{information.height}}</text>
-              <text wx:if='{{information.education}}'>{{information.education}}</text>
+              <text wx:if='{{information.education}}' class='on'>{{information.education}}</text>
-              <text wx:if='{{information.marry}}'>{{information.marry}}</text>
+              <text wx:if='{{information.marry}}' class='on'>{{information.marry}}</text>
               <text wx:if='{{information.income}}'>{{information.income}}</text>
               <text wx:if='{{information.occupation}}'>{{information.occupation}}</text>
-              <text wx:if='{{information.nickname &&  information.province && information.city}}'>{{information.province}}-{{information.city}}-{{information.area}}</text>
+              <text wx:if='{{information.nickname &&  information.province && information.city}}' class='in'>故乡：{{information.city_name}}</text>
       </view>
 </view>
 
@@ -105,14 +132,15 @@
                 
       </view>
 
-      <view class='data_list c' wx:if='{{optioninfocode.code == 201}}'>
+      <view class='c data_zolist' wx:if='{{optioninfocode.code == 201}}'>
-              <text  wx:if='{{optioninfo.age}}'>{{optioninfo.age}}</text>
+              <text>年龄：{{optioninfo.age ? optioninfo.age : '无需求'}}</text>
-              <text wx:if='{{optioninfo.marry}}'>{{optioninfo.marry}}</text>
+              <!-- <text wx:if='{{optioninfo.marry}}'>{{optioninfo.marry}}</text> -->
-              <text wx:if='{{optioninfo.height}}'>{{optioninfo.height}}</text>
+              <text>身高：{{optioninfo.height ? optioninfo.height : '无需求'}}</text>
-              <text wx:if='{{optioninfo.education}}'>{{optioninfo.education}}</text>
+              <text>地区：{{optioninfo.city? optioninfo.city : '无需求'}}</text>
-              <text wx:if='{{optioninfo.income_min && optioninfo.income_max}}'>{{optioninfo.income_min}}-{{optioninfo.income_max}}</text>
+              <text>学历：{{optioninfo.education && optioninfo.education !=0 ? optioninfo.education : '无需求'}}</text>
-              <text wx:if='{{optioninfo.occupation}}'>职业：{{optioninfo.occupation}}</text>
+              <text>收入：{{optioninfo.income_min}}-{{optioninfo.income_max}}</text>
-              <text wx:if='{{optioninfo.city}}'>{{optioninfo.city}}</text>
+              <text>职业：{{optioninfo.occupation && optioninfo.occupation !=0 ? optioninfo.occupation : '无需求'}}</text>
+ 
       </view>
 
       <view class='data_list c' wx:else>

pages/personal_core/personaldata/personaldata.wxss

@@ -36,7 +36,10 @@
 .data_title_r image{width:10rpx;position:relative;top:-2rpx;margin-left:16rpx;height:0;}
 
 /* .data_list{margin-top:30rpx;} */
-.data_list text{border:1px solid #E5E5E5;display:block;float:left;padding:10rpx 30rpx;border-radius:100rpx;font-size:28rpx;color:#292828;margin-right:30rpx;margin-top:30rpx}
+
+
+.data_zolist text{display:block;float:left;border-radius:8rpx;font-size:25rpx;color:#292828;margin-right:20rpx;margin-top:20rpx;width:47.9%;height:60rpx;text-align:center;line-height:60rpx;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;background:#ECF0FA;border:1px solid #E7EBF5;}
+.data_zolist text:nth-child(2n){margin-right:0;}
 .data_list_text{font-size:28rpx;color:#333;text-align:center;margin-top:60rpx;}
 
 /* 认证信息 */
@@ -50,4 +53,21 @@
 
 /* 二维码 */
 .data_QRcode{border:1px dashed #D0D1D1;width:140rpx;height:140rpx;margin-top:30rpx;}
-.data_QRcode image{width:100%;height:100%;}
+.data_QRcode image{width:100%;height:100%;}
+
+
+
+
+.data_zjlist text{border:1px solid #E5E5E5;display:block;float:left;border-radius:8rpx;font-size:25rpx;color:#292828;margin-right:20rpx;margin-top:20rpx;width:47.9%;height:60rpx;text-align:center;line-height:60rpx;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;background:#F2F2F2;}
+.data_zjlist text.on{width:30.8%  !important;}
+.data_zjlist text.in{width:100%  !important;}
+.data_zjlist text:nth-child(3){margin-right:0;}
+.data_zjlist text:nth-child(6){margin-right:0;}
+.data_zjlist text:nth-child(8){margin-right:0;}
+
+
+.Album_box{margin-top:30rpx;}
+.Album_box  .Album:nth-child(4n){margin-right:0;}
+.Album{width:23.7%;height:161.8rpx;float:left;margin-right:1.7%;margin-bottom:13rpx;position:relative;border-radius:10rpx;overflow:hidden;}
+.Album .Album_img{width:100%;height:100%;}
+.Album_box text{display:block;text-align:center;font-size:28rpx;color:#333;}

pages/personal_core/personaldataModifythe/personaldataModifythe.js

@@ -1,5 +1,4 @@
 const app = getApp();
-
 Page({
 
   data: {
@@ -567,9 +566,14 @@ Page({
                   icon: 'success',
                   duration: 2000
                 })
-
+            return;
           }
 
+      var fail = res.data.nickname[0];    //调用提示框
+      getApp().Tips(fail)
+
+
+
       })
 
   },

pages/personal_core/requirements/requirements.js

@@ -13,8 +13,8 @@ Page({
     EducationArray: [], // 学历-数据
     Educationindex: '',  // 学历-下标
 
-    MarriageArray: [], // 婚史-数据
+    // MarriageArray: [], // 婚史-数据
-    Marriageindex: '',  // 婚史-下标
+    // Marriageindex: '',  // 婚史-下标
 
     incomeid:0,
     incomeArray: [], // 收入-数据
@@ -38,7 +38,7 @@ Page({
     city: '',     // 市
     area: '',     // 区
     education: '',    //  学历  
-    marry: '',    //   婚史 
+    // marry: '',    //   婚史 
     income: '',     //  收入 
     occupation: '',     //  职业  
 
@@ -259,21 +259,21 @@ Page({
 
 
       //  婚史 ajax
-      let Marriage_url = 'public/paramsgather?type=marriage';
+      // let Marriage_url = 'public/paramsgather?type=marriage';
-      let Marriage_data = {
+      // let Marriage_data = {
-        pid: '0'
+      //   pid: '0'
-      };
+      // };
 
   
-      app.postRequest(Marriage_url, Marriage_data, function (res) {      //  婚史 ajax
+      // app.postRequest(Marriage_url, Marriage_data, function (res) {      //  婚史 ajax
-        if (res.code == 201) {
+      //   if (res.code == 201) {
-                that.setData({
+      //           that.setData({
-                  MarriageArray: res.data
+      //             MarriageArray: res.data
-                })
+      //           })
 
-        }
+      //   }
 
-      })
+      // })
 
       //  收入 ajax
       let income_url = 'public/paramsgather?type=shouru1';
@@ -383,12 +383,12 @@ Page({
           city: res.data.city,     // 市
           area: res.data.area,     // 区
           education: res.data.education,    //  学历  
-          marry: res.data.marry,    //   婚史 
+          // marry: res.data.marry,    //   婚史 
           income: _income,     //  收入 
           occupation: res.data.occupation,     //  职业
 
         
-          Marriageindex: res.data.marry,    //   婚史 
+          // Marriageindex: res.data.marry,    //   婚史 
 
     
           personacodel: res,    //获取全部数据
@@ -528,16 +528,16 @@ Page({
     })
   },
 
-  MarriageEvent: function (e) {   //  婚史    单项选择器
+  // MarriageEvent: function (e) {   //  婚史    单项选择器
-    // console.log(this);
+  //   // console.log(this);
-    // console.log(e);
+  //   // console.log(e);
-    // console.log(this.data.MarriageArray[e.detail.value]);
+  //   // console.log(this.data.MarriageArray[e.detail.value]);
-    // console.log('picker发送选择改变，携带值为', e.detail.value)
+  //   // console.log('picker发送选择改变，携带值为', e.detail.value)
-    this.setData({
+  //   this.setData({
-      Marriageindex: e.detail.value,
+  //     Marriageindex: e.detail.value,
-      marry: e.detail.value
+  //     marry: e.detail.value
-    })
+  //   })
-  },
+  // },
 
   incomeEvent: function (e) {   //  收入    单项选择器
     var that = this;
@@ -770,7 +770,7 @@ Page({
         // console.log(this.data.age);              //  年龄 
         console.log(this.data.height);           //  身高 
         console.log(this.data.education);      //  学历  
-        console.log(this.data.marry);          //   婚史 
+        // console.log(this.data.marry);          //   婚史 
         console.log(this.data.income);        //  收入 
         console.log(this.data.province);       //  省 
         console.log(this.data.city);              //  市 
@@ -786,7 +786,7 @@ Page({
         var city = this.data.city                       // 市
         var area = this.data.area                     // 区
         var education = this.data.education  //  学历  
-        var marry = this.data.marry                 //   婚史 
+        // var marry = this.data.marry                 //   婚史 
         var income = this.data.income             //  收入 
         var occupation = this.data.occupation  //  职业
 
@@ -801,7 +801,7 @@ Page({
                       city: this.data.city,     // 市
                       area: this.data.area,     // 区
                       education: this.data.education,    //  学历  
-                      marry: this.data.marry,    //   婚史 
+                      // marry: this.data.marry,    //   婚史 
                       income: _income,     //  收入 
                       occupation: this.data.occupation,     //  职业
 

pages/personal_core/requirements/requirements.wxml

@@ -162,8 +162,8 @@
 
 
 
-
+<!--  婚史 单项选择器-->
-<view class="Choice_dx_box" data-asd="{{MarriageArray[Marriageindex]}}">     <!--  婚史 单项选择器-->
+<!-- <view class="Choice_dx_box" data-asd="{{MarriageArray[Marriageindex]}}">     
             <picker  bindchange="MarriageEvent" value="{{Marriageindex}}" range="{{MarriageArray}}">
                     
                       <view class='Choice_dx c'>
@@ -183,7 +183,7 @@
                                 
                       </view>
           </picker>
-</view>
+</view> -->
 
 
    <!--  收入 双选-->

pages/zheo_More/zheo_More.wxml

@@ -42,7 +42,7 @@
                     </view>
         </view>
 
-        <view class="Choice_dx_box"  wx:if="{{optioninfo.marry}}">  
+        <!-- <view class="Choice_dx_box"  wx:if="{{optioninfo.marry}}">  
                     <view class='Choice_dx c'>
                           <view class="Choice_dx_title">婚史</view>
 
@@ -50,7 +50,7 @@
                               {{optioninfo.marry}}
                           </view> 
                     </view>
-        </view>
+        </view> -->
 
         <view class="Choice_dx_box"  wx:if="{{optioninfo.income_min}}">  
                     <view class='Choice_dx c'>