合并冲突

.idea/workspace.xml

@@ -2,11 +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$/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/App.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/http/baseApi.js" beforeDir="false" afterPath="$PROJECT_DIR$/http/baseApi.js" 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/my/Myorder/Orderdetails/Orderdetails.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/Myorder/Orderdetails/Orderdetails.vue" 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" />
@@ -14,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/" />
@@ -44,8 +37,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3450">
-              <caret line="115" column="114" selection-start-line="115" selection-start-column="114" selection-end-line="115" selection-end-column="114" />
+            <state relative-caret-position="3360">
+              <caret line="112" column="114" selection-start-line="112" selection-start-column="114" selection-end-line="112" selection-end-column="114" />
             </state>
           </provider>
         </entry>
@@ -71,8 +64,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/login/login.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3570">
-              <caret line="119" column="48" selection-start-line="119" selection-start-column="48" selection-end-line="119" selection-end-column="48" />
+            <state relative-caret-position="3750">
+              <caret line="125" column="48" selection-start-line="125" selection-start-column="48" selection-end-line="125" selection-end-column="48" />
             </state>
           </provider>
         </entry>
@@ -90,7 +83,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="191" selection-start-line="191" selection-end-line="191" />
+              <caret line="196" selection-start-line="196" selection-end-line="196" />
             </state>
           </provider>
         </entry>
@@ -188,7 +181,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -343,6 +335,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -396,14 +389,18 @@
       <workItem from="1683160641474" duration="594000" />
       <workItem from="1683265707499" duration="595000" />
       <workItem from="1683332933669" duration="593000" />
+      <workItem from="1683364463682" duration="61000" />
+      <workItem from="1683505747555" duration="593000" />
+      <workItem from="1683594601602" duration="595000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="103180000" />
+    <option name="totallyTimeSpent" value="104429000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-8" width="1936" height="1056" extended-state="1" />
+    <editor active="true" />
     <layout>
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -598,8 +595,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3450">
-          <caret line="115" column="114" selection-start-line="115" selection-start-column="114" selection-end-line="115" selection-end-column="114" />
+        <state relative-caret-position="3360">
+          <caret line="112" column="114" selection-start-line="112" selection-start-column="114" selection-end-line="112" selection-end-column="114" />
         </state>
       </provider>
     </entry>
@@ -619,8 +616,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/login/login.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3570">
-          <caret line="119" column="48" selection-start-line="119" selection-start-column="48" selection-end-line="119" selection-end-column="48" />
+        <state relative-caret-position="3750">
+          <caret line="125" column="48" selection-start-line="125" selection-start-column="48" selection-end-line="125" selection-end-column="48" />
         </state>
       </provider>
     </entry>
@@ -634,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="191" selection-start-line="191" selection-end-line="191" />
+          <caret line="196" selection-start-line="196" selection-end-line="196" />
         </state>
       </provider>
     </entry>

manifest.json

@@ -1,7 +1,7 @@
 {
-    "name" : "传秀",
+    "name" : "传能",
     "appid" : "__UNI__FF40C0C",
-    "description" : "传秀app",
+    "description" : "智慧生活",
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
@@ -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

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

pages/Workorder/AccessControl/AccessControl.vue

@@ -8,18 +8,19 @@
 			<view class="mjlx">{{item.deviceSerial}}</view>
 			<view class="mjsh">{{item.parentCategory}}</view>
 
+		
 			<view class="mjkg">
 				<view class="anniu">
-					<u-button type="success" text="开启" @click="buttons(item,'open')"></u-button>
+					<u-button  type="primary" :plain="true" text="开启" @click="buttons(item,'open')"></u-button>
 				</view>
 				<view class="anniu">
-					<u-button type="warning" text="关闭" @click="buttons(item,'close')"></u-button>
+					<u-button  type="primary" :plain="true" text="关闭" @click="buttons(item,'close')"></u-button>
 				</view>	
 				<view class="anniu">
-					<u-button type="primary" text="常开" @click="buttons(item,'alwaysOpen')"></u-button>
+					<u-button  type="primary" :plain="true" text="常开" @click="buttons(item,'alwaysOpen')"></u-button>
 				</view>		
 				<view class="anniu">
-					<u-button type="error" text="常关" @click="buttons(item,'alwaysClose')"></u-button>
+					<u-button  type="primary" :plain="true" text="常关" @click="buttons(item,'alwaysClose')"></u-button>
 				</view>
 				<!-- <view class="sfkq">
 					<view class="sfkq1">是否开启</view>
@@ -181,13 +182,17 @@
 		align-items: center;
 		justify-content: center;
 	}
