Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
marketing
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
marketing-web
marketing
Commits
1cf3bdbd
Commit
1cf3bdbd
authored
Dec 08, 2020
by
chenxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 更新 dm-activity-select
parent
c8caabee
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
29 additions
and
66 deletions
+29
-66
index.html
index.html
+1
-0
form.vue
src/views/card/form.vue
+1
-0
group-send.vue
src/views/card/group-send.vue
+2
-4
merge-form.vue
src/views/card/merge-form.vue
+2
-6
merge-list.vue
src/views/card/merge-list.vue
+1
-5
merge-record-list.vue
src/views/card/merge-record-list.vue
+0
-5
form.vue
src/views/cdkey/form.vue
+1
-3
form.js
src/views/ecm/form.js
+1
-3
form.vue
src/views/ecm/form.vue
+1
-1
list.vue
src/views/ecm/list.vue
+1
-1
scan-form.js
src/views/ecm/scan-form.js
+1
-3
scan-form.vue
src/views/ecm/scan-form.vue
+1
-1
form.vue
src/views/game/dzp/form.vue
+1
-3
form.vue
src/views/game/ggk/form.vue
+1
-3
form.vue
src/views/game/klfl/form.vue
+2
-4
form.vue
src/views/game/ptyx/form.vue
+2
-4
form.vue
src/views/game/znm/form.vue
+2
-4
detail.vue
src/views/message/detail.vue
+1
-1
form.vue
src/views/message/form.vue
+2
-4
record.vue
src/views/message/record.vue
+2
-4
form.vue
src/views/wechat/form.vue
+1
-3
record.vue
src/views/wechat/record.vue
+2
-4
No files found.
index.html
View file @
1cf3bdbd
...
...
@@ -37,5 +37,6 @@
<script
src=
"//web-1251519181.file.myqcloud.com/components/selector.1.2.20.js"
></script>
<script
src=
"//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js"
></script>
<!-- 分页器 -->
<script
src=
"//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"
></script>
<script
src=
"//web-1251519181.file.myqcloud.com/components/activity-select.1.0.1.js"
></script>
<!-- 数据对话 -->
</body>
</html>
src/views/card/form.vue
View file @
1cf3bdbd
...
...
@@ -182,6 +182,7 @@
</div> -->
<div>
<el-checkbox
v-model=
"only"
:disabled=
"isEdit || isInfo"
>
不与其它优惠共享
</el-checkbox>
<span
class=
"fz12 gray ml5"
>
* 无实际业务,仅用于ERP或第三方接口回传
</span>
</div>
</el-form-item>
<el-form-item
prop=
"cardLimit"
label=
"领券限制"
>
...
...
src/views/card/group-send.vue
View file @
1cf3bdbd
...
...
@@ -18,7 +18,7 @@
<el-input
class=
"w250"
disabled
v-model=
"form.sceneSettingName"
></el-input>
</el-form-item>
<el-form-item
label=
"数据对话"
>
<
activity-select
:actId
.
sync=
"form.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></
activity-select>
<
dm-activity-select
:actId
.
sync=
"form.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></dm-
activity-select>
</el-form-item>
</div>
<div
class=
"dm-form__wrap"
>
...
...
@@ -146,7 +146,6 @@
</el-form>
</template>
<
script
>
import
activitySelect
from
'@/components/activity-select/index.vue'
;
import
{
checkPutonMemberIds
,
saveUpdatePutonCard
,
getCardDetail
,
getCardPutonDetail
}
from
'@/service/api/cardApi.js'
;
import
{
listTemplateVariables
}
from
'@/service/api/msgApi.js'
;
import
{
formatDateTimeByType
}
from
'@/utils/index.js'
;
...
...
@@ -156,8 +155,7 @@ export default {
name
:
'card-group'
,
components
:
{
'item-card'
:
itemCard
,
'var-dialog'
:
varDialog
,
activitySelect
'var-dialog'
:
varDialog
},
data
()
{
return
{
...
...
src/views/card/merge-form.vue
View file @
1cf3bdbd
...
...
@@ -16,8 +16,8 @@
<el-date-picker
v-if=
"ruleForm.effectiveMode"
class=
"w250 mt10"
v-model=
"dateTime"
type=
"daterange"
range-separator=
"至"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
:picker-options=
"pickerOptions"
></el-date-picker>
</el-form-item>
<el-form-item
label=
"数据对话"
>
<
activity-select
v-if=
"!ruleForm.marketingActivityId"
:actId
.
sync=
"ruleForm.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></activity-select
>
<
activity-select
v-else
ref=
"actSelect"
:actId
.
sync=
"ruleForm.marketingActivityId"
:readOnly=
"isInfo"
></
activity-select>
<
!-- 只能新增不能改 --
>
<
dm-activity-select
:actId
.
sync=
"ruleForm.marketingActivityId"
:readOnly=
"isInfo || isEdit"
></dm-
activity-select>
</el-form-item>
<el-form-item
prop=
"cardIds"
label=
"新增卡券"
>
<el-button
@
click=
"showCardDialog = true"
>
添加卡券
</el-button>
...
...
@@ -65,7 +65,6 @@
</template>
<
script
>
import
activitySelect
from
'@/components/activity-select/index.vue'
;
import
{
saveCoupPackage
,
coupPackageDetail
,
getCoupListInfo
}
from
'@/service/api/cardApi.js'
;
import
{
sceneSettingList
}
from
'@/service/api/wechatApi.js'
;
import
{
formatDateTimeByType
}
from
'@/utils/index.js'
;
...
...
@@ -108,9 +107,6 @@ export default {
isEdit
:
this
.
$route
.
meta
.
type
===
'edit'
};
},
components
:
{
activitySelect
},
methods
:
{
formatDateTimeByType
,
del
({
coupCardId
})
{
...
...
src/views/card/merge-list.vue
View file @
1cf3bdbd
...
...
@@ -2,7 +2,7 @@
<section
class=
"dm-wrap"
v-loading=
"loading"
>
<div
class=
"pb22 clearfix"
>
<el-date-picker
class=
"w400"
v-model=
"dateTime"
type=
"daterange"
range-separator=
"至"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
@
change=
"refresh"
></el-date-picker>
<
activity-select
class=
"vertical-middle w150 mr5"
:actId
.
sync=
"listParams.marketingActivityId"
onlySelect
@
actUpdate=
"refresh"
></
activity-select>
<
dm-activity-select
class=
"vertical-middle w150 mr5"
width=
"150"
:actId
.
sync=
"listParams.marketingActivityId"
onlySelect
@
actUpdate=
"refresh"
></dm-
activity-select>
<el-input
v-model=
"listParams.search"
class=
"w300"
placeholder=
"请输入卡券包名称"
clearable
@
change=
"refresh"
><i
slot=
"prefix"
class=
"el-input__icon el-icon-search"
></i></el-input>
<el-button
class=
"fr"
type=
"primary"
@
click=
"$router.push('/card/merge/add')"
>
新建卡券包
</el-button>
</div>
...
...
@@ -43,7 +43,6 @@
</section>
</template>
<
script
>
import
activitySelect
from
'@/components/activity-select/index.vue'
;
import
{
pageCoupPackage
,
deleteCoupPackage
}
from
'@/service/api/cardApi.js'
;
import
{
formatDateTimeByType
}
from
'@/utils/index.js'
;
import
talbeMethods
from
'@/mixins/tableMethods.js'
;
...
...
@@ -74,9 +73,6 @@ export default {
params
:
{}
// 传递的参数
};
},
components
:
{
activitySelect
},
created
()
{
this
.
getTableList
();
this
.
$store
.
commit
(
'mutations_breadcrumb'
,
[{
name
:
'营销管理'
,
path
:
''
},
{
name
:
'卡券营销'
,
path
:
''
},
{
name
:
'卡券包'
,
path
:
''
},
{
name
:
'卡券包列表'
,
path
:
''
}]);
// eslint-disable-line
...
...
src/views/card/merge-record-list.vue
View file @
1cf3bdbd
...
...
@@ -3,7 +3,6 @@
<div
class=
"pb22 clearfix"
>
<el-input
v-model=
"listParams.search"
class=
"w300"
placeholder=
"请输入卡券包名称"
clearable
@
change=
"refresh"
><i
slot=
"prefix"
class=
"el-input__icon el-icon-search"
></i></el-input>
<!--
<el-input
v-model=
"listParams.receiveCode"
class=
"w300"
placeholder=
"请输入投放渠道"
clearable
@
change=
"refresh"
><i
slot=
"prefix"
class=
"el-input__icon el-icon-search"
></i></el-input>
-->
<!--
<activity-select
class=
"vertical-middle w150 mr5"
:actId
.
sync=
"listParams.marketingActivityId"
onlySelect
@
actUpdate=
"refresh"
></activity-select>
-->
</div>
<el-table
tooltipEffect=
"light"
:data=
"tableList"
style=
"width: 100%"
>
<el-table-column
:show-overflow-tooltip=
"true"
min-width=
"100"
align=
"left"
prop=
"receiveTime"
label=
"领取时间"
>
...
...
@@ -36,7 +35,6 @@
</section>
</template>
<
script
>
import
activitySelect
from
'@/components/activity-select/index.vue'
;
import
{
pageCoupPackageLog
}
from
'@/service/api/cardApi.js'
;
import
{
formatDateTimeByType
}
from
'@/utils/index.js'
;
import
talbeMethods
from
'@/mixins/tableMethods.js'
;
...
...
@@ -66,9 +64,6 @@ export default {
params
:
{}
// 传递的参数
};
},
components
:
{
activitySelect
},
created
()
{
this
.
getTableList
();
this
.
$store
.
commit
(
'mutations_breadcrumb'
,
[{
name
:
'营销管理'
,
path
:
''
},
{
name
:
'卡券营销'
,
path
:
''
},
{
name
:
'卡券包'
,
path
:
''
},
{
name
:
'卡券包领取记录'
,
path
:
''
}]);
// eslint-disable-line
...
...
src/views/cdkey/form.vue
View file @
1cf3bdbd
...
...
@@ -5,7 +5,7 @@
<dm-input
:disabled=
"!canEdit"
class=
"w400"
v-model=
"ruleForm.cdkeyName"
placeholder=
"请输入兑换码名称"
:byteType=
"1"
:maxlength=
"24"
></dm-input>
</el-form-item>
<el-form-item
label=
"数据对话"
prop=
"marketingActivityId"
>
<
activity-select
class=
"activity"
:actId
.
sync=
"ruleForm.marketingActivityId"
:readOnly=
"!canEdit"
></
activity-select>
<
dm-activity-select
class=
"activity"
:actId
.
sync=
"ruleForm.marketingActivityId"
:readOnly=
"!canEdit"
></dm-
activity-select>
</el-form-item>
<el-form-item
prop=
"dateTime"
label=
"有效期"
>
<el-date-picker
:default-time=
"['00:00:00', '23:59:59']"
:disabled=
"!canEdit"
class=
"w400"
v-model=
"dateTime"
type=
"datetimerange"
:picker-options=
"pickerOptions"
range-separator=
"至"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
></el-date-picker>
...
...
@@ -79,7 +79,6 @@
import
axios
from
'axios'
;
import
file
from
'@/components/upload/file'
;
import
{
formatDateTimeByType
}
from
'@/utils/index.js'
;
import
activitySelect
from
'@/components/activity-select/index.vue'
;
import
{
cdkeyCheck
,
cdkeyPlanSave
,
cdkeyPlanEdit
,
cdkeyFailExport
,
cdkeyExport
}
from
'@/service/api/cdKeyApi.js'
;
import
{
getCardDetail
}
from
'@/service/api/cardApi.js'
;
import
{
_debounce
}
from
'@/utils/index'
;
...
...
@@ -198,7 +197,6 @@ export default {
};
},
components
:
{
activitySelect
,
file
},
computed
:
{
...
...
src/views/ecm/form.js
View file @
1cf3bdbd
import
{
_debounce
}
from
'@/utils/index'
;
import
{
getEcmInfo
,
saveEcmInfo
}
from
'@/service/api/ecmApi.js'
;
import
activitySelect
from
'@/components/activity-select/index.vue'
;
import
{
listTemplateVariables
}
from
'@/service/api/msgApi.js'
;
import
{
klflStrategy
}
from
'@/service/api/gameApi.js'
;
// 会员等级列表接口
import
xxSysp_mix
from
'@/mixins/selector.js'
;
// 商品选择器方法mixins
...
...
@@ -133,8 +132,7 @@ export default {
components
:
{
'marketing-event'
:
marketingEvent
,
'item-card'
:
itemCard
,
'var-dialog'
:
varDialog
,
activitySelect
'var-dialog'
:
varDialog
},
watch
:
{
checked
(
val
)
{
...
...
src/views/ecm/form.vue
View file @
1cf3bdbd
...
...
@@ -57,7 +57,7 @@
<el-input
class=
"w400"
disabled
v-model=
"form.sceneSettingName"
></el-input>
</el-form-item>
<el-form-item
label=
"数据对话"
>
<
activity-select
:actId
.
sync=
"form.marketingActivityId"
:readOnly=
"!isAdd"
></
activity-select>
<
dm-activity-select
:actId
.
sync=
"form.marketingActivityId"
:readOnly=
"!isAdd"
></dm-
activity-select>
</el-form-item>
</section>
<!-- 消费触发配置 -->
...
...
src/views/ecm/list.vue
View file @
1cf3bdbd
...
...
@@ -7,7 +7,7 @@
<el-select
class=
"dm-select"
clearable
v-model=
"listParams.marketingType"
placeholder=
"选择营销方式"
@
change=
"search"
>
<el-option
v-for=
"(v, i) in marketingTypeOptions"
:key=
"i"
:label=
"v.label"
:value=
"v.value"
></el-option>
</el-select>
<
activity-select
class=
"vertical-middle w150 mr5"
:actId
.
sync=
"listParams.marketingActivityId"
onlySelect
@
actUpdate=
"search"
></
activity-select>
<
dm-activity-select
class=
"vertical-middle w150 mr5"
onlySelect
width=
"150"
:actId
.
sync=
"listParams.marketingActivityId"
@
actUpdate=
"search"
></dm-
activity-select>
<el-select
class=
"dm-select"
clearable
v-model=
"listParams.onlineStatus"
placeholder=
"选择上线状态"
@
change=
"search"
>
<el-option
v-for=
"(v, i) in onlineOptions"
:key=
"i"
:label=
"v.label"
:value=
"v.value"
></el-option>
</el-select>
...
...
src/views/ecm/scan-form.js
View file @
1cf3bdbd
/*jshint esversion: 6 */
import
{
_debounce
}
from
'@/utils/index'
;
import
{
getEcmInfo
,
saveEcmInfo
}
from
'@/service/api/ecmApi.js'
;
import
activitySelect
from
'@/components/activity-select/index.vue'
;
import
{
listTemplateVariables
}
from
'@/service/api/msgApi.js'
;
import
xxSysp_mix
from
'@/mixins/selector.js'
;
// 商品选择器方法mixins
import
marketingEvent
from
'./marketing-event/index.vue'
;
...
...
@@ -154,8 +153,7 @@ export default {
components
:
{
'marketing-event'
:
marketingEvent
,
'item-card'
:
itemCard
,
'var-dialog'
:
varDialog
,
activitySelect
'var-dialog'
:
varDialog
},
// watch: {},
computed
:
{
...
...
src/views/ecm/scan-form.vue
View file @
1cf3bdbd
...
...
@@ -11,7 +11,7 @@
<el-date-picker
:disabled=
"disabled"
default-time=
"23:59:59"
v-model=
"form.endDate"
type=
"datetime"
:picker-options=
"endDatePickerOptions"
placeholder=
"结束时间"
@
change=
"checkBeginEndTime"
>
</el-date-picker>
</el-form-item>
<el-form-item
label=
"数据对话"
>
<
activity-select
:actId
.
sync=
"form.marketingActivityId"
:readOnly=
"disabled"
></
activity-select>
<
dm-activity-select
:actId
.
sync=
"form.marketingActivityId"
:readOnly=
"disabled"
></dm-
activity-select>
</el-form-item>
<h3
class=
"title mt46"
>
营销次数配置
...
...
src/views/game/dzp/form.vue
View file @
1cf3bdbd
...
...
@@ -7,7 +7,7 @@
<dm-input
v-model=
"form.gameName"
class=
"w400"
:disabled=
"isInfo"
:maxlength=
"25"
></dm-input>
</el-form-item>
<el-form-item
label=
"数据对话"
>
<
activity-select
:actId
.
sync=
"form.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></
activity-select>
<
dm-activity-select
:actId
.
sync=
"form.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></dm-
activity-select>
</el-form-item>
<el-form-item
label=
"游戏时间"
prop=
"dateTime"
>
<el-date-picker
:picker-options=
"pickerOptions"
class=
"w400"
:default-time=
"['00:00:00', '23:59:59']"
v-model=
"form.dateTime"
:disabled=
"isInfo"
type=
"datetimerange"
range-separator=
"至"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
></el-date-picker>
...
...
@@ -147,7 +147,6 @@
<
script
>
import
{
_debounce
}
from
'@/utils/index'
;
import
adjustStock
from
'../common/adjust-stock'
;
import
activitySelect
from
'@/components/activity-select/index.vue'
;
import
{
detailLottery
,
saveLottery
,
downloadWheelSkinPsd
,
updateGamePrize
}
from
'@/service/api/gameApi.js'
;
import
{
numberToChinese
,
formatDateTimeByType
,
deepClone
}
from
'@/utils/index.js'
;
import
dmUploadAvatar
from
'@/components/upload/avatar'
;
...
...
@@ -275,7 +274,6 @@ export default {
dmUploadAvatar
,
dmShare
,
dmThreshold
,
activitySelect
,
adjustStock
}
,
created
()
{
...
...
src/views/game/ggk/form.vue
View file @
1cf3bdbd
...
...
@@ -7,7 +7,7 @@
<dm-input
v-model=
"form.gameName"
class=
"w400"
:disabled=
"isInfo"
:maxlength=
"25"
></dm-input>
</el-form-item>
<el-form-item
label=
"数据对话"
>
<
activity-select
:actId
.
sync=
"form.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></
activity-select>
<
dm-activity-select
:actId
.
sync=
"form.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></dm-
activity-select>
</el-form-item>
<el-form-item
label=
"游戏时间"
class=
"width50"
prop=
"dateTime"
>
<el-date-picker
class=
"w400"
v-model=
"form.dateTime"
:disabled=
"isInfo"
:default-time=
"['00:00:00', '23:59:59']"
:picker-options=
"pickerOptions"
type=
"datetimerange"
range-separator=
"至"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
>
</el-date-picker>
...
...
@@ -131,7 +131,6 @@
<
script
>
import
{
_debounce
}
from
'@/utils/index'
;
import
adjustStock
from
'../common/adjust-stock'
;
import
activitySelect
from
'@/components/activity-select/index.vue'
;
import
{
detailLottery
,
saveLottery
,
downloadWheelSkinPsd
,
updateGamePrize
,
deleteGamePrize
}
from
'@/service/api/gameApi.js'
;
import
{
formatDateTimeByType
,
deepClone
}
from
'@/utils/index.js'
;
import
prizeMixins
from
'../common/prizeMixins.js'
;
...
...
@@ -240,7 +239,6 @@ export default {
dmUploadAvatar
,
dmShare
,
dmThreshold
,
activitySelect
,
adjustStock
}
,
created
()
{
...
...
src/views/game/klfl/form.vue
View file @
1cf3bdbd
...
...
@@ -6,7 +6,7 @@
<dm-input
v-model=
"form.gameName"
class=
"w400"
:maxlength=
"10"
></dm-input>
</el-form-item>
<el-form-item
label=
"数据对话"
>
<
activity-select
:actId
.
sync=
"form.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></
activity-select>
<
dm-activity-select
:actId
.
sync=
"form.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></dm-
activity-select>
</el-form-item>
<el-form-item
label=
"游戏背景"
class=
"clearfix"
>
<div
class=
"left-bg fl"
>
...
...
@@ -198,7 +198,6 @@
<
script
>
import
{
_debounce
}
from
'@/utils/index'
;
import
{
isEmpty
}
from
'@/utils/strlen'
;
import
activitySelect
from
'@/components/activity-select/index.vue'
;
import
{
klflDetail
,
klflSave
,
klflStrategyList
,
klflPrizeList
,
klflStrategySort
,
klflStrategyDel
,
klflDownTemp
,
getCouponStock
}
from
'@/service/api/gameApi.js'
;
import
{
formatDateTimeByType
}
from
'@/utils/index.js'
;
import
dmUploadImg
from
'@/components/upload/img'
;
...
...
@@ -321,8 +320,7 @@ export default {
calculate
,
codeDialog
,
dmShare
,
dmThreshold
,
activitySelect
dmThreshold
},
computed
:
{
asideShow
()
{
...
...
src/views/game/ptyx/form.vue
View file @
1cf3bdbd
...
...
@@ -6,7 +6,7 @@
<dm-input
v-model=
"form.gameName"
class=
"w400"
:disabled=
"isInfo"
:maxlength=
"25"
></dm-input>
</el-form-item>
<el-form-item
label=
"数据对话"
>
<
activity-select
:actId
.
sync=
"form.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></
activity-select>
<
dm-activity-select
:actId
.
sync=
"form.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></dm-
activity-select>
</el-form-item>
<el-form-item
label=
"游戏时间"
prop=
"dateTime"
class=
"width50"
>
<el-date-picker
class=
"w400"
:disabled=
"isInfo"
v-model=
"form.dateTime"
:picker-options=
"pickerOptions"
type=
"datetimerange"
:default-time=
"['00:00:00', '23:59:59']"
range-separator=
"至"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
>
</el-date-picker>
...
...
@@ -109,7 +109,6 @@
<
script
>
import
{
_debounce
}
from
'@/utils/index'
;
import
activitySelect
from
'@/components/activity-select/index.vue'
;
import
{
ptyxDetail
,
savePtyx
,
getGameSystemMusic
,
downloadPtyxSkinPsd
}
from
'@/service/api/gameApi.js'
;
import
{
numberToChinese
,
formatDateTimeByType
}
from
'@/utils/index.js'
;
import
dmUploadAvatar
from
'@/components/upload/avatar'
;
...
...
@@ -241,8 +240,7 @@ export default {
ptyxSkin
,
audioUpload
,
dmShare
,
dmThreshold
,
activitySelect
dmThreshold
},
methods
:
{
//添加奖品
...
...
src/views/game/znm/form.vue
View file @
1cf3bdbd
...
...
@@ -6,7 +6,7 @@
<dm-input
v-model=
"form.gameName"
class=
"w400"
:maxlength=
"25"
></dm-input>
</el-form-item>
<el-form-item
label=
"数据对话"
>
<
activity-select
:actId
.
sync=
"form.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></
activity-select>
<
dm-activity-select
:actId
.
sync=
"form.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></dm-
activity-select>
</el-form-item>
<el-form-item
label=
"LOGO上传"
prop=
"logoImg"
class=
"width50"
>
<dm-upload-avatar
:model
.
sync=
"form.logoImg"
width=
"auto"
label=
"上传图片"
tips=
" 请上传高度为80px的PNG透明背景图片"
></dm-upload-avatar>
...
...
@@ -91,7 +91,6 @@
<
script
>
import
{
_debounce
}
from
'@/utils/index'
;
import
activitySelect
from
'@/components/activity-select/index.vue'
;
import
{
znmDetail
,
znmSave
,
znmStrategyList
,
znmStrategySort
,
znmStrategyDel
}
from
'@/service/api/gameApi.js'
;
import
{
numberToChinese
,
formatDateTimeByType
}
from
'@/utils/index.js'
;
import
dmUploadAvatar
from
'@/components/upload/avatar'
;
...
...
@@ -177,8 +176,7 @@ export default {
dmUploadAvatar
,
strategy
,
dmShare
,
dmThreshold
,
activitySelect
dmThreshold
},
computed
:
{
asideShow
()
{
...
...
src/views/message/detail.vue
View file @
1cf3bdbd
...
...
@@ -30,7 +30,7 @@
</el-col>
<el-col
:span=
"8"
>
<span
class=
"primary-font-color"
>
数据对话:
</span>
<
activity-select
style=
"display:inline-block"
:actId
.
sync=
"info.marketingActivityId"
readOnly
></
activity-select>
<
dm-activity-select
style=
"display:inline-block"
:actId
.
sync=
"info.marketingActivityId"
showText
></dm-
activity-select>
</el-col>
<el-col
:span=
"24"
>
<span
class=
"primary-font-color"
>
短信模板:
</span>
...
...
src/views/message/form.vue
View file @
1cf3bdbd
...
...
@@ -3,7 +3,7 @@
<section
class=
"dm-form__wrap"
>
<h3
class=
"dm-title__label"
>
场景设置
</h3>
<el-form-item
label=
"数据对话"
>
<
activity-select
:actId
.
sync=
"info.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></
activity-select>
<
dm-activity-select
:actId
.
sync=
"info.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></dm-
activity-select>
</el-form-item>
<el-form-item
label=
"发送时间"
>
<el-select
class=
"w250"
v-model=
"info.sendType"
>
...
...
@@ -47,7 +47,6 @@
</
template
>
<
script
>
import
{
_debounce
}
from
'@/utils/index'
;
import
activitySelect
from
'@/components/activity-select/index.vue'
;
import
{
saveSendSmsService
,
checkMessageSendCount
}
from
'@/service/api/messageApi.js'
;
import
smsTemp
from
'@/components/libs/smsTemp'
;
import
{
formatDateTimeByType
}
from
'@/utils/index.js'
;
...
...
@@ -114,8 +113,7 @@ export default {
};
},
components
:
{
smsTemp
,
activitySelect
smsTemp
},
computed
:
{
asideShow
()
{
...
...
src/views/message/record.vue
View file @
1cf3bdbd
...
...
@@ -5,7 +5,7 @@
<el-select
class=
"dm-select"
v-model=
"listParams.sendStatus"
placeholder=
"选择发送状态"
@
change=
"refresh"
>
<el-option
v-for=
"item in sendStatusOptions"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
></el-option>
</el-select>
<
activity-select
class=
"vertical-middle w150 mr5"
:actId
.
sync=
"listParams.marketingActivityId"
onlySelect
@
actUpdate=
"refresh"
></
activity-select>
<
dm-activity-select
class=
"vertical-middle w150 mr5"
width=
"150"
:actId
.
sync=
"listParams.marketingActivityId"
onlySelect
@
actUpdate=
"refresh"
></dm-
activity-select>
<el-checkbox
class=
"vertical-middle"
v-if=
"$store.state.marketing.isShowSelf"
v-model=
"listParams.showSelfFlag"
:true-label=
"1"
:false-label=
"0"
label=
"仅看本人"
border
@
change=
"refresh"
/>
<el-input
v-model=
"listParams.search"
class=
"w200"
placeholder=
"输入模板名称/ID/内容"
clearable
@
change=
"refresh"
><i
slot=
"prefix"
class=
"el-input__icon el-icon-search"
></i></el-input>
<el-button
class=
"fr"
type=
"primary"
@
click=
"$router.push('/message/record/add')"
>
新建群发
</el-button>
...
...
@@ -39,7 +39,6 @@
</section>
</template>
<
script
>
import
activitySelect
from
'@/components/activity-select/index.vue'
;
import
{
LoadMessageList
,
invalidsmsRecord
}
from
'@/service/api/messageApi.js'
;
import
{
formatDateTimeByType
}
from
'@/utils/index.js'
;
import
timeCounts
from
'@/components/timeCount/index.vue'
;
...
...
@@ -47,8 +46,7 @@ import tableMethods from '@/mixins/tableMethods.js';
export
default
{
name
:
'sms-record'
,
components
:
{
timeCounts
,
activitySelect
timeCounts
},
mixins
:
[
tableMethods
],
data
()
{
...
...
src/views/wechat/form.vue
View file @
1cf3bdbd
...
...
@@ -3,7 +3,7 @@
<section
class=
"dm-form__wrap"
>
<div
class=
"mb20"
>
<span
class=
"dm-input_label mr8"
>
数据对话:
</span>
<
activity-select
class=
"inline-block"
:actId
.
sync=
"info.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></
activity-select>
<
dm-activity-select
class=
"inline-block"
:actId
.
sync=
"info.marketingActivityId"
:readOnly=
"isEdit || isInfo"
></dm-
activity-select>
</div>
<div
class=
"mb20"
v-if=
"!isAdd && info.sceneSettingName"
>
<span
class=
"dm-input_label mr8"
>
营销场景:
</span>
...
...
@@ -89,7 +89,6 @@
</template>
<
script
>
import
{
_debounce
}
from
'@/utils/index'
;
import
activitySelect
from
'@/components/activity-select/index.vue'
;
import
dmImgText
from
'@/components/libs/imgTextTemp'
;
import
dmImgBox
from
'@/components/libs/imgTemp/index-box.vue'
;
import
{
getIsShowSelf
}
from
'@/service/api/commonApi.js'
;
...
...
@@ -105,7 +104,6 @@ export default {
components
:
{
dmImgText
,
dmImgBox
,
activitySelect
,
'wx-text'
:
wxText
,
tips
},
...
...
src/views/wechat/record.vue
View file @
1cf3bdbd
...
...
@@ -8,7 +8,7 @@
<el-select
class=
"vertical-middle w150"
v-model=
"listParams.sendStatus"
placeholder=
"选择发送状态"
@
change=
"search"
>
<el-option
v-for=
"item in sendStatusOptions"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
></el-option>
</el-select>
<
activity-select
class=
"vertical-middle w150 mr5"
:actId
.
sync=
"listParams.marketingActivityId"
onlySelect
@
actUpdate=
"search"
></
activity-select>
<
dm-activity-select
class=
"vertical-middle w150 mr5"
width=
"150"
:actId
.
sync=
"listParams.marketingActivityId"
onlySelect
@
actUpdate=
"search"
></dm-
activity-select>
<el-checkbox
class=
"vertical-middle"
v-model=
"listParams.hideInvalid"
:true-label=
"1"
:false-label=
"0"
label=
"隐藏已失效"
border
@
change=
"search"
></el-checkbox>
<el-checkbox
class=
"vertical-middle ml0"
v-if=
"$store.state.marketing.isShowSelf"
v-model=
"listParams.showSelfFlag"
:true-label=
"1"
:false-label=
"0"
label=
"仅看本人"
border
@
change=
"search"
/>
<el-input
v-model=
"listParams.clerkName"
clearable
class=
"vertical-middle w200"
placeholder=
"请输入发送人名称"
@
change=
"search"
><i
slot=
"prefix"
class=
"el-input__icon el-icon-search"
></i></el-input>
...
...
@@ -70,7 +70,6 @@
</section>
</template>
<
script
>
import
activitySelect
from
'@/components/activity-select/index.vue'
;
import
{
sendRecordList
,
delWechatMarketingRecord
,
invalidWechatMarketingRecord
}
from
'@/service/api/wechatApi.js'
;
import
{
getIsShowSelf
}
from
'@/service/api/commonApi.js'
;
import
dmDialog
from
'./dialog'
;
...
...
@@ -80,8 +79,7 @@ export default {
name
:
'wechat-record'
,
components
:
{
dmDialog
,
'time-counts'
:
timeCounts
,
activitySelect
'time-counts'
:
timeCounts
},
data
()
{
return
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment