合并

.idea/workspace.xml

@@ -2,17 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b14f9fe1-d3c3-496a-8ebb-4789fe400212" name="默认更改列表" comment="">
-      <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" />
-      <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/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$/.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$/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/manifest.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/Workorder/Tenantbill/Tenantbill.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/Workorder/Tenantbill/Tenantbill.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$/pages/login/Privacyagreement.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/login/Privacyagreement.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pages/login/login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/login/login.vue" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -28,7 +25,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/index/index.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="6690">
+            <state>
               <caret line="223" column="19" selection-start-line="223" selection-start-column="19" selection-end-line="223" selection-end-column="19" />
             </state>
           </provider>
@@ -37,8 +34,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="3360">
-              <caret line="112" column="114" selection-start-line="112" selection-start-column="114" selection-end-line="112" selection-end-column="114" />
+            <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>
           </provider>
         </entry>
@@ -46,8 +43,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="11310">
-              <caret line="377" column="6" selection-start-line="377" selection-start-column="6" selection-end-line="377" selection-end-column="6" />
+            <state relative-caret-position="11340">
+              <caret line="378" column="6" selection-start-line="378" selection-start-column="6" selection-end-line="378" selection-end-column="6" />
             </state>
           </provider>
         </entry>
@@ -64,8 +61,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="3750">
-              <caret line="125" column="48" selection-start-line="125" selection-start-column="48" selection-end-line="125" selection-end-column="48" />
+            <state relative-caret-position="4020">
+              <caret line="134" column="23" selection-start-line="134" selection-start-column="23" selection-end-line="134" selection-end-column="23" />
             </state>
           </provider>
         </entry>
@@ -73,17 +70,26 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/uni.scss">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1470">
+            <state relative-caret-position="782">
               <caret line="49" selection-start-line="51" selection-start-column="2" selection-end-line="53" selection-end-column="3" />
             </state>
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/Workorder/Tenantbill/Tenantbill.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="240">
+              <caret line="8" column="30" lean-forward="true" selection-end-line="453" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pages/Workorder/AccessControl/AccessControl.vue">
+        <entry file="file://$PROJECT_DIR$/manifest.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="811">
-              <caret line="196" selection-start-line="196" selection-end-line="196" />
+            <state relative-caret-position="360">
+              <caret line="12" column="26" lean-forward="true" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="26" />
             </state>
           </provider>
         </entry>
@@ -99,7 +105,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>weixiuno</find>
       <find>details</find>
       <find>qleixinguyu</find>
       <find>columnsrenyuan</find>
@@ -129,6 +134,7 @@
       <find>Videosurveillance</find>
       <find>asyncChange1</find>
       <find>mjzt1</find>
+      <find>buttons</find>
     </findStrings>
     <replaceStrings>
       <replace>repairRegioncontactPerson</replace>
@@ -164,10 +170,11 @@
         <option value="$PROJECT_DIR$/pages.json" />
         <option value="$PROJECT_DIR$/pages/Workorder/Workorder.vue" />
         <option value="$PROJECT_DIR$/pages/Workorder/AccessControl/AccessControl.vue" />
+        <option value="$PROJECT_DIR$/manifest.json" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="1">
+  <component name="ProjectFrameBounds">
     <option name="x" value="1912" />
     <option name="y" value="-8" />
     <option name="width" value="1936" />
@@ -181,6 +188,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -335,12 +343,11 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../witcarbon-vue" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="nodejs_package_manager_path" value="npm" />
@@ -392,14 +399,16 @@
       <workItem from="1683364463682" duration="61000" />
       <workItem from="1683505747555" duration="593000" />
       <workItem from="1683594601602" duration="595000" />
+      <workItem from="1683852687927" duration="250000" />
+      <workItem from="1683880139423" duration="549000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="104429000" />
+    <option name="totallyTimeSpent" value="105228000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1912" y="-8" width="1936" height="1056" extended-state="1" />
+    <frame x="1912" y="-8" width="1936" height="1056" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
@@ -525,13 +534,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/index/Immediatecollection/Immediatecollection.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="45" column="20" selection-start-line="45" selection-start-column="20" selection-end-line="45" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/index/Onlinewarranty/Onlinewarranty.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
@@ -588,22 +590,22 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/index/index.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6690">
+        <state>
           <caret line="223" column="19" selection-start-line="223" selection-start-column="19" selection-end-line="223" selection-end-column="19" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/my/my.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <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 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>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="11310">