-
+.anniu{
+	width: 120rpx;
+	margin-left: 30rpx;
+}
 	.mjkg {
 		display: flex;
 		align-items: center;
-		justify-content: space-around;
-		margin-top: 40rpx;
-		margin-bottom: 10rpx;
+		justify-content:flex-end;
+		height: 120rpx;
+		border-top: 2px solid #F6F6F6;
+		margin-top: 20rpx;
 	}
 
 	.mjsh {
@@ -210,7 +215,7 @@
 
 	.mjym {
 		width: 690rpx;
-		height: 400rpx;
+		height: 380rpx;
 		background: #fff;
 		margin: 20rpx auto;
 		border-radius: 10px;

pages/Workorder/Intelligentdoorlock/Intelligentdoorlock.vue

@@ -1,381 +1,315 @@
 <template>
-	<view class="billall">
-
-		<!-- 列表 -->
-		<!-- <t-table>
-			<t-tr>
-				<t-th>序号</t-th>
-				<t-th>姓名</t-th>
-				<t-th>年龄</t-th>
-				<t-th>爱好</t-th>
-				<t-th>操作</t-th>
-			</t-tr>
-			<t-tr v-for="item in tableList" :key="item.id">
-				<t-td>{{ item.id + 1 }}</t-td>
-				<t-td>{{ item.name }}</t-td>
-				<t-td>{{ item.age }}</t-td>
-				<t-td>{{ item.hobby }}</t-td>
-				  <t-td align="left"> <u-button @click="edit(item)"  size="small" type="primary" :plain="true" text="编辑"></u-button></t-td>
-				
-			</t-tr>
-		</t-table> -->
-
-		<view class="u-listdata">
-			<view style="padding:10rpx 0 0 30rpx">
-				共有 <span style="color: red">{{totalnumber}}</span>条记录
-			</view>
-
-			<u-list @scrolltolower="scrolltolower" :pagingEnabled='true'>
-				<u-list-item v-for="(item, index) in indexList" :key="index">
-
-					<view class="companylist">
-						<view class="settled" @click="kaimen(item)">
-							开门记录
-						</view>
-						<view class="outstanding" @click="Remotedooropening(item)">
-							远程开门
-						</view>
-						<view class="outstanding1" @click="setPwd(item.deviceId)">
-							临时密码
-						</view>
-						<view class="outstanding2" @click="seedetail(item)">
-							查看租户
-						</view>
-
-						<h3>{{item.name}}</h3>
-						<view class="Currentamount">
-							房间编号:{{item.roomid}}
-						</view>
-						<view class="Currentamount">
-							用户总数量: {{item.usernum}}
-						</view>
-						<view class="Currentamount">
-							设备编号:{{item.deviceId}}
-						</view>
-						<view class="Currentamount">
-							网关编号: {{item.deviceno}}
-						</view>
-						<!-- <view class="Currentamount">
-							安装时间: {{item.installationtime}}
-						</view> -->
-					</view>
-
-				</u-list-item>
-			</u-list>
-
-		</view>
-
-		<!-- 门锁信息 -->
-		<u-modal :show="showms" @confirm="confirmPwd" title="临时密码设置" :showCancelButton="true" @cancel="showms=false">
-					<view class="slot-content">
-						 <u--input
-						    placeholder="请输入临时密码"
-						    v-model="lsmima"
-						  ></u--input>
-					</view>
-				</u-modal>
-		<u-notify ref="uNotify" message=""></u-notify>
-	</view>
+  <view class="billall">
+    <view class="u-listdata">
+      <view style="padding: 10rpx 0 0 30rpx">
+        共有 <span style="color: red">{{ totalnumber }}</span
+        >条记录
+      </view>
+
+      <u-list @scrolltolower="scrolltolower" :pagingEnabled="true">
+        <u-list-item v-for="(item, index) in indexList" :key="index">
+          <view class="companylist">
+            <view class="outstanding" @click="Remotedooropening(item)">
+              远程开门
+            </view>
+            <view class="outstanding1" @click="setPwd(item.deviceId)">
+              临时密码
+            </view>
+            <view class="outstanding2" @click="seedetail(item)">
+              查看租户
+            </view>
+            <h3>{{ item.name }}</h3>
+            <view class="Currentamount"> 设备编号:{{ item.deviceId }} </view>
+          </view>
+        </u-list-item>
+      </u-list>
+    </view>
+    <!-- 门锁信息 -->
+    <u-modal
+      :show="showms"
+      @confirm="confirmPwd"
+      title="临时密码设置"
+      :showCancelButton="true"
+      @cancel="showms = false"
+    >
+      <view class="slot-content">
+        <u--input placeholder="请输入临时密码" v-model="lsmima"></u--input>
+      </view>
+    </u-modal>
+    <u-notify ref="uNotify" message=""></u-notify>
+  </view>
 </template>
 
 <script>
-	// import tTable from '@/components/t-table/t-table.vue';
-	// import tTh from '@/components/t-table/t-th.vue';
-	// import tTr from '@/components/t-table/t-tr.vue';
-	// import tTd from '@/components/t-table/t-td.vue';
-	export default {
-		components: {
-			// tTable,
-			// tTh,
-			// tTr,
-			// tTd
-		},
-		data() {
-
-			return {
-				showms: false,
-
-				totalnumber: 0,
-				setyesno: true,
-				lsmima: '',
-				indexList: [],
-				dataList: [],
-				dataForm: {
-					"currentPage":1,
-					"deviceId": "",
-					"pageSize": 10,
-					"roomId": "",
-					"tempPwd": "",
-					"tenantsId": "",
-					"userName": ""
-				},
-
-				showtype: false,
-				showdct: false,
-				mytitle: '',
-				alldata: [],
-				showfloor: false,
-				loading: false,
-				columns: [],
-				pd: true,
-				columnData: [],
-				myday: '',
-				mytype: '全部',
-				showPicker: false,
-
-
-
-
-			}
-		},
-		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
-		onLoad() {
-			this.getalldata();
-
-		},
-		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
-		onReady() {
-			// 微信小程序需要用此写法
-
-		},
-
-		//监听页面隐藏
-		onHide() {},
-		//监听窗口尺寸变化
-		onResize() {},
-		//监听页面卸载
-		onUnload() {},
-		//监听用户下拉动作，一般用于下拉刷新
-		onPullDownRefresh() {},
-
-
-		methods: {
-			Remotedooropening(e) {
-				let postdata = {
-					cmdType: 'RemoteOpenDoor',
-					roomId: e.roomid
-				};
-				this.$api.post('/lock/issuedCmd', postdata)
-					.then(res => {
-						if (res.data.code == 0) {
-this.$refs.uNotify.success(res.data.data)
-
-						} else {
-							this.$refs.uNotify.error(res.data.msg)
-						}
-					})
-			},
-
-			seedetail(e) {
-				uni.navigateTo({
-					url: `/pages/Workorder/Intelligentdoorlock/Tenantdetails/Tenantdetails?companyOrgId=${e.roomid}`
-				});
-			},
-			kaimen(e) {
-				uni.navigateTo({
-					url: `/pages/Workorder/Intelligentdoorlock/Dooropeningrecord/Dooropeningrecord?companyOrgId=${e.roomid}`
-				});
-			},
-			setPwd(deviceId){
-				this.showms=true;
-				this.dataForm.deviceId=deviceId
-			},
-			confirmPwd() {
-				this.$api.post('/lock/getTempPwd',{
-					tempPwd:this.lsmima,
-					deviceId:this.dataForm.deviceId
-				}).then(res => {
-						if (res.data.code == 0) {
-							this.showms = false;
-							//this.lsmima = res.data.data;
-							this.$refs.uNotify.success(res.data.msg)
-						} else {
-							this.$refs.uNotify.error(res.data.msg)
-						}
-					})
-
-			},
-			closems() {
-				this.showms = false
-				// console.log('close');
-			},
-
-
-
-
-			scrolltolower() {
-				if (this.pd) {
-					this.getalldata();
-				} else {
-					return
-				}
-			},
-
-			getalldata() {
-				this.$api.post('/lock/page', this.dataForm)
-					.then(res => {
-						this.totalnumber = res.data.data.total;
-						if (res.data.data.list.length != 0) {
-							this.indexList.push(...res.data.data.list);
-							this.dataForm.currentPage = this.dataForm.currentPage + 1;
-							this.pd = true;
-						} else {
-							uni.showToast({
-								title: '暂无更多数据了',
-								icon: 'none',
-								duration: 1500
-							})
-							this.pd = false;
-						}
-
-					})
-			},
-
-
-
-
-
-
-
-
-		}
-	}
+export default {
+  components: {},
+  data() {
+    return {
+      showms: false,
+      totalnumber: 0,
+      setyesno: true,
+      lsmima: "",
+      indexList: [],
+      dataList: [],
+      dataForm: {
+        currentPage: 1,
+        deviceId: "",
+        pageSize: 10,
+        roomId: "",
+        tempPwd: "",
+        tenantsId: "",
+        userName: "",
+      },
+      showtype: false,
+      showdct: false,
+      mytitle: "",
+      alldata: [],
+      showfloor: false,
+      loading: false,
+      columns: [],
+      pd: true,
+      columnData: [],
+      myday: "",
+      mytype: "全部",
+      showPicker: false,
+    };
+  },
+  //监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
+  onLoad() {
+    this.getalldata();
+  },
+  //监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
+  onReady() {
+    // 微信小程序需要用此写法
+  },
+  //监听页面隐藏
+  onHide() {},
+  //监听窗口尺寸变化
+  onResize() {},
+  //监听页面卸载
+  onUnload() {},
+  //监听用户下拉动作，一般用于下拉刷新
+  onPullDownRefresh() {},
+
+  methods: {
+    Remotedooropening(e) {
+      let postdata = {
+        cmdType: "RemoteOpenDoor",
+        roomId: e.roomid,
+      };
+      this.$api.post("/lock/issuedCmd", postdata).then((res) => {
+        if (res.data.code == 0) {
+          this.$refs.uNotify.success(res.data.data);
+        } else {
+          this.$refs.uNotify.error(res.data.msg);
+        }
+      });
+    },
+
+    seedetail(e) {
+      uni.navigateTo({
+        url: `/pages/Workorder/Intelligentdoorlock/Tenantdetails/Tenantdetails?companyOrgId=${e.roomid}`,
+      });
+    },
+    kaimen(e) {
+      uni.navigateTo({
+        url: `/pages/Workorder/Intelligentdoorlock/Dooropeningrecord/Dooropeningrecord?companyOrgId=${e.roomid}`,
+      });
+    },
+    setPwd(deviceId) {
+      this.showms = true;
+      this.dataForm.deviceId = deviceId;
+    },
+    confirmPwd() {
+      this.$api
+        .post("/lock/getTempPwd", {
+          tempPwd: this.lsmima,
+          deviceId: this.dataForm.deviceId,
+        })
+        .then((res) => {
+          if (res.data.code == 0) {
+            this.showms = false;
+            this.$refs.uNotify.success(res.data.msg);
+          } else {
+            this.$refs.uNotify.error(res.data.msg);
+          }
+        });
+    },
+    closems() {
+      this.showms = false;
+    },
+    scrolltolower() {
+      if (this.pd) {
+        this.getalldata();
+      } else {
+        return;
+      }
+    },
+    getalldata() {
+      this.$api.post("/lock/page", this.dataForm).then((res) => {
+        this.totalnumber = res.data.data.total;
+        if (res.data.data.list.length != 0) {
+          this.indexList.push(...res.data.data.list);
+          this.dataForm.currentPage = this.dataForm.currentPage + 1;
+          this.pd = true;
+        } else {
+          uni.showToast({
+            title: "暂无更多数据了",
+            icon: "none",
+            duration: 1500,
+          });
+          this.pd = false;
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	.mensuoxx {
-		width: 750rpx;
-		height: 300rpx;
-
-		h3 {
-			width: 100%;
-			height: 80rpx;
-			text-align: center;
-			line-height: 80rpx;
-			margin-bottom: 50rpx;
-		}
-	}
-
-	.Currentamount {
-		padding-left: 30rpx;
-		min-height: 50rpx;
-		line-height: 50rpx;
-		color: #BCB3A7;
-
-		span {
-			color: #FA5555;
-			padding-left: 9rpx;
-		}
-	}
-
-	.Callfee {
-		width: 100rpx;
-		height: 45rpx;
-		text-align: center;
-		line-height: 45rpx;
-		color: #5C8FFF;
-		border: 1px solid #5C8FFF;
-		font-size: 22rpx;
-		position: absolute;
-		bottom: 10rpx;
-		right: 10px;
-		font-weight: bold;
-	}
-
-	.companylist {
-		margin: 20rpx 30rpx;
-		background: #fff;
-		min-height: 380rpx;
-		border-radius: 10px;
-		position: relative;
-
-		h3 {
-			height: 70rpx;
-			line-height: 70rpx;
-			padding-left: 30rpx;
-		}
-	}
-
-	.settled {
-		background-color: #2B60DE;
-		width: 120rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 0px;
-		right: 0px;
-		border-top-right-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
-	.outstanding {
-		background-color: #09C700;
-		width: 120rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 110rpx;
-		right: 0px;
-		border-top-left-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
-	.outstanding1 {
-		background-color: #3090C7;
-		width: 120rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		top: 56%;
-		right: 0px;
-		border-top-left-radius: 10rpx;
-		border-bottom-left-radius: 10rpx;
-	}
-
-	.outstanding2 {
-		background-color: #4E8975;
-		width: 120rpx;
-		height: 60rpx;
-		text-align: center;
-		line-height: 60rpx;
-		color: #fff;
-		font-size: 14rpx;
-		position: absolute;
-		bottom: 0px;
-		right: 0px;
-		border-top-left-radius: 10rpx;
-		border-bottom-right-radius: 10rpx;
-	}
-
-
-
-
-	.billall {}
-
-	.topbill {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		height: 100rpx;
-		background-color: #e6e6e6;
-	}
-
-	.topbilledit {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-	}
-
-	.changetime1 {
-		padding-right: 10rpx;
-	}
+.mensuoxx {
+  width: 750rpx;
+  height: 300rpx;
+
+  h3 {
+    width: 100%;
+    height: 80rpx;
+    text-align: center;
+    line-height: 80rpx;
+    margin-bottom: 50rpx;
+  }
+}
+.mjkg {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  height: 120rpx;
+  border-top: 2px solid #f6f6f6;
+  margin-top: 20rpx;
+}
+.anniu {
+  width: 120rpx;
+  margin-left: 30rpx;
+}
+
+.Currentamount {
+  padding-left: 30rpx;
+  min-height: 50rpx;
+  line-height: 50rpx;
+  color: #bcb3a7;
+
+  span {
+    color: #fa5555;
+    padding-left: 9rpx;
+  }
+}
+
+.Callfee {
+  width: 100rpx;
+  height: 45rpx;
+  text-align: center;
+  line-height: 45rpx;
+  color: #5c8fff;
+  border: 1px solid #5c8fff;
+  font-size: 22rpx;
+  position: absolute;
+  bottom: 10rpx;
+  right: 10px;
+  font-weight: bold;
+}
+
+.companylist {
+  margin: 20rpx 30rpx;
+  background: #fff;
+  min-height: 380rpx;
+  border-radius: 10px;
+  position: relative;
+
+  h3 {
+    height: 70rpx;
+    line-height: 70rpx;
+    padding-left: 30rpx;
+  }
+}
+
+.settled {
+  background-color: #2b60de;
+  width: 120rpx;
+  height: 60rpx;
+  text-align: center;
+  line-height: 60rpx;
+  color: #fff;
+  font-size: 14rpx;
+  position: absolute;
+  top: 0px;
+  right: 0px;
+  border-top-right-radius: 10rpx;
+  border-bottom-left-radius: 10rpx;
+}
+
+.outstanding {
+  background-color: #09c700;
+  width: 120rpx;
+  height: 60rpx;
+  text-align: center;
+  line-height: 60rpx;
+  color: #fff;
+  font-size: 14rpx;
+  position: absolute;
+  top: 110rpx;
+  right: 0px;
+  border-top-left-radius: 10rpx;
+  border-bottom-left-radius: 10rpx;
+}
+
+.outstanding1 {
+  background-color: #3090c7;
+  width: 120rpx;
+  height: 60rpx;
+  text-align: center;
+  line-height: 60rpx;
+  color: #fff;
+  font-size: 14rpx;
+  position: absolute;
+  top: 56%;
+  right: 0px;
+  border-top-left-radius: 10rpx;
+  border-bottom-left-radius: 10rpx;
+}
+
+.outstanding2 {
+  background-color: #4e8975;
+  width: 120rpx;
+  height: 60rpx;
+  text-align: center;
+  line-height: 60rpx;
+  color: #fff;
+  font-size: 14rpx;
+  position: absolute;
+  bottom: 0px;
+  right: 0px;
+  border-top-left-radius: 10rpx;
+  border-bottom-right-radius: 10rpx;
+}
+
+.billall {
+}
+
+.topbill {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  height: 100rpx;
+  background-color: #e6e6e6;
+}
+
+.topbilledit {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+}
+
+.changetime1 {
+  padding-right: 10rpx;
+}
 </style>

pages/index/BillPending/BillPending.vue

@@ -57,10 +57,10 @@
                 </u-list>
             </view>
             <view class="zhifu" v-show="zhifumk">
-                <view class="zhifuleft">
+              <!--  <view class="zhifuleft">
                     <checkbox :checked="quanxuan"/>
                     全选
-                </view>
+                </view> -->
                 <view class="zhifuright" @click="Immediatepayment">
                     <view class="heji">
                         合计：<span>￥ {{heji}}</span>
@@ -794,7 +794,7 @@
         background-color: #fff;
         display: flex;
         align-items: center;
-        justify-content: space-between;
+        justify-content:flex-end;
     }
 
     .zhifuleft {

pages/index/Immediateinspection/Immediateinspection.vue

@@ -101,7 +101,6 @@
 			this.dataForm.endDate = `${year}-${month}-${day}` + " 23:59:59";
 			this.dataForm.circuitPersonId = this.getuserInfo.id;
 			//	this.dataForm.circuitType = this.userInfo.circuitType;
-			//	console.log('111111111111111111',this.dataForm)
 			this.getDataList();
 		},
 		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
@@ -138,35 +137,60 @@
 					// 是否支持手动输入条形码  仅飞书小程序（V3.14.0）支持
 					barCodeInput: false,
 					success: (res) => {
-						console.log(res.result)
-						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, //备注
-
+						let lsdata =res.result;
+						if(lsdata.indexOf('houseId')=='-1'){
+							  //没有房间号
+							  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 => {
+							  		if (res.data.code == 0) {
+							  			this.$refs.uNotify.success('打卡成功')
+							  			this.getDataListtwo();
+							  
+							  		} else {
+							  			this.$refs.uNotify.error('打卡失败')
+							  		}
+							  	})
+							  
+						}else{
+							  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 => {
+							  		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)
@@ -178,7 +202,6 @@
 				this.dataForm.page = 1;
 				this.$api.get('/circuitrecord/page', this.dataForm)
 					.then(res => {
-						//console.log('111111111111111111',res.data.data)
 						this.totalnumber = res.data.data.total;
 						this.indexList = res.data.data.list;
 					})

pages/index/index.vue

@@ -222,18 +222,20 @@
 
 			</u-tabbar-item>
 		</u-tabbar>
- <canvas v-if="showCanvas" class="watermarkCans" canvas-id="watermarkCanvas"></canvas>
+		
+	<!-- 水印 -->	
+<!-- <canvas v-if="showCanvas" class="watermarkCans" canvas-id="watermarkCanvas"></canvas> -->
 	</view>
 </template>
 
 <script>
-	  import watermark from '../../js_sdk/ly-watermark/commons/watermark.js'
+	  import watermark from '@/js_sdk/ly-watermark/commons/watermark.js'
 	import tTable from '@/components/t-table/t-table.vue';
 	import tTh from '@/components/t-table/t-th.vue';
 	import tTr from '@/components/t-table/t-tr.vue';
 	import tTd from '@/components/t-table/t-td.vue';
 	export default {
-		  mixins: [watermark],
+		//  mixins: [watermark],  // 水印
 		components: {
 			tTable,
 			tTh,
@@ -272,7 +274,7 @@
 			 
 		},
 		mounted() {
-				            this.initWatermark(); // 可以在水印内容准备好后执行初始化
+ //     this.initWatermark(); // 可以在水印内容准备好后执行初始化
 				        },
 		onPullDownRefresh() {
 			//	console.log('我下拉刷新页面了！！！！！！！！！！！！！！！', )

pages/login/login.vue

@@ -10,52 +10,42 @@
 		<view class="form-box">
 			<view class="loginTxt">登录</view>
 			<view class="row-input">
-				<u-icon name="account" color="#2979ff" size="50" style="padding: 0 20rpx;"></u-icon>
+				<u-icon name="account" color="#2979ff" size="50" style="padding: 0 20rpx"></u-icon>
 				<input v-model="account" placeholder="请输入用户账号" maxlength="18" clearable />
 			</view>
 			<view class="row-input">
-				<u-icon name="lock" color="#2979ff" size="50" style="padding: 0 20rpx;"></u-icon>
+				<u-icon name="lock" color="#2979ff" size="50" style="padding: 0 20rpx"></u-icon>
 				<input v-model="password" placeholder="登陆密码" clearable :password="!isShowPassword" />
-				<u-icon name="eye-fill" color="#2979ff" size="50" style="padding-right:20rpx" v-if="isShowPassword"
+				<u-icon name="eye-fill" color="#2979ff" size="50" style="padding-right: 20rpx" v-if="isShowPassword"
 					@click="showOrHide"></u-icon>
-				<u-icon name="eye-off" color="#2979ff" size="50" style="padding-right:0rpx" v-else @click="showOrHide">
+				<u-icon name="eye-off" color="#2979ff" size="50" style="padding-right: 0rpx" v-else @click="showOrHide">
 				</u-icon>
 			</view>
-
-			<!-- <view class="menu-link">
-				<text @click="forget">找回密码</text>
-			</view> -->
-			<view class="login-btn" @click="loginbtn">登录</view>
-			<!-- <view class="tip-link">
-			</view> -->
+			<view class="Userprotocol">
+				<view class="Userprotocolchecked">
+					<checkbox :checked="isChecked" @click="isChecked=!isChecked" />
+				</view>
+				<view class="Userprotocoltext" @click="Userprotocol">我已阅读并同意用户协议和隐私政策</view>
+			</view>
 		</view>
-
-		<u-toast ref="uToast" />
-
+		<view class="login-btn" @click="loginbtn">登录</view>
+	</view>
+	<u-toast ref="uToast" />
 	</view>
 </template>
 
 <script>
-	// function getUUID() {
-	//   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
-	//     return (c === 'x' ? (Math.random() * 16 | 0) : ('r&0x3' | '0x8')).toString(16)
-	//   })
-	// }
-	//const BaseApi= require("@/http/baseApi.js");
-
 	export default {
-
 		data() {
 			return {
+				isChecked: true,
 				isShowPassword: false,
-				account: '',
-				password: '',
-				captcha: '',
-				uuid: '',
-				captchaPath: '',
-
-
-			}
+				account: "",
+				password: "",
+				captcha: "",
+				uuid: "",
+				captchaPath: "",
+			};
 		},
 
 		onLoad() {
@@ -63,136 +53,128 @@
 		},
 		onUnload() {
 			//触发水印显示
-			uni.$emit('ly-show-watermark');
+			uni.$emit("ly-show-watermark");
 		},
 		methods: {
 			loginbtn() {
-
-				if (this.account == '') {
+				if (this.account == "") {
 					this.$refs.uToast.show({
-						type: 'error',
+						type: "error",
 						message: "请输入账号",
-					})
-				} else if (this.password == '') {
+					});
+				} else if (this.password == "") {
 					this.$refs.uToast.show({
-						type: 'error',
+						type: "error",
 						message: "请输入密码",
-					})
+					});
 				}
 
 				let formData = {
 					username: this.account,
 					password: this.password,
-				}
+				};
 				//登录功能
-				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.navigateTo({
-									url: '/pages/index/index'
-								})
+				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.navigateTo({
+								url: "/pages/index/index",
 							});
-						} else {
-							this.$refs.uToast.show({
-								type: 'error',
-								message: "账号或者密码错误，请重新输入",
-							})
-						}
-					})
-
-
+						});
+					} else {
+						this.$refs.uToast.show({
+							type: "error",
+							message: "账号或者密码错误，请重新输入",
+						});
+					}
+				});
 			},
 			getpermissions() {
-				console.log('权限功能', )
+				console.log("权限功能");
 				//获取用户权限功能
 				return new Promise((resolve, reject) => {
-					this.$api.get('/menu/permissions', {}).then((res) => {
-						uni.setStorageSync('ButtonPermissions', res.data.data);
-						resolve(res);
-						//	console.log('111111111111111111', res)
-
-					}).catch(e => {
-						reject(e)
-					})
+					this.$api
+						.get("/menu/permissions", {})
+						.then((res) => {
+							uni.setStorageSync("ButtonPermissions", res.data.data);
+							resolve(res);
+						})
+						.catch((e) => {
+							reject(e);
+						});
 				});
-
-
-				// this.$api.get('/menu/permissions', {})
-				// 	.then(res1 => {
-				// 		uni.setStorageSync('ButtonPermissions', res1.data.data); //权限列表
-				// 	})
 			},
 			getDictList() {
 				//获取字典列表, 添加并全局变量保存
 				return new Promise((resolve, reject) => {
-					this.$api.get('/all', {}).then((res) => {
-						uni.setStorageSync('getDictDataList', res.data.data);
-						resolve(res);
-						//	console.log('222222', res)
-
-					}).catch(e => {
-						reject(e)
-					})
+					this.$api
+						.get("/all", {})
+						.then((res) => {
+							uni.setStorageSync("getDictDataList", res.data.data);
+							resolve(res);
+							//	console.log('222222', res)
+						})
+						.catch((e) => {
+							reject(e);
+						});
 				});
-
-
-				// this.$api.get('/all', {})
-				// 	.then(res => {
-				// 		//  console.log('88888', res.data.data)
-				// 		uni.setStorageSync('getDictDataList', res.data.data);
-				// 	})
 			},
 			getuserInfo() {
 				//获取用户信息
 				return new Promise((resolve, reject) => {
-					this.$api.get('/user/userInfo', {}).then((res) => {
-						uni.setStorageSync('getuserInfo', res.data.data);
-						resolve(res);
-						//console.log('333333', res)
-
-					}).catch(e => {
-						reject(e)
-					})
+					this.$api
+						.get("/user/userInfo", {})
+						.then((res) => {
+							uni.setStorageSync("getuserInfo", res.data.data);
+							resolve(res);
+						})
+						.catch((e) => {
+							reject(e);
+						});
 				});
-
-				// this.$api.get('/user/userInfo', {})
-				// 	.then(res => {
-				// 		//  console.log('88888', res.data.data)
-				// 		uni.setStorageSync('getuserInfo', res.data.data);
-				// 	})
 			},
 
 			// 密码显示/密码隐藏
 			showOrHide() {
-				this.isShowPassword = !this.isShowPassword
+				this.isShowPassword = !this.isShowPassword;
+			},
+			Userprotocol() {
+				uni.navigateTo({
+					url: "/pages/login/Privacyagreement",
+					success: (res) => {},
+					fail: () => {},
+					complete: () => {},
+				});
 			},
 
 			// 找回密码
 			forget() {
 				uni.navigateTo({
-					url: '/pages/login/forget',
-					success: res => {},
+					url: "/pages/login/forget",
+					success: (res) => {},
 					fail: () => {},
 					complete: () => {},
-				})
+				});
 			},
 
 			// 注册
 			register() {
 				uni.navigateTo({
-					url: '/pages/login/register',
-					success: res => {},
+					url: "/pages/login/register",
+					success: (res) => {},
 					fail: () => {},
 					complete: () => {},
-				})
-			}
-		}
-	}
+				});
+			},
+		},
+	};
 </script>
 
 <style lang="scss">
