style:“优化部分样式”

src/assets/language/en.json

@@ -475,7 +475,7 @@
     "humidity": "%RH",
     "volume": "Volume",
     "alarmContent": "Alarm content",
-    "alarmContentNoData": "Machine is normal, no alarm.",
+    "alarmContentNoData": "Machine is normal.",
     "alarmClock": "Machine alarm!",
     "eliminateAlarm": "Eliminate",
     "editDevice": "Machine information",
@@ -557,7 +557,7 @@
     "versionNo": "Version No",
     "url": "URL",
     "urlPlace": "please enter the url",
-    "update": "to update",
+    "update": "Update",
     "sureUpdate": "Are you sure you want to update",
     "coupon": "coupon",
     "adRule": "Advertising rules",
@@ -1287,7 +1287,7 @@
     "forgetPassWord": "Forget password ?",
     "regusterButton": "Click Register",
     "loginButton": "Sign in",
-    "loginSucess": "Login succeeded"
+    "loginSucess": "Successful"
   },
   "register": {
     "header": "User Registration",
@@ -1385,9 +1385,9 @@
     "feedback": "Feedback",
     "selfRecharging": "Self recharging",
     "logOut": "Sign out",
-    "logOutTips": "tips",
-    "cancelLog": "cancel",
-    "confirmLog": "confirm",
+    "logOutTips": "Tips",
+    "cancelLog": "Cancel",
+    "confirmLog": "Confirm",
     "logOutContent": "Are you sure you want to log out",
     "corrEmailPlace": "Please enter the correct email address",
     "corrPhonePlace": "Please enter the correct mobile number",

src/assets/language/zh.json

@@ -1405,7 +1405,7 @@
     "logOutTips": "提示",
     "cancelLog": "取消",
     "confirmLog": "确定",
-    "logOutContent": "确定需要退出登录吗",
+    "logOutContent": "确定退出系统吗",
     "corrEmailPlace": "请输入正确的邮箱",
     "corrPhonePlace": "请输入正确的手机号",
     "bindWechat": "绑定微信",

src/styles/device/index.less

@@ -57,7 +57,7 @@
       }
 
       .bd1 {
-        width: 100%;
+        // width: 100%;
         // height: 108px;
         background: url(../../assets/home/outer.png) no-repeat;
         background-size: 100% 100%;
@@ -100,40 +100,6 @@
               }
             }
           }
-
-          // .TextGroup4 {
-          //   height: 57px;
-          //   // width: 48px;
-
-          //   .main6 {
-          //     width: 48px;
-          //     height: 57px;
-
-          //     .word5 {
-          //       height: 26px;
-          //       overflow-wrap: break-word;
-          //       color: rgba(223, 94, 76, 1);
-          //       font-size: 22px;
-          //       font-family: Helvetica;
-          //       text-align: center;
-          //       white-space: nowrap;
-          //       line-height: 26px;
-          //       display: block;
-          //     }
-
-          //     .word6 {
-          //       height: 17px;
-          //       overflow-wrap: break-word;
-          //       color: rgba(135, 135, 166, 1);
-          //       font-size: 12px;
-          //       text-align: center;
-          //       white-space: nowrap;
-          //       line-height: 17px;
-          //       margin-top: 14px;
-          //       display: block;
-          //     }
-          //   }
-          // }
         }
       }
     }
