Merge branch 'master' of gitpfg.pinfangw.com:gaofangming/yhb

pages/index/index.js

@@ -57,7 +57,7 @@ Page({
     page: 1,//当前页码
     limit: 10,//获取条数
     morehide: false,   //暂无更多信息显示隐藏
-    moreTxt:'',
+    moreTxt: '', 
 
   },
 
@@ -69,6 +69,12 @@ Page({
 
   onShow: function (options) {
     var that = this;
+
+    that.setData({
+      page: 1,//当前页码
+    })
+
+
     getApp().showLoading();   //提示加载中
     
     // console.log(app.globalData.height);
@@ -766,28 +772,42 @@ Page({
       // area: that.data.area,                    // 区
     };
     app.postRequest(home_url, home_data, function (res) {
+
       if (res.code == 201) {
         // console.log(res.data);
         var home = that.data.home
+
+        var moreTxt = '';
+        if (0 < (res.data.length < 10)) {
+          moreTxt = '暂无更多数据。'
+          console.log('无')
+        } else {
+          moreTxt = ''
+          console.log('有')
+        }
+
         // 设置数据
         for (var i = 0; i < res.data.length; i++) {
           home.push(res.data[i]);
         }
      
-
         that.setData({
           home: home,
+          morehide: true,
+          moreTxt: moreTxt,
         })
 
         that.cancelLoading();   //数据加载完关闭
         return;
       }
+
+
         that.cancelLoading();   //数据加载完关闭
 
         that.setData({
           home_code: res.code,
           morehide: true,
-          moreTxt :'暂无更多数据。'
+          moreTxt:"暂无更多数据。"
         })
 
         
@@ -828,9 +848,18 @@ Page({
     };
     app.postRequest(home_url, home_data, function (res) {
       if (res.code == 201) {
+
+        var moreTxt = '';
+        if (res.data.length < 10) {
+          moreTxt = '暂无更多数据。'
+        } else {
+          moreTxt = ''
+        }
+
         console.log(res.data);
         that.setData({
           home: res.data,
+          moreTxt: moreTxt,
           home_code: res.code,
         })
 
@@ -842,7 +871,7 @@ Page({
         that.cancelLoading();   //数据加载完关闭
 
         that.setData({
-          home_code: res.code,
+          home: res.data,
           morehide: true,
           moreTxt: '暂无更多数据。'
         })

pages/index/index.wxml

@@ -195,7 +195,7 @@
 
         <block wx:for='{{home}}' wx:key="item" wx:for-index="id">
               
-                <view class='m_wntj_list c' wx:if="{{home_code == 201}}">
+                <view class='m_wntj_list c'>
                         <navigator hover-class="none" url="/pages/index_details/index_details?uid={{item.uid}}&img={{item.img}}"></navigator>
                         <view class='m_wntj_list_img'>
                               <image mode="aspectFill" src='{{item.img}}'></image>

pages/index_details/index_details.wxss

@@ -25,9 +25,9 @@
 .information_r text{font-size:18rpx;color:#FFF;display:block;text-align:center;position:relative;z-index:10;top:51rpx;}
 
 /* 个人信息  */
-.data_box{margin-top:20rpx;padding:0 30rpx;}
+.data_box{margin-top:20rpx;padding:0 30rpx 10rpx 30rpx;}
 
-.data_title{border-bottom:1px solid #f8f8f8;padding-bottom:16rpx;}
+.data_title{border-bottom:1px solid #f8f8f8;padding-bottom:20rpx;}
 .data_title_l{float:left;font-size:24rpx;color:#292828;font-weight:600;}
 .data_title_l image{height:0;}
 .data_title_r{float:right;font-size:24rpx;color:#A7A6A6;}

pages/personal_core/home_list/home_list.js

@@ -1,66 +1,33 @@
-// pages/personal_core/home_list/home_list.js
+const app = getApp();
 Page({
 
-  /**
-   * 页面的初始数据
-   */
+ 
   data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-
+    optioninfo:'',
   },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
 
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
+  onLoad: function (options) {
 
-  },
+        var that = this;
+        // console.log(options.uid)
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
+        //  认证信息
+    let optioninfo_url = 'my/authentication/adopticonone';
+        let optioninfo_data = {
+          // uid: options.uid,
+        };
+        app.postRequest(optioninfo_url, optioninfo_data, function (res) {
+          console.log(res.data);
+          if (res.code == 201) {
 
-  },
+            that.setData({
+              optioninfo: res.data,
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
+            })
+          }
+        })
 
   },
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
 })

pages/personal_core/home_list/home_list.json

@@ -1,3 +1,3 @@
 {
-  "usingComponents": {}
+  "navigationBarTitleText": "认证信息"
 }

pages/personal_core/home_list/home_list.wxml

@@ -2,6 +2,8 @@
         <navigator class='yzlist'  hover-class="none" url="/pages/personal_core/Realname/Realname">
                 <image src='/image/yz1.png' mode="widthFix"></image>
                 <text>实名认证</text>
+
+                <view class='yzlist_text'>{{optioninfo.shenfenzheng.status}}</view>
         </navigator>
 
         <!-- <navigator class='yzlist'  hover-class="none">
@@ -12,16 +14,22 @@
         <navigator class='yzlist'  hover-class="none"  url="/pages/personal_core/Adegreein/Adegreein">
                 <image src='/image/yz3.png' mode="widthFix"></image>
                 <text>学历认证</text>
+
+                <view class='yzlist_text'>{{optioninfo.xueli.status}}</view>
         </navigator>
 
         <navigator class='yzlist'  hover-class="none" url="/pages/personal_core/vehicle/vehicle">
                 <image src='/image/yz4.png' mode="widthFix"></image>
                 <text>车辆认证</text>
+
+                <view class='yzlist_text'>{{optioninfo.chenliang.status}}</view>
         </navigator>
 
         <navigator class='yzlist'  hover-class="none"  url="/pages/personal_core/Realestate/Realestate">
                 <image src='/image/yz5.png' mode="widthFix"></image>
                 <text>房产认证</text>
+
+                <view class='yzlist_text'>{{optioninfo.fangchan.status}}</view>
         </navigator>
 </view>
 

pages/personal_core/home_list/home_list.wxss

@@ -1,10 +1,11 @@
 
-.yzlist{border-bottom:1px solid #F5F5F5;display:flex;align-items:center;padding:30rpx 30rpx;}
+.yzlist{border-bottom:1px solid #F5F5F5;display:flex;align-items:center;padding:30rpx 30rpx;position:relative;}
 .yzlist image{width:56rpx;height:0;}
 .yzlist text{font-size:32rpx;color:#000;font-weight:600;margin-left:20rpx;}
+.yzlist .yzlist_text{font-size:28rpx;color: #666;position:absolute;top:40rpx;right:40rpx;}
 
 
-.yztext{border:1px solid #DCDCDC;width:90%;margin:auto;margin-top:30rpx;background: #F5F5F5;padding:30rpx 20rpx;}
+.yztext{border:1px solid #DCDCDC;width:90%;margin:auto;margin-top:36rpx;background: #F5F5F5;padding:30rpx 20rpx;}
 .yztext_title{font-size:28rpx;color:#808080;margin-bottom:20rpx;}
 .yztext text{font-size:24rpx;color:#A7A6A6;display:block;}
 .yztext text +text{margin-top:10rpx;}

pages/personal_core/personaldata/personaldata.wxml

@@ -48,7 +48,7 @@
 </view>
 
 <!-- 个人资料 -->
-<view class='information c'>
+<!-- <view class='information c'>
       <view class='information_l'>
               <view class='information_l_title'>{{information.nickname}} <text>{{information.age}}</text></view>
               <view class='information_l_id'>ID：{{information.number}}</view>
@@ -62,11 +62,11 @@
                  <image mode="aspectFill"  src='/image/personal03.png'></image>
                 <text>125</text>
       </view>
-</view>
+</view> -->
 
 
 <!-- 个人信息 -->
-<view class='data_box' style='margin-top:100rpx;'>
+<view class='data_box' style='margin-top:20rpx;'>
       <view class='data_title c'>
                 <view class='data_title_l'> <image src='/image/xtb2.png'  mode="widthFix" style='position:relative;top:2px;width: 40rpx;'></image> 个人资料</view>
 
@@ -83,12 +83,14 @@
               <text wx:if='{{information.height}}'>{{information.height}}</text>
               <text wx:if='{{information.education}}'>{{information.education}}</text>
               <text wx:if='{{information.marry}}'>{{information.marry}}</text>
-              <text wx:if='{{information.income}}'>{{information.income}}/月</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>
       </view>
 </view>
 
+<view style='height:10rpx;background:#fafafa;margin:20rpx 0;'></view>
+
 <!-- 择偶要求 -->
 <view class='data_box'>
       <view class='data_title c'>
@@ -105,7 +107,7 @@
               <text wx:if='{{optioninfo.marry}}'>{{optioninfo.marry}}</text>
               <text wx:if='{{optioninfo.height}}'>{{optioninfo.height}}</text>
               <text wx:if='{{optioninfo.education}}'>{{optioninfo.education}}</text>
-              <text wx:if='{{optioninfo.income_min && optioninfo.income_max}}'>{{optioninfo.income_min}}-{{optioninfo.income_max}}/月</text>
+              <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>
@@ -115,12 +117,13 @@
       </view>
 </view>
 
+<view style='height:10rpx;background:#fafafa;margin:20rpx 0;'></view>
 
 <!-- 认证信息 -->
 <view class='data_box'>
       <view class='data_title c'>
                 <view class='data_title_l'> <image src='/image/xtb4.png'  mode="widthFix" style='position:relative;top:6rpx;width: 32rpx;'></image> 认证信息</view>
-                
+
                 <navigator class='data_title_r' hover-class="none" url='/pages/personal_core/home_list/home_list'>
                         <text>去认证</text>
                         <image src='/image/personal5.png' mode="widthFix"></image>

pages/personal_core/personaldata/personaldata.wxss

@@ -26,9 +26,9 @@
 .information_r text{font-size:18rpx;color:#FFF;display:block;text-align:center;position:relative;z-index:10;top:50rpx;}
 
 /* 个人信息  */
-.data_box{margin-top:80rpx;padding:0 30rpx;}
+.data_box{margin-top:20rpx;padding:0 30rpx 10rpx 30rpx;}
 
-.data_title{border-bottom:1px solid #ECECEC;padding-bottom:16rpx;}
+.data_title{border-bottom:1px solid #ECECEC;padding-bottom:20rpx;}
 .data_title_l{float:left;font-size:24rpx;color:#292828;font-weight:600;}
 .data_title_l image{height:0;}
 .data_title_r{float:right;font-size:24rpx;color:#A7A6A6;}

pages/personal_core/personaldataModifythe/personaldataModifythe.wxml

@@ -4,7 +4,7 @@
 <view class='data_box'>
 
        <view class='data_name c'>  <!--  姓名 -->
-             <text>我的姓名</text>
+             <text>我的昵称</text>
             <input type='text' placeholder="填写您的姓名" bindinput="getPhone"  value="{{personal.nickname}}"></input>
        </view>