From 0ad4b5daa7bee2e6f31372b1799d084911a36227 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 21 Nov 2025 10:48:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B7=BB=E5=8A=A0=E5=88=B8?=
 =?UTF-8?q?=E5=85=91=E6=8D=A2=E7=A0=81=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../my-components/my-date-pickerview.vue      |   2 +-
 http/api/market/couponRedemption.js           |  77 ++++
 jsconfig.json                                 |  22 ++
 pageMarket/components/choose-coupon.vue       | 198 ++++++++++
 pageMarket/components/coupon-list.vue         |  22 ++
 pageMarket/components/date-time-picker.vue    | 108 ++++++
 pageMarket/couponExchangeCode/add.vue         | 173 +++++++++
 pageMarket/couponExchangeCode/index.vue       | 351 ++++++++++++++++++
 pageMarket/newUserDiscount/index.vue          |   2 +-
 pageMarket/static/images/coupon_code.png      | Bin 0 -> 1142 bytes
 pages.json                                    |  16 +
 pages/appliccation/marketing.vue              |   2 +-
 12 files changed, 970 insertions(+), 3 deletions(-)
 create mode 100644 http/api/market/couponRedemption.js
 create mode 100644 jsconfig.json
 create mode 100644 pageMarket/components/choose-coupon.vue
 create mode 100644 pageMarket/components/coupon-list.vue
 create mode 100644 pageMarket/components/date-time-picker.vue
 create mode 100644 pageMarket/couponExchangeCode/add.vue
 create mode 100644 pageMarket/couponExchangeCode/index.vue
 create mode 100644 pageMarket/static/images/coupon_code.png

diff --git a/components/my-components/my-date-pickerview.vue b/components/my-components/my-date-pickerview.vue
index ad2e996..1240179 100644
--- a/components/my-components/my-date-pickerview.vue
+++ b/components/my-components/my-date-pickerview.vue
@@ -495,7 +495,7 @@
 		right: 0;
 		bottom: 0;
 		top: 0;
