diff --git a/src/views/games/details/share/edit.vue b/src/views/games/details/share/edit.vue
index e11d229..1a49a81 100644
--- a/src/views/games/details/share/edit.vue
+++ b/src/views/games/details/share/edit.vue
@@ -3,7 +3,7 @@
@@ -30,6 +30,7 @@
+ 不指定地域
-
+
分享优先
广告优先
+ 只分享
+ 只广告
@@ -86,17 +89,20 @@
添加分享语
-
-
-
-
-
- 广告首先的情况下, 最多播放广告n次后, 将切换成分享, 暂时无用。
-
-
-
- 点击广告的间隔时间, 暂时无用。
-
+
+
+
+
+
+
+ 广告首先的情况下, 最多播放广告n次后, 将切换成分享, 暂时无用。
+
+
+
+ 点击广告的间隔时间, 暂时无用。
+
+
+
@@ -108,7 +114,7 @@
-
+
新增
-
+
新增
@@ -280,6 +288,7 @@ export default {
regions: [],
areas: [],
token: '',
+ onlyShare: false,
// main
shareForm: {
default_share: false,
@@ -298,7 +307,7 @@ export default {
comment: '',
ad_id: ''
},
- rules: {
+ shareFormRules: {
default_share: [
{ required: true, message: '请选择是否默认分享', trigger: 'blur' }
],
@@ -307,13 +316,28 @@ export default {
{ type: 'number', message: '请输入数字', trigger: 'blur' }
],
ad_count: [
- { required: true, message: '请输入广告次数', trigger: 'blur' },
+ {
+ required: !this.onlyShare,
+ message: this.onlyShare ? '' : '请输入广告次数',
+ trigger: 'blur'
+ },
{ type: 'number', message: '请输入数字', trigger: 'blur' }
],
ad_cd: [
- { required: true, message: '请输入广告播放间隔', trigger: 'blur' },
+ {
+ required: !this.onlyShare,
+ message: this.onlyShare ? '' : '请输入广告播放间隔',
+ trigger: 'blur'
+ },
{ type: 'number', message: '请输入数字', trigger: 'blur' }
],
+ ad_id: [
+ {
+ required: !this.onlyShare,
+ message: this.onlyShare ? '' : '请输入广告ID',
+ trigger: 'blur'
+ }
+ ],
type: [{ required: true, message: '请选择类型', trigger: 'blur' }],
share_type: [
{ required: true, message: '请选择分享类型', trigger: 'blur' }
@@ -321,9 +345,7 @@ export default {
share_word: [
{ required: true, message: '请至少添加一个分享组', trigger: 'blur' }
],
- sex: [{ required: true, message: '请选择性别', trigger: 'blur' }],
- area: [{ required: true, message: '请输入地域', trigger: 'blur' }],
- ad_id: [{ required: true, message: '请输入广告ID', trigger: 'blur' }]
+ sex: [{ required: true, message: '请选择性别', trigger: 'blur' }]
},
imageUrl: '',
// modal - shareType
@@ -454,12 +476,16 @@ export default {
share_image: this.shareForm.share_images[i]
})
}
+ if (this.shareForm.type === 2) this.onlyShare = true
}
})
.catch(err => {
console.log(err)
})
},
+ changeType(val) {
+ val === 2 ? (this.onlyShare = true) : (this.onlyShare = false)
+ },
submitForm(formName) {
if (this.shareGroups.length > 0) {
this.shareForm.share_word = this.shareGroups[0].share_word
diff --git a/src/views/games/details/share/index.vue b/src/views/games/details/share/index.vue
index 8ba43f6..676882d 100644
--- a/src/views/games/details/share/index.vue
+++ b/src/views/games/details/share/index.vue
@@ -14,8 +14,10 @@
-
-
+
+
+
+
@@ -66,7 +68,13 @@
sortable
:formatter="formatDefault"
/>
-
+
@@ -138,12 +146,12 @@ export default {
}
this.permEdit =
this.userInfo.permissions.includes(`${this.uid}-edit`) ||
- this.userInfo.permissions.includes(`${this.uid}-publish`)||
+ this.userInfo.permissions.includes(`${this.uid}-publish`) ||
this.userInfo.permissions.includes(`games-writeable`)
this.permView =
this.userInfo.permissions.includes(`${this.uid}-readable`) ||
this.userInfo.permissions.includes(`${this.uid}-edit`) ||
- this.userInfo.permissions.includes(`${this.uid}-publish`)||
+ this.userInfo.permissions.includes(`${this.uid}-publish`) ||
this.userInfo.permissions.includes(`games-writeable`)
},
methods: {
@@ -253,7 +261,15 @@ export default {
return cellValue ? '是' : '否'
},
formatType(row, column, cellValue, index) {
- return cellValue === 0 ? '分享图' : '广告'
+ if (cellValue === 0) {
+ return '分享优先'
+ } else if (cellValue === 1) {
+ return '广告优先'
+ } else if (cellValue === 2) {
+ return '只分享'
+ } else if (cellValue === 3) {
+ return '只广告'
+ }
},
formatSex(row, column, cellValue, index) {
if (cellValue === '0') {
@@ -264,6 +280,9 @@ export default {
return '女'
}
},
+ formatArea(row, column, cellValue, index) {
+ return cellValue ? cellValue : '不指定'
+ },
delShare(row) {
this.$confirm('是否删除该分享图?', '提示', {
confirmButtonText: '确定',