fix:"优化参数修改功能"

src/styles/user/index.less

@@ -14,7 +14,7 @@
         height: 100%;
         width: 100%;
         height: calc(100% - 50px);
-        padding-bottom: 10px;
+        // padding-bottom: 10px;
         overflow: auto;
         overflow-x: hidden;
     }
@@ -24,33 +24,33 @@
     }
 
     .baseRow {
-        width: 100%;
-        height: 20px;
-        margin-left: 15px;
-        margin-top: 5px;
-        justify-content: flex-start;
+        // width: 100%;
+        // height: 20px;
+        // margin-left: 15px;
+        margin: 10px 10px;
+        // justify-content: flex-start;
 
         .group2 {
             background-color: #8096ec;
             border-radius: 2px;
             width: 4px;
             height: 16px;
-            margin-top: 4px;
+            // margin-top: 4px;
         }
 
         .baseText {
             width: 150px;
-            height: 20px;
-            margin-top: 2px;
+            // height: 20px;
+            // margin-top: 2px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
-            font-size: 0.35rem;
+            font-size: 13px;
             font-family: PingFangSC-Medium;
             text-align: left;
             white-space: nowrap;
-            line-height: 0.5rem;
+            line-height: 13px;
             display: block;
-            margin-left: 15px;
+            margin-left: 8px;
         }
     }
 
@@ -108,6 +108,7 @@
             .van-cell {
                 padding: 0;
             }
