1、修改首页

src/views/common/home.vue

@@ -4,7 +4,7 @@
     <p class="content">亚米商城专业版并非一个开源软件，作者保留全部的权利。 擅自窃用，即属严重侵权行为，与盗窃无异。产生的一切任何后果责任由侵权者自负。
       擅自窃用，必将追究法律责任！！！</p> -->
 
-    <div v-if="shopStatusInfo.shopStatus !== null && shopStatusInfo.shopStatus !== 1" class="shop-inf-imperfect-tips">
+    <div v-if="shopStatusInfo.shopStatus !== null && shopStatusInfo.shopStatus !== 1 && userId !== 12 && userId !== 13" class="shop-inf-imperfect-tips">
       <div v-if="shopStatusInfo.shopStatus === 2">
         <div>
           <i class="el-icon-warning" />
@@ -30,12 +30,13 @@
       </div>
     </div>
 
-    <!-- 数据 -->
-    <!-- 基本信息 -->
-    <div class="order-all-num white-basic">
-      <div class="title-basic">{{ $t("shopProcess.basicInfo") }}</div>
-      <div class="row-bg">
-        <!-- <el-col :span="15" class="col-box" style="height:100%;"> -->
+    <div v-if="userId !== 12 && userId !== 13">
+      <!-- 数据 -->
+      <!-- 基本信息 -->
+      <div class="order-all-num white-basic">
+        <div class="title-basic">{{ $t("shopProcess.basicInfo") }}</div>
+        <div class="row-bg">
+          <!-- <el-col :span="15" class="col-box" style="height:100%;"> -->
           <div class="num-item-box">
             <div class="wait-payment-num order-num-item">
               <div class="item-box">
@@ -84,8 +85,8 @@
               </div>
             </div>
           </div>
-        <!-- </el-col> -->
-        <!-- <el-col :span="9" class="col-box" style="height:100%;"> -->
+          <!-- </el-col> -->
+          <!-- <el-col :span="9" class="col-box" style="height:100%;"> -->
           <div class="num-item-box">
             <div class="wait-evaluate-num order-num-item">
               <div class="item-box">
@@ -118,206 +119,211 @@
               </div>
             </div>
           </div>
-        <!-- </el-col> -->
+          <!-- </el-col> -->
+        </div>
       </div>
-    </div>
-    <!-- 基本信息end -->
-
-    <!-- 今日待办 -->
-    <div class="white-basic">
-      <div class="title-basic">{{$t('home.pendingToday')}}</div>
-      <div class="abeyance-box">
-        <div class="audit-violations order-num-item">
-          <div class="item-img">
-            <img src="~@/assets/img/home/audit-violations.png" >
+      <!-- 基本信息end -->
+
+      <!-- 今日待办 -->
+      <div class="white-basic">
+        <div class="title-basic">{{$t('home.pendingToday')}}</div>
+        <div class="abeyance-box">
+          <div class="audit-violations order-num-item">
+            <div class="item-img">
+              <img src="~@/assets/img/home/audit-violations.png" >
+            </div>
+            <div class="item-box">
+              <div class="words">{{ $t("home.pendingTodayA") }}</div>
+              <div class="number">{{pendingToday.prodAuditNum}}</div>
+            </div>
           </div>
-          <div class="item-box">
-            <div class="words">{{ $t("home.pendingTodayA") }}</div>
-            <div class="number">{{pendingToday.prodAuditNum}}</div>
+
+          <div class="stores-to-audited order-num-item">
+            <div class="item-img">
+              <img src="~@/assets/img/home/stores-to-audited.png" >
+            </div>
+            <div class="item-box">
+              <div class="words">{{ $t("home.pendingTodayB") }}</div>
+              <div class="number">{{pendingToday.shopAuditNum}}</div>
+            </div>
           </div>
-        </div>
 
-        <div class="stores-to-audited order-num-item">
-          <div class="item-img">
-            <img src="~@/assets/img/home/stores-to-audited.png" >
+          <div class="distribution-withdrawals order-num-item">
+            <div class="item-img">
+              <img src="~@/assets/img/home/distribution-withdrawals.png" >
+            </div>
+            <div class="item-box">
+              <div class="words">{{ $t("home.pendingTodayC") }}</div>
+              <div class="number">{{pendingToday.distributionAuditNum}}</div>
+            </div>
           </div>
