1

.idea/workspace.xml

@@ -2,8 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b14f9fe1-d3c3-496a-8ebb-4789fe400212" name="默认更改列表" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/manifest.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/cache/apk/__UNI__FF40C0C_cm.apk" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/apk/__UNI__FF40C0C_cm.apk" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/cache/apk/apkurl" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/apk/apkurl" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/cache/apk/cmManifestCache.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/apk/cmManifestCache.json" afterDir="false" />
@@ -11,12 +9,10 @@
       <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/" />

manifest.json

@@ -23,23 +23,24 @@
             /* android打包配置 */
             "android" : {
                 "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "autoSdkPermissions" : false
             },
             /* ios打包配置 */
             "ios" : {

pages.json

@@ -375,6 +375,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/login/Privacyagreement",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "隐私协议",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/index/Immediateinspection/Immediateinspection.vue

@@ -140,34 +140,69 @@
 					// 是否支持手动输入条形码  仅飞书小程序（V3.14.0）支持
 					barCodeInput: false,
 					success: (res) => {
-						//console.log('111111111111111111', JSON.parse(res.result))
-						let lsdata = JSON.parse(res.result)
-						this.Punchposition = lsdata.position;
-						let postdata = {
-							"buildingId": lsdata.buildingId, //楼宇id
-							"storeyId": lsdata.storeyId, //楼层id
-							//"houseId": lsdata.buildingId, //房间id
-							"position": lsdata.position, //位置信息
-							"circuitPersonId": this.getuserInfo.id, //巡检人员id
-
-							"circuitTime": getCurrentTime(), //巡检时间
-							//  "circuitType": this.getuserInfo.circuitType,//巡检类型
-							"circuitType": '', //巡检类型
-							"remark": lsdata.remark, //备注
-
+							//  console.log('000000000000000000',res.result)						
+						
+						let lsdata =res.result;
+						 // console.log('111111111111111111', lsdata.substr(lsdata.indexOf('position')+11,lsdata.indexOf('projectId')-(lsdata.indexOf('position')+14)))
+						
+						if(lsdata.indexOf('houseId')=='-1'){
+							  console.log('888',)
+							  //没有房间号
+							  
+							  this.Punchposition = lsdata.substr(lsdata.indexOf('position')+11,lsdata.indexOf('projectId')-(lsdata.indexOf('position')+14));
+							  let postdata = {
+							  	"buildingId":lsdata.substr(lsdata.indexOf('buildingId')+12,19), //楼宇id
+							  	"storeyId":lsdata.substr(lsdata.indexOf('storeyId')+10,19), //楼层id
+							  	"houseId":'', //房间id
+							  	"position": this.Punchposition, //位置信息
+							  	"circuitPersonId": this.getuserInfo.id, //巡检人员id							
+							  	"circuitTime": getCurrentTime(), //巡检时间
+							  	//  "circuitType": this.getuserInfo.circuitType,//巡检类型
+							  	"circuitType": '', //巡检类型
+							  	"remark": lsdata.substr(lsdata.indexOf('remark')+8,lsdata.indexOf('buildingId')-(lsdata.indexOf('remark')+10)), //备注						
+							  }
+							  
+							  this.$api.post('/circuitrecord', postdata)
+							  	.then(res => {
+							  	//	console.log('99999', res)
+							  		if (res.data.code == 0) {
+							  			this.$refs.uNotify.success('打卡成功')
+							  			this.getDataListtwo();
+							  
+							  		} else {
+							  			this.$refs.uNotify.error('打卡失败')
+							  		}
+							  	})
+							  
+						}else{
+							  console.log('999',)
+							  this.Punchposition = lsdata.substr(lsdata.indexOf('position')+11,lsdata.indexOf('projectId')-(lsdata.indexOf('position')+14));
+							  let postdata = {
+							  	"buildingId":lsdata.substr(lsdata.indexOf('buildingId')+12,19), //楼宇id
+							  	"storeyId":lsdata.substr(lsdata.indexOf('storeyId')+10,19), //楼层id
+							  	"houseId":lsdata.substr(lsdata.indexOf('houseId')+9,19), //房间id
+							  	"position": this.Punchposition, //位置信息
+							  	"circuitPersonId": this.getuserInfo.id, //巡检人员id							
+							  	"circuitTime": getCurrentTime(), //巡检时间
+							  	//  "circuitType": this.getuserInfo.circuitType,//巡检类型
+							  	"circuitType": '', //巡检类型
+							  	"remark":  lsdata.substr(lsdata.indexOf('remark')+8,lsdata.indexOf('buildingId')-(lsdata.indexOf('remark')+10)), //备注					
+							  }
+							  
+							  this.$api.post('/circuitrecord', postdata)
+							  	.then(res => {
+							  	//	console.log('99999', res)
+							  		if (res.data.code == 0) {
+							  			this.$refs.uNotify.success('打卡成功')
+							  			this.getDataListtwo();
+							  
+							  		} else {
+							  			this.$refs.uNotify.error('打卡失败')
+							  		}
+							  	})						  
 						}
-
-						this.$api.post('/circuitrecord', postdata)
-							.then(res => {
-								console.log('99999', res)
-								if (res.data.code == 0) {
-									this.$refs.uNotify.success('打卡成功')
-									this.getDataListtwo();
-
-								} else {
-									this.$refs.uNotify.error('打卡失败')
-								}
-							})
+													
+										
 					},
 					fail: (error) => {
 						this.$refs.uNotify.error(error)

pages/login/login.vue

@@ -35,9 +35,19 @@
 				还没有账号?<text @click="register">注册</text>
 			</view> -->
 		</view>
+		
+		<view class="Userprotocol">
+			<view class="Userprotocolchecked">
+				<checkbox :checked="isChecked" @click="isChecked=!isChecked" />
+			</view>
+			<view class="Userprotocoltext" @click="Userprotocol">
+				我已阅读并同意用户协议和隐私政策
+			</view>
+		</view>
+
 
 		<u-toast ref="uToast" />
-		
+		<u-notify ref="uNotify" message="" ></u-notify>
 	</view>
 </template>
 
@@ -54,14 +64,14 @@
 		
 		data() {
 			return {
+				isChecked:true,
 				isShowPassword: false,
 				account: '',
 				password: '',
 				captcha: '',
 				uuid: '',
 				captchaPath: '',
-
-
+						
 			}
 		},
 
@@ -82,61 +92,66 @@
 
 			loginbtn() {
 
-				if (this.account == '') {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "请输入账号",
-					})
-					// uni.showToast({
-					// 	title: "请输入账号",
-					// 	icon:'error',
-					// 	duration: 1000,
+if(this.isChecked){
+	
+	if (this.account == '') {
+		this.$refs.uToast.show({
+			type: 'error',
+			message: "请输入账号",
+		})
+		// uni.showToast({
+		// 	title: "请输入账号",
+		// 	icon:'error',
+		// 	duration: 1000,
+		// })
+	} else if (this.password == '') {
+		this.$refs.uToast.show({
+			type: 'error',
+			message: "请输入密码",
+		})
+	}
+	
+	let formData = {
+		username: this.account,
+		password: this.password,
+		// uuid:this.uuid,
+		// captcha:this.captcha,
+	}
+	//登录功能
+	this.$api.post('/login', formData)
+		.then(res => {
+	
+			if (res.data.code == 0) {
+	
+				uni.setStorageSync('tokendata', res.data.data.token); //token
+				uni.setStorageSync('Userinformation', formData); //用户信息
+	
+				//获取用户的信息，如组织架构，个人信息，权限等
+				Promise.all([this.getpermissions(), this.getDictList(), this.getuserInfo(), ]).then(() => {
+	
+					// uni.switchTab({
+					// 	url: '/pages/index/index',
+					// 	success: res => {},
+					// 	fail: () => {},
+					// 	complete: () => {},
 					// })
-				} else if (this.password == '') {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "请输入密码",
-					})
-				}
-
-				let formData = {
-					username: this.account,
-					password: this.password,
-					// uuid:this.uuid,
-					// captcha:this.captcha,
-				}
-				//登录功能
-				this.$api.post('/login', formData)
-					.then(res => {
-
-						if (res.data.code == 0) {
-
-							uni.setStorageSync('tokendata', res.data.data.token); //token
-							uni.setStorageSync('Userinformation', formData); //用户信息
-
-							//获取用户的信息，如组织架构，个人信息，权限等
-							Promise.all([this.getpermissions(), this.getDictList(), this.getuserInfo(), ]).then(() => {
-
-								// uni.switchTab({
-								// 	url: '/pages/index/index',
-								// 	success: res => {},
-								// 	fail: () => {},
-								// 	complete: () => {},
-								// })
-								uni.navigateTo({
-									url: '/pages/index/index'
-								})
-							});
-
-
-						} else {
-							this.$refs.uToast.show({
-								type: 'error',
-								message: "账号或者密码错误，请重新输入",
-							})
-						}
+					uni.navigateTo({
+						url: '/pages/index/index'
 					})
-
+				});
+	
+	
+			} else {
+				this.$refs.uToast.show({
+					type: 'error',
+					message: "账号或者密码错误，请重新输入",
+				})
+			}
+		})
+	
+}else{
+	this.$refs.uNotify.error('您尚未同意用户协议')	
+}
 
 			},
 
@@ -204,6 +219,14 @@
 			showOrHide() {
 				this.isShowPassword = !this.isShowPassword
 			},
+Userprotocol(){
+	uni.navigateTo({
+		url: '/pages/login/Privacyagreement',
+		success: res => {},
+		fail: () => {},
+		complete: () => {},
+	})
+},
 
 			// 找回密码
 			forget() {
@@ -229,7 +252,22 @@
 </script>
 
 <style lang="scss">
-	
+	.Userprotocol{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: fixed;
+		bottom: 20rpx;
+	left: 0rpx;
+	right: 0rpx;
+	}
+	.Userprotocolchecked{
+		
+	}
+	.Userprotocoltext{
+		color: #fff;
+		padding-left: 10rpx;
+	}
 	
 	page {
 		background-color: #0b0c14;

pages/my/Myorder/Orderdetails/Orderdetails.vue

@@ -35,7 +35,7 @@
 							金额: <span>￥{{item.amount}}</span>
 						</view>
 						<view class="Currentamount">
-							账单类型: {{item.billType}}
+							账单类型: {{item.billType}}--{{item.costType}}
 						</view>
 						<view class="Currentamount">
 							计费周期: {{item.costCycle}}
@@ -131,6 +131,7 @@
 				showPicker: false,
 				//myday: currentDate,
 				showpayjine: false,
+				PropertyTypedata:[],
 				model1: {
 					userInfo: {
 						amount: '',
@@ -162,11 +163,16 @@
 			this.getalldata(this.myid)
 			
 			let getDictDataList = uni.getStorageSync('getDictDataList');
-		//	console.log('111111111111111111', getDictDataList)
+			console.log('111111111111111111', getDictDataList)
 			for (let i = 0; i < getDictDataList.length; i++) {
 			    if (getDictDataList[i].dictType == 'PayType') {
 			        this.billstype = getDictDataList[i].dataList
 			    }  
+				if (getDictDataList[i].dictType == 'PropertyType') {
+				    this.PropertyTypedata = getDictDataList[i].dataList
+				}  
+				
+				
 			}
 			
 			
@@ -261,10 +267,25 @@ this.indexList=[];
 							        a[i].billType =  a[i].billType;
 							    }
 							    return a;
+							}	
+							function transform1(a, b) {
+							    loop: for (let i = 0; i < a.length; i++) {
+							        for (let j = 0; j < b.length; j++) {
+							            if (a[i].costType == b[j].dictValue) {
+							                a[i].costType = b[j].dictLabel;
+							                continue loop;
+							            }
+							        }
+							        a[i].costType =  a[i].costType;
+							    }
+							    return a;
 							}							
-							this.indexList=transform(res.data.data.billLists, this.billstype)											
+													
+									
+							this.indexList=transform(res.data.data.billLists, this.billstype)	;
+							this.indexList=transform1(res.data.data.billLists, this.PropertyTypedata)	;										
 						}
-						//  console.log('111111111111111111',this.indexList)																			
+						  console.log('111111111111111111',this.indexList)																			
 					})
 			},