add

.idea/workspace.xml

@@ -3,10 +3,7 @@
   <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$/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/manifest.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/cache/apk/__UNI__FF40C0C_cm.apk" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/apk/__UNI__FF40C0C_cm.apk" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/cache/apk/apkurl" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/apk/apkurl" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/unpackage/cache/apk/cmManifestCache.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/apk/cmManifestCache.json" afterDir="false" />
@@ -44,8 +41,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 +68,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 +87,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 +185,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -343,6 +339,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -396,14 +393,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 +599,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 +620,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 +635,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,

pages/Workorder/Intelligentdoorlock/Intelligentdoorlock.vue

@@ -29,19 +29,7 @@
 				<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="mima(item)">
-							临时密码
-						</view>
-						<view class="outstanding2" @click="seedetail(item)">
-							查看租户
-						</view>
-
+					
 						<h3>{{item.name}}</h3>
 						<view class="Currentamount">
 							房间编号:{{item.roomid}}
@@ -58,6 +46,22 @@
 						<view class="Currentamount">
 							安装时间: {{item.installationtime}}
 						</view>
+											
+						<view class="mjkg">
+							<view class="anniu">
+								<u-button  type="primary" :plain="true" text="开门记录" @click="kaimen(item)"></u-button>
+							</view>
+							<view class="anniu">
+								<u-button  type="primary" :plain="true" text="远程开门" @click="Remotedooropening(item)"></u-button>
+							</view>	
+							<view class="anniu">
+								<u-button  type="primary" :plain="true" text="临时密码"  @click="mima(item)"></u-button>
+							</view>		
+							<view class="anniu">
+								<u-button  type="primary" :plain="true" text="查看租户"  @click="seedetail(item)"></u-button>
+							</view>
+						
+						</view>
 					</view>
 
 				</u-list-item>
@@ -264,6 +268,18 @@ this.$refs.uNotify.success(res.data.data)
 			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;

pages/login/login.vue

@@ -27,13 +27,13 @@
 
 			</view> -->
 
-			<view class="menu-link">
+		<!-- 	<view class="menu-link">
 				<text @click="forget">找回密码</text>
-			</view>
+			</view> -->
 			<view class="login-btn" @click="loginbtn">登录</view>
-			<view class="tip-link">
+		<!-- 	<view class="tip-link">
 				还没有账号?<text @click="register">注册</text>
-			</view>
+			</view> -->
 		</view>
 
 		<u-toast ref="uToast" />

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/75c2b810-ed7d-11ed-83db-0529eba60f3b