src/api/service/package.js

@@ -69,6 +69,7 @@ export function newGoodsList(type, businessType) {
 // 查询设备下对应的赠送的商品列表
 export function deviceGoodsList(type, businessType, deviceIds) {
   // /?deviceIds=${deviceIds}&businessType=${businessType}&type=${type}
+  console.log("获取请求链接=00=");
   return request({
     url: `/admin/goods/listByDevice`,
     method: 'post',
@@ -78,4 +79,4 @@ export function deviceGoodsList(type, businessType, deviceIds) {
       "businessType": businessType,
     }
   })
-}
+}

src/utils/request.js

@@ -71,6 +71,8 @@ service.interceptors.request.use(config => {
         interval = 2000;
       } else if (config.url === "/admin/program/list") {
         interval = 0;
+      } else if (config.url === "/admin/goods/listByDevice") {
+        interval = 0;
       } else {
         interval = 500;
       }

src/views/content/article/detail.vue

@@ -426,7 +426,7 @@ import { detail, submit } from "@/api/content/article";
 import { list } from "@/api/operation/channel";
 import { disabledMixin, isFreeMixin, platformMixin } from "@/mixin/index";
 export default {
-  name: "contentArticleDetail",
+  // name: "contentArticleDetail",
   mixins: [platformMixin, isFreeMixin, disabledMixin],
   data() {
     return {

src/views/content/video/detail.vue

@@ -33,7 +33,7 @@
 <script>
 import { detail, submit } from "@/api/content/video";
 export default {
-  name: "videoDetail",
+  // name: "videoDetail",
   data() {
     return {
       form: {

src/views/device/article/detail.vue

@@ -59,7 +59,7 @@ import { create, detail, edit } from "@/api/device/article";
 import Editor from "@/components/Editor/index";
 import { devMixin, disabledMixin } from "@/mixin/index";
 export default {
-  name: "deviceArticleDetail",
+  // name: "deviceArticleDetail",
   mixins: [devMixin, disabledMixin],
   components: {
     Editor,

src/views/device/class/detail.vue

@@ -254,7 +254,7 @@ devTypeMixin,
 yesOrNoMixin,
 } from "@/mixin/index";
 export default {
-  name: "deviceClassDetail",
+  // name: "deviceClassDetail",
   mixins: [
     devModeMixin,
     yesOrNoMixin,

src/views/device/list/detail.vue

@@ -77,7 +77,7 @@
         <el-table :data="contentVipPlatformList" border style="width: min-content">
           <el-table-column prop="platformId" label="资源平台" width="180">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.platformId" placeholder="请选择流量平台" clearable
+              <el-select v-model="scope.row.platformId" placeholder="请选择流量平台"
                 @change="handlePlatformChange(scope.row, scope.$index)">
                 <el-option v-for="item in platformOptions" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
@@ -85,7 +85,7 @@
           </el-table-column>
           <el-table-column prop="contentVip" label="设备会员收费时间" width="180">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.contentVip" placeholder="默认关闭" clearable>
+              <el-select v-model="scope.row.contentVip" placeholder="默认关闭">
                 <el-option v-for="item in contentVipOptions" :key="item.value" :label="item.label"
                   :value="item.value" />
               </el-select>
@@ -204,15 +204,15 @@
 <script>
 import { create, detail, edit } from "@/api/device/list";
 import {
-  devCategoryMixin,
-  devFucMixin,
-  devModeMixin,
-  devTypeMixin,
-  yesOrNoMixin,
+devCategoryMixin,
+devFucMixin,
+devModeMixin,
+devTypeMixin,
+yesOrNoMixin,
 } from "@/mixin/index";
 
 export default {
-  name: "deviceListDetail",
+  // name: "deviceListDetail",
   mixins: [
     devModeMixin,
     devTypeMixin,

src/views/device/version/detail.vue

@@ -126,7 +126,7 @@
 import { getDetailInfo, getVersionAdd, updateEdit } from "@/api/device/version";
 import { devMixin, devModeMixin } from "@/mixin/index";
 export default {
-  name: "deviceVersionDetail",
+  // name: "deviceVersionDetail",
   mixins: [devMixin, devModeMixin],
   data() {
     return {

src/views/goods/list/detail.vue

@@ -41,7 +41,7 @@
 import { create, detail, edit } from '@/api/goods/list'
 import { locMixin } from './mixin'
 export default {
-  name:"goodsListDetail",
+  // name:"goodsListDetail",
   mixins: [locMixin],
   data() {
     return {

src/views/music/album/detail.vue

@@ -138,13 +138,13 @@ import { list } from "@/api/music/list";
 import { detail, submit } from "@/api/music/menu";
 import Audio from "@/components/Audio/index.vue";
 import {
-  albumTypeMixin,
-  onOrOffMixin,
-  payTypeMixin,
-  platformMixin,
+albumTypeMixin,
+onOrOffMixin,
+payTypeMixin,
+platformMixin,
 } from "@/mixin/index";
 export default {
-  name: "musicAlbumDetail",
+  // name: "musicAlbumDetail",
   mixins: [platformMixin, onOrOffMixin, payTypeMixin, albumTypeMixin],
   components: {
     Audio,

src/views/music/anchor/detail.vue

@@ -29,7 +29,7 @@
 import { detail, submit } from '@/api/music/anchor'
 import { platformMixin } from '@/mixin/index'
 export default {
-  name:"musicAnchorDetail",
+  // name:"musicAnchorDetail",
   mixins: [platformMixin],
   data() {
     return {

src/views/music/blog/detail.vue

@@ -155,14 +155,14 @@
 import { selectAnchor } from "@/api/music/anchor";
 import { checkList, detail, relieve, submit } from "@/api/music/blog";
 import {
-  blogClassMixin,
-  isFreeMixin,
-  onOrOffMixin,
-  payTypeMixin,
-  platformMixin,
+blogClassMixin,
+isFreeMixin,
+onOrOffMixin,
+payTypeMixin,
+platformMixin,
 } from "@/mixin/index";
 export default {
-  name: "musicBlogDetail",
+  // name: "musicBlogDetail",
   mixins: [
     blogClassMixin,
     platformMixin,

src/views/music/choiceness/detail.vue

@@ -253,7 +253,7 @@ import { detail, list, submit } from "@/api/music/choiceness";
 import { addressMixin, contentMixin, onOrOffMixin } from "@/mixin/index";
 import { dialogCallBack } from "@/utils/DialogUtil";
 export default {
-  name:"musicChoicenessDetail",
+  // name:"musicChoicenessDetail",
   mixins: [addressMixin, contentMixin, onOrOffMixin],
   data() {
     return {

src/views/music/list/detail.vue

@@ -89,7 +89,7 @@ import { detail, submit } from "@/api/music/list";
 import { selectSinger } from "@/api/music/singer";
 import { languageMixin, platformMixin } from "@/mixin/index";
 export default {
-  name:"musicListDetail",
+  // name:"musicListDetail",
   mixins: [platformMixin, languageMixin],
   data() {
     return {

src/views/music/menu/detail.vue

@@ -263,7 +263,7 @@ import { detail, submit } from "@/api/music/menu";
 import Audio from "@/components/Audio/index.vue";
 import { onOrOffMixin, payTypeMixin, platformMixin } from "@/mixin/index";
 export default {
-  name:"musicMenuDetail",
+  // name:"musicMenuDetail",
   mixins: [platformMixin, onOrOffMixin, payTypeMixin],
   components: {
     Audio,

src/views/music/program/detail.vue

@@ -59,7 +59,7 @@ import { detail, submit } from '@/api/music/program';
 import Dialog from '@/components/Dialog';
 import { isFreeMixin, platformMixin } from '@/mixin/index';
 export default {
-  name:"musicProgramDetail",
+  // name:"musicProgramDetail",
   mixins: [platformMixin, isFreeMixin],
   components: { Dialog },
   data() {

src/views/music/radio/detail.vue

@@ -51,7 +51,7 @@
 import { detail, submit } from '@/api/music/radio';
 import { addressMixin, contentMixin, mapMixin, platformMixin } from '@/mixin/index';
 export default {
-  name:"musicRadioDetail",
+  // name:"musicRadioDetail",
   mixins: [platformMixin, addressMixin, mapMixin, contentMixin],
   data() {
     return {

src/views/music/singer/detail.vue

@@ -40,7 +40,7 @@
 import { detail, submit } from '@/api/music/singer'
 import { platformMixin, regionMixin, sexMixin } from '@/mixin/index'
 export default {
-  name:"musicSingerDetail",
+  // name:"musicSingerDetail",
   mixins: [sexMixin, regionMixin, platformMixin],
   data() {
     return {

src/views/operation/activity/detail.vue

@@ -175,7 +175,7 @@
 import { detail, goodList, submit } from "@/api/operation/activity";
 import { devMixin, serviceTimeMixin } from "@/mixin/index";
 export default {
-  name:"operationActivityDetail",
+  // name:"operationActivityDetail",
   mixins: [serviceTimeMixin, devMixin],
 
   data() {

src/views/operation/agreement/detail.vue

@@ -21,10 +21,10 @@
 </template>
 
 <script>
+import { detail, submit } from '@/api/operation/agreement';
 import Editor from "@/components/Editor/index";
-import { submit, detail } from '@/api/operation/agreement'
 export default {
-  name:"operationAgreementDetail",
+  // name:"operationAgreementDetail",
   components: {
     Editor
   },

src/views/operation/channel/detail.vue

@@ -187,7 +187,7 @@ import { channelDetail, edit } from "@/api/operation/channel";
 import Dialog from "@/components/Dialog/index.vue";
 import { disabledMixin, isFreeMixin, platformMixin } from "@/mixin/index";
 export default {
-  name: "operationChannelDetail",
+  // name: "operationChannelDetail",
   mixins: [platformMixin, isFreeMixin, disabledMixin],
   components: {
     Dialog,

src/views/operation/channels/detail.vue

@@ -183,7 +183,7 @@ import { channelDetail, channeledit } from "@/api/operation/channels";
 import Dialog from "@/components/Dialog/index.vue";
 import { disabledMixin, isFreeMixin, platformMixin } from "@/mixin/index";
 export default {
-  name: "operationChannelsDetail",
+  // name: "operationChannelsDetail",
   mixins: [platformMixin, isFreeMixin, disabledMixin],
   components: {
     Dialog,

src/views/operation/explain/detail.vue

@@ -82,7 +82,7 @@ import { devCategoryMixin, devTypeMixin } from "@/mixin/index";
 import VueQr from "vue-qr";
 
 export default {
-  name:"operationExplainDetail",
+  // name:"operationExplainDetail",
   components: {
     VueQr,
   },

src/views/operation/feedbacklist/detail.vue

@@ -33,7 +33,7 @@
 <script>
 import { detail, submit } from '@/api/operation/feedbacklist'
 export default {
-  name:"operationFeedbacklistDetail",
+  // name:"operationFeedbacklistDetail",
   data() {
     return {
       // 表单

src/views/operation/map/detail.vue

@@ -58,7 +58,7 @@
 import { detail, submit } from "@/api/operation/map";
 import { mapMixin } from "@/mixin/index";
 export default {
-  name:"operationMapDetail",
+  // name:"operationMapDetail",
   mixins: [mapMixin],
   data() {
     return {

src/views/operation/recommend/detail.vue

@@ -349,21 +349,21 @@
 
 <script>
 import {
-  detail,
-  moduleList,
-  radioList,
-  submitThree,
+detail,
+moduleList,
+radioList,
+submitThree,
 } from "@/api/operation/recommend";
 import { list } from "@/api/operation/scene";
 import {
-  audioMixin,
-  coverMixin,
-  disabledMixin,
-  isFreeMixin,
-  platformMixin,
+audioMixin,
+coverMixin,
+disabledMixin,
+isFreeMixin,
+platformMixin,
 } from "@/mixin/index";
 export default {
-  name:"operationRecommendDetail",
+  // name:"operationRecommendDetail",
   mixins: [coverMixin, audioMixin, platformMixin, isFreeMixin, disabledMixin],
   data() {
     return {

src/views/operation/recommend/index.vue

@@ -232,6 +232,7 @@
           align="center"
           show-overflow-tooltip
         />
+
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" @click="getDetail(scope.row, true)"
@@ -264,7 +265,7 @@ typeList,
 } from "@/api/operation/recommend";
 import { dialogCallBack } from "@/utils/DialogUtil";
 export default {
-  name:"OperationRecommend",
+  name: "OperationRecommend",
   data() {
     return {
       // 遮罩层
@@ -426,6 +427,7 @@ export default {
 
     // 详情页
     getDetail(row, boolean) {
+      this.dialogVisible_list = false;
       this.$router.push({
         path: `/operation/homePage/recommend/detail`,
         query:

src/views/operation/scene/detail.vue

@@ -71,10 +71,10 @@
 </template>
 
 <script>
-import { detail, edit, detailList, change, menuDetail, editMenu } from '@/api/operation/scene'
+import { change, detail, detailList, edit, editMenu, menuDetail } from '@/api/operation/scene'
 import { disabledMixin } from '@/mixin/index'
 export default {
-  name:"operationSceneDetail",
+  // name:"operationSceneDetail",
   mixins: [disabledMixin],
   data() {
     return {

src/views/operation/startPage/detail.vue

@@ -39,9 +39,9 @@
 </template>
 
 <script>
-import { submit, detail, edit, checked } from '@/api/operation/startPage'
+import { checked, detail, edit, submit } from '@/api/operation/startPage'
 export default {
-  name:"operationStartPageDetail",
+  // name:"operationStartPageDetail",
   data() {
     return {
       // 表单

src/views/operation/tag/detail.vue

@@ -72,7 +72,7 @@ import { detail, submitThree } from '@/api/operation/tag';
 import Dialog from '@/components/Dialog/index.vue';
 import { audioMixin, disabledMixin, isFreeMixin, platformMixin } from '@/mixin/index';
 export default {
-  name:"operationTagDetail",
+  // name:"operationTagDetail",
   components: {
     Dialog
   },

src/views/operation/waken/detail.vue

@@ -247,7 +247,7 @@ import { list } from "@/api/operation/channel";
 import { detail, devices, submit } from "@/api/operation/waken";
 import { disabledMixin, isFreeMixin, platformMixin } from "@/mixin/index";
 export default {
-  name:"operationWakenDetail",
+  // name:"operationWakenDetail",
   mixins: [platformMixin, isFreeMixin, disabledMixin],
   data() {
     return {

src/views/operation/wxbanner/detail.vue

@@ -34,10 +34,10 @@
 </template>
 
 <script>
-import { detail, add, edit } from "@/api/operation/wxbanner";
+import { add, detail, edit } from "@/api/operation/wxbanner";
 import { mapMixin } from "@/mixin/index";
 export default {
-    name:"operationWXBannerDetail",
+    // name:"operationWXBannerDetail",
     mixins: [mapMixin],
     data() {
         return {

src/views/project/list/detail.vue

@@ -113,10 +113,10 @@
 </template>
 
 <script>
-import { add, edit, update, appEdit, updateAdd, updatePage, historyPage, shelves } from "@/api/project/list";
+import { add, appEdit, edit, historyPage, shelves, update, updateAdd, updatePage } from "@/api/project/list";
 import Editor from "@/components/Editor";
 export default {
-  name:"projectListDetail",
+  // name:"projectListDetail",
   components: {
     Editor,
   },

src/views/push/dialog/detail.vue

@@ -57,9 +57,9 @@
 </template>
 
 <script>
-import { submit, detail } from '@/api/push/dialog'
+import { detail, submit } from '@/api/push/dialog'
 export default {
-  name:"pushDialogDetail",
+  // name:"pushDialogDetail",
   data() {
     return {
       // 表单

src/views/push/update/detail.vue

@@ -44,7 +44,7 @@
 import { detail, submit } from '@/api/push/update'
 import { systemMixin } from '@/mixin'
 export default {
-  name:"pushUpdateDetail",
+  // name:"pushUpdateDetail",
   mixins: [systemMixin],
   data() {
     var checkVersion = (rule, value, callback) => {

src/views/registration/content/detail.vue

@@ -82,9 +82,9 @@
 <script>
 import { radioList } from '@/api/operation/recommend'
 import { create, detail, edit } from '@/api/registration/content'
-import { platformMixin, audioMixin, isFreeMixin, coverMixin } from '@/mixin/index'
+import { audioMixin, coverMixin, isFreeMixin, platformMixin } from '@/mixin/index'
 export default {
-  name:"registrationContentDetail",
+  // name:"registrationContentDetail",
   mixins: [platformMixin, audioMixin, isFreeMixin, coverMixin],
   data() {
     return {

src/views/registration/exchange/detail.vue

@@ -37,7 +37,7 @@
 <script>
 import { create, detail, edit, mealList } from '@/api/registration/exchange'
 export default {
-  name:"registrationExchangeDetail",
+  // name:"registrationExchangeDetail",
   data() {
     return {
       // 表单

src/views/registration/lottery/detail.vue

@@ -73,9 +73,9 @@
 </template>
 
 <script>
-import { detail, create, checkTime, edit } from '@/api/registration/lottery'
+import { checkTime, create, detail, edit } from '@/api/registration/lottery'
 export default {
-  name:"registrationLotteryDetail",
+  // name:"registrationLotteryDetail",
   data() {
     return {
       // 表单

src/views/service/flow/detail.vue

@@ -77,7 +77,7 @@ import { list } from '@/api/operation/scene'
 import { create, detail, deviceGoodsList, edit, goodsList } from '@/api/service/package'
 import { devMixin, serviceTimeMixin, serviceTypeMixin } from '@/mixin/index'
 export default {
-  name:"serviceFlowDetail",
+  // name:"serviceFlowDetail",
   mixins: [devMixin, serviceTimeMixin, serviceTypeMixin],
   data() {
     let checkedPrice = (rule, value, callback) => {

src/views/service/music/detail.vue

@@ -84,7 +84,7 @@ import {
 } from "@/api/service/package";
 import { devMixin, serviceTimeMixin, serviceTypeMixin } from "@/mixin/index";
 export default {
-  name: "serviceMusicDetail",
+  // name: "serviceMusicDetail",
   mixins: [devMixin, serviceTimeMixin, serviceTypeMixin],
   data() {
     let checkedPrice = (rule, value, callback) => {

src/views/service/vip/detail.vue

@@ -73,11 +73,12 @@
 <script>
 import { devMixin, serviceTimeMixin, serviceTypeMixin } from '@/mixin/index'
 // import { list } from '@/api/operation/scene'
-import { detail, edit, create, goodsList, deviceGoodsList } from '@/api/service/package'
+import { create, detail, deviceGoodsList, edit } from '@/api/service/package'
 export default {
-  name: "serviceVipDetail",
+  // name:"serviceVipDetail",
   mixins: [devMixin, serviceTimeMixin, serviceTypeMixin],
   data() {
+    
     let checkedPrice = (rule, value, callback) => {
       if (Number(value) > 500) {
         callback(new Error('原价不得超过500'))
@@ -320,7 +321,7 @@ export default {
     cancel() {
       // let url = this.typeList[0] === '13' ? 'musicPackage' : 'flowPackage'
       // this.$tab.closeOpenPage(`/flowpackage/${url}?typeList=${this.typeList}`);
-      this.$tab.closeOpenPage(`/service/vipPackage?typeList=${this.typeList}`);
+      this.$tab.closeOpenPage(`/service/serviceVip?typeList=${this.typeList}`);
     },
 
     // 禁止修改
@@ -335,4 +336,4 @@ export default {
 .el-form {
   width: 500px;
 }
-</style>
+</style>

src/views/service/vip/index.vue

@@ -72,7 +72,7 @@
 
 <script>
 // import { list as sceneList } from "@/api/operation/scene";
-import { goodsList, list, remove, shelve, deviceGoodsList, newGoodsList } from "@/api/service/package";
+import { goodsList, list, newGoodsList, remove, shelve } from "@/api/service/package";
 import { devMixin, serviceTimeMixin } from "@/mixin/index";
 import { dialogCallBack } from "@/utils/DialogUtil";
 export default {
@@ -211,7 +211,7 @@ export default {
           typeList: this.form.typeList.join(","),
         },
       });
-      this.$route.meta.activeMenu = "/service/vipPackage";
+      this.$route.meta.activeMenu = "/service/serviceVip";
     },
 
     // 删除

src/views/system/dict/data.vue

@@ -195,7 +195,7 @@ import { addData, delData, getData, listData, updateData } from "@/api/system/di
 import { getType, listType } from "@/api/system/dict/type";
 
 export default {
-  name: "systemDictData",
+  // name: "systemDictData",
   dicts: ['sys_normal_disable'],
   data() {
     return {