-		z-index: 999;
+		z-index: 9999;
 		background-color: rgba(51, 51, 51, .5);
 
 		.item {
diff --git a/http/api/market/couponRedemption.js b/http/api/market/couponRedemption.js
new file mode 100644
index 0000000..74b5956
--- /dev/null
+++ b/http/api/market/couponRedemption.js
@@ -0,0 +1,77 @@
+import http from "@/http/http.js";
+const request = http.request;
+const urlType = "market";
+
+export function enable(params) {
+  return request({
+    url: urlType + `/admin/couponRedemption/enable`,
+    method: "PUT",
+    params: {
+      ...params,
+    },
+  });
+}
+
+export function status(params) {
+  return request({
+    url: urlType + `/admin/couponRedemption/enable/status`,
+    method: "get",
+    params: {
+      ...params,
+    },
+  });
+}
+export function couponRedemption(params) {
+  return request({
+    url: urlType + `/admin/couponRedemption`,
+    method: "get",
+    params: {
+      ...params,
+    },
+  });
+}
+export function couponRedemptionList(params) {
+  return request({
+    url: urlType + `/admin/couponRedemption/list`,
+    method: "get",
+    params: {
+      ...params,
+    },
+  });
+}
+export function add(params) {
+  return request({
+    url: urlType + `/admin/couponRedemption`,
+    method: "POST",
+    params: {
+      ...params,
+    },
+  });
+}
+export function edit(params) {
+  return request({
+    url: urlType + `/admin/couponRedemption`,
+    method: "PUT",
+    params: {
+      ...params,
+    },
+  });
+}
+export function codeList(params) {
+  return request({
+    url: urlType + `/admin/couponRedemption/code/list`,
+    method: "GET",
+    params: {
+      ...params,
+    },
+  });
+}
+export function codeExport(params) {
+  return request({
+    url: urlType + `/admin/couponRedemption/code/export`,
+    method: "GET",
+    params: {
+      ...params,
+    },
+  });
+}
diff --git a/jsconfig.json b/jsconfig.json
new file mode 100644
index 0000000..75d624b
--- /dev/null
+++ b/jsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+      "target": "ES6",
+      "module": "ESNext",
+      "baseUrl": ".",
+      "paths": {
+        "@/*": ["src/*"]  // 适配 uni-app 的 @ 路径别名（关键，避免导入路径报错）
+      },
+      "jsx": "preserve",
+      "allowJs": true
+    },
+    "include": [
+      "src/**/*",
+      "pages.json",
+      "uni.pages.json"  // 包含 uni-app 配置文件，让 Vetur 识别页面结构
+    ],
+    "exclude": [
+      "node_modules",
+      "dist",
+      "unpackage"  // 排除编译产物和依赖目录
+    ]
+  }
\ No newline at end of file
diff --git a/pageMarket/components/choose-coupon.vue b/pageMarket/components/choose-coupon.vue
new file mode 100644
index 0000000..3e74159
--- /dev/null
+++ b/pageMarket/components/choose-coupon.vue
@@ -0,0 +1,198 @@
+<template>
+  <view class="">
+    <up-popup :show="show" mode="bottom">
+      <view class="">
+        <view class="top u-flex u-row-between">
+          <text class="font-bold u-font-32 color-333">{{ title }}</text>
+          <up-icon size="18" name="close" @click="show = false"></up-icon>
+        </view>
+        <scroll-view
+          :scroll-y="true"
+          style="max-height: 50vh"
+          @scroll="scroll"
+          :scroll-top="scrollTop"
+        >
+          <view
+            v-for="(item, index) in list"
+            :key="index"
+            class="item"
+            @click="itemClick(item)"
+            :class="[selGoods && selGoods.id == item.id ? 'selected' : '']"
+          >
+            <view class="u-flex u-row-between">
+              <view class="u-flex gap-20">
+                <view class="u-flex" @click.stop="preview(item)">
+                  <up-image
+                    :src="item.coverImg"
+                    width="80rpx"
+                    height="80rpx"
+                  ></up-image>
+                </view>
+
+                <text class="u-font-32 color-333">{{ item.name }}</text>
+              </view>
+              <text class="u-font-32 color-red u-p-l-30"
+                >¥{{ item.lowPrice }}</text
+              >
+            </view>
+          </view>
+        </scroll-view>
+        <view class="bottom">
+          <view class="btn cancel" @click="close">{{ cancelText }}</view>
+          <view class="btn success" @click="confirm">{{ confirmText }}</view>
+        </view>
+      </view>
+    </up-popup>
+  </view>
+</template>
+<script setup>
+import { ref, onMounted, watch } from "vue";
+import { getCouponList } from "@/http/api/coupon.js";
+const modelValue = defineModel({
+  type: String,
+  default: "",
+});
+const show = defineModel("show", {
+  type: String,
+  default: "",
+});
+const goodsName = defineModel("goodsName", {
+  type: String,
+  default: "",
+});
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: "选择优惠券",
+  },
+  confirmText: {
+    type: String,
+    default: "确认",
+  },
+  cancelText: {
+    type: String,
+    default: "取消",
+  },
+});
+
+const selGoods = ref("");
+function itemClick(item) {
+  if (selGoods.value && selGoods.value.id == item.id) {
+    selGoods.value = "";
+    return;
+  }
+  selGoods.value = item;
+}
+const list = ref([]);
+
+const scrollTop = ref(0);
+function scroll(e) {
+  scrollTop.value = e.detail.scrollTop;
+}
+function preview(item) {
+  uni.previewImage({
+    urls: item.images || [item.coverImg],
+  });
+}
+watch(
+  () => modelValue.value,
+  (newVal, oldVal) => {
+    console.log(newVal, oldVal);
+    selGoods.value = list.value.find((item) => item.id == newVal);
+    console.log(selGoods.value);
+    if (selGoods.value) {
+      goodsName.value = selGoods.value.name;
+    }
+  }
+);
+
+watch(
+  () => list.value.length,
+  (newVal, oldVal) => {
+    selGoods.value = list.value.find((item) => item.id == modelValue.value);
+    console.log(selGoods.value);
+    if (selGoods.value) {
+      modelValue.value = selGoods.value.id;
+      goodsName.value = selGoods.value.name;
+    }
+  }
+);
+
+function close() {
+  show.value = false;
+}
+function confirm() {
+  if (!selGoods.value) {
+    uni.showToast({
+      title: "请选择优惠券",
+      icon: "none",
+    });
+    return;
+  }
+  modelValue.value = selGoods.value.id;
+  show.value = false;
+}
+onMounted(() => {
+  getCouponList().then((res) => {
+    list.value = res;
+  });
+});
+</script>
+
+<style lang="scss">
+.popup-content {
+  background: #fff;
+  width: 640rpx;
+  border-radius: 18rpx;
+}
+.top {
+  padding: 40rpx 48rpx;
+  border-bottom: 1px solid #d9d9d9;
+}
+.bottom {
+  padding: 48rpx 52rpx;
+  display: flex;
+  justify-content: space-between;
+  border-top: 1px solid #d9d9d9;
+  gap: 50rpx;
+  .btn {
+    flex: 1;
+    text-align: center;
+    padding: 18rpx 60rpx;
+    border-radius: 100rpx;
+    font-size: 32rpx;
+    border: 2rpx solid transparent;
+    &.success {
+      background-color: $my-main-color;
+      color: #fff;
+    }
+    &.cancel {
+      border-color: #d9d9d9;
+      box-shadow: 0 4rpx 0 0 #00000005;
+    }
+  }
+}
+.item {
+  padding: 10rpx 30rpx;
+  border: 1px solid #d9d9d9;
+  margin: 10rpx;
+  border-radius: 8rpx;
+  transition: all 0.3s ease-in-out;
+  box-shadow: 0 0 10px transparent;
+  &.selected {
+    border-color: $my-main-color;
+    box-shadow: 0 0 10px $my-main-color;
+  }
+}
+.choose-goods {
+  display: flex;
+  padding: 24rpx;
+  align-items: center;
+  border-radius: 8rpx;
+  border: 2rpx solid #d9d9d9;
+  background: #fff;
+  font-size: 28rpx;
+  font-weight: 400;
+}
+</style>
diff --git a/pageMarket/components/coupon-list.vue b/pageMarket/components/coupon-list.vue
new file mode 100644
index 0000000..7ffbeee
--- /dev/null
+++ b/pageMarket/components/coupon-list.vue
@@ -0,0 +1,22 @@
+<template>
+  <view>
+
+
+    <chooseCoupon v-model="chooseCouponData.couponId" :show="chooseCouponData.show"></chooseCoupon>
+  </view>
+</template>
+
+<script setup>
+import { reactive } from "vue";
+import chooseCoupon from "./choose-coupon.vue";
+const chooseCouponData=reactive({
+  couponId:'',
+  show:true
+})
+const modelValue = defineModel({
+  type: Array,
+  default: () => [],
+});
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/pageMarket/components/date-time-picker.vue b/pageMarket/components/date-time-picker.vue
new file mode 100644
index 0000000..9234ac3
--- /dev/null
+++ b/pageMarket/components/date-time-picker.vue
@@ -0,0 +1,108 @@
+<template>
+  <view>
+    <view @click="open">
+      <slot v-if="$slots.default"> </slot>
+      <view v-else class="choose-goods u-flex u-row-between">
+        <text class="color-999" v-if="!startTime && !endTime"
+          >请选择日期范围</text
+        >
+        <text class="color-333 u-font-24 u-m-r-32 " v-else
+          >{{ startTime }} - {{ endTime }}</text
+        >
+        <view class="u-flex" v-if="startTime&&endTime" @click.stop="clear">
+          <up-icon name="close" size="14"></up-icon>
+        </view>
+        <up-icon size="14" name="arrow-right" v-else ></up-icon>
+
+      </view>
+    </view>
+    <my-date-pickerview
+      @confirm="datePickerConfirm"
+      mode="all"
+      ref="datePicker"
+    ></my-date-pickerview>
+  </view>
+</template>
+
+<script setup>
+import { ref } from "vue";
+const datePicker = ref(null);
+const startTime = defineModel("startTime", {
+  default: () => "",
+  type: String,
+});
+const endTime = defineModel("endTime", {
+  default: () => "",
+  type: String,
+});
+
+function clear(){
+  startTime.value = "";
+  endTime.value = "";
+}
+function open() {
+  datePicker.value.toggle();
+}
+function datePickerConfirm(e) {
+  startTime.value = e.start;
+  endTime.value = e.end;
+  console.log(e);
+}
+</script>
+<style lang="scss">
+.popup-content {
+  background: #fff;
+  width: 640rpx;
+  border-radius: 18rpx;
+}
+.top {
+  padding: 40rpx 48rpx;
+  border-bottom: 1px solid #d9d9d9;
+}
+.bottom {
+  padding: 48rpx 52rpx;
+  display: flex;
+  justify-content: space-between;
+  border-top: 1px solid #d9d9d9;
+  gap: 50rpx;
+  .btn {
+    flex: 1;
+    text-align: center;
+    padding: 18rpx 60rpx;
+    border-radius: 100rpx;
+    font-size: 32rpx;
+    border: 2rpx solid transparent;
+    &.success {
+      background-color: $my-main-color;
+      color: #fff;
+    }
+    &.cancel {
+      border-color: #d9d9d9;
+      box-shadow: 0 4rpx 0 0 #00000005;
+    }
+  }
+}
+.item {
+  padding: 10rpx 30rpx;
+  border: 1px solid #d9d9d9;
+  margin: 10rpx;
+  border-radius: 8rpx;
+  transition: all 0.3s ease-in-out;
+  box-shadow: 0 0 10px transparent;
+  &.selected {
+    border-color: $my-main-color;
+    box-shadow: 0 0 10px $my-main-color;
+  }
+}
+.choose-goods {
+  display: flex;
+  padding: 24rpx;
+  align-items: center;
+  border-radius: 8rpx;
+  border: 2rpx solid #d9d9d9;
+  background: #fff;
+  font-size: 28rpx;
+  font-weight: 400;
+  min-height: 90rpx;
+}
+</style>
diff --git a/pageMarket/couponExchangeCode/add.vue b/pageMarket/couponExchangeCode/add.vue
new file mode 100644
index 0000000..58b12a3
--- /dev/null
+++ b/pageMarket/couponExchangeCode/add.vue
@@ -0,0 +1,173 @@
+<template>
+  <view class="min-page bg-f7 default-box-padding u-font-28 color-333">
+    <view class="default-box-padding bg-fff default-box-radius">
+      <view>
+        <view class="font-bold u-m-b-16">兑换码名称</view>
+        <up-input
+          placeholder="请输入兑换码名称"
+          border="none"
+          v-model="form.title"
+          placeholder-class="color-999 u-font-28"
+        ></up-input>
+        <view class="u-m-t-24">
+          <up-line></up-line>
+        </view>
+      </view>
+      <view class="u-m-t-24">
+        <view class="font-bold u-m-b-16">活动日期</view>
+        <DateTimePicker v-model:startTime="form.startTime" v-model:endTime="form.endTime"> </DateTimePicker>
+      </view>
+      
+    </view>
+    <view class="default-box-padding bg-fff default-box-radius u-m-t-32">
+      <view class="font-bold">优惠券</view>
+      <view class="u-m-t-16 u-p-b-24">
+        <CouponList v-model="form.couponInfoList"></CouponList>
+      </view>
+      <up-line></up-line>
+      <view class="font-bold u-m-t-24 u-m-b-16">指定时间段可用</view>
+      <view class="my-hour-area">
+        <my-hour-area
+          v-model:useTimeType="form.useTimeType"
+          v-model:startValue="form.useStartTime"
+          v-model:endValue="form.useEndTime"
+        ></my-hour-area>
+      </view>
+    </view>
+
+    <my-bottom-btn-group
+      @cancel="cancel"
+      @save="save"
+      direction="column"
+    ></my-bottom-btn-group>
+  </view>
+</template>
+
+<script setup>
+import { reactive, onMounted } from "vue";
+import DateTimePicker from "@/pageMarket/components/date-time-picker.vue";
+import CouponList from "@/pageMarket/components/coupon-list.vue";
+import * as suggestApi from "@/http/api/market/suggest.js";
+import {
+  onLoad,
+  onReady,
+  onShow,
+  onPageScroll,
+  onReachBottom,
+  onBackPress,
+} from "@dcloudio/uni-app";
+
+const form = reactive({
+  useStartTime: "",
+  useTimeType: "all",
+  useEndTime: "",
+  startTime:'',
+  endTime:'',
+  couponInfoList: [],
+});
+
+function save() {
+  if (!form.title) {
+    uni.showToast({
+      title: "请输入模版名称",
+      icon: "none",
+    });
+    return;
+  }
+  if (form.useTimeType == "custom") {
+    if (!form.useStartTime) {
+      uni.showToast({
+        title: "请选择开始时间",
+        icon: "none",
+      });
+      return;
+    }
+    if (!form.useEndTime) {
+      uni.showToast({
+        title: "请选择结束时间",
+        icon: "none",
+      });
+      return;
+    }
+  }
+  if (form.useDays.length == 0) {
+    uni.showToast({
+      title: "请选择可用周期",
+      icon: "none",
+    });
+    return;
+  }
+  if (!form.foods) {
+    uni.showToast({
+      title: "请选择商品",
+      icon: "none",
+    });
+    return;
+  }
+  if(options.type=='edit'){
+    suggestApi
+    .editSuggest({
+      title: form.title,
+      id: form.id,
+      foods: form.foods,
+      useDays: form.useDays.join(","),
+      useStartTime: form.useStartTime,
+      useTimeType: form.useTimeType,
+      useEndTime: form.useEndTime,
+    })
+    .then((res) => {
+      uni.showToast({
+        title: "修改成功",
+        icon: "none",
+      });
+      setTimeout(() => {
+        uni.navigateBack({
+        delta: 1,
+      });
+      }, 1500);
+      
+    });
+    return 
+  }
+  suggestApi
+    .addSuggest({
+      title: form.title,
+      foods: form.foods,
+      useDays: form.useDays.join(","),
+      useStartTime: form.useStartTime,
+      useTimeType: form.useTimeType,
+      useEndTime: form.useEndTime,
+    })
+    .then((res) => {
+      uni.showToast({
+        title: "添加成功",
+        icon: "none",
+      });
+      setTimeout(() => {
+        uni.navigateBack({
+        delta: 1,
+      });
+      }, 1500);
+    });
+}
+const options=reactive({})
+onLoad((opt) => {
+   
+});
+</script>
+
+<style lang="scss" scoped>
+:deep(.my-hour-area .container) {
+  padding: 32rpx 28rpx;
+  background-color: #f7f7f7;
+  border-radius: 8rpx;
+  margin-top: 16rpx;
+}
+:deep(.my-hour-area .box) {
+  margin-top: 0 !important;
+}
+:deep(.fixed-bottom) {
+  left: 110rpx;
+  right: 110rpx;
+}
+</style>
diff --git a/pageMarket/couponExchangeCode/index.vue b/pageMarket/couponExchangeCode/index.vue
new file mode 100644
index 0000000..2b6b0e4
--- /dev/null
+++ b/pageMarket/couponExchangeCode/index.vue
@@ -0,0 +1,351 @@
+<template>
+  <view class="min-page bg-f7 u-font-28">
+    <up-sticky>
+      <view class="bg-fff default-box-padding">
+        <view class="u-flex">
+          <image
+            style="width: 60rpx; height: 60rpx"
+            src="/pageMarket/static/images/coupon_code.png"
+          ></image>
+          <view class="u-flex-1 u-flex u-p-l-24">
+            <view class="u-font-28 u-flex-1 u-p-r-24">
+              <view class="color-333 font-bold">券兑换码 </view>
+              <view class="color-666 u-m-t-4 u-font-24"
+                >可添加多券组合兑换
+              </view>
+            </view>
+            <up-switch
+              v-model="accountInfoStore.shopInfo.isProductSuggest"
+              size="18"
+              :active-value="1"
+              :inactive-value="0"
+            ></up-switch>
+          </view>
+        </view>
+      </view>
+    </up-sticky>
+    <view class="u-p-t-60 default-box-x-padding">
+      <view class="u-flex u-row-between">
+        <view class="shop" @click="showShopModal">适用门店</view>
+        <view
+          class="u-flex status-sel u-row-between bg-fff u-line-1"
+          @click="showStatusModal"
+        >
+          <text class="color-999" v-if="returnStatusText == '全部'">全部</text>
+          <text class="color-333" v-else>{{ returnStatusText }}</text>
+          <up-icon name="arrow-down" size="14"></up-icon>
+        </view>
+      </view>
+    </view>
+    <view class="default-box-padding">
+      <view
+        v-for="(item, index) in list"
+        class="u-m-b-56 default-box-radius bg-fff default-box-padding"
+      >
+        <view class="u-flex u-row-between">
+          <text class="u-font-32 font-bold color-333">{{ item.name }}</text>
+          <view class="status" :class="['status' + item.status]">{{
+            item.status == 0 ? "有效" : "无效"
+          }}</view>
+        </view>
+        <view class="u-m-t-22 color-666 u-font-24 u-flex">
+          <view>
+            <view> 有效期：{{ item.startTime }} 至 {{ item.endTime }}</view>
+            <view class="u-m-t-16"
+              >优惠券（张）：
+              <text class="color-333 u-font-28 font-bold">{{
+                item.couponNum
+              }}</text></view
+            >
+            <view class="u-m-t-16">{{ returnCoupon(item) }}</view>
+          </view>
+
+          <view class="btn edit" @click="handleEdit(item)">查看</view>
+        </view>
+        <!-- <view class="u-flex u-row-right gap-20 u-m-t-24">
+          <view class="btn del" @click="handleDelete(item)">删除</view>
+          <view class="btn edit" @click="handleEdit(item)">查看</view>
+        </view> -->
+      </view>
+    </view>
+    <view style="height: 100rpx"></view>
+    <view class="fixed-bottom">
+      <my-button @click="go.to('PAGES_MARKET_COUPON_EXCHANGE_CODE_ADD')"
+        >添加兑换码</my-button
+      >
+    </view>
+
+    <Modal
+      v-model="modalData.show"
+      :title="modalData.title"
+      @confirm="handleConfirm"
+    >
+      <template v-if="modalData.key == 'selShop'">
+        <view class="default-box-padding">
+          <my-shop-select
+            @shop-select="shopSelect"
+            v-model:selShops="form.shopIdList"
+            v-model:useType="form.useType"
+          ></my-shop-select>
+        </view>
+      </template>
+    </Modal>
+
+    <u-action-sheet
+      :actions="actions"
+      cancelText="取消"
+      :closeOnClickAction="true"
+      round="6"
+      @close="showAction = false"
+      @select="selectStatus"
+      :show="showAction"
+    ></u-action-sheet>
+  </view>
+</template>
+
+<script setup>
+import {
+  onLoad,
+  onReady,
+  onShow,
+  onPageScroll,
+  onReachBottom,
+  onBackPress,
+} from "@dcloudio/uni-app";
+import Modal from "@/pageMarket/components/modal.vue";
+import * as couponRedemptionApi from "@/http/api/market/couponRedemption.js";
+import { useAccountInfoStore } from "@/store/account.js";
+import go from "@/commons/utils/go.js";
+const accountInfoStore = useAccountInfoStore();
+import { ref, reactive, onMounted, computed, watch } from "vue";
+const loadFinish = ref(false);
+const form = reactive({
+  isEnable: 0,
+  useType: "all",
+});
+
+const actions = [
+  {
+    name: "全部",
+    value: "",
+  },
+  {
+    name: "有效",
+    value: "0",
+  },
+  {
+    name: "无效",
+    value: "1",
+  },
+];
+const returnStatusText = computed(() => {
+  return actions.find((item) => item.value == query.status)?.name || "全部";
+});
+
+function returnCoupon(item) {
+  return item.couponInfoList
+    .reduce((prev, cur) => prev + cur.title + "*" + cur.num + "、", "")
+    .slice(0, -1);
+}
+const showAction = ref(false);
+function selectStatus(item) {
+  console.log(item);
+  query.status = item.value;
+}
+
+function showStatusModal() {
+  showAction.value = true;
+}
+
+function showShopModal() {
+  modalData.show = true;
+  modalData.title = "适用门店";
+  modalData.key = "selShop";
+}
+
+const firstModalTime = ref(0);
+const modalData = reactive({
+  show: false,
+  title: "",
+  key: "",
+});
+
+function handleDelete(item) {
+  uni.showModal({
+    title: "确认删除吗？",
+    success: (res) => {
+      if (res.confirm) {
+        couponRedemptionApi
+          .delete({
+            id: item.id,
+          })
+          .then((res) => {
+            uni.showToast({
+              title: "删除成功",
+              icon: "none",
+            });
+            refreshList();
+          });
+      }
+    },
+  });
+}
+const isEnd = ref(false);
+const query = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  status: "",
+});
+const list = ref([]);
+function refreshList() {
+  query.pageNum = 1;
+  isEnd.value = false;
+  getList();
+}
+
+function handleEdit(item) {
+  uni.setStorageSync("suggestItem", item);
+  go.to("PAGES_MARKET_ORDER_RECOMMENDATION_ADD", {
+    type: "edit",
+  });
+}
+
+const handleConfirm = async () => {
+  if (form.useType == "custom") {
+    if (form.shopIdList.length == 0) {
+      uni.showToast({
+        title: "请选择适用门店",
+        icon: "none",
+      });
+      return;
+    }
+  }
+
+  couponRedemptionApi.enable({
+    shopIdList: form.shopIdList,
+    useType: form.useType,
+    isEnable: form.isEnable,
+  });
+  uni.showToast({
+    title: "修改成功",
+    icon: "none",
+  });
+  modalData.show = false;
+};
+
+const getList = async () => {
+  loadFinish.value = false;
+  if (isEnd.value) {
+    return;
+  }
+  const res = await couponRedemptionApi.couponRedemptionList(query);
+  loadFinish.value = true;
+  if (query.pageNum >= res.totalPage * 1) {
+    isEnd.value = true;
+  }
+  if (query.pageNum == 1) {
+    list.value = res.records || [];
+  } else {
+    list.value = list.value.concat(res.records || []);
+  }
+  console.log(list.value);
+  query.pageNum++;
+};
+
+function getShopInfo() {
+  accountInfoStore.getShopInfo().then((res) => {
+    console.log(res);
+  });
+}
+watch(
+  () => accountInfoStore.shopInfo.isProductSuggest,
+  (newVal, oldVal) => {
+    if (!loadFinish.value) return;
+    accountInfoStore.editShopInfo({
+      isProductSuggest: newVal,
+      id: accountInfoStore.shopInfo.id,
+    });
+    uni.showToast({
+      title: "修改成功",
+      icon: "none",
+    });
+  }
+);
+watch(
+  () => query.status,
+  (newval) => {
+    console.log(newval);
+    refreshList();
+  }
+);
+
+async function getConfig() {
+  couponRedemptionApi.status().then((res) => {
+    Object.assign(form, res);
+  });
+}
+onReachBottom(() => {
+  console.log("触底");
+  getList();
+});
+onMounted(() => {
+  getShopInfo();
+  getConfig();
+});
+onShow(() => {
+  refreshList();
+});
+</script>
+
+<style lang="scss" scoped>
+.status {
+  padding: 8rpx 18rpx;
+  border: 2rpx solid transparent;
+  border-radius: 8rpx;
+  &.status0 {
+    background-color: rgba(123, 209, 54, 0.12);
+    border-color: rgba(123, 209, 54, 1);
+    color: #7bd136;
+  }
+  &.status1 {
+    border-color: rgba(153, 153, 153, 1);
+    background-color: rgba(153, 153, 153, 0.12);
+    color: #999;
+  }
+}
+.btn {
+  padding: 8rpx 42rpx;
+  white-space: nowrap;
+  border-radius: 100rpx;
+  &.del {
+    background-color: #f7f7fa;
+    color: #999;
+  }
+  &.edit {
+    background-color: $my-main-color;
+    color: #fff;
+  }
+}
+.fixed-bottom {
+}
+.time {
+  margin-left: 30rpx;
+  padding: 4rpx 20rpx;
+  border: 1px solid $my-main-color;
+  border-radius: 8rpx;
+  color: $my-main-color;
+}
+.shop {
+  background-color: rgba(49, 138, 254, 0.07);
+  color: $my-main-color;
+  border: 1px solid $my-main-color;
+  padding: 20rpx;
+  border-radius: 8rpx;
+}
+.status-sel {
+  min-width: 266rpx;
+  padding: 18rpx 32rpx;
+  border: 1px solid #d9d9d9;
+  border-radius: 8rpx;
+}
+</style>
diff --git a/pageMarket/newUserDiscount/index.vue b/pageMarket/newUserDiscount/index.vue
index 9b88fff..6233117 100644
--- a/pageMarket/newUserDiscount/index.vue
+++ b/pageMarket/newUserDiscount/index.vue
@@ -246,7 +246,7 @@ function save() {
     });
     return;
   }
