Browse Source

style:“优化设备列表刷新逻辑”

soobin 1 year ago
parent
commit
7ef16719ec

+ 7 - 4
src/App.vue

@@ -4,8 +4,11 @@
       <transition :name="transitionName">
         <!-- 缓存组件,但是进入编辑页面就会有问题 -->
         <!-- <keep-alive include="device,deviceSet,role"><component :is="Component" /></keep-alive> -->
-        <component :is="Component" />
+        <component :is="Component"  v-if="!$route.meta.keepAlive"/>
       </transition>
+      <keep-alive>
+      <component :is="Component"  v-if="$route.meta.keepAlive"/>
+    </keep-alive>
     </router-view>
   </div>
 </template>
@@ -95,13 +98,13 @@ p {
 
 html {
   height: 100%;
-  overflow: hidden;
+  // overflow: hidden;
 }
 
 body {
   height: 100%;
-  overflow-x: hidden;
-  overflow-y: auto;
+  // overflow-x: hidden;
+  // overflow-y: auto;
 }
 
 #app {

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


+ 1 - 0
src/assets/language/en.json

@@ -418,6 +418,7 @@
     "temperatureInCabinet": "Temperature in cabinet",
     "humidityInCabinet": "Humidity in cabinet",
     "showGoods": "Block or display goods",
+    "diyFlower": "DIY flower",
     "editCheck": "Are you sure about the change?",
     "unknownError": "Unknown error!",
     "degree": "℃",

+ 1 - 0
src/assets/language/zh.json

@@ -418,6 +418,7 @@
     "outsidehd": "柜外湿度",
     "noData": "暂无数据",
     "showGoods": "屏蔽/显示商品",
+    "diyFlower": "DIY花型",
     "editCheck": "是否确认更改?",
     "unknownError": "未知错误!",
     "degree": "℃",

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

@@ -1,10 +1,10 @@
 .pageClock {
   background-color: rgba(255, 255, 255, 1);
-  position: relative;
+  // position: relative;
   width: 100%;
   height: 100%;
-  overflow: hidden;
-  overflow-y: auto;
+  overflow: auto;
+  overflow-x: hidden;
 
   .bd1 {
     width: 100%;

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

@@ -1,13 +1,13 @@
 .devicePage {
   background-color: rgba(255, 255, 255, 1);
   position: relative;
-  overflow: hidden;
-
+  // overflow: hidden;
+  
   .listBox {
     width: 100%;
-    height: calc(100vh - 100px);
-    overflow: hidden;
-    overflow-y: auto;
+    // height: calc(100vh - 100px);
+    // height: auto;
+    // overflow: auto;
 
     .deviceBox1 {
       .searchRow {

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

@@ -126,10 +126,10 @@
 
 .pageDoor {
     background-color: rgba(255, 255, 255, 1);
-    position: relative;
+    // position: relative;
     width: 100%;
     height: calc(100vh - 44px);
-    overflow: hidden;
+    overflow: auto;
 
 
     .box1 {

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

@@ -1,10 +1,10 @@
 .deviceSetPage {
     background-color: rgba(255, 255, 255, 1);
-    position: relative;
+    // position: relative;
     width: 100%;
     height: calc(100vh);
-    overflow: hidden;
-    overflow-y: auto;
+    overflow: auto;
+    overflow-x: hidden;
 
     .bd1 {
         width: 100%;

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

@@ -1,9 +1,9 @@
 .sugarPage {
     background-color: rgba(255, 255, 255, 1);
-    position: relative;
+    // position: relative;
     width: 100%;
     height: calc(100vh - 44px);
-    overflow: hidden;
+    overflow: auto;
 
     .van-cell {
         margin-top: 13px;

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

@@ -1,7 +1,7 @@
 .modifyPriceIdx {
     height: calc(100%-44px);
-    overflow: hidden;
-    overflow-y: auto;
+    overflow: auto;
+    overflow-x: hidden;
 
     .headerCon {
         .line {

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

@@ -1,9 +1,9 @@
 .modulationPage {
   background-color: rgba(255, 255, 255, 1);
-  position: relative;
+  // position: relative;
   width: 100%;
   height: calc(100vh - 44px);
-  overflow: hidden;
+  overflow: auto;
 
   .van-slider {
     width: 92%;

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

@@ -2,12 +2,12 @@
     background-color: #fff;
     width: 100%;
     height: calc(100%-44px);
-    overflow: hidden;
-    overflow-y: auto;
+    overflow: auto;
+    overflow-x: hidden;
 
     .Body {
         z-index: 22;
-        position: relative;
+        // position: relative;
         width: 100%;
 
         .mod3 {

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

@@ -1,7 +1,7 @@
 .paramsSetPage {
-    position: relative;
+    // position: relative;
     width: 100%;
-    overflow: hidden;
+    overflow: auto;
 
     .paramsSetBox {
         width: 100%;

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

@@ -1,9 +1,9 @@
 .rechargePage {
     background-color: rgba(255, 255, 255, 1);
-    position: relative;
+    // position: relative;
     width: 100%;
     height: calc(100vh - 44px);
-    overflow: hidden;
+    overflow: auto;
 
     .numberInput {
         .van-field__control {

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

@@ -106,11 +106,12 @@ button:active {
 
 .robotRanking {
     background-color: #fff;
-    position: relative;
+    // position: relative;
     width: 100%;
+    height: calc(100%-50px);
     padding-bottom: 60px;
-    overflow: hidden;
-    overflow-y: auto;
+    overflow: auto;
+    overflow-x: hidden;
 
     .box1 {
         height: 100%;

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

@@ -1,7 +1,7 @@
 .showGoodsIdx {
     // height: calc(100%-44px);
-    overflow: hidden;
-    overflow-y: auto;
+    overflow: auto;
+    overflow-x: hidden;
 
 
     .headerCon {

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

@@ -2,7 +2,7 @@
     width: 100%;
     background: url(../../assets/user/bg.png) top center no-repeat;
     background-size: 100%;
-    position: relative;
+    // position: relative;
 
     .simple-header {
         background: transparent;
@@ -10,9 +10,9 @@
 
     .userPageBox {
         width: 100%;
-        height: calc(100% - 100px);
+        height: calc(100% - 50px);
         height: 100%;
-        margin-bottom: 100px;
+        // margin-bottom: 100px;
         overflow: auto;
         overflow-x: hidden;
     }

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

@@ -1,9 +1,9 @@
 .viewLogsPage {
 	background-color: rgba(255, 255, 255, 1);
-	position: relative;
+	// position: relative;
 	width: 100%;
 	height: calc(100vh - 44px);
-	overflow: hidden;
+	overflow: auto;
 
 	.volumeChangeButton {
 		background-color: #4d6add;

+ 22 - 0
src/views/device/deviceOper.vue

@@ -105,12 +105,21 @@
         </div>
         <div class="operText">{{ $t("device.modifyPrice") }}</div>
       </div>
+      <!-- 屏蔽/展示商品 -->
       <div class="operItem" @click="showGoodsClk()">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/showGoods.png" />
         </div>
         <div class="operText">{{ $t("device.showGoods") }}</div>
       </div>
+      <!-- DIY花型 -->
+      <!-- <div class="operItem" @click="diyFlowerClk()">
+        <div class="operIcon">
+          <img class="operImg" src="../../assets/device/operIcon/diyFlower.png" />
+        </div>
+        <div class="operText">{{ $t("device.diyFlower") }}</div>
+      </div> -->
+      <!-- 修改机器密码 -->
       <div v-if="user.type < 3" class="operItem" @click="changePasswordClk()">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/password.png" />
@@ -199,6 +208,14 @@ export default {
         query: { deviceId: device.value.id, name: device.value.name },
       });
     };
+    
+    // 点击DIY花型
+    const diyFlowerClk = () => {
+      router.push({
+        path: "diyFlower",
+        query: { deviceId: device.value.id, name: device.value.name },
+      });
+    };
     const { t } = useI18n();
     const user = getLoginUser();
     const router = useRouter();
@@ -224,6 +241,9 @@ export default {
         sleepTitle.value = t("device.turnOnSleep");
       }
     };
+    const closeOper = () => {
+      show.value = false;
+    }
     // 重启炉头
     const restartFurnace = () => {
       operType.value = 1;
@@ -411,6 +431,7 @@ export default {
       show,
       operCheckShow,
       showOper,
+      closeOper,
       restartFurnace,
       operCheckClear,
       operCheck,
@@ -428,6 +449,7 @@ export default {
       isRole,
       modifyPriceClk,
       showGoodsClk,
+      diyFlowerClk,
       sleepTitle,
       viewLogs,
       deleteDevice,

+ 15 - 11
src/views/device/deviceSet.vue

@@ -12,8 +12,7 @@
           </div>
           <div class="mod2 flex-col"></div>
         </div>
-        <van-field readonly v-model="deviceDetal.clientId" :label="`${$t('device.equipmentCode')}`"
-          placeholder="" />
+        <van-field readonly v-model="deviceDetal.clientId" :label="`${$t('device.equipmentCode')}`" placeholder="" />
         <div class="cust_vantBorder">
           <van-field required clearable v-model="deviceDetal.name" name="name"
             :label="`${$t('device.equipmentNameLabel')}`" :placeholder="$t('device.equipmentNamePlaceholder')" :rules="[
@@ -58,8 +57,7 @@
             </template>
           </van-field>
         </div> -->
-        <van-field readonly v-model="deviceDetal.equimentType" :label="`${$t('device.machineType')}`"
-          placeholder="" />
+        <van-field readonly v-model="deviceDetal.equimentType" :label="`${$t('device.machineType')}`" placeholder="" />
         <!-- mg280才有到期时间 -->
         <template v-if="deviceDetal?.equimentType?.indexOf('mg280') !== -1">
           <van-field readonly v-model="deviceDetal.lastUseDate" :label="`${$t('device.expirationTime')}`"
@@ -143,14 +141,11 @@
         <div class="custom-line"></div>
         <div class="cust_vantBorder">
           <van-field clearable label-width="32%" v-model="deviceDetal.messageReceiver1"
-            :label="`${$t('device.messageReceiver1')}`"
-            :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
+            :label="`${$t('device.messageReceiver1')}`" :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
           <van-field clearable label-width="32%" v-model="deviceDetal.messageReceiver2"
-            :label="`${$t('device.messageReceiver2')}`"
-            :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
+            :label="`${$t('device.messageReceiver2')}`" :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
           <van-field clearable label-width="32%" v-model="deviceDetal.messageReceiver3"
-            :label="`${$t('device.messageReceiver3')}`"
-            :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
+            :label="`${$t('device.messageReceiver3')}`" :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
         </div>
         <div class="custom-line"></div>
         <!-- <div class="cust_vantBorder">
@@ -257,7 +252,7 @@ import { Api_getGetEquipmentToLabel } from "@/service/labelMan";
 import kCascader from "@/components/commom/kCascader/index.vue";
 import { computed, onMounted, reactive, ref } from "vue";
 import sHeader from "@/components/SimpleHeader";
-import { useRoute, useRouter } from "vue-router";
+import { useRoute, useRouter, onBeforeRouteLeave } from "vue-router";
 import {
   getDeviceDetal,
   updateDevice,
@@ -295,6 +290,7 @@ export default {
     const { t } = useI18n();
     const route = useRoute();
     const router = useRouter();
+    const isUpdate = ref(false);
     const deviceDetal = ref({
       name: "",
       selfName: "",
@@ -311,6 +307,13 @@ export default {
     let tagsList = reactive({
       arr: [],
     });
+    onBeforeRouteLeave((to, from, next) => {
+      if(isUpdate.value) {
+        console.log("to.meta.keepAlive", to.meta.keepAlive);
+        to.meta.keepAlive = false;
+      }
+      next();
+    });
     // 过滤时间
     const filterDate = (date) => {
       if (date) {
@@ -426,6 +429,7 @@ export default {
       console.log(params);
       const { data } = await updateDevice(params);
       if (data.code === "00000") {
+        isUpdate.value = true;
         Toast.success(t("device.modificationSucceeded"));
         router.push({ path: "/device" });
       } else {

+ 187 - 0
src/views/device/diyFlower/index.vue

@@ -0,0 +1,187 @@
+<template>
+  <div class="showGoodsIdx">
+    <s-header :name="$t('device.diyFlower')" :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.showGoodsPage.equipmentName') }}:</span>
+        <span class="c-text-color c-text-14">{{ equipmentName }}</span>
+      </div>
+    </div>
+  </div>
+  <van-cell center title="DIY花型功能开关状态:" size="large" title-style="color: #404d74;">
+    <template #right-icon>
+      <van-switch v-model="checked" size="24" />
+    </template>
+  </van-cell>
+  <!-- <div class="l-flex-between o-m-10">
+    <div>{{ $t('device.modifyPricePage.total') }}{{ tableData.length }}{{ $t('device.modifyPricePage.goods') }}
+    </div>
+  </div>
+  <van-row class="goods o-mlr-8" wrap="true">
+    <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>
+        <van-switch class="o-ml-1" v-model="switchStates[index]" size="20px" active-color="#4dc294"
+          @change="handleChange(index)" />
+      </div>
+      <van-divider :style="{ color: '#1baeae', borderColor: '#1baeae', fontSize: '20px', fontWeight: 500 }" />
+    </van-col>
+  </van-row>
+  <div class="l-flex-center" style="margin: 16px">
+    <van-button round block class="Btn" type="primary" native-type="submit" @click="updateShowGoods()">
+      {{ $t('device.submitAndPushDeviceUpdates') }}
+    </van-button>
+  </div> -->
+</template>
+
+<script>
+// 导入接口
+import {
+  selectProducts,
+  updateProductsShow
+} 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 {
+  Toast, Dialog
+} from 'vant';
+import {
+  useI18n
+} from "vue-i18n";
+import { styleUrl } from '../../../common/js/utils';
+export default {
+  components: {
+    sHeader
+  },
+  setup() {
+    // 引入语言
+    const {
+      t
+    } = useI18n();
+    // 商品图片路径处理
+    const showSugerPhoto = (row) => {
+      let imgId = row.no;
+      if (imgId) {
+        return require(`../../../assets/order/spunSugar/goods/${imgId}.png`);
+      }
+      return imgId;
+    };
+    // 路由
+    const route = useRoute();
+    const router = useRouter();
+    // 商品数据
+    const tableData = ref([]);
+    const switchStates = ref([]);
+    // 设备名称
+    const equipmentName = ref('');
+
+    // 刚进页面
+    onMounted(() => {
+      // 加载样式
+      styleUrl('showGoods');
+      const id = route.query.deviceId || "";
+      const name = route.query.name || "";
+      if (id) {
+        cofficentForm.equipmentId = id;
+        equipmentName.value = name;
+        getList();
+      }
+
+    });
+    // 获取商品列表
+    const getList = () => {
+      selectProducts({
+        equipmentId: cofficentForm.equipmentId
+      }).then(res => {
+        console.log('res', res)
+        const {
+          data
+        } = res.data;
+        if (data) {
+          if (data.length > 0) {
+            // 是否修改状态
+            data.forEach(item => {
+              if (item.showType == null || item.showType == 0) {
+                switchStates.value.push(true);
+              } else {
+                switchStates.value.push(false);
+              }
+            })
+          }
+          tableData.value = data;
+        }
+      })
+    }
+    // 修改的价格
+    const cofficentForm = reactive({
+      equipmentId: '',
+    });
+
+    // 更改状态
+    const handleChange = (index) => {
+      // console.log(index);
+      // console.log(switchStates.value[index]);
+      if (switchStates.value[index]) {
+        tableData.value[index].showType = 0;
+      } else {
+        tableData.value[index].showType = 1;
+      }
+      // console.log(tableData.value[index]);
+    };
+
+
+    // 点击提交
+    const updateShowGoods = () => {
+      Dialog.confirm({
+        title: t('device.openRemind'),
+        message: t('device.editCheck'),
+      }).then(() => {
+        console.log(tableData.value);
+        var products = tableData.value;
+        var list = JSON.stringify(products);
+        updateProductsShow({
+          productList: list
+        }).then((res) => {
+          console.log(res.data.message);
+          // Toast();
+          Dialog.alert({
+            message: t('device.modificationSucceeded'),
+          }).then(() => {
+            //返回上一页
+            router.go(-1);
+          });
+          setTimeout(() => {
+            getList();
+          }, 1000);
+        }).catch((error) => {
+          console.log(error);
+          Toast.fail(t('device.unknownError'));
+        });
+      });
+    };
+    return {
+      cofficentForm,
+      tableData,
+      showSugerPhoto,
+      equipmentName,
+      updateShowGoods,
+      switchStates,
+      handleChange,
+    };
+  },
+};
+</script>
+
+<style lang="less" scoped></style>

+ 42 - 6
src/views/device/index.vue

@@ -4,7 +4,7 @@
     <s-header :name="sys ? sys.title : $t('device.managementCenter')" :noback="true"></s-header>
     <div class="listBox">
       <van-list v-model:loading="loading" v-model:error="error" :error-text="$t('public.requestFailed')"
-        :finished="finished" :finished-text="$t('public.noMore')" offset="300" :immediate-check="false" @load="onLoad">
+        :finished="finished" :finished-text="$t('public.noMore')" :offset="300" :immediate-check="false" @load="onLoad">
         <div class="deviceBox1 flex-col">
           <div class="searchRow flex-row justify-between">
             <div class="flex-col">
@@ -151,8 +151,6 @@
                       <a class="clickable-link o-ptb-7" @click="viewPosiClk(item)">{{ item.fullName }}</a>
                     </span>
                   </div>
-
-
                   <van-row class="layer5 o-ptb-7 kBordBott" justify="space-between"
                     v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'POP320'">
                     <van-col class="word5">{{ $t("device.furnaceHeadTemperature") }}:{{
@@ -206,7 +204,8 @@
                     <span class="txt5 o-ptb-7 kBordBott l-flex-RC"><span>{{ $t("device.oneKeyFeed") }}:</span>
                       <!-- <van-button @click="replenishmentClk(item)" type="primary">{{ $t("device.replenishment") }}
                       </van-button> -->
-                      <a class="replenishment o-ptb-7" @click="replenishmentClk(item)">{{ $t("device.replenishment") }}</a>
+                      <a class="replenishment o-ptb-7" @click="replenishmentClk(item)">{{ $t("device.replenishment")
+                      }}</a>
                     </span>
                   </template>
                   <span class="info1 o-ptb-7 kBordBott">{{ $t("device.lastRefreshTime") }}:{{
@@ -255,6 +254,7 @@
     <deviceOper ref="oprRef" @operfinish="operFinish"></deviceOper>
     <!-- 搜索弹出框 -->
     <deviceSearch ref="searchRef" @search="search($event)"></deviceSearch>
+    <div style="height: 50px;"></div>
     <nav-bar></nav-bar>
   </div>
 </template>
@@ -264,7 +264,7 @@
 import {
   Api_postMachineNum,
 } from "../../service/home";
-import { onMounted, reactive, toRefs, ref } from "vue";
+import { onMounted, reactive, toRefs, ref, onActivated } from "vue";
 import { Toast, Dialog } from "vant";
 import navBar from "../../components/NavBar";
 import sHeader from "../../components/SimpleHeader";
@@ -277,9 +277,10 @@ import {
 } from "../../service/device/index";
 import deviceSearch from "./deviceSearch";
 import deviceOper from "./deviceOper";
-import { useRouter } from "vue-router";
+import { onBeforeRouteLeave, useRouter } from "vue-router";
 import dateUtil from "../../utils/dateUtil";
 import { useI18n } from "vue-i18n";
+import { onBeforeUnmount } from "vue";
 
 export default {
   name: "device",
@@ -295,6 +296,38 @@ export default {
     const router = useRouter();
     const sys = ref(null);
     const user = getLoginUser();
+    const verticalScrollPosition = ref(0);
+
+    onActivated(() => {
+      // 当组件被激活时,可能是从 keep-alive 缓存中激活的
+      // 这时重新添加滚动事件监听器
+      document.documentElement.scrollTop = verticalScrollPosition.value;
+      console.log("进入时的位置", document.documentElement.scrollTop);
+      // window.addEventListener('scroll', handleScroll);
+    });
+
+
+    onBeforeRouteLeave(() => {
+      console.log("离开时的位置", document.documentElement.scrollTop);
+      verticalScrollPosition.value = document.documentElement.scrollTop || 0;
+    })
+
+    // 在组件卸载前清除定时器
+    onBeforeUnmount(() => {
+      clearInterval(updateDataInterval);
+    });
+
+
+    const updateDataInterval = () => {
+      // 每隔3分钟更新数据
+      setInterval(() => {
+        init();
+        if (oprRef.value) {
+          oprRef.value.closeOper();
+        }
+        verticalScrollPosition.value = 0;
+      }, 5 * 60 * 1000); // 3分钟的毫秒数
+    };
     //控制睡眠描述的显示隐藏
     const sleepDescBoxShow = ref(true);
     // 页面列表查询参数
@@ -308,6 +341,8 @@ export default {
     // 初始化页面获取列表
     onMounted(() => {
       init();
+      updateDataInterval(); 
+      // window.addEventListener('scroll', handleScroll);
       // 加载样式
       // styleUrl('device');
     });
@@ -361,6 +396,7 @@ export default {
     // 滚动加载
     const onLoad = () => {
       if (!finished.value) {
+        // console.log("滚动加载")
         searchParams.current = searchParams.current + 1;
         getList();
       }

+ 2 - 1
src/views/register.vue

@@ -198,7 +198,8 @@ export default {
       // if (currentTime - lastSendTime.value > 1000 * 60 * 10 || lastSendTime.value === '') {
       const { data } = await sentRegisterCode({
         ifForeign: ifForeign.value,
-        phoneOrEmail: phoneOrEmailStr
+        phoneOrEmail: phoneOrEmailStr,
+        hostName: 'Sunzee',
       });
       // console.log('seedVerCodeSuccess', data);
       if (data.code === '00000') {

+ 4 - 4
src/views/robotRanking.vue

@@ -582,19 +582,19 @@ export default {
         switch (chartType) {
           case "day":
             totalObj.dayData = data.data;
-            console.log("日返回值", data);
+            // console.log("日返回值", data);
             break;
           case "week":
             totalObj.weekData = data.data;
-            console.log("周返回值", data);
+            // console.log("周返回值", data);
             break;
           case "month":
             totalObj.monthData = data.data;
-            console.log("月返回值", data);
+            // console.log("月返回值", data);
             break;
           case "year":
             totalObj.yearData = data.data;
-            console.log("年返回值", data);
+            // console.log("年返回值", data);
             break;
         }
         // 有数据返回则处理

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

@@ -15,12 +15,12 @@
           <div class="taskTitle">{{ $t('taskMessage.distributionApplicationApproval') }}</div>
         </div>
       </div>
-      <div class="taskListRow flex-col" @click="pushPageList('/taskJoinPayMchCheck')">
+      <!-- <div class="taskListRow flex-col" @click="pushPageList('/taskJoinPayMchCheck')">
         <div class="taskIcon withIcon"></div>
         <div class="taskRight">
           <div class="taskTitle">{{ $t('taskMessage.withdrawalAccountApproval') }}</div>
         </div>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>

+ 8 - 7
src/views/user.vue

@@ -568,13 +568,14 @@ export default {
         chaScPayShow.value = true;
         getSunzeeDetail();
         getSevenCloudDetail();
-      } else if (user.id == 2738) {
-        chaSzPayShow.value = true;
-        getSunzeeDetail();
-      } else if (user.id == 2739) {
-        chaScPayShow.value = true;
-        getSevenCloudDetail();
-      }
+      } 
+      // else if (user.id == 2738) {
+      //   chaSzPayShow.value = true;
+      //   getSunzeeDetail();
+      // } else if (user.id == 2739) {
+      //   chaScPayShow.value = true;
+      //   getSevenCloudDetail();
+      // }
     });
     const gettAdminGetRelation = async () => {
       const { data } = await tAdminGetRelation({