Merge branch 'online' into 10/23-test

dist/static/css/chunk-584f74be.3577e1a4.css

@@ -0,0 +1 @@
+.content-tooltip[data-v-64596b6c]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}.dialog-footer[data-v-43a5b626]{width:100%;text-align:right}.reword-list[data-v-43a5b626]{display:-webkit-box;display:-ms-flexbox;display:flex}.reword-list .el-form-item[data-v-43a5b626]{-webkit-box-flex:1;-ms-flex:1;flex:1}.add-reword[data-v-43a5b626]{margin-bottom:22px;width:180px;border-style:dashed}

dist/static/css/chunk-64aa1cae.afbf5ff3.css

@@ -0,0 +1 @@
+.right-code .title[data-v-43074d22]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-43074d22]{display:inline-block}.el-input[data-v-43074d22]{width:180px!important}

dist/static/css/chunk-b10e6fea.cb21165c.css

@@ -1 +0,0 @@
-.content-tooltip[data-v-64596b6c]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}.dialog-footer[data-v-17893631]{width:100%;text-align:right}.reword-list[data-v-17893631]{display:-webkit-box;display:-ms-flexbox;display:flex}.reword-list .el-form-item[data-v-17893631]{-webkit-box-flex:1;-ms-flex:1;flex:1}.add-reword[data-v-17893631]{margin-bottom:22px;width:180px;border-style:dashed}

dist/static/css/chunk-e29c4bd8.262c5511.css

@@ -1 +0,0 @@
-.right-code .title[data-v-080514fc]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-080514fc]{display:inline-block}.el-input[data-v-080514fc]{width:180px!important}

src/views/luckyDraw/trophyCreate.vue

@@ -4,6 +4,7 @@
         <el-form :model="form"
                 :rules="rules"
                 ref="ruleForm">
+            <p style="color: red; padding: 0 0 10px 100px;">注意：活动所有奖品的中奖概率之和必须等于100%; <br />活动奖品必须选择一个默认奖品，该奖品建议设置为谢谢参与;</p>
             <el-form-item label="所属活动" prop="groupId" label-width="100PX">
                 <el-select v-model.trim="form.groupId"
                         style="width: 100% !important"
@@ -12,7 +13,7 @@
                 </el-select>
             </el-form-item>
             <el-row :gutter="10" v-for="(reword, index) in form.rewordList" :key="index">
-                <el-col :span="12">
+                <el-col :span="10">
                     <el-form-item :label="`奖品${index + 1}`"
                             label-width="100PX"
                             :prop="'rewordList.' + index + '.name'"
@@ -22,7 +23,7 @@
                                 placeholder="请输入奖品名称"></el-input>
                     </el-form-item>
                 </el-col>
-                <el-col :span="7">
+                <el-col :span="5">
                     <el-form-item :prop="'rewordList.' + index + '.chances'"
                             :rules="[{required: true, validator: validNumber, trigger: 'blur'}]">
                         <el-input v-model.trim="reword.chances"
@@ -33,7 +34,7 @@
                         </el-input>
                     </el-form-item>
                 </el-col>
-                <el-col :span="5">
+                <el-col :span="4">
                     <el-form-item :prop="'rewordList.' + index + '.stock'"
                             :rules="[{required: true, validator: validNumber1, trigger: 'blur'}]">
                         <el-input v-model.trim="reword.stock"
@@ -43,6 +44,17 @@
                         </el-input>
                     </el-form-item>
                 </el-col>
+                <el-col :span="5">
+                    <el-form-item :prop="'rewordList.' + index + '.isDefault'"
+                            :rules="[{required: true, message:'请输入选择是否默认', trigger: 'blur'}]">
+                        <el-select v-model.trim="reword.isDefault"
+                                style="width: 100% !important"
+                                placeholder="请选择是否默认">
+                            <el-option :value="true" label="是"></el-option>
+                            <el-option :value="false" label="否"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
             </el-row>
             <div style="text-align: center">
                 <el-button :disabled="form.rewordList.length <= 1" class="add-reword" round icon="el-icon-minus" @click="onRemoveReword">删除奖品</el-button>
