From 08281203b0a32980dc07b09c1d0c1547bb2dc5aa Mon Sep 17 00:00:00 2001
From: sj <1304317391@qq.com>
Date: Fri, 18 Nov 2022 13:37:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BC=9A=E5=91=98=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bxg/activity/combination/form.vue | 8 ++++----
 src/views/bxg/shop/userlevel/form.vue       | 6 +++---
 src/views/bxg/shop/userlevel/index.vue      | 3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/bxg/activity/combination/form.vue b/src/views/bxg/activity/combination/form.vue
index 0960bcc..2bc9086 100644
--- a/src/views/bxg/activity/combination/form.vue
+++ b/src/views/bxg/activity/combination/form.vue
@@ -16,7 +16,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="拼团简介" prop="info" >
-              <el-input v-model="formValidate.info"  disabled="true" @input="onInput()" style="width: 500px;" placeholder="请输入拼团简介"/>
+              <el-input v-model="formValidate.info"  disabled="true"  @input="onInput()" style="width: 500px;" placeholder="请输入拼团简介"/>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -367,9 +367,9 @@ export default {
         title: [
           {required: true, message: '请输入拼团名称', trigger: 'blur'}
         ],
-        info: [
-          {required: true, message: '请输入拼团简介', trigger: 'blur'}
-        ],
+        // info: [
+        //   {required: true, message: '请输入拼团简介', trigger: 'blur'}
+        // ],
         unitName: [
           {required: true, message: '请输入单位', trigger: 'blur'}
         ],
diff --git a/src/views/bxg/shop/userlevel/form.vue b/src/views/bxg/shop/userlevel/form.vue
index 1bccd60..ceb82d0 100644
--- a/src/views/bxg/shop/userlevel/form.vue
+++ b/src/views/bxg/shop/userlevel/form.vue
@@ -14,7 +14,7 @@
       <el-form-item label="会员等级">
         <el-input-number v-model="form.grade" style="width: 370px;" />
       </el-form-item>
-      <el-form-item label="享受折扣">
+      <el-form-item label="商品价格(%)">
         <el-input-number v-model="form.discount" style="width: 370px;" />
       </el-form-item>
       <el-form-item label="会员背景">
@@ -69,7 +69,7 @@ export default {
         isPay: '',
         isShow: 1,
         grade: '',
-        discount: '',
+        discount: 100,
         image: '',
         icon: '',
         imageArr: [],
@@ -152,7 +152,7 @@ export default {
         isPay: '',
         isShow: 1,
         grade: '',
-        discount: '',
+        discount: 100,
         image: '',
         icon: '',
         imageArr: [],
diff --git a/src/views/bxg/shop/userlevel/index.vue b/src/views/bxg/shop/userlevel/index.vue
index c757907..3c74f5b 100644
--- a/src/views/bxg/shop/userlevel/index.vue
+++ b/src/views/bxg/shop/userlevel/index.vue
@@ -26,7 +26,7 @@
       </el-table-column>
       <el-table-column prop="name" label="等级名称" />
       <el-table-column prop="grade" label="会员等级" />
-      <el-table-column prop="discount" label="享受折扣" />
+      <el-table-column prop="discount" label="商品价格(%)" />
       <el-table-column prop="validDate" label="有效时间" />
       <el-table-column prop="isForever" label="是否永久">
         <template slot-scope="scope">
@@ -133,6 +133,7 @@ export default {
         isShow: data.isShow,
         grade: data.grade,
         discount: data.discount,
+        growthValue:data.growthValue,
         image: data.image,
         icon: data.icon,
         imageArr: data.image ? data.image.split(',') : [],