From d0e4cabd07fb7c58e5c18771574f688d8ab5390c Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 12 Mar 2025 17:14:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=8D=E7=94=A8=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=9D=E5=A4=96=E4=BC=A0=E5=8F=82=EF=BC=8C?=
 =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E6=B8=85=E9=99=A4=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=95=B0=E6=8D=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=A2=9E=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.ts                     |   3 +
 .../marketing/share/components/share.vue      |   2 +-
 src/views/data/index.vue                      |   2 +-
 src/views/product/index.vue                   | 174 ++++++++++--------
 4 files changed, 104 insertions(+), 77 deletions(-)

diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index ea766a4..039339a 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -114,6 +114,9 @@ export const useUserStore = defineStore("user", () => {
    */
   function clearUserData() {
     return new Promise<void>((resolve) => {
+      userInfo.value = {} as UserInfo
+      meituan_douyin_info.value = {}
+      isShopAdmin.value = false
       clearToken();
       usePermissionStoreHook().resetRouter();
       useDictStoreHook().clearDictionaryCache();
diff --git a/src/views/application/marketing/share/components/share.vue b/src/views/application/marketing/share/components/share.vue
index f89612a..2022eeb 100644
--- a/src/views/application/marketing/share/components/share.vue
+++ b/src/views/application/marketing/share/components/share.vue
@@ -359,7 +359,7 @@ export default {
           background-color: #fff;
           position: absolute;
           top: 10px;
-          right: $size / 2 * -1;
+          right: calc($size / 2 * - 1);
           transform: rotate(-45deg);
         }
 
diff --git a/src/views/data/index.vue b/src/views/data/index.vue
index c321ac8..c206cca 100644
--- a/src/views/data/index.vue
+++ b/src/views/data/index.vue
@@ -214,7 +214,7 @@
             <div class="data_item_right">
               <div class="t">
                 <span>新增会员数</span>
-                <span class="n">{{ 0 }}(人)</span>
+                <span class="n">{{ trade.newMemberCoun || 0 }}(人)</span>
               </div>
               <div class="t">
                 <span>会员消费笔数</span>
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 40159f7..d154e37 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -1,75 +1,88 @@
 <template>
   <div class="app-container">
     <!-- 列表 -->
-    <template v-if="isA">
-      <!-- 搜索 -->
-      <page-search ref="searchRef" :search-config="searchConfig" @query-click="handleQueryClick"
-        @reset-click="handleResetClick" />
-      <!-- 顶部数据 -->
-      <Statistics></Statistics>
-      <!-- 列表 -->
-      <page-content ref="contentRef" :content-config="contentConfig" @add-click="handleAddClick"
-        @edit-click="handleEditClick" @export-click="handleExportClick" @search-click="handleSearchClick"
-        @toolbar-click="handleToolbarClick" @operat-click="handleOperatClick" @filter-change="handleFilterChange">
-        <!-- <template #status="scope">
+    <!-- 搜索 -->
+    <page-search
+      ref="searchRef"
+      :search-config="searchConfig"
+      @query-click="handleQueryClick"
+      @reset-click="handleResetClick"
+    />
+    <!-- 顶部数据 -->
+    <Statistics></Statistics>
+    <!-- 列表 -->
+    <page-content
+      ref="contentRef"
+      :content-config="contentConfig"
+      @add-click="handleAddClick"
+      @edit-click="handleEditClick"
+      @export-click="handleExportClick"
+      @search-click="handleSearchClick"
+      @toolbar-click="handleToolbarClick"
+      @operat-click="handleOperatClick"
+      @filter-change="handleFilterChange"
+    >
+      <!-- <template #status="scope">
           <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
             {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
           </el-tag>
         </template> -->
-        <template #type="scope">
-          {{ typeFilter(scope.row[scope.prop]) }}
-        </template>
-        <template #gender="scope">
-          <DictLabel v-model="scope.row[scope.prop]" code="gender" />
-        </template>
-        <template #shangjia="scope">
-          <el-switch v-model="scope.row[scope.prop]" :active-value="1" :inactive-value="0"
-            @click="handleSwitchChange(scope.row)"></el-switch>
-        </template>
-        <template #mobile="scope">
-          <el-text>{{ scope.row[scope.prop] }}</el-text>
-          <copy-button v-if="scope.row[scope.prop]" :text="scope.row[scope.prop]" style="margin-left: 2px" />
-        </template>
-      </page-content>
+      <template #type="scope">
+        {{ typeFilter(scope.row[scope.prop]) }}
+      </template>
+      <template #gender="scope">
+        <DictLabel v-model="scope.row[scope.prop]" code="gender" />
+      </template>
+      <template #shangjia="scope">
+        <el-switch
+          v-model="scope.row[scope.prop]"
+          :active-value="1"
+          :inactive-value="0"
+          @click="handleSwitchChange(scope.row)"
+        ></el-switch>
+      </template>
+      <template #mobile="scope">
+        <el-text>{{ scope.row[scope.prop] }}</el-text>
+        <copy-button
+          v-if="scope.row[scope.prop]"
+          :text="scope.row[scope.prop]"
+          style="margin-left: 2px"
+        />
+      </template>
+    </page-content>
 
-      <!-- 新增 -->
-      <page-modal ref="addModalRef" :modal-config="addModalConfig" @submit-click="handleSubmitClick">
-        <template #gender="scope">
-          <Dict v-model="scope.formData[scope.prop]" code="gender" />
-        </template>
-      </page-modal>
+    <!-- 新增 -->
+    <page-modal ref="addModalRef" :modal-config="addModalConfig" @submit-click="handleSubmitClick">
+      <template #gender="scope">
+        <Dict v-model="scope.formData[scope.prop]" code="gender" />
+      </template>
+    </page-modal>
 
-      <!-- 编辑 -->
-      <page-modal ref="editModalRef" :modal-config="editModalConfig" @submit-click="handleSubmitClick">
-        <template #gender="scope">
-          <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" />
-        </template>
-      </page-modal>
+    <!-- 编辑 -->
+    <page-modal
+      ref="editModalRef"
+      :modal-config="editModalConfig"
+      @submit-click="handleSubmitClick"
+    >
+      <template #gender="scope">
+        <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" />
+      </template>
+    </page-modal>
 
-      <!-- 库存预警设置 -->
-      <MyDialog ref="myDialogRef" @confirm="confirm" title="修改库存预警">
-        <el-form :model="form">
-          <el-form-item label="库存预警" label-width="">
-            <el-input-number v-model="form.num" label="描述文字"></el-input-number>
-          </el-form-item>
-        </el-form>
-      </MyDialog>
-    </template>
-    <template v-else>
-      <!-- <page-content ref="contentRef" :content-config="contentConfig2" @operat-click="handleOperatClick">
-        <template #status="scope">
-          <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
-            {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
-          </el-tag>
-        </template>
-</page-content> -->
-    </template>
+    <!-- 库存预警设置 -->
+    <MyDialog ref="myDialogRef" @confirm="confirm" title="修改库存预警">
+      <el-form :model="form">
+        <el-form-item label="库存预警" label-width="">
+          <el-input-number v-model="form.num" label="描述文字"></el-input-number>
+        </el-form-item>
+      </el-form>
+    </MyDialog>
   </div>
 </template>
 
 <script setup lang="ts">
 import UserAPI from "@/api/product/index";
-import { useRouter } from 'vue-router';
+import { useRouter } from "vue-router";
 import type { IObject, IOperatData } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
 import addModalConfig from "./indexconfig/add";
@@ -96,13 +109,13 @@ const {
 const router = useRouter();
 
 const form = reactive({
-  num: '',
-})
+  num: "",
+});
 // 新增
 async function handleAddClick() {
-  router.push({ name: 'addgoods' });
+  router.push({ name: "addgoods" });
   // addModalRef.value?.setModalVisible();
-  // 加载上级规格下拉数据源 
+  // 加载上级规格下拉数据源
   // addModalConfig.formItems[2]!.attrs!.data = await UserAPI.getPage({ name: "" });
   // 加载角色下拉数据源
   // addModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
@@ -110,35 +123,41 @@ async function handleAddClick() {
 // 上架
 function handleSwitchChange(data: any) {
   let obj = {
-    type: data.isGrounding ? 'sku' : 'product',
+    type: data.isGrounding ? "sku" : "product",
     id: data.id,
-    isSale: data.isSale
-  }
+    isSale: data.isSale,
+  };
   UserAPI.onOff(obj);
 }
 // 编辑
 async function handleEditClick(row: IObject) {
-  router.push({ name: 'addgoods', query: { goods_id: row.id } });
+  router.push({ name: "addgoods", query: { goods_id: row.id } });
 }
-const myDialogRef = ref(null)
+const myDialogRef = ref(null);
 // 其他工具栏
 function handleToolbarClick(name: string) {
   console.log(name);
   if (name === "custom1") {
     // ElMessage.success("点击了自定义1按钮");
-    myDialogRef.value.open()
+    myDialogRef.value.open();
   }
 }
 function confirm() {
-  console.log(form, 'debug')
+  console.log(form, "debug");
 }
 // 商品规格
 function typeFilter(item: any) {
-  if (item == 'single') { return '单规格' }
-  else if (item == 'sku') { return '多规格' }
-  else if (item == 'package') { return '套餐商品' }
-  else if (item == 'weight') { return '称重商品' }
-  else if (item == 'coupon') { return '团购券' }
+  if (item == "single") {
+    return "单规格";
+  } else if (item == "sku") {
+    return "多规格";
+  } else if (item == "package") {
+    return "套餐商品";
+  } else if (item == "weight") {
+    return "称重商品";
+  } else if (item == "coupon") {
+    return "团购券";
+  }
 }
 // 其他操作列
 async function handleOperatClick(data: IOperatData) {
@@ -175,6 +194,11 @@ async function handleOperatClick(data: IOperatData) {
   }
 }
 
-// 切换示例
-const isA = ref(true);
+const route = useRoute();
+onMounted(() => {
+  console.log(route.query);
+  if (route.query.id) {
+    contentRef.value?.fetchPageData({ id: route.query.id });
+  }
+});
 </script>