许成详 6 年之前
父節點
當前提交
81c1e81071

+ 35
- 1
src/pages/system/marketingActivities/activitiesList/index.vue 查看文件

5
         <div class="flex-item flex-h">
5
         <div class="flex-item flex-h">
6
           <el-button size="mini" type="success" @click="redirection('addActivities')">新增活动</el-button>
6
           <el-button size="mini" type="success" @click="redirection('addActivities')">新增活动</el-button>
7
         </div>
7
         </div>
8
+        <ul>
9
+          <li>
10
+            <el-select v-model="CaseId" placeholder="请选择案场">
11
+              <el-option
12
+                key=""
13
+                label="不限案场"
14
+                value="">
15
+              </el-option>
16
+              <el-option
17
+                v-for="item in cases"
18
+                :key="item.CaseId"
19
+                :label="item.CaseName"
20
+                :value="item.CaseId">
21
+              </el-option>
22
+            </el-select>
23
+          </li>
24
+        </ul>
8
         <el-button
25
         <el-button
9
           size="mini"
26
           size="mini"
10
           type="primary" @click="clickList">搜索</el-button>
27
           type="primary" @click="clickList">搜索</el-button>
87
   </div>
104
   </div>
88
 </template>
105
 </template>
89
 <script>
106
 <script>
107
+import { mapState } from 'vuex'
90
 export default {
108
 export default {
91
   data () {
109
   data () {
92
     return {
110
     return {
102
       }],
120
       }],
103
       value: '10', // 一页多少数据
121
       value: '10', // 一页多少数据
104
       tableData: [],
122
       tableData: [],
105
-      postData: { // 表格搜索条件 //caseid: '', // 案场id
123
+      postData: { // 表格搜索条件
124
+        caseid: '', // 案场id
106
         page: 1, // 当前页码
125
         page: 1, // 当前页码
107
         pageSize: 10, // 请求数据量
126
         pageSize: 10, // 请求数据量
108
       },
127
       },
110
       total: 0 // 数据条数
129
       total: 0 // 数据条数
111
     }
130
     }
112
   },
131
   },
132
+  computed: {
133
+    ...mapState({
134
+      cases: x => x.app.cases.list,
135
+      defaultCaseId: x => x.app.cases.default,
136
+      clientUrl: x => x.app.clientUrl,
137
+    }),
138
+    CaseId: {
139
+      get () {
140
+        return this.postData.caseid || this.defaultCaseId
141
+      },
142
+      set (val) {
143
+        this.postData.caseid = val
144
+      }
145
+    }
146
+  },
113
   mounted () {
147
   mounted () {
114
     this.getList()
148
     this.getList()
115
   },
149
   },

+ 10
- 9
src/pages/system/marketingActivities/listOfLotteryActivities/edit.vue 查看文件

1
 <template>
1
 <template>
2
   <div class="subPage flex-h">
2
   <div class="subPage flex-h">
3
-    <div class="flex-item" style="margin:20px;">
3
+    <div class="img">
4
+      <img v-if="templateList.length" :src="templateList[templateActiveIndex].TplImg" width="100%" alt="">
5
+    </div>
6
+    <div class="flex-item">
4
       <nav class="flex-h">
7
       <nav class="flex-h">
5
         <a class="flex-item" :class="{'active': activeIndex === 0}" @click="activeIndex = 0">基础信息</a>
8
         <a class="flex-item" :class="{'active': activeIndex === 0}" @click="activeIndex = 0">基础信息</a>
6
         <a class="flex-item" :class="{'active': activeIndex === 1}" @click="activeIndex = 1">奖品信息</a>
9
         <a class="flex-item" :class="{'active': activeIndex === 1}" @click="activeIndex = 1">奖品信息</a>
290
                     :disabled="!editAll || isread"
293
                     :disabled="!editAll || isread"
291
                     size="mini"
294
                     size="mini"
292
                     type="success"
295
                     type="success"
293
-                    @click="addPrizeItemPhone(scope.$index)">编辑</el-button>
296
+                    @click="addPrizeItemPhone(scope.$index)">内定设置</el-button>
294
                 </template>
297
                 </template>
295
               </el-table-column>
298
               </el-table-column>
296
             </el-table>
299
             </el-table>
309
           @click="rebackList">取消</el-button>
312
           @click="rebackList">取消</el-button>
310
       </div>
313
       </div>
311
     </div>
314
     </div>