@@ -205,17 +187,19 @@
 		padding: 60rpx 40rpx 100rpx;
 		box-sizing: border-box;
 		border-radius: 32rpx;
-		.loginTxt{
-			color: #0C1935;
+
+		.loginTxt {
+			color: #0c1935;
 			font-size: 40rpx;
 			margin-bottom: 80rpx;
 			text-align: center;
 		}
+
 		.row-input {
 			display: flex;
 			align-items: center;
 			height: 80rpx;
-			background-color: #F4F7FF;
+			background-color: #f4f7ff;
 			border-radius: 36rpx;
 			margin-bottom: 40rpx;
 			padding: 0 20rpx;
@@ -224,7 +208,7 @@
 				width: 460rpx;
 				font-size: 30rpx;
 				color: #a1a2a3;
-				flex: 1
+				flex: 1;
 			}
 		}
 
@@ -232,14 +216,13 @@
 			margin-top: 50px;
 			font-size: 16px;
 			letter-spacing: 7px;
-			color: #FFFFFF;
+			color: #ffffff;
 			height: 40px;
 			border-radius: 18px;
-			background: #5C8FFF;
+			background: #5c8fff;
 			text-align: center;
 			line-height: 40px;
 		}
-
 	}
 
 	.content {
@@ -283,6 +266,5 @@
 			width: 272px;
 			height: 157px;
 		}