@@ -101,6 +113,7 @@ export default {
                     name: null,
                     chances: null,
                     stock: null,
+                    isDefault: null
                 }],
                 memo: null
             },
@@ -133,6 +146,7 @@ export default {
                 name: null,
                 chances: null,
                 stock: null,
+                isDefault: null
             })
         },
         onSubmit(formName) {
@@ -149,6 +163,7 @@ export default {
                             groupId: form.groupId,
                             chances: numeral(item.chances ? item.chances / 100 : 0).format('0.00'),
                             stock: item.stock,
+                            isDefault: item.isDefault,
                             memo: form.memo,
                             enabled: 1
                         })

src/views/luckyDraw/trophyManager.vue

@@ -53,6 +53,13 @@
                     </template>
                 </el-table-column>
                 <el-table-column align="center"
+                                prop="isDefault"
+                                label="是否默认">
+                    <template slot-scope="scope">
+                        {{ scope.row.isDefault ? '是' : '否' }}
+                    </template>
+                </el-table-column>
+                <el-table-column align="center"
                                 prop="memo"
                                 label="备注">
                     <template slot-scope="scope">
@@ -75,7 +82,7 @@
 
         <el-dialog :title="formTitle[formActionTitle]"
                 :visible.sync="lotteryCreateStatus"
-                width="600px">
+                width="800px">
             <trophy-create :groupList="groupList"
                         :getList="getList"
                         :close="onPopupClose"></trophy-create>
@@ -119,6 +126,15 @@
                             placeholder="请输入库存">
                     </el-input>
                 </el-form-item>
+                <el-form-item label="是否默认"
+                            prop="isDefault">
+                    <el-select v-model.trim="form.isDefault"
+                            style="width: 100% !important"
+                            placeholder="请选择是否是默认">
+                        <el-option :value="true" label="是"></el-option>
+                        <el-option :value="false" label="否"></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="备注"
                             prop="memo">
                     <el-input type="textarea" :rows="2" v-model.trim="form.memo"
@@ -184,14 +200,16 @@ export default {
                 groupId: null,
                 chances: null,
                 stock: null,
-                memo: null
+                memo: null,
+                isDefault: null
             },
             rules: {
                 name: [{required: true, message:'请输入活动名称', trigger: 'blur'}],
                 groupId: [{required: true, message:'请选择所属活动', trigger: 'change'}],
                 chances: [{required: true, validator: validNumber, trigger: 'blur'}],
                 stock: [{required: true, validator: validNumber1, trigger: 'blur'}],
-                enabled: [{required: true, message:'请选择是否启用', trigger: 'change'}]
+                enabled: [{required: true, message:'请选择是否启用', trigger: 'change'}],
+                isDefault: [{required: true, message:'请选择是否默认', trigger: 'change'}]
             },
             pageInfo: {
                 // 分页规则
@@ -236,6 +254,7 @@ export default {
                         groupId: data.groupId,
                         chances: data.chances * 100,
                         stock: data.stock,
+                        isDefault: data.isDefault,
                         memo: data.memo
                     }
                 })
@@ -254,6 +273,7 @@ export default {
                         chances: numeral(form.chances ? form.chances / 100 : 0).format('0.0000'),
                         stock: form.stock,
                         memo: form.memo,
+                        isDefault: form.isDefault,
                         enabled: 1
                     }
                     if(this.formActionTitle == 'update') {

src/views/sporadicManager/sporadicList.vue

@@ -201,7 +201,7 @@
         <el-form-item label="缴费人数"
                       prop="maxNum"
                       :rules="[{ required: true, validator: validMaxNum, trigger: 'blur' }]"
-                      v-show="maskForm.type == 12">
+                      v-if="maskForm.type == 12">
           <el-input v-model.trim="maskForm.maxNum"
                     type="number"
                     @mousewheel.native.prevent></el-input>