add

.idea/workspace.xml

@@ -2,10 +2,22 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b14f9fe1-d3c3-496a-8ebb-4789fe400212" name="默认更改列表" comment="">
-      <change beforePath="$PROJECT_DIR$/http/baseApi.js" beforeDir="false" afterPath="$PROJECT_DIR$/http/baseApi.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages.json" beforeDir="false" afterPath="$PROJECT_DIR$/pages.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/Workorder/Workorder.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Workorder.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/Immediatecollection/Immediatecollection.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/Immediatecollection/Immediatecollection.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/Workorder/AccessControl/AccessControl.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/AccessControl/AccessControl.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/Workorder/Intelligentdoorlock/Intelligentdoorlock.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Intelligentdoorlock/Intelligentdoorlock.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/Workorder/Videosurveillance/Videosurveillance.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Videosurveillance/Videosurveillance.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/index/BillPending/BillPending.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/BillPending/BillPending.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/my/Myorder/Orderdetails/Orderdetails.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/Myorder/Orderdetails/Orderdetails.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-config-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-config-service.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-service.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-view.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/app-view.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/manifest.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/view.umd.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__FF40C0C/view.umd.min.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-config-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-config-service.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-service.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-view.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-view.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/manifest.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/view.umd.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/view.umd.min.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -39,8 +51,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="10110">
-              <caret line="365" column="6" selection-start-line="365" selection-start-column="6" selection-end-line="365" selection-end-column="6" />
+            <state relative-caret-position="10950">
+              <caret line="367" column="6" selection-start-line="367" selection-start-column="6" selection-end-line="367" selection-end-column="6" />
             </state>
           </provider>
         </entry>
@@ -76,7 +88,7 @@
         <entry file="file://$PROJECT_DIR$/pages/Workorder/AccessControl/AccessControl.vue">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="811">
-              <caret line="155" selection-start-line="155" selection-end-line="155" />
+              <caret line="191" selection-start-line="191" selection-end-line="191" />
             </state>
           </provider>
         </entry>
@@ -379,11 +391,12 @@
       <workItem from="1682468371664" duration="591000" />
       <workItem from="1682554138603" duration="592000" />
       <workItem from="1682641765071" duration="593000" />
+      <workItem from="1683160641474" duration="594000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="101398000" />
+    <option name="totallyTimeSpent" value="101992000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-8" width="1936" height="1056" extended-state="1" />
@@ -589,8 +602,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pages.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="10110">
-          <caret line="365" column="6" selection-start-line="365" selection-start-column="6" selection-end-line="365" selection-end-column="6" />
+        <state relative-caret-position="10950">
+          <caret line="367" column="6" selection-start-line="367" selection-start-column="6" selection-end-line="367" selection-end-column="6" />
         </state>
       </provider>
     </entry>
@@ -618,7 +631,7 @@
     <entry file="file://$PROJECT_DIR$/pages/Workorder/AccessControl/AccessControl.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="811">
-          <caret line="155" selection-start-line="155" selection-end-line="155" />
+          <caret line="191" selection-start-line="191" selection-end-line="191" />
         </state>
       </provider>
     </entry>

pages/Workorder/AccessControl/AccessControl.vue

@@ -9,7 +9,19 @@
 			<view class="mjsh">{{item.parentCategory}}</view>
 
 			<view class="mjkg">
-				<view class="sfkq">
+				<view class="anniu">
+					<u-button type="success" text="开启" @click="buttons(item,'open')"></u-button>
+				</view>
+				<view class="anniu">
+					<u-button type="warning" text="关闭" @click="buttons(item,'close')"></u-button>
+				</view>	
+				<view class="anniu">
+					<u-button type="primary" text="常开" @click="buttons(item,'alwaysOpen')"></u-button>
+				</view>		
+				<view class="anniu">
+					<u-button type="error" text="常关" @click="buttons(item,'alwaysClose')"></u-button>
+				</view>
+				<!-- <view class="sfkq">
 					<view class="sfkq1">是否开启</view>
 					<view class="sfkq2">
 						<u-switch activeColor="#2979FF" asyncChange @change="asyncChange1(item)"