-          <caret line="377" column="6" selection-start-line="377" selection-start-column="6" selection-end-line="377" selection-end-column="6" />
+        <state relative-caret-position="11340">
+          <caret line="378" column="6" selection-start-line="378" selection-start-column="6" selection-end-line="378" selection-end-column="6" />
         </state>
       </provider>
     </entry>
@@ -616,22 +618,43 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/login/login.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="4020">
+          <caret line="134" column="23" selection-start-line="134" selection-start-column="23" selection-end-line="134" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/Workorder/AccessControl/AccessControl.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="279">
+          <caret line="22" column="85" selection-start-line="22" selection-start-column="78" selection-end-line="22" selection-end-column="85" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/index/Immediatecollection/Immediatecollection.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="56" lean-forward="true" selection-end-line="443" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/uni.scss">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1470">
+        <state relative-caret-position="782">
           <caret line="49" selection-start-line="51" selection-start-column="2" selection-end-line="53" selection-end-column="3" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/Workorder/AccessControl/AccessControl.vue">
+    <entry file="file://$PROJECT_DIR$/pages/Workorder/Tenantbill/Tenantbill.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="8" column="30" lean-forward="true" selection-end-line="453" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/manifest.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="811">
-          <caret line="196" selection-start-line="196" selection-end-line="196" />
+        <state relative-caret-position="360">
+          <caret line="12" column="26" lean-forward="true" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="26" />
         </state>
       </provider>
     </entry>

App.vue

@@ -20,12 +20,17 @@
 			// 	localStorage.setItem("dictList",JSON.stringify(res.data.data));
 			//   });
 			// },
+		
+			
 		},
 		onLaunch: function() {
+			
+			
 		//	this.getDictAll();
 			// 获取字典列表, 添加并全局变量保存
 		},
 		onShow: function() {
+			
 		},
 		onHide: function() {
 			console.log('App Hide')

androidPrivacy.json

@@ -0,0 +1,34 @@
+{
+    "version" : "2",
+    "prompt" : "template",
+    "title" : "服务协议和隐私政策",
+    "message" : "请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"./static/privacy.html\">《服务协议》</a>和<a href=\"./static/privacy.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "second" : {
+        "title" : "确认提示",
+        "message" : "　　进入应用前，你需先同意<a href=\"./static/privacy.html\">《服务协议》</a>和<a href=\"./static/privacy.html\">《隐私政策》</a>，否则将退出应用。",
+        "buttonAccept" : "同意并继续",
+        "buttonRefuse" : "退出应用"
+    },
+    "styles" : {
+        "backgroundColor" : "#ffffff",
+        "borderRadius" : "5px",
+        "title" : {
+            "color" : "#000000",
+            "fontSize" : "32rpx"
+        },
+        "message" : {
+            "fontSize" : "26rpx"
+        },
+        "buttonAccept" : {
+            "color" : "#5cb26f",
+            "fontSize" : "28rpx"
+        },
+        "buttonRefuse" : {
+            "color" : "#606266",
+            "fontSize" : "28rpx"
+        }
+    }
+}
+

http/baseApi.js

@@ -1,6 +1,6 @@
 const BaseApi = 'http://gpu.ringzle.com:8082/witcarbon-app/app'
 //严工
-//const BaseApi = 'http://192.168.1.28:9013/witcarbon-app/app'
+//const BaseApi = 'http://192.168.1.2:9013/witcarbon-app/app'
 
 
 

manifest.json

@@ -16,31 +16,24 @@
             "autoclose" : true,
             "delay" : 0
         },
+
         /* 模块配置 */
         "modules" : {},
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
             "android" : {
-                "permissions" : [
-                    "<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.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<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\"/>"
-                ],
+                "permissions" : [ "<uses-feature android:name=\"android.hardware.camera\"/>" ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
-                "autoSdkPermissions" : false
+                "autoSdkPermissions" : false,
+                "permissionExternalStorage":{
+                    "request":"none",
+                    "prompt":"应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+                },
+                "permissionPhoneState":{
+                    "request":"none",
+                    "prompt":"为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
+                }
             },
             /* ios打包配置 */
             "ios" : {
@@ -88,6 +81,9 @@
                         "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
+            },
+            "splashscreen" : {
+                "useOriginalMsgbox" : true
             }
         }
     },
