Merge remote-tracking branch 'origin/sunzee-test' into sunzee-test

src/assets/language/en.json

@@ -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"
+}

src/assets/language/zh.json

@@ -1347,5 +1347,8 @@
   },
   "wechat": {
     "headerName": "绑定微信"
-  }
-}
+  },
+  "账户操作": "账户操作",
+  "优惠码": "优惠码",
+  "报警历史": "报警历史"
+}

src/views/home/index.vue

@@ -97,7 +97,8 @@
         <div class="main25 flex-col" v-for="(item, index) in pushToolList" :key="index" @click="pushToolPage(item.value)">
           <img class="mod7 flex-col" :src="showLogo(item.value)" />
           <div class="TextGroup14 flex-col">
-            <span class="info15" v-html="item.label"></span>
+            <!-- <span class="info15" v-html="item.label"></span> -->
+            <span class="info15">{{ $t(item.label) }}</span>
           </div>
         </div>
       </div>

src/views/login.vue

@@ -135,7 +135,7 @@ export default {
         // console.log('loginUser JSON：', JSON.stringify(data.data));
         Toast.success(t('login.loginSucess'));
         // 需要刷新页面，否则 axios.js 文件里的 token 不会被重置
-        // window.location.href = '/';
+        window.location.href = '/shenze/';
         setTimeout(() => {
           router.push("/home");
         }, 200);