@@ -22,7 +34,7 @@
 						<u-switch activeColor="#2979FF" asyncChange @change="asyncChange2(item)"
 							inactiveColor="rgb(230, 230, 230)" v-model="item.value2" size="40"></u-switch>
 					</view>
-				</view>
+				</view> -->
 			</view>
 		</view>
 
@@ -44,6 +56,8 @@
 		},
 
 		methods: {
+			
+			
 			getalldata() {
 				this.$api.get('/access/page', {})
 					.then(res => {
@@ -52,10 +66,10 @@
 							if (res.data.data.length == 0) {
 								this.mjlist = []
 							} else {
-								for (let i = 0; i < res.data.data.length; i++) {
-									res.data.data[i].value1 = false;
-									res.data.data[i].value2 = false;
-								}
+								// for (let i = 0; i < res.data.data.length; i++) {
+								// 	res.data.data[i].value1 = false;
+								// 	res.data.data[i].value2 = false;
+								// }
 
 								this.mjlist = res.data.data;
 							}
@@ -65,6 +79,26 @@
 						}
 					})
 			},
+			
+			buttons(e,fs){
+				  let postdata = {
+				  	cmd:fs,
+				  	deviceSerial: e.deviceSerial
+				  }
+				  //  console.log('111111111111111111',postdata)
+					this.$api.post('/access/operate', postdata)
+						.then(res => {
+							if (res.data.code == 0) {
+								this.$refs.uNotify.success('成功')
+							} else {
+								this.$refs.uNotify.error(res.data.msg)
+							}
+						})
+					
+				  
+			},
+			
+			
 			operate(e) {
 				this.$api.post('/access/operate', e)
 					.then(res => {
@@ -151,7 +185,9 @@
 	.mjkg {
 		display: flex;
 		align-items: center;
-		margin-top: 80rpx;
+		justify-content: space-around;
+		margin-top: 40rpx;
+		margin-bottom: 10rpx;
 	}
 
 	.mjsh {

pages/Workorder/Intelligentdoorlock/Intelligentdoorlock.vue

@@ -77,7 +77,7 @@
 			</view>
 		</u-popup>
 
-
+<u-notify ref="uNotify" message="" ></u-notify>
 	</view>
 </template>
 
@@ -181,9 +181,9 @@ lsmima:'',
 						if (res.data.code == 0) {
 								this.showms = true;
 this.lsmima=res.data.data;
-  console.log('111111111111111111',this.lsmima)
+ // console.log('111111111111111111',this.lsmima)
 						} else {
-
+this.$refs.uNotify.error(res.data.msg)	
 						}
 					})
 
@@ -238,7 +238,7 @@ this.lsmima=res.data.data;
 <style lang="scss">
 	.mensuoxx {
 		width: 750rpx;
-		height: 500rpx;
+		height: 300rpx;
 
 		h3 {
 			width: 100%;
@@ -290,7 +290,7 @@ this.lsmima=res.data.data;
 	}
 
 	.settled {
-		background-color: #09C700;
+		background-color: #2B60DE;
 		width: 120rpx;
 		height: 60rpx;
 		text-align: center;
@@ -320,7 +320,7 @@ this.lsmima=res.data.data;
 	}
 
 	.outstanding1 {
-		background-color: #09C700;
+		background-color: #3090C7;
 		width: 120rpx;
 		height: 60rpx;
 		text-align: center;
@@ -335,7 +335,7 @@ this.lsmima=res.data.data;
 	}
 
 	.outstanding2 {
-		background-color: #09C700;
+		background-color: #4E8975;
 		width: 120rpx;
 		height: 60rpx;
 		text-align: center;

pages/Workorder/Videosurveillance/Videosurveillance.vue

@@ -141,7 +141,7 @@
 						this.totalnumber = res.data.data.total;
 						if (res.data.data.list.length != 0) {
 							this.indexList.push(...res.data.data.list);
-							this.dataForm.page = this.dataForm.page + 1;
+							this.dataForm.pageStart = this.dataForm.pageStart + 1;
 							this.pd = true;
 						} else {
 							uni.showToast({
@@ -182,7 +182,7 @@
 <style lang="scss">
 	.Currentamount {
 		padding-left: 30rpx;
-		height: 50rpx;
+		min-height: 50rpx;
 		line-height: 50rpx;
 		color: #BCB3A7;
 
@@ -209,7 +209,7 @@
 	.companylist {
 		margin: 20rpx 30rpx;
 		background: #fff;
-		height: 190rpx;
+		min-height: 200rpx;
 		border-radius: 10px;
 		position: relative;
 

pages/index/BillPending/BillPending.vue

@@ -359,10 +359,10 @@
                                 correctLevel: QRCode.CorrectLevel.H,
                             });
                          //   10秒之后调取查询订单
-                            let that = this;
-                            setTimeout(function () {
-                                that.queryOrder2();
-                            }, 15000);
+                            // let that = this;
+                            // setTimeout(function () {
+                            //     that.queryOrder2();
+                            // }, 15000);
 
                         }
                     });
@@ -471,10 +471,10 @@
                                 correctLevel: QRCode.CorrectLevel.H,
                             });
                             //10秒之后调取查询订单
-                            let that = this;
-                            setTimeout(function () {
-                                that.queryOrder1();
-                            }, 15000);
+                            // let that = this;
+                            // setTimeout(function () {
+                            //     that.queryOrder1();
+                            // }, 15000);
 
                         }
                     });