+
             .relationClass {
                 // padding: 0;
 
@@ -149,15 +150,16 @@
         background: #fff;
 
         .operListBox {
-            margin-top: 20px;
+            // margin-top: 5px;
 
             .taskListRow {
                 width: 100%;
-                height: 1.5rem;
+                height: 50px;
                 flex-wrap: wrap;
+                margin: 5px 10px;
 
                 .taskIcon {
-                    width: 13%;
+                    width: 10%;
                     height: 100%;
                     position: relative;
 

src/views/device/deviceOper.vue

@@ -387,7 +387,7 @@ export default {
     };
     // 跳转 - 参数设置
     const paramSetPush = () => {
-      router.push({ path: "paramsSet", query: { deviceId: device.value.id, machineType: device.value.machineType } });
+      router.push({ path: "paramsSet", query: { deviceId: device.value.id, machineType: device.value.machineType, name: device.value.name } });
     };
 
     // 跳转 - 添加分销人

src/views/device/paramsSet/index.vue

@@ -6,10 +6,9 @@
       <div class="wrap2 flex-col van-hairline--bottom">
         <div class="outer1 justify-between">
           <div class="block1"></div>
-          <span class="txt2">{{ $t('device.equipmentName') }}：{{ deviceDetal.name ? deviceDetal.name : $t("device.equipmentNameTips") }}</span>
+          <span class="txt2">{{ $t('device.equipmentName') }}：{{ name ? name : $t("device.equipmentNameTips") }}</span>
         </div>
       </div>
-
       <div class="list van-hairline--bottom" @click="pushPage('0')">
         <div class="title">
           <img class="icon" src='../../../assets/device/currency1.png' />
@@ -56,12 +55,13 @@ export default {
     const route = useRoute();
     const deviceId = route.query.deviceId;
     const machineType = route.query.machineType;
-    const deviceDetal = ref(null);
+    const name = route.query.name;
+    const deviceDetal = ref();
     // 初始化页面获取列表
     onMounted(async () => {
       // 加载样式
       styleUrl('paramsSet');
-      getDeviceDetalFun();
+      await getDeviceDetalFun();
     });
     // 获取设备列表数据
     const getDeviceDetalFun = async () => {
@@ -76,7 +76,8 @@ export default {
     return {
       deviceDetal,
       pushPage,
-      machineType
+      machineType,
+      name
     };
   },
 };

src/views/device/paramsSet/paramsSetInfo.vue

@@ -6,7 +6,8 @@
       <div class="wrap2 flex-col van-hairline--bottom">
         <div class="outer1 flex-row justify-between">
           <div class="block1 flex-col"></div>
-          <span class="txt2">{{ $t('device.equipmentName') }}：{{ deviceDetal.name ? deviceDetal.name : $t("device.equipmentNameTips")
+          <span class="txt2">{{ $t('device.equipmentName') }}：{{ deviceDetal.name ? deviceDetal.name :
+      $t("device.equipmentNameTips")
             }}</span>
         </div>
       </div>
@@ -81,7 +82,7 @@
 <script>
 import { onMounted, ref } from "vue";
 import sHeader from "@/components/SimpleHeader";
-import { useRoute } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import { getDeviceDetal, getParameters, updateParameters, humidityParameters } from "@/service/device";
 import { showFailToast, showSuccessToast, showConfirmDialog, showToast } from "vant";
 import { useI18n } from 'vue-i18n';
@@ -92,6 +93,7 @@ export default {
   setup() {
     const { t } = useI18n();
     const route = useRoute();
+    const router = useRouter();
     const deviceId = route.query.deviceId;
     const machineType = route.query.machineType;
     const deviceDetal = ref([]);
@@ -220,6 +222,9 @@ export default {
         if (data.code) {
           checked.value[key] = !checked.value[key];
           showSuccessToast(t('device.modificationSucceeded'));
+          setTimeout(() => {
+            router.go(-1);
+          }, 1000);
         } else {
           showFailToast(data.message);
         }

src/views/user.vue

@@ -3,8 +3,8 @@
     <div class="userPageBox">
       <s-header :name="sys ? sys.title : $t('user.personalCenter')" :noback="true" :isFixed="false"></s-header>
       <div class="userBaseBox">
-        <div class="baseRow flex-row justify-between">
-          <div class="group2 flex-col"></div>
+        <div class="baseRow l-flex-RC">
+          <div class="group2"></div>
           <span class="baseText">{{ $t("user.essentialInformation") }}</span>
         </div>
         <div class="userMessage flex-row justify-between">
@@ -213,13 +213,13 @@
       <div class="lineBox"></div>
       <div class="commonOperBox">
         <!-- 常用操作 -->
-        <div class="baseRow flex-row justify-between">
-          <div class="group2 flex-col"></div>
+        <div class="baseRow l-flex-RC">
+          <div class="group2"></div>
           <span class="baseText">{{ $t("user.commonOperations") }}</span>
         </div>
         <div class="operListBox">
           <!-- 常用工具 -->
-          <div class="taskListRow flex-col" @click="pushPageList('/commonTools')">
+          <div class="taskListRow l-flex-RC" @click="pushPageList('/commonTools')">
             <div class="taskIcon commonToolsIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">{{ $t("home.commonTools") }}</div>
@@ -227,7 +227,7 @@
           </div>
 
           <!-- 任务消息 -->
-          <div v-if="roleCheck()" class="taskListRow flex-col" @click="pushPageList('/taskMessage')">
+          <div v-if="roleCheck()" class="taskListRow l-flex-RC" @click="pushPageList('/taskMessage')">
             <div class="taskIcon taskMessageIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">{{ $t("user.taskMessage") }}</div>
@@ -235,7 +235,7 @@
           </div>
 
           <!-- 提现帐号 -->
-          <div v-if="isInland && user.type == '2'" class="taskListRow flex-col" @click="pushPageList('/settlement')">
+          <div v-if="isInland && user.type == '2'" class="taskListRow l-flex-RC" @click="pushPageList('/settlement')">
             <div class="taskIcon joinPayMchIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">{{ $t("user.settlementAccount") }}</div>
@@ -243,7 +243,7 @@
           </div>
 
           <!-- 公告编辑 -->
-          <div v-if="user.type == '0'" class="taskListRow flex-col" @click="pushPageList('/announcement')">
+          <div v-if="user.type == '0'" class="taskListRow l-flex-RC" @click="pushPageList('/announcement')">
             <div class="taskIcon announcementIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">
@@ -253,7 +253,7 @@
           </div>
 
           <!-- 绑定微信 -->
-          <div v-if="isInWeChat" class="taskListRow flex-col" @click="pushPageList('/bindWechat')">
+          <div v-if="isInWeChat" class="taskListRow l-flex-RC" @click="pushPageList('/bindWechat')">
             <!--          <div class="taskListRow flex-col" @click="pushPageList('/bindWechat')">-->
             <div class="taskIcon bindWechatIcon"></div>
             <div class="taskRight">
@@ -264,7 +264,7 @@
           </div>
 
           <!-- 定位修改 -->
-          <div v-if="user.type <= '1'" class="taskListRow flex-col" @click="pushPageList('/modifyLoc')">
+          <div v-if="user.type <= '1'" class="taskListRow l-flex-RC" @click="pushPageList('/modifyLoc')">
             <!-- <div class="taskListRow flex-col" @click="pushPageList('/modifyLoc')"> -->
             <div class="taskIcon modifyLocIcon"></div>
             <div class="taskRight">
@@ -275,7 +275,7 @@
           </div>
 
           <!-- 数据同步 -->
-          <div v-if="user.type == '0'" class="taskListRow flex-col" @click="pushPageList('/syncOldData')">
+          <div v-if="user.type == '0'" class="taskListRow l-flex-RC" @click="pushPageList('/syncOldData')">
             <!-- <div class="taskListRow flex-col" @click="pushPageList('/syncOldData')"> -->
             <div class="taskIcon syncOldDataIcon"></div>
             <div class="taskRight">
@@ -286,7 +286,7 @@
           </div>
 
           <!-- 修改密码 -->
-          <div class="taskListRow flex-col" @click="pushPageList('/changepassword')">
+          <div class="taskListRow l-flex-RC" @click="pushPageList('/changepassword')">
             <div class="taskIcon changePasswordIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">{{ $t("user.changePassword") }}</div>
@@ -294,7 +294,7 @@
           </div>
 
           <!-- 意见反馈 -->
-          <div v-if="user.type > 1" class="taskListRow flex-col" @click="pushPageList('/feedback')">
+          <div v-if="user.type > 1" class="taskListRow l-flex-RC" @click="pushPageList('/feedback')">
             <div class="taskIcon feedbackIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">{{ $t("user.feedback") }}</div>
@@ -302,7 +302,7 @@
           </div>
 
 
-          <div class="taskListRow flex-col" @click="onperExitSys()">
+          <div class="taskListRow l-flex-RC" @click="onperExitSys()">
             <div class="taskIcon loginOutIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">{{ $t("user.logOut") }}</div>
@@ -753,7 +753,7 @@ export default {
       gettAdminGetRelation();
       // 获取账户
       getAcccountDetail();
-      if (user.id == 1) {
+      if (user.type == 0) {
         chaSzPayShow.value = true;
         chaScPayShow.value = true;
         getSunzeeDetail();