广告特征码必填 --> 非必填

boundle.sh

@@ -5,8 +5,8 @@ source /etc/profile
 npm install --prefer-offline --loglevel info --unsafe-perm=true --allow-root >> boundle.log
 echo 'copy node_modules to /data/publish/node_packages' >> boundle.log
 
-# npm run build:prod
+npm run build:prod
-npm run build:stage
+# npm run build:stage
 
 cd ./dist/ && tar -zcvf pop-sys.tar.gz ./
 cd ..

src/components/PicLib/index.vue

@@ -29,7 +29,7 @@
         </el-row>
         <el-row
             :gutter="24"
-            class="mgt-20 mgb-20"
+            class="mgt-20 mgb-20 pics-wrap"
         >
             <el-col :span="4">
                 <div class="img-box uploader-box">

src/router/ad.js

@@ -5,6 +5,8 @@ import Layout from '@/layout'
 const adRouter = {
   path: '/ad',
   component: Layout,
+  redirect: '/ad/list',
+  name: 'ad',
   meta: {
     title: '广告投放',
     icon: 'ad',
@@ -16,6 +18,15 @@ const adRouter = {
       name: 'adList',
       meta: {title: '广告管理'},
     },
+    {
+      path: 'edit',
+      component: () => import('@/views/ad/edit'), // Parent router-view
+      name: 'adEdit',
+      hidden: true,
+      meta: {
+        title: '广告编辑',
+      },
+    },
     {
       path: 'jump',
       component: () => import('@/views/ad/jump'), // Parent router-view
@@ -32,16 +43,6 @@ const adRouter = {
         title: 'AppID列表',
       },
     },
-
-    {
-      path: 'edit',
-      component: () => import('@/views/ad/edit'), // Parent router-view
-      name: 'adEdit',
-      hidden: true,
-      meta: {
-        title: '广告编辑',
-      },
-    },
   ],
 }
 

src/router/admin.js

@@ -5,10 +5,12 @@ import Layout from '@/layout'
 const adminRouter = {
   path: '/admin',
   component: Layout,
+  redirect: '/admin/user-list',
+  name: 'admin',
   meta: {
     title: '系统管理',
     icon: 'system',
-    // roles: ['admin'],
+    roles: ['admin']
   },
   children: [
     // {
@@ -25,6 +27,30 @@ const adminRouter = {
         title: '用户列表',
       },
     },
+    // {
+    //   path: 'ad-list',
+    //   component: () => import('@/views/admin/ad-list'), // Parent router-view
+    //   name: 'adminAdList',
+    //   meta: {
+    //     title: '广告列表',
+    //   },
+    // },
+    // {
+    //   path: 'jump',
+    //   component: () => import('@/views/admin/jump'), // Parent router-view
+    //   name: 'adminAdJump',
+    //   meta: {
+    //     title: '互跳管理',
+    //   },
+    // },
+    // {
+    //   path: 'game-list',
+    //   component: () => import('@/views/admin/game-list'), // Parent router-view
+    //   name: 'adminGameList',
+    //   meta: {
+    //     title: 'AppID列表',
+    //   },
+    // },
   ],
 }
 

src/router/index.js

@@ -42,7 +42,7 @@ import errRouter from './error'
 export const constantRoutes = [
   {
     path: '/',
-    redirect: '/ad/ad-list',
+    redirect: '/ad/list'
   },
   {
     path: '/login',
@@ -58,12 +58,10 @@ export const constantRoutes = [
   // dashboardRouter,
   adRouter,
   libRouter,
+  // comRouter,
+  // adminRouter,
   errRouter,
   userRouter,
-  adminRouter,
-  // comRouter,
-  // 404 page must be placed at the end !!!
-  {path: '*', redirect: '/404', hidden: true},
 ]
 
 /**
@@ -71,9 +69,9 @@ export const constantRoutes = [
  * the routes that need to be dynamically loaded based on user roles
  */
 export const asyncRoutes = [
-  // adminRouter,
+  adminRouter, 
-  // // 404 page must be placed at the end !!!
+  // 404 page must be placed at the end !!!
-  // {path: '*', redirect: '/404', hidden: true},
+  {path: '*', redirect: '/404', hidden: true},
 ]
 
 const createRouter = () =>

src/router/lib.js

@@ -5,6 +5,7 @@ import Layout from '@/layout'
 const libRouter = {
   path: '/lib',
   component: Layout,
+  name: 'lib',
   meta: {
     title: '资源库',
     icon: 'pic',

src/router/user.js

@@ -5,6 +5,7 @@ import Layout from '@/layout'
 const comRouter = {
   path: '/user',
   component: Layout,
+  redirect: 'user',
   children: [
     {
       path: '',

src/views/ad/edit.vue

@@ -80,6 +80,10 @@
           size="mini"
           @click="selectAllLocation"
         >选择所有位置</el-button>
+        <el-button
+          size="mini"
+          @click="deselectAllLocation"
+        >清空</el-button>
       </el-form-item>
       <el-form-item
         label="广告头像"
@@ -96,26 +100,24 @@
           :show-file-list="false"
           :before-upload="beforeUpload"
         >
-          <img
+          <span @click="openModal">
-            v-if="adForm.ad_image"
+            <img
-            :src="adForm.ad_image"
+              v-if="adForm.ad_image"
-            class="uploader-img"
+              :src="adForm.ad_image"
-          >
+              class="uploader-img"
-          <i
+            >
-            v-else
+            <i
-            class="el-icon-plus uploader-icon"
+              v-else
-          />
+              class="el-icon-plus uploader-icon"
+            />
+          </span>
+
         </el-upload>
+
         <span
           class="ipt-tip"
           style="margin-top: 6px;"
         >只能上传小于 600k 的图片</span>
-        <el-button
-          type="primary"
-          size="mini"
-          @click="openModal"
-          :disabled="!writeable"
-        >选择图片</el-button>
       </el-form-item>
       <el-form-item
         label="是否跳转"
@@ -208,6 +210,7 @@
           class="w100"
           :disabled="!writeable"
         />
+        <span class="ipt-tip">当前最高优先级：{{this.sortList[this.sortList.length-1]}}，最低优先级：{{this.sortList[0]}}</span>
       </el-form-item>
       <el-form-item
         label="广告标题"
@@ -378,6 +381,7 @@ export default {
       modeList: {},
       uploadUrl: `${process.env.VUE_APP_UPLOAD}`,
       targetList: [],
+      sortList: [],
       // form
       adForm: {
         name: '',
@@ -425,13 +429,13 @@ export default {
         ad_sort: [
           {type: 'number', message: '广告优先级必须是数值', trigger: 'blur'},
         ],
-        'ad_property.jump_param': [
+        // 'ad_property.jump_param': [
-          {
+        //   {
-            required: true,
+        //     required: true,
-            message: '请填写广告特征码（ad_channel）',
+        //     message: '请填写广告特征码（ad_channel）',
-            trigger: 'blur',
+        //     trigger: 'blur',
-          },
+        //   },
-        ],
+        // ],
         'ad_property.appid': [
           {required: true, validator: validateAppId, trigger: 'blur'},
         ],
@@ -719,6 +723,20 @@ export default {
         platform_id: this.adForm.channelid,
       })
       this.targetList = targetList.result
+
+      // 获取投放游戏的优先级列表
+      if (this.adForm.gameid) {
+        const adsRes = await this.getAd({
+          gameid: this.adForm.gameid,
+        })
+        const ads = adsRes.message || []
+        this.sortList = ads.map(item => {
+          return item.ad_sort
+        })
+        this.sortList.sort(function(a, b) {
+          return a - b
+        })
+      }
     },
     changeTarget(val) {
       this.adForm.ad_property.link = ''
@@ -788,6 +806,9 @@ export default {
       })
       this.adForm.locationid = locs
     },
+    deselectAllLocation() {
+      this.adForm.locationid = []
+    },
     // modal
     openModal() {
       this.modalVisible = true
@@ -815,5 +836,9 @@ export default {
 .scrollbar >>> .el-scrollbar__bar.is-horizontal {
   display: none;
 }
+
+.scrollbar >>> .pics-wrap {
+  padding: 0 4px;
+}
 </style>
 

src/views/ad/list.vue

@@ -297,7 +297,7 @@ import {Promise, reject} from 'q'
 import moment from 'moment'
 
 export default {
-  name: 'AdminAdList',
+  name: 'adList',
   data() {
     return {
       // common