From 5397eb8c56857f2a0505863252bedf5d792fd2fd Mon Sep 17 00:00:00 2001
From: yulixing <yulixing@kingsome.cn>
Date: Thu, 19 Sep 2019 12:03:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB=E8=A7=84=E5=88=99=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/modules/games.js                |  8 ++++----
 src/views/games/details/{ => ad}/adPos.vue |  0
 src/views/games/details/{ => ad}/adUid.vue |  0
 src/views/games/details/index.vue          |  6 +++---
 src/views/games/details/share/edit.vue     | 13 +++++++++++++
 5 files changed, 20 insertions(+), 7 deletions(-)
 rename src/views/games/details/{ => ad}/adPos.vue (100%)
 rename src/views/games/details/{ => ad}/adUid.vue (100%)

diff --git a/src/router/modules/games.js b/src/router/modules/games.js
index 364eeca..ea30a97 100644
--- a/src/router/modules/games.js
+++ b/src/router/modules/games.js
@@ -138,14 +138,14 @@ const gamesRouter = {
           meta: {title: '客服奖励'},
         },
         {
-          path: 'ad-pos',
-          component: () => import('@/views/games/details/adPos'),
+          path: 'ad/ad-pos',
+          component: () => import('@/views/games/details/ad/adPos'),
           name: 'GameDetailsAdPos',
           meta: {title: '广告位'},
         },
         {
-          path: 'ad-uid',
-          component: () => import('@/views/games/details/adUid'),
+          path: 'ad/ad-uid',
+          component: () => import('@/views/games/details/ad/adUid'),
           name: 'GameDetailsAdUid',
           meta: {title: '广告码'},
         },
diff --git a/src/views/games/details/adPos.vue b/src/views/games/details/ad/adPos.vue
similarity index 100%
rename from src/views/games/details/adPos.vue
rename to src/views/games/details/ad/adPos.vue
diff --git a/src/views/games/details/adUid.vue b/src/views/games/details/ad/adUid.vue
similarity index 100%
rename from src/views/games/details/adUid.vue
rename to src/views/games/details/ad/adUid.vue
diff --git a/src/views/games/details/index.vue b/src/views/games/details/index.vue
index 68cde34..c15aeb3 100644
--- a/src/views/games/details/index.vue
+++ b/src/views/games/details/index.vue
@@ -37,11 +37,11 @@
 
       <el-submenu
         v-if="uid !== 'new'"
-        :index="`/games/details/${uid}/ad-pos`"
+        :index="`/games/details/${uid}/ad/ad-pos`"
       >
         <template slot="title">广告</template>
-        <el-menu-item :index="`/games/details/${uid}/ad-pos`">广告位</el-menu-item>
-        <el-menu-item :index="`/games/details/${uid}/ad-uid`">广告码</el-menu-item>
+        <el-menu-item :index="`/games/details/${uid}/ad/ad-pos`">广告位</el-menu-item>
+        <el-menu-item :index="`/games/details/${uid}/ad/ad-uid`">广告码</el-menu-item>
       </el-submenu>
       <el-menu-item
         v-if="uid !== 'new'"
diff --git a/src/views/games/details/share/edit.vue b/src/views/games/details/share/edit.vue
index 7d672f8..e1d8b28 100644
--- a/src/views/games/details/share/edit.vue
+++ b/src/views/games/details/share/edit.vue
@@ -127,9 +127,18 @@
           <el-radio :label="2">只分享</el-radio>
           <el-radio :label="3">只广告</el-radio>
           <el-radio :label="4">关闭</el-radio>
+          <el-radio :label="5">自定义</el-radio>
         </el-radio-group>
       </el-form-item>
       <div v-if="!onlyAd">
+        <el-form-item
+          label="分享规则"
+          prop="ad_cd.reg"
+          v-if="shareForm.type === 5"
+        >
+          <el-input v-model="shareForm.ad_cd.reg" />
+          <span class="ipt-tip">分享与广告交替规则，如分享2次后广告5次，填写: S-2,A-5</span>
+        </el-form-item>
         <el-form-item
           label="分享次数"
           prop="share_count"
@@ -528,6 +537,7 @@ export default {
         ad_count: 0,
         ad_cd: {
           iscapture: false,
+          reg: ''
         },
         type: 0,
         game_id: '',
@@ -570,6 +580,7 @@ export default {
           {required: true, message: '请至少添加一个分享组', trigger: 'blur'},
         ],
         sex: [{required: true, message: '请选择性别', trigger: 'blur'}],
+        'ad_cd.reg': [{required: true, message: '请填写分享规则', trigger: 'blur'}]
       },
       imageUrl: '',
       // modal - shareType
@@ -721,6 +732,7 @@ export default {
             if (typeof this.shareForm.ad_cd !== 'object') {
               this.shareForm.ad_cd = {
                 iscapture: false,
+                reg: ''
               }
             }
 
@@ -862,6 +874,7 @@ export default {
         this.shareForm.share_image = ''
         this.shareForm.ad_cd = {
           iscapture: false,
+          reg: ''
         }
       }
     },