订单等数据分离

src/utils/request.js

@@ -2,7 +2,7 @@
  * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
  * @Date: 2022-08-02 14:50:38
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-11-01 11:54:14
+ * @LastEditTime: 2024-11-11 13:54:37
  * @FilePath: \admin-manage\src\utils\request.js
  * @Description: 
  * 
@@ -33,7 +33,7 @@ service.interceptors.request.use(
       // ['X-Token'] is a custom headers key
       // please modify it according to the actual situation
       config.headers['Accesstoken'] = getToken()
-      config.headers['code'] = 1
+      config.headers['code'] = '520100,5201000,p-0001' //慧研学520100 中数5201000 贵大 p-0001
       config.headers['epid'] = localStorage.getItem('epid')
       // config.headers['Content-Type'] = 'application/x-www-form-urlencoded'
     // }

src/views/home/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-07-08 12:10:55
- * @LastEditTime: 2024-11-01 16:31:42
+ * @LastEditTime: 2024-11-12 11:11:26
  * @LastEditors: wenjie 1454560336@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \admin-manage\src\views\home\index.vue
@@ -32,7 +32,7 @@
     </div> -->
 
      <el-select
-          v-model="platformType"
+          v-model="query.platformType"
           size="small"
           class="item-width-200 mb10"
           placeholder="请选择所属平台"
@@ -184,6 +184,11 @@ export default {
       query:{
         platformType:1,
       },
+      platformTypeObj:{
+        1:'520100',
+        2:'p-000',
+        3:'5201000',
+      },
       userData: {
         dayRegister: 0,
         dayVip: 0,
@@ -213,7 +218,7 @@ export default {
     };
   },
   watch: {
-    platformType(val) {
+    'query.platformType'(val) {
         this.init()
       }
   },
@@ -231,7 +236,8 @@ export default {
 
         orderCount({
           startTime: thisDayStartTime,
-          endTime: thisDayEndTime
+          endTime: thisDayEndTime,
+          code:this.platformTypeObj[this.query.platformType] 
         }).then(res => {
           if (res.state == 'Success') {
             this.today = res.content;
@@ -239,15 +245,23 @@ export default {
         });
         orderCount({
           startTime: yesterdayStartTime,
-          endTime: yesterdayEndTime
+          endTime: yesterdayEndTime,
+          code:this.platformTypeObj[this.query.platformType] 
         }).then(res => {
           if (res.state == 'Success') {
             this.yesterday = res.content;
           }
         });
-        userStatistics({code:this.query.platformType}).then(res => {
+        userStatistics(this.query).then(res => {
           if (res.state == 'Success') {
             this.userData = res.content;
+            // if(this.query.platformType==2){
+            //   this.userData.totalRegister = this.userData.totalRegisterByHyx
+            //   this.userData.totalRegister = this.userData.totalRegisterByHyx
+            // }else if(this.query.platformType==3){
+            //   this.userData.totalRegister = this.userData.totalRegisterByMall
+            //   this.userData.totalRegister = this.userData.totalRegisterByMall
+            // }
           }
         })
     }

src/views/operationManage/goodsManage/goodsDetail.vue

@@ -2,7 +2,7 @@
  * @Author: wj 1454560336@qq.com
  * @Date: 2023-11-24 14:39:54
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-11-08 11:53:02
+ * @LastEditTime: 2024-11-11 17:23:24
  * @FilePath: \admin-manage\src\views\operationManage\goodsManage\goodsDetail.vue
  * @Description: 
  * 
@@ -85,7 +85,7 @@
         </template>
 
 
-        <el-form-item v-if="mode=='detail'" label="商品上架平台商品信息：">
+        <el-form-item v-if="setQuery.prePlatformType && mode=='detail'" label="商品操作平台商品信息：">
           <el-checkbox-group v-model="setQuery.platformType" prop="platformType">
             <div class="flex" v-for="(item,index) in setQuery.prices" :key="index" ><el-checkbox :label="item.platformType">{{filterMasterName(item.platformType) }}</el-checkbox> 
             <el-form-item  >
@@ -98,7 +98,7 @@
         </el-form-item>
 
 
-          <el-form-item label="售价：" v-else prop="realPrice">
+          <el-form-item label="售价：" v-else-if="!setQuery.prePlatformType" prop="realPrice">
             <el-input
               type="number"
               v-model="setQuery.realPrice"

src/views/operationManage/goodsManage/labelList.vue

@@ -119,12 +119,12 @@
         label-width="130px"
         >
           
-        <el-form-item label="标签名称：" prop="labelName">
+        <el-form-item label="所属平台：" prop="labelName">
             <el-select
             v-model="setQuery.platformType"
             clearable
             class="item-width-300"
-            placeholder="请选择主商户"
+            placeholder="请选择所属平台"
           >
             <el-option
               v-for="item in masterShopOptions"

src/views/operationManage/orderManage/index.vue

@@ -310,7 +310,7 @@ export default {
         }else{
           return {
             goodsName:goodsModelList[0].goodsInfo.goodsName,
-            price:goodsModelList[0].goodsInfo.realPrice
+            price: goodsModelList[0].goodsInfo.platformPrice?goodsModelList[0].goodsInfo.platformPrice.price: goodsModelList[0].goodsInfo.realPrice
           }
         }
     },

src/views/operationManage/orderManage/orderDetail.vue

@@ -2,7 +2,7 @@
  * @Author: wj 1454560336@qq.com
  * @Date: 2023-11-01 14:21:43
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-10-28 14:27:46
+ * @LastEditTime: 2024-11-11 16:52:07
  * @FilePath: \admin-manage\src\views\operationManage\orderManage\orderDetail.vue
  * @Description:
  *
@@ -631,7 +631,7 @@ import {auditRefund,transfer,orderDetail,subOrdersConfirm,getReserve} from '@/ap
                         icon:row.goodsList[0].goodsInfo.goodsPath,
                         paymentTime:row.payment?row.payment.paymentTime:'',
                         paymentWay:row.payment?row.payment.paymentWay:'',
-                        price:row.goodsList[0].goodsInfo.realPrice,
+                        price:row.goodsList[0].goodsInfo.platformPrice?row.goodsList[0].goodsInfo.platformPrice.price:row.goodsList[0].goodsInfo.realPrice,
                         goodsName:row.goodsList[0].goodsInfo.goodsName,
 
                     }

src/views/operationManage/shopManage/index.vue

@@ -119,6 +119,18 @@
         show-overflow-tooltip
       >
       </el-table-column>
+      <el-table-column
+        prop="shopMenuId"
+        align="center"
+        label="所属平台"
+        show-overflow-tooltip
+      >
+      <template slot-scope="scope">
+        <div class="flex">
+          {{ filterMasterName(scope.row.platformType) }}
+        </div>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="shopId"
         align="center"
@@ -486,6 +498,10 @@ export default {
 .shopManage {
   .search {
     justify-content: space-between;
+    .flex{
+      display: flex;
+      
+    }
     .add-btn {
       // margin-right: 20px;
     }

src/views/operationManage/shopManage/shopAdd.vue

@@ -2,7 +2,7 @@
  * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
  * @Date: 2023-05-26 16:37:34
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-11-08 16:39:24
+ * @LastEditTime: 2024-11-11 14:22:45
  * @FilePath: \admin-manage\src\views\operationManage\shopManage\shopAdd.vue
  * @Description:
  *
@@ -494,11 +494,11 @@ export default {
 
       }
     },
-    'setQuery.authAccount'(val){
-        if(!val){
-          this.setQuery.state = 2
-        }
-    }
+    // 'setQuery.authAccount'(val){
+    //     if(!val){
+    //       this.setQuery.state = 2
+    //     }
+    // }
   },
   computed: {
     isDisabled(val){