-          <div class="item-box">
-            <div class="words">{{ $t("home.pendingTodayB") }}</div>
-            <div class="number">{{pendingToday.shopAuditNum}}</div>
+
+          <div class="withdraw-cash order-num-item">
+            <div class="item-img">
+              <img src="~@/assets/img/home/withdraw-cash.png" >
+            </div>
+            <div class="item-box">
+              <div class="words">{{ $t("home.pendingTodayD") }}</div>
+              <div class="number">{{pendingToday.withdrawalAuditNum}}</div>
+            </div>
           </div>
-        </div>
 
-        <div class="distribution-withdrawals order-num-item">
-          <div class="item-img">
-            <img src="~@/assets/img/home/distribution-withdrawals.png" >
+        </div>
+      </div>
+      <!-- 今日待办end -->
+
+      <!-- 实时概况 -->
+      <div class="realtime-situation-box white-basic">
+        <div class="title-basic">{{$t('home.nowDate')}}</div>
+        <div class="real-time-content">
+          <div class="item">
+            <div class="word">{{$t('home.ordersToday')}}</div>
+            <div class="number">{{nowDateForm.currentOrderNum}}</div>
           </div>
-          <div class="item-box">
-            <div class="words">{{ $t("home.pendingTodayC") }}</div>
-            <div class="number">{{pendingToday.distributionAuditNum}}</div>
+          <div class="item">
+            <div class="word">{{$t('home.newMembersToday')}}</div>
+            <div class="number">{{nowDateForm.currentUserNum}}</div>
           </div>
-        </div>
-
-        <div class="withdraw-cash order-num-item">
-          <div class="item-img">
-            <img src="~@/assets/img/home/withdraw-cash.png" >
+          <div class="item">
+            <div class="word">{{$t('home.newStores')}}</div>
+            <div class="number">{{nowDateForm.currentShopNum}}</div>
           </div>
-          <div class="item-box">
-            <div class="words">{{ $t("home.pendingTodayD") }}</div>
-            <div class="number">{{pendingToday.withdrawalAuditNum}}</div>
+          <div class="item">
+            <div class="word">{{$t('home.todayVisitors')}}</div>
+            <div class="number">{{nowDateForm.todayVisitors}}</div>
+          </div>
+          <div class="item">
+            <div class="word">{{$t('home.visitorsInTheLastSevenDays')}}</div>
+            <div class="number">{{nowDateForm.firstSevenDayVisitors}}</div>
+          </div>
+          <div class="item">
+            <div class="word">{{$t('home.realtimeSituationA')}}</div>
+            <div class="number">{{nowDateForm.currentPayAmount}}</div>
+          </div>
+          <div class="item">
+            <div class="word">{{$t('home.realtimeSituationB')}}</div>
+            <div class="number">{{nowDateForm.currentProdNum}}</div>
+          </div>
+          <div class="item">
+            <div class="word">{{$t('home.realtimeSituationC')}}</div>
+            <div class="number">{{nowDateForm.currentProdCommNum}}</div>
+          </div>
+          <div class="item">
+            <div class="word">{{$t('home.realtimeSituationD')}}</div>
+            <div class="number">{{nowDateForm.yesterdayVisitors}}</div>
+          </div>
+          <div class="item">
+            <div class="word">{{$t('home.realtimeSituationE')}}</div>
+            <div class="number">{{nowDateForm.firstThirtyDayVisitors}}</div>
           </div>
