1

app.json

@@ -1,5 +1,6 @@
 {
   "pages": [
+        "pages/personal_core/vehicle/vehicle",
  "pages/personal_core/remind/remind",
   "pages/Jurisdiction/click_Jurisdiction/click_Jurisdiction",
   "pages/Setup/modify/modify",
@@ -23,7 +24,7 @@
     "pages/personal_core/Realestate/Realestate",
     "pages/personal_core/Adegreein/Adegreein",
     "pages/personal_core/Realname/Realname",
-    "pages/personal_core/vehicle/vehicle",
+
     "pages/personal_core/home_list/home_list",
     "pages/index_details/index_details",
     "pages/index/index",

pages/personal_core/Album/Album.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "上传照片"
+  "navigationBarTitleText": "个人相册"
 }

pages/personal_core/personaldata/personaldata.js

@@ -104,7 +104,7 @@ Page({
     let adopticon_data = {
     };
     app.postRequest(adopticon_url, adopticon_data, function (res) {
-      // console.log(res.data);
+      console.log(res.data);
       // console.log(res);
       if (res.code == 201) {
 
@@ -156,48 +156,88 @@ Page({
       sourceType: ['album', 'camera'],
       success(res) {
 
-        // console.log(res.tempFilePaths[0]);
-        // tempFilePath可以作为img标签的src属性显示图片
-        _this.setData({
-          uploadImages: res.tempFilePaths,
-          isMaxImagesNum: true,
-          uploadimg: false,
-          photo: res.tempFilePaths[0],
-        });
 
-        //上传图片
-        wx.uploadFile({
-          url: app.globalData.url + 'my/images/headimg',
-          filePath: res.tempFilePaths[0],
-          name: 'photo',
-          formData: {
-            key: wx.getStorageSync('access_key'),
-            token: wx.getStorageSync('access_token')
-          },
-          success: function (res) {
+        let tempFilesSize = res.tempFiles[0].size;
 
-            var data = JSON.parse(res.data);
+        if (tempFilesSize > 1024 * 1024 * 3) {
 
-            if (data.code == 201) {
+          wx.showModal({
+            title: '提示',
+            content: '图片不得超过3MB',
+            showCancel: false,
+          })
 
-              var _qrcode = '上传成功'
-              getApp().Tips(_qrcode);
+          return;
+        }
 
+        var Headportrait = res.tempFilePaths[0];
+        console.log(res.tempFilePaths[0]);
 
-              _this.onShow();
 
-              return;
+        wx.showModal({
+          title: '形象照',
+          content: '您确认上传此图片为形象照吗？',
+          success(res) {
+            if (res.confirm) {
+                        // console.log('用户点击确定')
+     
+                        // tempFilePath可以作为img标签的src属性显示图片
+                        _this.setData({
+                          uploadImages: Headportrait,
+                          isMaxImagesNum: true,
+                          uploadimg: false,
+                          photo: Headportrait,
+                        });
 
-            }
+                        //上传图片
+                        wx.uploadFile({
+                          url: app.globalData.url + 'my/images/headimg',
+                          filePath: Headportrait,
+                          name: 'photo',
+                          formData: {
+                            key: wx.getStorageSync('access_key'),
+                            token: wx.getStorageSync('access_token')
+                          },
+                          success: function (res) {
+
+                            var data = JSON.parse(res.data);
+                            console.log(data);
+                            if (data.code == 201) {
+
+                              var _qrcode = '上传成功'
+                              getApp().Tips(_qrcode);
+
+
+                              _this.onShow();
+
+                              return;
+
+                            }
+                          
+                            var _qrcode2 = data.msg;
+                            getApp().Tips(_qrcode2);
+                  
+
+                          }, fail: function (d) {
 
-            var _qrcode2 = '上传失败'
-            getApp().Tips(_qrcode2);
+                          }
+                        })
 
-          }, fail: function (d) {
+           
+            } else if (res.cancel) {
+
+              console.log('用户点击取消')
+            }
 
           }
         })
 
+
+
+
+
+
+
       }
     })
 

pages/personal_core/personaldata/personaldata.wxml

@@ -22,7 +22,7 @@
                 </view>
 
                 <view class='Not_pass_img' hidden='{{uploadimg}}'>
-                        <image src='{{uploadImages}}'></image>
+                        <image mode="aspectFill" src='{{uploadImages}}'></image>
                 </view>
 
       </view>
@@ -131,13 +131,31 @@
       </view>
 
       <view class='data_rz_box c' wx:if='{{adopticoncode.code == 201}}'>
-              <block wx:for="{{adopticon}}" wx:key="item">
-                  <view class='data_rz'>
-                          <image src='{{item.icon}}' mode="aspectFill"></image>
-                          <text class='data_smrz'>{{item.name}}</text>
-                          <text class='data_yrz'>{{item.status}}</text>
-                  </view>
-              </block>
+
+                <view class='data_rz' wx:if='{{adopticon.shenfenzheng}}'>
+                          <image src='{{adopticon.shenfenzheng.icon}}' mode="aspectFill"></image>
+                          <text class='data_smrz'>{{adopticon.shenfenzheng.name}}</text>
+                          <text class='data_yrz'>{{adopticon.shenfenzheng.status}}</text>
+                </view>
+
+                <view class='data_rz' wx:if='{{adopticon.xueli}}'>
+                          <image src='{{adopticon.xueli.icon}}' mode="aspectFill"></image>
+                          <text class='data_smrz'>{{adopticon.xueli.name}}</text>
+                          <text class='data_yrz'>{{adopticon.xueli.status}}</text>
+                </view>
+
+               <view class='data_rz' wx:if='{{adopticon.chenliang}}'>
+                          <image src='{{adopticon.chenliang.icon}}' mode="aspectFill"></image>
+                          <text class='data_smrz'>{{adopticon.chenliang.name}}</text>
+                          <text class='data_yrz'>{{adopticon.chenliang.status}}</text>
+                </view>
+
+               <view class='data_rz' wx:if='{{adopticon.fangchangzheng}}'>
+                          <image src='{{adopticon.fangchangzheng.icon}}' mode="aspectFill"></image>
+                          <text class='data_smrz'>{{adopticon.fangchangzheng.name}}</text>
+                          <text class='data_yrz'>{{adopticon.fangchangzheng.status}}</text>
+                </view>
+
       </view>
 
       <view class='data_rz_box c'  wx:else>

pages/personal_core/personaldata/personaldata.wxss

@@ -10,6 +10,7 @@
 .Headportrait_text text{font-size:25rpx;color:#FFF;margin-left:10rpx;}
 .Not_pass_img{width:100%;height:100%;}
 
+
 .personal_img_text{border:1px solid;position:absolute;bottom:0;left:0;}
 .personal_increase{position:absolute;bottom:20rpx;right:30rpx;width:56rpx;}
 .personal_increase image{width:100%;height:0;}

pages/personal_core/personaldataModifythe/personaldataModifythe.js

@@ -208,7 +208,7 @@ Page({
             if (res.data[i].id == _income) {
 
                 that.setData({
-                  incomeindex: i,
+                   incomeindex: i,
                 })
             }
           }
@@ -222,12 +222,26 @@ Page({
 
 
       //  婚史 ajax
-      let Marriage_url = 'public/paramsgather?type=marriage';
+      let Marriage_url = 'public/paramsgather?type=marriage&marriage=1';
       let Marriage_data = {
         pid: '0'
       };
+
+      let _marry = res.data.marry;
+
       app.postRequest(Marriage_url, Marriage_data, function (res) {      //  婚史 ajax
         if (res.code == 201) {
+
+
+          for (let i = 0; i < res.data.length; i++) {    //已选中的数据处理
+            if (res.data[i].id == _marry) {
+
+              that.setData({
+                Marriageindex: i,
+              })
+            }
+          }
+
           // console.log(res.data);
           that.setData({
             MarriageArray: res.data
@@ -267,57 +281,8 @@ Page({
     })
 
 
-    // 获取区域ID
-    // var _openid = 0;
-    // try {
-    //   var value = wx.getStorageSync('openid');
-    //   if (value) {
-    //     _openid = value
-
-    //     that.setData({
-    //       openid: _openid
-    //     })
-
-
-    //   }
-    //   console.log(_openid);
-    // } catch (e) {
-    //   // Do something when catch error
-    // }
 
 
-
-    //  性别 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
-    //     })
-
-    //   }
-
-
-    // })
-
-
-    //  允许有意者联系我 ajax
-
-    // let contact_url = 'public/citypid';
-    // let contact_data = {
-    //   pid: '0'
-    // };
-    // app.postRequest(contact_url, contact_data, function (res) {      //  允许有意者联系我 ajax
-    //   // console.log(res);
-    //   that.setData({
-    //     contactArray: res.data
-    //   })
-    // })
-
   },
 
 
@@ -374,11 +339,12 @@ Page({
   MarriageEvent: function (e) {   //  婚史    单项选择器
     // console.log(this);
     // console.log(e);
+    console.log(this.data.MarriageArray[e.detail.value].id);
     // console.log(this.data.MarriageArray[e.detail.value]);
     // console.log('picker发送选择改变，携带值为', e.detail.value)
     this.setData({
       Marriageindex: e.detail.value,
-      marry: e.detail.value
+      marry: this.data.MarriageArray[e.detail.value].id
     })
   },
 
@@ -404,19 +370,6 @@ Page({
     })
   },
 
-  // contactEvent: function (e) {   //  允许有意者联系我    单项选择器
-  //   // console.log(this.data.selectArray[e.detail.value].area_name)
-  //   // console.log('picker发送选择改变，携带值为', e.detail.value)
-  //   console.log(this);
-  //   console.log(e);
-  //   console.log(this.data.contactArray[e.detail.value]);
-  //   console.log('picker发送选择改变，携带值为', e.detail.value)
-  //   this.setData({
-  //     contactindex: e.detail.value
-  //   })
-  // },
-
-
 
   getProvince() {    //  多项选择器
 
@@ -577,36 +530,18 @@ Page({
   //下一步事件
   register: function (e) {
 
-    console.log(this.data.nickname);       //  名字  
-    // console.log(this.data.sex);                 //  性别  
-    console.log(this.data.age);              //  年龄 
-    console.log(this.data.height);           //  身高 
-    console.log(this.data.education);      //  学历  
-    console.log(this.data.marry);          //   婚史 
-    console.log(this.data.income);        //  收入 
-    console.log(this.data.province);       //  省 
-    console.log(this.data.city);              //  市 
-    console.log(this.data.area);              //  区 
-
-
-
-    var nickname = this.data.nickname  //姓名
-    // var sex = this.data.sex                     //  性别  
-    var age = this.data.age                     //  年龄  
-    var height = this.data.height             //  身高  
-    var province = this.data.province      // 市
-    var city = this.data.city                       // 市
-    var area = this.data.area                     // 区
-    var education = this.data.education  //  学历  
-    var marry = this.data.marry                 //   婚史 
-    var income = this.data.income             //  收入 
-    var occupation = this.data.occupation  //  收入 occupation
-
-    // wx.navigateTo({
-    //   url: '/pages/register/fillTel/fillTel?nickname=' + nickname +  '&sex=' + sex + '&age=' + age + '&height=' + height + '&education=' + education + '&marry=' + marry + '&income=' + income + '&city=' + city + '&area=' + area + '&occupation=' + occupation + '&province=' + province + ''
-    // })
+    // console.log(this.data.nickname);       //  名字  
+     // console.log(this.data.sex);                 //  性别  
+    // console.log(this.data.age);              //  年龄 
+    // console.log(this.data.height);           //  身高 
+    // console.log(this.data.education);      //  学历  
+    // console.log(this.data.marry);          //   婚史 
+    // console.log(this.data.income);        //  收入 
+    // console.log(this.data.province);       //  省 
+    // console.log(this.data.city);              //  市 
+    // console.log(this.data.area);              //  区 
+
 
-  
 
     //  修改个人信息
     let editinfoform_url = 'my/personaldata/editinfoform';

pages/personal_core/personaldataModifythe/personaldataModifythe.wxml

@@ -121,19 +121,19 @@
 
 
 <view class="Choice_dx_box">     <!--  婚史 单项选择器-->
-            <picker  bindchange="MarriageEvent" value="{{Marriageindex}}" range="{{MarriageArray}}">
+            <picker  bindchange="MarriageEvent" value="{{Marriageindex}}" range="{{MarriageArray}}"   range-key="name">
                     
                       <view class='Choice_dx c'>
                             <view class="Choice_dx_title">婚史</view>
 
                             <view class='Choice_dx_text' wx:if='{{personacodel.code == 201}}'>
                               
-                                  {{MarriageArray[Marriageindex]}}
+                                  {{MarriageArray[Marriageindex].name}}
                                 
                             </view>
                             <view class='Choice_dx_text' wx:else>
                               
-                                  {{MarriageArray[Marriageindex] ? MarriageArray[Marriageindex]  : "请选择"}}
+                                  {{MarriageArray[Marriageindex].name ? MarriageArray[Marriageindex].name  : "请选择"}}
                                 
                             </view>
                                 
@@ -184,24 +184,6 @@
 </view>
 
 
-<!--  允许有意者联系我  单项选择器-->
-<!-- <view class="Choice_dx_box">     
-            <picker  bindchange="contactEvent" value="{{contactindex}}" range="{{contactArray}}"  range-key="area_name">
-                    
-                      <view class='Choice_dx c'>
-                            <view class="Choice_dx_title">允许有意者联系我</view>
-
-                            <view class='Choice_dx_text' >
-                              
-                                  {{contactArray[contactindex].area_name ? contactArray[contactindex].area_name  : "请选择"}}
-                                
-                            </view>
-                                
-                      </view>
-          </picker>
-</view>
-       -->
-  
 
 
 

pages/personal_core/vehicle/vehicle.js

@@ -84,8 +84,12 @@ Page({
           return;
         }
 
-        _this.setData({
-          loadingHidden: false
+        // _this.setData({
+        //   loadingHidden: false
+        // });
+        wx.showToast({
+          title: '上传中...',
+          icon: 'loading'
         });
 
       
@@ -95,7 +99,7 @@ Page({
         app.Multigraph(dt_url, dt_filePath, function (res) {
 
           if (res.code == 201) {
-             console.log(res.data.img_name);
+            //  console.log(res.data.img_name);
 
 
             _this.setData({
@@ -103,11 +107,17 @@ Page({
               xszzyImagesNum: true,
               // scsfzimg: false,
               positive: res.data.img_name,     //手持身份证
-              loadingHidden: true         //加载中
             });
 
-          }
+            wx.showToast({
+              title: '上传成功',
+              icon: 'none',  // 不显示图标
+              duration: 2000
+            })
 
+            return;     
+          }
+          app.Tips(res.msg);
         });
 
       }
@@ -138,8 +148,9 @@ Page({
           return;
         }
 
-        _this.setData({
-          loadingHidden: false
+        wx.showToast({
+          title: '上传中...',
+          icon: 'loading'
         });
 
 
@@ -149,8 +160,7 @@ Page({
         app.Multigraph(dt_url, dt_filePath, function (res) {
 
                 if (res.code == 201) {
-                  console.log(res.data.img_name);
-
+                  // console.log(res.data.img_name);
 
                   _this.setData({
                     xszfyImages: dt_filePath,
@@ -158,11 +168,18 @@ Page({
                     // scsfzimg: false,
                     opposite: res.data.img_name,     //手持身份证
                     loadingHidden: true         //加载中
-                    
+                                        
                   });
-                    
-                }
 
+                  wx.showToast({
+                    title: '上传成功',
+                    icon: 'none',  // 不显示图标
+                    duration: 2000
+                  })
+
+                  return;     
+                }
+                 app.Tips(res.msg);
 
 
         });

pages/register/OwnData/OwnData.js

@@ -170,13 +170,13 @@ Page({
 
 
     //  婚史 ajax
-    let Marriage_url = 'public/paramsgather?type=marriage';
+    let Marriage_url = 'public/paramsgather?type=marriage&marriage=1';
     let Marriage_data = {
       pid: '0'
     };
     app.postRequest(Marriage_url, Marriage_data, function (res) {      //  婚史 ajax
       if (res.code == 201) {
-        // console.log(res.data);
+        console.log(res.data);
 
     
         that.setData({
@@ -194,7 +194,7 @@ Page({
     };
     app.postRequest(income_url, income_data, function (res) {      //  收入 ajax
       if (res.code == 201) {
-        console.log(res.data);
+        // console.log(res.data);
         that.setData({
           incomeArray: res.data
         })
@@ -285,9 +285,10 @@ Page({
     // console.log(e);
     // console.log(this.data.MarriageArray[e.detail.value]);
     // console.log('picker发送选择改变，携带值为', e.detail.value)
+    // console.log(this.data.MarriageArray[e.detail.value].id);
     this.setData({
       Marriageindex: e.detail.value,
-      marry: e.detail.value
+      marry: this.data.MarriageArray[e.detail.value].id
     })
   },
 

pages/register/OwnData/OwnData.wxml

@@ -111,14 +111,15 @@
 
 
 <view class="Choice_dx_box">     <!--  婚史 单项选择器-->
-            <picker  bindchange="MarriageEvent" value="{{Marriageindex}}" range="{{MarriageArray}}">
+            <picker  bindchange="MarriageEvent" value="{{Marriageindex}}" range="{{MarriageArray}}" range-key="name">
                     
                       <view class='Choice_dx c'>
                             <view class="Choice_dx_title">婚史</view>
 
                             <view class='Choice_dx_text' >
                               
-                                  {{MarriageArray[Marriageindex] ? MarriageArray[Marriageindex]  : "请选择"}}
+                                  {{MarriageArray[Marriageindex].name ? MarriageArray[Marriageindex].name  : "请选择"}}
+                                     
                                 
                             </view>