11

pages/idCard/idCard.js

@@ -6,48 +6,48 @@ Page({
     isTrue: true,
   },
   goShenFen() {
-    //.....................................................
-    // if (!this.data.isTrue) {
-    //   wx.request({
-    //     url: app.globalData.publicUrl + '/applet/suppleUserInfo',
-    //     method: "POST",
-    //     header: {
-    //       appletsId: wx.getStorageSync('openId')
-    //     },
-    //     data: {
-    //       headPicPath: this.data.imgPath
-    //     },
-    //     success: (res) => {
-    //       console.log(res, "000");
-    //     }
-    //   })
-    //   wx.redirectTo({
-    //     url: '/pages/idCardDetail/idCardDetail',
-    //   })
-    // } else {
-    //   wx.showToast({
-    //     title: "请上传照片",
-    //     icon: 'none',
-    //     duration: 2000,
-    //   })
-    // }
-    //..................................................... 下边删除
-    wx.request({
-      url: app.globalData.publicUrl + '/applet/suppleUserInfo',
-      method: "POST",
-      header: {
-        appletsId: wx.getStorageSync('openId')
-      },
-      data: {
-        headPicPath: this.data.imgPath
-      },
-      success: (res) => {
-        console.log(res, "000");
-      }
-    })
-    wx.redirectTo({
-      url: '/pages/idCardDetail/idCardDetail',
-    })
+ 
+    if (!this.data.isTrue) {
+      wx.request({
+        url: app.globalData.publicUrl + '/applet/suppleUserInfo',
+        method: "POST",
+        header: {
+          appletsId: wx.getStorageSync('openId')
+        },
+        data: {
+          headPicPath: this.data.imgPath
+        },
+        success: (res) => {
+          console.log(res, "000");
+        }
+      })
+      wx.redirectTo({
+        url: '/pages/idCardDetail/idCardDetail',
+      })
+    } else {
+      wx.showToast({
+        title: "请上传照片",
+        icon: 'none',
+        duration: 2000,
+      })
+    }
+  
+    // wx.request({
+    //   url: app.globalData.publicUrl + '/applet/suppleUserInfo',
+    //   method: "POST",
+    //   header: {
+    //     appletsId: wx.getStorageSync('openId')
+    //   },
+    //   data: {
+    //     headPicPath: this.data.imgPath
+    //   },
+    //   success: (res) => {
+    //     console.log(res, "000");
+    //   }
+    // })
+    // wx.redirectTo({
+    //   url: '/pages/idCardDetail/idCardDetail',
+    // })
   },
   goPhoto() {
     var that = this;

pages/notice/notice.js

@@ -3,62 +3,64 @@ var util = require('../../utils/md5.js')
 Page({
   data: {
     currentTabIndex: 0,
-    readList: [{
-        title: '重要通知',
-        content: '萨达撒多会撒娇的挥洒健康的挥洒考究的挥洒的货架上',
-        time: '2020/07/08'
-      },
-      {
-        title: '重要通知222',
-        content: 'wewewe',
-        time: '2020/07/08'
-      },
-      {
-        title: '重要通知222',
-        content: 'wewewe',
-        time: '2020/07/08'
-      },
-      {
-        title: '重要通知222',
-        content: 'wewewe',
-        time: '2020/07/08'
-      },
-      {
-        title: '重要通知222',
-        content: 'wewewe',
-        time: '2020/07/08'
-      },
-      {
-        title: '重要通知',
-        content: 'skdaskjd阿斯顿撒多撒多撒多萨迪克撒旦卡萨丁',
-        time: '2020/07/08'
-      },
-      {
-        tile: '重要通知',
-        content: '所得税卡的挥洒考究的哈斯科技带回家卡萨的挥洒考究的哈斯卡接电话看手机啊都好看手机锕',
-        time: '2020/07/08'
-      },
+    readList: [
+      // {
+      //   title: '重要通知',
+      //   content: '萨达撒多会撒娇的挥洒健康的挥洒考究的挥洒的货架上',
+      //   time: '2020/07/08'
+      // },
+      // {
+      //   title: '重要通知222',
+      //   content: 'wewewe',
+      //   time: '2020/07/08'
+      // },
+      // {
+      //   title: '重要通知222',
+      //   content: 'wewewe',
+      //   time: '2020/07/08'
+      // },
+      // {
+      //   title: '重要通知222',
+      //   content: 'wewewe',
+      //   time: '2020/07/08'
+      // },
+      // {
+      //   title: '重要通知222',
+      //   content: 'wewewe',
+      //   time: '2020/07/08'
+      // },
+      // {
+      //   title: '重要通知',
+      //   content: 'skdaskjd阿斯顿撒多撒多撒多萨迪克撒旦卡萨丁',
+      //   time: '2020/07/08'
+      // },
+      // {
+      //   tile: '重要通知',
+      //   content: '所得税卡的挥洒考究的哈斯科技带回家卡萨的挥洒考究的哈斯卡接电话看手机啊都好看手机锕',
+      //   time: '2020/07/08'
+      // },
     ],
-    noreadList: [{
-        title: '未读通知',
-        content: '萨达撒多会撒娇的挥洒健康的挥洒考究的挥洒的货架上',
-        time: '2020/07/08'
-      },
-      {
-        title: '重要通知222',
-        content: 'wewewe',
-        time: '2020/07/08'
-      },
-      {
-        title: '重要通知',
-        content: 'skdaskjd阿斯顿撒多撒多撒多萨迪克撒旦卡萨丁',
-        time: '2020/07/08'
-      },
-      {
-        title: '重要通知',
-        content: '所得税卡的挥洒考究的哈斯科技带回家卡萨的挥洒考究的哈斯卡接电话看手机啊都好看手机锕',
-        time: '2020/07/08'
-      },
+    noreadList: [
+      // {
+      //   title: '未读通知',
+      //   content: '萨达撒多会撒娇的挥洒健康的挥洒考究的挥洒的货架上',
+      //   time: '2020/07/08'
+      // },
+      // {
+      //   title: '重要通知222',
+      //   content: 'wewewe',
+      //   time: '2020/07/08'
+      // },
+      // {
+      //   title: '重要通知',
+      //   content: 'skdaskjd阿斯顿撒多撒多撒多萨迪克撒旦卡萨丁',
+      //   time: '2020/07/08'
+      // },
+      // {
+      //   title: '重要通知',
+      //   content: '所得税卡的挥洒考究的哈斯科技带回家卡萨的挥洒考究的哈斯卡接电话看手机啊都好看手机锕',
+      //   time: '2020/07/08'
+      // },
     ],
   },
   onTabsItemTap: function (event) {

pages/notice/notice.wxml

@@ -7,7 +7,7 @@
 			</view>
 		</block>
 	</view>
-	<view class="yuan" wx:if='{{currentTabIndex != 1}}'></view>
+	<view class="yuan" wx:if='{{currentTabIndex != 1 && noreadList.length > 0 }}'></view>
 	<view class='ordert-detail'>
 		<view hidden='{{currentTabIndex != 0}}'>
 			<view class="onread" wx:for='{{noreadList}}'>  

pages/personInfo/personInfo.js

@@ -50,8 +50,6 @@ Page({
         url: '/pages/login/login',
       })
     }
-  },
-  onLoad() {
     wx.request({
       url: app.globalData.publicUrl + '/sys/login/session',
       method: "GET",
@@ -65,6 +63,9 @@ Page({
         })
       }
     })
+  },
+  onLoad() {
+
   }
 
 })

pages/updatepassword/updatepassword.js

@@ -90,7 +90,7 @@ Page({
             }
           } else {
             wx.showToast({
-              title: "密码长度最少为6位",
+              title: "密码长度最少为7位",
               icon: 'none',
               duration: 2000,
             })

pages/visitandinfo/visitandinfo.wxml

@@ -38,9 +38,9 @@
 								</view>
 								<view class="td idcard" value="{{item.text}}" bindtap="cellClick" data-infos='{{item}}'>
 									<view>{{item.name}}</view>
-									<view wx:if='{{item.idNumber}}' class="oldzi">({{item.idNumber}}</view>
-									<!-- <view wx:if='{{item.idNumber}}' class="oldzi">({{subqian.subqian(item.idNumber)}}</view>
-									<view wx:if='{{item.idNumber}}' class="oldzi">{{subhou.subhou(item.idNumber)}})</view> -->
+									<!-- <view wx:if='{{item.idNumber}}' class="oldzi">({{item.idNumber}}</view> -->
+									<view wx:if='{{item.idNumber}}' class="oldzi">({{subqian.subqian(item.idNumber)}}</view>
+									<view wx:if='{{item.idNumber}}' class="oldzi">{{subhou.subhou(item.idNumber)}})</view>
 								</view>
 								<view class="td" bindtap="cellClick" data-infos='{{item}}' value="{{item.text}}">{{time.formatDate(item.time)}}</view>
 								<view class="td status" bindtap="cellClick" data-infos='{{item}}' wx:if="{{item.status == '1'}}" style="color: #67C23A">填全未审</view>

pages/visitandinfo/visitandinfo.wxss

@@ -21,12 +21,13 @@
 
 .tabs-item.selected {
   color: #2892ff;
-  background: #F5F7FA;
+  background-color: white;
 }
 
 .tabs-item {
   width: 50%;
   color: #666;
+  background: #F5F7FA;
 
 }
 

utils/number.wxs

@@ -1,7 +1,5 @@
 var number = function (val, index) {
-
-  return val.subString(index - 1, 1)
-  // return val.slice(index,index+1)
+  return val.slice(index,index+1)
 }
 
 module.exports = {