From db68195139916641dac8a4fe388e15832ea512cc Mon Sep 17 00:00:00 2001
From: wangbing <wangbingit@outlook.com>
Date: Fri, 3 May 2019 00:46:37 +0800
Subject: [PATCH] =?UTF-8?q?Home=E9=A1=B5=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/screen/home.ftl       | 103 ++++++++++++------
 1 file changed, 67 insertions(+), 36 deletions(-)

diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl
index 07749a60..28856120 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl
@@ -258,49 +258,61 @@
                 </div>
 
                 <el-form :model="form" :rules="rules" ref="form" label-width="100px">
-                    <el-form-item label="活动名称" prop="name">
-                        <el-input v-model="form.name"></el-input>
+                    <el-form-item label="活动名称" prop="field1">
+                        <el-input v-model="form.field1"></el-input>
                     </el-form-item>
-                    <el-form-item label="活动区域" prop="region">
-                        <el-select v-model="form.region" placeholder="请选择活动区域">
+                    <el-form-item label="活动区域" prop="field2">
+                        <el-select v-model="form.field2" placeholder="请选择活动区域">
                             <el-option label="区域一" value="shanghai"></el-option>
                             <el-option label="区域二" value="beijing"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="活动时间" required>
                         <el-col :span="11">
-                            <el-form-item prop="date1">
-                                <el-date-picker type="date" placeholder="选择日期" v-model="form.date1"
+                            <el-form-item prop="field3">
+                                <el-date-picker type="date" placeholder="选择日期" v-model="form.field3"
                                                 style="width: 100%;"></el-date-picker>
                             </el-form-item>
                         </el-col>
                         <el-col style="text-align: center" :span="2">-</el-col>
                         <el-col :span="11">
-                            <el-form-item prop="date2">
-                                <el-time-picker placeholder="选择时间" v-model="form.date2"
+                            <el-form-item prop="field4">
+                                <el-time-picker placeholder="选择时间" v-model="form.field4"
                                                 style="width: 100%;"></el-time-picker>
                             </el-form-item>
                         </el-col>
                     </el-form-item>
-                    <el-form-item label="即时配送" prop="delivery">
-                        <el-switch v-model="form.delivery"></el-switch>
+                    <el-form-item label="即时配送" prop="field5">
+                        <el-switch v-model="form.field5"></el-switch>
                     </el-form-item>
-                    <el-form-item label="活动性质" prop="type">
-                        <el-checkbox-group v-model="form.type">
-                            <el-checkbox label="美食/餐厅线上活动" name="type"></el-checkbox>
-                            <el-checkbox label="地推活动" name="type"></el-checkbox>
-                            <el-checkbox label="线下主题活动" name="type"></el-checkbox>
-                            <el-checkbox label="单纯品牌曝光" name="type"></el-checkbox>
+                    <el-form-item label="活动性质" prop="field6">
+                        <el-checkbox-group v-model="form.field6">
+                            <el-checkbox label="美食/餐厅线上活动" name="field6"></el-checkbox>
+                            <el-checkbox label="地推活动" name="field6"></el-checkbox>
+                            <el-checkbox label="线下主题活动" name="field6"></el-checkbox>
+                            <el-checkbox label="单纯品牌曝光" name="field6"></el-checkbox>
                         </el-checkbox-group>
                     </el-form-item>
-                    <el-form-item label="特殊资源" prop="resource">
-                        <el-radio-group v-model="form.resource">
+                    <el-form-item label="特殊资源" prop="field7">
+                        <el-radio-group v-model="form.field7">
                             <el-radio label="线上品牌商赞助"></el-radio>
                             <el-radio label="线下场地免费"></el-radio>
                         </el-radio-group>
                     </el-form-item>
-                    <el-form-item label="活动形式" prop="desc">
-                        <el-input type="textarea" v-model="form.desc"></el-input>
+                    <el-form-item label="购买数量" prop="field8">
+                        <el-input-number v-model="form.field8" :min="1" :max="10" label="描述文字"></el-input-number>
+                    </el-form-item>
+                    <el-form-item label="地址" prop="field9">
+                        <el-cascader
+                                :options="address"
+                                v-model="form.field9">
+                        </el-cascader>
+                    </el-form-item>
+                    <el-form-item label="活动形式" prop="field10">
+                        <el-input type="textarea" v-model="form.field10"></el-input>
+                    </el-form-item>
+                    <el-form-item label="颜色选择" prop="field11">
+                        <el-color-picker></el-color-picker>
                     </el-form-item>
                     <el-form-item>
                         <el-button type="primary" @click="submitForm('form')">立即创建</el-button>
@@ -859,16 +871,29 @@
             fileList: [],
 
             form: {
-                name: '',
-                region: '',
-                date1: '',
-                date2: '',
-                delivery: false,
-                type: [],
-                resource: '',
-                desc: ''
+                field1: '',
+                field2: '',
+                field3: '',
+                field4: '',
+                field5: false,
+                field6: [],
+                field7: '',
+                field8: '',
+                field9: [],
+                field10: ''
             },
-
+            address:[{
+                value: '10000',
+                label: '上海市',
+                children:[{
+                    value: '11000',
+                    label: '静安区',
+                    children:[{
+                        value: '11100',
+                        label: '南京西路',
+                    }]
+                }]}
+            ],
             tableData: [{
                 date: '2016-05-03',
                 name: '王小虎',
@@ -885,26 +910,32 @@
             multipleSelection: [],
 
             rules: {
-                name: [
+                field1: [
                     {required: true, message: '请输入活动名称', trigger: 'blur'},
                     {min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur'}
                 ],
-                region: [
+                field2: [
                     {required: true, message: '请选择活动区域', trigger: 'change'}
                 ],
-                date1: [
+                field3: [
                     {type: 'date', required: true, message: '请选择日期', trigger: 'change'}
                 ],
-                date2: [
+                field4: [
                     {type: 'date', required: true, message: '请选择时间', trigger: 'change'}
                 ],
-                type: [
+                field6: [
                     {type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change'}
                 ],
-                resource: [
+                field7: [
                     {required: true, message: '请选择活动资源', trigger: 'change'}
                 ],
-                desc: [
+                field8: [
+                    {required: true, message: '请填写购买数量', trigger: 'blur'}
+                ],
+                field9: [
+                    {required: true, message: '请填写地址', trigger: 'blur'}
+                ],
+                field10: [
                     {required: true, message: '请填写活动形式', trigger: 'blur'}
                 ]
             },