@@ -162,7 +128,7 @@
             }
 
             .txtBox {
-              width: 7rem;
+              width: 295px;
               // overflow: auto;
 
               .txt1 {
@@ -224,8 +190,8 @@
           .txt1 {
             // width: 100%;
             color: rgba(64, 77, 116, 1);
-            font-size: 0.375rem;
-            line-height: 0.5rem;;
+            font-size: 14px;
+            line-height: 20px;
             display: flex;
             align-items: center;
           }
@@ -246,10 +212,10 @@
               // width: 100%;
               padding: 10px 10px;
               color: rgba(64, 77, 116, 1);
-              font-size: 0.375rem;
+              font-size: 13px;
               text-align: left;
               flex-wrap: wrap; 
-              line-height: 0.375rem;
+              line-height: 13px;
               display: flex;
               align-items: center;
 
@@ -281,10 +247,10 @@
               }
 
               .word3 {
-                width: 50%;
+                width: 130px;
                 // padding: 0 0;
                 margin-right: 10px;
-                line-height: 0.5rem;
+                line-height: 18px;
               }
 
               .editIcon {
@@ -299,13 +265,13 @@
               .clickable-link {
                 // text-decoration: underline;
                 cursor: pointer;
-                font-size: 0.375rem;
-                width: 80%;
+                font-size: 13px;
+                width: 240px;
                 // display: flex;
                 // flex-wrap: wrap;
                 // padding-right: 1rem;
                 // margin-right: 1rem;
-                line-height: 0.5rem;;
+                line-height: 20px;
               }
 
             }
@@ -431,7 +397,7 @@
             .editDeviceBtnCon {
 
               .box2 {
-                width: 0.5rem;
+                width: 10px;
                 height: 0.5rem;
                 background: url("../../assets/order/gotoRight.png") no-repeat;
                 background-size: 100%;
@@ -441,7 +407,7 @@
               .c-text-14 {
                 display: inline-block;
                 /* 将行内文本转为块级元素 */
-                padding: 0.1rem 0.5rem;
+                padding: 5px 10px;
                 /* 添加内边距 */
                 background-color: #df5e4c;
                 border-radius: 0.5rem;

src/styles/deviceSet/index.less

@@ -1,3 +1,8 @@
+body * {
+    box-sizing: border-box;
+    flex-shrink: 0;
+}
+
 .deviceSetPage {
     background-color: rgba(255, 255, 255, 1);
     // position: relative;

src/styles/discountCode/index.less

@@ -49,7 +49,7 @@
 
             .main5 {
                 width: auto;
-                
+
                 .label2 {
                     width: 20px;
                     height: 20px;
@@ -159,7 +159,7 @@
                 .checkedBox {
                     position: absolute;
                     top: 40px;
-                    right: 10%;          
+                    right: 10%;
                 }
 
             }

src/styles/joinpayMch/index.less

@@ -89,24 +89,6 @@
 
     }
 
-    .bankCode {
-        .van-cell__title {
-            width: 35%;
-            position: relative;
-
-            &::after {
-                content: '*';
-                color: red;
-                position: absolute;
-                left: -6em;
-            }
-        }
-
-        .van-field__body {
-            width: 50%;
-        }
-    }
-
     .custom-input {
         .van-cell__title {
             width: 35%;
@@ -181,7 +163,7 @@
     }
 
     .van-radio__icon .van-icon {
-        font-size: 16px ;
+        font-size: 16px;
     }
 
     .van-radio__icon--checked .van-icon {

src/styles/orderCenter/index.less

@@ -4,14 +4,14 @@
     height: calc(100% - 44px);
     overflow: auto;
     overflow-x: hidden;
-    background-color: #f5f5f5;
+    // background-color: #f5f5f5;
 
     .main3 {
       // width: 100%;
       height: 60px;
       background: rgba(255, 255, 255, 1) url("../../assets/home/line.png") bottom center no-repeat;
       background-size: 100% auto;
-      background-color: #f5f5f5;
+      background-color: #ffffff;
 
       .group4 {
         // width: 100%;
@@ -144,7 +144,7 @@
       // width: 100%;
       background: rgba(255, 255, 255, 1) url("../../assets/home/line.png") bottom center no-repeat;
       background-color: #fff;
-      box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+      box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
 
 
       .main9 {
@@ -238,15 +238,15 @@
         height: 170px;
         position: relative;
         padding: 10px 10px;
-        background-color: #f5f5f5;
+        background-color: #ffffff;
 
         .van-card {
           height: 150px;
-          background-color: #ffff;
+          // background-color: #ffff;
           display: flex;
           align-items: center;
           border-radius: 20px;
-          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+          box-shadow: 5px 5px 5px 2px rgba(0, 0, 0, 0.1);
 
         }
 

src/styles/user/index.less

@@ -78,7 +78,7 @@
 
     .userInfoBox {
         // margin-top: 25px;
-        padding: 0px 0.5rem 0.5rem;
+        padding: 0px 10px 0.5rem;
 
         .userInfo {
             // width: 87%;
@@ -96,33 +96,38 @@
             .editIcon {
                 position: absolute;
                 right: 0;
-                font-size: 0.5rem;
+                font-size: 18px;
                 color: #4d6add;
             }
 
             .userInfoLeft {
-                width: 2.5rem;
+                width: 80px;
             }
 
+            .van-cell {
+                padding: 0;
+            }
             .relationClass {
                 // padding: 0;
 
+
                 .van-field__control {
                     // height: 38px;
                     line-height: 0.5rem;
-                    padding: 6px;
+                    padding: 5px;
                     border-radius: 2px;
                     background: #fff;
                     border: 1px solid #dddde8;
-                    width: 60%;
+                    width: 140px;
+                    margin-left: 4px;
                 }
 
                 .van-field__button {
                     background-color: #4d6add;
                     color: #fff;
-                    padding: 0 0.3rem;
+                    padding: 0 10px;
                     margin-left: 15px;
-                    border-radius: 0.5rem;
+                    border-radius: 10px;
                 }
             }
         }

src/views/advertManage/advertRule/add.vue

@@ -15,7 +15,7 @@
           :label="$t('advertManage.advertRule.addRule.pushMerchant')"
           :placeholder="$t('advertManage.advertRule.addRule.pushMerchantPlace')" />
         <van-field readonly colon :border="false" v-model="cofficentForm.A_advertList" clearable name="A_advertList"
-          :placeholder="$t('advertManage.advertRule.addRule.AScreenPlace')" class="input1"
+          :placeholder="$t('advertManage.advertRule.addRule.AScreenPlace')"
           :label="$t('advertManage.advertRule.addRule.AScreen')">
           <template #button>
             <van-button @click="searchClk(0)" type="primary">{{
@@ -24,7 +24,7 @@
           </template>
         </van-field>
         <van-field required readonly colon :border="false" v-model="cofficentForm.B_advertList" clearable
-          name="B_advertList" :placeholder="$t('advertManage.advertRule.addRule.BScreennPlace')" class="input1"
+          name="B_advertList" :placeholder="$t('advertManage.advertRule.addRule.BScreennPlace')"
           :label="$t('advertManage.advertRule.addRule.BScreen')" :rules="[
             {
               required: true,

src/views/advertManage/advertRule/screen.vue

@@ -14,7 +14,7 @@
             : $t("advertManage.advertRule.addRule.BScreen")
           }}
         </div>
-        <div class="c-border o-ptb-10 o-plr-12 l-flex-RC l-flex-w" style="padding-bottom: 0; min-height: 36px">
+        <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">
           <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">
             <span class="o-mr-3">{{ item.name }}</span>

src/views/device/editAdRule/index.vue

@@ -5,7 +5,7 @@
       <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; width: 70%;"
+            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"

src/views/orderCenter/index.vue

@@ -24,7 +24,7 @@
             </div>
           </div>
         </div>
-        <img class="img1" referrerpolicy="no-referrer" src="@/assets/line.png" />
+        <!-- <img class="img1" referrerpolicy="no-referrer" src="@/assets/line.png" /> -->
         <dateSelectList @update="update($event)"></dateSelectList>
         <typeSelectList @upselectdata="upselectdata($event)"></typeSelectList>
         <!-- 销售数据 -->

src/views/settlement/index.vue

@@ -239,7 +239,7 @@
             :rules="[{ required: bankAccountType === '4', message: $t('joinpayMch.interBankNoPlaceholder') }]"
             @update:model-value="fieldUpdate" />
           <!-- 银行编号 -->
-          <van-field v-if="bankAccountType === '4'" class="bankCode" v-model="bankCodeValue" name="bankCodeValue"
+          <van-field v-if="bankAccountType === '4'" class="requiredLeft" v-model="bankCodeValue" name="bankCodeValue"
             :label="$t('huifuMch.bankCodeLabel')" :placeholder="$t('huifuMch.bankCodePlaceholder')"
             :rules="[{ required: true, message: $t('huifuMch.bankCodePlaceholder') }]" @update:model-value="fieldUpdate">
             <template #button>

src/views/user.vue

@@ -153,10 +153,10 @@
               <span class="userInfoLeft">{{ $t("user.diyPassword") }}: </span>
               <div>
                 <van-field class="relationClass" v-model="diyPassword" :placeholder="$t('user.diyPasswordPlace')">
-  
+
                   <template #button>
                     <van-button type="primary" @click="mailboxChg(diyPassword, 6)">{{
-          $t("user.confirmLog") }}
+        $t("user.confirmLog") }}
                     </van-button>
                   </template>
                 </van-field>
@@ -174,8 +174,8 @@
           <div v-if="chaSzPayShow" class="userInfo l-flex-between">
             <span class="userInfoLeft">{{ $t("user.szPayType") }}: </span>
             <div class="cust_vantBorder o-pl-5">
-              <van-switch :model-value="sunzeePay" active-color="#0090fa" inactive-color="#30c25c" style="font-size: 0.5rem;"
-                @update:model-value="changeSunzeePay" />
+              <van-switch :model-value="sunzeePay" active-color="#0090fa" inactive-color="#30c25c"
+                style="font-size: 0.5rem;" @update:model-value="changeSunzeePay" />
             </div>
             <span class="o-pl-10">{{ $t("user.currentChoose") }}: {{ sunzeePay ? "汇付" : "汇聚" }}</span>
           </div>
@@ -183,8 +183,8 @@
           <div v-if="chaScPayShow" class="userInfo l-flex-between">
             <span class="userInfoLeft">{{ $t("user.scPayType") }}: </span>
             <div class="cust_vantBorder o-pl-5">
-              <van-switch :model-value="sevencloudPay" active-color="#0090fa" inactive-color="#30c25c" style="font-size: 0.5rem;"
-                @update:model-value="changeSevenCloudPay" />
+              <van-switch :model-value="sevencloudPay" active-color="#0090fa" inactive-color="#30c25c"
+                style="font-size: 0.5rem;" @update:model-value="changeSevenCloudPay" />
             </div>
             <span class="o-pl-10">{{ $t("user.currentChoose") }}: {{ sevencloudPay ? "汇付" : "汇聚" }}</span>
           </div>
@@ -697,7 +697,36 @@ export default {
       router.push({ path: "uniPay" });
     };
     const onperExitSys = () => {
-      kDialogRef.value.openDialog();
+      // kDialogRef.value.openDialog();
+      showConfirmDialog({
+        title: t('user.tips'),
+        message: t('user.logOutContent'),
+      }).then(() => {
+        // 获取缓存的语言
+        const savedCredentials = localStorage.getItem('savedCredentials');
+        const curLang = localStorage.getItem("curLang");
+        // 清空缓存
+        localStorage.clear();
+        localStorage.setItem("curLang", curLang);
+        if (savedCredentials) {
+          localStorage.setItem('savedCredentials', savedCredentials);
+        }
+        if (sys.value) {
+          setTimeout(() => {
+            router.push({
+              path: "login",
+              query: { relation_admin_id: sys.value.relationAdminId },
+            });
+          }, 200);
+        } else {
+          setTimeout(() => {
+            router.push({ path: "login" });
+          }, 200);
+        }
+      }).catch((error) => {
+        console.error(error);
+      })
+
     };
     const pushPageList = (url) => {
       router.push({ path: url });

vue.config.js

@@ -4,11 +4,11 @@ module.exports = {
   publicPath: "/shenze",
   assetsDir: 'static',
   css: {
-    // extract: false
-    extract: {
-      filename: `css/[name].${version}.css`,   
-      chunkFilename: `css/[name].${version}.css`
-    }
+    extract: false
+    // extract: {
+    //   filename: `css/[name].${version}.css`,   
+    //   chunkFilename: `css/[name].${version}.css`
+    // }
   },
   filenameHashing: false,
   configureWebpack: {