From 5b2d2ab8c3a4312b9df876814f6caab0657c3277 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Wed, 10 Dec 2025 09:29:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E5=88=86?=
 =?UTF-8?q?=E5=BA=97=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/data/index.vue        |  7 ++++---
 src/views/data/sales.vue        | 15 ++++++++-------
 src/views/data/table.vue        |  3 ++-
 src/views/online-shop/index.vue |  8 +++++---
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/views/data/index.vue b/src/views/data/index.vue
index ea9dbaf..4b64a57 100644
--- a/src/views/data/index.vue
+++ b/src/views/data/index.vue
@@ -688,6 +688,7 @@ export default {
     async geiShopList() {
       let res = await ShopApi.getBranchList()
       this.branchList = res;
+      this.shopId = res[0].shopId
     },
     shopChange() {
       this.summarytrade();
@@ -714,7 +715,7 @@ export default {
           beginDate: this.query.createdAt[0],
           endDate: this.query.createdAt[1],
           rangeType: this.timeValue,
-          shopId: this.shopInfo.id
+          shopId: this.shopId
         });
         this.trade = res;
         this.tradeSale = res.sale;
@@ -1277,7 +1278,7 @@ export default {
         this.saleTableLoading = true;
         const res = await dataSummaryApi.productSaleDate({
           day: this.saleTableActive,
-          shopId: this.shopInfo.id,
+          shopId: this.shopId,
         });
         this.saleTable = res;
         this.saleTableTotal = res.length;
@@ -1293,7 +1294,7 @@ export default {
     async datePayType() {
       try {
         this.payChartLoading = true;
-        const res = await dataSummaryApi.datePayType({ day: this.saleActive, shopId: this.shopInfo.id });
+        const res = await dataSummaryApi.datePayType({ day: this.saleActive, shopId: this.shopId });
         const data = res.map((item) => {
           return {
             value: item.count,
diff --git a/src/views/data/sales.vue b/src/views/data/sales.vue
index 54c950e..8dd6991 100644
--- a/src/views/data/sales.vue
+++ b/src/views/data/sales.vue
@@ -16,11 +16,11 @@
               <el-option v-for="item in branchList" :key="item.shopId" :label="item.shopName" :value="item.shopId" />
             </el-select>
           </el-form-item>
-          <!-- <el-form-item>
+          <el-form-item>
             <el-select v-model="query.prodCategoryId" placeholder="商品分类" style="width: 140px">
               <el-option :label="item.name" :value="item.id" v-for="item in categorys" :key="item.id"></el-option>
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
         </template>
         <el-form-item>
           <el-radio-group v-model="timeValue" @change="timeChange">
@@ -250,6 +250,7 @@ export default {
     async geiShopList() {
       let res = await ShopApi.getBranchList()
       this.branchList = res;
+      this.shopId = res[0].shopId
     },
     totalfilter(item, d) {
       let num = item + d;
@@ -280,9 +281,9 @@ export default {
           beginDate: this.query.createdAt[0],
           endDate: this.query.createdAt[1],
           rangeType: this.timeValue,
-          prodCategoryId: this.query.prodCategoryId,
+          categoryId: this.query.prodCategoryId,
           productName: this.query.productName,
-          shopId: this.shopInfo.id,
+          shopId: this.shopId,
           type: this.orderType,
         });
         this.payCount = res;
@@ -300,7 +301,7 @@ export default {
         const file = await saleSummaryApi.export({
           beginDate: this.query.createdAt[0],
           endDate: this.query.createdAt[1],
-          prodCategoryId: this.query.prodCategoryId,
+          categoryId: this.query.prodCategoryId,
           productName: this.query.productName,
           shopId: this.shopId
         });
@@ -343,8 +344,8 @@ export default {
           endDate: this.query.createdAt[1],
           rangeType: this.timeValue,
           productName: this.query.productName,
-          prodCategoryId: this.query.prodCategoryId,
-          shopId: this.shopInfo.id,
+          categoryId: this.query.prodCategoryId,
+          shopId: this.shopId,
         });
         this.tableData.totalList = _.chunk(res, this.tableData.size);
         this.tableData.data = this.tableData.totalList[this.tableData.page - 1] || [];
diff --git a/src/views/data/table.vue b/src/views/data/table.vue
index 7137add..a360083 100644
--- a/src/views/data/table.vue
+++ b/src/views/data/table.vue
@@ -153,6 +153,7 @@ export default {
     async geiShopList() {
       let res = await ShopApi.getBranchList()
       this.branchList = res;
+      this.shopId = res[0].shopId
     },
     //携带table id跳转到订单列表页面
     toTableOrderList(data) {
@@ -214,7 +215,7 @@ export default {
           rangeType: this.timeValue,
           beginDate: this.query.createdAt[0],
           endDate: this.query.createdAt[1],
-          shopId: this.shopInfo.id
+          shopId: this.shopId
         });
         this.tableData.loading = false;
         this.tableData.totalList = _.chunk(res, this.tableData.size);
diff --git a/src/views/online-shop/index.vue b/src/views/online-shop/index.vue
index 6141806..9df282a 100644
--- a/src/views/online-shop/index.vue
+++ b/src/views/online-shop/index.vue
@@ -10,7 +10,8 @@
       <div class="preview_wrap">
         <div class="phone_wrap">
           <div class="index_bg" v-if="tableActive == 'index_bg'">
-            <el-carousel height="500px">
+            <img class="bg" v-if="!isJsonArrayString(selectItem.value)" :src="selectItem.value" alt="">
+            <el-carousel height="500px" v-else>
               <el-carousel-item v-for="item in JSON.parse(selectItem.value)">
                 <img class="bg" :src="item" />
               </el-carousel-item>
@@ -155,7 +156,8 @@
             </div>
           </div>
           <div class="shopinfo_bg" v-if="tableActive == 'shopinfo_bg'">
-            <el-carousel height="120px">
+            <img class="bg" :src="selectItem.value" v-if="!isJsonArrayString(selectItem.value)" />
+            <el-carousel height="120px" v-else>
               <el-carousel-item v-for="item in JSON.parse(selectItem.value)">
                 <img class="bg" :src="item" />
               </el-carousel-item>
@@ -192,7 +194,7 @@
         </div>
         <div class="form_item">
           <div class="upload_wrap" style="display: flex;flex-direction: column;gap: 28px;"
-            v-if="isJsonArrayString(selectItem.value)">
+            v-if="selectItem.autoKey == 'index_bg' || selectItem.autoKey == 'shopinfo_bg'">
             <MultiImageUpload v-model="imgList" @upDataEvent="MultiOnSuccess" />
             <div>
               <el-button type="primary" size="large" @click="doSubmit">确认修改</el-button>