From 567c2848a6627b41592de0a7cd6e224dccd729cb Mon Sep 17 00:00:00 2001
From: wtq <2394975549@qq.com>
Date: Tue, 28 Apr 2026 09:15:31 +0800
Subject: [PATCH] '!'

---
 src/components/storemanager/modify-store.vue |  2 +-
 src/pages/indexpage/cmp/mtStoreInfo.vue      | 23 +++++++++++++-------
 src/pages/indexpage/cmp/storeOrderRank.vue   | 14 +++++++-----
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/components/storemanager/modify-store.vue b/src/components/storemanager/modify-store.vue
index ef27ddd..ce17a5c 100644
--- a/src/components/storemanager/modify-store.vue
+++ b/src/components/storemanager/modify-store.vue
@@ -665,7 +665,7 @@
 </template>
 
 <script>
-import { GetVendorStore, updateStore, deleteStoreVendorMap, addStoreVendorMap, updateStoreVendorMap, taoUpdateStatusOrTimeOrPoints, createStore } from '@/apis/store.js'
+import { GetVendorStore, updateStore, deleteStoreVendorMap, addStoreVendorMap, updateStoreVendorMap, taoUpdateStatusOrTimeOrPoints, createStore,getStoreVendorMaps } from '@/apis/store.js'
 import { getPlaces, getCoordinateDistrictCode, getPlaces2, updateStoreTemplate } from '@/apis/cms.js'
 import $ajax from 'axios'
 import api from '@/utils/api'
diff --git a/src/pages/indexpage/cmp/mtStoreInfo.vue b/src/pages/indexpage/cmp/mtStoreInfo.vue
index ede12f8..3961871 100644
--- a/src/pages/indexpage/cmp/mtStoreInfo.vue
+++ b/src/pages/indexpage/cmp/mtStoreInfo.vue
@@ -51,10 +51,12 @@
             <el-table-column prop="activity" label="活动总数量" align="center" ></el-table-column>
             <el-table-column prop="activity_1" label="活动商品数量(0-3折)" align="center" ></el-table-column>
             <el-table-column prop="activity_2" label="活动商品数量(3-9折)" align="center" ></el-table-column>
-            <el-table-column prop="delivery_fee" label="超过1.5km起送价<=20" align="center" width="300">
+            <el-table-column prop="delivery_fee" label="超过1.5km起送价<=20" align="center" width="320">
                  <template slot-scope="scope">
-                    <div v-for="(item,index) in JSON.parse(scope.row.delivery_fee)" :key="index">
-                        {{ '范围：' + item.time_range + '，最低价：' + item.min_price + '，运费：' + item.shipping_fee }}
+                    <div v-if="scope.row.delivery_fee">
+                         <div v-for="(item,index) in JSON.parse(scope.row.delivery_fee)" :key="index">
+                            {{ '范围：' + item.time_range + '，最低价：' + item.min_price + '，运费：' + item.shipping_fee }}
+                        </div>
                     </div>
                 </template>
             </el-table-column>
@@ -101,7 +103,7 @@ export default{
             timeRange:[],
         }
     },
-    created(){
+    async created(){
         // console.log('查询美团门店数据')
         
         let now = new Date().getTime()
@@ -115,8 +117,13 @@ export default{
         // })
         // console.log('res,9999999999999,,,UpdateMtActivity',res1)
         //  hideLoad()
-
-        this.initData()
+        
+        await this.initData()
+        if(this.dataList.length ==0){
+            await this.initStoreData()
+            await this.initData()
+        }
+        
     },
     methods:{
         // 初始化门店数据
@@ -145,8 +152,8 @@ export default{
                 }
                 if(JSON.stringify(this.storeIDs) !== '{}') obj.storeIDs = JSON.stringify([this.storeIDs.id])
                 let res = await api('v2/bind/GetActivityList', {
-                method: 'GET',
-                params: obj
+                    method: 'GET',
+                    params: obj
                 })
                 this.dataList = res.data
                 this.totalCount = res.totalCount
diff --git a/src/pages/indexpage/cmp/storeOrderRank.vue b/src/pages/indexpage/cmp/storeOrderRank.vue
index 19ecd1d..cdc37cc 100644
--- a/src/pages/indexpage/cmp/storeOrderRank.vue
+++ b/src/pages/indexpage/cmp/storeOrderRank.vue
@@ -13,7 +13,7 @@
             </jx-select-pick>
             </el-form-item>
             <!-- 时间 -->
-            <el-form-item label="对比日期范围:" label-width="100px">
+            <el-form-item label="日期范围（当前）:" label-width="140px">
             <!-- value-format="yyyy-MM-dd HH:mm:ss" -->
             <el-date-picker
                 style="width: 260px"
@@ -57,7 +57,7 @@
                             <!-- <h1>{{ recentDay * 2 }}天内的变化</h1> -->
                             <div style="display: flex;justify-content: space-around;margin: 0 auto;">
                                 <el-card v-for="item in scope.row.children" :key="item.id" style="border:1px solid #eee;padding: 10px;font-size: 28px;" :style="{'background-color':new Date(item.order_date).getTime() - new Date(storeOrderRankStatic.data.timeRange[0]).getTime() >= 0 ? '#eee': ''}">
-                                    <div style="text-align: center;margin-bottom: 10px;">{{   new Date(item.order_date).getTime() - new Date(storeOrderRankStatic.data.timeRange[0]).getTime() >= 0 ? '近期' : '远期'}}</div>
+                                    <div style="text-align: center;margin-bottom: 10px;">{{   new Date(item.order_date).getTime() - new Date(storeOrderRankStatic.data.timeRange[0]).getTime() >= 0 ? '当前时间段' : '上一时间段'}}</div>
                                     <div><span style="font-weight: bold;">时间范围</span>：
                                         {{
                                             new Date(item.order_date).getTime() - new Date(storeOrderRankStatic.data.timeRange[0]).getTime() < 0 ? 
@@ -73,7 +73,7 @@
                  </el-table-column>
                 <el-table-column label="门店id" align="center" prop="jx_store_id"></el-table-column>
                 <el-table-column label="门店名" align="center" prop="name"></el-table-column>
-                <el-table-column label="订单总数" align="center" prop="total_orders"></el-table-column>
+                <el-table-column label="订单总数（总）" align="center" prop="total_orders"></el-table-column>
             </el-table>
         </div>
         <!-- 分页 -->
@@ -263,17 +263,19 @@ export default {
                     if(currentTime - mindumTime < 0){
                         brr[findIndex].children[0] = {
                             id:brr[findIndex].id + '1',
-                            ...item
+                            ...item,
+                            order_count:brr[findIndex].children[0].order_count + item.order_count
                         }
                     }else{
                          brr[findIndex].children[1] = {
                             id:brr[findIndex].id + '2',
-                            ...item
+                            ...item,
+                            order_count:brr[findIndex].children[1].order_count + item.order_count
                         }
                     }
                 }
             })
-            // console.log(brr,'data',data)
+            console.log(brr,'data',data)
             return brr
         },
         // 选项的时间发生变化