Parcourir la source

update:“合并sc-test到sc”

soobin il y a 2 ans
Parent
commit
215b5a8965
100 fichiers modifiés avec 2572 ajouts et 2510 suppressions
  1. 1 1
      package.json
  2. 1 1
      public/index.html
  3. BIN
      src/assets/accountOperation/retailIcon.png
  4. BIN
      src/assets/accountOperation/withIcon.png
  5. BIN
      src/assets/device/add.png
  6. BIN
      src/assets/device/humanness.png
  7. BIN
      src/assets/device/operIcon/editPrice.png
  8. BIN
      src/assets/device/operIcon/editPrice1.png
  9. BIN
      src/assets/device/operIcon/ic_onOff.png
  10. BIN
      src/assets/device/operIcon/ic_openDoor.png
  11. BIN
      src/assets/device/operIcon/ic_password.png
  12. BIN
      src/assets/device/operIcon/ic_restart.png
  13. BIN
      src/assets/device/operIcon/ic_sleep.png
  14. BIN
      src/assets/device/operIcon/ic_商品调价@3x.png
  15. BIN
      src/assets/device/operIcon/onOff.png
  16. BIN
      src/assets/device/operIcon/openDoor.png
  17. BIN
      src/assets/device/operIcon/password.png
  18. BIN
      src/assets/device/operIcon/restart.png
  19. BIN
      src/assets/device/operIcon/sleep.png
  20. BIN
      src/assets/device/operIcon/tuoji.png
  21. BIN
      src/assets/home/M14.png
  22. BIN
      src/assets/home/M3.png
  23. BIN
      src/assets/home/M8.png
  24. BIN
      src/assets/home/_M3.png
  25. 7 4
      src/assets/language/en.json
  26. 9 7
      src/assets/language/zh.json
  27. BIN
      src/assets/user/airwallexIcon.png
  28. 6 4
      src/common/js/utils.js
  29. 39 33
      src/components/commom/kCascader/index.vue
  30. 72 0
      src/components/commom/kDialog/index.less
  31. 1 1
      src/components/commom/kTabs/index.vue
  32. 2 2
      src/components/typeSelectList/index.vue
  33. 1 1
      src/main.js
  34. 7 7
      src/router/index.js
  35. 4 0
      src/service/test.js
  36. 4 0
      src/service/user.js
  37. 90 80
      src/styles/accountOperation/index.less
  38. 16 13
      src/styles/accountPer/index.less
  39. 21 20
      src/styles/advertManage/index.less
  40. 401 401
      src/styles/alarmClock/index.less
  41. 14 14
      src/styles/alarmHistory/index.less
  42. 8 8
      src/styles/apkManage/index.less
  43. 3 3
      src/styles/bindWechat/index.less
  44. 38 38
      src/styles/changePassword/index.less
  45. 9 14
      src/styles/device/index.less
  46. 58 57
      src/styles/deviceOper/index.less
  47. 8 8
      src/styles/deviceSearch/index.less
  48. 20 25
      src/styles/deviceSet/index.less
  49. 17 17
      src/styles/discountCode/index.less
  50. 7 7
      src/styles/distributionSet/index.less
  51. 6 5
      src/styles/doSugar/index.less
  52. 100 78
      src/styles/forgetPassword/index.less
  53. 12 13
      src/styles/home/index.less
  54. 12 12
      src/styles/joinpayMch/index.less
  55. 13 13
      src/styles/labelMan/index.less
  56. 174 168
      src/styles/login/index.less
  57. 227 226
      src/styles/merchantManage/index.less
  58. 2 2
      src/styles/modifyPrice/index.less
  59. 95 95
      src/styles/modulation/index.less
  60. 2 2
      src/styles/orderCenter/index.less
  61. 3 3
      src/styles/orderExport/index.less
  62. 3 3
      src/styles/paramsSet/index.less
  63. 7 7
      src/styles/recharge/index.less
  64. 103 103
      src/styles/register/index.less
  65. 27 3
      src/styles/robotRanking/index.less
  66. 15 16
      src/styles/role/index.less
  67. 7 6
      src/styles/showGoods/index.less
  68. 8 8
      src/styles/taskMessage/index.less
  69. 5 5
      src/styles/uniPay/index.less
  70. 23 12
      src/styles/user/index.less
  71. 2 2
      src/styles/viewLogs/index.less
  72. 4 1
      src/utils/config.js
  73. 2 1
      src/views/Hpp.vue
  74. 2 2
      src/views/accountOperation/index.vue
  75. 145 146
      src/views/alarmHistory/historySearch.vue
  76. 1 1
      src/views/bindWechat.vue
  77. 9 10
      src/views/device/alarmClock.vue
  78. 69 69
      src/views/device/alarmClockSet/index.vue
  79. 6 6
      src/views/device/customLogo.vue
  80. 171 172
      src/views/device/devicePassword/index.vue
  81. 3 3
      src/views/device/deviceSet.vue
  82. 21 21
      src/views/device/editAdRule/index.vue
  83. 5 5
      src/views/device/index.vue
  84. 0 1
      src/views/device/modifyPrice/index.vue
  85. 142 142
      src/views/device/openDoor.vue
  86. 2 2
      src/views/device/paramsSet/index.vue
  87. 3 4
      src/views/device/paramsSet/paramsSetInfo.vue
  88. 5 5
      src/views/device/recharge.vue
  89. 4 4
      src/views/device/saveProportion/index.less
  90. 3 4
      src/views/device/showGoods/index.vue
  91. 4 4
      src/views/device/tagSet/index.vue
  92. 98 98
      src/views/device/toDaySugarList.vue
  93. 5 5
      src/views/home/index.vue
  94. 1 11
      src/views/huifuMch/index.less
  95. 48 112
      src/views/huifuMch/index.vue
  96. 3 6
      src/views/huifuMch/update.vue
  97. 83 105
      src/views/joinpayMch/index.vue
  98. 16 15
      src/views/labelMan/add.vue
  99. 7 7
      src/views/labelMan/index.vue
  100. 0 0
      src/views/login.vue

+ 1 - 1
package.json

@@ -77,4 +77,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}

+ 1 - 1
public/index.html

@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>Seven Cloud</title>
+    <title>Sunzee</title>
     <link rel="stylesheet" href="./fontIcon.css">
     <script type="text/javascript" src="./echarts.min.js"></script>
     <script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>

BIN
src/assets/accountOperation/retailIcon.png


BIN
src/assets/accountOperation/withIcon.png


BIN
src/assets/device/add.png


BIN
src/assets/device/humanness.png


BIN
src/assets/device/operIcon/editPrice.png


BIN
src/assets/device/operIcon/editPrice1.png


BIN
src/assets/device/operIcon/ic_onOff.png


BIN
src/assets/device/operIcon/ic_openDoor.png


BIN
src/assets/device/operIcon/ic_password.png


BIN
src/assets/device/operIcon/ic_restart.png


BIN
src/assets/device/operIcon/ic_sleep.png


BIN
src/assets/device/operIcon/ic_商品调价@3x.png


BIN
src/assets/device/operIcon/onOff.png


BIN
src/assets/device/operIcon/openDoor.png


BIN
src/assets/device/operIcon/password.png


BIN
src/assets/device/operIcon/restart.png


BIN
src/assets/device/operIcon/sleep.png


BIN
src/assets/device/operIcon/tuoji.png


BIN
src/assets/home/M14.png


BIN
src/assets/home/M3.png


BIN
src/assets/home/M8.png


BIN
src/assets/home/_M3.png


+ 7 - 4
src/assets/language/en.json

@@ -630,7 +630,7 @@
     "beneficiary": "Beneficiary"
   },
   "joinpayMch": {
-    "withdrawalAccountNo": "Standby withdrawal account No",
+    "withdrawalAccountNo": "Withdrawal account No",
     "merchantNameLabel": "Merchant name",
     "merchantNamePlaceholder": "Please enter the merchant name",
     "merchantAccountLabel": "Merchant account",
@@ -914,7 +914,7 @@
     "confirm": "confirm"
   },
   "huifuMch": {
-    "standbyWithdrawalAccountNo": "Withdrawal account No",
+    "standbyWithdrawalAccountNo": "Standby withdrawal account No",
     "merchantType": "Merchant type",
     "personal": "personal",
     "enterprise": "enterprise",
@@ -1330,5 +1330,8 @@
     "standbyWithdrawalAccountNo": "Standby withdrawal account No",
     "merchantManagement": "Merchant management",
     "labelMan": "Label management"
-  }
-}
+  },
+  "Account operation": "Account operation",
+  "Discount code": "Discount code",
+  "Alarm history": "Alarm history"
+}

+ 9 - 7
src/assets/language/zh.json

@@ -1,6 +1,6 @@
 {
   "public": {
-    "sysName": "七云科技",
+    "sysName": "申泽科技",
     "requestFailed": "请求失败,点击重新加载",
     "noMore": "没有更多了"
   },
@@ -631,7 +631,7 @@
     "beneficiary": "收款人"
   },
   "joinpayMch": {
-    "withdrawalAccountNo": "备用提现账号",
+    "withdrawalAccountNo": "提现账号",
     "merchantNameLabel": "商户名称",
     "merchantNamePlaceholder": "请输入商户名称",
     "merchantAccountLabel": "商户账号",
@@ -921,7 +921,7 @@
     "confirm": "确认"
   },
   "huifuMch": {
-    "standbyWithdrawalAccountNo": "提现账号",
+    "standbyWithdrawalAccountNo": "备用提现账号",
     "merchantType": "商户类型",
     "personal": "个人",
     "enterprise": "企业",
@@ -988,8 +988,7 @@
     "submit": "提交",
     "submittedSuccessfully": "提交成功",
     "submitFailed": "提交失败",
-    "update": "修改",
-    "uploadPage": "重新上传图片"
+    "update": "修改"
   },
   "subLedgerManage": {
     "exportOfShandeLedgerData": "杉德分账数据导出",
@@ -1347,5 +1346,8 @@
   },
   "wechat": {
     "headerName": "绑定微信"
-  }
-}
+  },
+  "账户操作": "账户操作",
+  "优惠码": "优惠码",
+  "报警历史": "报警历史"
+}

BIN
src/assets/user/airwallexIcon.png


+ 6 - 4
src/common/js/utils.js

