Sfoglia il codice sorgente

feat:“同步2024.06.26“

soobin 1 anno fa
parent
commit
016caa2e7b

+ 1 - 1
src/styles/role/index.less

@@ -1,4 +1,4 @@
-.accountPerPage {
+.rolePage {
   width: 100%;
 
   .accountPerBox {

+ 1 - 1
src/views/device/deviceOper.vue

@@ -31,7 +31,7 @@
         <div class="operText">{{ sleepTitle }}</div>
       </div>
       <!-- 开启炉头/设备 -->
-      <div class="operItem" @click="openOffFurnace(1)">
+      <div v-if="device.machineType != '2'" class="operItem" @click="openOffFurnace(1)">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/onOff.png" />
         </div>

+ 7 - 3
src/views/home/index.vue

@@ -38,7 +38,7 @@
       <div v-if="showDataDiv" class="o-plr-8 o-pt-10">
         <div class="outer5 flex-col" @click="pushOrderCenter">
           <div class="block5 flex-col">
-            <div class="topTitle flex-row justify-end">
+            <div v-if="isOrderData" class="topTitle flex-row justify-end">
               <span class="txt10">{{ $t("home.orderData") }}</span>
               <div class="layer4 flex-col"></div>
             </div>
@@ -212,7 +212,9 @@ export default {
     let chartObj = null;
     // 跳转订单中心
     const pushOrderCenter = () => {
-      router.push({ path: "/orderCenter" });
+      if (isOrderData.value) {
+        router.push({ path: "/orderCenter" });
+      }
     };
     const dateSelect = ref({});
     const update = (uDate) => {
@@ -525,9 +527,10 @@ export default {
       // 子商家以上级别,默认可以看到订单详情
       if (user.type === 0 || user.type === 2) {
         showDataDiv.value = true;
+        isOrderData.value = true;
       } else {
         // 如果有数据概览权限 和 订单数据权限
-        if (isDataOverview && isOrderData.value) {
+        if (isDataOverview) {
           showDataDiv.value = true;
         }
       }
@@ -625,6 +628,7 @@ export default {
       dateSelect,
       Format_time,
       showDataDiv,
+      isOrderData,
       currencySymbol,
       showAlarm,
       alarmList,

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

@@ -216,7 +216,7 @@
             <!-- 发起退款 -->
             <!-- 非已付款订单,线下订单要隐藏按钮 -->
             <van-button size="small"
-              v-if="(refundObject.status === 1 && user.ifForeign === '0') || (refundObject.status === 1 && user.ifForeign === '1' && refundObject.isAir === '1')"
+              v-if="(refundObject.status === 1 && user.ifForeign === '0' && isRefund) || (refundObject.status === 1 && user.ifForeign === '1' && refundObject.isAir === '1')"
               @click="noticeClk(refundObject)" round type="primary" style="margin-top: 20px;">
               {{ $t('orderCenter.initiateRefund') }}
             </van-button>

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

@@ -1,6 +1,6 @@
 <template>
   <!-- 角色权限设置 -->
-  <div class="accountPerPage flex-col">
+  <div class="rolePage flex-col">
     <s-header :name="$t('role.rolePermissionSettings')" :noback="false"></s-header>
     <div class="accountPerBox flex-col">
       <div class="searchRow flex-row justify-between">