xcx

src/pages/system/marketingActivities/activitiesList/index.vue

@@ -5,6 +5,23 @@
         <div class="flex-item flex-h">
           <el-button size="mini" type="success" @click="redirection('addActivities')">新增活动</el-button>
         </div>
+        <ul>
+          <li>
+            <el-select v-model="CaseId" placeholder="请选择案场">
+              <el-option
+                key=""
+                label="不限案场"
+                value="">
+              </el-option>
+              <el-option
+                v-for="item in cases"
+                :key="item.CaseId"
+                :label="item.CaseName"
+                :value="item.CaseId">
+              </el-option>
+            </el-select>
+          </li>
+        </ul>
         <el-button
           size="mini"
           type="primary" @click="clickList">搜索</el-button>
@@ -87,6 +104,7 @@
   </div>
 </template>
 <script>
+import { mapState } from 'vuex'
 export default {
   data () {
     return {
@@ -102,7 +120,8 @@ export default {
       }],
       value: '10', // 一页多少数据
       tableData: [],
-      postData: { // 表格搜索条件 //caseid: '', // 案场id
+      postData: { // 表格搜索条件
+        caseid: '', // 案场id
         page: 1, // 当前页码
         pageSize: 10, // 请求数据量
       },
@@ -110,6 +129,21 @@ export default {
       total: 0 // 数据条数
     }
   },
+  computed: {
+    ...mapState({
+      cases: x => x.app.cases.list,
+      defaultCaseId: x => x.app.cases.default,
+      clientUrl: x => x.app.clientUrl,
+    }),
+    CaseId: {
+      get () {
+        return this.postData.caseid || this.defaultCaseId
+      },
+      set (val) {
+        this.postData.caseid = val
+      }
+    }
+  },
   mounted () {
     this.getList()
   },

src/pages/system/marketingActivities/listOfLotteryActivities/edit.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="subPage flex-h">
-    <div class="flex-item" style="margin:20px;">
+    <div class="img">
+      <img v-if="templateList.length" :src="templateList[templateActiveIndex].TplImg" width="100%" alt="">
+    </div>
+    <div class="flex-item">
       <nav class="flex-h">
         <a class="flex-item" :class="{'active': activeIndex === 0}" @click="activeIndex = 0">基础信息</a>
         <a class="flex-item" :class="{'active': activeIndex === 1}" @click="activeIndex = 1">奖品信息</a>
@@ -290,7 +293,7 @@
                     :disabled="!editAll || isread"
                     size="mini"
                     type="success"
-                    @click="addPrizeItemPhone(scope.$index)">编辑</el-button>
+                    @click="addPrizeItemPhone(scope.$index)">内定设置</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -309,9 +312,6 @@
           @click="rebackList">取消</el-button>
       </div>
     </div>
-    <div class="img" style="margin-left:0px;margin-right:20px;">
-      <img v-if="templateList.length" :src="templateList[templateActiveIndex].TplImg" width="100%" alt="">
-    </div>
     <el-dialog
       :title="editPrizeOff ? '编辑奖品' : '新增奖品'"
       :visible.sync="centerDialogVisible"
@@ -347,7 +347,7 @@
               <span style="line-height:40px;font-size:11px;color:#ccc;">（选择“否”即为“谢谢参与”奖项）</span>
             </div>
           </li>
-          <li class="flex-h" style="width:50%;float:left;" v-if="addPrizeInfo.PrizeType === 'third' && addPrizeInfo.IsReality === 1">
+          <li class="flex-h" style="width:50%;float:left;" v-if="addPrizeInfo.PrizeType === 'third'">
             <span>奖品名称：<em>*</em></span>
             <div class="flex-item">
               <div style="width: 200px;">
@@ -848,11 +848,11 @@ export default {
       this.$router.push({ name: 'listOfLotteryActivities' })
     },
     submitLuckdrawData () { // 提交活动信息
+      if (!this.checkData()) {
+        return false
+      }
       if (this.submitOff) {
         this.submitOff = false
-        if (!this.checkData()) {
-          return false
-        }
         this.postData.ShareAddNum = this.postData.ShareAddNum - 0
         this.postData.LuckdrawNum = this.postData.LuckdrawNum - 0
         if (!this.postData.IsInternalDefault) {
@@ -865,6 +865,7 @@ export default {
             if (this.postData.Prizes[a].VerificationStart === '') {
               delete this.postData.Prizes[a].VerificationStart
               delete this.postData.Prizes[a].VerificationEnd
+              this.postData.Prizes[a].ValidDays = this.postData.Prizes[a].ValidDays - 0
             } else {
               delete this.postData.Prizes[a].ValidDays
             }

src/pages/system/marketingActivities/snapUpList/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="subPage flex-h">
     <div class="img">
-      <img v-if="templateList.length" :src="templateList[templateActiveIndex].ModelImgUrl" width="100%" alt="">
+      <img v-if="templateList.length" :src="templateList[templateActiveIndex].ModelLargeImgUrl" width="100%" alt="">
     </div>
     <div class="flex-item">
       <h1>基本信息</h1>
@@ -84,7 +84,7 @@
                 </div>
               </li>
               <li class="flex-h">
-                <span>活动说明：</span>
+                <span>活动说明：<em>*</em></span>
                 <div class="flex-item">
                   <div>
                     <quill-editor
@@ -282,7 +282,7 @@ export default {
       if (this.postData.FlashBuyName === '') {
         this.$message({
           type: 'error',
-          message: '活动名称不能为空'
+          message: '活动说明不能为空'
         })
         return false
       }