diff --git a/components/my-components/my-bottom-btn-group.vue b/components/my-components/my-bottom-btn-group.vue
index 862bca2..56f6c02 100644
--- a/components/my-components/my-bottom-btn-group.vue
+++ b/components/my-components/my-bottom-btn-group.vue
@@ -46,4 +46,9 @@ function cancel() {
.zhanwei1{
height: 240rpx;
}
+.fixed-bottom {
+ &.u-flex-column{
+ align-items: stretch;
+ }
+}
diff --git a/components/my-components/my-hour-area.vue b/components/my-components/my-hour-area.vue
index 8e846c7..7bb2442 100644
--- a/components/my-components/my-hour-area.vue
+++ b/components/my-components/my-hour-area.vue
@@ -1,97 +1,118 @@
-
-
-
-
-
-
-
- 开始时间
- {{ startValue }}
-
- —
-
- 结束时间
- {{ endValue }}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 开始时间
+ {{ startValue }}
+
+ —
+
+ 结束时间
+ {{ endValue }}
+
+
+
+
+
+
+
+
+
diff --git a/components/my-components/my-week-sel.vue b/components/my-components/my-week-sel.vue
index 78ad6d9..28295d0 100644
--- a/components/my-components/my-week-sel.vue
+++ b/components/my-components/my-week-sel.vue
@@ -3,6 +3,7 @@
[],
diff --git a/http/api/market/suggest.js b/http/api/market/suggest.js
index 6068458..92106f7 100644
--- a/http/api/market/suggest.js
+++ b/http/api/market/suggest.js
@@ -31,7 +31,7 @@ export function editSuggest(params) {
}
export function deleteSuggest(params) {
return request({
- url: urlType + `/admin/suggest`,
+ url: urlType + `/admin/suggest?id=${params.id}`,
method: "DELETE",
params: {
...params,
diff --git a/pageMarket/components/choose-goods.vue b/pageMarket/components/choose-goods.vue
new file mode 100644
index 0000000..bbd9da3
--- /dev/null
+++ b/pageMarket/components/choose-goods.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+ 请选择商品
+ {{ goodsName }}
+
+
+
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+ ¥{{ item.lowPrice }}
+
+
+
+
+ {{ cancelText }}
+ {{ confirmText }}
+
+
+
+
+
+
+
+
diff --git a/pageMarket/distribution/add-fenxiao-user.vue b/pageMarket/distribution/add-fenxiao-user.vue
index 87f9d04..ef76980 100644
--- a/pageMarket/distribution/add-fenxiao-user.vue
+++ b/pageMarket/distribution/add-fenxiao-user.vue
@@ -66,7 +66,7 @@
{{
- item.accountPoints
+ item.consumeCount
}}
diff --git a/pageMarket/distribution/components/fenxiao-mingxi.vue b/pageMarket/distribution/components/fenxiao-mingxi.vue
index 69032bc..8756e6e 100644
--- a/pageMarket/distribution/components/fenxiao-mingxi.vue
+++ b/pageMarket/distribution/components/fenxiao-mingxi.vue
@@ -38,7 +38,7 @@
{{ 0 }}{{ item.rewardAmount }}
{{
item.level == 1 ? "直接分成" : "间接分成"
diff --git a/pageMarket/newUserDiscount/index.vue b/pageMarket/newUserDiscount/index.vue
index e8959bd..9b88fff 100644
--- a/pageMarket/newUserDiscount/index.vue
+++ b/pageMarket/newUserDiscount/index.vue
@@ -53,7 +53,7 @@
class="number-box"
placeholder="请输入内容"
placeholder-class="color-999 u-font-28"
- type="number"
+ type="digit"
v-model="form.discountAmount"
/>
元
@@ -65,13 +65,13 @@
class="u-flex default-box-x-padding default-box-y-padding"
v-if="form.discountType === 'RANDOM'"
>
- 减免方式
- 添加方案
+ 随机减免方案
+ 添加方案
所有概率相加必须等于100%
-
+