xcx

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

@@ -1,34 +1,36 @@
 <template>
   <div class="subPage">
-    <div class="title">
-      活动列表
+    <div class="system-table-search">
+      <div class="flex-h">
+        <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>
+      </div>
+      <div class="moreFilter"></div>
     </div>
-    <div class="head-div">
-      每页数量/条
-      <template>
-        <el-select v-model="postData.pageSize" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </template>
-    </div>
-    <!-- 包含 按钮的div -->
-    <div class="button-div">
-      <el-row>
-        <el-button type="warning" style="float: right;">重置</el-button>
-        <el-button type="primary" style="float: right; margin-right: 10px;" @click="clickList">查询</el-button>
-        <el-button type="success" style="float: right;" @click="redirection('addActivities')">新增</el-button>
-      </el-row>
-    </div>
-    <div class="content">
-      <template>
-        <el-table
+    <div class="system-table-box">
+      <el-table
           :data="tableData"
-          border
           style="width: 100%">
           <el-table-column
             prop="CaseName"
@@ -37,8 +39,7 @@
           </el-table-column>
           <el-table-column
             prop="ActivityName"
-            label="活动名称"
-            width="180">
+            label="活动名称">
           </el-table-column>
           <el-table-column
             prop="ActivityType"
@@ -70,29 +71,36 @@
           </el-table-column>
           <el-table-column
             prop="address"
-            label="操作">
+            label="操作"
+            width="200">
             <template slot-scope="scope">
-              <div v-if="scope.row.Status === 0">
-                <a href="#" @click="disable(scope.row.ActivityId)">停用</a>&nbsp;&nbsp;<a href="#" @click="delet(scope.row.ActivityId)">删除</a>
-              </div>
-              <div v-else>
-                <a href="#" @click="normal(scope.row.ActivityId)">启用</a>
-              </div>
+              <el-button
+                v-if="scope.row.Status === 0"
+                size="mini"
+                type="danger"
+                @click="delet(scope.row.ActivityId)">删除</el-button>
+              <el-button
+                v-if="scope.row.Status === 0"
+                size="mini"
+                type="warning"
+                @click="disable(scope.row.ActivityId)">停用</el-button>
+              <el-button
+                v-else
+                size="mini"
+                type="success"
+                @click="normal(scope.row.ActivityId)">启用</el-button>
             </template>
           </el-table-column>
         </el-table>
-      </template>
-    </div>
-    <div class="block">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page.sync="currentPage2"
-        :page-size="Number(value)"
-        layout="prev, pager, next, jumper"
-        :total="total">
-      </el-pagination>
     </div>
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page.sync="currentPage2"
+      :page-size="Number(value)"
+      layout="prev, pager, next, jumper"
+      :total="total">
+    </el-pagination>
   </div>
 </template>
 <script>

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

@@ -1,82 +1,72 @@
 <template>
   <div class="subPage">
