From ca182dc32522db21d6643e21dbd4f543393f729d Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Wed, 28 Jan 2026 15:02:24 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/coupon/index.js                       |  62 ++++
 src/components/selectCoupon/index.vue         |  34 ++
 src/views/login/index.vue                     |   6 +-
 src/views/marketing_center/data.js            |  10 +-
 .../components/groupSetting.vue               | 290 ++++++++++++++++++
 .../distribution_page/index.vue               |   9 +-
 .../share_setting/components/add_banner.vue   | 175 +++++++++++
 .../components/banner_setting.vue             | 136 ++++++++
 .../share_setting/components/linkCard.vue     | 189 ++++++++++++
 .../share_setting/components/setting.vue      | 135 ++++++++
 .../marketing_center/share_setting/data.js    |  38 +++
 .../marketing_center/share_setting/index.vue  |  56 ++++
 src/views/product/index.vue                   |   7 +-
 src/views/product/indexconfig/content.ts      |   5 +-
 14 files changed, 1141 insertions(+), 11 deletions(-)
 create mode 100644 src/components/selectCoupon/index.vue
 create mode 100644 src/views/marketing_center/distribution_page/components/groupSetting.vue
 create mode 100644 src/views/marketing_center/share_setting/components/add_banner.vue
 create mode 100644 src/views/marketing_center/share_setting/components/banner_setting.vue
 create mode 100644 src/views/marketing_center/share_setting/components/linkCard.vue
 create mode 100644 src/views/marketing_center/share_setting/components/setting.vue
 create mode 100644 src/views/marketing_center/share_setting/data.js
 create mode 100644 src/views/marketing_center/share_setting/index.vue

diff --git a/src/api/coupon/index.js b/src/api/coupon/index.js
index b713bf5..86f0091 100644
--- a/src/api/coupon/index.js
+++ b/src/api/coupon/index.js
@@ -801,6 +801,68 @@ export function attendanceDetail(params) {
 	});
 }
 
+// 分享奖励基础:新增/修改
+export function shareBasePost(data) {
+	return request({
+		url: `${Market_BaseUrl}/admin/shareBase`,
+		method: 'POST',
+		data
+	});
+}
+
+// 分享奖励基础 查询
+export function shareBaseGet(params) {
+	return request({
+		url: `${Market_BaseUrl}/admin/shareBase`,
+		method: 'GET',
+		params
+	});
+}
+
+// 轮播图配置:新增/修改
+export function shareCarouselPost(data) {
+	return request({
+		url: `${Market_BaseUrl}/admin/carousel`,
+		method: 'POST',
+		data
+	});
+}
+
+// 分享轮播图配置
+export function shareCarouselGet(params) {
+	return request({
+		url: `${Market_BaseUrl}/admin/carousel`,
+		method: 'GET',
+		params
+	});
+}
+
+// 分享 轮播图配置 删除
+export function shareCarouselDel(id) {
+	return request({
+		url: `${Market_BaseUrl}/admin/carousel/${id}`,
+		method: 'DELETE'
+	});
+}
+
+// 全民股东群聊 配置信息获取
+export function disGroupGet(params) {
+	return request({
+		url: `${Market_BaseUrl}/admin/disGroup`,
+		method: 'get',
+		params
+	});
+}
+
+// 全民股东群聊:新增/修改
+export function disGroupPost(data) {
+	return request({
+		url: `${Market_BaseUrl}/admin/disGroup`,
+		method: 'POST',
+		data
+	});
+}
+
 
 
 
diff --git a/src/components/selectCoupon/index.vue b/src/components/selectCoupon/index.vue
new file mode 100644
index 0000000..ddaa258
--- /dev/null
+++ b/src/components/selectCoupon/index.vue
@@ -0,0 +1,34 @@
+<template>
+  <el-select v-model="modelValue" placeholder="请选择优惠券" clearable style="width: 300px;" @change="changHandle">
+    <el-option v-for="coupon in couponList" :key="coupon.id" :label="coupon.title" :value="coupon.id" />
+  </el-select>
+</template>
+<script setup>
+import couponApi from "@/api/market/coupon";
+import { ref, onMounted } from "vue";
+
+const modelValue = defineModel({
+  type: [String, Number],
+  default: ''
+});
+
+const name = defineModel('name', {
+  type: String,
+  default: ''
+});
+
+function changHandle(value) {
+  name.value = couponList.value.find(item => item.id === value)?.title || '';
+}
+
+// 优惠券列表
+const couponList = ref([]);
+
+onMounted(() => {
+  couponApi.getList({ size: 999 }).then((res) => {
+    if (res) {
+      couponList.value = res.records || [];
+    }
+  });
+});
+</script>
\ No newline at end of file
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 16ec113..d41322b 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -70,11 +70,11 @@ const env = process.env.NODE_ENV
 // DEV-START
 const accountList = reactive([
   { username: "admin", type: 'primary', label: 'admin' },
-  // { username: "19191703856", type: 'warning', label: '喜气洋洋' },
-  // { username: "19107220837", type: 'danger', label: '快乐时光店铺' },
+  { username: "18049104914", type: 'warning', label: '东风的店铺' },
+  { username: "19107220837", type: 'danger', label: '快乐时光店铺' },
   // { username: "18199991111", type: 'success', label: '草莓加盟主店可直接管理' },
   { username: "18821670757", type: 'success', label: '高歌的小店' },
-  // { username: "19112345678", type: 'danger', label: '酸橘子·云贵小馆' },
+  { username: "191123456", type: 'primary', label: '酸橘子' },
 ]);
 
 // 快捷模拟登录
