add

.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')

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,28 +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_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.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\"/>"
-                ],
+                "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" : {
@@ -85,6 +81,9 @@
                         "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
+            },
+            "splashscreen" : {
+                "useOriginalMsgbox" : true
             }
         }
     },
@@ -112,3 +111,5 @@
     },
     "vueVersion" : "2"
 }
+/* ios打包配置 *//* SDK配置 */
+

pages/login/login.vue

@@ -59,6 +59,9 @@
 
 		onLoad() {
 			//	 this.getCaptcha();
+			//this.getDeviceInfo();
+			//this.getOAID();
+			
 		},
 		onUnload() {
 			//触发水印显示
@@ -69,8 +72,8 @@
 				const HBusername = uni.getStorageSync('HBusername');
 				//缓存的密码
 				const HBpassword = uni.getStorageSync('HBpassword');
-						console.log("缓存的账号:"+HBusername)
-						console.log("缓存的密码:"+HBpassword)
+						//console.log("缓存的账号:"+HBusername)
+						//console.log("缓存的密码:"+HBpassword)
 						//有缓存就赋值给文本没有就清空
 					if (HBusername && HBpassword) {
 						this.account = HBusername;
@@ -83,6 +86,30 @@
 				},
 		
 		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;