忘记密码

property_ui/api/system/user.js

@@ -13,7 +13,21 @@ export function updateUserPwd(oldPassword, newPassword) {
     data: data
   })
 }
-
+// 忘记密码发送短信
+export function getappForgetPW(data) {
+  return request({
+    url: '/wuYe/applet/appForgetPW/'+data,
+    method: 'get',
+  })
+}
+// 重置密码
+export function getappCheck(data) {
+  return request({
+    url: '/wuYe/applet/appCheck',
+    method: 'get',
+	'data':data
+  })
+}
 // 查询用户个人信息
 export function getUserProfile() {
   return request({

property_ui/pages.json

@@ -7,6 +7,17 @@
 	  	  "navigationStyle": "custom"
 	    }
 	  }, 
+	  {
+	  	  "path": "pages/mine/pwd/forgetpwd",
+	  	  "style": {
+	  	    "navigationBarTitleText": "忘记密码"
+	  	  }
+	  	}, {
+	  	  "path": "pages/mine/pwd/resetpwd",
+	  	  "style": {
+	  	    "navigationBarTitleText": "重置密码"
+	  	  }
+	  },
 	  {
 	    "path": "pages/index/index",
 	    "style": {

property_ui/pages/index/index.vue

@@ -253,7 +253,7 @@ import {getCount,getCountTips} from "@/api/work/index.js"
 			htabo:require("@/static/images/home/htabo.png"),
 			htabp:require("@/static/images/home/htabp.png"),
 			upimg:require("@/static/images/home/up.png"),
-			city:'幸福大街',
+			city:'合肥市',
 			deptName:this.$store.state.user.deptName,
 			nickName:this.$store.state.user.nickName,
 			postGroup:'',//岗位
@@ -283,7 +283,9 @@ import {getCount,getCountTips} from "@/api/work/index.js"
 		if(checkPermi(['wuYe:statistics:num:app'])){
 			this.getCount()
 		}
-		this.getCountTips()
+		if(checkPermi(['wuYe:statistics:wuYeTips'])){
+			this.getCountTips()
+		}
 		if(checkPermi(['wuYe:repair:list'])){
 			this.repairList()
 		}

property_ui/pages/login.vue

@@ -5,16 +5,18 @@
 		<view class="wymain">
 			<image :src="headimg" class="headimg"></image>
 			<!-- 微信登录 -->
+			<!-- #ifdef MP-WEIXIN -->
 			<button type="primary" class="rbtn" open-type="getUserInfo" @getuserinfo="getuserinfo">
 				<image :src="vxtab" class="vxtab"></image>
 				<text class="btn-txt">微信一键登录</text>
 			</button>
+			<!-- #endif -->
 			<button type="primary" class=" rbtn" @click="getlogin">
 				<image :src="zhtab" class="zhtab"></image>
 				<text class="btn-txt">账号密码登录</text>
 			</button>
 			<view class="line"></view>
-			<view class="rbtn btna" @click="getregister">还没账号？去注册</view>
+			<!-- <view class="rbtn btna" @click="getregister">还没账号？去注册</view> -->
 		</view>
 
 		

property_ui/pages/register.vue

@@ -13,7 +13,7 @@
 		  	  <view class="login-form-content">
 		  
 		  	  	<view class="input-item">
-		  	  		<view class="login_tit">手机号码</view>
+		  	  		<view class="login_tit">账号</view>
 		  	  		<view class="login_box">
 		  	  			<!-- <view class="login_boxl">+86</view> -->
 		  	  			 <input  v-model="datainfo.username" class="input" type="text" placeholder="请输入登录账号" maxlength="30" />

property_ui/pages/tlogin.vue

@@ -7,7 +7,7 @@
 		  <view class="head">
 		  	<view class="htit">你好，</view>
 		  	<view class="htit">欢迎登录智慧社区平台</view>
-		  	<view class="htxt" @click="getregister">还没有账号？<text>立即注册</text></view>
+		  	<!-- <view class="htxt" @click="getregister">还没有账号？<text>立即注册</text></view> -->
 		  </view>
 		    <view class="flex1" style="position: relative;">
 		  
@@ -22,7 +22,7 @@
 		  	  <view class="login-form-content" v-if="tabidx!=1">
 		  
 		  	  	<view class="input-item">
-		  	  		<view class="login_tit">手机号码</view>
+		  	  		<view class="login_tit">账号</view>
 		  	  		<view class="login_box">
 		  	  			<!-- <view class="login_boxl">+86</view> -->
 		  	  			 <input  v-model="loginForm.username" class="input" type="text" placeholder="请输入登录账号" maxlength="30" />

property_ui/permission.js

@@ -5,7 +5,7 @@ const loginPage = "/pages/login"
   
 // 页面白名单
 const whiteList = ['/pages/index/index','/pages/agreement',
-  '/pages/login','/pages/tlogin', '/pages/register', '/pages/common/webview/index'
+  '/pages/login','/pages/tlogin', '/pages/register', '/pages/common/webview/index','/pages/mine/pwd/resetpwd','/pages/mine/pwd/forgetpwd',
 ]
 
 // 检查地址白名单

property_ui/service/components/car/list.vue

@@ -38,8 +38,11 @@
 				<view class="patbtns">
 					<!-- v-if="ite.checkStatus==2" -->
 					<!-- v-else -->
-					<view class="btna" @click.stop="getDetail(ite.checkPointRecordId)" v-if="ite.checkStatus==2">查看</view>
-					<view  class="btnb" @click.stop="getAddFn(ite.checkPointRecordId)" v-else>去巡更</view>
+					<block v-if="checkPermi(['wuYe:checkPointRecord:query'])">
+						<view class="btna" @click.stop="getDetail(ite.checkPointRecordId)" v-if="ite.checkStatus==2">查看</view>
+						<view  class="btnb" @click.stop="getAddFn(ite.checkPointRecordId)" v-else>去巡更</view>
+					</block>
+					
 					<view  class="btnc" v-if="checkPermi(['wuYe:checkPointRecord:remove'])" @click.stop="getDelFn(ite.checkPointRecordId)">删除</view>
 				</view>
 			</view>

property_ui/service/pages/service/patrol.vue

@@ -5,8 +5,8 @@
 			</uni-nav-bar>
 			<view class="pfbox" :style="'background-color:'+backgroundColor">
 				<view class="patop">
-					<view class="tit" @click="getRecordFn">巡更记录</view>
-					<view class="txt" @click="getSetFn">巡更点设置</view>
+					<view class="tit" v-if="checkPermi(['wuYe:checkPointRecord:list'])" @click="getRecordFn">巡更记录</view>
+					<view class="txt" v-if="checkPermi(['wuYe:checkPointManage:add'])" @click="getSetFn">巡更点设置</view>
 				</view>
 				<view class="patabs flexc">
 					<view class="patab cof7" @click="getTabFn(0)">

property_ui/service/pages/service/patrolrecord.vue

@@ -77,7 +77,10 @@
 				})
 			},
 			getDetail(id){
-				this.$tab.navigateTo("/service/pages/service/patroldetail?id="+id)
+				if(checkPermi(['wuYe:checkPointRecord:query'])){
+					this.$tab.navigateTo("/service/pages/service/patroldetail?id="+id)
+				}
+				
 			},
 			getAddFn(){
 				this.$tab.navigateTo("/service/pages/service/patroladd?")