@@ -115,3 +111,5 @@
     },
     "vueVersion" : "2"
 }
+/* ios打包配置 *//* SDK配置 */
+

pages/Workorder/Tenantbill/Tenantbill.vue

@@ -64,9 +64,9 @@
 						<view class="Currentamount">
 							本期金额: <span>￥{{item.feeTotal}}</span>
 						</view>
-						<view class="Currentamount">
+					<!-- 	<view class="Currentamount">
 							欠费天数: {{item.elecAmount}}
-						</view>
+						</view> -->
 						<view class="Currentamount">
 							账户余额:￥{{item.balance}}
 						</view>
@@ -262,10 +262,10 @@
 				this.showtype = false;
 			},
 			confirmtype(e) {
-				//	console.log('111111111111111111', e.value[0])
+					console.log('111111111111111111', e.value[0])
 				this.showtype = false;
 				this.mytype = e.value[0].label;
-				this.dataForm.cycle = e.value[0].id;
+				this.dataForm.status = e.value[0].id;
 				this.indexList = [];
 				this.dataForm.page = 1;
 				this.getalldata();
@@ -283,7 +283,7 @@
 			getDate(type) {
 				const date = new Date();
 				let year = date.getFullYear();
-				let month = date.getMonth() + 1;
+				let month = date.getMonth() ;
 				if (type === 'start') {
 					year = year - 60;
 				} else if (type === 'end') {
@@ -388,7 +388,7 @@
 	.companylist {
 		margin: 20rpx 30rpx;
 		background: #fff;
-		height: 280rpx;
+		height: 230rpx;
 		border-radius: 10px;
 		position: relative;
 

pages/index/Immediatecollection/Immediatecollection.vue

@@ -49,6 +49,11 @@
 						              }">
 							{{ item.isExpedit == 1 ? "已催费" : "未催费" }}
 						</view>
+	<view class="outstanding" :style="{
+						                'background-color': item.isSettled == 1 ? '#09C700' : '#FA5555',
+						              }">
+							{{ item.isSettled == 1 ? "已结清" : "未结清" }}
+						</view>
 
 						<h3>{{item.tenantName}}</h3>
 						<view class="Currentamount">
@@ -66,7 +71,7 @@
 						<view class="Currentamount">
 							联系电话: {{item.phone}}
 						</view>
-						<view class="Callfee"  @click.stop="handleClick(item.id)">
+						<view class="Callfee" v-if="item.isSettled == 0"  @click.stop="handleClick(item.id)">
 							催费
 						</view>
 					</view>
@@ -288,13 +293,23 @@
 				this.getalldata();
 			},
 			confirmtypes(e) {
-				// console.log('22222', e.value[0])
-				this.showtypes = false;
-				this.mytypes = e.value[0].dictLabel;
-				this.dataForm.arrearDay = e.value[0].dictValue;
-				this.dataForm.page = 1;
-				this.indexList=[];
-				this.getalldata();
+				 console.log('22222', e.value[0])
+				 if(e.value[0].dictValue=='all'){
+					 
+					 this.showtypes = false;
+					 this.mytypes = e.value[0].dictLabel;
+					 this.dataForm.arrearDay = '';
+					 this.dataForm.page = 1;
+					 this.indexList=[];
+					 this.getalldata();
+				 }else{
+					 this.showtypes = false;
+					 this.mytypes = e.value[0].dictLabel;
+					 this.dataForm.arrearDay = e.value[0].dictValue;
+					 this.dataForm.page = 1;
+					 this.indexList=[];
+					 this.getalldata();
+				 }
 			},
 			canceltypes() {
 				this.showtypes = false;
@@ -398,7 +413,7 @@
 		color: #fff;
 		font-size: 14rpx;
 		position: absolute;
-		top: 0px;
+		top: 90rpx;
 		right: 0px;
 		border-top-right-radius: 10rpx;
 		border-bottom-left-radius: 10rpx;

pages/index/Workordertodone/Workorderdetails/Workorderdetails.vue

@@ -202,11 +202,10 @@
 		},
 		methods: {
 			getUserList() {
-				this.$api.get('/user/list',{ page: 1,
-					limit: 100,})
+				this.$api.get('/user/list',{ page: 1,limit: 100,})
 						.then(res=>{
-						//	console.log('111111111111111111',res.data.data)
-this.columnsrenyuan=[res.data.data]
+						
+               this.columnsrenyuan=[res.data.data]
 						})
 			},
 			getdata(){

pages/login/login.vue

@@ -1,36 +1,83 @@
 <template>
-	<view class="content">
-		<view class="info_bg">
-			<image src="../../static/management/login-bg.png" class="bgImg"></image>
-			<div class="title">
-				<image src="../../static/management/logo.svg"></image>
-				<text>双碳感知资产运营管理平台</text>
-			</div>
-		</view>
-		<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>
-				<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>
-				<input v-model="password" placeholder="登陆密码" clearable :password="!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>
-			</view>
-			<view class="Userprotocol">
-				<view class="Userprotocolchecked">
-					<checkbox :checked="isChecked" @click="isChecked=!isChecked" style="transform: scale(0.7);"></checkbox>
-				</view>
-				<view class="Userprotocoltext" @click="Userprotocol">我已阅读并同意用户协议和隐私政策</view>
-			</view>
-			<view class="login-btn" @click="loginbtn">登录</view>
-		</view>
-		<u-toast ref="uToast" />
-	</view>
+  <view class="content">
+    <view class="info_bg">
+      <image src="../../static/management/login-bg.png" class="bgImg"></image>
+      <div class="title">
+        <image src="../../static/management/logo.svg"></image>
+        <text>双碳感知资产运营管理平台</text>
+      </div>
+    </view>
+    <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>
+        <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>
+        <input
+          v-model="password"
+          placeholder="登陆密码"
+          clearable
+          :password="!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>
+      </view>
+
+      <view class="Userprotocols">
+        <view class="Userprotocolchecked">
+          <checkbox :checked="rememberPsw" @click="checkboxChange" />
+        </view>
+        <view class="Userprotocoltext">记住账号密码</view>
+      </view>
+
+      <view class="Userprotocol">
+        <view class="Userprotocolchecked">
+          <checkbox
+            :checked="isChecked"
+            @click="isChecked = !isChecked"
+            style="transform: scale(0.7)"
+          ></checkbox>
+        </view>
+        <view class="Userprotocoltext" @click="Userprotocol"
+          >我已阅读并同意用户协议和隐私政策</view
+        >
+      </view>
+      <view class="login-btn" @click="loginbtn">登录</view>
+    </view>
+    <u-toast ref="uToast" />
+  </view>
 </template>
 
 <script>
@@ -38,6 +85,7 @@
 		data() {
 			return {
 				isChecked: true,
+				rememberPsw:true,
 				isShowPassword: false,
 				account: "",
 				password: "",
@@ -49,12 +97,73 @@
 
 		onLoad() {
 			//	 this.getCaptcha();
+			//this.getDeviceInfo();
+			//this.getOAID();
+			
 		},
 		onUnload() {
 			//触发水印显示
 			uni.$emit("ly-show-watermark");
 		},
+		mounted() {//记住密码
+				//缓存的账号
+				const HBusername = uni.getStorageSync('HBusername');
+				//缓存的密码
+				const HBpassword = uni.getStorageSync('HBpassword');
+						//console.log("缓存的账号:"+HBusername)
+						//console.log("缓存的密码:"+HBpassword)
+						//有缓存就赋值给文本没有就清空
+					if (HBusername && HBpassword) {
+						this.account = HBusername;
+						this.password = HBpassword;
+					} else {
+						this.account = '';
+						this.password = '';
+					}
+					//自动登录
+				},
+		
 		methods: {
+			getDeviceInfo(){
+				plus.device.getInfo({
+					success:function(e){
+						console.log('getDeviceInfo success: '+JSON.stringify(e));
+						
+					},
+					fail:function(e){
+						console.log('getDeviceInfo failed: '+JSON.stringify(e));
+					}
+				});
+			},
+			 getOAID(){
+				plus.device.getOAID({
+					success:function(e){
+						console.log('getOAID success: '+JSON.stringify(e));
+					},
+					fail:function(e){
+						console.log('getOAID failed: '+JSON.stringify(e));
+					}
+				});
+			},
+			
+			
+			
+			//复选框
+						checkboxChange: function(e) {
+							this.rememberPsw=!this.rememberPsw;
+							  console.log('111111111111111111',this.rememberPsw)							
+							if (this.rememberPsw == true) {
+								//获取缓存的账号 赋值
+								uni.getStorageSync('HBusername',this.account);
+								uni.getStorageSync('HBpassword',this.password);
+							} else {//销毁
+								uni.removeStorageSync('HBusername');
+								uni.removeStorageSync('HBpassword');              
+							}
+						},
+		
+			
+			
 			loginbtn() {
 				if (this.account == "") {
 					this.$refs.uToast.show({
@@ -65,7 +174,7 @@
 				} else if (this.password == "") {
 					this.$refs.uToast.show({
 						type: "error",
-						message: "请输入密码",
+						message: "请同意用户协议和隐私政策",
 					});
 					return false
 				}
@@ -88,13 +197,54 @@
 								url: "/pages/index/index",
 							});
 						});
-					} else {
+						return false
+					} else if (this.password == "") {
 						this.$refs.uToast.show({
 							type: "error",
-							message: "账号或者密码错误，请重新输入",
+							message: "请输入密码",
 						});
+							return false
 					}
-				});
+					
+					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); //用户信息
+							
+							 //勾选就缓存账号和密码
+						if (this.rememberPsw) {
+							uni.setStorageSync('HBusername', this.account);
+							uni.setStorageSync('HBpassword', this.password);
+						} else {//销毁缓存
+							uni.removeStorageSync('HBusername');
+							uni.removeStorageSync('HBpassword');
+						}
+						
+							
+							
+							//获取用户的信息，如组织架构，个人信息，权限等
+							Promise.all([
+								this.getpermissions(),
+								this.getDictList(),
+								this.getuserInfo(),
+							]).then(() => {
+								uni.navigateTo({
+									url: "/pages/index/index",
+								});
+							});
+						} else {
+							this.$refs.uToast.show({
+								type: "error",
+								message: "账号或者密码错误，请重新输入",
+							});
+						}
+					});
+				})
 			},
 			getpermissions() {
 				//获取用户权限功能
@@ -177,6 +327,22 @@
 </script>
 
 <style lang="scss">
+	.Userprotocol{
+		margin-top: 60rpx;
+		display: flex;
+		align-items: center;
+		justify-content: flex-start;
+	}
+	
+	.Userprotocols{
+		margin-top: 30rpx;
+		display: flex;
+		align-items: center;
+		justify-content: flex-start;
+	}
+	.Userprotocoltext{
+		color: #5C8FFF;
+	}
 	.form-box {
 		width: 91%;
 		background: #fff;

pages/my/my.vue

@@ -5,11 +5,14 @@
 				</view>
 		<view class="topimg">
 			<view class="touxiang">
-				<u-upload :fileList="fileList" @afterRead="afterRead" name="6" :multiple='false' :maxCount="1"
+				<image :src="src" mode="widthFix" shape="circle"
+				style="width: 150rpx;height: 150rpx;"></image>
+				
+				<!-- <u-upload :fileList="fileList" @afterRead="afterRead" name="6" :multiple='false' :maxCount="1"
 					imageMode="true" width="150" height="150">
 					<image :src="src" mode="widthFix" shape="circle"
 					style="width: 150rpx;height: 150rpx;"></image>
-				</u-upload>
+				</u-upload> -->
 			</view>
 			<view class="Username">
 				<view class="Username1">{{getuserInfo.realName}} <span>您好</span>   </view>

unpackage/.gitignore

@@ -0,0 +1 @@
+dist

unpackage/cache/apk/apkurl

@@ -1 +0,0 @@
-https://ide.dcloud.net.cn/build/download/05c49760-ee2f-11ed-9fa9-319fd9d06cee

unpackage/cache/certdata

@@ -1,3 +0,0 @@
-andrCertfile=D:/test.keystore
-andrCertAlias=testalias
-andrCertPass=PSVpuECYS9q09OMSemkdhA==

unpackage/cache/wgt/__UNI__FF40C0C/__uniappview.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-
-  <head>
-    <meta charset="UTF-8" />
-    <script>
-      var __UniViewStartTime__ = Date.now();
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
-    <title>View</title>
-    <link rel="stylesheet" href="view.css" />
-  </head>
-
-  <body>
-    <div id="app"></div>
-    <script src="__uniappes6.js"></script>
-    <script src="view.umd.min.js"></script>
-    <script src="app-view.js"></script>
-  </body>
-
-</html>

unpackage/cache/wgt/__UNI__FF40C0C/uni_modules/lime-echart/static/index.html

@@ -1,129 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport"
-			content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-		<meta http-equiv="X-UA-Compatible" content="ie=edge">
-		<title></title>
-		<style type="text/css">
-			html,
-			body,
-			.canvas {
-				padding: 0;
-				margin: 0;
-				overflow-y: hidden;
-				background-color: transparent;
-				width: 100%;
-				height: 100%;
-			}
-		</style>
-	</head>
-	<body>
-		<div class="canvas" id="limeChart"></div>
-		<script type="text/javascript" src="./uni.webview.1.5.3.js"></script>
-		<script type="text/javascript" src="./echarts.min.js"></script>
-		<script type="text/javascript" src="./ecStat.min.js"></script>
-		<!-- <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/echarts-liquidfill@latest/dist/echarts-liquidfill.min.js"></script> -->
-		<script>
-			let chart = null;
-			let cache = [];
-			console.log = function(...agrs) {
-				postMessage(agrs)
-			}
-			function emit(event, data) {
-				let dataStr = JSON.stringify(data, stringify)
-				postMessage({
-					event,
-					data: dataStr
-				})
-				cache = []
-			}
-			function postMessage(data) {
-				uni.postMessage({
-					data
-				});
-			}
-			function stringify(key, value) {
-				if (typeof value === 'object' && value !== null) {
-					if (cache.indexOf(value) !== -1) {
-						return;
-					}
-					cache.push(value);
-				}
-				return value;
-			}
-			function parse(name, callback, options) {
-				const optionNameReg = /[\w]+\.setOption\(([\w]+\.)?([\w]+)\)/
-				if (optionNameReg.test(callback)) {
-					const optionNames = callback.match(optionNameReg)
-					if(optionNames[1]) {
-						const _this = optionNames[1].split('.')[0]
-						window[_this] = {}
-						window[_this][optionNames[2]] = options
-						return optionNames[2]
-					} else {
-						return null
-					}
-				}
-				return null
-			}
-			function init(callback, options, opts = {}, theme = null) {
-				if(!chart) {
-					chart = echarts.init(document.getElementById('limeChart'), theme, opts)
-					if(options) {
-						chart.setOption(options)
-					}
-					// const name = parse('a', callback, options)
-					// console.log('options::', callback)
-					// if(name) this[name] = options
-					// eval(`a = ${callback};`)
-					// if(a) {a(chart)}
-				}
-			}
-			
-			function setChart(callback, options) {
-				if(!callback) return
-				if(chart && callback && options) {
-					var r = null
-					const name = parse('r', callback, options)
-					if(name) this[name] = options
-					eval(`r = ${callback};`)
-					if(r) {r(chart)}
-				}
-			}
-			function setOption(data) {
-				if (chart) chart.setOption(data[0], data[1])
-			}
-			function showLoading(data) {
-				if (chart) chart.showLoading(data[0], data[1])
-			}
-			
-			function hideLoading() {
-				if (chart) chart.hideLoading()
-			}
-			
-			function clear() {
-				if (chart) chart.clear()
-			
-			}
-			
-			function dispose() {
-				if (chart) chart.dispose()
-			}
-			function resize(size) {
-				if (chart) chart.resize(size)
-			}
-			
-			function canvasToTempFilePath(opt = {}) {
-				if (chart) {
-				  const src = chart.getDataURL(opt)
-				  postMessage({
-					  file: true,
-					  data: src
-				  })
-				}
-			}
-		</script>
-	</body>
-</html>

unpackage/dist/build/app-plus/__uniappview.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-
-  <head>
-    <meta charset="UTF-8" />
-    <script>
-      var __UniViewStartTime__ = Date.now();
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
-    </script>
-    <title>View</title>
-    <link rel="stylesheet" href="view.css" />
-  </head>
-
-  <body>
-    <div id="app"></div>
-    <script src="__uniappes6.js"></script>
-    <script src="view.umd.min.js"></script>
-    <script src="app-view.js"></script>
-  </body>
-
-</html>