Explorar o código

feat:“同步12.15”

soobin hai 1 ano
pai
achega
7c89db73b9

+ 1 - 2
src/App.vue

@@ -103,8 +103,7 @@ html {
 
 body {
   height: 100%;
-  // overflow-x: hidden;
-  // overflow-y: auto;
+  overflow: auto;
 }
 
 #app {

+ 6 - 5
src/assets/language/en.json

@@ -309,7 +309,7 @@
     "deletionSucceeded": "Deletion succeeded",
     "commonOperations": "Remote operating equipment",
     "equipmentNo": "Equipment No",
-    "restart": "Restart device",
+    "restart": "Reset machine",
     "restartFurnaceHead": "Restart furnace head",
     "sleep": "sleep",
     "openCloseFurnaceHead": "Open/close furnace head",
@@ -357,8 +357,8 @@
     "pleaseSelectThePowerOnStatus": "Please select the power on status",
     "equipmentStatus": "Equipment Status",
     "pleaseSelectTheDeviceStatus": "Please select the device status",
-    "emptyingConditions": "Emptying Conditions",
-    "clickSearch": "Click Search",
+    "emptyingConditions": "Clear condition",
+    "clickSearch": "Click search",
     "spunSugar": "棉花糖",
     "popcorn": "popcorn",
     "sz": "Sunzee",
@@ -403,7 +403,7 @@
     "totalNumberOfEquipment": "Total number of equipment",
     "affiliatedMerchants": "Business Owner",
     "sleepState": "Sleep State",
-    "sleeping": "sleeping",
+    "sleeping": "sleeping zzZ",
     "notSleeping": "Not sleeping",
     "lastRefreshTime": "Recent refresh time",
     "machineUniqueCode": "Device Code",
@@ -551,6 +551,7 @@
     "export": "export",
     "apply": "apply",
     "discount": "discount",
+    "deduction": "deduction",
     "termOfValidity": "Valid until",
     "expired": "(Expired)",
     "validDays": "Valid days",
@@ -576,7 +577,7 @@
     "theNumberOfDiscountCodesCannotExceed": "The number of discount codes cannot exceed 200",
     "theValidityPeriodCannotExceedMonths": "The validity period cannot exceed 3 months",
     "discountCannotBeGreaterThan": "Discount cannot be greater than 10",
-    "successfulProductionOfDiscountCode": "Successful production of discount code",
+    "successfulProductionOfDiscountCode": "Application successful",
     "applDiscCode": "Apply for discount code"
   },
   "distributionSet": {

+ 4 - 3
src/assets/language/zh.json

@@ -306,7 +306,7 @@
     "deletionSucceeded": "删除成功",
     "commonOperations": "远程操作设备",
     "equipmentNo": "设备编号",
-    "restart": "重启设备",
+    "restart": "机器复位",
     "restartFurnaceHead": "重启炉头",
     "sleep": "睡眠",
     "openCloseFurnaceHead": "开启/关闭炉头",
@@ -400,7 +400,7 @@
     "totalNumberOfEquipment": "总设备数",
     "affiliatedMerchants": "所属商家",
     "sleepState": "睡眠状态",
-    "sleeping": "睡眠中",
+    "sleeping": "睡眠中zzZ",
     "notSleeping": "未睡眠",
     "sleepDesc": "睡眠描述",
     "SuspendBusiness": "暂停营业",
@@ -552,6 +552,7 @@
     "export": "导出",
     "apply": "申请",
     "discount": "折扣",
+    "deduction": "抵扣",
     "termOfValidity": "有效期至",
     "expired": "(已过期)",
     "validDays": "有效天数",
@@ -577,7 +578,7 @@
     "theNumberOfDiscountCodesCannotExceed": "优惠码个数不能超过200",
     "theValidityPeriodCannotExceedMonths": "有效期不能超过3个月",
     "discountCannotBeGreaterThan": "折扣不能大于10",
-    "successfulProductionOfDiscountCode": "生产优惠码成功",
+    "successfulProductionOfDiscountCode": "申请成功",
     "applDiscCode": "申请优惠码"
   },
   "distributionSet": {

+ 2 - 2
src/common/style/mixin.less

@@ -23,10 +23,10 @@
 
 // //1px底部边框
 .border-1px(@color){
-  position: relative;
+  position: fixed;
   &:after{
     display: block;
-    position: absolute;
+    position: fixed;
     left: 0;
     bottom: 0;
     width: 100%;

+ 3 - 2
src/styles/home/index.less

@@ -148,8 +148,9 @@
             height: 30px;
 
             .word8 {
-              width: 14px;
+              width: auto;
               height: 20px;
+              padding-right: 21px;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
               font-size: 14px;
@@ -170,7 +171,7 @@
               text-align: center;
               white-space: nowrap;
               line-height: 30px;
-              margin-left: -1px;
+              margin-left: -20px;
               display: block;
             }
           }

+ 3 - 2
src/styles/orderCenter/index.less

@@ -118,8 +118,9 @@
             height: 30px;
 
             .word8 {
-              width: 14px;
+              width: auto;
               height: 20px;
+              padding-right: 21px;
               overflow-wrap: break-word;
               color: rgba(223, 94, 76, 1);
               font-size: 14px;
@@ -141,7 +142,7 @@
               text-align: center;
               white-space: nowrap;
               line-height: 30px;
-              margin-left: -1px;
+              margin-left: -20px;
               display: block;
             }
           }

+ 8 - 6
src/styles/robotRanking/index.less

@@ -77,16 +77,18 @@ button:active {
 
 .robotRanking {
     background-color: #fff;
-    // position: relative;
     width: 100%;
-    height: calc(100%-50px);
-    padding-bottom: 60px;
-    overflow: auto;
-    overflow-x: hidden;
-
+    // height: calc(100vh - 100px);
+    
+    
     .box1 {
         height: 100%;
         width: 100%;
+        height: calc(100% - 50px);
+        padding-bottom: 10px;
+        overflow: auto;
+        overflow-x: hidden;
+
 
         .van-tabs__line {
             background-color: #2c87c8 !important;

+ 10 - 8
src/styles/user/index.less

@@ -1,20 +1,22 @@
-.page {
+.userPage {
     width: 100%;
     background: url(../../assets/user/bg.png) top center no-repeat;
     background-size: 100%;
-    // position: relative;
-    height: calc(100% - 50px);
-    overflow: auto;
-    overflow-x: hidden;
+    // height: calc(100vh - 50px);
+    // padding-bottom: 50px;
+
 
     .simple-header {
         background: transparent;
     }
 
     .userPageBox {
-        width: 100%;
         height: 100%;
-        // margin-bottom: 100px;
+        width: 100%;
+        height: calc(100% - 50px);
+        padding-bottom: 10px;
+        overflow: auto;
+        overflow-x: hidden;
     }
 
     .userBaseBox {
@@ -74,7 +76,7 @@
     }
 
     .userInfoBox {
-        margin-top: 25px;
+        // margin-top: 25px;
         padding: 0px 15px 20px;
 
         .userInfo {

+ 1 - 1
src/views/discountCode/index.vue

@@ -37,7 +37,7 @@
           <div v-for="(item, index) in discountCodeList" :key="index" class="listItem" @click="disCountCodeClick(item)">
             <div class="itemBox">
               <div class="itemRow"><span class="itemTitle">{{ $t('discountCode.discountCode') }}:&nbsp;</span>{{ item.code
-              }}<span class="itemTitle discount">{{ $t('discountCode.discount') }}:&nbsp;</span>{{ item.discount }}
+              }}<span class="itemTitle discount">{{ item.type == '1' ? $t('discountCode.deduction') : $t('discountCode.discount') }}:&nbsp;</span>{{ item.discount }}
               </div>
               <div class="itemRow"><span class="itemTitle">{{ $t('discountCode.creationTime') }}:&nbsp;</span>{{
                 showDateTime(item.createDate) }}</div>

+ 14 - 5
src/views/discountCode/payCode.vue

@@ -35,7 +35,7 @@
             <span>0-10</span>
           </template>
         </van-field>
-        <div class="van-cell van-field" v-if='type === "0" && discount === "0"'>
+        <div class="van-cell van-field" v-if='type === "0" && discount === "0" && promoCodeOpen != "0"'>
           <div class="van-cell__title van-field__label"><span>{{ $t('discountCode.paymentMethod') }}</span></div>
           <div class="van-cell__value van-field__value radioBox">
             <van-radio-group v-model="frpCode" direction="horizontal">
@@ -85,6 +85,8 @@ export default {
     });
     const payCodeType = ref(false);
     const ewmObj = ref(null);
+    const promoCodeOpen = ref(''); // 0折优惠码开通状态
+
 
     // 初始化页面
     onMounted(async () => {
@@ -97,7 +99,11 @@ export default {
       payParams.discount = '';
       payParams.frpCode = 'WEIXIN_NATIVE';
       const user = getLoginUser();
-      if (user) { payParams.adminId = user.id; }
+      if (user) {
+        payParams.adminId = user.id;
+        promoCodeOpen.value = user.promoCodeOpen;
+        // console.log("promoCodeOpen",promoCodeOpen.value);
+      }
     });
 
     // 提交搜索表单触发搜索
@@ -110,19 +116,21 @@ export default {
       if (parseInt(payParams.month) > 3) { showFailToast(t('discountCode.theValidityPeriodCannotExceedMonths')); return; }
       if (payParams.type === '0' && parseInt(payParams.discount) > 10) { showFailToast(t('discountCode.discountCannotBeGreaterThan')); return; }
       const { data } = await addCode(Object.assign({}, payParams));
-      if (payParams.type === '0') {
+      if (payParams.type === '0' && payParams.discount === '0' && promoCodeOpen.value != '0') {
         ewmObj.value = data.data;
         payCodeType.value = true;
       } else {
         if (data.code === '00000') {
           showSuccessToast(t('discountCode.successfulProductionOfDiscountCode'));
-          router.push({ path: '/discountCode' });
+          setTimeout(() => {
+            router.go(-1);
+          }, 1500);
         } else {
           showFailToast(data.message);
         }
       }
     }
-    const payCodeClose = () => { router.push({ path: '/discountCode' }); }
+    const payCodeClose = () => { router.go(-1); }
     // 有效天数
     const validDays = ref('0天');
     // 监听有效期,计算有效天数
@@ -136,6 +144,7 @@ export default {
       onSubmit,
       payCodeClose,
       validDays,
+      promoCodeOpen
     };
   },
 };

+ 7 - 10
src/views/merchantManage/set.vue

@@ -113,7 +113,8 @@
 
             <div class="block5 flex-row justify-between">
               <span class="txt6">{{ $t('merchantManage.accountType') }}
-                :{{ adminMchObj.bankAccountType === 1 ? $t('merchantManage.debitCard') : (adminMchObj.bankAccountType === 4
+                :{{ adminMchObj.bankAccountType === 1 ? $t('merchantManage.debitCard') : (adminMchObj.bankAccountType ===
+                  4
                   ? $t('merchantManage.corporateAccount') : "") }}</span>
               <!-- <span class="word9"></span> -->
             </div>
@@ -124,8 +125,8 @@
             <div v-if="adminType < 2">
               <span class="word12">{{ $t('merchantManage.joinpayMch') }}:{{ adminMchObj.signStatus == '签约成功' ?
                 adminMchObj.signStatus : '未签约' }}</span>
-              <span class="word12">{{ $t('merchantManage.huifuMch') }}:{{ huifuMchObj != null && huifuMchObj.conStat ==
-                '5' && huifuMchObj.status == '2' ? '签约成功' : '未签约' }}</span>
+              <span class="word12">{{ $t('merchantManage.huifuMch') }}:{{ huifuMchObj != null && huifuMchObj.status == '2'
+                ? '签约成功' : '未签约' }}</span>
             </div>
           </div>
         </div>
@@ -179,19 +180,15 @@ export default {
           adminObj.value.promoCodeOpen = '1';
         }
         ifForeign.value = data.data.ifForeign;
-      } else { showFailToast(data.message); }
-      console.log('getAdminFun', data);
+      }
     };
     const getAdminMchFun = async () => {
       const { data } = await getAdminMch({ id: merchantId.value });
-      if (data.code === "00000") { adminMchObj.value = data.data; } else { showFailToast(data.message); }
-      console.log('getAdminMchFun', data);
-      console.log('adminMchObj', adminMchObj.value.signStatus);
+      if (data.code === "00000") { adminMchObj.value = data.data; }
     }
     const getHuifuMchFun = async () => {
       const { data } = await getHuifuMch({ adminId: merchantId.value });
-      if (data.code === "00000") { huifuMchObj.value = data.data; } else { showFailToast(data.message); }
-      console.log('getHuifuMchFun', data);
+      if (data.code === "00000") { huifuMchObj.value = data.data; }
     }
     const onSubmit = async () => {
       const params = {

+ 1 - 1
src/views/orderCenter/index.vue

@@ -625,7 +625,7 @@ export default {
 
     // 跳转订单导出
     const gotoOrderExcel = async () => {
-      if (searchParams.type == null) {
+      if (searchParams.type == null || searchParams.type == '' ) {
         searchParams.type = user.ifForeign;
       }
       // 显示加载框

+ 3 - 0
src/views/popPayment.vue

@@ -58,6 +58,9 @@ export default {
 
         };
         const showSugarPhoto = (no) => {
+            if (no == 'A99') {
+                return require(`../assets/order/spunSugar/goods/A30.png`);
+            }
             return require(`../assets/order/spunSugar/goods/${no}.png`);
         };
         const wxPay = () => {

+ 1 - 1
src/views/register.vue

@@ -162,7 +162,7 @@ export default {
         ifForeign: ifForeign.value,
         // phone: phone.value,
         // email: email.value,
-        phoneOrEmail: phoneOrEmailStr,
+        phoneOrEmail: phone.value || email.value,
         code: code.value,
         companyType: '1'
       });

+ 3 - 5
src/views/robotRanking.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="robotRanking flex-col">
-    <s-header :name="$t('robotRanking.machineSalesRanking')" :noback="true"></s-header>
     <div class="box1 flex-col">
+      <s-header :name="$t('robotRanking.machineSalesRanking')" :noback="true" :isFixed="false"></s-header>
       <div class="box3 flex-col">
         <div class="main1 flex-col">
           <div class="mod1 flex-col">
@@ -689,10 +689,8 @@ export default {
                 },
               },
             ];
-            dayChartOption.dataZoom[0]["startValue"] =
-              data.data.categories[data.data.categories.length - 5];
-            dayChartOption.dataZoom[0]["endValue"] =
-              data.data.categories[data.data.categories.length - 1];
+            dayChartOption.dataZoom[0]["startValue"] = data.data.categories[0];
+            dayChartOption.dataZoom[0]["endValue"] = data.data.categories[4];
             // 解决resize不起作用,配合onMounted里的方法使用
             switch (chartType) {
               case "day":

+ 2 - 8
src/views/settlement/index.vue

@@ -175,19 +175,13 @@
           <div class="van-cell van-field" v-if="pageType === '4'">
             <div class="van-cell__title van-field__label"><span>{{ $t('joinpayMch.signingStatus') }}</span></div>
             <div class="van-cell__value van-field__value radioBox" style="display: flex; justify-content: space-around;">
-              <!-- <span
-                :style="{ color: signStatus == '签约成功' ? (conStat == null && huifuMchID == null ? '#00ff80' : (conStat == 5 && huifuAuditStatus == '2' ? '#00ff80' : '#FFA500')) : '#FFA500' }">
-                {{ signStatus == '签约成功' ? (conStat == null && huifuMchID == null ? signStatus : (conStat == 5 &&
-                  huifuAuditStatus == '2' ?
-                  signStatus : '待签约')) : '待签约' }}
-              </span> -->
               <span
                 :style="{ color: signStatus == '签约成功' ? (huifuMchID == null ? '#00ff80' : (huifuAuditStatus == '2' ? '#00ff80' : '#FFA500')) : '#FFA500' }">
                 {{ signStatus == '签约成功' ? (huifuMchID == null ? signStatus : (huifuAuditStatus == '2' ? signStatus :
                   '待签约')) : '待签约' }}
               </span>
-              <van-button :disabled="huifuMchID == null ? (signStatus == '签约成功' ? true : false) : (huifuAuditStatus == '2' && signStatus == '签约成功' ? true : false)" 
-              span="5" round type="primary" style="height: 2em; padding: 0 2.5em" @click='altMchSignFun()'>{{
+              <van-button :disabled="huifuMchID == null ? (signStatus == '签约成功' ? true : false) : (huifuAuditStatus == '2' && signStatus == '签约成功' ? true : false)"
+               span="5" round type="primary" style="height: 2em; padding: 0 2.5em" @click='altMchSignFun()'>{{
                 $t('joinpayMch.signAContract') }}
               </van-button>
             </div>

+ 60 - 79
src/views/user.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="page flex-col">
-    <s-header :name="sys ? sys.title : $t('user.personalCenter')" :noback="true" :isFixed="false"></s-header>
+  <div class="userPage flex-col">
     <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>
@@ -25,7 +25,7 @@
         </div>
         <div class="userInfoBox">
           <!-- 地区 -->
-          <div v-if="!areaShow" class="userInfo l-flex-between">
+          <div v-if="isInland && user.type != '0'">
             <span class="userInfoLeft">{{ $t("user.region") }}: </span>
             <div class="cust_vantBorder">
               <div class="filedInpPad">
@@ -51,60 +51,66 @@
             <van-icon name="edit" class="editIcon" @click="editClk(4)" />
           </div>
           <!-- 手机号 -->
-          <div v-if="!phoneNumberShow" class="userInfo l-flex-between">
-            <span class="userInfoLeft">{{ $t("user.phoneNumber") }}: </span>
-            <div class="cust_vantBorder">
-              <van-field class="relationClass" v-model="cofficentForm.phone" :placeholder="$t('user.phoneNumberPlace')">
-                <template #button>
-                  <van-button type="primary" @click="mailboxChg(cofficentForm.phone, 3)">{{ $t("user.confirmLog") }}
-                  </van-button>
-                </template>
-              </van-field>
+          <div v-if="user.type != '0'">
+            <div v-if="!phoneNumberShow" class="userInfo l-flex-between">
+              <span class="userInfoLeft">{{ $t("user.phoneNumber") }}: </span>
+              <div class="cust_vantBorder">
+                <van-field class="relationClass" v-model="cofficentForm.phone" :placeholder="$t('user.phoneNumberPlace')">
+                  <template #button>
+                    <van-button type="primary" @click="mailboxChg(cofficentForm.phone, 3)">{{ $t("user.confirmLog") }}
+                    </van-button>
+                  </template>
+                </van-field>
+              </div>
+              <van-icon name="edit" class="editIcon" @click="editClk(3)" />
+            </div>
+            <div v-else class="userInfo l-flex-between">
+              <span class="userInfoLeft">{{ $t("user.phoneNumber") }}: </span>
+              <span>{{ accountDetail.phone }}</span>
+              <van-icon name="edit" class="editIcon" @click="editClk(3)" />
             </div>
-            <van-icon name="edit" class="editIcon" @click="editClk(3)" />
-          </div>
-          <div v-else class="userInfo l-flex-between">
-            <span class="userInfoLeft">{{ $t("user.phoneNumber") }}: </span>
-            <span>{{ accountDetail.phone }}</span>
-            <van-icon name="edit" class="editIcon" @click="editClk(3)" />
           </div>
           <!-- 邮箱 -->
-          <div v-if="!mailboxShow" class="userInfo l-flex-between">
-            <span class="userInfoLeft">{{ $t("user.mailbox") }}: </span>
-            <div class="cust_vantBorder">
-              <van-field class="relationClass" v-model="cofficentForm.mailBox" :placeholder="$t('user.mailboxPlace')">
-                <template #button>
-                  <van-button type="primary" @click="mailboxChg(cofficentForm.mailBox, 2)">{{ $t("user.confirmLog") }}
-                  </van-button>
-                </template>
-              </van-field>
+          <div v-if="user.type != '0'">
+            <div v-if="!mailboxShow" class="userInfo l-flex-between">
+              <span class="userInfoLeft">{{ $t("user.mailbox") }}: </span>
+              <div class="cust_vantBorder">
+                <van-field class="relationClass" v-model="cofficentForm.mailBox" :placeholder="$t('user.mailboxPlace')">
+                  <template #button>
+                    <van-button type="primary" @click="mailboxChg(cofficentForm.mailBox, 2)">{{ $t("user.confirmLog") }}
+                    </van-button>
+                  </template>
+                </van-field>
+              </div>
+              <van-icon name="edit" class="editIcon" @click="editClk(2)" />
+            </div>
+            <div v-else class="userInfo l-flex-between">
+              <span class="userInfoLeft">{{ $t("user.mailbox") }}: </span>
+              <span>{{ accountDetail.email }}</span>
+              <van-icon name="edit" class="editIcon" @click="editClk(2)" />
             </div>
-            <van-icon name="edit" class="editIcon" @click="editClk(2)" />
-          </div>
-          <div v-else class="userInfo l-flex-between">
-            <span class="userInfoLeft">{{ $t("user.mailbox") }}: </span>
-            <span>{{ accountDetail.email }}</span>
-            <van-icon name="edit" class="editIcon" @click="editClk(2)" />
           </div>
           <!-- 关联上级 -->
-          <div v-if="!relationType" class="userInfo l-flex-between">
-            <span class="userInfoLeft">{{ $t("user.associateParent") }}: </span>
-            <div class="cust_vantBorder">
-              <van-field class="relationClass" v-model="cofficentForm.associateParent"
-                :placeholder="$t('user.associateParentPlace')">
-                <template #button>
-                  <van-button type="primary" @click="mailboxChg(cofficentForm.associateParent, 1)">{{
-                    $t("user.confirmLog") }}
-                  </van-button>
-                </template>
-              </van-field>
+          <div v-if="isInland && user.type == '2'">
+            <div v-if="!relationType" class="userInfo l-flex-between">
+              <span class="userInfoLeft">{{ $t("user.associateParent") }}: </span>
+              <div class="cust_vantBorder">
+                <van-field class="relationClass" v-model="cofficentForm.associateParent"
+                  :placeholder="$t('user.associateParentPlace')">
+                  <template #button>
+                    <van-button type="primary" @click="mailboxChg(cofficentForm.associateParent, 1)">{{
+                      $t("user.confirmLog") }}
+                    </van-button>
+                  </template>
+                </van-field>
+              </div>
+              <van-icon name="edit" class="editIcon" @click="editClk(1)" />
+            </div>
+            <div v-else class="userInfo l-flex-between">
+              <span class="userInfoLeft">{{ $t("user.associateParent") }}: </span>
+              <span>{{ relationAdminName }}</span>
+              <van-icon name="edit" class="editIcon" @click="editClk(1)" />
             </div>
-            <van-icon name="edit" class="editIcon" @click="editClk(1)" />
-          </div>
-          <div v-else class="userInfo l-flex-between">
-            <span class="userInfoLeft">{{ $t("user.associateParent") }}: </span>
-            <span>{{ relationAdminName }}</span>
-            <van-icon name="edit" class="editIcon" @click="editClk(1)" />
           </div>
 
           <!-- 自定义货币符号 -->
@@ -165,21 +171,13 @@
           </div>
 
           <!-- 提现帐号 -->
-          <div v-if="isInland" class="taskListRow flex-col" @click="pushPageList('/settlement')">
+          <div v-if="isInland && user.type != '0'" class="taskListRow flex-col" @click="pushPageList('/settlement')">
             <div class="taskIcon joinPayMchIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">{{ $t("user.settlementAccount") }}</div>
             </div>
           </div>
 
-          <!-- 提现帐号 -->
-          <!-- <div v-if="isInland" class="taskListRow flex-col" @click="pushPageList('/joinpayMch')">
-            <div class="taskIcon joinPayMchIcon"></div>
-            <div class="taskRight">
-              <div class="taskTitle">{{ $t("user.withdrawalAccountNo") }}</div>
-            </div>
-          </div> -->
-
           <!-- Airwallex 钱包 -->
           <!-- <div v-if="isAbroad && user.companyType != '1'" class="taskListRow flex-col"
             @click="pushPageList('/airwallex')">
@@ -188,24 +186,6 @@
               <div class="taskTitle">{{ $t("user.airwallex") }}</div>
             </div>
           </div> -->
-
-          <!-- 备用提现账号 -->
-          <!-- <div v-if="isInland" class="taskListRow flex-col" @click="pushPageList('/huifuMch')">
-            <div class="taskIcon shandeMchIcon"></div>
-            <div class="taskRight">
-              <div class="taskTitle">
-                {{ $t("user.standbyWithdrawalAccountNo") }}
-              </div>
-            </div>
-          </div> -->
-          <!--          <div class="taskListRow flex-col" @click="pushPageList('/shandeMch')">
-                      <div class="taskIcon shandeMchIcon"></div>
-                      <div class="taskRight">
-                        <div class="taskTitle">
-                          {{ $t("user.standbyWithdrawalAccountNo") }}
-                        </div>
-                      </div>
-                    </div>-->
           <!-- 绑定微信 -->
           <div v-if="isInWeChat" class="taskListRow flex-col" @click="pushPageList('/bindWechat')">
             <!--          <div class="taskListRow flex-col" @click="pushPageList('/bindWechat')">-->
@@ -563,12 +543,12 @@ export default {
       gettAdminGetRelation();
       // 获取账户
       getAcccountDetail();
-      if (user.id == 1 ) {
+      if (user.id == 1) {
         chaSzPayShow.value = true;
         chaScPayShow.value = true;
         getSunzeeDetail();
         getSevenCloudDetail();
-      } 
+      }
       // else if (user.id == 2738) {
       //   chaSzPayShow.value = true;
       //   getSunzeeDetail();
@@ -717,4 +697,5 @@ export default {
 
 <style lang="less" scoped>
 @import "../common/style/mixin.less";
+@import "../styles/user/index";
 </style>