-    <div class="content">
-      <div class="input-div">
-        <div style="float: left; font-size: 20px;">
-          活动名称:
-        </div>
-        <div style="float: left; margin-left: 30px;">
-          <template>
-            <el-input v-model="activityName" placeholder="请输入内容" style="width: 300px;"></el-input>
-          </template>
-        </div>
-      </div>
-      <div class="input-div">
-        <div style="float: left; font-size: 20px;">
-          活动类型:
-        </div>
-        <div style="float: left; margin-left: 30px;">
-          <template>
-            <el-select v-model="regValue" placeholder="请选择" style="width: 300px;">
-              <el-option
-                v-for="item in regOptions"
-                :key="item.regValue"
-                :label="item.label"
-                :value="item.regValue">
-              </el-option>
-            </el-select>
-          </template>
-        </div>
-      </div>
-      <div class="input-div">
-        <div style="float: left; font-size: 20px;">
-          赠券卡券:
-        </div>
-        <div style="float: left; margin-left: 30px;">
-          <template>
-            <el-select v-model="giftValue" placeholder="请选择" style="width: 300px;">
-              <el-option
-                v-for="item in giftOptions"
-                :key="item.giftValue"
-                :label="item.label"
-                :value="item.giftValue">
-              </el-option>
-            </el-select>
-          </template>
-        </div>
-      </div>
-      <div class="input-div">
-        <div style="float: left; font-size: 20px;">
-           赠券数量:
-        </div>
-        <div style="float: left; margin-left: 30px;">
-          <template>
-            <el-input v-model="giftNum" placeholder="请输入内容" style="width: 300px;"></el-input>
-          </template>
-        </div>
-      </div>
-      <div class="input-div">
-        <div style="float: left; font-size: 20px;">
-          活动描述:
-        </div>
-        <div style="float: left; margin-left: 30px;">
-          <template>
-            <el-input
-              type="textarea"
-              :rows="10"
-              placeholder="请输入内容"
-              v-model="desc" style="width: 300px; height: 200px;">
-            </el-input>
-          </template>
-        </div>
-      </div>
-      <div class="input-div">
-        <el-row>
-          <el-button type="warning" style="float: right;" @click="redirection('activitiesList')">返回</el-button>
-          <el-button type="primary" style="float: right; margin-right: 10px;" @click="submitData">提交</el-button>
-        </el-row>
-      </div>
-    </div>
+    <form class="mainForm">
+      <ul>
+        <li class="flex-h">
+          <span>活动名称：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-input v-model="activityName" placeholder="请输入内容"></el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>活动类型：</span>
+          <div class="flex-item">
+            <div>
+              <el-select v-model="regValue" placeholder="请选择">
+                <el-option
+                  v-for="item in regOptions"
+                  :key="item.regValue"
+                  :label="item.label"
+                  :value="item.regValue">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>赠券卡券：</span>
+          <div class="flex-item">
+            <div>
+              <el-select v-model="giftValue" placeholder="请选择">
+                <el-option
+                  v-for="item in giftOptions"
+                  :key="item.giftValue"
+                  :label="item.label"
+                  :value="item.giftValue">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>赠券数量：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-input v-model="giftNum" placeholder="请输入内容"></el-input>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>活动描述：</span>
+          <div class="flex-item">
+            <div>
+              <el-input
+                type="textarea"
+                :rows="10"
+                placeholder="请输入内容"
+                v-model="desc">
+              </el-input>
+            </div>
+          </div>
+        </li>
+        <li style="text-align:center">
+          <el-button type="warning" size="mini" @click="redirection('activitiesList')">返回</el-button>
+          <el-button type="primary" size="mini" @click="submitData">提交</el-button>
+        </li>
+      </ul>
+    </form>
   </div>
 </template>
 <script>
@@ -120,16 +110,13 @@ export default {
     giftData: {
       get () {
         let jsonData = this.$data.giftList
-        console.log('请求到的:' + this.$data.giftList)
         let data = []
         for (let i = 0; i < jsonData.length; i++) {
           let tempData = []
           tempData.giftValue = jsonData[i].CouponId
           tempData.label = jsonData[i].CouponName
-          console.log('卡券编号:' + tempData.giftValue + ' ' + tempData.label)
           data.push(tempData)
         }
-        console.log('giftData 数据:')
         return data
       }
     }
@@ -141,22 +128,6 @@ export default {
     submitData () { // 提交数据
       // 判断是否提交成功
       // 提交成功,跳转页面
-      // let subData = []
-      // subData.activityName = this.$data.activityName
-      // subData.activityType = this.$data.regValue
-      // let obj = []
-      // obj.giftValue = this.$data.giftValue
-      // obj.giftNum = this.$data.giftNum
-      // obj.desc = this.$data.desc
-      // subData.resourceDesc = obj
-
-      // console.log(subData)
-
-      // let obj = []
-      // obj.giftValue = this.$data.giftValue
-      // obj.giftNum = this.$data.giftNum
-      // obj.desc = this.$data.desc
-
       let tempGiftOptions = this.$data.giftOptions
       let tempGiftValue = this.$data.giftValue
       for (let i = 0; i < tempGiftOptions.length; i++) {
@@ -166,7 +137,6 @@ export default {
         }
       }
       let jsonString = '{"giftValue":"' + this.$data.giftValue + '","giftLabel":"' + this.$data.giftLabel + '","giftNum":"' + this.$data.giftNum + '","desc":"' + this.$data.desc + '"}'
-
       this.$ajax(this.$api.marketingActivities.addMarketing.url, {
         method: this.$api.marketingActivities.addMarketing.method,
         queryData: {activityName: this.$data.activityName, activityType: this.$data.regValue, resourceDesc: jsonString, CaseId: this.defaultCaseId}