-        </div>
-
-      </div>
-    </div>
-    <!-- 今日待办end -->
-
-    <!-- 实时概况 -->
-    <div class="realtime-situation-box white-basic">
-      <div class="title-basic">{{$t('home.nowDate')}}</div>
-      <div class="real-time-content">
-        <div class="item">
-          <div class="word">{{$t('home.ordersToday')}}</div>
-          <div class="number">{{nowDateForm.currentOrderNum}}</div>
-        </div>
-        <div class="item">
-          <div class="word">{{$t('home.newMembersToday')}}</div>
-          <div class="number">{{nowDateForm.currentUserNum}}</div>
-        </div>
-        <div class="item">
-          <div class="word">{{$t('home.newStores')}}</div>
-          <div class="number">{{nowDateForm.currentShopNum}}</div>
-        </div>
-        <div class="item">
-          <div class="word">{{$t('home.todayVisitors')}}</div>
-          <div class="number">{{nowDateForm.todayVisitors}}</div>
-        </div>
-        <div class="item">
-          <div class="word">{{$t('home.visitorsInTheLastSevenDays')}}</div>
-          <div class="number">{{nowDateForm.firstSevenDayVisitors}}</div>
-        </div>
-        <div class="item">
-          <div class="word">{{$t('home.realtimeSituationA')}}</div>
-          <div class="number">{{nowDateForm.currentPayAmount}}</div>
-        </div>
-        <div class="item">
-          <div class="word">{{$t('home.realtimeSituationB')}}</div>
-          <div class="number">{{nowDateForm.currentProdNum}}</div>
-        </div>
-        <div class="item">
-          <div class="word">{{$t('home.realtimeSituationC')}}</div>
-          <div class="number">{{nowDateForm.currentProdCommNum}}</div>
-        </div>
-        <div class="item">
-          <div class="word">{{$t('home.realtimeSituationD')}}</div>
-          <div class="number">{{nowDateForm.yesterdayVisitors}}</div>
-        </div>
-        <div class="item">
-          <div class="word">{{$t('home.realtimeSituationE')}}</div>
-          <div class="number">{{nowDateForm.firstThirtyDayVisitors}}</div>
         </div>
       </div>
-    </div>
 
-    <!-- 底部流量走势图 -->
-    <div class="refund-plate">
-      <div class="ranking-box">
-        <!-- 流量走势 -->
-        <div class="refund-rate-box">
-          <div class="refund-chart-msg">
-            <div class="msg-tit-txt">
-              <p class="msg-tit">{{ $t("home.Traffictrend") }}</p>
-              <div class="refund-tip">
-                <div><i class="traffictrendA"></i>{{$t("home.TraffictrendA")}}</div>
-                <div><i class="traffictrendB"></i>{{$t("home.TraffictrendB")}}</div>
+      <!-- 底部流量走势图 -->
+      <div class="refund-plate">
+        <div class="ranking-box">
+          <!-- 流量走势 -->
+          <div class="refund-rate-box">
+            <div class="refund-chart-msg">
+              <div class="msg-tit-txt">
+                <p class="msg-tit">{{ $t("home.Traffictrend") }}</p>
+                <div class="refund-tip">
+                  <div><i class="traffictrendA"></i>{{$t("home.TraffictrendA")}}</div>
+                  <div><i class="traffictrendB"></i>{{$t("home.TraffictrendB")}}</div>
+                </div>
               </div>
             </div>
+            <div style="height: 100%">
+              <!-- 图表 -->
+              <div
+                class="refund-chart"
+                id="refPer-chart"
+                style="width: 100%; height: 300px"
+              ></div>
+              <div class="empty" v-if="!sellerMotorList.userNum.length">{{ $t("order.noData") }}</div>
+              <!--/ 图表 -->
+            </div>
           </div>