diff --git a/src/views/marketing_center/data.js b/src/views/marketing_center/data.js
index 4fc62de..f809cd7 100644
--- a/src/views/marketing_center/data.js
+++ b/src/views/marketing_center/data.js
@@ -32,10 +32,10 @@ export const newMenus = [
     intro: '协助商家拉来新客户，拓展客户群体',
     childrenList: [
       {
-        name: "分销",
+        name: "全民分销",
         icon: "zhcz",
         pathName: "distribution_page",
-        intro: "用户成为业务员，可促进消费"
+        intro: "用户成为股东，可促进消费"
       },
       {
         name: "套餐推广",
@@ -55,6 +55,12 @@ export const newMenus = [
         pathName: "group_booking",
         intro: "拼团"
       },
+      {
+        name: "分享配置",
+        icon: "sppt",
+        pathName: "share_setting",
+        intro: "商家可配置用户分享后可获得的奖励"
+      },
     ]
   },
   {
diff --git a/src/views/marketing_center/distribution_page/components/groupSetting.vue b/src/views/marketing_center/distribution_page/components/groupSetting.vue
new file mode 100644
index 0000000..b5d76eb
--- /dev/null
+++ b/src/views/marketing_center/distribution_page/components/groupSetting.vue
@@ -0,0 +1,290 @@
+<template>
+  <div class="form_content">
+    <div class="left">
+      <div class="new_preview">
+        <div class="header">{{ shopInfo.shopName }}</div>
+        <div class="content">
+          <div class="title">{{ form.title }}</div>
+          <div class="img_wrap">
+            <div class="img">
+              <el-image :src="form.groupUrl" style="width: 100%;height: 100%;border-radius: 4px;"></el-image>
+            </div>
+          </div>
+          <div class="intro">
+            {{ form.content }}
+          </div>
+          <div class="foot">
+            {{ defaultNote }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="form">
+      <el-form ref="formRef" :model="form" :rules="rules" label-position="right" label-width="120px">
+        <el-form-item label="群二维码" prop="groupUrl">
+          <single-image-upload style="width: 120px; height: 120px" v-model="form.groupUrl"></single-image-upload>
+        </el-form-item>
+        <el-form-item label="模块标题" prop="title">
+          <el-input :placeholder="defaultTitle" :maxlength="15" v-model.trim="form.title"
+            style="width: 300px;"></el-input>
+        </el-form-item>
+        <el-form-item label="模块内容">
+          <el-input type="textarea" :rows="4" :maxlength="20" show-word-limit placeholder="请输入内容"
+            v-model.trim="form.content" style="width: 300px;"></el-input>
+        </el-form-item>
+        <el-form-item label="模块提示语">
+          <div class="tips">{{ defaultNote }}</div>
+        </el-form-item>
+        <el-form-item label="启用状态">
+          <el-switch v-model="form.isEnable" :active-value="1" :inactive-value="0"></el-switch>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" :loading="loading" @click="submitHandle">保存</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue'
+import { ElNotification } from 'element-plus'
+import { disGroupGet, disGroupPost } from '@/api/coupon/index'
+
+const defaultTitle = ref('扫码进群，优惠多多')
+const defaultNote = ref('如果长按不能识别，可截图或保存二维码图片至相册，通过微信扫码入群')
+const defaultContent = ref('长按识别上方企微好友码，添加【福利官】')
+const shopInfo = ref('')
+
+const form = ref({
+  id: '',
+  groupUrl: '',
+  title: defaultTitle.value,
+  content: defaultContent.value,
+  isEnable: 1,
+})
+
+const rules = reactive({
+  groupUrl: [
+    {
+      required: true,
+      message: '请上传群二维码',
+      triiger: 'change'
+    }
+  ],
+  title: [
+    {
+      required: true,
+      message: '请输入模块标题',
+      triiger: 'change'
+    }
+  ],
+  content: [
+    {
+      required: true,
+      message: '请输入内容',
+      triiger: 'change'
+    }
+  ]
+})
+
+// 开始提交
+const formRef = ref(null)
+const emits = defineEmits(["success"]);
+const loading = ref(false);
+function submitHandle() {
+  formRef.value.validate(async (valid) => {
+    try {
+      if (valid) {
+        loading.value = true;
+
+        let data = { ...form.value }
+
+        if (data.title == '') {
+          data.title = defaultTitle.value
+        }
+
+        if (data.content == '') {
+          data.content = defaultContent.value
+        }
+
+        await disGroupPost(data);
+        ElNotification({
+          title: '注意',
+          message: '保存成功',
+          type: 'success'
+        })
+      }
+    } catch (err) {
+      console.log(err);
+    }
+    loading.value = false;
+  });
+}
+
+// 获取配置信息
+async function drainageConfigGetAjax() {
+  try {
+    const res = await disGroupGet()
+    form.value = res
+    if (form.value.title == '') {
+      form.value.title = defaultTitle.value
+    }
+    if (form.value.content == '') {
+      form.value.content = defaultContent.value
+    }
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+onMounted(() => {
+  shopInfo.value = JSON.parse(localStorage.getItem('userInfo'))
+  drainageConfigGetAjax()
+})
+</script>
+
+<style scoped lang="scss">
+.form_content {
+  padding: 14px 0 0;
+  display: flex;
+
+  .left {
+    width: 374px;
+    height: 720px;
+    position: relative;
+    background: url('https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/3/7da616a1c56a409dbdea8bf2f41cf14b.png') no-repeat center center / 100% 100%;
+
+    &::before {
+      content: "";
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      background-color: rgba(0, 0, 0, 0.3);
+    }
+
+    .preview {
+      width: 350px;
+      height: 130px;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      background-color: #fff;
+      border-radius: 6px;
+      display: flex;
+      align-items: center;
+      padding: 14px;
+
+      .info {
+        flex: 1;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        padding: 5px 0;
+
+        .top {
+          flex: 1;
+
+          .title {
+            font-size: 16px;
+            color: #333;
+            font-weight: bold;
+          }
+
+          .content {
+            font-size: 12px;
+            color: #666;
+          }
+        }
+
+        .btm {
+          font-size: 14px;
+          color: #999;
+        }
+      }
+
+      .img_wrap {
+        width: 100px;
+        height: 100px;
+
+        .img {
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
+
+    .new_preview {
+      --bg: #3F3B37;
+      --color: #F6DFC4;
+      --borderColor: #f6dfc45b;
+      width: 90%;
+      background-color: var(--bg);
+      border-radius: 4px;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+
+      .header {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 16px;
+        color: var(--color);
+        height: 50px;
+        border-bottom: 1px dashed var(--borderColor);
+      }
+
+      .content {
+        padding-bottom: 14px;
+
+        .title {
+          font-size: 14px;
+          color: var(--color);
+          height: 50px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
+
+        .img_wrap {
+          display: flex;
+          justify-content: center;
+
+          .img {
+            --size: 220px;
+            width: var(--size);
+            height: var(--size);
+          }
+        }
+
+        .intro {
+          height: 40px;
+          font-size: 14px;
+          color: var(--color);
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          padding: 0 14px;
+        }
+
+        .foot {
+          height: 40px;
+          color: var(--borderColor);
+          font-size: 14px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          padding: 0 14px;
+          text-align: center;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/marketing_center/distribution_page/index.vue b/src/views/marketing_center/distribution_page/index.vue
index 8c15d35..df922e0 100644
--- a/src/views/marketing_center/distribution_page/index.vue
+++ b/src/views/marketing_center/distribution_page/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="gyq_container">
     <div class="gyq_content">
-      <HeaderCard name="分销" intro="用户成为业务员，可促进消费" icon="xffx" showSwitch v-model:isOpen="form.isEnable">
+      <HeaderCard name="全民股东" intro="用户成为股东，可促进消费" icon="xffx" showSwitch v-model:isOpen="form.isEnable">
       </HeaderCard>
       <div class="tips">
         <el-alert title="请记得前往《分销明细》充值余额，余额不足时用户收益将无法正常入账" type="primary" show-icon :closable="false" />
@@ -18,6 +18,8 @@
         <activation_record key="activationRecord" v-if="tabActiveIndex == 2" />
         <!-- 分销明细 -->
         <distribution_details key="distributionDetails" v-if="tabActiveIndex == 3" />
+        <!-- 股东管理群 -->
+        <groupSetting name="groupSetting" key="groupSetting" v-if="tabActiveIndex == 4" />
       </div>
     </div>
   </div>
@@ -30,6 +32,7 @@ import setting from "./components/setting.vue";
 import distributor from "./components/distributor.vue";
 import activation_record from "./components/activation_record.vue";
 import distribution_details from "./components/distribution_details.vue";
+import groupSetting from "./components/groupSetting.vue";
 import { ref, onMounted, watch } from 'vue'
 import { distributionGet, distributionPut } from '@/api/coupon'
 
@@ -53,6 +56,10 @@ const tabList = ref([
     label: '分销明细',
     value: 3
   },
+  {
+    label: '股东管理群',
+    value: 3
+  },
 ])
 
 const form = ref({
diff --git a/src/views/marketing_center/share_setting/components/add_banner.vue b/src/views/marketing_center/share_setting/components/add_banner.vue
new file mode 100644
index 0000000..fea2f15
--- /dev/null
+++ b/src/views/marketing_center/share_setting/components/add_banner.vue
@@ -0,0 +1,175 @@
+<template>
+  <el-dialog :title="form.id ? '编辑' : '添加'" width="800px" v-model="visible" @closed="resetForm">
+    <el-form ref="formRef" :model="form" :rules="rules" label-width="100px" label-position="left">
+      <el-form-item label="名称" prop="name">
+        <el-input v-model="form.name" placeholder="请输入轮播图名称" :maxlength="20" style="width: 300px;"></el-input>
+      </el-form-item>
+      <el-form-item label="轮播图片" prop="imageUrl">
+        <div class="column">
+          <div class="center">
+            <SingleImageUpload v-model="form.imageUrl" />
+          </div>
+          <div class="tips" style="margin-bottom: 8px;">建议尺寸：750x300像素，支持jpg、png、gif格式，大小不超过2MB</div>
+        </div>
+      </el-form-item>
+      <el-form-item label="是否可分享" prop="isShareable">
+        <div class="column">
+          <div>
+            <el-radio-group v-model="form.isShareable">
+              <el-radio label="开启" :value="1"></el-radio>
+              <el-radio label="关闭" :value="0"></el-radio>
+            </el-radio-group>
+          </div>
+          <div class="tips">开启时，用户端会显示单独的分享按钮</div>
+        </div>
+      </el-form-item>
+      <el-form-item label="跳转页面" prop="jumpPageId">
+        <linkCard :includes-names="includesNames" v-model="form.jumpPageId" v-model:extendParam="form.extendParam" />
+      </el-form-item>
+      <el-form-item label="排序值" prop="sort">
+        <el-input v-model="form.sort" @input="e => form.sort = filterNumberInput(e, 1)" style="width: 300px;"
+          placeholder="排序值越大越靠前"></el-input>
+      </el-form-item>
+      <el-form-item label="是否启用">
+        <el-radio-group v-model="form.isEnabled">
+          <el-radio label="启用" :value="1"></el-radio>
+          <el-radio label="禁用" :value="0"></el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="visible = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm" :loading="loading">确 定</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import _ from 'lodash';
+import { ref } from 'vue';
+import { filterNumberInput } from '@/utils';
+import SingleImageUpload from '@/components/Upload/SingleImageUpload.vue';
+import linkCard from './linkCard.vue';
+import { shareCarouselPost } from '@/api/coupon/index.js';
+
+const visible = ref(false);
+const loading = ref(false);
+const formObj = ref({
+  id: '',                 // 轮播图ID，编辑时传递
+  name: '',               // 轮播图名称（20字内）
+  imageUrl: '',           // 轮播图片地址
+  isShareable: 1,        // 是否可分享 1=开启 0=关闭
+  jumpPageId: '',         // 跳转页面 tb_mini_app_pages的 id
+  extendParam: '',        // 扩展参数
+  sort: '',               // 排序值，数值越大越靠前
+  isEnabled: 1,          // 是否启用 1=启用 0=禁用
+});
+const form = ref(_.cloneDeep(formObj.value));
+function resetForm() {
+  form.value = _.cloneDeep(formObj.value);
+}
+const formRef = ref(null);
+const rules = {
+  name: [
+    { required: true, message: '请输入轮播图名称', trigger: 'blur' }
+  ],
+  imageUrl: [
+    { required: true, message: '请上传轮播图片', trigger: 'change' }
+  ],
+  jumpPageId: [
+    {
+      validator: (rule, value, callback) => {
+        if (form.value.jumpPageId && _.includes(includesNames.value.map(item => item.id), form.value.jumpPageId)) {
+          if (!form.value.extendParam) {
+            callback(new Error('请选择具体菜品'));
+          } else {
+            callback();
+          }
+        } else {
+          callback();
+        }
+      },
+      trigger: 'change'
+    }
+  ],
+  sort: [
+    { required: true, message: '请输入排序值', trigger: 'blur' }
+  ],
+}
+
+const includesNames = ref([
+  {
+    id: '4',
+    name: '套餐推广商品详情页'
+  },
+  {
+    id: '6',
+    name: '商品拼团详情页'
+  },
+  {
+    id: '10',
+    name: '点餐商品详情弹窗页'
+  }
+]);
+
+function submitForm() {
+  console.log(form.value);
+
+  formRef.value.validate((valid) => {
+    if (valid) {
+      shareCarouselPostAjax();
+    }
+  });
+}
+
+const emits = defineEmits(['success']);
+
+// 轮播图配置:新增/修改
+async function shareCarouselPostAjax() {
+  try {
+    loading.value = true;
+    await shareCarouselPost(form.value);
+    ElNotification({
+      title: '成功',
+      message: '保存成功',
+      type: 'success',
+      duration: 2000
+    });
+    emits('success');
+    visible.value = false;
+  } catch (error) {
+    console.log(error);
+  } finally {
+    loading.value = false;
+  }
+}
+
+function show(obj) {
+  visible.value = true;
+  if (obj && obj.id) {
+    form.value = _.cloneDeep(obj)
+  }
+}
+
+defineExpose({
+  show
+})
+</script>
+
+<style scoped lang="scss">
+.center {
+  display: flex;
+}
+
+.column {
+  display: flex;
+  flex-direction: column;
+}
+
+.tips {
+  font-size: 14px;
+  color: #999;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/marketing_center/share_setting/components/banner_setting.vue b/src/views/marketing_center/share_setting/components/banner_setting.vue
new file mode 100644
index 0000000..0227292
--- /dev/null
+++ b/src/views/marketing_center/share_setting/components/banner_setting.vue
@@ -0,0 +1,136 @@
+<template>
+  <div>
+    <div class="row">
+      <el-form :model="queryForm" inline>
+        <el-form-item>
+          <el-button type="primary" icon="Plus" @click="AddBannerRef.show()">添加</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="queryForm.isShareable" style="width: 150px;">
+            <el-option label="全部" :value="''" />
+            <el-option label="开启" :value="1" />
+            <el-option label="关闭" :value="0" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model="queryForm.isEnabled" style="width: 150px;">
+            <el-option label="全部" :value="''" />
+            <el-option label="启用" :value="1" />
+            <el-option label="禁用" :value="0" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="queryForm.name" placeholder="请输入名称搜索" style="width: 200px;" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" :loading="tableData.loading" @click="queryHandle">搜索</el-button>
+          <el-button icon="Refresh" :loading="tableData.loading" @click="resetHandle">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="row">
+      <el-table :data="tableData.list" border stripe v-loading="tableData.loading">
+        <el-table-column label="ID" prop="id"></el-table-column>
+        <el-table-column label="名称" prop="name"></el-table-column>
+        <el-table-column label="图片" prop="imageUrl">
+          <template v-slot="scope">
+            <el-image :src="scope.row.imageUrl" style="width: 50px;height: 50px;"></el-image>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="分享" prop="isShareable">
+          <template v-slot="scope">
+            <span v-if="scope.row.isShareable == 1">开启</span>
+            <span v-else>关闭</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column label="启用状态" prop="isEnabled">
+          <template v-slot="scope">
+            <el-tag v-if="scope.row.isEnabled == 1" type="primary" disable-transitions>已启用</el-tag>
+            <el-tag v-if="scope.row.isEnabled == 0" type="info" disable-transitions>已禁用</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="排序值" prop="sort"></el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="200"></el-table-column>
+        <el-table-column label="操作" width="150">
+          <template v-slot="scope">
+            <el-button link type="primary" @click="AddBannerRef.show(scope.row)">编辑</el-button>
+            <el-popconfirm title="确认要删除吗？" @confirm="deleteHandle(scope.row)">
+              <template #reference>
+                <el-button type="danger" link>删除</el-button>
+              </template>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <AddBanner @success="queryHandle" ref="AddBannerRef" />
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import AddBanner from './add_banner.vue';
+import { shareCarouselGet, shareCarouselDel } from '@/api/coupon/index.js';
+
+const AddBannerRef = ref(null);
+
+const queryForm = ref({
+  name: '',
+  isShareable: '', // 是否可分享 1=开启 0=关闭
+  isEnabled: '', // 是否启用 1=启用 0=禁用
+})
+
+const tableData = ref({
+  loading: false,
+  list: []
+})
+
+// 搜索
+function queryHandle() {
+  getTableData();
+}
+
+// 重置
+function resetHandle() {
+  queryForm.value = {
+    name: '',
+    isShareable: '',
+    isEnabled: '',
+  };
+  queryHandle();
+}
+
+// 轮播图配置
+async function getTableData() {
+  try {
+    tableData.value.loading = true;
+    const res = await shareCarouselGet(queryForm.value);
+    tableData.value.list = res;
+  } catch (error) {
+    console.log(error);
+  }
+  tableData.value.loading = false;
+}
+
+// 删除轮播图配置
+async function deleteHandle(row) {
+  try {
+    await shareCarouselDel(row.id);
+    getTableData();
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+onMounted(() => {
+  getTableData();
+})
+</script>
+
+<style scoped lang="scss">
+.row {
+  &.mt14 {
+    margin-top: 14px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/marketing_center/share_setting/components/linkCard.vue b/src/views/marketing_center/share_setting/components/linkCard.vue
new file mode 100644
index 0000000..ab6b5eb
--- /dev/null
+++ b/src/views/marketing_center/share_setting/components/linkCard.vue
@@ -0,0 +1,189 @@
+<template>
+  <div>
+    <el-select v-model="jumpPageId" style="width: 300px;" placeholder="请选择跳转页面" @change="jumpPageIdChange">
+      <el-option v-for="item in miniPageList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+    </el-select>
+    <div class="tips">选填，轮播图点击后跳转的目标页面</div>
+    <el-select v-model="goodsId" style="width: 300px;" placeholder="请选择具体菜品，可搜索" clearable filterable remote
+      :remote-method="remoteMethod" :loading="loading" v-if="jumpPageId && isIncludeFlag" @change="goodsIdChange">
+      <el-option v-for="item in goodsList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+    </el-select>
+  </div>
+</template>
+
+<script setup>
+import _ from 'lodash';
+import { ref, onMounted, watch } from 'vue';
+import API from '@/views/application/list/advertisement/indexconfig/api';
+import { packageGet, getGbWarePage } from '@/api/market/ware'
+import productApi from '@/api/product';
+
+const props = defineProps({
+  includesNames: {
+    type: Array,
+    default: () => ([])
+  }
+});
+
+const jumpPageId = defineModel({
+  type: [String, Number],
+  default: ''
+});
+
+const jumpPageName = ref('');
+const isIncludeFlag = ref(false);
+
+function checkIsInclude() {
+  // 增加边界判断：避免includesNames为空或item.id不存在导致的错误
+  if (!jumpPageId.value || !Array.isArray(props.includesNames) || props.includesNames.length === 0) {
+    return false;
+  }
+  // 提取id数组并判断包含关系
+  const idList = props.includesNames.map(item => item?.id); // 可选链避免item.id不存在
+  return _.includes(idList, jumpPageId.value);
+}
+
+watch(jumpPageId, async (newVal, oldVal) => {
+  if (newVal) {
+    await nextTick()
+    watchJumpPageIdChange(newVal)
+  }
+}, {
+  immediate: true, // 可选：首次加载时立即执行一次（根据需求决定）
+  deep: false // 无需深度监听，因为值是String/Number
+})
+
+const miniPageList = ref([]);
+
+// 获取小程序跳转页面列表
+async function getList() {
+  try {
+    const res = await API.miniAppPagesPage({ page: 1, size: 999 });
+    miniPageList.value = res.records;
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+function jumpPageIdChange(value) {
+  goodsId.value = '';
+  extendParam.value = ''
+  jumpPageName.value = miniPageList.value.find(item => item.id == value)?.name || '';
+  // 清空具体菜品选择
+  if (checkIsInclude()) {
+    isIncludeFlag.value = true;
+    getGoodsList()
+  } else {
+    isIncludeFlag.value = false;
+  }
+}
+
+// watch监听jumpPageId变化
+async function watchJumpPageIdChange(value) {
+  if (miniPageList.value.length === 0) {
+    await getList()
+  }
+  // 清空具体菜品选择
+  if (checkIsInclude()) {
+    jumpPageName.value = miniPageList.value.find(item => item.id == value)?.name || '';
+    isIncludeFlag.value = true;
+    getGoodsList()
+  } else {
+    isIncludeFlag.value = false;
+  }
+}
+
+const loading = ref(false);
+const goodsList = ref([]); // 具体菜品列表
+const goodsId = defineModel('goodsId', {
+  type: [String, Number],
+  default: ''
+});
+const extendParam = defineModel('extendParam', {
+  type: String,
+  default: ''
+});
+
+// 监听extendParam的变化，解析并赋值给goodsId
+watch(extendParam, (newExtendParam, oldExtendParam) => {
+  // console.log('extendParam变化：', newExtendParam);
+
+  // 1. 空值判断：如果extendParam为空，重置goodsId
+  if (!newExtendParam) {
+    goodsId.value = '';
+    return;
+  }
+
+  // 2. 解析字符串：匹配goodsId=xxx的格式
+  // 正则表达式说明：匹配goodsId=后接任意字符（非空），直到字符串结束或遇到&等分隔符
+  const reg = /goodsId=([^&]+)/;
+  const matchResult = newExtendParam.match(reg);
+
+  // 3. 提取值并赋值：匹配成功则赋值，否则重置
+  if (matchResult && matchResult[1]) {
+    const extractedGoodsId = matchResult[1];
+    goodsId.value = extractedGoodsId; // 赋值给goodsId模型属性
+    // console.log('解析出的goodsId：', extractedGoodsId);
+  } else {
+    goodsId.value = ''; // 匹配失败时清空
+    // console.log('未解析到goodsId');
+  }
+}, {
+  immediate: true, // 初始加载时立即执行一次解析
+  deep: false // 字符串是基本类型，无需深度监听
+});
+
+// 具体菜品选择变化
+function goodsIdChange(value) {
+  // 设置扩展参数
+  extendParam.value = `goodsId=${value}`;
+}
+
+function remoteMethod(value) {
+  getGoodsList(value);
+}
+
+// 获取商品咧白哦
+async function getGoodsList(value = '') {
+  try {
+    // 获取套餐列表
+    loading.value = true;
+    let list = [];
+    if (jumpPageName.value == '套餐推广商品详情页') {
+      const res = await packageGet({ page: 1, size: 999, packageName: value });
+      list = res.records.map(item => ({
+        id: item.id,
+        name: item.packageName
+      }));
+    } else if (jumpPageName.value == '商品拼团详情页') {
+      const res = await getGbWarePage({ page: 1, size: 999, wareName: value });
+      list = res.records.map(item => ({
+        id: item.id,
+        name: item.wareName
+      }));
+    } else if (jumpPageName.value == '点餐商品详情弹窗页') {
+      const res = await productApi.getPage({ name: value });
+      list = res.records.map(item => ({
+        id: item.id,
+        name: item.name
+      }));
+    }
+    goodsList.value = list;
+    loading.value = false;
+  } catch (error) {
+    console.log(error);
+    loading.value = false;
+  }
+}
+
+onMounted(() => {
+  getList()
+})
+</script>
+
+<style scoped lang="scss">
+.tips {
+  font-size: 14px;
+  color: #999;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/marketing_center/share_setting/components/setting.vue b/src/views/marketing_center/share_setting/components/setting.vue
new file mode 100644
index 0000000..9c86706
--- /dev/null
+++ b/src/views/marketing_center/share_setting/components/setting.vue
@@ -0,0 +1,135 @@
+<template>
+  <el-form ref="formRef" :model="form" :rules="rules" label-width="160px" label-position="left">
+    <el-form-item label="功能开启">
+      <el-switch v-model="form.isEnabled" :active-value="1" :inactive-value="0" />
+    </el-form-item>
+    <el-form-item label="可获得奖励的分享" prop="rewardSharePages">
+      <el-checkbox-group v-model="form.rewardSharePages">
+        <el-checkbox :label="item.label" :value="item.value" v-for="item in typesList" :key="item.value"></el-checkbox>
+      </el-checkbox-group>
+    </el-form-item>
+    <div class="header">分享人可获得奖励</div>
+    <el-form-item label="选择优惠券" prop="sharerCouponId">
+      <SelectCoupon v-model="form.sharerCouponId" v-model:name="form.sharerCouponName" />
+    </el-form-item>
+    <el-form-item label="单次获得优惠券数量" prop="sharerCouponNum">
+      <el-input v-model="form.sharerCouponNum" placeholder="请输入数量"
+        @input="e => form.sharerCouponNum = filterNumberInput(e, 1)" style="width: 300px;" />
+    </el-form-item>
+    <el-form-item label="可获得奖励次数">
+      <el-radio-group v-model="form.rewardTimesType">
+        <el-radio label="仅1次" :value="1"></el-radio>
+        <el-radio label="每次分享成功" :value="2"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <div class="header">被分享人可获得奖励</div>
+    <el-form-item label="选择优惠券">
+      <SelectCoupon v-model="form.sharedUserCouponId" v-model:name="form.sharedUserCouponName" />
+    </el-form-item>
+    <el-form-item label="单次获得优惠券数量">
+      <el-input v-model="form.sharedUserCouponNum" placeholder="请输入数量"
+        @input="e => form.sharedUserCouponNum = filterNumberInput(e, 1)" style="width: 300px;" />
+    </el-form-item>
+    <el-form-item label="获得奖励时是否弹窗">
+      <el-radio-group v-model="form.isSharedUserPopup">
+        <el-radio label="是" :value="1"></el-radio>
+        <el-radio label="否" :value="0"></el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" @click="submitForm">保存</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script setup>
+import _ from 'lodash'
+import { ref, onMounted } from 'vue'
+import typesList from '../data.js'
+import SelectCoupon from '@/components/selectCoupon/index.vue'
+import { filterNumberInput } from '@/utils/index.js'
+import { shareBasePost, shareBaseGet } from '@/api/coupon/index.js'
+
+const formRef = ref(null)
+const form = ref({
+  isEnabled: 0,
+  rewardSharePages: [],             // 可获得奖励的分享页面，用逗号分隔 typesList
+  sharerCouponId: '',               // 分享人可获得的优惠券ID
+  sharerCouponName: '',             // 分享人可获得的优惠券名称
+  sharerCouponNum: '',              // 分享人可获得的优惠券数量
+  rewardTimesType: 1,               // 可获得奖励次数 1=仅1次 2=每次分享成功
+  sharedUserCouponId: '',           // 被分享人可获得的优惠券ID
+  sharedUserCouponName: '',         // 被分享人可获得的优惠券名称
+  sharedUserCouponNum: '',          // 被分享人可获得的优惠券数量
+  isSharedUserPopup: 1,             // 被分享人获得奖励时是否弹窗 1=是 0=否
+})
+
+const rules = {
+  rewardSharePages: [
+    { required: true, message: '请选择可获得奖励的分享', trigger: 'change' }
+  ],
+  sharerCouponId: [
+    { required: true, message: '请选择优惠券', trigger: 'change' }
+  ],
+  sharerCouponNum: [
+    { required: true, message: '请输入单次获得优惠券数量', trigger: 'blur' }
+  ]
+}
+
+function submitForm() {
+  console.log(form.value);
+  formRef.value.validate((valid) => {
+    if (valid) {
+      console.log('提交表单', form.value)
+      shareBasePostAjax()
+    } else {
+      console.log('表单验证失败')
+      return false
+    }
+  })
+}
+
+// 分享奖励基础:新增/修改
+async function shareBasePostAjax() {
+  try {
+    const data = _.cloneDeep(form.value);
+    data.rewardSharePages = data.rewardSharePages.join(',');
+    await shareBasePost(data);
+    ElNotification({
+      title: '成功',
+      message: '保存成功',
+      type: 'success',
+      duration: 2000
+    });
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+// 分享奖励基础 查询
+async function shareBaseGetAjax() {
+  try {
+    const res = await shareBaseGet();
+    if (res) {
+      form.value = { ...form.value, ...res };
+      form.value.rewardSharePages = res.rewardSharePages ? res.rewardSharePages.split(',') : [];
+    }
+  } catch (error) {
+    console.log(error);
+  }
+}
+
+onMounted(() => {
+  // 初始化数据
+  shareBaseGetAjax();
+});
+</script>
+
+<style scoped lang="scss">
+.header {
+  color: #333;
+  font-size: 16px;
+  font-weight: 600;
+  margin: 0 0 20px 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/marketing_center/share_setting/data.js b/src/views/marketing_center/share_setting/data.js
new file mode 100644
index 0000000..37254da
--- /dev/null
+++ b/src/views/marketing_center/share_setting/data.js
@@ -0,0 +1,38 @@
+export default [
+  {
+    label: '店铺首页',
+    value: 'index'
+  },
+  // {
+  //   label: '我的',
+  //   value: 'dine'
+  // },
+  {
+    label: '点餐页',
+    value: 'eat'
+  },
+  {
+    label: '点餐页-详情',
+    value: 'eat-detail'
+  },
+  {
+    label: '套餐推广-列表',
+    value: 'pp-list'
+  },
+  {
+    label: '套餐推广-详情',
+    value: 'pp-detail'
+  },
+  {
+    label: '商品拼团-列表',
+    value: 'gb-list'
+  },
+  {
+    label: '商品拼团-详情',
+    value: 'gb-detail'
+  },
+  {
+    label: '全民股东',
+    value: 'dis'
+  }
+]
\ No newline at end of file
diff --git a/src/views/marketing_center/share_setting/index.vue b/src/views/marketing_center/share_setting/index.vue
new file mode 100644
index 0000000..aa6d07a
--- /dev/null
+++ b/src/views/marketing_center/share_setting/index.vue
@@ -0,0 +1,56 @@
+<template>
+  <div class="gyq_container">
+    <div class="gyq_content">
+      <HeaderCard name="分享配置" intro="商家可配置用户分享后可获得的奖励" icon="sppt">
+      </HeaderCard>
+      <div class="row mt14">
+        <tabHeader v-model="tabActiveIndex" :list="tabList" />
+      </div>
+      <div class="row mt14">
+        <!-- 基础设置 -->
+        <setting key="setting" name="setting" v-if="tabActiveIndex == 0" />
+        <!-- 点餐页轮播图 -->
+        <bannerSetting key="bannerSetting" name="bannerSetting" v-if="tabActiveIndex == 1" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import HeaderCard from "../components/headerCard.vue";
+import tabHeader from "../components/tabHeader.vue";
+import setting from "./components/setting.vue";
+import bannerSetting from "./components/banner_setting.vue";
+
+const tabActiveIndex = ref(0)
+
+const tabList = ref([
+  {
+    label: '基础设置',
+    value: 0
+  },
+  {
+    label: '点餐页轮播图',
+    value: 1
+  },
+])
+</script>
+
+<style scoped lang="scss">
+.gyq_container {
+  padding: 14px;
+
+  .gyq_content {
+    padding: 14px;
+    background-color: #fff;
+    border-radius: 8px;
+  }
+}
+
+.row {
+  &.mt14 {
+    margin-top: 14px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index 79e7768..c49889e 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -183,7 +183,6 @@ import editModalConfig from "./indexconfig/edit";
 import searchConfig from "./indexconfig/search";
 import MyDialog from "@/components/mycomponents/myDialog.vue";
 import Statistics from "./indexconfig/statistics.vue";
-import { min } from "lodash";
 
 const {
   searchRef,
@@ -242,13 +241,17 @@ if (isSyncStatus()) {
   contentConfig.cols[contentConfig.cols.length - 1].operat[2].hidden = false;
 }
 
-onMounted(() => {
+onMounted(async () => {
   console.log(route.query);
   if (route.query.id) {
     contentRef.value?.fetchPageData({ id: route.query.id });
   }
   // 获取耗材列表
   gethaocaiList();
+
+  const res = await UserAPI.getPage()
+  form.warnLine = res.warnLine || ''
+  // console.log('contentRef.value===', res);
 });
 
 function newHandleQueryClick(e: IObject | undefined) {
diff --git a/src/views/product/indexconfig/content.ts b/src/views/product/indexconfig/content.ts
index e0586ef..2ac8516 100644
--- a/src/views/product/indexconfig/content.ts
+++ b/src/views/product/indexconfig/content.ts
@@ -75,11 +75,10 @@ const contentConfig: IContentConfig<UserPageQuery> = {
     {
       icon: "edit",
       text: "库存预警",
-      type: "info",
+      type: "danger",
       name: "custom1",
       auth: "import",
     },
-   
   ],
   cols: [
     // { type: "selection", width: 50, align: "center" },
@@ -127,7 +126,7 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       fixed: "right",
       width: 280,
       templet: "tool",
-      operat: [{ text: "报损", name: ''}, { text: "编辑", icon: 'edit', name: "edit"}, { text: "删除", icon: 'delete', type: 'danger', name: "delete"}],
+      operat: [{ text: "报损", name: '' }, { text: "编辑", icon: 'edit', name: "edit" }, { text: "删除", icon: 'delete', type: 'danger', name: "delete" }],
     },
   ],
 };

From 71bec03475a9007422941080c9dbc4d0be6b1f7d Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Wed, 28 Jan 2026 16:16:04 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/account/shopUser.ts           | 11 ++++++++++-
 src/api/order/sale-summary.ts         |  1 -
 src/utils/index.ts                    | 12 ++++++++++--
 src/views/marketing_center/data.js    |  2 +-
 src/views/user/list/config/content.ts |  2 +-
 src/views/user/list/index.vue         | 13 ++++++++++++-
 6 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/api/account/shopUser.ts b/src/api/account/shopUser.ts
index 25faf3c..883bfa3 100644
--- a/src/api/account/shopUser.ts
+++ b/src/api/account/shopUser.ts
@@ -71,7 +71,16 @@ const API = {
       method: "get",
       params
     });
-  }
+  },
+  // 导出
+  export(params: any) {
+    return request({
+      url: `${baseURL}/export`,
+      method: "get",
+      params,
+      responseType: 'blob'
+    });
+  },
 }
 export default API;
 export interface getRequest {
diff --git a/src/api/order/sale-summary.ts b/src/api/order/sale-summary.ts
index 72f386d..d885d7f 100644
--- a/src/api/order/sale-summary.ts
+++ b/src/api/order/sale-summary.ts
@@ -26,7 +26,6 @@ const Api = {
       method: "get",
       params,
       responseType: 'blob'
-
     });
   },
 };
diff --git a/src/utils/index.ts b/src/utils/index.ts
index d3dbe87..7eea652 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -111,8 +111,16 @@ export function downloadFile(obj: BlobPart, name: string, suffix: string, useUni
 	const link = document.createElement("a");
 	link.style.display = "none";
 	link.href = url;
-	const newFilename = useUnix ? (parseTime(new Date(), undefined) + "-") : '' + name.trim()
-	const fileName = newFilename + "." + suffix;
+	// 期望行为：
+	// - 当 useUnix 为 true 且传入 name 时：`${timestamp}-${name}`
+	// - 当 useUnix 为 true 且 name 为空时：仅 `${timestamp}`（不带多余的 `-`）
+	// - 当 useUnix 为 false：使用传入的 name（如为空则回退到时间戳）
+	const safeName = (name || "").trim();
+	const timeStamp = parseTime(new Date(), undefined);
+	const fileBase = useUnix
+		? (safeName ? `${timeStamp}-${safeName}` : timeStamp)
+		: (safeName || timeStamp);
+	const fileName = fileBase + "." + suffix;
 	link.setAttribute("download", fileName);
 	document.body.appendChild(link);
 	link.click();
diff --git a/src/views/marketing_center/data.js b/src/views/marketing_center/data.js
index f809cd7..7598b35 100644
--- a/src/views/marketing_center/data.js
+++ b/src/views/marketing_center/data.js
@@ -32,7 +32,7 @@ export const newMenus = [
     intro: '协助商家拉来新客户，拓展客户群体',
     childrenList: [
       {
-        name: "全民分销",
+        name: "全民股东",
         icon: "zhcz",
         pathName: "distribution_page",
         intro: "用户成为股东，可促进消费"
diff --git a/src/views/user/list/config/content.ts b/src/views/user/list/config/content.ts
index f739756..d7d8e45 100644
--- a/src/views/user/list/config/content.ts
+++ b/src/views/user/list/config/content.ts
@@ -21,7 +21,7 @@ const contentConfig: IContentConfig<any> = {
   //   // return shopUserApi.edit(data);
   // },
   pk: "id",
-  toolbar: ["add"],
+  toolbar: ["add", 'export'],
   defaultToolbar: ["refresh", "filter", "search"],
   cols: [
     { type: "selection", width: 50, align: "center" },
diff --git a/src/views/user/list/index.vue b/src/views/user/list/index.vue
index 0a94f76..46ba916 100644
--- a/src/views/user/list/index.vue
+++ b/src/views/user/list/index.vue
@@ -158,6 +158,7 @@ import { returnOptionsLabel } from "./config/config";
 import shopUserApi from "@/api/account/shopUser";
 import { useRoute } from 'vue-router'
 import { ElNotification } from 'element-plus'
+import { downloadFile } from "@/utils/index";
 const editMoneyModalRef = ref(null);
 const userCouponDialogRef = ref(null);
 const GiveCouponRef = ref(null);
@@ -175,7 +176,7 @@ const {
 	// handleAddClick,
 	// handleEditClick,
 	handleSubmitClick,
-	handleExportClick,
+	// handleExportClick,
 	handleSearchClick,
 	handleFilterChange,
 } = usePage();
@@ -217,6 +218,16 @@ function formDataChange(type, val) {
 	}
 }
 
+// 导出
+async function handleExportClick() {
+	try {
+		const file = await shopUserApi.export(searchRef.value.getQueryParams());
+		downloadFile(file, "用户列表", "xlsx");
+	} catch (error) {
+		console.log(error);
+	}
+}
+
 // 新增
 async function handleAddClick() {
 	addModalRef.value?.setModalVisible();

From 62c6b755afe0ceda0ed890627d58dba7b9a21b47 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Wed, 28 Jan 2026 17:47:25 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=82=B9=E9=A4=90=E9=A1=B5=E8=BD=AE=E6=92=AD=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../share_setting/components/add_banner.vue   |  4 ++
 .../share_setting/components/linkCard.vue     | 42 +++++++++++++++----
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/views/marketing_center/share_setting/components/add_banner.vue b/src/views/marketing_center/share_setting/components/add_banner.vue
index fea2f15..140845b 100644
--- a/src/views/marketing_center/share_setting/components/add_banner.vue
+++ b/src/views/marketing_center/share_setting/components/add_banner.vue
@@ -111,6 +111,10 @@ const includesNames = ref([
   {
     id: '10',
     name: '点餐商品详情弹窗页'
+  },
+  {
+    id: '12',
+    name: '积分商品详情页面'
   }
 ]);
 
diff --git a/src/views/marketing_center/share_setting/components/linkCard.vue b/src/views/marketing_center/share_setting/components/linkCard.vue
index ab6b5eb..0042973 100644
--- a/src/views/marketing_center/share_setting/components/linkCard.vue
+++ b/src/views/marketing_center/share_setting/components/linkCard.vue
@@ -14,6 +14,7 @@
 <script setup>
 import _ from 'lodash';
 import { ref, onMounted, watch } from 'vue';
+import { pointsGoodsPage } from '@/api/points/index.js'
 import API from '@/views/application/list/advertisement/indexconfig/api';
 import { packageGet, getGbWarePage } from '@/api/market/ware'
 import productApi from '@/api/product';
@@ -105,7 +106,7 @@ const extendParam = defineModel('extendParam', {
 });
 
 // 监听extendParam的变化，解析并赋值给goodsId
-watch(extendParam, (newExtendParam, oldExtendParam) => {
+watch(extendParam, async (newExtendParam, oldExtendParam) => {
   // console.log('extendParam变化：', newExtendParam);
 
   // 1. 空值判断：如果extendParam为空，重置goodsId
@@ -121,12 +122,23 @@ watch(extendParam, (newExtendParam, oldExtendParam) => {
 
   // 3. 提取值并赋值：匹配成功则赋值，否则重置
   if (matchResult && matchResult[1]) {
-    const extractedGoodsId = matchResult[1];
-    goodsId.value = extractedGoodsId; // 赋值给goodsId模型属性
-    // console.log('解析出的goodsId：', extractedGoodsId);
+    let extractedGoodsId = matchResult[1];
+
+    // 尝试将 id 转为数字（如果看起来像数字）以保持与后端 id 类型一致
+    const numeric = Number(extractedGoodsId);
+    const parsedId = !Number.isNaN(numeric) ? numeric : extractedGoodsId;
+
+    // 确保 options 已加载，这样 el-select 能根据 value 匹配到对应的 label
+    try {
+      await getGoodsList();
+    } catch (e) {
+      // ignore
+    }
+
+    // 统一使用字符串类型的 id 以保证与 options 中的 value 匹配
+    goodsId.value = String(parsedId);
   } else {
     goodsId.value = ''; // 匹配失败时清空
-    // console.log('未解析到goodsId');
   }
 }, {
   immediate: true, // 初始加载时立即执行一次解析
@@ -135,7 +147,13 @@ watch(extendParam, (newExtendParam, oldExtendParam) => {
 
 // 具体菜品选择变化
 function goodsIdChange(value) {
-  // 设置扩展参数
+  // 设置扩展参数，处理清空情况以避免出现 'undefined'
+  if (value === null || typeof value === 'undefined' || value === '') {
+    extendParam.value = '';
+    goodsId.value = '';
+    return;
+  }
+
   extendParam.value = `goodsId=${value}`;
 }
 
@@ -152,21 +170,27 @@ async function getGoodsList(value = '') {
     if (jumpPageName.value == '套餐推广商品详情页') {
       const res = await packageGet({ page: 1, size: 999, packageName: value });
       list = res.records.map(item => ({
-        id: item.id,
+        id: String(item.id),
         name: item.packageName
       }));
     } else if (jumpPageName.value == '商品拼团详情页') {
       const res = await getGbWarePage({ page: 1, size: 999, wareName: value });
       list = res.records.map(item => ({
-        id: item.id,
+        id: String(item.id),
         name: item.wareName
       }));
     } else if (jumpPageName.value == '点餐商品详情弹窗页') {
       const res = await productApi.getPage({ name: value });
       list = res.records.map(item => ({
-        id: item.id,
+        id: String(item.id),
         name: item.name
       }));
+    } else if (jumpPageName.value == '积分商品详情页面') {
+      const res = await pointsGoodsPage({ page: 1, size: 999 });
+      list = res.records.map(item => ({
+        id: String(item.id),
+        name: item.goodsName
+      }));
     }
     goodsList.value = list;
     loading.value = false;

From c0354426284826a7ff00dff43f79d39f7b35920d Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 29 Jan 2026 10:09:30 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=9B=E4=BB=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/applocation/fxpz.png               | Bin 0 -> 3048 bytes
 src/views/marketing_center/data.js            |   2 +-
 .../marketing_center/share_setting/index.vue  |   2 +-
 .../shop/list/components/payStatusCard.vue    |  29 +++++++++++++-----
 4 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 src/assets/applocation/fxpz.png

diff --git a/src/assets/applocation/fxpz.png b/src/assets/applocation/fxpz.png
new file mode 100644
index 0000000000000000000000000000000000000000..47c1f3e8597de110a5ccd2f63665b0ca47584031
GIT binary patch
literal 3048
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

literal 0
HcmV?d00001

diff --git a/src/views/marketing_center/data.js b/src/views/marketing_center/data.js
index 7598b35..97a6473 100644
--- a/src/views/marketing_center/data.js
+++ b/src/views/marketing_center/data.js
@@ -57,7 +57,7 @@ export const newMenus = [
       },
       {
         name: "分享配置",
-        icon: "sppt",
+        icon: "fxpz",
         pathName: "share_setting",
         intro: "商家可配置用户分享后可获得的奖励"
       },
diff --git a/src/views/marketing_center/share_setting/index.vue b/src/views/marketing_center/share_setting/index.vue
index aa6d07a..ff8673c 100644
--- a/src/views/marketing_center/share_setting/index.vue
+++ b/src/views/marketing_center/share_setting/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="gyq_container">
     <div class="gyq_content">
-      <HeaderCard name="分享配置" intro="商家可配置用户分享后可获得的奖励" icon="sppt">
+      <HeaderCard name="分享配置" intro="商家可配置用户分享后可获得的奖励" icon="fxpz">
       </HeaderCard>
       <div class="row mt14">
         <tabHeader v-model="tabActiveIndex" :list="tabList" />
diff --git a/src/views/shop/list/components/payStatusCard.vue b/src/views/shop/list/components/payStatusCard.vue
index 6c43596..7cc2225 100644
--- a/src/views/shop/list/components/payStatusCard.vue
+++ b/src/views/shop/list/components/payStatusCard.vue
@@ -24,24 +24,34 @@
         </el-form-item>
         <el-form-item label="支付宝进件状态">
           <div class="column">
-            <el-text :type="statusListFilter(form.alipayStatus).type">
-              {{ statusListFilter(form.alipayStatus).label }}
-            </el-text>
+            <div>
+              <el-text :type="statusListFilter(form.alipayStatus).type">
+                {{ statusListFilter(form.alipayStatus).label }}
+              </el-text>
+            </div>
             <div class="center" v-if="form.alipayStatus == 'SIGN'">
               <el-text>待签约</el-text>
               <el-link type="primary" @click="singCodeDialogRef?.show(form.alipaySignUrl, 1)">查看签约码</el-link>
             </div>
+            <div class="error_text" v-if="form.alipayStatus == 'REJECTED'">
+              失败原因：{{ form.alipayErrorMsg }}
+            </div>
           </div>
         </el-form-item>
         <el-form-item label="微信进件状态">
           <div class="column">
-            <el-text :type="statusListFilter(form.wechatStatus).type">
-              {{ statusListFilter(form.wechatStatus).label }}
-            </el-text>
+            <div>
+              <el-text :type="statusListFilter(form.wechatStatus).type">
+                {{ statusListFilter(form.wechatStatus).label }}
+              </el-text>
+            </div>
             <div class="center" v-if="form.wechatStatus == 'SIGN'">
               <el-text>待签约</el-text>
               <el-link type="primary" @click="singCodeDialogRef?.show(form.wechatSignUrl, 2)">查看签约码</el-link>
             </div>
+            <div class="error_text" v-if="form.wechatStatus == 'REJECTED'">
+              失败原因：{{ form.wechatErrorMsg }}
+            </div>
           </div>
         </el-form-item>
         <el-form-item label="最后提交时间">
@@ -77,7 +87,7 @@
 <script setup>
 import { ref, onMounted } from 'vue'
 import { useRoute, useRouter } from 'vue-router';
-import { shopMerchantGet, getMainMerchant, shopMerchantPut, entryManagerDetail } from '@/api/common'
+import { shopMerchantGet, getMainMerchant, shopMerchantPut, entryManagerDetail, queryEntry } from '@/api/common'
 import singCodeDialog from '@/views/applyments/components/singCodeDialog.vue';
 
 const singCodeDialogRef = ref(null)
@@ -322,4 +332,9 @@ onMounted(() => {
   display: flex;
   flex-direction: column;
 }
+
+.error_text {
+  font-size: 14px;
+  color: #999;
+}
 </style>
\ No newline at end of file

From 45727d80053edd10985cc80db529dd8308efe0d4 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 29 Jan 2026 10:35:34 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing_center/share_setting/components/setting.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/marketing_center/share_setting/components/setting.vue b/src/views/marketing_center/share_setting/components/setting.vue
index 9c86706..eaa36f5 100644
--- a/src/views/marketing_center/share_setting/components/setting.vue
+++ b/src/views/marketing_center/share_setting/components/setting.vue
@@ -30,7 +30,7 @@
       <el-input v-model="form.sharedUserCouponNum" placeholder="请输入数量"
         @input="e => form.sharedUserCouponNum = filterNumberInput(e, 1)" style="width: 300px;" />
     </el-form-item>
-    <el-form-item label="获得奖励时是否弹窗">
+    <el-form-item label="被分享人弹窗">
       <el-radio-group v-model="form.isSharedUserPopup">
         <el-radio label="是" :value="1"></el-radio>
         <el-radio label="否" :value="0"></el-radio>

From 60ea128a10f5fe8b4c9a60c153e9d9f4b7f0ce33 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Thu, 29 Jan 2026 18:24:57 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=85=8D=E7=BD=AE=E6=94=B9=E5=8F=98=E5=90=8E?=
 =?UTF-8?q?=E5=8F=96=E9=A4=90=E6=A8=A1=E5=BC=8F=E4=B8=8D=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/index.vue | 46 ++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index ffcf629..3ae6b2e 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -601,6 +601,24 @@ function dinerDisabled(item, index) {
     return !shopUser.userInfo.eatModel.includes("take-out");
   }
 }
+
+// 监听店铺就餐类型配置变化，自动同步 diners.sel，避免切换路由后需刷新才能生效
+watch(
+  () => shopUser.userInfo && shopUser.userInfo.eatModel,
+  (eatModel) => {
+    console.log("watch eatModel change:", eatModel);
+    if (!eatModel) return;
+    const sel = eatModel.includes("dine-in") ? 0 : 1;
+    if (diners.sel !== sel) {
+      console.log("update diners.sel:", diners.sel, "=>", sel);
+      diners.sel = sel;
+      // 同步 carts 的就餐类型
+      changeCartsDinerType();
+    }
+  },
+  { immediate: true }
+);
+
 // 商品分类
 const category = reactive({
   list: [],
@@ -795,6 +813,34 @@ onMounted(async () => {
   }
   console.log(table.value);
   init();
+  // 尝试在挂载时主动刷新店铺配置，确保从设置页面返回时能生效
+  await refreshShopUserInfo();
+});
+
+// 主动刷新店铺信息并同步就餐类型（用于从设置页返回时生效）
+async function refreshShopUserInfo() {
+  try {
+    const res = await shopUser.getUserInfo();
+    if (res && res.eatModel) {
+      const sel = res.eatModel.includes("dine-in") ? 0 : 1;
+      if (diners.sel !== sel) {
+        diners.sel = sel;
+        changeCartsDinerType();
+      }
+    }
+  } catch (error) {
+    console.error("refreshShopUserInfo error", error);
+  }
+}
+
+// keep-alive 激活时刷新
+onActivated(() => {
+  refreshShopUserInfo();
+});
+
+// 路由复用或更新时刷新
+onBeforeRouteUpdate((to, from) => {
+  refreshShopUserInfo();
 });
 
 function resetOldOrder() {

From 3855ed4b7514f85be45b81c58f3fbaa5ac683a79 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 30 Jan 2026 16:01:44 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/product/index.ts                 |  9 +++++++++
 src/views/product/index.vue              | 15 +++++++++++++--
 src/views/product/indexconfig/content.ts |  7 +++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/api/product/index.ts b/src/api/product/index.ts
index 2facf1e..ae3d34c 100644
--- a/src/api/product/index.ts
+++ b/src/api/product/index.ts
@@ -181,6 +181,15 @@ const AuthAPI = {
       method: "get",
       params,
     });
+  },
+  // 导出商品
+  exportProducts(params: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/export`,
+      method: "get",
+      params,
+      responseType: 'blob'
+    });
   }
 };
 
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index c49889e..a06a6e8 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -174,7 +174,7 @@ import UserAPI from "@/api/product/index";
 import { useRouter } from "vue-router";
 import type { IObject, IOperatData } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
-import { isSyncStatus } from "@/utils/index";
+import { isSyncStatus, downloadFile } from "@/utils/index";
 import addModalConfig from "./indexconfig/add";
 import contentConfig from "./indexconfig/content";
 import MultiImageUpload from "@/components/Upload/MultiImageUpload.vue";
@@ -193,7 +193,7 @@ const {
   handleResetClick,
   // handleEditClick,
   handleSubmitClick,
-  handleExportClick,
+  // handleExportClick,
   handleSearchClick,
   handleFilterChange,
 } = usePage();
@@ -302,6 +302,17 @@ function getTongji(params: IObject | undefined) {
   });
 }
 
+// 导出商品
+async function handleExportClick() {
+  try {
+    const filterParams = searchRef.value?.getQueryParams();
+    const file = await UserAPI.exportProducts(filterParams);
+    downloadFile(file, "商品列表", "xlsx");
+  } catch (error) {
+    console.log(error);
+  }
+}
+
 // 新增
 async function handleAddClick() {
   router.push({ name: "addgoods" });
diff --git a/src/views/product/indexconfig/content.ts b/src/views/product/indexconfig/content.ts
index 2ac8516..a177bd2 100644
--- a/src/views/product/indexconfig/content.ts
+++ b/src/views/product/indexconfig/content.ts
@@ -79,6 +79,13 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       name: "custom1",
       auth: "import",
     },
+    {
+      icon: "Download",
+      text: "导出",
+      type: "",
+      name: "export",
+      auth: "import",
+    },
   ],
   cols: [
     // { type: "selection", width: 50, align: "center" },