Merge branch 'main' of http://sl.vrgon.com:3000/LuYaShi/InspectionCleaning

pages/adminNfc/index.vue

@@ -156,10 +156,14 @@ export default {
       }
     }
     .card-left {
+      background: url("/static/adminImg/icon-bg1.png") no-repeat right 32rpx bottom 20rpx /
+        60rpx 60rpx;
       background-color: #4974f3;
     }
     .card-right {
       margin-left: 20rpx;
+      background: url("/static/adminImg/icon-bg2.png") no-repeat right 32rpx bottom 20rpx /
+        60rpx 60rpx;
       background-color: #53d5a9;
     }
   }

pages/login/login.vue

@@ -1,18 +1,30 @@
 <template>
   <view class="content">
     <view
-      style="margin-top: 50rpx; display: flex; align-items: center; padding-right: 50rpx"
+      style="
+        margin-top: 50rpx;
+        display: flex;
+        align-items: center;
+        padding-right: 50rpx;
+      "
     >
       <view style="margin-right: 50rpx">账号</view>
       <u-input v-model="phone" border placeholder="账号"></u-input>
     </view>
     <view
-      style="margin-top: 50rpx; display: flex; align-items: center; padding-right: 50rpx"
+      style="
+        margin-top: 50rpx;
+        display: flex;
+        align-items: center;
+        padding-right: 50rpx;
+      "
     >
       <view style="margin-right: 50rpx">账号</view>
       <u-input v-model="pwd" border placeholder="密码"></u-input>
     </view>
-    <u-button type="primary" @click="loginFn" style="margin-top: 50rpx">登陆</u-button>
+    <u-button type="primary" @click="loginFn" style="margin-top: 50rpx"
+      >登陆</u-button
+    >
     <u-button type="primary" @click="login1Fn" style="margin-top: 50rpx"
       >登陆13800451500清洁工</u-button
     >
@@ -45,20 +57,20 @@ export default {
       const normalTabBar = [
         {
           pagePath: "/pages/index/planList",
-          iconPath: "/static/tab/list.png",
+          iconPath: "/static/tab/planList.png",
-          selectedIconPath: "/static/tab/list_cur.png",
+          selectedIconPath: "/static/tab/planList-active.png",
           text: "计划",
         },
         {
           pagePath: "/pages/index/index",
-          iconPath: "/static/tab/home.png",
+          iconPath: "/static/tab/admin-home.png",
-          selectedIconPath: "/static/tab/home_cur.png",
+          selectedIconPath: "/static/tab/admin-home-acitve.png",
           text: "首页",
         },
         {
           pagePath: "/pages/user/index",
-          iconPath: "/static/tab/my.png",
+          iconPath: "/static/tab/admin-my.png",
-          selectedIconPath: "/static/tab/my_cur.png",
+          selectedIconPath: "/static/tab/admin-my-active.png",
           text: "设置",
         },
       ];