Merge branch 'master' of http://121.37.83.100:3000/sooka_edyj/sooka_edyj_minapp

# Conflicts:
#	pages/me/me.wxss

iconfont.wxss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3264694 */
-  src: url('//at.alicdn.com/t/c/font_3264694_vvd9ofl6l5.woff2?t=1669682527309') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3264694_vvd9ofl6l5.woff?t=1669682527309') format('woff'),
-       url('//at.alicdn.com/t/c/font_3264694_vvd9ofl6l5.ttf?t=1669682527309') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_3264694_gxhod5vh9pc.woff2?t=1672883976549') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3264694_gxhod5vh9pc.woff?t=1672883976549') format('woff'),
+       url('//at.alicdn.com/t/c/font_3264694_gxhod5vh9pc.ttf?t=1672883976549') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-yunongtongqingchuhuancun:before {
+  content: "\e638";
+}
+
+.icon-tongxunlu:before {
+  content: "\e670";
+}
+
+.icon-guanyuwomen:before {
+  content: "\e69a";
+}
+
+.icon-wnt_qingchuhuancun:before {
+  content: "\e644";
+}
+
 .icon-wodetijiao:before {
   content: "\e6d3";
 }

pages/me/me.js

@@ -10,7 +10,7 @@ Page({
     isShowAccoutDialog : false,
     isBindSuccess : false,
     userInfo:null,
-    userName :null,
+    userName :"点击登录",
     password: null,
     openid: null
   },
@@ -22,6 +22,7 @@ Page({
   },
 
   init_userInfo() {
+
     let that = this
     if (app.globalToken == null) {
       http.showLoading()
@@ -58,7 +59,7 @@ Page({
     })
   },
   loginSuccess(res) {
-    
+   console.log(res)
     let that = this
     if (res.data.code != 200) {
       that.openid = res.data.data
@@ -82,6 +83,31 @@ Page({
     }
   },
 
+clear(){
+  wx.clearStorage({
+    success: (res) => {
+      wx.showToast({
+        title: '清理成功',
+      })
+      wx.removeStorageSync('userInfo');
+      wx.removeStorageSync('openid');
+      app.globalToken=null;
+     this.setData({
+        isShowAccoutDialog : false,
+      isBindSuccess : false,
+      userInfo:null,
+      
+      userName :"游客",
+      password: null,
+      openid: null
+     
+     })
+    wx.reLaunch({
+      url: '../index/index'
+    })
+    },
+  })
+},
   modalCancel(){
     this.setData({
       isShowAccoutDialog : false

pages/me/me.wxml

@@ -1,15 +1,48 @@
 <view class="container_c">
-
-
-  <image src="{{userInfo.avatarUrl}}" class="wd_img"></image>
-
-  <div type="userNickName" lang="zh_CN" class="wd_txt">
+<view class="top_con">
+  <image src="{{userInfo.avatarUrl}}" class="wd_img" wx:if="{{!isBindSuccess}}" bindtap="init_userInfo"   ></image>
+   <image src="{{userInfo.avatarUrl}}" class="wd_img" wx:if="{{isBindSuccess}}"></image>
+  <view class="top_txt">
+    <!-- <div type="userNickName" lang="zh_CN" class="wd_txt">
     {{userInfo.nickName}}
-  </div>
-
-
-  <button wx:if="{{!isBindSuccess}}" bindtap="init_userInfo" class="wd_btn">绑定账号</button>
-  <label wx:if="{{isBindSuccess}}">账号绑定成功</label>
+  </div> -->
+  <text class="userNickName"  wx:if="{{!isBindSuccess}}">{{userName}}</text>
+  <text class="userNickName" wx:if="{{isBindSuccess}}" >{{userInfo.nickName}}</text>
+  <text>技术部</text>
+  </view>
+  <image src="../images/me.png" class="me_bg"/>
+</view>
+<view class="me_tit">
+  <view class="tit_two">
+    <image src="../images/metit.png" class="metit" />
+      <view class="meline">
+        <i class="iconfont icon-tongxunlu"></i>
+        <text>通讯录</text>
+        <i class="iconfont icon-xiangyou"></i>
+      </view>
+      <view class="meline" bindtap="clear">
+        <i class="iconfont icon-yunongtongqingchuhuancun" ></i>
+        <text>清除缓存</text>
+        <i class="iconfont icon-xiangyou"></i>
+      </view>
+  </view>
+  <view class="tit_one">
+    <image src="../images/metit1.png" class="metit" />
+    <view class="meline">
+    <i class="iconfont icon-guanyuwomen"></i>
+        <text>关于我们</text>
+        <i class="iconfont icon-xiangyou"></i>
+      </view>
+  </view>
+</view>
+
+ 
+
+  
+
+
+  <!-- <button wx:if="{{!isBindSuccess}}" bindtap="init_userInfo" class="wd_btn">绑定账号</button>
+  <label wx:if="{{isBindSuccess}}">账号绑定成功</label> -->
 
 
 

pages/me/me.wxss

@@ -4,19 +4,34 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  padding-top: 5rem;
+}
+.top_con{
+  display: flex;
+  flex-direction: row;
+  padding: 6% 8%;
+  width: 84%;
+  align-items: center;
+  background-color: #f94b0e;
+  position: relative;
+}
+.me_bg{
+  position: absolute;
+  bottom: -90rpx;
+  width: 100%;
+  left: 0px;
+  height: 100rpx;
 }
 .wd_img{
-  width: 200rpx;
-  height: 200rpx;
+  width: 160rpx;
+  height: 160rpx;
   border-radius: 50%;
   display: flex;
   align-items: center;
   justify-content: center;
   overflow: hidden;
-  border: 12rpx solid #f6f6f6c7;
+  border: 8rpx solid #f6f6f6c7;
   background: rgb(255, 201, 164);
-  margin-bottom: 20rpx;
+ margin-right: 30rpx;
 }
 .wd_img img{
   display: flex;
@@ -46,3 +61,75 @@
   line-height: 100rpx;
   padding-left: 20rpx;
 }
+.top_txt{
+  display: flex;
+  flex-direction: column;
+}
+.top_txt{
+  display: flex;
+  flex-direction: column;
+  color: #fff;
+  font-size: 32rpx;
+}
+.top_txt .name{
+  font-size: 38rpx;
+  font-weight: 500;
+  padding-bottom: 15rpx;
+}
+.me_tit{
+  margin-top: 40rpx;
+  margin:150rpx 30rpx 0rpx 30rpx;
+  
+  width: 92%;
+  display: flex;
+  flex-direction: column;
+}
+.tit_two{
+  position: relative;
+  width: 100%;
+  height: 240rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+.tit_two .metit{
+  width: 100%;
+  height: 240rpx;
+  display: block;
+  position: absolute;
+  z-index: -1;
+}
+.meline{
+  height: 120rpx;
+  align-items: center;
+  display: flex;
+  flex-direction: row;
+  padding: 0px 30rpx;
+  font-size: 32rpx;
+  color: rgb(88, 88, 88);
+  font-weight: 500;
+}
+.meline .iconfont{
+  font-size: 50rpx;
+  color: #f94b0e;
+  margin-right: 20rpx;
+}
+.meline .icon-xiangyou{
+  margin-left: auto;
+  color:rgb(207, 207, 207);
+    font-size: 40rpx;
+}
+.tit_one{
+  position: relative;
+  width: 100%;
+  height: 120rpx;
+  justify-content: center;
+  margin-top: 30rpx;
+}
+.tit_one .metit{
+  width: 100%;
+  height: 120rpx;
+  display: block;
+  position: absolute;
+  z-index: -1;
+}

pages/xunjianmore/xunjianmore.js

@@ -12,7 +12,8 @@ Page({
     host: app.globalData.host,
     buslogid: null,
     mapdata : null,
-    pictureBasePath : null
+    pictureBasePath : null,
+    hiddenName:true
   },
   onLoad(e) {
     this.initData(e)
@@ -40,4 +41,16 @@ Page({
       url: '../zhenggaijindu/zhenggaijindu?busInspectionId='+businspectionid,
     })
   },
+    // 按钮显示隐藏
+    shghnn:function(){
+      this.setData({
+          hiddenName:!this.data.hiddenName
+      })
+  },
+  // 跳转整改进度
+  bindViewXqZgGzS(){
+    // wx.navigateTo({
+    //   url: '../xqzggzs/xqzggzs',
+    // })
+  },
 })

pages/xunjianmore/xunjianmore.wxml

@@ -8,7 +8,7 @@
     </view>
     <view class="txt_vi" bindtap="bindViewZhengGaiJinDu" wx:for="{{value[1]}}" data-businspectionid="{{item.busInspectionId}}">
       <view class="txt flex_row">
-       <!-- <image src="{{pictureBasePath+item.attachUrl}}" />  -->
+        <!-- <image src="{{pictureBasePath+item.attachUrl}}" />  -->
         <view class="txt_wz">
           <text class="">{{index+1}}、{{item.busItemName}}</text>
           <view class="span_vi">
@@ -16,8 +16,16 @@
             <span class="yellow">{{item.riskStatusValue}}</span>
           </view>
           <!-- <view class="qy_txt">{{item.busEnterpriseName}}</view> -->
+
         </view>
       </view>
     </view>
+    <!-- 巡检悬浮按钮 -->
+    <view class="float_btn iconfont icon-wenjianjia" bindtap="shghnn"></view>
+    <view class="tab_nav" hidden="{{hiddenName}}">
+      <text mode="heightFix">隐患限期整改告知书</text>
+      <text mode="heightFix">复查意见告知书</text>
+      <i class="iconfont icon-zengjiashuzi" bindtap="bindViewXqZgGzS"></i>
+    </view>
   </view>
-</view>
+</view>