@@ -12,10 +12,11 @@ const t = i18n.global.t;
 // 菜单标识
 export const $M_Menus = {
   "M1":t("role.deviceManagement"),//设备管理
-  "M2":t("role.deviceView"),//设备查看
-  // "M3":t("role.accountOperation"),//分销设置
+  // "M2":t("role.deviceView"),//设备查看
+  // "M3":t("role.distributionSettings"),//分销设置
   "M3":t("role.accountOperation"),//账户操作
-  "M4":t("role.orderData"),//报警历史
+  // "M4":t("role.orderData"),//报警历史
+  "M4":t("role.orderData"),//订单数据
   "M5":t("role.advertisingManagement"),//广告管理
   "M6":t("role.taskMessage"),//任务消息
   "M7":t("role.discountCode"),//优惠码
@@ -26,7 +27,8 @@ export const $M_Menus = {
   // "M12":t("role.withdrawalAccountNo"),//提现账号
   // "M13":t("role.standbyWithdrawalAccountNo"),//备用提现账号
   "M14":t("role.dataOverview"),//数据概览
-  "M15":t("role.alarmHistory"),//订单数据
+  // "M15":t("role.alarmHistory"),//订单数据
+  "M15":t("role.alarmHistory"),//报警历史
   "M16":t("role.orderRefund"),//订单退款
   "M17":t("role.systemOffline"),//系统脱机
   // "M18":t("role.labelMan"),//标签管理

+ 39 - 33
src/components/commom/kCascader/index.vue

@@ -1,14 +1,8 @@
 <template>
   <!-- 地区弹窗 -->
   <van-popup v-model:show="areaPopshow" round position="bottom">
-    <van-cascader
-      @close="areaPopshow = false"
-      v-model="cascaderValue"
-      :title="$t('kCascader.selectRegion')"
-      :options="options"
-      @change="onChange"
-      @finish="onFinish"
-    />
+    <van-cascader @close="areaPopshow = false" v-model="cascaderValue" :title="$t('kCascader.selectRegion')"
+      :options="options" @change="onChange" @finish="onFinish" />
   </van-popup>
 </template>
 
@@ -122,31 +116,44 @@ export default {
     const selectArea = () => {
       Api_getAreaDetail({ value: selectId.value }).then(async (res) => {
         const resData = res.data;
-        if (resData.code === "00000") {
-          if (resData.data.length > 0) {
-            let areaName = '';
-            // 当第二级获取完后才获取第三级,不然不会默认选中
-            await getAddress(
-              resData.data[0]["value"],
-              0,
-              resData.data[0]["children"][0]["value"]
-            );
-            // 如果存在第三级
-            if (resData.data[0]["children"][0]["children"]) {
-                areaName = `${resData.data[0]['text']}/${resData.data[0]["children"][0]['text']}/${resData.data[0]["children"][0]["children"][0]['text']}`;
-              // 默认选中最后一级的值
-              cascaderValue.value =
-                resData.data[0]["children"][0]["children"][0]["value"];
-            } else {
-                areaName = `${resData.data[0]['text']}/${resData.data[0]["children"][0]['text']}`;
-              // 如果存在第二级
-              // 默认选中最后一级的值
-              cascaderValue.value = resData.data[0]["children"][0]["value"];
-            }
-            // 回显到input
-            emit('getareaname',areaName);
+        // if (resData.code === "00000") {
+        //   if (resData.data.length > 0) {
+        //     let areaName = '';
+        //     // 当第二级获取完后才获取第三级,不然不会默认选中
+        //     await getAddress(
+        //       resData.data[0]["value"],
+        //       0,
+        //       resData.data[0]["children"][0]["value"]
+        //     );
+        //     // 如果存在第三级
+        //     if (resData.data[0]["children"][0]["children"]) {
+        //         areaName = `${resData.data[0]['text']}/${resData.data[0]["children"][0]['text']}/${resData.data[0]["children"][0]["children"][0]['text']}`;
+        //       // 默认选中最后一级的值
+        //       cascaderValue.value =
+        //         resData.data[0]["children"][0]["children"][0]["value"];
+        //     } else {
+        //         areaName = `${resData.data[0]['text']}/${resData.data[0]["children"][0]['text']}`;
+        //       // 如果存在第二级
+        //       // 默认选中最后一级的值
+        //       cascaderValue.value = resData.data[0]["children"][0]["value"];
+        //     }
+        //     // 回显到input
+        //     emit('getareaname',areaName);
+        //   }
+        // }
+        if (resData && resData.code === "00000" && resData.data && resData.data.length > 0 && resData.data[0]["children"] && resData.data[0]["children"][0]) {
+          const firstLevelValue = resData.data[0]["value"];
+          const secondLevelValue = resData.data[0]["children"][0]["value"];
+          if (resData.data[0]["children"][0]["children"]) {
+            const thirdLevelValue = resData.data[0]["children"][0]["children"][0]["value"];
+            await getAddress(firstLevelValue, 0, thirdLevelValue);
+            emit('getareaname', `${resData.data[0]['text']}/${resData.data[0]["children"][0]['text']}/${resData.data[0]["children"][0]["children"][0]['text']}`);
+          } else {
+            await getAddress(firstLevelValue, 0, secondLevelValue);
+            emit('getareaname', `${resData.data[0]['text']}/${resData.data[0]["children"][0]['text']}`);
           }
         }
+        
       });
     };
     return {
@@ -162,5 +169,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>

+ 72 - 0
src/components/commom/kDialog/index.less

@@ -0,0 +1,72 @@
+.kDialogIdx {
+
+  .operCheckBox {
+    padding: 0 10px;
+    padding-top: 10px;
+
+    .operCheckCon {
+      padding-top: 10px;
+      border-top: 1px solid #D7D7E2;
+
+      .word10 {
+        width: 143px;
+        height: 13px;
+        overflow-wrap: break-word;
+        color: rgba(64, 77, 116, 1);
+        font-size: 13px;
+        text-align: left;
+        white-space: nowrap;
+        line-height: 13px;
+        display: block;
+        margin: 33px auto;
+      }
+
+      .block6 {
+        width: 265px;
+        height: 34px;
+        margin: 20px auto;
+
+        .mod7 {
+          border-radius: 17px;
+          height: 34px;
+          border: 1px solid rgba(77, 106, 221, 1);
+          width: 120px;
+          justify-content: center;
+          align-items: center;
+
+          .info5 {
+            overflow-wrap: break-word;
+            color: rgba(77, 106, 221, 1);
+            font-size: 15px;
+            font-family: PingFangSC-Medium;
+            text-align: center;
+            // white-space: nowrap;
+            line-height: 15px;
+            display: block;
+          }
+        }
+
+        .mod8 {
+          background-color: rgba(77, 106, 221, 1);
+          border-radius: 17px;
+          height: 34px;
+          width: 120px;
+          justify-content: center;
+          align-items: center;
+
+          .info6 {
+            overflow-wrap: break-word;
+            color: rgba(255, 255, 255, 1);
+            font-size: 15px;
+            font-family: PingFangSC-Medium;
+            text-align: center;
+            // white-space: nowrap;
+            line-height: 15px;
+            display: block;
+          }
+        }
+      }
+    }
+
+  }
+}

+ 1 - 1
src/components/commom/kTabs/index.vue

@@ -81,7 +81,7 @@ export default {
     background-color: #b9bad0;
   }
 
-  :deep(.van-tabs--line .van-tabs__wrap)  {
+  :deep(.van-tabs--line .van-tabs__wrap) {
     height: 30px;
   }
 }

+ 2 - 2
src/components/typeSelectList/index.vue

@@ -228,8 +228,8 @@ export default {
     const equipmentSourceList = ref([]);
     const deviceConfirm = (currentValue) => {
       allDevices.value = currentValue;
-      console.log("currentValue", currentValue)
-      if (currentValue != t('typeSelectList.allDevices')) {
+      console.log("currentValue",currentValue)
+      if(currentValue != t('typeSelectList.allDevices')) {
         const selectEquipment = equipmentSourceList.value.filter(i => i.name === currentValue);
         if (selectEquipment && selectEquipment.length > 0) {
           searchParams.equipmentId = selectEquipment[0].id;

+ 1 - 1
src/main.js

@@ -81,7 +81,7 @@ app.use(ActionBarButton)
   .use(ConfigProvider)
   .use(NavBar)
   .use(Area)
-
+  
 
 app.use(router)
 app.use(store)

+ 7 - 7
src/router/index.js

@@ -181,13 +181,6 @@ const router = createRouter({
       component: () => import("@/views/huifuMch/update"),
       meta: { index: 1 },
     },
-    // 上传图片
-    {
-      path: "/upload",
-      name: "upload",
-      component: () => import("@/views/huifuMch/upload"),
-      meta: { index: 1 },
-    },
     // 提现账号
     {
       path: "/joinpayMch",
@@ -364,6 +357,13 @@ const router = createRouter({
       component: () => import("@/views/orderExport/index"),
       meta: { index: 1 },
     },
+    // 杉德分账导出
+    {
+      path: "/subLedgerManage",
+      name: "subLedgerManage",
+      component: () => import("@/views/subLedgerManage/index"),
+      meta: { index: 1 },
+    },
     // 任务消息
     {
       path: "/taskMessage",

+ 4 - 0
src/service/test.js

@@ -88,4 +88,8 @@ export function getJoinPayMch(params) {
 // 保存提现账号
 export function saveJoinPayMch(params) {
     return axios.post(`/SZWL-SERVER/tJoinpayMch/save`, params)
+}
+// 上传图片
+export function uploadPic(params) {
+    return axios.post(`/tHuifuMch/uploadPic`, params)
 }

+ 4 - 0
src/service/user.js

@@ -23,4 +23,8 @@ export function Api_getArea(params) {
 // 地址回显
 export function Api_getAreaDetail(params) {
   return axios.get(`/SZWL-SERVER/tArea/getById`, {params});
+}
+// 是否海外用户
+export function getIfForeign(adminId) {
+  return axios.get(`/SZWL-SERVER/tAdmin/getIfForeign/${adminId}`);
 }

+ 90 - 80
src/styles/accountOperation/index.less

@@ -1,88 +1,98 @@
 .taskMessagePage {
+  width: 100%;
+
+  .taskMessageBox {
     width: 100%;
-    .taskMessageBox {
+    height: calc(100% - 60px);
+    overflow: auto;
+
+    .taskListRow {
       width: 100%;
-      height: calc(100% - 60px);
-      overflow: auto;
-      .taskListRow {
-        width: 100%;
-        height: 53px;
-        flex-wrap: wrap;
-        .taskIcon {
-          width: 13%;
-          height: 100%;
-          position: relative;
-          &.deviceIcon::after{
-            content: '';
-            position: absolute;
-            background: #fff url('../../assets/accountOperation/accountAuthority.png') top center no-repeat;
-            background-size: 100%;
-            width: 0.6rem;
-            height: 0.6rem;
-            right: 0.18rem;
-            top: 0.4rem;
-          }
-          &.retailIcon::after{
-            content: '';
-            position: absolute;
-            background: #fff url('../../assets/accountOperation/retailIcon.png') top center no-repeat;
-            background-size: 100%;
-            width: 0.6rem;
-            height: 0.6rem;
-            right: 0.15rem;
-            top: 0.4rem;
-          }
-          &.withIcon::after{
-            content: '';
-            position: absolute;
-            background: #fff url('../../assets/accountOperation/withIcon.png') top center no-repeat;
-            background-size: 100%;
-            width: 0.5rem;
-            height: 0.5rem;
-            right: 0.2rem;
-            top: 0.4rem;
-          }
-          &.merIcon::after{
-            content: '';
-            position: absolute;
-            background: #fff url('../../assets/accountOperation/merchantManage.png') top center no-repeat;
-            background-size: 100%;
-            width: 0.8rem;
-            height: 0.8rem;
-            right: 0.05rem;
-            top: 0.3rem;
-          }
-          &.labelIcon::after{
-            content: '';
-            position: absolute;
-            background: #fff url('../../assets/accountOperation/labelMan.png') top center no-repeat;
-            background-size: 100%;
-            width: 0.53rem;
-            height: 0.6rem;
-            right: 0.2rem;
-            top: 0.4rem;
-          }
+      height: 53px;
+      flex-wrap: wrap;
+
+      .taskIcon {
+        width: 13%;
+        height: 100%;
+        position: relative;
+
+        &.deviceIcon::after {
+          content: '';
+          position: absolute;
+          background: #fff url('../../assets/accountOperation/accountAuthority.png') top center no-repeat;
+          background-size: 100%;
+          width: 0.53rem;
+          height: 0.7rem;
+          right: 0.18rem;
+          top: 0.4rem;
         }
-        .taskRight {
-          width: 87%;
-          height: 100%;
-          position: relative;
-          border-bottom: 1px solid #e7eaf7;
-          &::after{
-            content: '';
-            position: absolute;
-            width: 6px;
-            height: 12px;
-            background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng51122feddbc4a9b3e0b055ed6181d290e60825befaa5c777794f1412ff817e57) top center no-repeat;
-            background-size: 100%;
-            right: 0.55rem;
-            top: 0.5rem;
-          }
-          .taskTitle {
-            line-height: 53px;
-          }
+
+        &.retailIcon::after {
+          content: '';
+          position: absolute;
+          background: #fff url('../../assets/accountOperation/retailIcon.png') top center no-repeat;
+          background-size: 100%;
+          width: 0.6rem;
+          height: 0.6rem;
+          right: 0.15rem;
+          top: 0.4rem;
+        }
+
+        &.withIcon::after {
+          content: '';
+          position: absolute;
+          background: #fff url('../../assets/accountOperation/withIcon.png') top center no-repeat;
+          background-size: 100%;
+          width: 0.6rem;
+          height: 0.6rem;
+          right: 0.15rem;
+          top: 0.4rem;
+        }
+
+        &.merIcon::after {
+          content: '';
+          position: absolute;
+          background: #fff url('../../assets/accountOperation/merchantManage.png') top center no-repeat;
+          background-size: 100%;
+          width: 0.66rem;
+          height: 0.6rem;
+          right: 0.15rem;
+          top: 0.4rem;
+        }
+
+        &.labelIcon::after {
+          content: '';
+          position: absolute;
+          background: #fff url('../../assets/accountOperation/labelMan.png') top center no-repeat;
+          background-size: 100%;
+          width: 0.53rem;
+          height: 0.6rem;
+          right: 0.2rem;
+          top: 0.4rem;
+        }
+      }
+
+      .taskRight {
+        width: 87%;
+        height: 100%;
+        position: relative;
+        border-bottom: 1px solid #e7eaf7;
+
+        &::after {
+          content: '';
+          position: absolute;
+          width: 6px;
+          height: 12px;
+          background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng51122feddbc4a9b3e0b055ed6181d290e60825befaa5c777794f1412ff817e57) top center no-repeat;
+          background-size: 100%;
+          right: 0.55rem;
+          top: 0.5rem;
+        }
+
+        .taskTitle {
+          line-height: 53px;
         }
       }
     }
   }
-  
+}

+ 16 - 13
src/styles/accountPer/index.less

@@ -114,25 +114,25 @@
     .van-switch {
         width: 38px;
         height: 18px;
-      
+
         .van-switch__node {
-          width: 18px;
-          height: 18px;
+            width: 18px;
+            height: 18px;
         }
-      
+
         &.van-switch--on .van-switch__node {
-          transform: translate(calc(38px - 18px));
+            transform: translate(calc(38px - 18px));
         }
 
     }
 
     .van-switch--on {
-        background-color: #2c87c8;
+        background-color: #4d6add;
     }
 
     .van-button--primary {
-        border-color: #2c87c8;
-        background-color: #2c87c8;
+        border-color: #4d6add;
+        background-color: #4d6add;
     }
 
     .van-button--danger {
@@ -141,19 +141,22 @@
     }
 
     .van-checkbox__icon--checked .van-icon {
-        border-color: #2c87c8;
-        background-color: #2c87c8;
+        border-color: #4d6add;
+        background-color: #4d6add;
     }
 }
 
 .codeSearch {
     width: 100%;
+
     .codeSearchPopup {
         width: 90%;
     }
+
     .content {
         padding-top: 1em;
     }
+
     .field .van-field__label {
         width: auto;
     }
@@ -161,9 +164,9 @@
 }
 
 .van-cascader__option--selected {
-    color: #2c87c8;
+    color: #4d6add;
 }
 
 .van-tabs__line {
-    background-color: #2c87c8 !important;
-}
+    background-color: #4d6add !important;
+}

+ 21 - 20
src/styles/advertManage/index.less

@@ -101,13 +101,13 @@
     }
 
     .van-radio__icon--checked .van-icon {
-        background-color: #2c87c8;
-        border-color: #2c87c8;
+        background-color: #4d6add;
+        border-color: #4d6add;
     }
 
     .van-button--primary {
-        background-color: #2c87c8;
-        border-color: #2c87c8;
+        background-color: #4d6add;
+        border-color: #4d6add;
     }
 
 }
@@ -139,40 +139,41 @@
                 }
 
                 .editBtn {
-                    border: 1px solid #2c87c8;
+                    border: 1px solid #4d6add;
                     border-radius: 2px;
                     padding: 6px 16px;
-                    color: #2c87c8;
+                    color: #4d6add;
                 }
             }
         }
     }
 
     .van-checkbox__icon--checked .van-icon {
-        background-color: #2c87c8;
-        border-color: #2c87c8;
+        background-color: #4d6add;
+        border-color: #4d6add;
     }
 
 
 }
 
 .van-button--primary {
-    border-color: #2c87c8;
-    background-color: #2c87c8;
+    border-color: #4d6add;
+    background-color: #4d6add;
 }
 
 .tagSetIdx {
-  overflow: hidden;
-  overflow-y: auto;
-  .submitBtn {
-    flex: 0 0 80px;
+    overflow: hidden;
+    overflow-y: auto;
 
-    .van-button--round {
-      width: 100%;
+    .submitBtn {
+        flex: 0 0 80px;
+
+        .van-button--round {
+            width: 100%;
+        }
     }
-  }
 
-  .searchBtn {
-    width:50%
-  }
+    .searchBtn {
+        width: 50%
+    }
 }

+ 401 - 401
src/styles/alarmClock/index.less

@@ -1,204 +1,172 @@
-.clockPage {
-    background-color: rgba(255, 255, 255, 1);
-    position: relative;
+.pageClock {
+  background-color: rgba(255, 255, 255, 1);
+  position: relative;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  overflow-y: auto;
+
+  .bd1 {
     width: 100%;
-    height: 100%;
-    overflow: hidden;
-    overflow-y: auto;
-  
-    .bd1 {
+    height: 439px;
+
+    .section5 {
+      background-color: rgba(255, 255, 255, 1);
+      z-index: 91;
+      height: 54px;
+      margin-top: 1px;
       width: 100%;
-      height: 439px;
-  
-      .section5 {
-        background-color: rgba(255, 255, 255, 1);
-        z-index: 91;
-        height: 54px;
-        margin-top: 1px;
-        width: 100%;
-        position: relative;
-  
-        .layer1 {
-          width: 84px;
+      position: relative;
+
+      .layer1 {
+        width: 84px;
+        height: 20px;
+        margin: 17px 0 0 15px;
+
+        .ImageText1 {
           height: 20px;
-          margin: 17px 0 0 15px;
-  
-          .ImageText1 {
-            height: 20px;
+          width: 84px;
+
+          .layer1 {
             width: 84px;
-  
-            .layer1 {
-              width: 84px;
+            height: 20px;
+            margin: 0 auto;
+
+            .bd2 {
+              width: 20px;
               height: 20px;
-              margin: 0 auto;
-  
-              .bd2 {
-                width: 20px;
-                height: 20px;
-                background: url('../../assets/device/add.png');
-                background-size: 100%;
-              }
-  
-              .TextGroup1 {
-                height: 20px;
+              background: url('../../assets/device/add.png');
+              background-size: 100%;
+            }
+
+            .TextGroup1 {
+              height: 20px;
+              width: 56px;
+
+              .word2 {
                 width: 56px;
-  
-                .word2 {
-                  width: 56px;
-                  height: 20px;
-                  overflow-wrap: break-word;
-                  color: rgba(64, 77, 116, 1);
-                  font-size: 14px;
-                  font-family: PingFangSC-Medium;
-                  text-align: left;
-                  white-space: nowrap;
-                  line-height: 20px;
-                  display: block;
-                }
+                height: 20px;
+                overflow-wrap: break-word;
+                color: rgba(64, 77, 116, 1);
+                font-size: 14px;
+                font-family: PingFangSC-Medium;
+                text-align: left;
+                white-space: nowrap;
+                line-height: 20px;
+                display: block;
               }
             }
           }
         }
-  
-        .img2 {
-          z-index: 93;
-          position: absolute;
-          left: 0;
-          top: 53px;
-          width: 100%;
-          height: 2px;
-        }
       }
-  
-      .section6 {
+
+      .img2 {
+        z-index: 93;
+        position: absolute;
+        left: 0;
+        top: 53px;
         width: 100%;
-        padding: 10px 15px;
-  
-        .TextGroup2 {
-          width: 20%;
-  
-          .bd3 {
-            .word3 {
-              width: auto;
-              height: 30px;
-              overflow-wrap: break-word;
-              color: rgba(64, 77, 116, 1);
-              font-size: 22px;
-              font-family: PingFangSC-Medium;
-              text-align: left;
-              white-space: nowrap;
-              line-height: 30px;
-              display: block;
-            }
-  
-            .info2 {
-              width: auto;
-              height: 18px;
-              overflow-wrap: break-word;
-              color: rgba(64, 77, 116, 1);
-              font-size: 13px;
-              text-align: left;
-              // white-space: nowrap;
-              line-height: 18px;
-              display: block;
-              margin: -2px 0 0 2px;
-            }
+        height: 2px;
+      }
+    }
+
+    .section6 {
+      width: 100%;
+      padding: 10px 15px;
+
+      .TextGroup2 {
+        width: 20%;
+
+        .bd3 {
+          .word3 {
+            width: auto;
+            height: 30px;
+            overflow-wrap: break-word;
+            color: rgba(64, 77, 116, 1);
+            font-size: 22px;
+            font-family: PingFangSC-Medium;
+            text-align: left;
+            white-space: nowrap;
+            line-height: 30px;
+            display: block;
+          }
+
+          .info2 {
+            width: auto;
+            height: 18px;
+            overflow-wrap: break-word;
+            color: rgba(64, 77, 116, 1);
+            font-size: 13px;
+            text-align: left;
+            // white-space: nowrap;
+            line-height: 18px;
+            display: block;
+            margin: -2px 0 0 2px;
           }
         }
-  
-        .TextGroup3 {
+      }
+
+      .TextGroup3 {
+        height: 38px;
+        width: 40%;
+
+        .main2 {
+          width: auto;
           height: 38px;
-          width: 40%;
-  
-          .main2 {
+
+          .word4 {
             width: auto;
-            height: 38px;
-  
-            .word4 {
-              width: auto;
-              height: 18px;
-              overflow-wrap: break-word;
-              color: rgba(64, 77, 116, 1);
-              font-size: 13px;
-              text-align: left;
-              white-space: nowrap;
-              line-height: 18px;
-              display: block;
-            }
-  
-            .txt3 {
-              width: auto;
-              height: 18px;
-              overflow-wrap: break-word;
-              color: rgba(64, 77, 116, 1);
-              font-size: 13px;
-              text-align: left;
-              white-space: nowrap;
-              line-height: 18px;
-              margin-top: 2px;
-              display: block;
-            }
+            height: 18px;
+            overflow-wrap: break-word;
+            color: rgba(64, 77, 116, 1);
+            font-size: 13px;
+            text-align: left;
+            white-space: nowrap;
+            line-height: 18px;
+            display: block;
+          }
+
+          .txt3 {
+            width: auto;
+            height: 18px;
+            overflow-wrap: break-word;
+            color: rgba(64, 77, 116, 1);
+            font-size: 13px;
+            text-align: left;
+            white-space: nowrap;
+            line-height: 18px;
+            margin-top: 2px;
+            display: block;
           }
         }
-  
-        .ImageText2 {
+      }
+
+      .ImageText2 {
+        height: 17px;
+        width: 10%;
+        margin: 9px 0 0 32px;
+
+        .group3 {
+          width: 40px;
           height: 17px;
-          width: 10%;
-          margin: 9px 0 0 32px;
-  
-          .group3 {
-            width: 40px;
-            height: 17px;
-  
-            .group4 {
-              width: 13px;
-              height: 14px;
-              background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPngb70cca70325ff31d341004d9ce7ebf2d5f692bbe3bf755d9d44b36aa78c21c77) top center no-repeat;
-              background-size: 100%;
-              margin-top: 1px;
-            }
-  
-            .TextGroup4 {
-              height: 17px;
-              width: 24px;
-  
-              .info3 {
-                width: 24px;
-                height: 17px;
-                overflow-wrap: break-word;
-                color: rgba(223, 94, 76, 1);
-                font-size: 12px;
-                text-align: left;
-                white-space: nowrap;
-                line-height: 17px;
-                display: block;
-              }
-            }
+
+          .group4 {
+            width: 13px;
+            height: 14px;
+            background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPngb70cca70325ff31d341004d9ce7ebf2d5f692bbe3bf755d9d44b36aa78c21c77) top center no-repeat;
+            background-size: 100%;
+            margin-top: 1px;
           }
-        }
-  
-        .bd4 {
-          width: 15%;
-          height: 36px;
-          margin: 10px 0 0 32px;
-  
-          .outer1 {
-            width: 41px;
+
+          .TextGroup4 {
             height: 17px;
-  
-            .main3 {
-              width: 15px;
-              height: 15px;
-              background: url('../../assets/edit.png') top center no-repeat;
-              background-size: 100%;
-              margin-top: 1px;
-            }
-  
-            .word5 {
+            width: 24px;
+
+            .info3 {
               width: 24px;
               height: 17px;
               overflow-wrap: break-word;
-              color: #2c87c8;
+              color: rgba(223, 94, 76, 1);
               font-size: 12px;
               text-align: left;
               white-space: nowrap;
@@ -206,258 +174,290 @@
               display: block;
             }
           }
-  
-          .word6 {
-            width: 39px;
-            height: 18px;
+        }
+      }
+
+      .bd4 {
+        width: 15%;
+        height: 36px;
+        margin: 10px 0 0 32px;
+
+        .outer1 {
+          width: 41px;
+          height: 17px;
+
+          .main3 {
+            width: 15px;
+            height: 15px;
+            background: url('../../assets/edit.png') top center no-repeat;
+            background-size: 100%;
+            margin-top: 1px;
+          }
+
+          .word5 {
+            width: 24px;
+            height: 17px;
             overflow-wrap: break-word;
-            color: rgba(77, 193, 147, 1);
-            font-size: 13px;
+            color: #4d6add;
+            font-size: 12px;
             text-align: left;
             white-space: nowrap;
-            line-height: 18px;
+            line-height: 17px;
             display: block;
-            margin: 1px 0 0 2px;
-  
-            &.close {
-              color: rgba(197, 197, 205, 1);
-            }
+          }
+        }
+
+        .word6 {
+          width: 39px;
+          height: 18px;
+          overflow-wrap: break-word;
+          color: rgba(77, 193, 147, 1);
+          font-size: 13px;
+          text-align: left;
+          white-space: nowrap;
+          line-height: 18px;
+          display: block;
+          margin: 1px 0 0 2px;
+
+          &.close {
+            color: rgba(197, 197, 205, 1);
           }
         }
       }
     }
   }
+}
+
+.alarmClockSetPage {
+  width: 100%;
 
-  .alarmClockSetPage {
+  .alarmClockSetBox {
+    width: 100%;
+    height: calc(100% - 44px);
+    overflow: auto;
+    overflow-x: hidden;
+
+    .equipmentField {
+      .van-field__label {
+        display: flex;
+        align-items: center;
+        line-height: 1;
+
+        &::before {
+          content: '';
+          width: 4px;
+          height: 12px;
+          margin: 0 4px;
+          background-color: #8096ec;
+          border-radius: 2px;
+          display: inline-block;
+        }
+      }
+    }
+
+    .repeatTimeBox {
       width: 100%;
+      padding-bottom: 18px;
+      border-bottom: 1px solid var(--van-cell-border-color);
+    }
 
-      .alarmClockSetBox {
-          width: 100%;
-          height: calc(100% - 44px);
-          overflow: auto;
-          overflow-x: hidden;
-
-          .equipmentField {
-              .van-field__label {
-                  display: flex;
-                  align-items: center;
-                  line-height: 1;
-
-                  &::before {
-                      content: '';
-                      width: 4px;
-                      height: 12px;
-                      margin: 0 4px;
-                      background-color: #5a9cc8;
-                      border-radius: 2px;
-                      display: inline-block;
-                  }
-              }
-          }
+    .dayCon {
+      padding: 6px 15px;
 
-          .repeatTimeBox {
-              width: 100%;
-              padding-bottom: 18px;
-              border-bottom: 1px solid var(--van-cell-border-color);
-          }
+      .dayName {
+        padding: 6px 10px;
+        background-color: rgba(223, 223, 229, 1);
+        border-radius: 2px;
+        border: 0.5px solid rgba(185, 186, 208, 1);
+      }
 
-          .dayCon {
-              padding: 6px 15px;
+      .active {
+        background-color: #4d6add !important;
+        border-color: #4d6add !important;
+        color: #fff !important;
+      }
+    }
 
-              .dayName {
-                  padding: 6px 10px;
-                  background-color: rgba(223, 223, 229, 1);
-                  border-radius: 2px;
-                  border: 0.5px solid rgba(185, 186, 208, 1);
-              }
+    .txt6 {
+      width: 112px;
+      height: 13px;
+      overflow-wrap: break-word;
+      color: rgba(64, 77, 116, 1);
+      font-size: 14px;
+      font-family: PingFangSC-Medium;
+      text-align: left;
+      white-space: nowrap;
+      line-height: 14px;
+      display: block;
+      margin: 18px 0 15px 15px;
+    }
 
-              .active {
-                  background-color: #2c87c8 !important;
-                  border-color: #2c87c8 !important;
-                  color: #fff !important;
-              }
-          }
+    .outer4 {
+      width: 345px;
+      height: 38px;
+      margin: 20px 0 0 15px;
+
+      .mod3 {
+        background-color: rgba(223, 223, 229, 1);
+        border-radius: 2px;
+        height: 38px;
+        border: 0.5px solid rgba(185, 186, 208, 1);
+        width: 119px;
+
+        .word2 {
+          width: 26px;
+          height: 13px;
+          overflow-wrap: break-word;
+          color: rgba(64, 77, 116, 1);
+          font-size: 13px;
+          text-align: left;
+          white-space: nowrap;
+          line-height: 13px;
+          display: block;
+          margin: 13px 0 0 47px;
+        }
+      }
 
-          .txt6 {
-              width: 112px;
-              height: 13px;
-              overflow-wrap: break-word;
-              color: rgba(64, 77, 116, 1);
-              font-size: 14px;
-              font-family: PingFangSC-Medium;
-              text-align: left;
-              white-space: nowrap;
-              line-height: 14px;
-              display: block;
-              margin: 18px 0 15px 15px;
-          }
+      .Button1 {
+        background-color: rgba(223, 223, 229, 1);
+        border-radius: 2px;
+        height: 38px;
+        border: 0.5px solid rgba(185, 186, 208, 1);
+        width: 211px;
+
+        .word3 {
+          width: 117px;
+          height: 13px;
+          overflow-wrap: break-word;
+          color: rgba(64, 77, 116, 1);
+          font-size: 13px;
+          text-align: left;
+          white-space: nowrap;
+          line-height: 13px;
+          display: block;
+          margin: 13px 0 0 47px;
+        }
+      }
+    }
 
-          .outer4 {
-              width: 345px;
-              height: 38px;
-              margin: 20px 0 0 15px;
-
-              .mod3 {
-                  background-color: rgba(223, 223, 229, 1);
-                  border-radius: 2px;
-                  height: 38px;
-                  border: 0.5px solid rgba(185, 186, 208, 1);
-                  width: 119px;
-
-                  .word2 {
-                      width: 26px;
-                      height: 13px;
-                      overflow-wrap: break-word;
-                      color: rgba(64, 77, 116, 1);
-                      font-size: 13px;
-                      text-align: left;
-                      white-space: nowrap;
-                      line-height: 13px;
-                      display: block;
-                      margin: 13px 0 0 47px;
-                  }
-              }
+    .outer5 {
+      width: 345px;
+      height: 38px;
+      margin: 15px 0 0 15px;
+
+      .bd1 {
+        background-color: rgba(223, 223, 229, 1);
+        border-radius: 2px;
+        height: 38px;
+        border: 0.5px solid rgba(185, 186, 208, 1);
+        width: 211px;
+
+        .word4 {
+          width: 117px;
+          height: 13px;
+          overflow-wrap: break-word;
+          color: rgba(64, 77, 116, 1);
+          font-size: 13px;
+          text-align: left;
+          white-space: nowrap;
+          line-height: 13px;
+          display: block;
+          margin: 13px 0 0 47px;
+        }
+      }
 
-              .Button1 {
-                  background-color: rgba(223, 223, 229, 1);
-                  border-radius: 2px;
-                  height: 38px;
-                  border: 0.5px solid rgba(185, 186, 208, 1);
-                  width: 211px;
-
-                  .word3 {
-                      width: 117px;
-                      height: 13px;
-                      overflow-wrap: break-word;
-                      color: rgba(64, 77, 116, 1);
-                      font-size: 13px;
-                      text-align: left;
-                      white-space: nowrap;
-                      line-height: 13px;
-                      display: block;
-                      margin: 13px 0 0 47px;
-                  }
-              }
-          }
+      .bd2 {
+        background-color: rgba(223, 223, 229, 1);
+        border-radius: 2px;
+        height: 38px;
+        border: 0.5px solid rgba(185, 186, 208, 1);
+        width: 119px;
+
+        .word5 {
+          width: 39px;
+          height: 13px;
+          overflow-wrap: break-word;
+          color: rgba(64, 77, 116, 1);
+          font-size: 13px;
+          text-align: left;
+          white-space: nowrap;
+          line-height: 13px;
+          display: block;
+          margin: 13px 0 0 40px;
+        }
+      }
+    }
 
-          .outer5 {
-              width: 345px;
-              height: 38px;
-              margin: 15px 0 0 15px;
-
-              .bd1 {
-                  background-color: rgba(223, 223, 229, 1);
-                  border-radius: 2px;
-                  height: 38px;
-                  border: 0.5px solid rgba(185, 186, 208, 1);
-                  width: 211px;
-
-                  .word4 {
-                      width: 117px;
-                      height: 13px;
-                      overflow-wrap: break-word;
-                      color: rgba(64, 77, 116, 1);
-                      font-size: 13px;
-                      text-align: left;
-                      white-space: nowrap;
-                      line-height: 13px;
-                      display: block;
-                      margin: 13px 0 0 47px;
-                  }
-              }
+    .ImageText1 {
+      height: 18px;
+      width: auto;
+      margin: 23px 0 0 15px;
 
-              .bd2 {
-                  background-color: rgba(223, 223, 229, 1);
-                  border-radius: 2px;
-                  height: 38px;
-                  border: 0.5px solid rgba(185, 186, 208, 1);
-                  width: 119px;
-
-                  .word5 {
-                      width: 39px;
-                      height: 13px;
-                      overflow-wrap: break-word;
-                      color: rgba(64, 77, 116, 1);
-                      font-size: 13px;
-                      text-align: left;
-                      white-space: nowrap;
-                      line-height: 13px;
-                      display: block;
-                      margin: 13px 0 0 40px;
-                  }
-              }
+      .mod4 {
+        width: 109px;
+        height: auto;
+
+        .TextGroup1 {
+          height: 13px;
+          margin-top: 2px;
+          width: auto;
+
+          .info4 {
+            width: auto;
+            height: 13px;
+            overflow-wrap: break-word;
+            color: rgba(64, 77, 116, 1);
+            font-size: 13px;
+            text-align: left;
+            white-space: nowrap;
+            line-height: 13px;
+            display: block;
           }
+        }
+
+        .section1 {
+          background-color: rgba(223, 223, 229, 1);
+          border-radius: 9px;
+          height: 18px;
+          width: 38px;
+
+          .van-switch {
+            width: 38px;
+            height: 18px;
 
-          .ImageText1 {
+            .van-switch__node {
+              width: 18px;
               height: 18px;
-              width: auto;
-              margin: 23px 0 0 15px;
-
-              .mod4 {
-                  width: 109px;
-                  height: auto;
-
-                  .TextGroup1 {
-                      height: 13px;
-                      margin-top: 2px;
-                      width: auto;
-
-                      .info4 {
-                          width: auto;
-                          height: 13px;
-                          overflow-wrap: break-word;
-                          color: rgba(64, 77, 116, 1);
-                          font-size: 13px;
-                          text-align: left;
-                          white-space: nowrap;
-                          line-height: 13px;
-                          display: block;
-                      }
-                  }
-
-                  .section1 {
-                      background-color: rgba(223, 223, 229, 1);
-                      border-radius: 9px;
-                      height: 18px;
-                      width: 38px;
-
-                      .van-switch {
-                          width: 38px;
-                          height: 18px;
-
-                          .van-switch__node {
-                              width: 18px;
-                              height: 18px;
-                          }
-
-                          &.van-switch--on .van-switch__node {
-                              transform: translate(calc(38px - 18px));
-                          }
-                      }
-                  }
-              }
+            }
+
+            &.van-switch--on .van-switch__node {
+              transform: translate(calc(38px - 18px));
+            }
           }
+        }
       }
+    }
+  }
 
-      .van-checkbox__icon--checked .van-icon {
-          background-color: #2c87c8;
-          border-color: #2c87c8;
-      }
+  .van-checkbox__icon--checked .van-icon {
+    background-color: #4d6add;
+    border-color: #4d6add;
+  }
 
-      .van-switch--on {
-          background-color: #2c87c8;
-      }
+  .van-switch--on {
+    background-color: #4d6add;
+  }
 
-      .van-button--primary {
-          background-color: #2c87c8;
-          border-color: #2c87c8;
-      }
+  .van-button--primary {
+    background-color: #4d6add;
+    border-color: #4d6add;
+  }
 
-      .van-cascader__option--selected {
-          color: #2c87c8;
-      }
+  .van-cascader__option--selected {
+    color: #4d6add;
+  }
 
-      .van-tabs__line {
-          background-color: #2c87c8 !important;
-      }
-  }
+  .van-tabs__line {
+    background-color: #4d6add !important;
+  }
+}

+ 14 - 14
src/styles/alarmHistory/index.less

@@ -107,23 +107,23 @@
     }
 
     .van-button--primary {
-        border-color: #2c87c8;
-        background-color: #2c87c8;
+        border-color: #4d6add;
+        background-color: #4d6add;
     }
 }
 
-	.codeSearch {
-		width: 100%;
+.codeSearch {
+    width: 100%;
 
-		.codeSearchPopup {
-			width: 90%;
-		}
+    .codeSearchPopup {
+        width: 90%;
+    }
 
-		.content {
-			padding-top: 1em;
-		}
+    .content {
+        padding-top: 1em;
+    }
 
-		.field .van-field__label {
-			width: auto;
-		}
-	}
+    .field .van-field__label {
+        width: auto;
+    }
+}

+ 8 - 8
src/styles/apkManage/index.less

@@ -19,10 +19,10 @@
     .content {
       .rightCon {
         .editBtn {
-          border: 1px solid #2c87c8;
+          border: 1px solid #4d6add;
           border-radius: 2px;
           padding: 6px 16px;
-          color: #2c87c8;
+          color: #4d6add;
         }
       }
     }
@@ -30,16 +30,16 @@
 }
 
 .van-button--primary {
-  background-color: #2c87c8;
-  border-color: #2c87c8;
+  background-color: #4d6add;
+  border-color: #4d6add;
 }
 
 .van-radio__icon--checked .van-icon {
-  background-color: #2c87c8;
-  border-color: #2c87c8;
+  background-color: #4d6add;
+  border-color: #4d6add;
 }
 
 .van-checkbox__icon--checked .van-icon {
-  background-color: #2c87c8;
-  border-color: #2c87c8;
+  background-color: #4d6add;
+  border-color: #4d6add;
 }

+ 3 - 3
src/styles/bindWechat/index.less

@@ -18,13 +18,13 @@
         .van-button {
             width: 120px;
             height: 34px;
-            border: 1px solid #2c87c8;
-            background-color: #2c87c8;
+            border: 1px solid #4d6add;
+            background-color: #4d6add;
         }
 
         .register {
             background-color: transparent;
-            color: #2c87c8;
+            color: #4d6add;
         }
     }
 }

+ 38 - 38
src/styles/changePassword/index.less

@@ -1,47 +1,47 @@
 .changePassword {
-    .changePasswordFormBox {
-      width: 100%;
-      margin-top: 40px;
-      text-align: center;
+  .changePasswordFormBox {
+    width: 100%;
+    margin-top: 40px;
+    text-align: center;
 
-      .van-form {
-        .van-cell {
-          width: 90%;
-          height: 38px;
-          padding: 0;
-          margin: 0 auto;
-          margin-top: 10px;
-          overflow: visible;
+    .van-form {
+      .van-cell {
+        width: 90%;
+        height: 38px;
+        padding: 0;
+        margin: 0 auto;
+        margin-top: 10px;
+        overflow: visible;
 
-          &::after {
-            display: none;
-          }
+        &::after {
+          display: none;
+        }
 
-          .van-field__control {
-            height: 38px;
-            line-height: 38px;
-            padding: 6px;
-            border-radius: 2px;
-            border: 0.5px solid rgba(185, 186, 208, 1);
-          }
+        .van-field__control {
+          height: 38px;
+          line-height: 38px;
+          padding: 6px;
+          border-radius: 2px;
+          border: 0.5px solid rgba(185, 186, 208, 1);
+        }
 
-          .van-field__label {
-            display: flex;
-            height: 38px;
-            align-items: center;
-            width: 80px;
-          }
+        .van-field__label {
+          display: flex;
+          height: 38px;
+          align-items: center;
+          width: 80px;
         }
       }
+    }
 
-      .register {
-        background-color: #2c87c8;
-        border-radius: 17px;
-        height: 34px;
-        width: 220px;
-        margin-top: 60px;
-        font-size: 15px;
-        font-family: PingFangSC-Medium;
-      }
+    .register {
+      background-color: #4d6add;
+      border-radius: 17px;
+      height: 34px;
+      width: 220px;
+      margin-top: 60px;
+      font-size: 15px;
+      font-family: PingFangSC-Medium;
     }
-  }
+  }
+}

+ 9 - 14
src/styles/device/index.less

@@ -171,7 +171,7 @@
             height: 15px;
 
             .layer1 {
-              background-color: #5a9cc8;
+              background-color: #8096ec;
               border-radius: 2px;
               width: 4px;
               height: 12px;
@@ -231,7 +231,7 @@
 
           .contentBottomCon {
             .van-button--primary {
-              background-color: #2c87c8;
+              background-color: #4d6add;
               width: 50px;
               padding: 0 0;
               margin: 0 8px 0 0;
@@ -276,7 +276,7 @@
               }
 
               .editIcon {
-                color: #2c87c8;
+                color: #4d6add;
                 padding: 0 0 0px 5px;
               }
             }
@@ -342,7 +342,7 @@
             }
 
             .editDeviceBtnCon {
-              color: #2c87c8;
+              color: #4d6add;
 
               .box2 {
                 width: 18px;
@@ -562,24 +562,19 @@
 }
 
 .van-button--primary {
-  background-color: #2c87c8;
-  border-color: #2c87c8;
+  background-color: #4d6add;
+  border-color: #4d6add;
 }
 
 .van-dropdown-menu__title--active {
-  color: #2c87c8;
+  color: #4d6add;
 }
 
 .van-dropdown-item__option--active,
 .van-dropdown-item__option--active .van-dropdown-item__icon {
-  color: #2c87c8;
+  color: #4d6add;
 }
 
 .van-dropdown-menu__title {
-  color: #2c87c8;
-}
-
-.van-checkbox__icon--checked .van-icon {
-  background-color: #2c87c8;
-  border-color: #2c87c8;
+  color: #4d6add;
 }

+ 58 - 57
src/styles/deviceOper/index.less

@@ -81,7 +81,7 @@
         .mod7 {
             border-radius: 17px;
             height: 34px;
-            border: 1px solid #2c87c8;
+            border: 1px solid #4d6add;
             width: 120px;
             justify-content: center;
             align-items: center;
@@ -90,7 +90,7 @@
                 width: auto;
                 height: 13px;
                 overflow-wrap: break-word;
-                color: #2c87c8;
+                color: #4d6add;
                 font-size: 15px;
                 font-family: PingFangSC-Medium;
                 text-align: center;
@@ -101,7 +101,7 @@
         }
 
         .mod8 {
-            background-color: #2c87c8;
+            background-color: #4d6add;
             border-radius: 17px;
             height: 34px;
             width: 120px;
@@ -124,60 +124,61 @@
     }
 }
 
-.openDoorPage {
-	background-color: rgba(255, 255, 255, 1);
-	position: relative;
-	width: 100%;
-	height: calc(100vh - 44px);
-	overflow: hidden;
-
-
-	.box1 {
-		width: 100%;
-		height: 237px;
-
-
-		.block2 {
-			width: 162px;
-			height: 20px;
-			margin: 18px 0 0 15px;
-
-			.block3 {
-				background-color: #5a9cc8;
-				border-radius: 2px;
-				width: 4px;
-				height: 12px;
-				margin-top: 4px;
-			}
-
-			.info2 {
-				width: 150px;
-				height: 20px;
-				overflow-wrap: break-word;
-				color: rgba(64, 77, 116, 1);
-				font-size: 14px;
-				font-family: PingFangSC-Medium;
-				text-align: left;
-				white-space: nowrap;
-				line-height: 20px;
-				display: block;
-			}
-		}
-
-		.info3 {
-			width: auto;
-			height: 20px;
-			overflow-wrap: break-word;
-			color: rgba(64, 77, 116, 1);
-			font-size: 14px;
-			font-family: PingFangSC-Medium;
-			text-align: left;
-			white-space: nowrap;
-			line-height: 20px;
-			display: block;
-		}
-	}
+.pageDoor {
+    background-color: rgba(255, 255, 255, 1);
+    position: relative;
+    width: 100%;
+    height: calc(100vh - 44px);
+    overflow: hidden;
+
+
+    .box1 {
+        width: 100%;
+        height: 237px;
+
+
+        .block2 {
+            width: 162px;
+            height: 20px;
+            margin: 18px 0 0 15px;
+
+            .block3 {
+                background-color: #8096ec;
+                border-radius: 2px;
+                width: 4px;
+                height: 12px;
+                margin-top: 4px;
+            }
+
+            .info2 {
+                width: 150px;
+                height: 20px;
+                overflow-wrap: break-word;
+                color: rgba(64, 77, 116, 1);
+                font-size: 14px;
+                font-family: PingFangSC-Medium;
+                text-align: left;
+                white-space: nowrap;
+                line-height: 20px;
+                display: block;
+            }
+        }
+
+        .info3 {
+            width: auto;
+            height: 20px;
+            overflow-wrap: break-word;
+            color: rgba(64, 77, 116, 1);
+            font-size: 14px;
+            font-family: PingFangSC-Medium;
+            text-align: left;
+            white-space: nowrap;
+            line-height: 20px;
+            display: block;
+        }
+    }
+
     .van-switch--on {
-        background-color: #2c87c8;
+        background-color: #4d6add;
     }
 }

+ 8 - 8
src/styles/deviceSearch/index.less

@@ -1,23 +1,23 @@
-.field .van-field__label { width: auto; }
+.field .van-field__label {
+  width: auto;
+}
 
 .deviceSearch {
   .clearBtn {
-    border-color: #2c87c8;
-    color: #2c87c8;
+    border-color: #4d6add;
     background-color: #fff;
   }
 
-
   .selectBtn {
-    background-color: #2c87c8;
-    border-color: #2c87c8;
+    background-color: #4d6add;
+    border-color: #4d6add;
   }
 
   .van-cascader__option--selected {
-    color: #2c87c8;
+    color: #4d6add;
   }
 
   .van-tabs__line {
-    background-color: #2c87c8 !important;
+    background-color: #4d6add !important;
   }
 }

+ 20 - 25
src/styles/deviceSet/index.less

@@ -278,7 +278,7 @@
             width: 100%;
 
             .van-icon {
-                color: #2c87c8;
+                color: #4d6add;
             }
 
             .word6 {
@@ -292,7 +292,7 @@
         }
 
         .van-switch--on {
-            background-color: #2c87c8;
+            background-color: #4d6add;
         }
 
         .bd8 {
@@ -383,7 +383,7 @@
                             width: 24px;
                             height: 17px;
                             overflow-wrap: break-word;
-                            color: #2c87c8;
+                            color: #4d6add;
                             font-size: 12px;
                             text-align: left;
                             white-space: nowrap;
@@ -532,12 +532,6 @@
                 display: block;
             }
 
-            .section1 {
-                width: 12px;
-                height: 12px;
-                background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng5e3fac6de0c7dcaa42c48ad9495ff6feeaa9cdab9afc41f6b5ceac1719f3fd50) 100% no-repeat;
-                margin: 4px 0 0 6px;
-            }
 
             .info6 {
                 width: 52px;
@@ -636,33 +630,34 @@
             white-space: nowrap;
             line-height: 15px;
             display: block;
-            background-color: #2c87c8;
-            border-color: #2c87c8;
+            background-color: #4d6add;
+            border-color: #4d6add;
             // margin: 11px 0 0 35px;
         }
     }
 
-        .input1 {
-            .van-field__body {
-                width: 80%;
-            }
+    .input1 {
+        .van-field__body {
+            width: 80%;
         }
+    }
+
 
     .van-button--primary {
-        background-color: #2c87c8;
-        border-color: #2c87c8;
+        background-color: #4d6add;
+        border-color: #4d6add;
     }
 
     .van-radio__icon--checked .van-icon {
-        background-color: #2c87c8;
-        border-color: #2c87c8;
+        background-color: #4d6add;
+        border-color: #4d6add;
     }
 
-        .van-tabs__line {
-             background-color: #2c87c8 !important;
-        }
+    .van-tabs__line {
+        background-color: #4d6add !important;
+    }
 
-        .van-cascader__option--selected {
-             color: #2c87c8;
-        }
+    .van-cascader__option--selected {
+        color: #4d6add;
+    }
 }

+ 17 - 17
src/styles/discountCode/index.less

@@ -86,7 +86,7 @@
                 justify-content: space-around;
 
                 .active {
-                    color: #2c87c8;
+                    color: #4d6add;
                     position: relative;
                     height: 100%;
                     line-height: 50px;
@@ -98,7 +98,7 @@
                         position: absolute;
                         bottom: 0;
                         left: 0;
-                        background-color: #2c87c8;
+                        background-color: #4d6add;
                     }
                 }
             }
@@ -162,7 +162,7 @@
                     width: 21%;
                     line-height: 2.2;
                     text-align: center;
-                    background-color: #2c87c8;
+                    background-color: #4d6add;
                     color: #fff;
 
                     &.isUseTip {
@@ -175,8 +175,8 @@
     }
 
     .van-button--primary {
-        border-color: #2c87c8;
-        background-color: #2c87c8;
+        border-color: #4d6add;
+        background-color: #4d6add;
     }
 }
 
@@ -193,23 +193,23 @@
     }
 
     .van-radio__icon--checked .van-icon {
-        background-color: #2c87c8;
-        border-color: #2c87c8;
+        background-color: #4d6add;
+        border-color: #4d6add;
     }
 }
 
 .codeSearch {
-  width: 100%;
+    width: 100%;
 
-  .codeSearchPopup {
-    width: 90%;
-  }
+    .codeSearchPopup {
+        width: 90%;
+    }
 
-  .content {
-    padding-top: 1em;
-  }
+    .content {
+        padding-top: 1em;
+    }
 
-  .field .van-field__label {
-    width: auto;
-  }
+    .field .van-field__label {
+        width: auto;
+    }
 }

+ 7 - 7
src/styles/distributionSet/index.less

@@ -10,8 +10,8 @@
 
     .headCon {
         .leftImg {
-            width: 20px;
-            height: 20px;
+            width: 19px;
+            height: 19px;
             background: url('../../assets/distributionSet/leftIcon.png') top center no-repeat;
             background-size: 100%;
         }
@@ -25,16 +25,16 @@
         }
 
         .rightCon {
-            color: #2c87c8;
+            color: #4d6add;
         }
     }
 
     .van-tabs__line {
-        background-color: #2c87c8 !important;
+        background-color: #4d6add !important;
     }
 
     .van-tab--active .van-tab__text--ellipsis {
-        color: #2c87c8;
+        color: #4d6add;
     }
 
     .contentCon {
@@ -91,7 +91,7 @@
     }
 
     .van-button--primary {
-        border-color: #2c87c8;
-        background-color: #2c87c8;
+        border-color: #4d6add;
+        background-color: #4d6add;
     }
 }

+ 6 - 5
src/styles/doSugar/index.less

@@ -20,7 +20,7 @@
     .textRow {
         text-align: right;
         width: 100%;
-        color: #2c87c8;
+        color: #4d6add;
         font-size: 12px;
         line-height: 17px;
         cursor: pointer;
@@ -36,7 +36,7 @@
             margin: 18px 0 0 15px;
 
             .block3 {
-                background-color: #5a9cc8;
+                background-color: #8096ec;
                 border-radius: 2px;
                 width: 4px;
                 height: 12px;
@@ -58,7 +58,7 @@
         }
 
         .block5 {
-            background-color: #2c87c8;
+            background-color: #4d6add;
             border-radius: 17px;
             height: 34px;
             width: 220px;
@@ -79,11 +79,12 @@
             }
         }
     }
+
     .van-tabs__line {
-        background-color: #2c87c8 !important;
+        background-color: #4d6add !important;
     }
 
     .van-cascader__option--selected {
-        color: #2c87c8;
+        color: #4d6add;
     }
 }

+ 100 - 78
src/styles/forgetPassword/index.less

@@ -1,83 +1,105 @@
 .forgetPassword {
-  .forgetPasswordFormBox {
-    width: 313px;
-    margin: 30px auto;
-    text-align: center;
-
-    .van-form {
-      .van-cell {
+    .forgetPasswordFormBox {
         width: 313px;
-        height: 38px;
-        padding: 0;
-        font-size: 13px;
-        margin: 0 auto;
-        margin-top: 20px;
-        overflow: visible;
-        &::after { display: none;}
-        .van-field__button button { background-color: #5a9cc8; color: #fff; }
-        .van-button__text {
-          padding: 4px;
-        }
-        .van-field__control {
-          height: 38px;
-          line-height: 38px;
-          padding: 6px;
-          border-radius: 2px;
-          border: 0.5px solid rgba(185, 186, 208, 1);
-        }
-        .radioBox {
-          display: flex;
-          .van-radio-group--horizontal {
-            width: 100%;
-            justify-content: space-around;
-          }
-          .van-radio { overflow: visible; }
-          .van-radio__icon--checked .van-icon-success{
-            border-color: #2c87c8;
-            background: #2c87c8;
-          }
-          .van-icon-success::before {
-            content: '';
-            background: #fff;
-            width: 40%;
-            height: 40%;
-            position: absolute;
-            top: 30%;
-            left: 30%;
-            border-radius: 100%;
-          }
-          .van-radio__icon--checked + .van-radio__label { color: #2c87c8; }
+        margin: 30px auto;
+        text-align: center;
+
+        .van-form {
+            .van-cell {
+                width: 313px;
+                height: 38px;
+                padding: 0;
+                font-size: 13px;
+                margin: 0 auto;
+                margin-top: 20px;
+                overflow: visible;
+
+                &::after {
+                    display: none;
+                }
+
+                .van-field__button button {
+                    background-color: #8096ec;
+                    color: #fff;
+                }
+
+                .van-button__text {
+                    padding: 4px;
+                }
+
+                .van-field__control {
+                    height: 38px;
+                    line-height: 38px;
+                    padding: 6px;
+                    border-radius: 2px;
+                    border: 0.5px solid rgba(185, 186, 208, 1);
+                }
+
+                .radioBox {
+                    display: flex;
+
+                    .van-radio-group--horizontal {
+                        width: 100%;
+                        justify-content: space-around;
+                    }
+
+                    .van-radio {
+                        overflow: visible;
+                    }
+
+                    .van-radio__icon--checked .van-icon-success {
+                        border-color: #4d6add;
+                        background: #4d6add;
+                    }
+
+                    .van-icon-success::before {
+                        content: '';
+                        background: #fff;
+                        width: 40%;
+                        height: 40%;
+                        position: absolute;
+                        top: 30%;
+                        left: 30%;
+                        border-radius: 100%;
+                    }
+
+                    .van-radio__icon--checked+.van-radio__label {
+                        color: #4d6add;
+                    }
+                }
+            }
+
+            .word1 {
+                overflow-wrap: break-word;
+                color: rgba(64, 77, 116, 1);
+                font-size: 13px;
+                text-align: left;
+                white-space: nowrap;
+                line-height: 13px;
+                display: block;
+                margin: 34px 0 0 0;
+            }
+
+            .word2 {
+                overflow-wrap: break-word;
+                color: rgba(64, 77, 116, 1);
+                font-size: 13px;
+                text-align: left;
+                white-space: nowrap;
+                line-height: 13px;
+                display: block;
+                margin: 14px 0 0 0;
+            }
+
+            .register {
+                background-color: rgba(77, 106, 221, 1);
+                border-radius: 17px;
+                height: 34px;
+                width: 220px;
+                margin-top: 60px;
+                font-size: 15px;
+                font-family: PingFangSC-Medium;
+            }
         }
-      }
-      .word1 {
-        overflow-wrap: break-word;
-        color: rgba(64, 77, 116, 1);
-        font-size: 13px;
-        text-align: left;
-        white-space: nowrap;
-        line-height: 13px;
-        display: block;
-        margin: 34px 0 0 0;
-      }
-      .word2 {
-        overflow-wrap: break-word;
-        color: rgba(64, 77, 116, 1);
-        font-size: 13px;
-        text-align: left;
-        white-space: nowrap;
-        line-height: 13px;
-        display: block;
-        margin: 14px 0 0 0;
-      }
-      .register {
-        background-color: #2c87c8;
-        border-radius: 17px;
-        height: 34px;
-        width: 200px;
-        margin-top: 60px;
-        font-size: 15px;
-        font-family: PingFangSC-Medium;
-      }
     }
-  }
 }

+ 12 - 13
src/styles/home/index.less

@@ -73,8 +73,8 @@
         height: 16px;
 
         .section5 {
-          width: 15px;
-          height: 15px;
+          width: 14px;
+          height: 16px;
           background: url("../../assets/home/titleIcon.png") top center no-repeat;
           background-size: 100%;
           margin-left: 15px;
@@ -275,22 +275,21 @@
         width: 100%;
 
         .ImageText10 {
-          height: 20px;
+          height: 14px;
           margin-left: 20px;
           width: 78px;
 
           .wrap2 {
             width: 78px;
-            height: 20px;
+            height: 14px;
 
             .outer10 {
               z-index: 2;
               position: relative;
-              margin-right: 5px;
-              width: 20px;
-              height: 20px;
+              width: 14px;
+              height: 14px;
               border: 2px rgba(128, 150, 236, 1);
-              background: url("../../assets/home/commonTools.png") top center no-repeat;
+              background: url("../../assets/home/commonTools.png") center no-repeat;
               background-size: 100%;
             }
 
@@ -301,7 +300,6 @@
               .txt13 {
                 width: 56px;
                 height: 14px;
-                margin-top: 3px;
                 overflow-wrap: break-word;
                 color: rgba(64, 77, 116, 1);
                 font-size: 14px;
@@ -330,12 +328,12 @@
         // margin: 0 26px 27px 0;
         // margin-bottom: 27px;
         /*        &:nth-last-child(-n + 5) {
-                  margin-bottom: 0;
-                } */
+          margin-bottom: 0;
+        } */
 
         .mod7 {
-          height: 45px;
-          width: 45px;
+          height: 55px;
+          width: 55px;
           margin: 0 auto;
           align-items: center;
           justify-content: center;
@@ -359,4 +357,5 @@
       }
     }
   }
+
 }

+ 12 - 12
src/styles/joinpayMch/index.less

@@ -130,40 +130,40 @@
             }
         }
     }
-    
+
     .van-radio__icon--checked .van-icon {
-        background-color: #2c87c8;
-        border-color: #2c87c8;
+        background-color: #4d6add;
+        border-color: #4d6add;
     }
 
     .van-calendar__day--start-end {
-        background-color: #2c87c8 !important;
+        background-color: #4d6add !important;
     }
 
     .van-calendar__selected-day {
-        background-color: #2c87c8 !important;
+        background-color: #4d6add !important;
     }
 
     .van-calendar__day--start {
-        background-color: #2c87c8 !important;
+        background-color: #4d6add !important;
     }
 
     .van-calendar__day--middle {
-        color: #2c87c8 !important;
+        color: #4d6add !important;
     }
 
     .van-calendar__day--end {
-        background-color: #2c87c8 !important;
+        background-color: #4d6add !important;
     }
 
     .van-calendar__confirm {
-        border-color: #2c87c8 !important;
-        background-color: #2c87c8 !important;
+        border-color: #4d6add !important;
+        background-color: #4d6add !important;
     }
 
     .van-button--primary {
-        border-color: #2c87c8;
-        background-color: #2c87c8;
+        border-color: #4d6add;
+        background-color: #4d6add;
     }
 
     .van-field__label {

+ 13 - 13
src/styles/labelMan/index.less

@@ -11,11 +11,11 @@
     }
 
     .van-tabs__line {
-        background-color: #2c87c8 !important;
+        background-color: #4d6add !important;
     }
 
     .van-tab--active .van-tab__text--ellipsis {
-        color: #2c87c8;
+        color: #4d6add;
     }
 
     .contentCon {
@@ -26,35 +26,35 @@
         .content {
             .rightCon {
                 .editBtn {
-                    border: 1px solid #2c87c8;
+                    border: 1px solid #4d6add;
                     border-radius: 2px;
                     padding: 6px 16px;
-                    color: #2c87c8;
+                    color: #4d6add;
                 }
             }
         }
     }
 
     .van-checkbox__icon--checked .van-icon {
-        background-color: #2c87c8;
-        border-color: #2c87c8;
+        background-color: #4d6add;
+        border-color: #4d6add;
     }
 }
 
 .addIdx {
     .van-radio__icon--checked .van-icon {
-      background-color: #2c87c8;
-      border-color: #2c87c8;
+        background-color: #4d6add;
+        border-color: #4d6add;
     }
 
     .van-checkbox__icon--checked .van-icon {
-        background-color: #2c87c8;
-        border-color: #2c87c8;
+        background-color: #4d6add;
+        border-color: #4d6add;
     }
 
     .van-button--primary {
-      background-color: #2c87c8;
-      border-color: #2c87c8;
+        background-color: #4d6add;
+        border-color: #4d6add;
     }
 
-  }
+}

+ 174 - 168
src/styles/login/index.less

@@ -1,177 +1,183 @@
 .login {
-  display: flex;
-  flex-wrap: wrap;
-  flex-direction: row;
-  align-content: flex-start;
-
-  .loginLogoBox {
-    width: 100%;
-    height: 180px;
-    text-align: center;
-    position: relative;
-
-    .loginLogo {
-      width: 200px;
-      height: 140px;
-      position: absolute;
-      top: 40px;
-      left: 50%;
-      transform: translateX(-50%);
-      background: url("../../assets/login/logo.png") center no-repeat;
-      background-size: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row;
+    align-content: flex-start;
+
+    .loginLogoBox {
+        width: 100%;
+        height: 180px;
+        text-align: center;
+        position: relative;
+
+        .loginLogo {
+            width: 216px;
+            height: 87px;
+            position: absolute;
+            top: 40px;
+            left: 50%;
+            transform: translateX(-50%);
+            background: url("../../assets/login/logo.png");
+            background-size: 100%;
+        }
+
+        .languageCon {
+            right: 10px;
+            top: 10px;
+            border: 1px solid #4d6add;
+            padding: 5px 10px;
+            border-radius: 10px;
+            color: #4d6add;
+        }
     }
 
-    .languageCon {
-      right: 10px;
-      top: 10px;
-      border: 1px solid #2c87c8;
-      padding: 5px 10px;
-      border-radius: 10px;
-      color: #2c87c8;
-    }
-  }
-
-  .loginTitleBox {
-    width: 100%;
-
-    .loginTitle {
-      height: 28px;
-      overflow-wrap: break-word;
-      color: #404d74;
-      font-size: 20px;
-      font-family: PingFangSC-Medium;
-      text-align: center;
-      white-space: nowrap;
-      line-height: 28px;
-      display: block;
-      margin: 8px auto 0 auto;
-      font-weight: 600;
-    }
-  }
-
-  .loginFormBox {
-    width: 100%;
-    margin-top: 20px;
-
-    .van-field__body {
-      height: 100%;
-    }
-
-    .van-form .van-cell {
-      width: 281px;
-      height: 38px;
-      background-color: rgba(255, 255, 255, 1);
-      border-radius: 2px;
-      border: 0.5px solid rgba(185, 186, 208, 1);
-      padding: 0;
-      color: rgba(168, 168, 197, 1);
-      font-size: 13px;
-      margin: 0 auto;
-      margin-top: 20px;
-      overflow: visible;
-
-      .van-field__control {
-        height: 38px;
-        line-height: 38px;
-        padding: 6px;
-      }
-
-      .van-field__control::-webkit-input-placeholder {
-        color: rgba(168, 168, 197, 1);
-      }
+    .loginTitleBox {
+        width: 100%;
+
+        .loginTitle {
+            height: 28px;
+            overflow-wrap: break-word;
+            color: #404d74;
+            font-size: 20px;
+            font-family: PingFangSC-Medium;
+            text-align: center;
+            white-space: nowrap;
+            line-height: 28px;
+            display: block;
+            margin: 8px auto 0 auto;
+            font-weight: 600;
+        }
     }
 
-    .checkedPasswordBox {
-
-      width: 281px;
-      margin: 25px auto 0 auto;
-      font-size: 13px;
-      color: #2c87c8;
-      display: flex;
-      justify-content: space-between;
-      height: 13px;
-      line-height: 13px;
-
-      .van-checkbox {
-        overflow: visible;
-      }
-
-      .van-checkbox__icon {
-        font-size: 13px;
-
-      }
-
-      .van-checkbox__label {
-        line-height: 13px;
-      }
-
-      .van-checkbox__icon--checked .van-icon-success {
-        border-color: #2c87c8;
-        background: #2c87c8;
-      }
-
-      .checkedPassWord .van-icon-success::before {
-        content: "";
-        background: #fff;
-        width: 40%;
-        height: 40%;
-        position: absolute;
-        top: 30%;
-        left: 30%;
-        border-radius: 100%;
-      }
-
-      .van-checkbox__icon--checked + .van-checkbox__label {
-        color: #2c87c8;
-      }
-
-      .forgetPassWord {
-        cursor: pointer;
-      }
-    }
+    .loginFormBox {
+        width: 100%;
+        margin-top: 38px;
+
+        .van-field__body {
+            height: 100%;
+        }
+
+        .van-form .van-cell {
+            width: 281px;
+            height: 38px;
+            background-color: rgba(255, 255, 255, 1);
+            border-radius: 2px;
+            border: 0.5px solid rgba(185, 186, 208, 1);
+            padding: 0;
+            color: rgba(168, 168, 197, 1);
+            font-size: 13px;
+            margin: 0 auto;
+            margin-top: 20px;
+            overflow: visible;
+
+            .van-field__control {
+                height: 38px;
+                line-height: 38px;
+                padding: 6px;
+
+                &:-internal-autofill-previewed,
+                &:-internal-autofill-selected {
+                    -webkit-text-fill-color: #323233 !important;
+                    transition: background-color 5000s ease-in-out 0s !important;
+                }
+            }
+
+            .van-field__control::-webkit-input-placeholder {
+                color: rgba(168, 168, 197, 1);
+            }
+        }
+
+        .checkedPasswordBox {
+            width: 281px;
+            margin: 25px auto 0 auto;
+            font-size: 13px;
+            color: #4d6add;
+            display: flex;
+            justify-content: space-between;
+            height: 13px;
+            line-height: 13px;
+
+            .van-checkbox {
+                overflow: visible;
+            }
+
+            .van-checkbox__icon {
+                font-size: 13px;
+            }
+
+            .van-checkbox__label {
+                line-height: 13px;
+            }
+
+            .van-checkbox__icon--checked .van-icon-success {
+                border-color: #4d6add;
+                background: #4d6add;
+            }
+
+            .checkedPassWord .van-icon-success::before {
+                content: "";
+                background: #fff;
+                width: 40%;
+                height: 40%;
+                position: absolute;
+                top: 30%;
+                left: 30%;
+                border-radius: 100%;
+            }
+
+            .van-checkbox__icon--checked+.van-checkbox__label {
+                color: #4d6add;
+            }
+
+            .forgetPassWord {
+                cursor: pointer;
+            }
+        }
+
+        .loginWithWechatClass {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+
+        .wechat-btn {
+            width: 60px;
+            height: 60px;
+            margin: 0;
+            padding: 0;
+            border: none;
+            border-radius: 50%;
+            /* 将按钮样式修改为圆形 */
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+
+        .wechat-icon {
+            width: 40px;
+            height: 40px;
+        }
+
+        .buttonBox {
+            width: 281px;
+            margin: 20px auto 0 auto;
+            display: flex;
+            justify-content: space-between;
+
+            .van-button {
+                width: 120px;
+                height: 34px;
+                border: 1px solid rgba(77, 106, 221, 1);
+                background-color: rgba(77, 106, 221, 1);
+            }
+
+            .register {
+                background-color: transparent;
+                color: rgba(77, 106, 221, 1);
+            }
+
+        }
 
-    .loginWithWechatClass {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-
-      .wechat-btn {
-        width: 60px;
-        height: 60px;
-        margin: 0;
-        padding: 0;
-        border: none;
-        border-radius: 50%; /* 将按钮样式修改为圆形 */
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
-
-      .wechat-icon {
-        width: 40px;
-        height: 40px;
-      }
     }
 
-    .buttonBox {
-      width: 281px;
-      margin: 20px auto 0 auto;
-      display: flex;
-      justify-content: space-between;
-
-      .van-button {
-        width: 120px;
-        height: 34px;
-        border: 1px solid #2c87c8;
-        background-color: #2c87c8;
-      }
-
-      .register {
-        background-color: transparent;
-        color: #2c87c8;
-      }
-    }
-
-  }
-
 }

+ 227 - 226
src/styles/merchantManage/index.less

@@ -1,245 +1,246 @@
 .merchantPage {
-  width: 100%;
-
-  .merchantBox {
     width: 100%;
-    height: calc(100% - 44px);
-    overflow: auto;
-    overflow-x: hidden;
-
-    .searchRow {
-      width: 90%;
-      height: 48px;
-      margin: 0 auto;
-      background: rgba(255, 255, 255, 1) url("../../assets/home/line.png") bottom center no-repeat;
-      background-size: 100%;
-      align-items: center;
-
-      .bd3 {
-        width: 87px;
-        height: 16px;
-
-        .info2 {
-          height: 14px;
-          overflow-wrap: break-word;
-          color: rgba(64, 77, 116, 1);
-          font-size: 15px;
-          font-family: PingFangSC-Semibold;
-          text-align: left;
-          white-space: nowrap;
-          line-height: 15px;
-          margin-top: 3px;
-          display: block;
-        }
 
-        .info3 {
-          overflow-wrap: break-word;
-          color: #c84b2c;
-          font-size: 20px;
-          font-family: PingFangSC-Semibold;
-          text-align: left;
-          white-space: nowrap;
-          line-height: 20px;
-          display: block;
-          margin: 0 .3em;
-        }
+    .merchantBox {
+        width: 100%;
+        height: calc(100% - 44px);
+        overflow: auto;
+        overflow-x: hidden;
 
-        .info4 {
-          height: 14px;
-          overflow-wrap: break-word;
-          color: rgba(64, 77, 116, 1);
-          font-size: 15px;
-          font-family: PingFangSC-Semibold;
-          text-align: left;
-          white-space: nowrap;
-          line-height: 15px;
-          display: block;
-          margin-top: 3px;
-        }
-      }
+        .searchRow {
+            width: 90%;
+            height: 48px;
+            margin: 0 auto;
+            background: rgba(255, 255, 255, 1) url("../../assets/home/line.png") bottom center no-repeat;
+            background-size: 100%;
+            align-items: center;
 
-      .main5 {
-        width: 39px;
-        height: 16px;
+            .bd3 {
+                width: 87px;
+                height: 16px;
 
-        .label2 {
-          width: 14px;
-          height: 14px;
-          margin-top: 1px;
-        }
+                .info2 {
+                    height: 14px;
+                    overflow-wrap: break-word;
+                    color: rgba(64, 77, 116, 1);
+                    font-size: 15px;
+                    font-family: PingFangSC-Semibold;
+                    text-align: left;
+                    white-space: nowrap;
+                    line-height: 15px;
+                    margin-top: 3px;
+                    display: block;
+                }
 
-        .TextGroup2 {
-          height: 16px;
-          width: 22px;
-
-          .txt3 {
-            width: 22px;
-            height: 16px;
-            overflow-wrap: break-word;
-            color: rgba(64, 77, 116, 1);
-            font-size: 11px;
-            text-align: center;
-            white-space: nowrap;
-            line-height: 16px;
-            display: block;
-          }
-        }
-      }
-    }
+                .info3 {
+                    overflow-wrap: break-word;
+                    color: #c84b2c;
+                    font-size: 20px;
+                    font-family: PingFangSC-Semibold;
+                    text-align: left;
+                    white-space: nowrap;
+                    line-height: 20px;
+                    display: block;
+                    margin: 0 .3em;
+                }
 
-    .main4 {
-      width: 100%;
-      justify-content: space-between;
-      padding: 15px;
-
-      .bd1 {
-        box-shadow: 1px 1px 4px 2px rgba(70, 95, 198, 0.14);
-        background-color: rgba(255, 255, 255, 1);
-        border-radius: 4px;
-        height: 206px;
-        margin: 0 auto;
-        margin-bottom: 20px;
-        width: 100%;
+                .info4 {
+                    height: 14px;
+                    overflow-wrap: break-word;
+                    color: rgba(64, 77, 116, 1);
+                    font-size: 15px;
+                    font-family: PingFangSC-Semibold;
+                    text-align: left;
+                    white-space: nowrap;
+                    line-height: 15px;
+                    display: block;
+                    margin-top: 3px;
+                }
+            }
 
-        .outer2 {
-          width: 100%;
-          padding: 20px;
+            .main5 {
+                width: 39px;
+                height: 16px;
 
-          .box2 {
-            width: 100%;
-            height: 14px;
-
-            .word3 {
-              width: 202px;
-              height: 13px;
-              overflow-wrap: break-word;
-              color: rgba(64, 77, 116, 1);
-              font-size: 14px;
-              font-family: PingFangSC-Semibold;
-              text-align: left;
-              white-space: nowrap;
-              line-height: 14px;
-              display: block;
-            }
+                .label2 {
+                    width: 14px;
+                    height: 14px;
+                    margin-top: 1px;
+                }
 
-            .group6 {
-              width: 6px;
-              height: 12px;
-              background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng51122feddbc4a9b3e0b055ed6181d290e60825befaa5c777794f1412ff817e57) top center no-repeat;
-              background-size: 100%;
-              margin-top: 2px;
+                .TextGroup2 {
+                    height: 16px;
+                    width: 22px;
+
+                    .txt3 {
+                        width: 22px;
+                        height: 16px;
+                        overflow-wrap: break-word;
+                        color: rgba(64, 77, 116, 1);
+                        font-size: 11px;
+                        text-align: center;
+                        white-space: nowrap;
+                        line-height: 16px;
+                        display: block;
+                    }
+                }
             }
-          }
-
-          .word4 {
-            width: 122px;
-            height: 13px;
-            overflow-wrap: break-word;
-            color: rgba(64, 77, 116, 1);
-            font-size: 13px;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 13px;
-            margin-top: 9px;
-            display: block;
-          }
-
-          .word5 {
-            width: 162px;
-            height: 13px;
-            overflow-wrap: break-word;
-            color: rgba(64, 77, 116, 1);
-            font-size: 13px;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 13px;
-            margin-top: 10px;
-            display: block;
-          }
-
-          .word6 {
-            width: 177px;
-            height: 13px;
-            overflow-wrap: break-word;
-            color: rgba(64, 77, 116, 1);
-            font-size: 13px;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 13px;
-            margin-top: 10px;
-            display: block;
-          }
-
-          .info6 {
-            width: 130px;
-            height: 13px;
-            overflow-wrap: break-word;
-            color: rgba(64, 77, 116, 1);
-            font-size: 13px;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 13px;
-            margin-top: 10px;
-            display: block;
-          }
-
-          .txt2 {
-            width: 110px;
-            height: 13px;
-            overflow-wrap: break-word;
-            color: rgba(64, 77, 116, 1);
-            font-size: 13px;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 13px;
-            margin-top: 10px;
-            display: block;
-          }
-
-          .box3 {
-            background-color: rgba(246, 247, 252, 1);
-            border-radius: 1px;
-            height: 26px;
-            margin-top: 10px;
+        }
+
+        .main4 {
             width: 100%;
+            justify-content: space-between;
+            padding: 15px;
+
+            .bd1 {
+                box-shadow: 1px 1px 4px 2px rgba(70, 95, 198, 0.14);
+                background-color: rgba(255, 255, 255, 1);
+                border-radius: 4px;
+                height: 206px;
+                margin: 0 auto;
+                margin-bottom: 20px;
+                width: 100%;
+
+                .outer2 {
+                    width: 100%;
+                    padding: 20px;
+
+                    .box2 {
+                        width: 100%;
+                        height: 14px;
+
+                        .word3 {
+                            width: 202px;
+                            height: 13px;
+                            overflow-wrap: break-word;
+                            color: rgba(64, 77, 116, 1);
+                            font-size: 14px;
+                            font-family: PingFangSC-Semibold;
+                            text-align: left;
+                            white-space: nowrap;
+                            line-height: 14px;
+                            display: block;
+                        }
+
+                        .group6 {
+                            width: 6px;
+                            height: 12px;
+                            background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng51122feddbc4a9b3e0b055ed6181d290e60825befaa5c777794f1412ff817e57) top center no-repeat;
+                            background-size: 100%;
+                            margin-top: 2px;
+                        }
+                    }
 
-            .txt3 {
-              width: 184px;
-              height: 13px;
-              overflow-wrap: break-word;
-              color: rgba(135, 135, 166, 1);
-              font-size: 12px;
-              text-align: left;
-              white-space: nowrap;
-              line-height: 13px;
-              display: block;
-              margin: 8px 0 0 10px;
+                    .word4 {
+                        width: 122px;
+                        height: 13px;
+                        overflow-wrap: break-word;
+                        color: rgba(64, 77, 116, 1);
+                        font-size: 13px;
+                        text-align: left;
+                        white-space: nowrap;
+                        line-height: 13px;
+                        margin-top: 9px;
+                        display: block;
+                    }
+
+                    .word5 {
+                        width: 162px;
+                        height: 13px;
+                        overflow-wrap: break-word;
+                        color: rgba(64, 77, 116, 1);
+                        font-size: 13px;
+                        text-align: left;
+                        white-space: nowrap;
+                        line-height: 13px;
+                        margin-top: 10px;
+                        display: block;
+                    }
+
+                    .word6 {
+                        width: 177px;
+                        height: 13px;
+                        overflow-wrap: break-word;
+                        color: rgba(64, 77, 116, 1);
+                        font-size: 13px;
+                        text-align: left;
+                        white-space: nowrap;
+                        line-height: 13px;
+                        margin-top: 10px;
+                        display: block;
+                    }
+
+                    .info6 {
+                        width: 130px;
+                        height: 13px;
+                        overflow-wrap: break-word;
+                        color: rgba(64, 77, 116, 1);
+                        font-size: 13px;
+                        text-align: left;
+                        white-space: nowrap;
+                        line-height: 13px;
+                        margin-top: 10px;
+                        display: block;
+                    }
+
+                    .txt2 {
+                        width: 110px;
+                        height: 13px;
+                        overflow-wrap: break-word;
+                        color: rgba(64, 77, 116, 1);
+                        font-size: 13px;
+                        text-align: left;
+                        white-space: nowrap;
+                        line-height: 13px;
+                        margin-top: 10px;
+                        display: block;
+                    }
+
+                    .box3 {
+                        background-color: rgba(246, 247, 252, 1);
+                        border-radius: 1px;
+                        height: 26px;
+                        margin-top: 10px;
+                        width: 100%;
+
+                        .txt3 {
+                            width: 184px;
+                            height: 13px;
+                            overflow-wrap: break-word;
+                            color: rgba(135, 135, 166, 1);
+                            font-size: 12px;
+                            text-align: left;
+                            white-space: nowrap;
+                            line-height: 13px;
+                            display: block;
+                            margin: 8px 0 0 10px;
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
+
 .codeSearch {
-  width: 100%;
+    width: 100%;
 
-  .codeSearchPopup {
-    width: 90%;
-  }
+    .codeSearchPopup {
+        width: 90%;
+    }
 
-  .content {
-    padding-top: 1em;
-  }
+    .content {
+        padding-top: 1em;
+    }
 
-  .field .van-field__label {
-    width: auto;
-  }
+    .field .van-field__label {
+        width: auto;
+    }
 
-  .van-button--primary {
-    border-color: #2c87c8;
-    background-color: #2c87c8;
-  }
+    .van-button--primary {
+        border-color: #4d6add;
+        background-color: #4d6add;
+    }
 }
 
 .merchantSetPage {
@@ -299,7 +300,7 @@
 
                         .acttive {
                             position: relative;
-                            color: #2c87c8;
+                            color: #4d6add;
 
                             &::after {
                                 content: '';
@@ -309,7 +310,7 @@
                                 bottom: 0;
                                 width: 40px;
                                 height: 2px;
-                                background-color: #2c87c8;
+                                background-color: #4d6add;
                                 border-radius: 1px;
                                 bottom: -0.5em;
                             }
@@ -1099,8 +1100,8 @@
                     }
 
                     .van-radio__icon--checked .van-icon-success {
-                        border-color: #2c87c8;
-                        background: #2c87c8;
+                        border-color: #4d6add;
+                        background: #4d6add;
                     }
 
                     .van-icon-success::before {
@@ -1115,15 +1116,15 @@
                     }
 
                     .van-radio__icon--checked+.van-radio__label {
-                        color: #2c87c8;
+                        color: #4d6add;
                     }
                 }
             }
         }
 
         .van-button--primary {
-            border-color: #2c87c8;
-            background-color: #2c87c8;
+            border-color: #4d6add;
+            background-color: #4d6add;
         }
 
     }

+ 2 - 2
src/styles/modifyPrice/index.less

@@ -5,7 +5,7 @@
 
     .headerCon {
         .line {
-            background-color: #5a9cc8;
+            background-color: #8096ec;
             border-radius: 2px;
             width: 4px;
             height: 16px;
@@ -54,7 +54,7 @@
             }
 
             .editBtn {
-                color: #2c87c8;
+                color: #4d6add;
             }
         }
     }

+ 95 - 95
src/styles/modulation/index.less

@@ -1,119 +1,119 @@
 .modulationPage {
-    background-color: rgba(255, 255, 255, 1);
-    position: relative;
-    width: 100%;
-    height: calc(100vh - 44px);
-    overflow: hidden;
-
-    .van-slider {
-      width: 92%;
-      height: 4px;
-      margin: 0 auto;
-      margin-top: 35px;
-      background-color: #dfdfe5;
+  background-color: rgba(255, 255, 255, 1);
+  position: relative;
+  width: 100%;
+  height: calc(100vh - 44px);
+  overflow: hidden;
 
-      .van-slider__bar {
-        background-color: #2c87c8;
-      }
+  .van-slider {
+    width: 92%;
+    height: 4px;
+    margin: 0 auto;
+    margin-top: 35px;
+    background-color: #dfdfe5;
 
-      .van-slider__button {
-        background-color: #2c87c8;
-        width: 16px;
-        height: 16px;
-      }
+    .van-slider__bar {
+      background-color: #4d6add;
     }
 
-    .volumeChangeButton {
-      background-color: #2c87c8;
-      width: 220px;
-      height: 34px;
-      margin: 49px auto;
-
-      .van-button__text {
-        font-size: 15px;
-      }
+    .van-slider__button {
+      background-color: #4d6add;
+      width: 16px;
+      height: 16px;
     }
+  }
 
+  .volumeChangeButton {
+    background-color: #4d6add;
+    width: 220px;
+    height: 34px;
+    margin: 49px auto;
 
-    .wrap1 {
-      width: 100%;
-      height: 274px;
-
-      .box2 {
-        background-color: rgba(255, 255, 255, 1);
-        z-index: 23;
-        height: 54px;
-        margin-top: 1px;
-        width: 100%;
-        position: relative;
-
-        .section3 {
-          width: 162px;
-          height: 20px;
-          margin: 17px 0 0 15px;
+    .van-button__text {
+      font-size: 15px;
+    }
+  }
 
-          .box3 {
-            background-color: #5a9cc8;
-            border-radius: 2px;
-            width: 4px;
-            height: 12px;
-            margin-top: 4px;
-          }
 
-          .info1 {
-            width: 150px;
-            height: 20px;
-            overflow-wrap: break-word;
-            color: rgba(64, 77, 116, 1);
-            font-size: 14px;
-            font-family: PingFangSC-Medium;
-            text-align: left;
-            white-space: nowrap;
-            line-height: 20px;
-            display: block;
-          }
-        }
+  .wrap1 {
+    width: 100%;
+    height: 274px;
 
-        .img1 {
-          z-index: 31;
-          position: absolute;
-          left: 0;
-          top: 53px;
-          width: 100%;
-          height: 2px;
-        }
-      }
+    .box2 {
+      background-color: rgba(255, 255, 255, 1);
+      z-index: 23;
+      height: 54px;
+      margin-top: 1px;
+      width: 100%;
+      position: relative;
 
-      .box4 {
-        width: 45%;
-        height: 14px;
-        margin: 19px 0 0 15px;
+      .section3 {
+        width: 162px;
+        height: 20px;
+        margin: 17px 0 0 15px;
 
-        .word3 {
-          width: auto;
-          height: 13px;
-          overflow-wrap: break-word;
-          color: rgba(64, 77, 116, 1);
-          font-size: 13px;
-          text-align: left;
-          white-space: nowrap;
-          line-height: 13px;
-          margin-top: 1px;
-          display: block;
+        .box3 {
+          background-color: #8096ec;
+          border-radius: 2px;
+          width: 4px;
+          height: 12px;
+          margin-top: 4px;
         }
 
-        .word4 {
-          width: auto;
-          height: 13px;
+        .info1 {
+          width: 150px;
+          height: 20px;
           overflow-wrap: break-word;
           color: rgba(64, 77, 116, 1);
-          font-size: 15px;
+          font-size: 14px;
           font-family: PingFangSC-Medium;
           text-align: left;
           white-space: nowrap;
-          line-height: 15px;
+          line-height: 20px;
           display: block;
         }
       }
+
+      .img1 {
+        z-index: 31;
+        position: absolute;
+        left: 0;
+        top: 53px;
+        width: 100%;
+        height: 2px;
+      }
+    }
+
+    .box4 {
+      width: 45%;
+      height: 14px;
+      margin: 19px 0 0 15px;
+
+      .word3 {
+        width: auto;
+        height: 13px;
+        overflow-wrap: break-word;
+        color: rgba(64, 77, 116, 1);
+        font-size: 13px;
+        text-align: left;
+        white-space: nowrap;
+        line-height: 13px;
+        margin-top: 1px;
+        display: block;
+      }
+
+      .word4 {
+        width: auto;
+        height: 13px;
+        overflow-wrap: break-word;
+        color: rgba(64, 77, 116, 1);
+        font-size: 15px;
+        font-family: PingFangSC-Medium;
+        text-align: left;
+        white-space: nowrap;
+        line-height: 15px;
+        display: block;
+      }
     }
-  }
+  }
+}

+ 2 - 2
src/styles/orderCenter/index.less

@@ -1311,7 +1311,7 @@
   }
 
   .van-button--primary {
-    border-color: #2c87c8;
-    background-color: #2c87c8;
+    border-color: #4d6add;
+    background-color: #4d6add;
   }
 }

+ 3 - 3
src/styles/orderExport/index.less

@@ -135,7 +135,7 @@
                         }
 
                         .text5 {
-                            color: #2c87c8;
+                            color: #4d6add;
                         }
 
                         .img2 {
@@ -268,10 +268,10 @@
     }
 
     .van-tabs__line {
-        background-color: #2c87c8 !important;
+        background-color: #4d6add !important;
     }
 
     .van-tab--active .van-tab__text--ellipsis {
-        color: #2c87c8;
+        color: #4d6add;
     }
 }

+ 3 - 3
src/styles/paramsSet/index.less

@@ -22,7 +22,7 @@
                 margin: 0 0 0 15px;
 
                 .block1 {
-                    background-color: #5a9cc8;
+                    background-color: #8096ec;
                     border-radius: 2px;
                     width: 4px;
                     height: 12px;
@@ -123,8 +123,8 @@
 
             .updataButton {
                 background-color: transparent;
-                color: #2c87c8;
-                border-color: #2c87c8;
+                color: #4d6add;
+                border-color: #4d6add;
                 padding: 0 0.5em;
                 border-radius: 50px;
             }

+ 7 - 7
src/styles/recharge/index.less

@@ -25,8 +25,8 @@
     }
 
     .volumeChangeButton {
-        border-color: #2c87c8;
-        background-color: #2c87c8;
+        border-color: #4d6add;
+        background-color: #4d6add;
         width: 220px;
         height: 34px;
         margin: 49px auto;
@@ -37,16 +37,16 @@
     }
 
     .van-radio__icon--checked .van-icon {
-        background-color: #2c87c8;
-        border-color: #2c87c8;
+        background-color: #4d6add;
+        border-color: #4d6add;
     }
 
     .van-cascader__option--selected {
-        color: #2c87c8;
+        color: #4d6add;
     }
 
     .van-tabs__line {
-        background-color: #2c87c8 !important;
+        background-color: #4d6add !important;
     }
 
     .box1 {
@@ -62,7 +62,7 @@
         justify-content: flex-start;
 
         .group2 {
-            background-color: #5a9cc8;
+            background-color: #8096ec;
             border-radius: 2px;
             width: 4px;
             height: 16px;

+ 103 - 103
src/styles/register/index.less

@@ -1,105 +1,105 @@
 .registerPage {
-  .registerFormBox {
-    width: 100%;
-    margin-top: 40px;
-    text-align: center;
-
-    .van-form {
-      .van-cell {
-        width: 90%;
-        height: 38px;
-        padding: 0;
-        margin: 0 auto;
-        margin-top: 10px;
-        overflow: visible;
-
-        &::after {
-          display: none;
-        }
-
-        .van-field__button button {
-          background-color: #5a9cc8;
-          color: #fff;
-        }
-
-        .van-button__text {
-          padding: 4px;
-        }
-
-        .van-field__control {
-          height: 38px;
-          line-height: 38px;
-          padding: 6px;
-          border-radius: 2px;
-          border: 0.5px solid rgba(185, 186, 208, 1);
-        }
-
-        .van-field__label {
-          display: flex;
-          height: 38px;
-          align-items: center;
-          width: 80px;
-        }
-
-        .radioBox {
-          display: flex;
-
-          .van-radio-group--horizontal {
-            width: 100%;
-            justify-content: space-around;
-          }
-
-          .van-radio {
-            overflow: visible;
-          }
-
-          .van-radio__icon--checked .van-icon-success {
-            border-color: #2c87c8;
-            background: #2c87c8;
-          }
-
-          .van-icon-success::before {
-            content: '';
-            background: #fff;
-            width: 40%;
-            height: 40%;
-            position: absolute;
-            top: 30%;
-            left: 29%;
-            border-radius: 100%;
-          }
-
-          .van-radio__icon--checked+.van-radio__label {
-            color: #2c87c8;
-          }
-        }
-      }
-    }
-  }
-
-  .van-tabs__nav {
-
-    .van-tab--card {
-      color: #2c87c8;
-      border-right: #2c87c8
-    }
-
-    border-color: #2c87c8;
-
-    .van-tab--active {
-      color: #fff;
-      background-color: #2c87c8;
-    }
-
-  }
-
-  .register {
-    background-color: #2c87c8;
-    border-radius: 17px;
-    height: 34px;
-    width: 220px;
-    margin-top: 60px;
-    font-size: 15px;
-    font-family: PingFangSC-Medium;
-  }
+	.registerFormBox {
+		width: 100%;
+		margin-top: 40px;
+		text-align: center;
+
+		.van-form {
+			.van-cell {
+				width: 90%;
+				height: 38px;
+				padding: 0;
+				margin: 0 auto;
+				margin-top: 10px;
+				overflow: visible;
+
+				&::after {
+					display: none;
+				}
+
+				.van-field__button button {
+					background-color: #8096ec;
+					color: #fff;
+				}
+
+				.van-button__text {
+					padding: 4px;
+				}
+
+				.van-field__control {
+					height: 38px;
+					line-height: 38px;
+					padding: 6px;
+					border-radius: 2px;
+					border: 0.5px solid rgba(185, 186, 208, 1);
+				}
+
+				.van-field__label {
+					display: flex;
+					height: 38px;
+					align-items: center;
+					width: 80px;
+				}
+
+				.radioBox {
+					display: flex;
+
+					.van-radio-group--horizontal {
+						width: 100%;
+						justify-content: space-around;
+					}
+
+					.van-radio {
+						overflow: visible;
+					}
+
+					.van-radio__icon--checked .van-icon-success {
+						border-color: #4d6add;
+						background: #4d6add;
+					}
+
+					.van-icon-success::before {
+						content: '';
+						background: #fff;
+						width: 40%;
+						height: 40%;
+						position: absolute;
+						top: 30%;
+						left: 29%;
+						border-radius: 100%;
+					}
+
+					.van-radio__icon--checked+.van-radio__label {
+						color: #4d6add;
+					}
+				}
+			}
+		}
+	}
+
+	.van-tabs__nav {
+
+		.van-tab--card {
+			color: #4d6add;
+			border-right: #4d6add
+		}
+
+		border-color: #4d6add;
+
+		.van-tab--active {
+			color: #fff;
+			background-color: #4d6add;
+		}
+
+	}
+
+	.register {
+		background-color: #4d6add;
+		border-radius: 17px;
+		height: 34px;
+		width: 220px;
+		margin-top: 60px;
+		font-size: 15px;
+		font-family: PingFangSC-Medium;
+	}
 }

+ 27 - 3
src/styles/robotRanking/index.less

@@ -88,11 +88,11 @@ button:active {
         width: 100%;
 
         .van-tabs__line {
-            background-color: #2c87c8 !important;
+            background-color: #4d6add !important;
         }
 
         .van-tab--active .van-tab__text--ellipsis {
-            color: #2c87c8;
+            color: #4d6add;
         }
 
         .box2 {
@@ -344,7 +344,6 @@ button:active {
                 }
             }
         }
-
     }
 
     .van-field__label {
@@ -358,4 +357,29 @@ button:active {
     .van-field__body {
         width: 100%;
     }
+
+    .van-calendar__day--start-end {
+        background-color: #4d6add;
+      }
+
+      .van-calendar__selected-day {
+        background-color: #4d6add;
+      }
+
+      .van-calendar__day--start {
+        background-color: #4d6add;
+      }
+
+      .van-calendar__day--middle {
+        color: #4d6add;
+      }
+
+      .van-calendar__day--end {
+        background-color: #4d6add;
+      }
+
+      .van-calendar__confirm {
+        border-color: #4d6add;
+        background-color: #4d6add;
+      }
 }

+ 15 - 16
src/styles/role/index.less

@@ -60,7 +60,6 @@
           padding: 5px;
         }
 
-
         .iconImg {
           width: 25px;
         }
@@ -104,13 +103,6 @@
               margin-right: 0.3em;
             }
 
-            .editImg {
-              width: 1.2em;
-              height: 1.2em;
-              background: url("../../assets/edit.png") top center no-repeat;
-              background-size: 100%;
-            }
-
             .operSet,
             .operDelter {
               display: flex;
@@ -121,8 +113,15 @@
               line-height: 1.3;
             }
 
+            .editImg {
+              width: 1.2em;
+              height: 1.2em;
+              background: url("../../assets/edit.png") top center no-repeat;
+              background-size: 100%;
+            }
+
             .operSet {
-              color: #2c87c8;
+              color: #4d6add;
               padding-right: 0.5em;
               margin-right: 0.5em;
               border-right: 1px solid;
@@ -169,7 +168,7 @@
     .mod7 {
       border-radius: 17px;
       height: 34px;
-      border: 1px solid #2c87c8;
+      border: 1px solid rgba(77, 106, 221, 1);
       width: 120px;
       justify-content: center;
       align-items: center;
@@ -178,7 +177,7 @@
         width: 60px;
         height: 13px;
         overflow-wrap: break-word;
-        color: #2c87c8;
+        color: rgba(77, 106, 221, 1);
         font-size: 15px;
         font-family: PingFangSC-Medium;
         text-align: center;
@@ -189,7 +188,7 @@
     }
 
     .mod8 {
-      background-color: #2c87c8;
+      background-color: rgba(77, 106, 221, 1);
       border-radius: 17px;
       height: 34px;
       width: 120px;
@@ -213,11 +212,11 @@
 }
 
 .van-checkbox__icon--checked .van-icon {
-    border-color: #2c87c8;
-    background-color: #2c87c8;
+  border-color: #4d6add;
+  background-color: #4d6add;
 }
 
 .van-button--primary {
-    border-color: #2c87c8;
-    background-color: #2c87c8;
+  border-color: #4d6add;
+  background-color: #4d6add;
 }

+ 7 - 6
src/styles/showGoods/index.less

@@ -6,7 +6,7 @@
 
     .headerCon {
         .line {
-            background-color: #5a9cc8;
+            background-color: #8096ec;
             border-radius: 2px;
             width: 4px;
             height: 16px;
@@ -33,13 +33,14 @@
     }
 
 }
-        .Btn {
-            width: 70%;
-        }
+
+.Btn {
+    width: 70%;
+}
 
 
 
 .van-button--primary {
-    background-color: #2c87c8;
-    border-color: #2c87c8;
+    background-color: #4d6add;
+    border-color: #4d6add;
 }

+ 8 - 8
src/styles/taskMessage/index.less

@@ -34,8 +34,8 @@
           position: absolute;
           background: #fff url('../../assets/taskMessage/retailIcon.png') top center no-repeat;
           background-size: 100%;
-          width: 0.55rem;
-          height: 0.55rem;
+          width: 0.6rem;
+          height: 0.6rem;
           right: 0.15rem;
           top: 0.4rem;
         }
@@ -45,9 +45,9 @@
           position: absolute;
           background: #fff url('../../assets/taskMessage/withIcon.png') top center no-repeat;
           background-size: 100%;
-          width: 0.5rem;
-          height: 0.5rem;
-          right: 0.2rem;
+          width: 0.6rem;
+          height: 0.6rem;
+          right: 0.15rem;
           top: 0.4rem;
         }
       }
@@ -130,7 +130,7 @@
       }
 
       .label3 {
-        color: #2c87c8;
+        color: #4d6add;
         width: 100px;
       }
 
@@ -155,11 +155,11 @@
     }
 
     .van-tabs__line {
-      background-color: #2c87c8 !important;
+      background-color: #4d6add !important;
     }
 
     .van-tab--active .van-tab__text--ellipsis {
-      color: #2c87c8;
+      color: #4d6add;
     }
 
     .listBox {

+ 5 - 5
src/styles/uniPay/index.less

@@ -24,7 +24,7 @@
     }
 
     .volumeChangeButton {
-        background-color: #2c87c8;
+        background-color: #4d6add;
         width: 220px;
         height: 34px;
         margin: 49px 0 0 78px;
@@ -35,8 +35,8 @@
     }
 
     .van-radio__icon--checked .van-icon {
-        background-color: #2c87c8;
-        border-color: #2c87c8;
+        background-color: #4d6add;
+        border-color: #4d6add;
     }
 
     .box1 {
@@ -45,10 +45,10 @@
     }
 
     .van-cascader__option--selected {
-        color: #2c87c8;
+        color: #4d6add;
     }
 
     .van-tabs__line {
-        background-color: #2c87c8 !important;
+        background-color: #4d6add !important;
     }
 }

+ 23 - 12
src/styles/user/index.less

@@ -29,7 +29,7 @@
         justify-content: flex-start;
 
         .group2 {
-            background-color: #5a9cc8;
+            background-color: #8096ec;
             border-radius: 2px;
             width: 4px;
             height: 16px;
@@ -94,7 +94,7 @@
                 position: absolute;
                 right: 0;
                 font-size: 18px;
-                color: #2c87c8;
+                color: #4d6add;
             }
 
             .userInfoLeft {
@@ -105,7 +105,7 @@
                 padding: 0;
 
                 .van-field__button {
-                    background-color: #2c87c8;
+                    background-color: #4d6add;
                     color: #fff;
                     padding: 0 0.5em;
                     margin-left: 10px;
@@ -153,8 +153,19 @@
                         position: absolute;
                         background: #fff url("../../assets/user/joinPayMchIcon.png") top center no-repeat;
                         background-size: 100%;
-                        width: 0.6rem;
-                        height: 0.6rem;
+                        width: 0.55rem;
+                        height: 0.55rem;
+                        right: 0.2rem;
+                        top: 0.4rem;
+                    }
+                    
+                    &.airwallexIcon::after {
+                        content: "";
+                        position: absolute;
+                        background: #fff url("../../assets/user/airwallexIcon.png") top center no-repeat;
+                        background-size: 100%;
+                        width: 0.55rem;
+                        height: 0.55rem;
                         right: 0.2rem;
                         top: 0.4rem;
                     }
@@ -164,8 +175,8 @@
                         position: absolute;
                         background: #fff url("../../assets/user/shandeMchIcon.png") top center no-repeat;
                         background-size: 100%;
-                        width: 0.65rem;
-                        height: 0.65rem;
+                        width: 0.6rem;
+                        height: 0.6rem;
                         right: 0.2rem;
                         top: 0.4rem;
                     }
@@ -186,9 +197,9 @@
                         position: absolute;
                         background: #fff url("../../assets/user/changePasswordIcon.png") top center no-repeat;
                         background-size: 100%;
-                        width: 0.6rem;
-                        height: 0.6rem;
-                        right: 0.25rem;
+                        width: 0.55rem;
+                        height: 0.55rem;
+                        right: 0.2rem;
                         top: 0.4rem;
                     }
 
@@ -197,8 +208,8 @@
                         position: absolute;
                         background: #fff url("../../assets/user/self.png") top center no-repeat;
                         background-size: 100%;
-                        width: 0.6rem;
-                        height: 0.6rem;
+                        width: 0.53rem;
+                        height: 0.53rem;
                         right: 0.2rem;
                         top: 0.4rem;
                     }

+ 2 - 2
src/styles/viewLogs/index.less

@@ -6,7 +6,7 @@
 	overflow: hidden;
 
 	.volumeChangeButton {
-		background-color: #2c87c8;
+		background-color: #4d6add;
 		width: 220px;
 		height: 34px;
 		margin: 49px auto;
@@ -27,7 +27,7 @@
 		margin: 18px 0 0 15px;
 
 		.block3 {
-			background-color: #5a9cc8;
+			background-color: #8096ec;
 			border-radius: 2px;
 			width: 4px;
 			height: 12px;

+ 4 - 1
src/utils/config.js

@@ -4,13 +4,16 @@ if (process.env.NODE_ENV === 'development') {
     // 测试的
     // baseURL = 'http://szwltest.sunzee.com.cn:49002/'
     // baseURL = 'https://szwl.sunzee.com.cn/'
+    // baseURL = 'http://120.25.151.99:49002/'
+
     // 正式的
     baseURL = 'https://sz.sunzee.com.cn/'
     
-    // baseURL = 'http://120.25.151.99:49002/'
     // 编译环境
     // baseURL = 'http://127.0.0.1:8080/'
+    // baseURL = 'https://xavi.c1.sidoc.cn'
 } else {
+    // 判断当前页面的主机名是否包含 'szwltest.sunzee.com.cn'。如果包含,则条件成立(即为 true);否则,条件不成立
     if (window.location.host.indexOf('szwltest.sunzee.com.cn') !== -1) {
         baseURL = 'https://szwl.sunzee.com.cn/'
     } else {

+ 2 - 1
src/views/Hpp.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
+	<s-header :name="$t('airwallex.sunzee')" :noback="false"></s-header>
     <h2>申泽智能</h2>
-    <button @click="redirectHpp()">Redirect to HPP</button>
+    <button @click="redirectHpp()">去付款Redirect to HPP</button>
   </div>
 </template>
 

+ 2 - 2
src/views/accountOperation/index.vue

@@ -15,12 +15,12 @@
           <div class="taskTitle">{{ $t('accountOperation.distributionSettings') }}</div>
         </div>
       </div>
-      <!-- <div class="taskListRow flex-col" @click="pushPageList('/joinpayMch')">
+      <div class="taskListRow flex-col" @click="pushPageList('/joinpayMch')">
         <div class="taskIcon withIcon"></div>
         <div class="taskRight">
           <div class="taskTitle">{{ $t('accountOperation.withdrawalAccountNo') }}</div>
         </div>
-      </div> -->
+      </div>
       <!-- <div class="taskListRow flex-col" @click="pushPageList('/shandeMch')">
 	    <div class="taskIcon withIcon"></div>
 	    <div class="taskRight">

+ 145 - 146
src/views/alarmHistory/historySearch.vue

@@ -1,147 +1,146 @@
 <template>
-	<!-- 报警历史 - 搜索弹窗 -->
-	<div class="codeSearch flex-col">
-	  <van-popup v-model:show="sheetShow" round class="codeSearchPopup">
-		<div class="content">
-		  <van-form @submit="onSubmit">
-			<van-field v-model="clientId" name="clientId" :label="$t('alarmHistory.equipmentNoLabel')"
-			  :placeholder="$t('alarmHistory.equipmentNoPlaceholder')" />
-			<van-field v-model="name" name="name" :label="$t('alarmHistory.equipmentNameLabel')"
-			  :placeholder="$t('alarmHistory.equipmentNamePlaceholder')" />
-			<div class="van-cell van-field">
-			  <div class="van-cell__title van-field__label">
-				<label id="van-field-4-label" for="van-field-4-input">{{ $t('alarmHistory.alarmTime') }}</label>
-			  </div>
-			  <div class="van-cell__value van-field__value">
-				<div class="van-field__body">
-				  <input type="text" class="van-field__control" :placeholder="$t('alarmHistory.startTime')"
-					style="text-align: center; width: 50%;" v-model="createStartDate" @click="createStartDateClick()" />
-				  <span>{{ $t('alarmHistory.to') }}</span>
-				  <input type="text" class="van-field__control" :placeholder="$t('alarmHistory.endTime')"
-					style="text-align: center; width: 50%;" v-model="createEndDate" @click="createEndDateClick()" />
-				</div>
-			  </div>
-			</div>
-			<!-- 操作 -->
-			<van-row justify="space-around" style="padding: 1em;">
-			  <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em;"
-				native-type="submit">{{ $t('alarmHistory.clickQuery') }}</van-button>
-			</van-row>
-		  </van-form>
-		</div>
-	  </van-popup>
-	  <van-popup v-model:show="createStartDateShow" round position="bottom">
-		<van-datetime-picker v-model="createStartDate" type="datehour" :title="$t('alarmHistory.selectFullTime')"
-		  :min-date="minDate" :max-date="maxDate" @confirm="createStartDateConFirm($event)"
-		  @cancel="createStartDateCancel()" />
-		<!-- 			<van-datetime-picker v-model="createStartDate" type="datetime" :title="$t('alarmHistory.selectFullTime')"
-				@confirm="createStartDateConFirm($event)" @cancel="createStartDateCancel()" :min-date="minDate" /> -->
-	  </van-popup>
-	  <van-popup v-model:show="createEndDateShow" round position="bottom">
-		<van-datetime-picker v-model="createEndDate" type="datehour" :title="$t('alarmHistory.selectFullTime')"
-		  :min-date="minDate" :max-date="maxDate" @confirm="createEndDateConFirm($event)" @cancel="createEndDateCancel()" />
-		<!-- 			<van-datetime-picker v-model="createEndDate" type="datetime" :title="$t('alarmHistory.selectFullTime')"
-				@confirm="createEndDateConFirm($event)" @cancel="createEndDateCancel()" :min-date="minDate" /> -->
-	  </van-popup>
-	</div>
-  </template>
-  
-  <script>
-  import {
-	ref
-  } from 'vue';
-  import dateUtil from "@/utils/dateUtil";
-  import { styleUrl } from "../../common/js/utils";
-  
-  export default {
-	name: 'historySearch',
-	components: {},
-	setup(prop, context) {
-	  const sheetShow = ref(false);
-	  const minDate = new Date(2018, 0, 1);
-	  const maxDate = new Date();
-	  // 加载样式
-	  styleUrl('alarmHistory');
-	  const showSearch = () => {
-		sheetShow.value = true;
-	  };
-	  const clientId = ref('');
-	  const name = ref('');
-	  // 创建开始时间
-	  const createStartDate = ref('');
-	  const createStartDateShow = ref(false);
-	  const createStartDateClick = () => {
-		if (createStartDate.value === '') {
-		  createStartDate.value = new Date();
-		}
-		createStartDateShow.value = true;
-	  }
-	  const createStartDateConFirm = (data) => {
-		createStartDate.value = dateUtil.formateDate(data, "yyyy-MM-dd hh:mm:ss");
-		createStartDateShow.value = false;
-	  }
-	  const createStartDateCancel = () => {
-		createStartDate.value = dateUtil.formateDate(new Date(createStartDate.value), "yyyy-MM-dd hh:mm:ss");
-		createStartDateShow.value = false;
-	  }
-	  // 创建结束时间
-	  const createEndDate = ref('');
-	  const createEndDateShow = ref(false);
-	  const createEndDateClick = () => {
-		if (createEndDate.value === '') {
-		  createEndDate.value = new Date();
-		}
-		createEndDateShow.value = true;
-	  }
-	  const createEndDateConFirm = (data) => {
-		createEndDate.value = dateUtil.formateDate(data, "yyyy-MM-dd hh:mm:ss");
-		createEndDateShow.value = false;
-	  }
-	  const createEndDateCancel = () => {
-		createEndDate.value = dateUtil.formateDate(new Date(createEndDate.value), "yyyy-MM-dd hh:mm:ss");
-		createEndDateShow.value = false;
-	  }
-	  // 提交搜索表单触发搜索
-	  const onSubmit = () => {
-		const searchParam = {};
-		if (clientId.value !== '') {
-		  searchParam.clientId = clientId.value;
-		}
-		if (name.value !== '') {
-		  searchParam.name = name.value;
-		}
-		if (createStartDate.value !== '') {
-		  searchParam.startDate = dateUtil.formateDate(new Date(createStartDate.value),
-			"yyyy/MM/dd hh:mm:ss");
-		}
-		if (createEndDate.value !== '') {
-		  searchParam.endDate = dateUtil.formateDate(new Date(createEndDate.value), "yyyy/MM/dd hh:mm:ss");
-		}
-		context.emit('search', searchParam);
-		sheetShow.value = false;
-	  }
-	  return {
-		sheetShow,
-		minDate,
-		maxDate,
-		showSearch,
-		clientId,
-		name,
-		createStartDate,
-		createStartDateShow,
-		createStartDateClick,
-		createStartDateConFirm,
-		createStartDateCancel,
-		createEndDate,
-		createEndDateShow,
-		createEndDateClick,
-		createEndDateConFirm,
-		createEndDateCancel,
-		onSubmit
-	  };
-	},
-  };
-  </script>
-  
-  <style lang="less" scoped></style>
-  
+  <!-- 报警历史 - 搜索弹窗 -->
+  <div class="codeSearch flex-col">
+    <van-popup v-model:show="sheetShow" round class="codeSearchPopup">
+      <div class="content">
+        <van-form @submit="onSubmit">
+          <van-field v-model="clientId" name="clientId" :label="$t('alarmHistory.equipmentNoLabel')"
+            :placeholder="$t('alarmHistory.equipmentNoPlaceholder')" />
+          <van-field v-model="name" name="name" :label="$t('alarmHistory.equipmentNameLabel')"
+            :placeholder="$t('alarmHistory.equipmentNamePlaceholder')" />
+          <div class="van-cell van-field">
+            <div class="van-cell__title van-field__label">
+              <label id="van-field-4-label" for="van-field-4-input">{{ $t('alarmHistory.alarmTime') }}</label>
+            </div>
+            <div class="van-cell__value van-field__value">
+              <div class="van-field__body">
+                <input type="text" class="van-field__control" :placeholder="$t('alarmHistory.startTime')"
+                  style="text-align: center; width: 50%;" v-model="createStartDate" @click="createStartDateClick()" />
+                <span>{{ $t('alarmHistory.to') }}</span>
+                <input type="text" class="van-field__control" :placeholder="$t('alarmHistory.endTime')"
+                  style="text-align: center; width: 50%;" v-model="createEndDate" @click="createEndDateClick()" />
+              </div>
+            </div>
+          </div>
+          <!-- 操作 -->
+          <van-row justify="space-around" style="padding: 1em;">
+            <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em;"
+              native-type="submit">{{ $t('alarmHistory.clickQuery') }}</van-button>
+          </van-row>
+        </van-form>
+      </div>
+    </van-popup>
+    <van-popup v-model:show="createStartDateShow" round position="bottom">
+      <van-datetime-picker v-model="createStartDate" type="datehour" :title="$t('alarmHistory.selectFullTime')"
+        :min-date="minDate" :max-date="maxDate" @confirm="createStartDateConFirm($event)"
+        @cancel="createStartDateCancel()" />
+      <!-- 			<van-datetime-picker v-model="createStartDate" type="datetime" :title="$t('alarmHistory.selectFullTime')"
+              @confirm="createStartDateConFirm($event)" @cancel="createStartDateCancel()" :min-date="minDate" /> -->
+    </van-popup>
+    <van-popup v-model:show="createEndDateShow" round position="bottom">
+      <van-datetime-picker v-model="createEndDate" type="datehour" :title="$t('alarmHistory.selectFullTime')"
+        :min-date="minDate" :max-date="maxDate" @confirm="createEndDateConFirm($event)" @cancel="createEndDateCancel()" />
+      <!-- 			<van-datetime-picker v-model="createEndDate" type="datetime" :title="$t('alarmHistory.selectFullTime')"
+              @confirm="createEndDateConFirm($event)" @cancel="createEndDateCancel()" :min-date="minDate" /> -->
+    </van-popup>
+  </div>
+</template>
+
+<script>
+import {
+  ref
+} from 'vue';
+import dateUtil from "@/utils/dateUtil";
+import { styleUrl } from "../../common/js/utils";
+
+export default {
+  name: 'historySearch',
+  components: {},
+  setup(prop, context) {
+    const sheetShow = ref(false);
+    const minDate = new Date(2018, 0, 1);
+    const maxDate = new Date();
+    // 加载样式
+    styleUrl('alarmHistory');
+    const showSearch = () => {
+      sheetShow.value = true;
+    };
+    const clientId = ref('');
+    const name = ref('');
+    // 创建开始时间
+    const createStartDate = ref('');
+    const createStartDateShow = ref(false);
+    const createStartDateClick = () => {
+      if (createStartDate.value === '') {
+        createStartDate.value = new Date();
+      }
+      createStartDateShow.value = true;
+    }
+    const createStartDateConFirm = (data) => {
+      createStartDate.value = dateUtil.formateDate(data, "yyyy-MM-dd hh:mm:ss");
+      createStartDateShow.value = false;
+    }
+    const createStartDateCancel = () => {
+      createStartDate.value = dateUtil.formateDate(new Date(createStartDate.value), "yyyy-MM-dd hh:mm:ss");
+      createStartDateShow.value = false;
+    }
+    // 创建结束时间
+    const createEndDate = ref('');
+    const createEndDateShow = ref(false);
+    const createEndDateClick = () => {
+      if (createEndDate.value === '') {
+        createEndDate.value = new Date();
+      }
+      createEndDateShow.value = true;
+    }
+    const createEndDateConFirm = (data) => {
+      createEndDate.value = dateUtil.formateDate(data, "yyyy-MM-dd hh:mm:ss");
+      createEndDateShow.value = false;
+    }
+    const createEndDateCancel = () => {
+      createEndDate.value = dateUtil.formateDate(new Date(createEndDate.value), "yyyy-MM-dd hh:mm:ss");
+      createEndDateShow.value = false;
+    }
+    // 提交搜索表单触发搜索
+    const onSubmit = () => {
+      const searchParam = {};
+      if (clientId.value !== '') {
+        searchParam.clientId = clientId.value;
+      }
+      if (name.value !== '') {
+        searchParam.name = name.value;
+      }
+      if (createStartDate.value !== '') {
+        searchParam.startDate = dateUtil.formateDate(new Date(createStartDate.value),
+          "yyyy/MM/dd hh:mm:ss");
+      }
+      if (createEndDate.value !== '') {
+        searchParam.endDate = dateUtil.formateDate(new Date(createEndDate.value), "yyyy/MM/dd hh:mm:ss");
+      }
+      context.emit('search', searchParam);
+      sheetShow.value = false;
+    }
+    return {
+      sheetShow,
+      minDate,
+      maxDate,
+      showSearch,
+      clientId,
+      name,
+      createStartDate,
+      createStartDateShow,
+      createStartDateClick,
+      createStartDateConFirm,
+      createStartDateCancel,
+      createEndDate,
+      createEndDateShow,
+      createEndDateClick,
+      createEndDateConFirm,
+      createEndDateCancel,
+      onSubmit
+    };
+  },
+};
+</script>
+
+<style lang="less" scoped></style>

+ 1 - 1
src/views/bindWechat.vue

@@ -90,7 +90,7 @@ export default {
     const onSubmit = async () => {
       try {
         const { data } = await bindWechat(
-          user.id
+            user.id
         );
         if (data.code === "00000") {
           console.log(data.data);

+ 9 - 10
src/views/device/alarmClock.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 设备定时开关列表 -->
-  <div class="clockPage flex-col">
+  <div class="pageClock flex-col">
     <s-header :name="$t('device.timeSwitch')" :noback="false"></s-header>
     <div class="bd1 flex-col">
       <div class="section5 flex-col">
@@ -15,9 +15,9 @@
           </div>
         </div>
         <img
-          class="img2"
-          referrerpolicy="no-referrer"
-          src="https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng8947935ab81635fdedd8124b11e305eef66286421b69c84fef22233014a3fa9a"
+            class="img2"
+            referrerpolicy="no-referrer"
+            src="https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng8947935ab81635fdedd8124b11e305eef66286421b69c84fef22233014a3fa9a"
         />
       </div>
       <div v-for="(item, index) in list" :key="index" >
@@ -75,11 +75,11 @@ export default {
     // 初始化页面获取列表
     onMounted(async () => {
       // 加载样式
-        styleUrl('alarmClock');
-        getAlaramClockListFun();
+      styleUrl('alarmClock');
+      getAlaramClockListFun();
     });
 
-     // 获取设备列表数据
+    // 获取设备列表数据
     const getAlaramClockListFun = async () => {
       const { data } = await getAlaramClockList({adminId : user.id});
       if (data.code) {
@@ -126,7 +126,7 @@ export default {
       router.push({ path: 'alarmClockSet', query: { alarmId: item.id }});
     }
 
- 
+
     return { list, addAlarmClock, showTypeText, showWeek, deleteAlarm, setAlarm };
   },
   components: { sHeader },
@@ -134,5 +134,4 @@ export default {
 </script>
 <style lang="less" scoped>
 @import "../../common/style/common";
-</style>
-
+</style>

+ 69 - 69
src/views/device/alarmClockSet/index.vue

@@ -5,27 +5,27 @@
     <div class="alarmClockSetBox flex-col">
       <div style="width: 100%; height: 18px"></div>
       <van-field
-        class="equipmentField"
-        is-link
-        readonly
-        :label="$t('device.equipmentName')"
-        :placeholder="$t('device.selectDevice')"
-        v-model="equipmentIdsText"
-        @click="equipmentShow = true"
+          class="equipmentField"
+          is-link
+          readonly
+          :label="$t('device.equipmentName')"
+          :placeholder="$t('device.selectDevice')"
+          v-model="equipmentIdsText"
+          @click="equipmentShow = true"
       />
       <van-field
-        v-model="hour"
-        is-link
-        readonly
-        :label="$t('device.selectTime')"
-        :placeholder="$t('device.selectTime')"
-        @click="currentTimeShow = true"
-        class="field"
+          v-model="hour"
+          is-link
+          readonly
+          :label="$t('device.selectTime')"
+          :placeholder="$t('device.selectTime')"
+          @click="currentTimeShow = true"
+          class="field"
       />
       <div class="repeatTimeBox">
         <span class="txt6">{{
-          $t("device.selectTheNumberOfAlarmClockRepetitions")
-        }}</span>
+            $t("device.selectTheNumberOfAlarmClockRepetitions")
+          }}</span>
         <div class="o-pl-15 o-ptb-10">
           <van-checkbox @click="checkedAllClk" v-model="checkedAll">全选</van-checkbox>
         </div>
@@ -36,19 +36,19 @@
         </div>
       </div>
       <van-field
-        v-model="alarmClockTypeText"
-        is-link
-        readonly
-        :label="$t('device.alarmTypeLabel')"
-        :placeholder="$t('device.alarmTypePlaceholder')"
-        @click="alarmClockTypeShow = true"
-        class="field"
+          v-model="alarmClockTypeText"
+          is-link
+          readonly
+          :label="$t('device.alarmTypeLabel')"
+          :placeholder="$t('device.alarmTypePlaceholder')"
+          @click="alarmClockTypeShow = true"
+          class="field"
       />
       <van-field
-        v-model="alarmClockName"
-        name="alarmClockName"
-        :label="$t('device.alarmNameLabel')"
-        :placeholder="$t('device.alarmNamePlaceholder')"
+          v-model="alarmClockName"
+          name="alarmClockName"
+          :label="$t('device.alarmNameLabel')"
+          :placeholder="$t('device.alarmNamePlaceholder')"
       />
       <div class="ImageText1 flex-col">
         <div class="mod4 flex-row justify-between">
@@ -62,11 +62,11 @@
       </div>
       <van-row justify="space-around" style="padding: 1em">
         <van-button
-          span="5"
-          round
-          type="primary"
-          style="height: 2em; padding: 0 2em"
-          @click="submitSet"
+            span="5"
+            round
+            type="primary"
+            style="height: 2em; padding: 0 2em"
+            @click="submitSet"
         >
           {{ $t("device.submitSettings") }}</van-button
         >
@@ -74,32 +74,32 @@
     </div>
     <van-popup v-model:show="alarmClockTypeShow" round position="bottom">
       <van-cascader
-        v-model="alarmClockType"
-        :title="$t('device.alarmTypePlaceholder')"
-        :options="alarmClockTypeOptions"
-        @close="alarmClockTypeShow = false"
-        @finish="alarmClockTypeFinish"
+          v-model="alarmClockType"
+          :title="$t('device.alarmTypePlaceholder')"
+          :options="alarmClockTypeOptions"
+          @close="alarmClockTypeShow = false"
+          @finish="alarmClockTypeFinish"
       />
     </van-popup>
     <van-popup v-model:show="currentTimeShow" round position="bottom">
       <van-datetime-picker
-        v-model="currentTime"
-        type="time"
-        :title="$t('device.clickToSelectTheTime')"
-        @confirm="
+          v-model="currentTime"
+          type="time"
+          :title="$t('device.clickToSelectTheTime')"
+          @confirm="
           currentTimeShow = false;
           hour = currentTime;
         "
-        @cancel="currentTimeShow = false"
+          @cancel="currentTimeShow = false"
       />
     </van-popup>
     <van-popup v-model:show="equipmentShow" position="bottom">
       <div class="van-picker__toolbar">
         <button
-          type="button"
-          class="van-picker__cancel"
-          style="margin: 0 0.5em"
-          @click="equipmentShow = false"
+            type="button"
+            class="van-picker__cancel"
+            style="margin: 0 0.5em"
+            @click="equipmentShow = false"
         >
           {{ $t("device.cancel") }}
         </button>
@@ -107,27 +107,27 @@
           {{ $t("device.selectDevice") }}
         </div>
         <button
-          type="button"
-          class="van-picker__confirm"
-          style="margin: 0 0.5em"
-          @click="equipmentShow = false"
+            type="button"
+            class="van-picker__confirm"
+            style="margin: 0 0.5em"
+            @click="equipmentShow = false"
         >
           {{ $t("device.confirm") }}
         </button>
       </div>
       <div class="checkbox-con" style="max-height: 264px; overflow-y: auto">
         <van-checkbox-group
-          v-model="equipmentIds"
-          @change="equipemntIdsChange"
-          ref="checkboxGroup"
+            v-model="equipmentIds"
+            @change="equipemntIdsChange"
+            ref="checkboxGroup"
         >
           <van-cell-group>
             <van-cell
-              v-for="(item, index) in equipmentList"
-              clickable
-              :key="index"
-              :title="item.label"
-              @click="equipementCheckItem(item.value)"
+                v-for="(item, index) in equipmentList"
+                clickable
+                :key="index"
+                :title="item.label"
+                @click="equipementCheckItem(item.value)"
             >
               <template #right-icon>
                 <van-checkbox :name="item.value" />
@@ -251,13 +251,13 @@ export default {
         alarmClockName.value = data.data.name;
         checked.value = data.data.status === "1";
         alarmClockType.value = data.data.type;
-        // 选中的周 
+        // 选中的周
         selectList.value = data.data.week.split(',');
         equipmentIds.value = data.data.equipmentIds.split(",");
         isEquipemntIdsText();
         // 回显闹钟类型
         const statusTxt = alarmClockTypeOptions.value.filter(
-          (item) => item.value === data.data.type
+            (item) => item.value === data.data.type
         );
         alarmClockTypeText.value = statusTxt[0]["text"];
       } else {
@@ -271,9 +271,9 @@ export default {
         equipmentList.value = [
           { label: t("device.allMachines"), value: "All" },
         ].concat(
-          data.data.map((item, index) => {
-            return { label: item.name || index, value: item.id.toString() };
-          })
+            data.data.map((item, index) => {
+              return { label: item.name || index, value: item.id.toString() };
+            })
         );
         isEquipemntIdsText();
       } else {
@@ -293,8 +293,8 @@ export default {
     const equipemntIdsChange = (event) => {
       const isAll = equipmentIds.value.filter((v) => v === "All");
       if (
-        isAll.length > 0 &&
-        equipmentIds.value.length !== equipmentList.value.length
+          isAll.length > 0 &&
+          equipmentIds.value.length !== equipmentList.value.length
       ) {
         equipmentIds.value = [];
         isAllEquipement();
@@ -343,8 +343,8 @@ export default {
     const alarmClockTypeFinish = ({ selectedOptions }) => {
       alarmClockTypeShow.value = false;
       alarmClockTypeText.value = selectedOptions
-        .map((option) => option.text)
-        .join("/");
+          .map((option) => option.text)
+          .join("/");
     };
 
     const alarmClockName = ref("");
@@ -380,8 +380,8 @@ export default {
         params.id = oldAlarmClock.id;
       }
       const { data } = route.query.deviceId
-        ? await addAlaramClock(params)
-        : await alaramClockUpdate(params);
+          ? await addAlaramClock(params)
+          : await alaramClockUpdate(params);
       console.log("data", data);
       if (data.code) {
         Toast.success(t("device.successfullyAddedAlarmClock"));

+ 6 - 6
src/views/device/customLogo.vue

@@ -1,11 +1,11 @@
 <template>
-<!--  修改logo  -->
+  <!--  修改logo  -->
   <div class="viewLogsPage flex-col">
     <s-header :name="$t('device.customLogo.customLogo')" :noback="false"></s-header>
-	<div class="block2 flex-row justify-between">
-		<div class="block3 flex-col"></div>
-		<span class="info2">{{ $t('device.equipmentName') }}:{{ deviceDetail ? deviceDetail.name : '' }}</span>
-	</div>
+    <div class="block2 flex-row justify-between">
+      <div class="block3 flex-col"></div>
+      <span class="info2">{{ $t('device.equipmentName') }}:{{ deviceDetail ? deviceDetail.name : '' }}</span>
+    </div>
     <div class="wrap1 flex-col o-pt-15">
       <van-field v-model="logoNumber"
                  type="digit"
@@ -46,7 +46,7 @@ export default defineComponent({
       // 加载样式
       styleUrl('viewLogs');
       await getDeviceDetailFun();
-	  console.log(deviceDetail.value.name);
+      console.log(deviceDetail.value.name);
     });
 
     const getDeviceDetailFun = async () => {

+ 171 - 172
src/views/device/devicePassword/index.vue

@@ -1,183 +1,182 @@
 <template>
-	<div class="passwordIdx">
-		<s-header :name="$t('device.devicePasswordPage.title')" :noback="false"></s-header>
-		<div class="headerCon kBordBott o-plr-10 o-ptb-16 l-flex-RC">
-			<div class="line o-mr-6"></div>
-			<div>
-				<span class="c-color c-text-14">{{ $t('device.devicePasswordPage.equipmentName') }}:</span>
-				<span class="c-text-color c-text-14">{{ equipmentName }}</span>
-			</div>
-		</div>
-	</div>
-	<van-config-provider :theme-vars="themeVars">
-	<van-dropdown-menu active-color="#1989fa">
-		<van-dropdown-item v-model="pwdValue" :options="pwdType" />
-	</van-dropdown-menu>
-	<van-form v-if="pwdValue==0" @submit="onSubmit">
-		<van-cell-group inset>
-			<van-field v-model="adminPwd" type="password" :label="$t('device.devicePasswordPage.deivcePwd')"
-				:placeholder="$t('device.devicePasswordPage.passwordPlaceholder')"
-				:rules="[{ validator, message: $t('device.devicePasswordPage.passwordPlaceholder') }]" />
-			<van-field v-model="checkAmdinPwd" type="password" :label="$t('device.devicePasswordPage.checkDeivcePwd')"
-				:placeholder="$t('device.devicePasswordPage.passwordCheckRequired')"
-				:rules="[{ validator, message: $t('device.devicePasswordPage.passwordPlaceholder') }]" />
-		</van-cell-group>
-		<div style="margin: 16px;">
-			<van-button round block type="primary" native-type="submit">
-				{{$t('device.submitAndPushDeviceUpdates')}}
-			</van-button>
-		</div>
-	</van-form>
-	<van-form v-else @submit="onSubmit">
-		<van-cell-group inset>
-			<van-field v-model="guestPwd" type="password" :label="$t('device.devicePasswordPage.deivcePwd')"
-				:placeholder="$t('device.devicePasswordPage.passwordPlaceholder')"
-				:rules="[{ validator, message: $t('device.devicePasswordPage.passwordPlaceholder') }]" />
-			<van-field v-model="checkGuestPwd" type="password" :label="$t('device.devicePasswordPage.checkDeivcePwd')"
-				:placeholder="$t('device.devicePasswordPage.passwordCheckRequired')"
-				:rules="[{ validator, message: $t('device.devicePasswordPage.passwordPlaceholder') }]" />
-		</van-cell-group>
-		<div style="margin: 16px;">
-			<van-button round block type="primary" native-type="submit">
-				{{$t('device.submitAndPushDeviceUpdates')}}
-			</van-button>
-		</div>
-	</van-form>
-	</van-config-provider>
+  <div class="passwordIdx">
+    <s-header :name="$t('device.devicePasswordPage.title')" :noback="false"></s-header>
+    <div class="headerCon kBordBott o-plr-10 o-ptb-16 l-flex-RC">
+      <div class="line o-mr-6"></div>
+      <div>
+        <span class="c-color c-text-14">{{ $t('device.devicePasswordPage.equipmentName') }}:</span>
+        <span class="c-text-color c-text-14">{{ equipmentName }}</span>
+      </div>
+    </div>
+  </div>
+  <van-config-provider :theme-vars="themeVars">
+    <van-dropdown-menu>
+      <van-dropdown-item v-model="pwdValue" :options="pwdType" />
+    </van-dropdown-menu>
+    <van-form v-if="pwdValue == 0" @submit="onSubmit">
+      <van-cell-group inset>
+        <van-field v-model="adminPwd" type="password" :label="$t('device.devicePasswordPage.deivcePwd')"
+                   :placeholder="$t('device.devicePasswordPage.passwordPlaceholder')"
+                   :rules="[{ validator, message: $t('device.devicePasswordPage.passwordPlaceholder') }]" />
+        <van-field v-model="checkAmdinPwd" type="password" :label="$t('device.devicePasswordPage.checkDeivcePwd')"
+                   :placeholder="$t('device.devicePasswordPage.passwordCheckRequired')"
+                   :rules="[{ validator, message: $t('device.devicePasswordPage.passwordPlaceholder') }]" />
+      </van-cell-group>
+      <div style="margin: 16px;">
+        <van-button round block type="primary" native-type="submit">
+          {{ $t('device.submitAndPushDeviceUpdates') }}
+        </van-button>
+      </div>
+    </van-form>
+    <van-form v-else @submit="onSubmit">
+      <van-cell-group inset>
+        <van-field v-model="guestPwd" type="password" :label="$t('device.devicePasswordPage.deivcePwd')"
+                   :placeholder="$t('device.devicePasswordPage.passwordPlaceholder')"
+                   :rules="[{ validator, message: $t('device.devicePasswordPage.passwordPlaceholder') }]" />
+        <van-field v-model="checkGuestPwd" type="password" :label="$t('device.devicePasswordPage.checkDeivcePwd')"
+                   :placeholder="$t('device.devicePasswordPage.passwordCheckRequired')"
+                   :rules="[{ validator, message: $t('device.devicePasswordPage.passwordPlaceholder') }]" />
+      </van-cell-group>
+      <div style="margin: 16px;">
+        <van-button round block type="primary" native-type="submit">
+          {{ $t('device.submitAndPushDeviceUpdates') }}
+        </van-button>
+      </div>
+    </van-form>
+  </van-config-provider>
 </template>
 
 <script>
-	// 导入接口
-	import {
-		updateDevicePassword
-	} from '@/service/device/index';
-	import sHeader from "@/components/SimpleHeader";
-	import {
-		ref,
-		reactive
-	} from "@vue/reactivity";
-	import {
-		onMounted
-	} from '@vue/runtime-core';
-	import {
-		useRoute, useRouter
-	} from 'vue-router';
-	import {
-		Notify, Dialog, Toast
-	} from 'vant';
-	import {
-		useI18n
-	} from "vue-i18n";
-  import { styleUrl } from "../../../common/js/utils";
-	export default {
-		components: {
-			sHeader
-		},
-		setup() {
-			// 引入语言
-			const { t } = useI18n();
-			// 路由
-			const route = useRoute();
-			const router = useRouter();
-			// 设备名称
-			const equipmentName = ref('');
-			const pwdValue = ref();
-			const adminPwd = ref();
-			const checkAmdinPwd = ref();
-			const guestPwd = ref();
-			const checkGuestPwd = ref();
+// 导入接口
+import {
+  updateDevicePassword
+} from '@/service/device/index';
+import sHeader from "@/components/SimpleHeader";
+import {
+  ref,
+  reactive
+} from "@vue/reactivity";
+import {
+  onMounted
+} from '@vue/runtime-core';
+import {
+  useRoute, useRouter
+} from 'vue-router';
+import {
+  Notify, Dialog, Toast
+} from 'vant';
+import {
+  useI18n
+} from "vue-i18n";
+import { styleUrl } from '../../../common/js/utils';
+export default {
+  components: {
+    sHeader
+  },
+  setup() {
+    // 引入语言
+    const { t } = useI18n();
+    // 路由
+    const route = useRoute();
+    const router = useRouter();
+    // 设备名称
+    const equipmentName = ref('');
+    const pwdValue = ref();
+    const adminPwd = ref();
+    const checkAmdinPwd = ref();
+    const guestPwd = ref();
+    const checkGuestPwd = ref();
 
-			const validator = (val) => /\w{6,}/.test(val);
-			const themeVars = {
-				dropdownMenuTitleTextColor: '#404d74'
-			};
-			const pwdType = [{
-					text: t('device.devicePasswordPage.adminPassword'),
-					value: 0
-				},
-				{
-					text: t('device.devicePasswordPage.guestPassword'),
-					value: 1
-				},
-			]
-			// 刚进页面
-			onMounted(() => {
-			  styleUrl('device');
-				// console.log(pwdType[0].value)
-				pwdValue.value = pwdType[0].value;
-				// console.log(pwdValue.value)
-				const id = route.query.deviceId || "";
-				const name = route.query.name || "";
-				if (id) {
-					passwordForm.equipmentId = id;
-					equipmentName.value = name;
-				}
+    const validator = (val) => /\w{6,}/.test(val);
+    const themeVars = {
+      dropdownMenuTitleTextColor: '#404d74'
+    };
+    const pwdType = [{
+      text: t('device.devicePasswordPage.adminPassword'),
+      value: 0
+    },
+      {
+        text: t('device.devicePasswordPage.guestPassword'),
+        value: 1
+      },
+    ]
+    // 刚进页面
+    onMounted(() => {
+      // 加载样式
+      styleUrl('device');
+      pwdValue.value = pwdType[0].value;
+      const id = route.query.deviceId || "";
+      const name = route.query.name || "";
+      if (id) {
+        passwordForm.equipmentId = id;
+        equipmentName.value = name;
+      }
 
-			});
-			// 修改的价格
-			const passwordForm = reactive({
-				equipmentId: '',
-				adminPwd: '',
-				guestPwd: ''
-			});
+    });
+    // 修改的价格
+    const passwordForm = reactive({
+      equipmentId: '',
+      adminPwd: '',
+      guestPwd: ''
+    });
 
-			// 点击提交
-			const onSubmit = () => {
-				passwordForm.adminPwd = adminPwd.value;
-				passwordForm.guestPwd = guestPwd.value;
-				console.log(passwordForm);
-				if ((passwordForm.adminPwd != checkAmdinPwd.value) || (passwordForm.guestPwd != checkGuestPwd.value)) {
-					Notify({
-						type: 'danger',
-						message: t('device.devicePasswordPage.passwordMatch')
-					});
-					return;
-				}
-				if(pwdValue.value == 0) {
-					passwordForm.guestPwd = "";
-				}
-				if(pwdValue.value == 1) {
-					passwordForm.adminPwd = "";
-				}
-				Dialog.confirm({
-					// title: "提示",
-					message: t('device.editCheck'),
-				}).then(() => {
-					console.log(passwordForm);
-					updateDevicePassword({
-						"equipmentId": passwordForm.equipmentId,
-						"adminPwd": passwordForm.adminPwd,
-						"guestPwd": passwordForm.guestPwd
-					}).then((res) => {
-						if(res.data.code == "A0001") {
-							Toast.fail(t('device.unknownError'));
-							return;
-						}						
-						Dialog.alert({
-							message: t('device.modificationSucceeded'),
-						}).then(() => {
-							//返回上一页
-							router.go(-1);
-						});
-					});
-				});
-			}
+    // 点击提交
+    const onSubmit = () => {
+      passwordForm.adminPwd = adminPwd.value;
+      passwordForm.guestPwd = guestPwd.value;
+      console.log(passwordForm);
+      if ((passwordForm.adminPwd != checkAmdinPwd.value) || (passwordForm.guestPwd != checkGuestPwd.value)) {
+        Notify({
+          type: 'danger',
+          message: t('device.devicePasswordPage.passwordMatch')
+        });
+        return;
+      }
+      if (pwdValue.value == 0) {
+        passwordForm.guestPwd = "";
+      }
+      if (pwdValue.value == 1) {
+        passwordForm.adminPwd = "";
+      }
+      Dialog.confirm({
+        // title: "提示",
+        message: t('device.editCheck'),
+      }).then(() => {
+        console.log(passwordForm);
+        updateDevicePassword({
+          "equipmentId": passwordForm.equipmentId,
+          "adminPwd": passwordForm.adminPwd,
+          "guestPwd": passwordForm.guestPwd
+        }).then((res) => {
+          if (res.data.code == "A0001") {
+            Toast.fail(t('device.unknownError'));
+            return;
+          }
+          Dialog.alert({
+            message: t('device.modificationSucceeded'),
+          }).then(() => {
+            //返回上一页
+            router.go(-1);
+          });
+        });
+      });
+    }
 
-			return {
-				passwordForm,
-				equipmentName,
-				pwdType,
-				pwdValue,
-				adminPwd,
-				checkAmdinPwd,
-				guestPwd,
-				checkGuestPwd,
-				onSubmit,
-				validator,
-				themeVars
-			};
-		},
-	};
+    return {
+      passwordForm,
+      equipmentName,
+      pwdType,
+      pwdValue,
+      adminPwd,
+      checkAmdinPwd,
+      guestPwd,
+      checkGuestPwd,
+      onSubmit,
+      validator,
+      themeVars
+    };
+  },
+};
 </script>
 
 <style lang="less" scoped>

+ 3 - 3
src/views/device/deviceSet.vue

@@ -106,8 +106,8 @@
               </div>
             </template>
           </van-field>
-        </div><!-- 优惠码功能开关 -->
-        <!-- <van-field colon readonly :label="`${$t('device.coupon')}`" placeholder="">
+        </div>
+        <van-field colon readonly :label="`${$t('device.coupon')}`" placeholder="">
           <template #input>
             <div class="l-flex-RC">
               <span>{{ couponStatusNameComp }}</span>
@@ -115,7 +115,7 @@
                           inactive-value="0" />
             </div>
           </template>
-        </van-field> -->
+        </van-field>
         <div class="cust_vantBorder">
           <van-field colon required clearable v-model="deviceDetal.operationalName" name="operationalName"
             :label="`${$t('device.nameOfOperatorLabel')}`" :placeholder="$t('device.nameOfOperatorPlaceholder')" :rules="[

+ 21 - 21
src/views/device/editAdRule/index.vue

@@ -4,14 +4,14 @@
     <div class="o-p-10 cust_vantBorder">
       <div class="l-flex-between kBordBott o-pb-20">
         <div
-          class="c-border o-ptb-10 o-plr-12 l-flex-RC l-flex-w o-w"
-          style="padding-bottom: 0; min-height: 36px"
+            class="c-border o-ptb-10 o-plr-12 l-flex-RC l-flex-w o-w"
+            style="padding-bottom: 0; min-height: 36px"
         >
           <div
-            class="c-border l-flex-RC o-p-3 c-color-f o-mr-10 o-mb-10"
-            style="background: #e59a6d; border: 1px solid #e59a6d"
-            v-for="(item, index) in tagList"
-            :key="index"
+              class="c-border l-flex-RC o-p-3 c-color-f o-mr-10 o-mb-10"
+              style="background: #e59a6d; border: 1px solid #e59a6d"
+              v-for="(item, index) in tagList"
+              :key="index"
           >
             <span class="o-mr-3">{{ item.name }}</span>
             <van-icon @click.stop="delTag(item, index)" name="clear" />
@@ -19,17 +19,17 @@
         </div>
         <div @click="submitClk" class="submitBtn o-ml-10">
           <van-button round type="primary">{{
-            $t("device.editAdRule.submitPush")
-          }}</van-button>
+              $t("device.editAdRule.submitPush")
+            }}</van-button>
         </div>
       </div>
       <van-field
-        colon
-        :border="false"
-        v-model="cofficentForm.name"
-        clearable
-        :placeholder="$t('device.editAdRule.ruleNamePlace')"
-        :label="$t('device.editAdRule.ruleName')"
+          colon
+          :border="false"
+          v-model="cofficentForm.name"
+          clearable
+          :placeholder="$t('device.editAdRule.ruleNamePlace')"
+          :label="$t('device.editAdRule.ruleName')"
       />
       <div class="l-flex-center" style="margin: 16px">
         <van-button round class="searchBtn" type="primary" size="large" @click="toSearch">
@@ -39,11 +39,11 @@
       <div class="o-mt-30">
         <div class="l-flex-RC l-flex-w">
           <div
-            @click="addAllTag(item)"
-            class="c-border l-flex-RC o-p-3 c-color-f o-mr-10 o-mb-10"
-            style="background: #e59a6d; border: 1px solid #e59a6d"
-            v-for="(item, index) in allTagList"
-            :key="index"
+              @click="addAllTag(item)"
+              class="c-border l-flex-RC o-p-3 c-color-f o-mr-10 o-mb-10"
+              style="background: #e59a6d; border: 1px solid #e59a6d"
+              v-for="(item, index) in allTagList"
+              :key="index"
           >
             <span class="o-mr-3">{{ item.name }}</span>
           </div>
@@ -149,8 +149,8 @@ export default {
   }
 
   .van-button--primary {
-    background-color: #2c87c8;
-    border-color: #2c87c8;
+    background-color: #4d6add;
+    border-color: #4d6add;
   }
 }
 </style>

+ 5 - 5
src/views/device/index.vue

@@ -84,7 +84,7 @@
                 <div class="contentBottomCon" v-if="item.checkType">
                   <img class="pic1" referrerpolicy="no-referrer" src="../../assets/home/line.png" />
                   <div class="layer2 flex-row justify-between o-ptb-8 kBordBott">
-                    <span class="info1 o-ptb-5 kBordBott">{{ $t("device.sleepState") }}:{{
+                    <span class="info1 o-ptb-8 kBordBott">{{ $t("device.sleepState") }}:{{
                       item.isSleep
                       ? $t("device.sleeping")
                       : $t("device.notSleeping")
@@ -132,7 +132,7 @@
                   </span> -->
                   <span class="txt1 o-ptb-8">{{ item.fullName }}</span>
                   <div>
-                    <span v-if="item.latitude" class="txt5 o-ptb-5 kBordBott l-flex-RC">
+                    <span v-if="item.latitude" class="txt5 o-ptb-8 kBordBott l-flex-RC">
                       <span class="info1">{{
                         $t("device.position") }}:</span>
                       <van-button @click="viewPosiClk(item)" type="primary">{{
@@ -198,8 +198,8 @@
                     showDateTime(item.lastUpdateTime)
                   }}</span>
                   <span class="info2 o-ptb-8 kBordBott">{{ $t("device.volume") }}:{{ item.volume }}</span>
-                  <div class="l-flex-RC o-ptb-7">
-                    <span class="info3 o-pr-8 kBordBott">{{ $t("device.alarmContent") }}:{{
+                  <div class="l-flex-RC">
+                    <span class="info3 o-pr-10 kBordBott">{{ $t("device.alarmContent") }}:{{
                       item.alarmList && item.alarmList[0]
                       ? item.alarmList[0].alarmContent
                       : item.alarmContent
@@ -223,7 +223,7 @@
                     </div>
                   </div>
                 </div>
-                <div class="bd6 l-flex-center o-ptb-10" @click="item.checkType = !item.checkType">
+                <div class="bd6 l-flex-center o-ptb-8" @click="item.checkType = !item.checkType">
                   <div class="l-flex-RC">
                     <span class="info2 o-mr-2">{{
                       item.checkType ? $t("device.stow") : $t("device.seeMore")

+ 0 - 1
src/views/device/modifyPrice/index.vue

@@ -188,5 +188,4 @@ export default {
 </script>
 
 <style lang="less" scoped>
-
 </style>

+ 142 - 142
src/views/device/openDoor.vue

@@ -1,153 +1,153 @@
 <template>
-	<!-- 远程开门 -->
-	<div class="openDoorPage flex-col">
-		<s-header :name="$t('device.remoteDoorOpening')" :noback="false"></s-header>
-		<div class="box1">
-			<div class="block2 flex-row justify-between">
-				<div class="block3 flex-col"></div>
-				<span class="info2">{{ $t('device.equipmentName') }}:{{ deviceDetal ? deviceDetal.name : '' }}</span>
-			</div>
-			<van-field
-				colon
-				readonly
-				:label="`${$t('device.outDoor')}`"
-				label-width="40px"
-			>
-				<template #input>
-					<div class="l-flex-RC">
-					<van-switch
-						:model-value="deviceDetal.outDoor"
-						@update:model-value="outDoorChg"
-						size="22"
-						active-value="1"
-						inactive-value="0"
-					/>
-					</div>
-					<span class="info3 o-pl-50">{{$t("device.status")}}: </span>
-					<span class="info3 o-pl-10">{{ deviceDetal.outDoor != 1 ? $t("device.close") : $t("device.open") }}</span>
-				</template>
-			</van-field>
-			
-			<van-field
-				colon
-				readonly
-				:label="`${$t('device.inDoor')}`"
-				label-width="40px"
-			>
-				<template #input>
-					<div class="l-flex-RC">
-					<van-switch
-						:model-value="deviceDetal.inDoor"
-						@update:model-value="inDoorChg"
-						size="22"
-						active-value="1"
-						inactive-value="0"
-					/>
-					</div>
-					<span class="info3 o-pl-50">{{$t("device.status")}}: </span>
-					<span class="info3 o-pl-10">{{ deviceDetal.inDoor != 1 ? $t("device.close") : $t("device.open") }}</span>
-				</template>
-			</van-field>
-		</div>
-	</div>
+  <!-- 远程开门 -->
+  <div class="pageDoor flex-col">
+    <s-header :name="$t('device.remoteDoorOpening')" :noback="false"></s-header>
+    <div class="box1">
+      <div class="block2 flex-row justify-between">
+        <div class="block3 flex-col"></div>
+        <span class="info2">{{ $t('device.equipmentName') }}:{{ deviceDetal ? deviceDetal.name : '' }}</span>
+      </div>
+      <van-field
+          colon
+          readonly
+          :label="`${$t('device.outDoor')}`"
+          label-width="40px"
+      >
+        <template #input>
+          <div class="l-flex-RC">
+            <van-switch
+                :model-value="deviceDetal.outDoor"
+                @update:model-value="outDoorChg"
+                size="22"
+                active-value="1"
+                inactive-value="0"
+            />
+          </div>
+          <span class="info3 o-pl-50">{{$t("device.status")}}: </span>
+          <span class="info3 o-pl-10">{{ deviceDetal.outDoor != 1 ? $t("device.close") : $t("device.open") }}</span>
+        </template>
+      </van-field>
+
+      <van-field
+          colon
+          readonly
+          :label="`${$t('device.inDoor')}`"
+          label-width="40px"
+      >
+        <template #input>
+          <div class="l-flex-RC">
+            <van-switch
+                :model-value="deviceDetal.inDoor"
+                @update:model-value="inDoorChg"
+                size="22"
+                active-value="1"
+                inactive-value="0"
+            />
+          </div>
+          <span class="info3 o-pl-50">{{$t("device.status")}}: </span>
+          <span class="info3 o-pl-10">{{ deviceDetal.inDoor != 1 ? $t("device.close") : $t("device.open") }}</span>
+        </template>
+      </van-field>
+    </div>
+  </div>
 </template>
 
 <script>
-	import { onMounted, ref } from 'vue';
-	import sHeader from "@/components/SimpleHeader";
-	import { useRoute } from 'vue-router';
-	import { getDeviceDetal, Api_openDoor } from '@/service/device'
-	import { Toast, Dialog } from 'vant';
-	import { useI18n } from "vue-i18n";
-  import {styleUrl} from "../../common/js/utils";
+import { onMounted, ref } from 'vue';
+import sHeader from "@/components/SimpleHeader";
+import { useRoute } from 'vue-router';
+import { getDeviceDetal, Api_openDoor } from '@/service/device'
+import { Toast, Dialog } from 'vant';
+import { useI18n } from "vue-i18n";
+import { styleUrl } from "../../common/js/utils";
+
+export default {
+  setup() {
+    const route = useRoute();
+    const deviceId = route.query.deviceId;
+    const deviceDetal = ref({});
+    const { t } = useI18n();
+
+    // 初始化页面获取列表
+    onMounted(async () => {
+      // 加载样式
+      styleUrl('deviceOper');
+      getDeviceDetalFun();
+      console.log(deviceDetal.value)
+    });
+
+    // 获取设备列表数据
+    const getDeviceDetalFun = async () => {
+      const {
+        data
+      } = await getDeviceDetal({
+        id: deviceId
+      });
+      if (data.code === '00000') {
+        // outDoor如果是null,默认是关闭
+        if (data.data.outDoor == null) {
+          data.data.outDoor = "0";
+        }
+        // inDoor如果是null,默认是关闭
+        if (data.data.inDoor == null) {
+          data.data.inDoor = "0";
+        }
+        deviceDetal.value = data.data;
+      } else {
+        Toast.fail(data.message);
+      }
+    }
 
-	export default {
-		setup() {
-			const route = useRoute();
-			const deviceId = route.query.deviceId;
-			const deviceDetal = ref({});
-			const { t } = useI18n();
+    // 点击外门开关
+    const outDoorChg = (outDoor) => {
+      Dialog.confirm({
+        title: t('device.openRemind'),
+        message: t('device.openRemindOut'),
+      }).then(() => {
+        Api_openDoor({
+          equipmentId: deviceDetal.value.id,
+          type: 0,
+          status: outDoor,
+        }).then((res) => {
+          Toast(res.data.message);
+          setTimeout(() => {
+            getDeviceDetalFun();
+          }, 1000);
+        });
+      });
+    };
 
-			// 初始化页面获取列表
-			onMounted(async () => {
-        // 加载样式
-        styleUrl('deviceOper');
-				getDeviceDetalFun();
-				console.log(deviceDetal.value)
-			});
+    // 点击内门开关
+    const inDoorChg = (inDoor) => {
+      Dialog.confirm({
+        title: t('device.openRemind'),
+        message: t('device.openRemindIn'),
+      }).then(() => {
+        Api_openDoor({
+          equipmentId: deviceDetal.value.id,
+          type: 1,
+          status: inDoor,
+        }).then((res) => {
+          Toast(res.data.message);
+          setTimeout(() => {
+            getDeviceDetalFun();
+          }, 1000);
+        });
+      });
+    };
 
-			// 获取设备列表数据
-			const getDeviceDetalFun = async () => {
-				const {
-					data
-				} = await getDeviceDetal({
-					id: deviceId
-				});
-				if (data.code === '00000') {
-					// outDoor如果是null,默认是关闭
-					if (data.data.outDoor == null) {
-					  data.data.outDoor = "0";
-					}
-					// inDoor如果是null,默认是关闭
-					if (data.data.inDoor == null) {
-					  data.data.inDoor = "0";
-					}
-					deviceDetal.value = data.data;
-				} else {
-					Toast.fail(data.message);
-				}
-			}
-			
-			// 点击外门开关
-			const outDoorChg = (outDoor) => {
-				Dialog.confirm({
-				    title: t('device.openRemind'),
-				    message: t('device.openRemindOut'),
-				}).then(() => {
-				    Api_openDoor({
-				    	equipmentId: deviceDetal.value.id,
-				    	type: 0,
-				    	status: outDoor,
-				    }).then((res) => {
-				    	Toast(res.data.message);
-				    	setTimeout(() => {
-				    		getDeviceDetalFun();
-				    	}, 1000);
-				    });
-				});
-			};
-			
-			// 点击内门开关
-			const inDoorChg = (inDoor) => {
-				Dialog.confirm({
-				    title: t('device.openRemind'),
-				    message: t('device.openRemindIn'),
-				}).then(() => {
-				    Api_openDoor({
-				    	equipmentId: deviceDetal.value.id,
-				    	type: 1,
-				    	status: inDoor,
-				    }).then((res) => {
-				    	Toast(res.data.message);
-				    	setTimeout(() => {
-				    		getDeviceDetalFun();
-				    	}, 1000);
-				    });
-				});
-			};
-			
-			return {
-				deviceDetal,
-				outDoorChg,
-				inDoorChg
-			};
-		},
-		components: {
-			sHeader
-		},
-	}
+    return {
+      deviceDetal,
+      outDoorChg,
+      inDoorChg
+    };
+  },
+  components: {
+    sHeader
+  },
+}
 </script>
 
 <style lang="less" scoped>
-	@import "../../common/style/common";
+@import "../../common/style/common";
 </style>

+ 2 - 2
src/views/device/paramsSet/index.vue

@@ -19,7 +19,7 @@
         <div class="outer2 flex-col"></div>
       </div> -->
 
-      
+
       <div class="list van-hairline--bottom" @click="pushPage('0')">
         <div class="title">
           <img class="icon" src='../../../assets/device/currency1.png' />
@@ -90,5 +90,5 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-  @import "../../../common/style/common";
+@import "../../../common/style/common";
 </style>

+ 3 - 4
src/views/device/paramsSet/paramsSetInfo.vue

@@ -14,7 +14,7 @@
         <van-field v-model="item.val" name="phone" type="tel" :label="paramName[key]">
           <template #button>
             <van-button size="small" type="primary" class="updataButton"
-              @click="updateParams(item)">{{ $t('device.submitUpdates') }}</van-button>
+                        @click="updateParams(item)">{{ $t('device.submitUpdates') }}</van-button>
           </template>
         </van-field>
       </div>
@@ -87,7 +87,7 @@ export default {
           comParams.value.push(paramItem.name);
           paramName.value.push(t("paramNames." + paramItem.name));
           // paramName.value.push(paramItem.name);
-          // console.log(zh.paramNames[paramItem.name]);        
+          // console.log(zh.paramNames[paramItem.name]);
         })
         // console.log(comParams.value);
 
@@ -123,5 +123,4 @@ export default {
 </script>
 <style lang="less" scoped>
 @import "../../../common/style/common";
-</style>
-  
+</style>

+ 5 - 5
src/views/device/recharge.vue

@@ -9,14 +9,14 @@
             class="recharge">0/{{ $t('device.month') }}</span></span>
       </div>
       <van-field v-model="deviceValue" is-link readonly :label="$t('device.purchasedMachine')"
-        :placeholder="$t('device.pleaseSelectAMachine')" @click="deviceShow = true" />
+                 :placeholder="$t('device.pleaseSelectAMachine')" @click="deviceShow = true" />
       <van-popup v-model:show="deviceShow" round closeable position="bottom">
         <van-cascader v-model="deviceId" :title="$t('device.pleaseSelectAMachine')" :options="deviceOptions"
-          @close="show = false" @finish="onDeviceFinish" />
+                      @close="show = false" @finish="onDeviceFinish" />
       </van-popup>
       <van-field v-model="number" type="number" :label="$t('device.quantityPurchased')"
-        :placeholder="$t('device.pleaseEnterThePurchaseQuantity')"
-        :rules="[{ required: true, message: $t('device.pleaseEnterThePurchaseQuantity') }]" class="numberInput">
+                 :placeholder="$t('device.pleaseEnterThePurchaseQuantity')"
+                 :rules="[{ required: true, message: $t('device.pleaseEnterThePurchaseQuantity') }]" class="numberInput">
         <template #button>
           <span>/{{ $t('device.month') }}</span>
         </template>
@@ -90,7 +90,7 @@ export default {
           };
         });
         const device = deviceOptions.value.filter(
-          (v) => v.value === parseInt(deviceId.value)
+            (v) => v.value === parseInt(deviceId.value)
         );
         if (device && device.length > 0) {
           deviceValue.value = device[0].text;

+ 4 - 4
src/views/device/saveProportion/index.less

@@ -27,7 +27,7 @@
         border-bottom: 0.02667rem solid var(--van-cell-border-color);
         transform: scaleY(.5);
       }
-      :deep(.van-cell)  {
+      :deep(.van-cell) {
         &::after{ display: none; }
       }
     }
@@ -125,13 +125,13 @@
         margin-top: 4px;
       }
     }
-    :deep(.van-cell)  { align-items: center; }
-    :deep(.van-field__control)  {
+    :deep(.van-cell) { align-items: center; }
+    :deep(.van-field__control) {
       width: 60%;
       border: 1px solid var(--van-border-color);
       padding: 0.2em 0;
     }
-    :deep(.updataButton)  {
+    :deep(.updataButton){
       background-color: transparent;
       color: var(--van-button-primary-background-color);
       padding: 0 0.5em;

+ 3 - 4
src/views/device/showGoods/index.vue

@@ -13,9 +13,9 @@
     <van-col v-for="(item, index) in tableData" :key="index" class="goodsCon o-mr-14" span="11">
       <div class="l-flex-RC">
         <van-image width="60" height="60" fit="contain" :src="showSugerPhoto(item)" />
-        <span class="o-ml-10" style="word-wrap: break-word; width: 50px;" >{{ item.productName }}</span>
+        <span class="o-ml-10" style="word-wrap: break-word; width: 50px;">{{ item.productName }}</span>
         <van-switch class="o-ml-1" v-model="switchStates[index]" size="20px" active-color="#4dc294"
-                    @change="handleChange(index)" />
+          @change="handleChange(index)" />
       </div>
       <van-divider :style="{ color: '#1baeae', borderColor: '#1baeae', fontSize: '20px', fontWeight: 500 }" />
     </van-col>
@@ -175,5 +175,4 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>

+ 4 - 4
src/views/device/tagSet/index.vue

@@ -6,7 +6,7 @@
         <div class="c-border o-ptb-10 o-plr-12 l-flex-RC l-flex-w o-w" style="padding-bottom: 0;min-height: 36px;">
           <!-- @click="noticeClk({ item, index }, 1)" -->
           <div class="c-border l-flex-RC o-p-3 c-color-f o-mr-10 o-mb-10"
-            style="background: #e59a6d; border: 1px solid #e59a6d" v-for="(item, index) in tagList" :key="index">
+               style="background: #e59a6d; border: 1px solid #e59a6d" v-for="(item, index) in tagList" :key="index">
             <span class="o-mr-3">{{ item.name }}</span>
             <van-icon @click.stop="delTag(item, index)" name="clear" />
           </div>
@@ -21,7 +21,7 @@
         <div @click="submitClk" class="submitBtn o-ml-10">
           <van-button round type="primary">{{
               $t("device.tagSet.sumbmit")
-          }}</van-button>
+            }}</van-button>
         </div>
       </div>
 
@@ -31,7 +31,7 @@
         </div>
         <div class="l-flex-RC l-flex-w">
           <div @click="addAllTag(item)" class="c-border l-flex-RC o-p-3 c-color-f o-mr-10 o-mb-10"
-            style="background: #e59a6d; border: 1px solid #e59a6d" v-for="(item, index) in allTagList" :key="index">
+               style="background: #e59a6d; border: 1px solid #e59a6d" v-for="(item, index) in allTagList" :key="index">
             <span class="o-mr-3">{{ item.name }}</span>
           </div>
         </div>
@@ -39,7 +39,7 @@
     </div>
     <!-- 弹窗 -->
     <kDialog :dialogTitle="dialogTitle" :cancelBtnTxt="$t('device.tagSet.cancel')"
-      :confirmBtnTxt="$t('device.tagSet.confirm')" ref="kDialogRef" @cancelclk="cancelClk" @confirmclk="confirmClk">
+             :confirmBtnTxt="$t('device.tagSet.confirm')" ref="kDialogRef" @cancelclk="cancelClk" @confirmclk="confirmClk">
       <template #content>
         <div class="cust_vantBorder">
           <van-field clearable label-width="0" v-model="tagName" label="" />

+ 98 - 98
src/views/device/toDaySugarList.vue

@@ -1,110 +1,110 @@
 <template>
-	<!-- 今日做糖列表 -->
-	<div class="page flex-col">
-		<s-header :name="$t('device.todaysSugarList')" :noback="false"></s-header>
-		<div class="box1 flex-col">
-			<div class="block2 flex-row justify-between">
-				<div class="block3 flex-col"></div>
-				<span class="info2">{{ $t('device.equipmentName') }}:{{ deviceDetal ? deviceDetal.name : '' }}</span>
-			</div>
-			<van-list
-			  class="o-pt-20"
-			  v-model:loading="loading"
-			  :finished="finished"
-			  :finished-text="$t('public.noMore')"
-			  @load="selectSugarListFun"
-			>
-			  <van-cell v-for="(item, index) in list" :key="index" :title="item" />
-			</van-list>
-		</div>
-	</div>
+  <!-- 今日做糖列表 -->
+  <div class="sugarPage flex-col">
+    <s-header :name="$t('device.todaysSugarList')" :noback="false"></s-header>
+    <div class="box1 flex-col">
+      <div class="block2 flex-row justify-between">
+        <div class="block3 flex-col"></div>
+        <span class="info2">{{ $t('device.equipmentName') }}:{{ deviceDetal ? deviceDetal.name : '' }}</span>
+      </div>
+      <van-list
+          class="o-pt-20"
+          v-model:loading="loading"
+          :finished="finished"
+          :finished-text="$t('public.noMore')"
+          @load="selectSugarListFun"
+      >
+        <van-cell v-for="(item, index) in list" :key="index" :title="item" />
+      </van-list>
+    </div>
+  </div>
 </template>
 <script>
-	import {
-		onMounted,
-		ref
-	} from "vue";
-	import sHeader from "@/components/SimpleHeader";
-	import {
-		getDeviceDetal,
-		selectSugarList
-	} from "@/service/device";
-	import {
-		Toast
-	} from "vant";
-	import {
-		getLoginUser,
-    styleUrl
-	} from "@/common/js/utils";
-	import {
-		useRoute
-	} from 'vue-router';
+import {
+  onMounted,
+  ref
+} from "vue";
+import sHeader from "@/components/SimpleHeader";
+import {
+  getDeviceDetal,
+  selectSugarList
+} from "@/service/device";
+import {
+  Toast
+} from "vant";
+import {
+  getLoginUser,
+  styleUrl
+} from "@/common/js/utils";
+import {
+  useRoute
+} from 'vue-router';
 
 
-	export default {
-		setup() {
-			const route = useRoute();
-			const deviceId = route.query.deviceId;
-			const deviceDetal = ref(null);
-			const loading = ref(false);
-			const finished = ref(false);
-			const user = getLoginUser();
-			const list = ref([]);
-			// 初始化页面获取列表
-			onMounted(async () => {
-        // 加载样式
-        styleUrl('doSugar');
-				getDeviceDetalFun();
-				selectSugarListFun();
-				// console.log(deviceDetal);
-			});
+export default {
+  setup() {
+    const route = useRoute();
+    const deviceId = route.query.deviceId;
+    const deviceDetal = ref(null);
+    const loading = ref(false);
+    const finished = ref(false);
+    const user = getLoginUser();
+    const list = ref([]);
+    // 初始化页面获取列表
+    onMounted(async () => {
+      // 加载样式
+      styleUrl('doSugar');
+      getDeviceDetalFun();
+      selectSugarListFun();
+      // console.log(deviceDetal);
+    });
 
 
-			// 获取设备数据
-			const getDeviceDetalFun = async () => {
-				const {
-					data
-				} = await getDeviceDetal({
-					id: deviceId
-				});
-				if (data.code === '00000') {
-					deviceDetal.value = data.data;
-				} else {
-					Toast.fail(data.message);
-				}
-			}
+    // 获取设备数据
+    const getDeviceDetalFun = async () => {
+      const {
+        data
+      } = await getDeviceDetal({
+        id: deviceId
+      });
+      if (data.code === '00000') {
+        deviceDetal.value = data.data;
+      } else {
+        Toast.fail(data.message);
+      }
+    }
 
-			// 获取做糖列表数据
-			const selectSugarListFun = async () => {
-				// console.log(user);
-				const {
-					data
-				} = await selectSugarList({
-					adminId: user.id
-				});
-				if (data.code) {
-					list.value = data.data.map((item) => {
-						return item.productName;
-					});
-					finished.value = true;
-				} else {
-					Toast.fail(data.message);
-				}
-			};
+    // 获取做糖列表数据
+    const selectSugarListFun = async () => {
+      // console.log(user);
+      const {
+        data
+      } = await selectSugarList({
+        adminId: user.id
+      });
+      if (data.code) {
+        list.value = data.data.map((item) => {
+          return item.productName;
+        });
+        finished.value = true;
+      } else {
+        Toast.fail(data.message);
+      }
+    };
 
-			return {
-				list,
-				deviceDetal,
-				loading,
-				finished,
-				selectSugarListFun,
-			};
-		},
-		components: {
-			sHeader
-		},
-	};
+    return {
+      list,
+      deviceDetal,
+      loading,
+      finished,
+      selectSugarListFun,
+    };
+  },
+  components: {
+    sHeader
+  },
+};
 </script>
 <style lang="less" scoped>
-	@import "../../common/style/common";
+@import "../../common/style/common";
 </style>

+ 5 - 5
src/views/home/index.vue

@@ -299,7 +299,7 @@ export default {
               {
                 ...data.data.series[0],
                 type: "bar",
-                itemStyle: { color: "#ddae27" },
+                itemStyle: { color: "#e59a6d" },
                 name: t("home.productNum"),
                 label: {
                   show: true,
@@ -309,7 +309,7 @@ export default {
               {
                 ...data.data.series[1],
                 type: "bar",
-                itemStyle: { color: "#2c87c8" },
+                itemStyle: { color: "#4d6add" },
                 name: t("home.salesAmount"),
                 label: {
                   show: true,
@@ -493,9 +493,9 @@ export default {
         case "M9":
           router.push({ path: "/orderExport" });
           break;
-        // case "M10":
-        //   router.push({ path: "/subLedgerManage" });
-        //   break;
+        case "M10":
+          router.push({ path: "/subLedgerManage" });
+          break;
         case "M11":
           router.push({ path: "/robotranking" });
           break;

+ 1 - 11
src/views/huifuMch/index.less

@@ -38,14 +38,4 @@
     margin-bottom: 20px;
   }
 
-}
-
-.van-button--primary {
-  background-color: #2c87c8;
-  border-color: #2c87c8;
-}
-
-// .van-radio__icon--checked .van-icon {
-//   background-color: #2c87c8;
-//   border-color: #2c87c8;
-// }
+}

+ 48 - 112
src/views/huifuMch/index.vue

@@ -51,8 +51,7 @@
             :placeholder="$t('huifuMch.beginDatePlaceholder')" @click="showBeginDateLicense = true"
             :rules="[{ required: true, message: $t('huifuMch.beginDatePlaceholder') }]" />
           <van-field v-if="licenseValidityType == 0" v-model="endDateLicense" readonly name="endDateLicense"
-            :label="$t('huifuMch.endDate')" :placeholder="$t('huifuMch.endDatePlaceholder')"
-            @click="showEndDateLicense = true"
+            :label="$t('huifuMch.endDate')" :placeholder="$t('huifuMch.endDatePlaceholder')" @click="showEndDateLicense = true"
             :rules="[{ required: true, message: $t('huifuMch.endDatePlaceholder') }]" />
         </div>
         <div class="huifuBox">
@@ -101,8 +100,8 @@
           <van-field v-if="cardType == 0" v-model="openLicenceNo" name="openLicenceNo"
             :label="$t('huifuMch.openLicenceNo')" :placeholder="$t('huifuMch.openLicenceNoPlaceholder')"
             :rules="[{ required: true, message: $t('huifuMch.openLicenceNoPlaceholder') }]" />
-          <van-field v-if="cardType == '1'" v-model="bankAddress" is-link readonly name="bankAddress"
-            :label="$t('huifuMch.huifuBankAddress')" :placeholder="$t('huifuMch.huifuBankAddressPlaceholder')"
+          <van-field  v-if="cardType == '1'" v-model="bankAddress" is-link readonly name="bankAddress" :label="$t('huifuMch.huifuBankAddress')"
+            :placeholder="$t('huifuMch.huifuBankAddressPlaceholder')"
             :rules="[{ required: true, message: $t('huifuMch.huifuBankAddressPlaceholder') }]"
             @click="showBankAddress = true" />
           <van-field v-model="certNo" name="certNo" :label="$t('huifuMch.huifuCertNo')"
@@ -170,17 +169,17 @@
     <div class="upLoad flex-col" v-if="showStatus == '0'">
       <van-cell title="身份证" size="large" icon="contact" />
       <div class="uploader-container">
-        <van-uploader v-model="certFrontPic" accept=".jpg,.png" :preview-size="[320, 180]"
+        <van-uploader v-model="certBackPic" accept=".jpg,.jpeg,.png" :preview-size="[320, 180]"
           style="display: block; padding: 0.5em 1em;" :max-size="2 * 1024 * 1024" @oversize="onOversize"
-          :after-read="upCertFrontPic" upload-text="点击上传身份证正面照片" capture="camera" image-fit="contain" :max-count="1" />
-        <van-uploader v-model="certBackPic" accept=".jpg,.png" :preview-size="[320, 180]"
+          :after-read="upCertBackPic" upload-text="点击上传身份证正面照片" capture="camera" image-fit="contain" :max-count="1" />
+        <van-uploader v-model="certFrontPic" accept=".jpg,.jpeg,.png" :preview-size="[320, 180]"
           style="display: block; padding: 0.5em 1em;" :max-size="2 * 1024 * 1024" @oversize="onOversize"
-          :after-read="upCertBackPic" upload-text="点击上传身份证背面照片" capture="camera" image-fit="contain" :max-count="1" />
+          :after-read="upCertFrontPic" upload-text="点击上传身份证背面照片" capture="camera" image-fit="contain" :max-count="1" />
       </div>
       <div v-if="type == '1'">
         <van-cell title="营业执照" size="large" icon="contact" />
         <div class="uploader-container">
-          <van-uploader v-model="licensePic" accept=".jpg,.png" :preview-size="[320, 180]"
+          <van-uploader v-model="licensePic" accept=".jpg,.jpeg,.png" :preview-size="[320, 180]"
             style="display: block; padding: 0.5em 1em;" :max-size="2 * 1024 * 1024" @oversize="onOversize"
             :after-read="upLicensePic" upload-text="点击上传营业执照" capture="camera" image-fit="contain" :max-count="1" />
         </div>
@@ -188,7 +187,7 @@
       <div v-if="cardType == '1'">
         <van-cell title="结算卡" size="large" icon="debit-pay" />
         <div class="uploader-container">
-          <van-uploader v-model="cardFrontPic" accept=".jpg,.png" :preview-size="[320, 180]"
+          <van-uploader v-model="cardFrontPic" accept=".jpg,.jpeg,.png" :preview-size="[320, 180]"
             style="display: block; padding: 0.5em 1em;" :max-size="2 * 1024 * 1024" @oversize="onOversize"
             :after-read="upCardFrontPic" upload-text="点击上传结算卡正面照片" capture="camera" image-fit="contain" :max-count="1" />
         </div>
@@ -196,7 +195,7 @@
       <div v-if="cardType == '0'">
         <van-cell title="开户许可证" size="large" icon="debit-pay" />
         <div class="uploader-container">
-          <van-uploader v-model="regAcctPic" accept=".jpg,.png" :preview-size="[320, 180]"
+          <van-uploader v-model="regAcctPic" accept=".jpg,.jpeg,.png" :preview-size="[320, 180]"
             style="display: block; padding: 0.5em 1em;" :max-size="2 * 1024 * 1024" @oversize="onOversize"
             :after-read="upRegAcctPic" upload-text="点击上传开户许可证照片" capture="camera" image-fit="contain" :max-count="1" />
         </div>
@@ -215,7 +214,8 @@
           <span class="custom-title">审核状态: </span>
           <span v-if="showStatus == '1' || showStatus == '4'" class="custom-title" style="color: #FFA500;">审核中</span>
           <span v-if="showStatus == '2'" class="custom-title" style="color: #00FF00;">审核通过</span>
-          <span v-if="showStatus == '3'" class="custom-title" style="color: #FF0000;">审核未通过</span>
+          <span v-if="showStatus == '3'" class="custom-title" style="color: #FF0000;">审核失败</span>
+          <!-- <div :style=statusColor value="审核中"></div> -->
         </template>
       </van-cell>
       <div class="parent-container" v-if="huifuMchCheck.type == '0'">
@@ -243,14 +243,12 @@
         <span>{{ $t('huifuMch.huifuContactEmail') }}:{{ huifuMchCheck.email }}</span>
         <span>{{ $t('huifuMch.huifuBusinessAddress') }}:{{ huifuMchCheck.detailAddr }}</span>
         <span>{{ $t('huifuMch.huifuServicePhone') }}:{{ huifuMchCheck.servicePhone }}</span>
-        <span>{{ $t('huifuMch.cardType') }}:{{ huifuMchCheck.cardType == '1' ?
-          $t('huifuMch.personalAccount') : $t('huifuMch.corporateAccount') }}</span>
+        <span>{{ $t('huifuMch.cardType') }}:{{ huifuMchCheck.cardType == '1'? $t('huifuMch.personalAccount'):$t('huifuMch.corporateAccount') }}</span>
         <span>{{ $t('huifuMch.huifuCardName') }}:{{ huifuMchCheck.cardName }}</span>
         <span>{{ $t('huifuMch.huifuCardNo') }}:{{ huifuMchCheck.cardNo }}</span>
         <span v-if="huifuMchCheck.cardType == '1'">{{ $t('huifuMch.huifuMp') }}:{{ huifuMchCheck.mp }}</span>
         <span>{{ $t('huifuMch.huifuCertNo') }}:{{ huifuMchCheck.certNo }}</span>
-        <span v-if="huifuMchCheck.cardType == '0'">{{ $t('huifuMch.openLicenceNo') }}:{{ huifuMchCheck.openLicenceNo
-        }}</span>
+        <span v-if="huifuMchCheck.cardType == '0'">{{ $t('huifuMch.openLicenceNo') }}:{{ huifuMchCheck.openLicenceNo }}</span>
         <span v-if="huifuMchCheck.cardType == '0'">{{ $t('huifuMch.branchCode') }}:{{ huifuMchCheck.branchCode }}</span>
       </div>
       <van-row v-if="showStatus == '2' || showStatus == '3'" justify="space-around" style="padding: 3em;">
@@ -258,11 +256,6 @@
           $t('huifuMch.update') }}
         </van-button>
       </van-row>
-      <van-row v-if="showStatus == '2' || showStatus == '3'" justify="space-around" style="padding: 1em;">
-        <van-button span="5" round type="primary" style="padding: 0 3em" native-type="sumbit" @click="upload">{{
-          $t('huifuMch.uploadPage') }}
-        </van-button>
-      </van-row>
     </div>
   </div>
 </template>
@@ -297,7 +290,7 @@ export default {
     const beginDateLicense = ref(''); // 营业执照有效开始日期
     const showBeginDateLicense = ref(false);
     const endDateLicense = ref(''); // 营业执照有效截止日期
-    const showEndDateLicense = ref(false);
+    const showEndDateLicense= ref(false);
     const beginDate = ref(''); // 有效期开始日期
     const showBeginDate = ref(false);
     const endDate = ref(''); // 有效期截日期
@@ -345,44 +338,24 @@ export default {
       certEndDate: '', // 有效期截止日期
     });
     // 上传身份证正面
-    const upCertFrontPic = async (file) => {
+    const upCertBackPic = async (file) => {
       file.status = 'uploading';
       file.message = '上传中...';
+      // 此时可以自行将文件上传至服务器
+      // const fileObject = new File([file.content], file.file.name, { type: file.file.type });
       const formData = new FormData();
       formData.append('file', file.file, file.file.name);
       formData.append('adminId', user.id);
-      formData.append('fileType', "F40");
-      // console.log(formData.get("file"));
-      if (addParams.type === '1') {
-        formData.append('fileType', "F02");
-      }
+      formData.append('fileType', "F03");
+      console.log(formData.get("file"));
       try {
-        const { data } = await uploadPic(formData, {
-          headers: {
-            'Content-Type': 'multipart/form-data',
-          },
-        });
-        if (addParams.type === '1') {
-          const { data1 } = await uploadPic(formData, {
-            headers: {
-              'Content-Type': 'multipart/form-data',
-            },
-          });
-          if (data.code == "00000" && data1.code == "00000") {
-            console.log(data);
-            file.status = 'done';
-          } else {
-            file.status = 'failed';
-            file.message = '上传失败';
-          }
+        const { data } = await uploadPic(formData);
+        if (data.code == "00000") {
+          console.log(data);
+          file.status = 'done';
         } else {
-          if (data.code == "00000") {
-            console.log(data);
-            file.status = 'done';
-          } else {
-            file.status = 'failed';
-            file.message = '上传失败';
-          }
+          file.status = 'failed';
+          file.message = '上传失败';
         }
       } catch {
         file.status = 'failed';
@@ -390,7 +363,7 @@ export default {
       }
     };
     // 上传身份证背面
-    const upCertBackPic = async (file) => {
+    const upCardFrontPic = async (file) => {
       file.status = 'uploading';
       file.message = '上传中...';
       // 此时可以自行将文件上传至服务器
@@ -398,38 +371,16 @@ export default {
       const formData = new FormData();
       formData.append('file', file.file, file.file.name);
       formData.append('adminId', user.id);
-      formData.append('fileType', "F41");
-      if (addParams.type == '1') {
-        formData.append('fileType', "F03");
-      }
+      formData.append('fileType', "F13");
       console.log(formData.get("file"));
       try {
-        const { data } = await uploadPic(formData, {
-          headers: {
-            'Content-Type': 'multipart/form-data',
-          },
-        });
-        if (addParams.type == '1') {
-          const { data1 } = await uploadPic(formData, {
-            headers: {
-              'Content-Type': 'multipart/form-data',
-            },
-          });
-          if (data.code == "00000" && data1.code == "00000") {
-            console.log(data1);
-            file.status = 'done';
-          } else {
-            file.status = 'failed';
-            file.message = '上传失败';
-          }
+        const { data } = await uploadPic(formData);
+        if (data.code == "00000") {
+          console.log(data);
+          file.status = 'done';
         } else {
-          if (data.code == "00000") {
-            console.log(data);
-            file.status = 'done';
-          } else {
-            file.status = 'failed';
-            file.message = '上传失败';
-          }
+          file.status = 'failed';
+          file.message = '上传失败';
         }
       } catch {
         file.status = 'failed';
@@ -437,18 +388,18 @@ export default {
       }
     };
     // 上传结算卡正面
-    const upCardFrontPic = async (file) => {
+    const upCertFrontPic = async (file) => {
       file.status = 'uploading';
       file.message = '上传中...';
       // 此时可以自行将文件上传至服务器
+      const fileObject = new File([file.content], file.file.name, { type: file.file.type });
       const formData = new FormData();
-      formData.append('file', file.file, file.file.name);
+      formData.append('file', fileObject);
       formData.append('adminId', user.id);
-      formData.append('fileType', "F13");
+      formData.append('fileType', "F02");
       console.log(formData.get("file"));
       try {
-        const { data } = await uploadPic(formData, 'multipart/form-data'
-        );
+        const { data } = await uploadPic(formData);
         if (data.code == "00000") {
           console.log(data);
           file.status = 'done';
@@ -466,17 +417,14 @@ export default {
       file.status = 'uploading';
       file.message = '上传中...';
       // 此时可以自行将文件上传至服务器
+      const fileObject = new File([file.content], file.file.name, { type: file.file.type });
       const formData = new FormData();
-      formData.append('file', file.file, file.file.name);
+      formData.append('file', fileObject);
       formData.append('adminId', user.id);
       formData.append('fileType', "F07");
       console.log(formData.get("file"));
       try {
-        const { data } = await uploadPic(formData, {
-          headers: {
-            'Content-Type': 'multipart/form-data',
-          },
-        });
+        const { data } = await uploadPic(formData);
         if (data.code == "00000") {
           console.log(data);
           file.status = 'done';
@@ -494,20 +442,14 @@ export default {
       file.status = 'uploading';
       file.message = '上传中...';
       // 此时可以自行将文件上传至服务器
-      // const fileObject = new File([file.content], file.file.name, { type: file.file.type });
-      // const formData = new FormData();
-      // formData.append('file', fileObject);
+      const fileObject = new File([file.content], file.file.name, { type: file.file.type });
       const formData = new FormData();
-      formData.append('file', file.file, file.file.name);
+      formData.append('file', fileObject);
       formData.append('adminId', user.id);
       formData.append('fileType', "F08");
       console.log(formData.get("file"));
       try {
-        const { data } = await uploadPic(formData, {
-          headers: {
-            'Content-Type': 'multipart/form-data',
-          },
-        });
+        const { data } = await uploadPic(formData);
         if (data.code == "00000") {
           console.log(data);
           file.status = 'done';
@@ -601,8 +543,8 @@ export default {
       } else if (certFrontPic.value == null) {
         Toast("请上传身份证背面照片");
         return;
-      }
-      if (addParams.cardType == '1') {
+      } 
+      if(addParams.cardType == '1') {
         if (cardFrontPic.value == null) {
           Toast("请上传结算卡正面照片");
           return;
@@ -633,11 +575,6 @@ export default {
     const updateHuifu = async () => {
       router.push("/huifuMchEdit");
     }
-    // 跳转到上传图片页面
-    const upload = async () => {
-      router.push("/upload");
-    }
-
     // 提交审核表单
     const onSubmit = async () => {
       console.log('onSubmit', addParams);
@@ -703,8 +640,7 @@ export default {
       cardFrontPic,
       submitCheck,
       onOversize,
-      updateHuifu,
-      upload,
+      updateHuifu
     };
   },
 };

+ 3 - 6
src/views/huifuMch/update.vue

@@ -126,7 +126,7 @@
           <van-field v-if="certValidityType == 0" v-model="endDate" readonly name="endDate"
             :label="$t('huifuMch.endDate')" :placeholder="$t('huifuMch.endDatePlaceholder')" @click="showEndDate = true"
             :rules="[{ required: true, message: $t('huifuMch.endDatePlaceholder') }]" />
-          <van-field v-if="status === '2'" v-model="sms" center clearable :label="$t('huifuMch.sms')"
+          <van-field v-model="sms" center clearable :label="$t('huifuMch.sms')"
             :placeholder="$t('huifuMch.smsPlaceholder')"
             :rules="[{ required: true, message: $t('huifuMch.smsPlaceholder') }]">
             <template #button>
@@ -214,7 +214,6 @@ export default {
     const endDate = ref(''); // 有效期截日期
     const showEndDate = ref(false);
     const showStatus = ref(null);
-    const status = ref(''); // 审核状态
     const verCodeTime = reactive({
       time: 0
     });
@@ -330,7 +329,7 @@ export default {
       if (data.code === '00000') {
         Toast({
           duration: 2000,
-          message: t('huifuMch.successSend') + '\n' + maskPhoneNumber(data.data.phone)
+          message: t('huifuMch.successSend')+'\n' + maskPhoneNumber(data.data.phone)
         });
         console.log('seedVerCodeSuccess');
         verCodeTime.time = 60;
@@ -361,7 +360,6 @@ export default {
       console.log(data.data);
       if (data.data != null) {
         huifuMchCheck.value = data.data;
-        status.value = data.data.status;
         addParams.type = data.data.type;
         addParams.regName = data.data.regName;
         addParams.shortName = data.data.shortName;
@@ -439,7 +437,7 @@ export default {
     };
     return {
       ...toRefs(addParams),
-      ...toRefs(verCodeTime),
+      ...toRefs( verCodeTime),
       verCodeTime,
       sendCode,
       onSubmit,
@@ -474,7 +472,6 @@ export default {
       onConfirmBeginDate,
       onConfirmEndDate,
 
-      status,
       minDate: new Date(2000, 0, 1),
       maxDate: new Date(2035, 11, 31),
       submitUpdateCheck,

+ 83 - 105
src/views/joinpayMch/index.vue

@@ -1,131 +1,114 @@
 <template>
   <!-- 提现账号 -->
   <div class="shandeMchPage flex-col"
-    :class="{ page1: pageType === '1', page2: pageType === '2', page3: pageType === '3', page4: pageType === '4' }">
+       :class="{ page1: pageType === '1', page2: pageType === '2', page3: pageType === '3', page4: pageType === '4' }">
     <s-header :name="$t('joinpayMch.withdrawalAccountNo')" :noback="false"></s-header>
     <div class="shandeMchBox flex-col">
       <div class="topSpeed" v-if="pageType !== '4'"
-        :class="{ page1: pageType === '1', page2: pageType === '2', page3: pageType === '3' }"></div>
+           :class="{ page1: pageType === '1', page2: pageType === '2', page3: pageType === '3' }"></div>
       <div v-if="pageType === '1' || pageType === '4'">
         <van-form @submit="saveJoinPayMchFun">
           <van-field v-model="altMchName" name="altMchName" :label="$t('joinpayMch.merchantNameLabel')" readonly />
           <van-field v-model="altMchNo" name="altMchNo" :label="$t('joinpayMch.merchantAccountLabel')" readonly />
-          <van-field v-model="altMchShortName" name="altMchShortName" :label="$t('joinpayMch.merchantAbbreviationLabel')"
-            readonly />
+          <van-field v-model="altMchShortName" name="altMchShortName" :label="$t('joinpayMch.merchantAbbreviationLabel')" readonly />
           <div class="van-cell van-field requiredLeft">
-            <div class="van-cell__title van-field__label"><span>{{ $t('joinpayMch.merchantType') }}:</span></div>
+            <div class="van-cell__title van-field__label"><span>{{$t('joinpayMch.merchantType')}}:</span></div>
             <div class="van-cell__value van-field__value radioBox">
               <van-radio-group v-model="altMerchantType" direction="horizontal" @change="fieldUpdate">
-                <van-radio name="10" icon-size="18px">{{ $t('joinpayMch.personal') }}</van-radio>
-                <van-radio name="11" icon-size="18px">{{ $t('joinpayMch.individualBusinesses') }}</van-radio>
-                <van-radio name="12" icon-size="18px">{{ $t('joinpayMch.enterprise') }}</van-radio>
+                <van-radio name="10" icon-size="18px">{{$t('joinpayMch.personal')}}</van-radio>
+                <van-radio name="11" icon-size="18px">{{$t('joinpayMch.individualBusinesses')}}</van-radio>
+                <van-radio name="12" icon-size="18px">{{$t('joinpayMch.enterprise')}}</van-radio>
               </van-radio-group>
             </div>
           </div>
           <div class="intervalRow"></div>
-          <van-field class="requiredLeft" v-model="busiContactName" name="busiContactName"
-            :label="$t('joinpayMch.contactNameLabel')" :placeholder="$t('joinpayMch.contactNamePlaceholder')"
-            :rules="[{ required: true, message: $t('joinpayMch.contactNamePlaceholder') }]"
-            @update:model-value="fieldUpdate" />
-          <van-field class="requiredLeft" v-model="busiContactMobileNo" name="busiContactMobileNo"
-            :label="$t('joinpayMch.cellPhoneLabel')" :placeholder="$t('joinpayMch.cellPhonePlaceholder')"
-            :rules="[{ required: true, message: $t('joinpayMch.cellPhonePlaceholder') }]"
-            @update:model-value="fieldUpdate" />
-          <van-field class="requiredLeft" v-model="legalPerson" name="legalPerson"
-            :label="$t('joinpayMch.nameOfLegalPerson/IndividualLabel')"
-            :placeholder="$t('joinpayMch.nameOfLegalPerson/IndividualPlaceholder')"
-            :rules="[{ required: true, message: $t('joinpayMch.nameOfLegalPerson/IndividualPlaceholder') }]"
-            @update:model-value="fieldUpdate" />
-          <van-field class="requiredLeft" v-model="phoneNo" name="phoneNo"
-            :label="$t('joinpayMch.phoneNumberOfLegalPerson/IndividualLabel')"
-            :placeholder="$t('joinpayMch.phoneNumberOfLegalPerson/IndividualPlaceholder')"
-            :rules="[{ required: true, message: $t('joinpayMch.phoneNumberOfLegalPerson/IndividualPlaceholder') }]"
-            @update:model-value="fieldUpdate" />
-          <van-field class="requiredLeft" v-model="idCardNo" name="idCardNo" :label="$t('joinpayMch.IDLabel')"
-            :placeholder="$t('joinpayMch.IDPlaceholder')"
-            :rules="[{ required: true, message: $t('joinpayMch.IDPlaceholder') }]" @update:model-value="fieldUpdate" />
+          <van-field class="requiredLeft" v-model="busiContactName" name="busiContactName" :label="$t('joinpayMch.contactNameLabel')"
+                     :placeholder="$t('joinpayMch.contactNamePlaceholder')" :rules="[{ required: true, message:$t('joinpayMch.contactNamePlaceholder') }]"
+                     @update:model-value="fieldUpdate" />
+          <van-field class="requiredLeft" v-model="busiContactMobileNo" name="busiContactMobileNo" :label="$t('joinpayMch.cellPhoneLabel')"
+                     :placeholder="$t('joinpayMch.cellPhonePlaceholder')" :rules="[{ required: true, message: $t('joinpayMch.cellPhonePlaceholder') }]"
+                     @update:model-value="fieldUpdate" />
+          <van-field class="requiredLeft" v-model="legalPerson" name="legalPerson" :label="$t('joinpayMch.nameOfLegalPerson/IndividualLabel')"
+                     :placeholder="$t('joinpayMch.nameOfLegalPerson/IndividualPlaceholder')" :rules="[{ required: true, message: $t('joinpayMch.nameOfLegalPerson/IndividualPlaceholder') }]"
+                     @update:model-value="fieldUpdate" />
+          <van-field class="requiredLeft" v-model="phoneNo" name="phoneNo" :label="$t('joinpayMch.phoneNumberOfLegalPerson/IndividualLabel')" :placeholder="$t('joinpayMch.phoneNumberOfLegalPerson/IndividualPlaceholder')"
+                     :rules="[{ required: true, message:$t('joinpayMch.phoneNumberOfLegalPerson/IndividualPlaceholder') }]" @update:model-value="fieldUpdate" />
+          <van-field class="requiredLeft" v-model="idCardNo" name="idCardNo" :label="$t('joinpayMch.IDLabel')" :placeholder="$t('joinpayMch.IDPlaceholder')"
+                     :rules="[{ required: true, message: $t('joinpayMch.IDPlaceholder')}]" @update:model-value="fieldUpdate" />
           <van-cell :title="$t('joinpayMch.validityOfIDCard')" :value="idCardExpiry" @click="idCardExpiryShow = true" />
-          <van-calendar v-model:show="idCardExpiryShow" @confirm="idCardExpiryOnConfirm" color="#4d6add" />
+          <van-calendar v-model:show="idCardExpiryShow" @confirm="idCardExpiryOnConfirm" color="#4d6add"/>
           <div class="van-cell van-field" v-if="pageType === '4'">
-            <div class="van-cell__title van-field__label"><span>{{ $t('joinpayMch.pictureReview') }}:</span></div>
+            <div class="van-cell__title van-field__label"><span>{{$t('joinpayMch.pictureReview')}}:</span></div>
             <div class="van-cell__value van-field__value radioBox"
-              style="display: flex; justify-content: space-around; align-items: center;">
+                 style="display: flex; justify-content: space-around; align-items: center;">
               {{ approveStatus }}
               <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em" @click='updateSentImage()'>
-                {{ $t('joinpayMch.reUpload') }}</van-button>
+                {{$t('joinpayMch.reUpload')}}</van-button>
             </div>
           </div>
           <div class="van-cell van-field" v-if="pageType === '4'">
-            <div class="van-cell__title van-field__label"><span>{{ $t('joinpayMch.signingStatus') }}:</span></div>
+            <div class="van-cell__title van-field__label"><span>{{$t('joinpayMch.signingStatus')}}:</span></div>
             <div class="van-cell__value van-field__value radioBox"
-              style="display: flex; justify-content: space-around; align-items: center;">
+                 style="display: flex; justify-content: space-around; align-items: center;">
               {{ signStatus }}
-              <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em"
-                @click='altMchSignFun()'>{{ $t('joinpayMch.signAContract') }}
+              <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em" @click='altMchSignFun()'>{{$t('joinpayMch.signAContract')}}
               </van-button>
             </div>
           </div>
           <div class="intervalRow"></div>
           <div class="van-cell van-field requiredLeft">
-            <div class="van-cell__title van-field__label"><span>{{ $t('joinpayMch.accountType') }}:</span></div>
+            <div class="van-cell__title van-field__label"><span>{{$t('joinpayMch.accountType')}}:</span></div>
             <div class="van-cell__value van-field__value radioBox">
               <van-radio-group v-model="bankAccountType" direction="horizontal" @change="fieldUpdate">
-                <van-radio name="1" icon-size="18px">{{ $t('joinpayMch.debitCard') }}</van-radio>
-                <van-radio name="4" icon-size="18px">{{ $t('joinpayMch.corporateAccount') }}</van-radio>
+                <van-radio name="1" icon-size="18px">{{$t('joinpayMch.debitCard')}}</van-radio>
+                <van-radio name="4" icon-size="18px">{{$t('joinpayMch.corporateAccount')}}</van-radio>
               </van-radio-group>
             </div>
           </div>
-          <van-field class="requiredLeft" v-model="bankAccountName" name="bankAccountName"
-            :label="$t('joinpayMch.bankAccountNameLabel')" :placeholder="$t('joinpayMch.bankAccountNamePlaceholder')"
-            :rules="[{ required: true, message: $t('joinpayMch.bankAccountNamePlaceholder') }]"
-            @update:model-value="fieldUpdate" />
-          <van-field class="requiredLeft" v-model="bankAccountNo" name="bankAccountNo"
-            :label="$t('joinpayMch.bankAccountLabel')" :placeholder="$t('joinpayMch.bankAccountPlaceholder')"
-            :rules="[{ required: true, message: $t('joinpayMch.bankAccountPlaceholder') }]"
-            @update:model-value="fieldUpdate" />
+          <van-field class="requiredLeft" v-model="bankAccountName" name="bankAccountName" :label="$t('joinpayMch.bankAccountNameLabel')"
+                     :placeholder="$t('joinpayMch.bankAccountNamePlaceholder')" :rules="[{ required: true, message: $t('joinpayMch.bankAccountNamePlaceholder') }]"
+                     @update:model-value="fieldUpdate" />
+          <van-field class="requiredLeft" v-model="bankAccountNo" name="bankAccountNo" :label="$t('joinpayMch.bankAccountLabel')"
+                     :placeholder="$t('joinpayMch.bankAccountPlaceholder')" :rules="[{ required: true, message: $t('joinpayMch.bankAccountPlaceholder') }]"
+                     @update:model-value="fieldUpdate" />
           <div :class="{ requiredLeft: bankAccountType === '4' }">
-            <van-field v-model="bankChannelNo" name="bankChannelNo" :label="$t('joinpayMch.interBankNoLabel')"
-              :placeholder="$t('joinpayMch.interBankNoPlaceholder')"
-              :rules="[{ required: bankAccountType === '4', message: $t('joinpayMch.interBankNoPlaceholder') }]"
-              @update:model-value="fieldUpdate" />
-            <van-field v-model="licenseNo" name="licenseNo" :label="$t('joinpayMch.businessLicenseNoLabel')"
-              :placeholder="$t('joinpayMch.businessLicenseNoPlaceholder')"
-              :rules="[{ required: bankAccountType === '4', message: $t('joinpayMch.businessLicenseNoPlaceholder') }]"
-              @update:model-value="fieldUpdate" />
-            <van-cell :title="$t('joinpayMch.validityOfBusinessLicenseLabel')" :value="licenseExpiry"
-              @click="licenseExpiryShow = true" />
-            <van-calendar v-model:show="licenseExpiryShow" @confirm="licenseExpiryOnConfirm" color="#4d6add" />
+            <van-field v-model="bankChannelNo" name="bankChannelNo" :label="$t('joinpayMch.interBankNoLabel')" :placeholder="$t('joinpayMch.interBankNoPlaceholder')"
+                       :rules="[{ required: bankAccountType === '4', message: $t('joinpayMch.interBankNoPlaceholder') }]" @update:model-value="fieldUpdate" />
+            <van-field v-model="licenseNo" name="licenseNo" :label="$t('joinpayMch.businessLicenseNoLabel') " :placeholder="$t('joinpayMch.businessLicenseNoPlaceholder') "
+                       :rules="[{ required: bankAccountType === '4', message: $t('joinpayMch.businessLicenseNoPlaceholder')  }]"
+                       @update:model-value="fieldUpdate" />
+            <van-cell :title="$t('joinpayMch.validityOfBusinessLicenseLabel')" :value="licenseExpiry" @click="licenseExpiryShow = true" />
+            <van-calendar v-model:show="licenseExpiryShow" @confirm="licenseExpiryOnConfirm" color="#4d6add"/>
           </div>
           <div class="intervalRow"></div>
           <div class="van-cell van-field">
-            <div class="van-cell__title van-field__label"><span>{{ $t('joinpayMch.settlementMethod') }}:</span></div>
+            <div class="van-cell__title van-field__label"><span>{{$t('joinpayMch.settlementMethod')}}:</span></div>
             <div class="van-cell__value van-field__value radioBox">
               <van-radio-group v-model="settMode" direction="horizontal" @change="fieldUpdate">
-                <van-radio name="1" icon-size="18px">{{ $t('joinpayMch.autoSettlementByConvergence') }}</van-radio>
-                <van-radio name="2" icon-size="18px">{{ $t('joinpayMch.manuallySettledByMerchantPlatform') }}</van-radio>
+                <van-radio name="1" icon-size="18px">{{$t('joinpayMch.autoSettlementByConvergence')}}</van-radio>
+                <van-radio name="2" icon-size="18px">{{$t('joinpayMch.manuallySettledByMerchantPlatform')}}</van-radio>
               </van-radio-group>
             </div>
           </div>
           <div class="van-cell van-field">
-            <div class="van-cell__title van-field__label"><span>{{ $t('joinpayMch.settlementCycleType') }}:</span></div>
+            <div class="van-cell__title van-field__label"><span>{{$t('joinpayMch.settlementCycleType')}}:</span></div>
             <div class="van-cell__value van-field__value radioBox">
               <van-radio-group v-model="settDateType" direction="horizontal" @change="fieldUpdate">
-                <van-radio name="1" icon-size="18px">{{ $t('joinpayMch.weekDay') }}</van-radio>
-                <van-radio name="2" icon-size="18px">{{ $t('joinpayMch.naturalDay') }}</van-radio>
-                <van-radio name="3" icon-size="18px">{{ $t('joinpayMch.monthlySettlementDate') }}</van-radio>
+                <van-radio name="1" icon-size="18px">{{$t('joinpayMch.weekDay')}}</van-radio>
+                <van-radio name="2" icon-size="18px">{{$t('joinpayMch.naturalDay')}}</van-radio>
+                <van-radio name="3" icon-size="18px">{{$t('joinpayMch.monthlySettlementDate')}}</van-radio>
               </van-radio-group>
             </div>
           </div>
-          <van-field v-model="riskDay" name="riskDay" :label="$t('joinpayMch.settlementCycleLabel')"
-            :placeholder="$t('joinpayMch.settlementCyclePlaceholder')" @update:model-value="fieldUpdate" />
-          <van-field v-model="manageScope" name="manageScope" :label="$t('joinpayMch.natureOfBusinessLabel')"
-            :placeholder="$t('joinpayMch.natureOfBusinessPlaceholder')" @update:model-value="fieldUpdate" />
-          <van-field v-model="manageAddr" name="manageAddr" :label="$t('joinpayMch.businessAddressLabel')"
-            :placeholder="$t('joinpayMch.businessAddressPlaceholder')" @update:model-value="fieldUpdate" />
+          <van-field v-model="riskDay" name="riskDay" :label="$t('joinpayMch.settlementCycleLabel')" :placeholder="$t('joinpayMch.settlementCyclePlaceholder')"
+                     @update:model-value="fieldUpdate" />
+          <van-field v-model="manageScope" name="manageScope" :label="$t('joinpayMch.natureOfBusinessLabel')" :placeholder="$t('joinpayMch.natureOfBusinessPlaceholder')"
+                     @update:model-value="fieldUpdate" />
+          <van-field v-model="manageAddr" name="manageAddr" :label="$t('joinpayMch.businessAddressLabel')" :placeholder="$t('joinpayMch.businessAddressPlaceholder')"
+                     @update:model-value="fieldUpdate" />
           <!-- 操作 -->
           <van-row justify="space-around" style="padding: 1em">
-            <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em"
-              native-type="submit">{{ $t('joinpayMch.submitDataForReview') }}
+            <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em" native-type="submit">{{$t('joinpayMch.submitDataForReview')}}
             </van-button>
           </van-row>
         </van-form>
@@ -134,39 +117,33 @@
         <img src='../../assets/joinPayMch/center.png' style="width: 50%; margin-top: 3em;" />
         <div v-if="joinPayMchType === '0'" style="width: 100%;">
           <div style="width: 100%; text-align: center;">
-            <span
-              style=" font-size: 1.4em; font-weight: bold; line-height: 3;">{{ $t('joinpayMch.thePlatformAdministratorIsReviewing') }}</span>
+            <span style=" font-size: 1.4em; font-weight: bold; line-height: 3;">{{$t('joinpayMch.thePlatformAdministratorIsReviewing')}}</span>
           </div>
           <div style="width: 100%; text-align: center;">
-            <span style="line-height: 1.2;">{{ $t('joinpayMch.youCan') }}<span
-                style="color: #4d6add; text-decoration: underline;"
-                @click='updateJoinPay()'>{{ $t('joinpayMch.withdrawAndRevise') }}</span></span>
+            <span style="line-height: 1.2;">{{$t('joinpayMch.youCan')}}<span style="color: #4d6add; text-decoration: underline;"
+                                                                             @click='updateJoinPay()'>{{$t('joinpayMch.withdrawAndRevise')}}</span></span>
           </div>
         </div>
         <div v-if="joinPayMchType === '2' || joinPayMchType === '3'" style="width: 100%;">
           <div style="width: 100%; text-align: center;">
-            <span
-              style=" font-size: 1.4em; font-weight: bold; line-height: 3; color: #ee0a24;">{{ $t('joinpayMch.failedToPassTheReview') }}</span>
+            <span style=" font-size: 1.4em; font-weight: bold; line-height: 3; color: #ee0a24;">{{$t('joinpayMch.failedToPassTheReview')}}</span>
           </div>
           <div style="width: 100%; text-align: center;">
-            <span style="line-height: 1.2;">{{ $t('joinpayMch.failedToPassTheReview') }},<span
-                style="color: #4d6add; text-decoration: underline;"
-                @click='pageType = "1"'>{{ $t('joinpayMch.clickHereToFillInTheInformationAgain') }}</span></span>
+            <span style="line-height: 1.2;">{{$t('joinpayMch.failedToPassTheReview')}},<span style="color: #4d6add; text-decoration: underline;"
+                                                                                             @click='pageType = "1"'>{{$t('joinpayMch.clickHereToFillInTheInformationAgain')}}</span></span>
           </div>
         </div>
         <div v-if="joinPayMchStep === '0'">
           <div style="width: 100%; text-align: center;">
-            <span
-              style=" font-size: 1.4em; font-weight: bold; line-height: 3; color: #07c160;">{{ $t('joinpayMch.approvalPassed') }}</span>
+            <span style=" font-size: 1.4em; font-weight: bold; line-height: 3; color: #07c160;">{{$t('joinpayMch.approvalPassed')}}</span>
           </div>
           <div style="width: 100%; text-align: center;">
-            <span style="line-height: 1.2;">{{ $t('joinpayMch.approvalPassed') }},{{ $t('joinpayMch.youCan') }}<span
-                style="color: #4d6add; text-decoration: underline;"
-                @click='pageType = "1"'>{{ $t('joinpayMch.clickHereToFillInAgainAndSubmitForReview') }}</span></span>
+            <span style="line-height: 1.2;">{{$t('joinpayMch.approvalPassed')}},{{$t('joinpayMch.youCan')}}<span style="color: #4d6add; text-decoration: underline;"
+                                                                                                                 @click='pageType = "1"'>{{$t('joinpayMch.clickHereToFillInAgainAndSubmitForReview')}}</span></span>
           </div>
           <van-row justify="space-around" style="padding: 1em">
             <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em" @click='pageType = "3"'>
-              {{ $t('joinpayMch.nextGoToUploadIDPhotos') }}</van-button>
+              {{$t('joinpayMch.nextGoToUploadIDPhotos')}}</van-button>
           </van-row>
         </div>
       </div>
@@ -175,50 +152,49 @@
           <div class="upLoaderRow">
             <div class="baseRow flex-row justify-between">
               <div class="group2 flex-col"></div>
-              <span class="baseText">{{ $t('joinpayMch.uploYourIdCard') }}</span>
+              <span class="baseText">{{$t('joinpayMch.uploYourIdCard')}}</span>
             </div>
             <div class="cardRow">
               <div class="cardLi">
                 <van-uploader v-model="cardNegativeList" :max-size="2 * 1024 * 1024" :max-count="1"
-                  :after-read="afterRead" @oversize="onOversize" />
-                <p>{{ $t('joinpayMch.uploPortrait') }}</p>
+                              :after-read="afterRead" @oversize="onOversize" />
+                <p>{{$t('joinpayMch.uploPortrait')}}</p>
               </div>
               <div class="cardLi">
                 <van-uploader v-model="cardPositiveList" :max-size="2 * 1024 * 1024" :max-count="1"
-                  :after-read="afterRead" @oversize="onOversize" />
-                <p>{{ $t('joinpayMch.uploNatiEmblem') }}</p>
+                              :after-read="afterRead" @oversize="onOversize" />
+                <p>{{$t('joinpayMch.uploNatiEmblem')}}</p>
               </div>
             </div>
           </div>
           <div class="upLoaderRow" v-if="bankAccountType === '4'">
             <div class="baseRow flex-row justify-between">
               <div class="group2 flex-col"></div>
-              <span class="baseText">{{ $t('joinpayMch.businessLicensePlace') }}</span>
+              <span class="baseText">{{$t('joinpayMch.businessLicensePlace')}}</span>
             </div>
             <div class="cardRow">
               <div class="cardLi">
                 <van-uploader v-model="tradeLicenceList" :max-size="2 * 1024 * 1024" :max-count="1"
-                  :after-read="afterRead" @oversize="onOversize" />
-                <p>{{ $t('joinpayMch.businessLicense') }}</p>
+                              :after-read="afterRead" @oversize="onOversize" />
+                <p>{{$t('joinpayMch.businessLicense')}}</p>
               </div>
             </div>
           </div>
           <div class="upLoaderRow" v-if="bankAccountType === '4'">
             <div class="baseRow flex-row justify-between">
               <div class="group2 flex-col"></div>
-              <span class="baseText">{{ $t('joinpayMch.accountOpeningLicensePlace') }}</span>
+              <span class="baseText">{{$t('joinpayMch.accountOpeningLicensePlace')}}</span>
             </div>
             <div class="cardRow">
               <div class="cardLi">
                 <van-uploader v-model="openAccountLicenceList" :max-size="2 * 1024 * 1024" :max-count="1"
-                  :after-read="afterRead" @oversize="onOversize" />
-                <p>{{ $t('joinpayMch.accountOpeningLicense') }}</p>
+                              :after-read="afterRead" @oversize="onOversize" />
+                <p>{{$t('joinpayMch.accountOpeningLicense')}}</p>
               </div>
             </div>
           </div>
           <van-row justify="space-around" style="padding: 1em">
-            <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em"
-              native-type="submit">{{ $t('joinpayMch.submissions') }}
+            <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em" native-type="submit">{{$t('joinpayMch.submissions')}}
             </van-button>
           </van-row>
         </van-form>
@@ -240,7 +216,7 @@ export default {
   components: { sHeader },
   setup() {
     // 引入语言
-    const { t } = useI18n();
+    const {t} = useI18n();
     const user = getLoginUser();
     const idCardExpiryShow = ref(false);
     const idCardExpiryOnConfirm = (value) => {
@@ -481,4 +457,6 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>@import "../../common/style/common.less";</style>
+<style lang="less" scoped>
+@import "../../common/style/common.less";
+</style>

+ 16 - 15
src/views/labelMan/add.vue

@@ -4,7 +4,7 @@
     <van-form show-error-message @submit="onSubmit">
       <div class="kBordBott cust_vantBorder">
         <van-field colon :border="false" required v-model="cofficentForm.name" clearable name="name"
-          :label="$t('labelMan.add.name')" :placeholder="$t('labelMan.add.namePlace')" :rules="[
+                   :label="$t('labelMan.add.name')" :placeholder="$t('labelMan.add.namePlace')" :rules="[
             {
               required: true,
               message: $t('labelMan.add.namePlace'),
@@ -13,7 +13,7 @@
       </div>
       <div class="kBordBott">
         <van-field colon :border="false" required clearable name="type" :label="$t('labelMan.add.type')"
-          :placeholder="$t('labelMan.add.typePlace')" :rules="[
+                   :placeholder="$t('labelMan.add.typePlace')" :rules="[
             {
               required: true,
               message: $t('labelMan.add.typePlace'),
@@ -30,8 +30,8 @@
       </div>
       <div v-if="cofficentForm.type === '0'" class="kBordBott cust_vantBorder">
         <van-field colon :border="false" required @click-input="busiAdminInpClk" readonly clearable
-          v-model="cofficentForm.adminNames" name="adminNames" :label="$t('labelMan.add.merchant')"
-          :placeholder="$t('labelMan.add.merchantPlace')" :rules="[
+                   v-model="cofficentForm.adminNames" name="adminNames" :label="$t('labelMan.add.merchant')"
+                   :placeholder="$t('labelMan.add.merchantPlace')" :rules="[
             {
               required: true,
               message: $t('labelMan.add.merchantPlace'),
@@ -40,7 +40,7 @@
           <template #right-icon>
             <div class="l-flex-RC">
               <van-icon v-if="cofficentForm.adminNames" @click="cofficentForm.adminNames = ''" class="o-mr-6"
-                name="clear" />
+                        name="clear" />
               <van-icon @click="busiAdminInpClk" name="arrow-down" />
             </div>
           </template>
@@ -48,8 +48,8 @@
       </div>
       <div v-if="cofficentForm.type === '1'" class="kBordBott cust_vantBorder">
         <van-field colon :border="false" required @click-input="busiEquipInpClk" readonly clearable
-          v-model="cofficentForm.equipmentNames" name="equipmentNames" :label="$t('labelMan.add.machine')"
-          :placeholder="$t('labelMan.add.machinePlace')" :rules="[
+                   v-model="cofficentForm.equipmentNames" name="equipmentNames" :label="$t('labelMan.add.machine')"
+                   :placeholder="$t('labelMan.add.machinePlace')" :rules="[
             {
               required: true,
               message: $t('labelMan.add.machinePlace'),
@@ -58,7 +58,7 @@
           <template #right-icon>
             <div class="l-flex-RC">
               <van-icon v-if="cofficentForm.equipmentNames" @click="cofficentForm.equipmentNames = ''" class="o-mr-6"
-                name="clear" />
+                        name="clear" />
               <van-icon @click="busiEquipInpClk" name="arrow-down" />
             </div>
           </template>
@@ -72,10 +72,10 @@
     </van-form>
     <!-- 商家弹窗 -->
     <kSelectPop @selconfirm="selAdminConfirm" ref="kSelectPopAdminRef" :selOptions="selAdminOptions"
-      :selTitleAndName="['username', 'username']"></kSelectPop>
+                :selTitleAndName="['username', 'username']"></kSelectPop>
     <!-- 机器弹窗 -->
     <kSelectPop @selconfirm="selEquipConfirm" ref="kSelectPopEquipRef" :selOptions="selEquipOptions"
-      :selTitleAndName="['name', 'name']"></kSelectPop>
+                :selTitleAndName="['name', 'name']"></kSelectPop>
   </div>
 </template>
 
@@ -183,12 +183,12 @@ export default {
         cofficentForm.value = row;
         // 处理商家列表,把选中的显示在商家列表
         cofficentForm.value.adminNames = cofficentForm.value.adminNames
-          ? JSON.parse(cofficentForm.value.adminNames).join(",")
-          : "";
+            ? JSON.parse(cofficentForm.value.adminNames).join(",")
+            : "";
         // 处理机器列表,把选中的显示在机器列表
         cofficentForm.value.equipmentNames = cofficentForm.value.equipmentNames
-          ? JSON.parse(cofficentForm.value.equipmentNames).join(",")
-          : "";
+            ? JSON.parse(cofficentForm.value.equipmentNames).join(",")
+            : "";
       }
     });
     // 表单参数
@@ -244,4 +244,5 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+</style>

+ 7 - 7
src/views/labelMan/index.vue

@@ -23,8 +23,8 @@
         <div class="c-text-color c-text-b c-text-15">
           {{ $t("advertManage.advertRule.total")
           }}<span class="c-text-20" style="color: #df5e4c">{{
-  ruleTotal
-}}</span>
+            ruleTotal
+          }}</span>
           {{ $t("alarmHistory.recordsTotal") }}
         </div>
       </div>
@@ -50,7 +50,7 @@
     <kTabs tabWidth="100%" @tabchg="tabChg" :tabList="tabList"></kTabs>
     <div class="contentCon">
       <div @click.self="toEdit(item)" v-for="item in tableData" :key="item.id"
-        class="o-plr-20 o-pt-24 o-pb-12 l-flex-between kBordBott content">
+           class="o-plr-20 o-pt-24 o-pb-12 l-flex-between kBordBott content">
         <div>
           <div class="l-flex-RC">
             <span class="c-color c-text-12">{{ $t("labelMan.labelName") }}:</span>
@@ -59,8 +59,8 @@
           <div class="l-flex-RC">
             <span class="c-color c-text-12">{{ $t("advertManage.advertRule.createTime") }}:</span>
             <span class="c-text-color c-text-12">{{
-              Format_time(item.createDate)
-            }}</span>
+                Format_time(item.createDate)
+              }}</span>
           </div>
         </div>
         <div class="rightCon">
@@ -77,8 +77,8 @@
     </div>
     <!-- 删除确认弹窗 -->
     <kDialog :dialogTitle="$t('advertManage.delPopTitle')" :cancelBtnTxt="$t('advertManage.cancelTxt')"
-      :confirmBtnTxt="$t('advertManage.confirmDel')" ref="kDialogRef" :dialogContent="$t('advertManage.delPopContent')"
-      @confirmclk="confirmClk">
+             :confirmBtnTxt="$t('advertManage.confirmDel')" ref="kDialogRef" :dialogContent="$t('advertManage.delPopContent')"
+             @confirmclk="confirmClk">
     </kDialog>
   </div>
 </template>

+ 0 - 0
src/views/login.vue


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff