From dd8e50744f6b29442abfe535f949b22fb89c1d20 Mon Sep 17 00:00:00 2001
From: yulixing <yulixing@kingsome.cn>
Date: Mon, 5 Aug 2019 15:09:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ad/edit.vue       | 14 +++++++++++--
 src/views/ad/list.vue       | 40 +++++++++++++++++++++++++++++++++++++
 src/views/admin/ad-list.vue | 14 +++++++++++--
 3 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/src/views/ad/edit.vue b/src/views/ad/edit.vue
index 8826cde..b10c053 100644
--- a/src/views/ad/edit.vue
+++ b/src/views/ad/edit.vue
@@ -209,8 +209,9 @@
         <el-button
           type="primary"
           @click="submit('adForm')"
+          v-if="writeable"
         >提交</el-button>
-        <el-button @click="resetForm('adForm')">重置</el-button>
+        <el-button @click="resetForm('adForm')" v-if="writeable">重置</el-button>
         <el-button @click="goBack">返回</el-button>
       </el-form-item>
     </el-form>
@@ -237,7 +238,7 @@ export default {
 
     return {
       //common
-      writeable: true,
+      writeable: false,
       companyid: 0,
       allGame: [],
       gameList: [],
@@ -295,6 +296,10 @@ export default {
     this.modeList = modeList
     this.typeList = typeList
 
+    
+
+
+
     const areaListRes = await this.getAdAreaList()
     areaListRes.adAreaList.map(item => {
       this.areaList[item.area_id] = item.name
@@ -349,6 +354,11 @@ export default {
       this.adForm.gameid = this.gameList[0] ? this.gameList[0].game_id : ''
       this.changeGame()
     }
+
+
+    // 判断该条广告是否可编辑： 新增、未通过
+
+    this.writeable = (this.adForm.status === 2 || !hasAd) ? true : false
   },
   methods: {
     // common
diff --git a/src/views/ad/list.vue b/src/views/ad/list.vue
index 6147e7e..8757475 100644
--- a/src/views/ad/list.vue
+++ b/src/views/ad/list.vue
@@ -36,6 +36,10 @@
               label="暂停"
               :value="3"
             />
+            <el-option
+              label="已删除"
+              :value="4"
+            />
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -151,6 +155,11 @@
               type="info"
               v-if="scope.row.status === 3"
             >暂停</el-tag>
+            <el-tag
+              type="info"
+              effect="plain"
+              v-if="scope.row.status === 4"
+            >已删除</el-tag>
           </template>
         </el-table-column>
         <el-table-column
@@ -167,6 +176,13 @@
             <el-button
               type="text"
               size="small"
+              @click.stop="stop(scope.row)"
+              v-if="scope.row.status === 1"
+            >暂停</el-button>
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.status !== 4"
               @click.stop="del(scope.row)"
             >删除</el-button>
           </template>
@@ -336,6 +352,7 @@ export default {
           })
       })
     },
+
     resetForm(formName) {
       this.$refs[formName].resetFields()
     },
@@ -436,6 +453,29 @@ export default {
           this.$message.info('操作已取消！')
         })
     },
+    stop(row) {
+      this.$confirm(`是否暂停广告：【${row.name}】?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(async () => {
+          const data = JSON.parse(JSON.stringify(row))
+          data.status = 3
+          data.begin_time = this.formDate(null, null, data.begin_time)
+          data.end_time = this.formDate(null, null, data.end_time)
+          try {
+            const result = await this.updateAd(data)
+            this.$message.success('状态修改成功!')
+            this.refreshData()
+          } catch (err) {
+            console.log(err)
+          }
+        })
+        .catch(() => {
+          this.$message.info('操作已取消！')
+        })
+    },
     // pagination
     sizeChange(val) {
       this.pageSize = val
diff --git a/src/views/admin/ad-list.vue b/src/views/admin/ad-list.vue
index 7786752..2e36890 100644
--- a/src/views/admin/ad-list.vue
+++ b/src/views/admin/ad-list.vue
@@ -35,6 +35,10 @@
             label="暂停"
             :value="3"
           />
+          <el-option
+            label="已删除"
+            :value="4"
+          />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -162,6 +166,11 @@
             type="info"
             v-if="scope.row.status === 3"
           >暂停</el-tag>
+          <el-tag
+            type="info"
+            effect="plain"
+            v-if="scope.row.status === 4"
+          >已删除</el-tag>
         </template>
       </el-table-column>
       <el-table-column
@@ -185,18 +194,19 @@
           <el-button
             type="text"
             size="small"
-            v-if="scope.row.status === 0 || scope.row.status === 3"
+            v-if="scope.row.status === 0"
             @click.stop="refuse(scope.row)"
           >拒绝</el-button>
           <el-button
             type="text"
             size="small"
             @click.stop="stop(scope.row)"
-            v-if="scope.row.status === 0 || scope.row.status === 1"
+            v-if="scope.row.status === 1"
           >暂停</el-button>
           <el-button
             type="text"
             size="small"
+            v-if="scope.row.status !== 4"
             @click.stop="del(scope.row)"
           >删除</el-button>
         </template>