-
 	}
-</style>
+</style>

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)																			
 					})
 			},
 

pages/my/my.vue

@@ -23,7 +23,7 @@
 				</view>
 			</view>
 
-			<view class="changemm">
+			<!-- <view class="changemm">
 				<view class="message">
 					<view class="wdmessage">已读信息:</view>
 					<view class="messagenumber">
@@ -36,11 +36,8 @@
 						<u-badge type="warning" max="99" :value="information2"></u-badge>
 					</view>
 				</view>
-				<!-- 	<view class="setdata"> -->
-				<!-- <u-icon name="setting" color="#0C1935" size="40" @click="tuichu"></u-icon> -->
-				<!-- 	<img src="../../static/my/tc.png" alt=""  @click="tuichu"> -->
-				<!-- </view> -->
-			</view>
+				
+			</view> -->
 		</view>
 		<!-- 头部结束 -->
 		<view class="minndle" v-if="$has('app:PersonalInformation')||$has('app:MyOrder')
@@ -169,7 +166,7 @@
 		//监听页面加载，其参数为上个页面传递的数据，参数类型为 Object（用于页面传参
 		onLoad() {
 			this.getuserInfo = uni.getStorageSync('getuserInfo');
-			console.log('111111111111111111', this.getuserInfo)
+			//console.log('111111111111111111', this.getuserInfo)
 		},
 		//监听页面初次渲染完成。注意如果渲染速度快，会在页面进入动画完成前触发
 		onReady() {},

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/7e94ce20-ea49-11ed-b84d-319223d5ae50
+https://ide.dcloud.net.cn/build/download/05c49760-ee2f-11ed-9fa9-319fd9d06cee