312
-    <div class="img" style="margin-left:0px;margin-right:20px;">
313
-      <img v-if="templateList.length" :src="templateList[templateActiveIndex].TplImg" width="100%" alt="">
314
-    </div>
315
     <el-dialog
315
     <el-dialog
316
       :title="editPrizeOff ? '编辑奖品' : '新增奖品'"
316
       :title="editPrizeOff ? '编辑奖品' : '新增奖品'"
317
       :visible.sync="centerDialogVisible"
317
       :visible.sync="centerDialogVisible"
347
               <span style="line-height:40px;font-size:11px;color:#ccc;">(选择“否”即为“谢谢参与”奖项)</span>
347
               <span style="line-height:40px;font-size:11px;color:#ccc;">(选择“否”即为“谢谢参与”奖项)</span>
348
             </div>
348
             </div>
349
           </li>
349
           </li>
350
-          <li class="flex-h" style="width:50%;float:left;" v-if="addPrizeInfo.PrizeType === 'third' && addPrizeInfo.IsReality === 1">
350
+          <li class="flex-h" style="width:50%;float:left;" v-if="addPrizeInfo.PrizeType === 'third'">
351
             <span>奖品名称:<em>*</em></span>
351
             <span>奖品名称:<em>*</em></span>
352
             <div class="flex-item">
352
             <div class="flex-item">
353
               <div style="width: 200px;">
353
               <div style="width: 200px;">
848
       this.$router.push({ name: 'listOfLotteryActivities' })
848
       this.$router.push({ name: 'listOfLotteryActivities' })
849
     },
849
     },
850
     submitLuckdrawData () { // 提交活动信息
850
     submitLuckdrawData () { // 提交活动信息
851
+      if (!this.checkData()) {
852
+        return false
853
+      }
851
       if (this.submitOff) {
854
       if (this.submitOff) {
852
         this.submitOff = false
855
         this.submitOff = false
853
-        if (!this.checkData()) {
854
-          return false
855
-        }
856
         this.postData.ShareAddNum = this.postData.ShareAddNum - 0
856
         this.postData.ShareAddNum = this.postData.ShareAddNum - 0
857
         this.postData.LuckdrawNum = this.postData.LuckdrawNum - 0
857
         this.postData.LuckdrawNum = this.postData.LuckdrawNum - 0
858
         if (!this.postData.IsInternalDefault) {
858
         if (!this.postData.IsInternalDefault) {
865
             if (this.postData.Prizes[a].VerificationStart === '') {
865
             if (this.postData.Prizes[a].VerificationStart === '') {
866
               delete this.postData.Prizes[a].VerificationStart
866
               delete this.postData.Prizes[a].VerificationStart
867
               delete this.postData.Prizes[a].VerificationEnd
867
               delete this.postData.Prizes[a].VerificationEnd
868
+              this.postData.Prizes[a].ValidDays = this.postData.Prizes[a].ValidDays - 0
868
             } else {
869
             } else {
869
               delete this.postData.Prizes[a].ValidDays
870
               delete this.postData.Prizes[a].ValidDays
870
             }
871
             }

+ 3
- 3
src/pages/system/marketingActivities/snapUpList/edit.vue 查看文件

1
 <template>
1
 <template>
2
   <div class="subPage flex-h">
2
   <div class="subPage flex-h">
3
     <div class="img">
3
     <div class="img">
4
-      <img v-if="templateList.length" :src="templateList[templateActiveIndex].ModelImgUrl" width="100%" alt="">
4
+      <img v-if="templateList.length" :src="templateList[templateActiveIndex].ModelLargeImgUrl" width="100%" alt="">
5
     </div>
5
     </div>
6
     <div class="flex-item">
6
     <div class="flex-item">
7
       <h1>基本信息</h1>
7
       <h1>基本信息</h1>
84
                 </div>
84
                 </div>
85
               </li>
85
               </li>
86
               <li class="flex-h">
86
               <li class="flex-h">
87
-                <span>活动说明:</span>
87
+                <span>活动说明:<em>*</em></span>
88
                 <div class="flex-item">
88
                 <div class="flex-item">
89
                   <div>
89
                   <div>
90
                     <quill-editor
90
                     <quill-editor
282
       if (this.postData.FlashBuyName === '') {
282
       if (this.postData.FlashBuyName === '') {
283
         this.$message({
283
         this.$message({
284
           type: 'error',
284
           type: 'error',
285
-          message: '活动名称不能为空'
285
+          message: '活动说明不能为空'
286
         })
286
         })
287
         return false
287
         return false
288
       }
288
       }