feat：“同步11.09”

src/assets/language/en.json

@@ -1218,7 +1218,8 @@
     "registerButton": "Register",
     "replaysInSeconds": "Replays in seconds",
     "emailRegistration": "Email",
-    "phoneRegistration": "Phone"
+    "phoneRegistration": "Phone",
+    "twoTypedDiff" : "The two passwords are different"
   },
   "robotRanking": {
     "machineSalesRanking": "Machine sales ranking",

src/assets/language/zh.json

@@ -1232,7 +1232,8 @@
     "registerButton": "注册",
     "replaysInSeconds": "秒后可重发",
     "emailRegistration": "邮箱注册",
-    "phoneRegistration": "手机注册"
+    "phoneRegistration": "手机注册",
+    "twoTypedDiff" : "两次输入的密码不一致"
   },
   "robotRanking": {
     "machineSalesRanking": "机器销售排行榜",

src/service/register.js

@@ -8,4 +8,9 @@ export function sentRegisterCode(params) {
 // 注册
 export function tAdminSave(params) {
   return axios.post(`/SZWL-SERVER/tAdmin/save`, params);
+}
+
+// 获取最后一次发送验证码的时间
+export function getLastSendTime(params) {
+  return axios.get(`/SZWL-SERVER/tMessageCode/getLastSendTime?phoneOrEmail=${params.phoneOrEmail}`, params);
 }

src/styles/register/index.less

@@ -18,7 +18,7 @@
         }
 
         .van-field__button button {
-          background-color: #5a9cc8;
+          background-color: #2c87c8;
           color: #fff;
         }
 

src/views/device/deviceOper.vue

@@ -75,12 +75,12 @@
         </div>
         <div class="operText">{{ $t("device.modulation") }}</div>
       </div>
-      <div v-if="user.ifForeign == '0'" class="operItem" @click="recharge()">
+      <!-- <div v-if="user.ifForeign == '0'" class="operItem" @click="recharge()">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/recharge.png" />
         </div>
         <div class="operText">{{ $t("device.equipmentRecharge") }}</div>
-      </div>
+      </div> -->
       <div class="operItem" @click="paramSetPush()">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/paramsSet.png" />
@@ -369,7 +369,7 @@ export default {
       }
       // 系统脱机
       if (operType.value === 5) {
-        const { data } = await deviceTuoji({ id: device.value.id });
+        const { data } = await deviceTuoji({ id: device.value.id, clientId: device.value.clientId, adminUserName: user.username });
         if (data.code) {
           Toast.success(t("device.sysOffSuccess"));
           operCheckShow.value = false;

src/views/register.vue

@@ -120,10 +120,13 @@ import sHeader from '@/components/SimpleHeader';
 import logiLogoImgUrl from "@/assets/login/logo.png";
 import { useRouter } from 'vue-router';
 import { getLocal, setLocal, styleUrl } from '@/common/js/utils';
+import { useI18n } from "vue-i18n";
 
 
 export default {
   setup() {
+    // 引入语言
+    const { t } = useI18n();
     const active = ref(0);
     const username = ref('');
     const name = ref('');
@@ -146,7 +149,7 @@ export default {
     // 注册点击
     const registerSubmit = async () => {
       if (password.value !== passwordCheck.value) {
-        Toast.fail('两次密码不一致,请确认密码');
+        Toast.fail(t('register.twoTypedDiff'));
         return false;
       }
       const { data } = await tAdminSave({
@@ -186,21 +189,21 @@ export default {
       if (data.code === '00000') {
         Toast(data.data);
         console.log('seedVerCodeSuccess');
-        verCodeTime.time = 2 * 60;
+        verCodeTime.time = 1 * 60;
         verCodeTimeInterval();
       } else {
         Toast.fail(data.message);
       }
     }
-    // 验证码发送成功开始3分钟倒计时
+    // 验证码发送成功开始1分钟倒计时
     const verCodeTimeInterval = () => {
-      verCodeTime.time--;
-      setLocal('registerVerCodeTime', verCodeTime.time)
-      if (verCodeTime.time !== 0) {
-        setTimeout(() => {
-          verCodeTimeInterval();
-        }, 1000);
-      }
+      const intervalId = setInterval(() => {
+        verCodeTime.time--;
+        setLocal('registerVerCodeTime', verCodeTime.time);
+        if (verCodeTime.time === 0) {
+          clearInterval(intervalId); // 清除定时器
+        }
+      }, 1000);
     }
     // 初始化页面获取验证码倒计时
     onMounted(async () => {

src/views/settlement/index.vue

@@ -889,7 +889,7 @@ export default {
       huifuParams.phone = addParams.busiContactMobileNo;
       huifuParams.email = addParams.emailValue;
       huifuParams.cardName = addParams.bankAccountName;
-      huifuParams.cardNo = addParams.bankAccountNo;
+      huifuParams.cardNo = addParams.bankAccountNo.replace(/\s/g, '');
       huifuParams.mp = addParams.phoneNo;
       huifuParams.certNo = addParams.idCardNo;
       huifuParams.certValidityType = addParams.validityType;

src/views/user.vue

@@ -226,12 +226,12 @@
           </div>
 
           <!-- 自动充值 -->
-          <div v-if="isInland" class="taskListRow flex-col" @click="operUnipay()">
+          <!-- <div v-if="isInland" class="taskListRow flex-col" @click="operUnipay()">
             <div class="taskIcon selfPayIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">{{ $t("user.selfRecharging") }}</div>
             </div>
-          </div>
+          </div> -->
 
           <div class="taskListRow flex-col" @click="onperExitSys()">
             <div class="taskIcon loginOutIcon"></div>