-        <div style="height: 100%">
-          <!-- 图表 -->
-          <div
-            class="refund-chart"
-            id="refPer-chart"
-            style="width: 100%; height: 300px"
-          ></div>
-          <div class="empty" v-if="!sellerMotorList.userNum.length">{{ $t("order.noData") }}</div>
-          <!--/ 图表 -->
-        </div>
-        </div>
-        <!-- 流量走势end -->
-
-        <!-- 热卖店铺TOP10 -->
-        <div class="ranking-left">
-          <div class="ranking-title">{{ $t("home.TraffictrendE") }}</div>
-          <table class="table" cellpadding="0" cellspacing="0">
-            <tr class="table-tit gray">
-              <td class="table-tit-item ranks padLeft">{{ $t("home.rank") }}</td>
-              <td class="table-tit-item prods">{{ $t("prodList.shopName") }}</td>
-              <td class="table-tit-item refs money-padleft">{{ $t("home.turnover") }}</td>
-              <td class="table-tit-item prop">{{ $t("home.sales") }}</td>
-            </tr>
-            <tr
-              v-for="(item, index) in hotShopList"
-              :key="index"
-              class="table-tit"
-            >
-              <td class="padLeft">{{ index + 1 }}</td>
-              <td>{{ item.shopName }}</td>
-              <td class="money-padleft">￥{{ item.amount }}</td>
-              <td>{{ item.sales }}</td>
-            </tr>
-          </table>
-          <div class="empty" v-if="!hotShopList.length">{{ $t("order.noData") }}</div>
+          <!-- 流量走势end -->
+
+          <!-- 热卖店铺TOP10 -->
+          <div class="ranking-left">
+            <div class="ranking-title">{{ $t("home.TraffictrendE") }}</div>
+            <table class="table" cellpadding="0" cellspacing="0">
+              <tr class="table-tit gray">
+                <td class="table-tit-item ranks padLeft">{{ $t("home.rank") }}</td>
+                <td class="table-tit-item prods">{{ $t("prodList.shopName") }}</td>
+                <td class="table-tit-item refs money-padleft">{{ $t("home.turnover") }}</td>
+                <td class="table-tit-item prop">{{ $t("home.sales") }}</td>
+              </tr>
+              <tr
+                v-for="(item, index) in hotShopList"
+                :key="index"
+                class="table-tit"
+              >
+                <td class="padLeft">{{ index + 1 }}</td>
+                <td>{{ item.shopName }}</td>
+                <td class="money-padleft">￥{{ item.amount }}</td>
+                <td>{{ item.sales }}</td>
+              </tr>
+            </table>
+            <div class="empty" v-if="!hotShopList.length">{{ $t("order.noData") }}</div>
+          </div>
+          <!--/ 热卖店铺TOP10 end -->
         </div>
-        <!--/ 热卖店铺TOP10 end -->
-      </div>
 
-      <!-- 交易趋势 -->
-      <div class="refund-chart-box">
+        <!-- 交易趋势 -->
+        <div class="refund-chart-box">
           <div class="successed-refund">
-          <div class="refund-chart-msg">
-            <div class="msg-tit-txt">
-              <p class="msg-tit">{{ $t("home.TraffictrendC") }}</p>
-              <div class="refund-tip">
-                <div><i class="traffictrendA"></i>{{$t("home.TraffictrendD")}}</div>
+            <div class="refund-chart-msg">
+              <div class="msg-tit-txt">
+                <p class="msg-tit">{{ $t("home.TraffictrendC") }}</p>
+                <div class="refund-tip">
+                  <div><i class="traffictrendA"></i>{{$t("home.TraffictrendD")}}</div>
+                </div>
               </div>
             </div>
+            <div style="height: 100%">
+              <!-- 图表 -->
+              <div
+                class="refund-chart"
+                id="ref-chart"
+                style="width: 100%; height: 300px"
+              ></div>
+              <!--/ 图表 -->
+              <div class="empty" v-if="!tradeTendencyList.length">{{ $t("order.noData") }}</div>
+            </div>
           </div>
-         <div style="height: 100%">
-          <!-- 图表 -->
-          <div
-            class="refund-chart"
-            id="ref-chart"
-            style="width: 100%; height: 300px"
-          ></div>
-          <!--/ 图表 -->
-          <div class="empty" v-if="!tradeTendencyList.length">{{ $t("order.noData") }}</div>
+
+          <!-- 热卖商品TOP10-->
+          <div class="ranking-right" style="height: auto">
+            <div class="ranking-title">{{ $t("home.TraffictrendF") }}</div>
+            <table class="table table-con">
+              <tr class="table-tit gray">
+                <td class="table-tit-item rank padLeft">{{ $t("home.rank") }}</td>
+                <td class="table-tit-item prod">{{ $t("product.prodName") }}</td>
+                <td class="table-tit-item ref money-padleft" >{{ $t("home.paidAmount") }}</td>
+                <td class="table-tit-item ref" >{{ $t("home.sales") }}</td>
+              </tr>
+              <tr v-for="(item, index) in hotProdList" :key="index">
+                <td class="padLeft">{{ index+1 }}</td>
+                <td class="line-clamp-one">{{ item.prodName }}</td>
+                <td class="money-padleft">￥{{ item.amount }}</td>
+                <td >{{ item.sales }}</td>
+              </tr>
+            </table>
+            <div class="empty" v-if="!hotProdList.length">{{ $t("order.noData") }}</div>
           </div>