@@ -512,10 +512,10 @@
                             correctLevel: QRCode.CorrectLevel.H,
                         });
                         //10秒之后调取查询订单
-                        let that = this;
-                        setTimeout(function () {
-                            that.queryOrder1();
-                        }, 15000);
+                        // let that = this;
+                        // setTimeout(function () {
+                        //     that.queryOrder1();
+                        // }, 15000);
 
                     }
                 });

pages/index/index.vue

@@ -515,7 +515,7 @@
 		justify-content: center;
 		position: relative;
 		top: 80rpx;
-		margin-bottom: 30rpx;
+		margin-bottom: 100rpx;
 	}
 
 

pages/login/login.vue

@@ -52,8 +52,8 @@
 		data() {
 			return {
 				isShowPassword: false,
-				account: 'admin',
-				password: 'cx868688',
+				account: '',
+				password: '',
 				captcha: '',
 				uuid: '',
 				captchaPath: '',

pages/my/Changepassword/Changepassword.vue

@@ -4,14 +4,14 @@
 		<view class="xgmy">
 			<u--form labelPosition="left" labelWidth='180' :model="model1" :rules="rules" ref="form1">
 				<u-form-item label="旧登录密码" prop="userInfo.password" borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.password" border="surround"></u--input>
+					<u--input v-model="model1.userInfo.password" border="surround" clearable></u--input>
 				</u-form-item>
 				<u-form-item label="新登录密码" prop="userInfo.newPassword" borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.newPassword" border="surround"></u--input>
+					<u--input v-model="model1.userInfo.newPassword" border="surround" clearable></u--input>
 				</u-form-item>
 				</u-form-item>
 				<u-form-item label="请再次输入" prop="userInfo.confirmPassword" borderBottom ref="item1">
-					<u--input v-model="model1.userInfo.confirmPassword" border="surround"></u--input>
+					<u--input v-model="model1.userInfo.confirmPassword" border="surround" clearable></u--input>
 				</u-form-item>
 			
 			</u--form>
@@ -19,6 +19,8 @@
 				<u-button type="primary" @click="submit">确定修改</u-button>
 			</view>
 		</view>
+		
+		<u-notify ref="uNotify" message="" ></u-notify>
 	</view>
 </template>
 
@@ -74,15 +76,22 @@
 					if(this.model1.userInfo.newPassword!=this.model1.userInfo.confirmPassword){
 						uni.$u.toast('您的新密码不一致，请重新输入')
 					}else{
-						uni.$u.toast('校验通过')
-						
-						  console.log('111111111111111111',this.model1.userInfo)
-						this.$api.get('/user/password',this.model1.userInfo)
+						//uni.$u.toast('校验通过')
+						//  console.log('111111111111111111',this.model1.userInfo)
+						  let postdata={
+							  "newPassword":this.model1.userInfo.newPassword,
+							    "password": this.model1.userInfo.password
+						  }
+						  
+						this.$api.put('/user/password',postdata)
 						.then(res=>{
-						
-						uni.navigateTo({
-							url: '/pages/login/login'
-						})
+						if(res.data.code==0){
+							uni.navigateTo({
+								url: '/pages/login/login'
+							})
+						}else{
+							this.$refs.uNotify.error(res.data.msg)	
+						}						
 						
 						})
 					}

pages/my/Myorder/Orderdetails/Orderdetails.vue

@@ -59,7 +59,7 @@
 	<view class="yucun">
 		<u-button type="primary" text="补助" @click="prestore('补助')"></u-button>
 	</view> -->
-			<view class="yucun">
+			<view class="yucun" v-if='tk'>
 				<u-button type="error" text="退费" @click="prestore('退费')"></u-button>
 			</view>
 		</view>
@@ -110,6 +110,7 @@
 		data() {
 
 			return {
+				tk:false,
 				zhifucanvas: false,
 				dibucaidan: true,
 				prestorename: '',
@@ -227,13 +228,17 @@
 this.indexList=[];
 				this.$api.get('/order/' + e, {})
 					.then(res => {
+						
 					//	console.log('111111111111111111', res.data.data)
 						if (res.data.data.status == '-1') {
-							res.data.data.status = '已关闭'
+							res.data.data.status = '已关闭';
+							this.tk=false;
 						} else if (res.data.data.status == '0') {
-							res.data.data.status = '待支付'
+							res.data.data.status = '待支付';
+							this.tk=false;
 						} else if (res.data.data.status == '1') {
-							res.data.data.status = '已支付'
+							res.data.data.status = '已支付';
+							this.tk=true;
 						}
 
 						this.alldata = res.data.data;

pages/my/my.vue

@@ -15,10 +15,10 @@
 				<view class="Username1">{{getuserInfo.realName}} <span>您好</span>   </view>
 				<view class="Username2">
 					<view class="">
-						您上次登录时间：
+						您上次更新个人信息时间：
 					</view>
 					<view class="">
-						2023-3-23 13:32:48
+						{{getuserInfo.updateDate}}
 					</view>
 				</view>
 			</view>
@@ -43,7 +43,8 @@
 			</view>
 		</view>
 		<!-- 头部结束 -->
-		<view class="minndle">
+		<view class="minndle" v-if="$has('app:PersonalInformation')||$has('app:MyOrder')
+		||$has('app:MyTask')||$has('app:CommentsSuggestions')">
 			<!-- <u-grid :border="false" col="4" @click="navigations">
 				<u-grid-item v-for="(listItem,listIndex) in list" :key="listIndex">
 					<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="listItem.name" :color="listItem.color"
@@ -168,7 +169,7 @@
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
 		onLoad() {
 			this.getuserInfo = uni.getStorageSync('getuserInfo');
-			//console.log('111111111111111111', this.getuserInfo)
+			console.log('111111111111111111', this.getuserInfo)
 		},
 		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
 		onReady() {},

uni.scss

@@ -14,8 +14,8 @@
 @import '@/uni_modules/uview-ui/theme.scss';
 .topnames{
 	width: 750rpx;
-	height: 80rpx;
-	line-height: 80rpx;
+	height: 180rpx;
+	line-height:220rpx;
 	text-align: center;
 	font-weight: bold;
 	font-size: 38rpx;