Revert "场景专区"

This reverts commit 14ee7fbe42f2c51b4af8a87c18790c053d5ffdaf.

src/views/service/package/detail.vue

@@ -3,21 +3,24 @@
     <el-form :model="form" :rules="rules" ref="form" label-width="100px">
       <el-form-item label="关联设备：">
         <el-select v-model="deviceIds" multiple placeholder="请选择关联设备">
-          <el-option v-for="item in devOptions" :key="item.value" :label="item.label" :value="item.value.toString()" />
+          <el-option v-for="item in devOptions" :key="item.value" :label="item.label"
+            :value="item.value.toString()" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="form.type == 13 ? '套餐名称：' : '流量名称：'">
+      <el-form-item :label="form.type == 13 ? '套餐名称：': '流量名称：'">
         <el-input v-model="form.name" placeholder="请输入套餐名称" />
       </el-form-item>
       <el-form-item label="服务类型：">
         <el-select v-model="form.businessType" placeholder="请选择服务类型"
           :disabled="form.id && form.type == 12 ? true : false">
-          <el-option v-for="item in serviceTypeOptions" :key="item.value" :value="item.value" :label="item.label" />
+          <el-option v-for="item in serviceTypeOptions" :key="item.value" :value="item.value"
+            :label="item.label" />
         </el-select>
       </el-form-item>
       <el-form-item v-if="form.type == 13" label="资源平台：">
         <el-select v-model="form.platformId" placeholder="请选择资源平台">
-          <el-option v-for="item in platformOptions" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option v-for="item in platformOptions" :key="item.value" :label="item.label"
+            :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item v-else label="流量套餐：">
@@ -25,11 +28,6 @@
           <el-option v-for="(item, index) in goodsOptions" :key="index" :label="item" :value="index" />
         </el-select>
       </el-form-item>
-      <el-form-item v-if="form.platformId === 3" label="栏目：">
-        <el-select placeholder="请选择爱听栏目">
-          <el-option v-for="item in sceneOptions" :key="item.id" :value="item.id" :label="item.name" />
-        </el-select>
-      </el-form-item>
       <el-form-item label="原价：" prop="price">
         <el-input-number v-model="form.price" :min="0" :max="500" :controls="false" :precision="2"
           placeholder="请输入原价" />
@@ -40,12 +38,14 @@
       </el-form-item>
       <el-form-item label="服务时长：">
         <el-select v-model="form.indate" placeholder="请选择服务时长">
-          <el-option v-for="item in serviceTimeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option v-for="item in serviceTimeOptions" :key="item.value" :label="item.label"
+            :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="是否推荐：">
         <el-select v-model="form.isRecommend" placeholder="请选择是否推荐">
-          <el-option v-for="item in recommendOptions" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option v-for="item in recommendOptions" :key="item.value" :label="item.label"
+            :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="排序：" v-if="form.businessType === 5">
@@ -62,7 +62,6 @@
 <script>
 import { devMixin, serviceTimeMixin, serviceTypeMixin } from '@/mixin/index'
 import { detail, edit, create, goodsList } from '@/api/service/package'
-import { list } from '@/api/operation/scene'
 export default {
   mixins: [devMixin, serviceTimeMixin, serviceTypeMixin],
   data() {
@@ -88,8 +87,6 @@ export default {
       form: {
         type: this.$route.query.type
       },
-      // 爱听栏目
-      sceneOptions: [],
       // 流量套餐
       goodsOptions: [],
       // 关联设备
@@ -98,12 +95,6 @@ export default {
       platformOptions: [{
         value: 1,
         label: 'QQ音乐'
-      }, {
-        value: 2,
-        label: '酷狗音乐'
-      }, {
-        value: 3,
-        label: '爱听音乐'
       }],
       // 是否推荐
       recommendOptions: [{
@@ -132,7 +123,14 @@ export default {
     }
   },
   mounted() {
-    this.form.type === 12 ? this.getGoodsList() : this.getSceneList()
+    if (this.form.type == 12) {
+      // 流量套餐
+      goodsList().then(res => {
+        if (res.code === 0) {
+          this.goodsOptions = res.data
+        }
+      })
+    }
     if (this.$route.query.id) {
       this.form.id = this.$route.query.id
       this.getList()
@@ -148,7 +146,6 @@ export default {
         }
       })
     },
-
     // 提交
     getSubmit() {
       this.$refs.form.validate((valid) => {
@@ -173,27 +170,10 @@ export default {
         }
       })
     },
-
     // 取消
     cancel() {
       let url = this.form.type == 13 ? 'musicPackage' : 'flowPackage'
       this.$tab.closeOpenPage(`/service/${url}?type=${this.form.type}`);
-    },
-
-    // 流量套餐
-    getGoodsList() {
-      goodsList().then(res => {
-        if (res.code === 0) {
-          this.goodsOptions = res.data
-        }
-      })
-    },
-
-    // 爱听栏目
-    getSceneList() {
-      list().then(res => {
-        this.sceneOptions = res.data
-      })
     }
   }
 }

src/views/service/package/index.vue

@@ -7,7 +7,8 @@
       </el-form-item>
       <el-form-item v-if="form.type == 13" label="资源平台：">
         <el-select v-model="form.platformId" placeholder="请选择资源平台" clearable>
-          <el-option v-for="item in platformOptions" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option v-for="item in platformOptions" :key="item.value" :label="item.label"
+            :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item v-else label="流量套餐：">
@@ -22,7 +23,8 @@
       </el-form-item>
       <el-form-item label="当前状态：">
         <el-select v-model="form.status" placeholder="请选择当前状态" clearable>
-          <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option v-for="item in statusOptions" :key="item.value" :label="item.label"
+            :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -33,7 +35,7 @@
       </el-form-item>
     </el-form>
     <!-- 列表 -->
-    <el-table :data="tableData" v-loading="loading" :default-sort="{ prop: 'sort' }">
+    <el-table :data="tableData" v-loading="loading" :default-sort="{prop: 'sort'}">
       <el-table-column label="排序" align="center" prop="sort" key="sort" :formatter="sortFormatter" />
       <el-table-column :label="form.type == 13 ? '套餐名称' : '流量套餐'" align="center" prop="name" key="name"
         show-overflow-tooltip />
@@ -47,7 +49,6 @@
         :formatter="timeFormatter" />
       <el-table-column v-if="form.type == 13" label="资源平台" align="center" prop="platformId" key="platformId"
         :formatter="platformFormatter" />
-      <el-table-column label="栏目" align="center" />
       <el-table-column label="当前状态" align="center" prop="status" key="status" :formatter="statusFormatter" />
       <el-table-column label="是否推荐" align="center" prop="isRecommend" key="isRecommend"
         :formatter="recommendFormatter" />
@@ -64,7 +65,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total > 0" :total="total" :page.sync="form.pageNum" :limit.sync="form.pageSize"
+    <pagination v-show="total>0" :total="total" :page.sync="form.pageNum" :limit.sync="form.pageSize"
       @pagination="getList" />
   </div>
 </template>
@@ -108,12 +109,6 @@ export default {
       platformOptions: [{
         value: 1,
         label: 'QQ音乐'
-      }, {
-        value: 2,
-        label: '酷狗音乐'
-      }, {
-        value: 3,
-        label: '爱听音乐'
       }],
       // 流量套餐
       goodsOptions: []