+          <!--/ 热卖商品TOP10end-->
         </div>
 
-        <!-- 热卖商品TOP10-->
-        <div class="ranking-right" style="height: auto">
-          <div class="ranking-title">{{ $t("home.TraffictrendF") }}</div>
-          <table class="table table-con">
-            <tr class="table-tit gray">
-              <td class="table-tit-item rank padLeft">{{ $t("home.rank") }}</td>
-              <td class="table-tit-item prod">{{ $t("product.prodName") }}</td>
-              <td class="table-tit-item ref money-padleft" >{{ $t("home.paidAmount") }}</td>
-              <td class="table-tit-item ref" >{{ $t("home.sales") }}</td>
-            </tr>
-            <tr v-for="(item, index) in hotProdList" :key="index">
-              <td class="padLeft">{{ index+1 }}</td>
-              <td class="line-clamp-one">{{ item.prodName }}</td>
-              <td class="money-padleft">￥{{ item.amount }}</td>
-              <td >{{ item.sales }}</td>
-            </tr>
-          </table>
-          <div class="empty" v-if="!hotProdList.length">{{ $t("order.noData") }}</div>
-        </div>
-        <!--/ 热卖商品TOP10end-->
       </div>
-
+      <!-- /底部流量走势图 -->
+    </div>
+    <div v-else>
+      <h1 style="text-align: center; font-size: 100px">合作平台二</h1>
+      <h1 style="text-align: center; font-size: 50px">（玲珑 吃货堂 番茄 中二）</h1>
     </div>
-    <!-- /底部流量走势图 -->
   </div>
 </template>
 
@@ -340,6 +346,7 @@ export default {
 
   data () {
     return {
+      userId: this.$store.state.user.id,
       value: [0, 1],
       sumPayActualTotal: 0.00,
       dataForm: {},
@@ -394,6 +401,7 @@ export default {
     }
   },
   mounted () {
+    console.log("用户ID" + this.$store.state.user.id)
     this.getPlatformStatistics() // 获取首页的基本信息 今日待办 实时概况
     // let erd = elementResizeDetectorMaker()
     // erd.listenTo(document.getElementById('entirety-data-chart'), this.resizeFunc)

src/views/modules/afterSales/returnDelivery.vue

@@ -168,6 +168,7 @@ export default {
         currentPage: 1, // 当前页数
         pageSize: 10 // 每页显示多少条
       },
+      userId: this.$store.state.user.id,
       searchForm: {
         orderNumber: null,
         deliveryNo: null,
@@ -224,7 +225,7 @@ export default {
             receiverInfo: this.searchForm.receiverInfo,
             status: this.searchForm.status,
             isPayed: this.searchForm.isPayed,
-            printChannel: this.searchForm.printChannel
+            printChannel: (this.userId === 12 || this.userId === 13)? 'Lightning': null
             },
             this.searchForm
           )

src/views/modules/afterSales/thirdAfterSales-add-or-update.vue

@@ -295,7 +295,7 @@
     searchOrder(orderNumber){
       if (orderNumber) {
         this.$http({
-          url: this.$http.adornUrl('/printOrder/printOrder/searchByOrderNumber'),
+          url: this.$http.adornUrl('/platform/order/searchByOrderNumber'),
           method: 'get',
           params: this.$http.adornParams({orderNumber: orderNumber})
         }).then(({data}) => {

src/views/modules/order/orderInfo.vue

@@ -794,6 +794,8 @@ export default {
     closeDialog(){
       this.visible = false;
       this.showOrderCard = false;
+      this.pdfInfo = {};
+      this.dataForm.printStatus = null;
     },
     /**
      *  生成作品打印PDF