Merge branch 'dev-sws' into dev-yxl

src/components/model-coupon/model-coupon-content.vue

@@ -7,7 +7,7 @@
                     <theme-select v-model="form.theme" :data="base_list.themeList" @update:model-value="themeChange"></theme-select>
                 </el-form-item>
             </card-container>
-            <card-container class="common-content-height">
+            <card-container class="content-height">
                 <div class="mb-12">优惠券数据</div>
                 <el-form-item label="数据来源">
                     <el-radio-group v-model="form.data_type">
@@ -27,14 +27,18 @@
                     </el-form-item>
                 </template>
                 <template v-else>
-                    <slider></slider>
+                    <el-form-item label="展示数量">
+                        <slider v-model="form.number"></slider>
+                    </el-form-item>
+                </template>
+                <template v-if="form.theme === '4'">
+                    <el-form-item label="内容标题">
+                        <el-input v-model="form.title" placeholder="请输入内容"></el-input>
+                    </el-form-item>
+                    <el-form-item label="内容描述">
+                        <el-input v-model="form.desc" type="textarea" :rows="4" placeholder="请输入内容"></el-input>
+                    </el-form-item>
                 </template>
-                <el-form-item label="内容标题">
-                    <el-input v-model="form.title" placeholder="请输入内容"></el-input>
-                </el-form-item>
-                <el-form-item label="内容描述">
-                    <el-input v-model="form.desc" type="textarea" :rows="4" placeholder="请输入内容"></el-input>
-                </el-form-item>
             </card-container>
         </el-form>
     </div>

src/components/model-coupon/model-coupon-styles.vue

@@ -1,5 +1,10 @@
 <template>
     <div class="styles">
+        <el-form :model="form" label-width="70">
+            <card-container class="mb-8">
+                
+            </card-container>
+        </el-form>
         <common-styles class="styles-height" :value="form.common_style" @update:value="common_styles_update" />
     </div>
 </template>

src/layout/components/main/default/coupon.ts

@@ -25,7 +25,9 @@ const defaultCoupoin: DefaultCoupon = {
         theme: '1',
         data_type: '0',
         number: 4,
+        // 只有主题4用到
         title: '先领券 再购物',
+        // 只有主题4用到
         desc: '领券下单·享购物优惠',
         data_list: [],
     },