From 8fa21b3404a3f353efcdf58c230ef8ee1434beda Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 20 Nov 2025 14:41:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=96=B0=E5=AE=A2=E7=AB=8B?=
=?UTF-8?q?=E5=87=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
commons/style/common.scss | 51 ++-
.../my-components/my-bottom-btn-group.vue | 28 +-
components/my-components/my-dine-types.vue | 72 +++--
components/my-components/my-time-area.vue | 14 +-
http/api/market/consumeDiscount.js | 23 +-
pageMarket/components/modal.vue | 4 +-
pageMarket/distribution/add-fenxiao-user.vue | 9 +-
pageMarket/distribution/level-list.vue | 5 +-
pageMarket/newUserDiscount/index.vue | 302 ++++++++++++++++++
.../static/images/new-user-discount.png | Bin 0 -> 1104 bytes
pages.json | 19 ++
pages/appliccation/marketing.vue | 2 +-
store/market.js | 28 ++
13 files changed, 507 insertions(+), 50 deletions(-)
create mode 100644 pageMarket/newUserDiscount/index.vue
create mode 100644 pageMarket/static/images/new-user-discount.png
diff --git a/commons/style/common.scss b/commons/style/common.scss
index 6a0a8f3..542d42b 100644
--- a/commons/style/common.scss
+++ b/commons/style/common.scss
@@ -365,7 +365,7 @@ text {
right: 0;
padding: 30rpx;
padding-bottom: env(safe-area-inset-bottom);
-
+ z-index: 999;
/* #ifdef H5 */
padding-bottom: 28rpx;
/* #endif */
@@ -427,4 +427,51 @@ text {
}
.bg-f7{
background-color: #F7F7F7;
-}
\ No newline at end of file
+}
+.default-box-padding{
+ padding: 32rpx 28rpx;
+}
+.default-box-radius{
+ border-radius: 16rpx;
+}
+.default-box-x-padding{
+ padding-left: 28rpx;
+ padding-right: 28rpx;
+}
+.default-box-y-padding{
+ padding-top: 32rpx;
+ padding-bottom: 32rpx;
+}
+$height: 70rpx;
+
+.number-box {
+ font-size: 28rpx;
+ padding: 0 26rpx;
+ border-radius: 6rpx 0 0 6rpx;
+ border-top: 2rpx solid #d9d9d9;
+ border-bottom: 2rpx solid #d9d9d9;
+ border-left: 2rpx solid #d9d9d9;
+ background: #fff;
+ box-sizing: border-box;
+ height: $height;
+ flex: 1;
+ line-height: $height;
+ }
+ .unit {
+ display: flex;
+ padding: 0 38rpx;
+ height: $height;
+ line-height: $height;
+ align-items: center;
+ border-radius: 0 6rpx 6rpx 0;
+ border: 2rpx solid #d9d9d9;
+ background: #f7f7fa;
+ font-size: 28rpx;
+ color: #999999;
+ }
+ .u-col-baseline{
+ align-items: baseline;
+ }
+ .text-right{
+ text-align: right;
+ }
\ No newline at end of file
diff --git a/components/my-components/my-bottom-btn-group.vue b/components/my-components/my-bottom-btn-group.vue
index 688082a..862bca2 100644
--- a/components/my-components/my-bottom-btn-group.vue
+++ b/components/my-components/my-bottom-btn-group.vue
@@ -1,10 +1,13 @@
-
+
-
+
-
+
保存
@@ -18,7 +21,15 @@
+
+
diff --git a/components/my-components/my-dine-types.vue b/components/my-components/my-dine-types.vue
index 05458df..bb3a040 100644
--- a/components/my-components/my-dine-types.vue
+++ b/components/my-components/my-dine-types.vue
@@ -1,39 +1,57 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/components/my-components/my-time-area.vue b/components/my-components/my-time-area.vue
index 7cb469d..0938a16 100644
--- a/components/my-components/my-time-area.vue
+++ b/components/my-components/my-time-area.vue
@@ -2,13 +2,13 @@
- 请选择日期范围
+ {{ startText }}
{{ startDate }}
—
- 请选择日期范围
+ {{ endText }}
{{ endDate }}
@@ -29,6 +29,16 @@
+
diff --git a/pageMarket/static/images/new-user-discount.png b/pageMarket/static/images/new-user-discount.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a4897be30035f1aca9bad220338899ec1c9b281
GIT binary patch
literal 1104
zcmV-W1h4yvP))
zBrY+cQR4zc(NRM*S}0)&JCrR@mOxp;R{A*KTqf_1rn
zlZL{~;n4f4%yy|WIagem4_}RgLD#0by8F%rP<#dKJ^~YmI9-@AC-Cvpuyi}TayOK9
zg;;g6JbJ4!zYNCR2KV-b34_DH67C((T@GCeVAPE+=(HtJ^M{kgo1lI-j9&mxd<$Q!
zbT+xhoGVs<1IJ;?V)%K3?%=5kc=0YL*LMNWgVVO}=Zt}(%L#Ra0#>A2CO$st1DVw^sI$z0f^`8W?S>maVhMKBfU*XJqNqxz(w>8;C%EZG#czP-pLSRU`3txq2@=T}hl=J*^qs
z*&9lWNIDcx{z*!^Ndne(nLCzvB~o{?c@A58Klm3adO){A_{o?pcGsFtTTJPH>rZ>A
zG8k|Ttk@$jC+bem4}qw~9BB{jv~ElSZf*e?E6`(KJA+1J>UV2l?LPSUe-MynWV?R9
zZK;K@WDCst8x~l)Wv6+G_V!GBs8iM+MM~)sk_4<`pq0$1vVt%mVdBnf4ETpOtW`!n
zSw=kNviQxwqgH6n__}lQ_#H6aV!ithXx?evm;@}OOt+F4J9uHQHMGWYXSO3}q_FG7wmXsz5LN0!>D)
z*`uLZ_t;9|?U-2W8M@C>dXpheL-MWz#iw{S^J=T4s4-yrb+K263T3V-@
zkGfirT|$=?SVkg?YI7#i$)+udL^u@`>9dJ|Z4+fPadSbW3qvC3ojwZK5}7^`q)8=R
z7!n1=G2P|}K6C6M^e;iW25S&o4?->yWeEIH#M{Ap*2tq73 {
+ return {
+ //分销配置
+ config: {
+ isEnable: 0,
+ },
+ };
+ },
+ actions: {
+ async getConfig() {
+ const data = await consumeDiscountApi.getConfig();
+ this.config = data;
+ return this.config;
+ },
+ async editConfig(data,isAutoResrefresh = true) {
+ const res = await consumeDiscountApi.editConfig({ ...this.config, ...data });
+ if(isAutoResrefresh){
+ this.getConfig();
+ }
+ return res;
+ },
+ },
+ unistorage: true, // 开启后对 state 的数据读写都将持久化
+});
\ No newline at end of file