-  if(form.discountType == "FIXED" && form.discountAmount == ""){
+  if(form.discountType == "FIXED" && !form.discountAmount ){
     uni.showToast({
       title:'请填写减免金额',
       icon:'none'
diff --git a/pageMarket/static/images/coupon_code.png b/pageMarket/static/images/coupon_code.png
new file mode 100644
index 0000000000000000000000000000000000000000..286ccd1b7429b2127b423515817847ad3f106eed
GIT binary patch
literal 1142
zcmV-+1d02JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000ClNkl<Zcmc$g
ze`r-@7{@>N%w=;^3k@w&`X!6Xtse%tG?`%<)2UEvGD|5f|C1=lD5ywdP((zKVbhrv
z<)mpDHX@_~Ev;<jFe-y^qWwaqo72>tzR!I--1FXh6uI8b%X!}OzR&xd=lP!JeZJ4R
z0s2i|9bPwOb@-8_TN3uO9G%h>wpKTX*DExE1s96#TFjJ`O8WaMA;p}&KDHT%AP8BZ
zh{GfUeGL<c#z1JM4|L>Myy`%U63O|xN)5pI3Z9Oe2%xkW7Tp5Pb7AAWbCXrIP=5my
zrPA?oh8zGRhrpY&VfxkZ*>A9NXa4fWH?U(rG*rN=HBh1#%SMm`;L(ZD{VyzRg>~)l
z$*=j#mS14ix3Ks_7+nSr-JBgBJOG!AjJJ=4SJV}HPUITrt2x*$Aj-z9au{6Xd+`92
zkAz+Y?)b|$D#U81j>3YE8SZ=Y02FI={FHByw7TLV9nnqj#3Yzs0hbO<vhsCNMh7WI
zd?#y3Iz^SE<0k&RempeIfk|UwNHN?!4%TRW=T*L4d{tZo6E2HuGII~W{v+`BQFwU<
zG)^N8CSwZYN5PT_+TR9?Ho-Gn;eijJr30Rv3|C$pw{~+YK4aB$Q{ne6IG`AA$BiC<
zAOC>+<?ul<VB82;tYFT}jaE#{KZlQhc553?g-|sHEVVD*1+ULEt&>y=o>$-_$Kjs$
zVS#*iY3_F27`U518q#&&!!-4RXva8Qrw^z(jdaodC1u3GbsdA1s`f}<u9vVEY5Won
z^+sC%o(RB948-ukVCQG+*J|Ki0eI>TSf+HFE|NWBjrEO(#rO7ukrqak!LgIjc{roX
zo(0*8XkDrEw(~miKP%SnhPTz2LZ$rc&dAE$jTJ3*kWH~po%w}>l54{~iQkA!S#|-;
zxCZ7`z<L#z=}g+x5!VWU^@ydnX<uxxrnTTku<W#}e)cJ#*+#PW5bQbtmbIh;H9Ic@
z6ID!`8{n}jc=rcr-D4&hv1~lv=8ACkwXl3DX|TqEXT=CB$c(j{t@r|Z)Y^@z=KGRT
zr;kPtfStKj?A-TYt%@)*ir?)_t-sf|Ky|Y+vBBA%?2B7v=0@wKTi_AZhh=v}*1r!A
zfIVh!VIL!#7gA1Fh#r7{M3tece4|_;gPSjFNOnJCAK3k;`xw=zy_#_$rB*d#MQY57
z`}HzlU&5yEV9Bkn2_-e1_`_#2w>~nz5^BrEmL0iIcmQnMDu2x`*K9W2r_MI(+{An|
zh_WxJ8)o+pi<bkyl<$aw4XW<9#DuT*LB6tG&)Q$QIx*(cz2-Sr5&@W*_4Z9aL9;;Q
zD@JAeTV~WYpGjf>dXhE<NY`rs)WZfSTy~g{wjc;tCjA+{SK95L>u^xS)4|q-sSbgt
zB4i_K1CoMX3C`@uH(N}L{T~1T0RR8JtKD+|000I_L_t&o0Fs8*sXY5!rT_o{07*qo
IM6N<$f~1-%{r~^~

literal 0
HcmV?d00001

diff --git a/pages.json b/pages.json
index 43be175..d634a26 100644
--- a/pages.json
+++ b/pages.json
@@ -712,7 +712,23 @@
 					"style": {
 						"navigationBarTitleText": "添加"
 					}
+				},
+				{
+					"pageId": "PAGES_MARKET_COUPON_EXCHANGE_CODE",
+					"path": "couponExchangeCode/index",
+					"style": {
+						"navigationBarTitleText": "券兑换码"
+					}
+				},
+				{
+					"pageId": "PAGES_MARKET_COUPON_EXCHANGE_CODE_ADD",
+					"path": "couponExchangeCode/add",
+					"style": {
+						"navigationBarTitleText": "添加券兑换码"
+					}
 				}
+				
+
 			]
 		},
 		{
diff --git a/pages/appliccation/marketing.vue b/pages/appliccation/marketing.vue
index 70f09fd..5ddba3d 100644
--- a/pages/appliccation/marketing.vue
+++ b/pages/appliccation/marketing.vue
@@ -124,7 +124,7 @@ const menuList = ref([
 			{
 				title: '券兑换码',
 				icon: '',
-				pageUrl: '',
+				pageUrl: 'PAGES_MARKET_COUPON_EXCHANGE_CODE',
 				intro: '可添加多券组合兑换'
 			},
 			{