Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
1e6deb4b
Commit
1e6deb4b
authored
Oct 30, 2019
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
国际化
parent
db94ad19
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
208 additions
and
85 deletions
+208
-85
zh-demo.js
src/assets/common/lang/zh-demo.js
+1
-0
zh-tw.js
src/assets/common/lang/zh-tw.js
+122
-0
CommodityActive.vue
src/components/activity/CommodityActive.vue
+11
-11
CommodityType.vue
src/components/activity/CommodityType.vue
+20
-20
CouponList.vue
src/components/activity/CouponList.vue
+25
-25
IntegralMall.vue
src/components/activity/IntegralMall.vue
+22
-22
LuckyDraw.vue
src/components/activity/LuckyDraw.vue
+7
-7
No files found.
src/assets/common/lang/zh-demo.js
View file @
1e6deb4b
export
const
obj
=
{
export
const
obj
=
{
BrandName
:
'品牌名称'
,
BrandName
:
'品牌名称'
,
}
}
export
default
obj
;
export
default
obj
;
\ No newline at end of file
src/assets/common/lang/zh-tw.js
View file @
1e6deb4b
...
@@ -1765,4 +1765,126 @@ export const salesModule={
...
@@ -1765,4 +1765,126 @@ export const salesModule={
doorPhoto
:
'門牌照片'
,
doorPhoto
:
'門牌照片'
,
businessPhoto
:
'營業照片'
,
businessPhoto
:
'營業照片'
,
BrandName
:
'品牌名稱'
,
BrandName
:
'品牌名稱'
,
VisitPlan
:
'拜訪計畫行事曆看板'
,
Today
:
'今日'
,
noVisitPlan
:
'今日暫無拜訪計畫哦'
,
RecentVisitPlan
:
'近期拜訪計畫'
,
RecentNoPlan
:
'近期暫無拜訪計畫哦'
,
addVisit
:
'新增拜訪'
,
VisitingCustomers
:
'拜訪客戶'
,
NewCustomer
:
'開發新客戶'
,
VisitOldCustomer
:
'拜訪老客戶'
,
beforeVisitPlan
:
'上次拜訪資訊'
,
goutong
:
'溝通內容'
,
VisitDate
:
'拜訪日期'
,
VisitTime
:
'拜訪時間'
,
belongProcess
:
'所屬流程'
,
VisitDetail
:
'拜訪說明'
,
IsSignCustomer
:
'是否預填客戶資料:'
,
kaifaDetail
:
'開發說明'
,
bookDate
:
'預訂日期'
,
VisitRecordList
:
'拜訪記錄清單'
,
VisitRecord
:
'拜訪記錄'
,
noVisited
:
'未訪問'
,
haveGoutong
:
'已溝通'
,
fwRecord
:
'訪問記錄'
,
gjx
:
'共進行'
,
ghs
:
'共耗時'
,
ZixunHotLine
:
'近期最熱諮詢路線'
,
LinshiCustomer
:
'臨時客戶'
,
XunwenLine
:
'詢問路線'
,
PriceExpect
:
'價格預計'
,
PeopleCount
:
'人數預計'
,
ReleaseTask
:
'發佈任務'
,
BaseInfo
:
'基本資訊'
,
TaskName
:
'任務名稱'
,
TaskType
:
'任務類型'
,
TaskTotal
:
'任務總數'
,
KeFenNum
:
'可分數量'
,
TimeRange
:
'時間範圍'
,
EndTime
:
'結束時間'
,
TaskRemark
:
'任務備註'
,
JoinDepart
:
'參與部門/人員'
,
JoinPart
:
'參與部門'
,
JoinPeople
:
'參與人員'
,
TaskFenPei
:
'任務分配'
,
PositiveInteger
:
'請輸入正整數'
,
SimilarTask
:
'同類任務完成率'
,
LastComplete
:
'上次完成'
,
NoHistoryTask
:
'暫無歷史任務'
,
DepartNewTask
:
'部門新任務'
,
NoTasks
:
'未收到新的任務哦'
,
IssuedPeople
:
'下發人'
,
IssuedTime
:
'下發時間'
,
TaskYaoQiu
:
'任務要求'
,
TaskStart
:
'開始任務'
,
NowTask
:
'當前任務'
,
NoTaskIn
:
'當前沒有正在進行中的任務哦'
,
DepartmentExecution
:
'部門執行力'
,
HistoryTask
:
'查看歷史任務'
,
MyTasks
:
'我發佈的任務'
,
AddTasks
:
'新增任務'
,
ClickAddTasks
:
'點擊右上方“+”按鈕,新增一個任務吧'
,
TodayTask
:
'今日任務動態'
,
NoActive
:
'大家好像都還沒有行動起來哦'
,
Contribution
:
'貢獻'
,
MyNewTasks
:
'我的新任務'
,
LijiActive
:
'立即行動'
,
MyZhiXing
:
'我的執行力'
,
ZB
:
'占比'
,
NoConfiguration
:
'您還沒有配寘'
,
ClickToEdit
:
'請點擊卡片中的編輯按鈕“'
,
LJPZ
:
'立即配寘,否則無法評分'
,
reMindNow
:
'當前還剩餘'
,
ZBFP
:
'的占比沒有分配,'
,
ZBFPYX
:
'占比分配不全會影響銷售的綜合能力評估,'
,
CXFP
:
'重新分配'
,
NLPG
:
'能力評定修改'
,
NLMC
:
'能力名稱'
,
NLMFYQ
:
'能力滿分要求'
,
ShruNum
:
'請輸入相應數位'
,
ShruBFB
:
'請輸入百分比'
,
NLZB
:
'能力占比'
,
}
//营销活动
export
const
MarketingActi
=
{
usingRange
:
'使用範圍'
,
car
:
'車輛'
,
free
:
'自由行'
,
local
:
'當地遊'
,
huangoujia
:
'換購價'
,
huodongtime
:
'活動時間'
,
alltongyong
:
'全場通用'
,
endTime
:
'結束時間'
,
addCommType
:
'新增商品類型'
,
commTypeState
:
'商品類型狀態'
,
commTypeImg
:
'商品類型展示圖片'
,
commTypelogo
:
'商品類型logo'
,
commTypetubiao
:
'商品類型圖標'
,
commTypename
:
'商品類型名稱'
,
typeNum
:
'類型編號'
,
notShow
:
'不顯示'
,
commName
:
'商品名稱'
,
commType
:
'商品類型'
,
commActivity
:
'商品活動'
,
addComm
:
'新增商品'
,
commNum
:
'商品編號'
,
commNums
:
'商品數量'
,
buydegnjiyq
:
'購買等級要求'
,
Marketvalue
:
'市場價'
,
RestrictionNumber
:
'限購數'
,
DistributionInstructions
:
'配送說明'
,
ActivitiesInvolved
:
'所屬活動'
,
commState
:
'商品狀態'
,
ActivityNum
:
'活動編號'
,
ActivityName
:
'活動名稱'
,
ActivityImg
:
'活動圖片'
,
ActivityDes
:
'活動描述'
,
commActivityName
:
'商品活動名稱'
,
ActivityPro
:
'活動介紹'
,
CommActivitytubiao
:
'商品活動圖標'
,
}
}
src/components/activity/CommodityActive.vue
View file @
1e6deb4b
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
<div
class=
"query-box"
>
<div
class=
"query-box"
>
<ul
class
>
<ul
class
>
<li>
<li>
<input
type=
"button"
@
click=
"getList"
class=
"hollowFixedBtn"
value=
"查询
"
>
<input
type=
"button"
@
click=
"getList"
class=
"hollowFixedBtn"
:value=
"$t('pub.searchBtn')
"
>
<input
<input
type=
"button"
type=
"button"
@
click=
"outerVisible = true,dialogTitle='新增商品活动', addMsg.reqType = 'add',resetInfo()"
@
click=
"outerVisible = true,dialogTitle='新增商品活动', addMsg.reqType = 'add',resetInfo()"
...
@@ -74,12 +74,12 @@
...
@@ -74,12 +74,12 @@
<div
class=
"clearfix"
></div>
<div
class=
"clearfix"
></div>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<tr>
<tr>
<th
width=
"120px"
>
活动编号
</th>
<th
width=
"120px"
>
{{
$t
(
'MarketingActi.ActivityNum'
)
}}
</th>
<th>
活动名称
</th>
<th>
{{
$t
(
'MarketingActi.ActivityName'
)
}}
</th>
<th>
活动图片
</th>
<th>
{{
$t
(
'MarketingActi.ActivityImg'
)
}}
</th>
<th>
活动描述
</th>
<th>
{{
$t
(
'MarketingActi.ActivityDes'
)
}}
</th>
<th>
创建时间
</th>
<th>
{{
$t
(
'fnc.cjshijian'
)
}}
</th>
<th>
操作
</th>
<th>
{{
$t
(
'system.table_operation'
)
}}
</th>
</tr>
</tr>
<tr
v-for=
"item in dataList"
>
<tr
v-for=
"item in dataList"
>
<td>
{{
item
.
id
}}
</td>
<td>
{{
item
.
id
}}
</td>
...
@@ -121,13 +121,13 @@
...
@@ -121,13 +121,13 @@
:before-close=
"closeChangeMachie"
:before-close=
"closeChangeMachie"
>
>
<el-form
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
label-width=
"130px"
>
<el-form
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
label-width=
"130px"
>
<el-form-item
label=
"商品活动名称
"
prop=
"name"
>
<el-form-item
:label=
"$t('MarketingActi.commActivityName')
"
prop=
"name"
>
<el-input
v-model=
"addMsg.name"
class=
"w217"
/>
<el-input
v-model=
"addMsg.name"
class=
"w217"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"活动介绍
"
prop=
"descrip"
>
<el-form-item
:label=
"$t('MarketingActi.ActivityPro')
"
prop=
"descrip"
>
<el-input
type=
"textarea"
v-model=
"addMsg.descrip"
class=
"w217"
></el-input>
<el-input
type=
"textarea"
v-model=
"addMsg.descrip"
class=
"w217"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"商品活动图标
"
>
<el-form-item
:label=
"$t('MarketingActi.CommActivitytubiao')
"
>
<div
class=
"_addUpload_box"
>
<div
class=
"_addUpload_box"
>
<div
class=
"_pic_upload"
>
<div
class=
"_pic_upload"
>
<template
v-if=
"addMsg.images!==''"
>
<template
v-if=
"addMsg.images!==''"
>
...
@@ -139,7 +139,7 @@
...
@@ -139,7 +139,7 @@
<span
<span
style=
"font-size:12px; color:#666666;cursor: pointer;line-height: 20px;"
style=
"font-size:12px; color:#666666;cursor: pointer;line-height: 20px;"
@
click=
"addMsg.images=''"
@
click=
"addMsg.images=''"
>
重新上传
</span>
>
{{
$t
(
'system.up_againUp'
)
}}
</span>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
...
...
src/components/activity/CommodityType.vue
View file @
1e6deb4b
...
@@ -63,10 +63,10 @@
...
@@ -63,10 +63,10 @@
<div
class=
"query-box"
>
<div
class=
"query-box"
>
<ul
class
>
<ul
class
>
<li>
<li>
<input
type=
"button"
@
click=
"getList"
class=
"hollowFixedBtn"
value=
"查询
"
>
<input
type=
"button"
@
click=
"getList"
class=
"hollowFixedBtn"
:value=
"$t('pub.searchBtn')
"
>
<input
<input
type=
"button"
type=
"button"
@
click=
"outerVisible = true,dialogTitle=
'新增商品类型'
, addMsg.reqType = 'add',resetInfo()"
@
click=
"outerVisible = true,dialogTitle=
$t('MarketingActi.addCommType')
, addMsg.reqType = 'add',resetInfo()"
class=
"normalBtn"
class=
"normalBtn"
:value=
"$t('pub.addBtn')"
:value=
"$t('pub.addBtn')"
>
>
...
@@ -77,14 +77,14 @@
...
@@ -77,14 +77,14 @@
<div
class=
"clearfix"
></div>
<div
class=
"clearfix"
></div>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<tr>
<tr>
<th
width=
"120px"
>
类型编号
</th>
<th
width=
"120px"
>
{{
$t
(
'MarketingActi.typeNum'
)
}}
</th>
<th>
商品类型名称
</th>
<th>
{{
$t
(
'MarketingActi.commTypename'
)
}}
</th>
<th>
商品类型图标
</th>
<th>
{{
$t
(
'MarketingActi.commTypetubiao'
)
}}
</th>
<th>
商品类型logo
</th>
<th>
{{
$t
(
'MarketingActi.commTypelogo'
)
}}
</th>
<th>
商品类型展示图片
</th>
<th>
{{
$t
(
'MarketingActi.commTypeImg'
)
}}
</th>
<th>
商品类型状态
</th>
<th>
{{
$t
(
'MarketingActi.commTypeState'
)
}}
</th>
<th>
更新时间
</th>
<th>
{{
$t
(
'adm.adm_gxtime'
)
}}
</th>
<th>
操作
</th>
<th>
{{
$t
(
'system.table_operation'
)
}}
</th>
</tr>
</tr>
<tr
v-for=
"item in dataList"
>
<tr
v-for=
"item in dataList"
>
<td>
{{
item
.
id
}}
</td>
<td>
{{
item
.
id
}}
</td>
...
@@ -98,7 +98,7 @@
...
@@ -98,7 +98,7 @@
<td>
<td>
<img
:src=
"item.typeImg"
class=
"comType_Img"
/>
<img
:src=
"item.typeImg"
class=
"comType_Img"
/>
</td>
</td>
<td>
{{
item
.
state
===
1
?
'正常'
:
'禁用'
}}
</td>
<td>
{{
item
.
state
===
1
}}
?
{{
$t
(
'pub.normalSel'
)
}}
: '
{{
$t
(
'active.ld_jinyong'
)
}}
'
</td>
<td>
{{
item
.
updateTime
.
replace
(
'T'
,
' '
)
}}
</td>
<td>
{{
item
.
updateTime
.
replace
(
'T'
,
' '
)
}}
</td>
<td>
<td>
<el-tooltip
<el-tooltip
...
@@ -114,7 +114,7 @@
...
@@ -114,7 +114,7 @@
@
click=
"outerVisible=true,dialogTitle='修改商品类型',updateData(item)"
@
click=
"outerVisible=true,dialogTitle='修改商品类型',updateData(item)"
></el-button>
></el-button>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"删除
"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('system.table_delete')
"
placement=
"top"
>
<el-button
type=
"primary"
class=
"bg_color_delete"
icon=
"el-icon-delete"
circle
@
click=
"Delete(item)"
></el-button>
<el-button
type=
"primary"
class=
"bg_color_delete"
icon=
"el-icon-delete"
circle
@
click=
"Delete(item)"
></el-button>
</el-tooltip>
</el-tooltip>
</td>
</td>
...
@@ -132,16 +132,16 @@
...
@@ -132,16 +132,16 @@
:before-close=
"closeChangeMachie"
:before-close=
"closeChangeMachie"
>
>
<el-form
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
label-width=
"130px"
>
<el-form
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
label-width=
"130px"
>
<el-form-item
label=
"商品类型名称
"
prop=
"name"
>
<el-form-item
:label=
"$t('MarketingActi.commTypename')
"
prop=
"name"
>
<el-input
v-model=
"addMsg.name"
class=
"w217"
/>
<el-input
v-model=
"addMsg.name"
class=
"w217"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"商品类型状态
"
prop=
"state"
>
<el-form-item
:label=
"$t('MarketingActi.commTypeState')
"
prop=
"state"
>
<el-select
filterable
v-model=
"addMsg.state"
>
<el-select
filterable
v-model=
"addMsg.state"
>
<el-option
label=
"显示
"
:value=
"1"
></el-option>
<el-option
:label=
"$t('system.table_isShows')
"
:value=
"1"
></el-option>
<el-option
label=
"不显示
"
:value=
"0"
></el-option>
<el-option
:label=
"$t('MarketingActi.notShow')
"
:value=
"0"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"商品类型图标
"
>
<el-form-item
:label=
"$t('MarketingActi.commTypetubiao')
"
>
<div
class=
"_addUpload_box"
>
<div
class=
"_addUpload_box"
>
<div
class=
"_pic_upload"
>
<div
class=
"_pic_upload"
>
<template
v-if=
"addMsg.icon!==''"
>
<template
v-if=
"addMsg.icon!==''"
>
...
@@ -171,7 +171,7 @@
...
@@ -171,7 +171,7 @@
</div>
</div>
</div>
</div>
</el-form-item>
</el-form-item>
<el-form-item
label=
"商品类型logo
"
>
<el-form-item
:label=
"$t('MarketingActi.commTypelogo')
"
>
<div
class=
"_addUpload_box"
>
<div
class=
"_addUpload_box"
>
<div
class=
"_pic_upload"
>
<div
class=
"_pic_upload"
>
<
template
v-if=
"addMsg.miniLog!==''"
>
<
template
v-if=
"addMsg.miniLog!==''"
>
...
@@ -201,7 +201,7 @@
...
@@ -201,7 +201,7 @@
</div>
</div>
</div>
</div>
</el-form-item>
</el-form-item>
<el-form-item
label=
"商品类型图片
"
>
<el-form-item
:label=
"$t('MarketingActi.commTypeImg')
"
>
<div
class=
"_addUpload_box"
>
<div
class=
"_addUpload_box"
>
<div
class=
"_pic_upload"
>
<div
class=
"_pic_upload"
>
<
template
v-if=
"addMsg.typeImg!==''"
>
<
template
v-if=
"addMsg.typeImg!==''"
>
...
@@ -213,7 +213,7 @@
...
@@ -213,7 +213,7 @@
<span
<span
style=
"font-size:12px; color:#666666;cursor: pointer;line-height: 20px;"
style=
"font-size:12px; color:#666666;cursor: pointer;line-height: 20px;"
@
click=
"addMsg.typeImg=''"
@
click=
"addMsg.typeImg=''"
>
重新上传
</span>
>
{{
$t
(
'system.up_againUp'
)
}}
</span>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
...
...
src/components/activity/CouponList.vue
View file @
1e6deb4b
...
@@ -84,16 +84,16 @@
...
@@ -84,16 +84,16 @@
</li>
</li>
<li>
<li>
<span>
<span>
<em>
使用范围
</em>
<em>
{{
$t
(
'MarketingActi.usingRange'
)
}}
</em>
<el-select
filterable
v-model=
"msg.couponsUseScope"
>
<el-select
filterable
v-model=
"msg.couponsUseScope"
>
<el-option
:label=
"$t('active.cl_tongyong')"
:value=
"1"
></el-option>
<el-option
:label=
"$t('active.cl_tongyong')"
:value=
"1"
></el-option>
<el-option
:label=
"$t('active.cl_team')"
:value=
"2"
></el-option>
<el-option
:label=
"$t('active.cl_team')"
:value=
"2"
></el-option>
<el-option
:label=
"$t('active.cl_qianzheng')"
:value=
"3"
></el-option>
<el-option
:label=
"$t('active.cl_qianzheng')"
:value=
"3"
></el-option>
<el-option
:label=
"$t('active.cl_jipiao')"
:value=
"4"
></el-option>
<el-option
:label=
"$t('active.cl_jipiao')"
:value=
"4"
></el-option>
<el-option
label=
"门票
"
:value=
"5"
></el-option>
<el-option
:label=
"$t('scen.sc_piao')
"
:value=
"5"
></el-option>
<el-option
label=
"车辆
"
:value=
"6"
></el-option>
<el-option
:label=
"$t('MarketingActi.car')
"
:value=
"6"
></el-option>
<el-option
label=
"自由行
"
:value=
"7"
></el-option>
<el-option
:label=
"$t('MarketingActi.free')
"
:value=
"7"
></el-option>
<el-option
label=
"当地游
"
:value=
"8"
></el-option>
<el-option
:label=
"$t('MarketingActi.local')
"
:value=
"8"
></el-option>
</el-select>
</el-select>
</span>
</span>
</li>
</li>
...
@@ -132,12 +132,12 @@
...
@@ -132,12 +132,12 @@
<th>
{{
$t
(
'active.cl_sxriqi'
)
}}
</th>
<th>
{{
$t
(
'active.cl_sxriqi'
)
}}
</th>
<th>
{{
$t
(
'active.cl_sxzhuangtai'
)
}}
</th>
<th>
{{
$t
(
'active.cl_sxzhuangtai'
)
}}
</th>
<th>
{{
$t
(
'active.cl_gqriqi'
)
}}
</th>
<th>
{{
$t
(
'active.cl_gqriqi'
)
}}
</th>
<th>
使用范围
</th>
<th>
{{
$t
(
'MarketingActi.usingRange'
)
}}
</th>
<th>
{{
$t
(
'admin.admin_status'
)
}}
</th>
<th>
{{
$t
(
'admin.admin_status'
)
}}
</th>
<th>
{{
$t
(
'active.cl_addPp'
)
}}
</th>
<th>
{{
$t
(
'active.cl_addPp'
)
}}
</th>
<th>
换购价
</th>
<th>
{{
$t
(
'MarketingActi.huangoujia'
)
}}
</th>
<th>
活动时间
</th>
<th>
{{
$t
(
'MarketingActi.huodongtime'
)
}}
</th>
<th>
备注
</th>
<th>
{{
$t
(
'hotel.hotel_remark'
)
}}
</th>
<th>
{{
$t
(
'system.table_operation'
)
}}
</th>
<th>
{{
$t
(
'system.table_operation'
)
}}
</th>
</tr>
</tr>
<tr
v-for=
"(item,index) in DataList"
v-loading=
"loading"
>
<tr
v-for=
"(item,index) in DataList"
v-loading=
"loading"
>
...
@@ -164,12 +164,12 @@
...
@@ -164,12 +164,12 @@
<td>
{{
item
.
expirationDate
}}
</td>
<td>
{{
item
.
expirationDate
}}
</td>
<td>
<td>
<span
v-if=
"item.couponsUseScope == 1"
>
全场通用
</span>
<span
v-if=
"item.couponsUseScope == 1"
>
{{
$t
(
'MarketingActi.alltongyong'
)
}}
</span>
<span
v-if=
"item.couponsUseScope == 2"
>
团队
</span>
<span
v-if=
"item.couponsUseScope == 2"
>
{{
$t
(
'active.cl_team'
)
}}
</span>
<span
v-if=
"item.couponsUseScope == 3"
>
签证
</span>
<span
v-if=
"item.couponsUseScope == 3"
>
{{
$t
(
'active.cl_qianzheng'
)
}}
</span>
<span
v-if=
"item.couponsUseScope == 4"
>
机票
</span>
<span
v-if=
"item.couponsUseScope == 4"
>
{{
$t
(
'active.cl_jipiao'
)
}}
</span>
<span
v-if=
"item.couponsUseScope == 5"
>
门票
</span>
<span
v-if=
"item.couponsUseScope == 5"
>
{{
$t
(
'scen.sc_piao'
)
}}
</span>
<span
v-if=
"item.couponsUseScope == 6"
>
车辆
</span>
<span
v-if=
"item.couponsUseScope == 6"
>
{{
$t
(
'MarketingActi.car'
)
}}
</span>
</td>
</td>
<td>
<td>
<span
v-if=
"item.couponStatus == 1"
style=
"color: green"
>
{{
$t
(
'pub.normalSel'
)
}}
</span>
<span
v-if=
"item.couponStatus == 1"
style=
"color: green"
>
{{
$t
(
'pub.normalSel'
)
}}
</span>
...
@@ -179,8 +179,8 @@
...
@@ -179,8 +179,8 @@
<td>
{{
item
.
createUserName
}}
</td>
<td>
{{
item
.
createUserName
}}
</td>
<td>
{{
item
.
redemptionPrice
}}
</td>
<td>
{{
item
.
redemptionPrice
}}
</td>
<td>
<td>
<p>
开始时间
:
{{
item
.
activityStartDate
}}
</p>
<p>
{{
$t
(
'system.table_begTime'
)
}}
:
{{
item
.
activityStartDate
}}
</p>
<p>
结束时间
:
{{
item
.
activityEndDate
}}
</p>
<p>
{{
$t
(
'MarketingActi.endTime'
)
}}
:
{{
item
.
activityEndDate
}}
</p>
</td>
</td>
<td>
{{
item
.
remark
}}
</td>
<td>
{{
item
.
remark
}}
</td>
<td
class=
"text_al_left"
>
<td
class=
"text_al_left"
>
...
@@ -378,23 +378,23 @@
...
@@ -378,23 +378,23 @@
<el-option
:label=
"$t('active.cl_team')"
:value=
"2"
></el-option>
<el-option
:label=
"$t('active.cl_team')"
:value=
"2"
></el-option>
<el-option
:label=
"$t('active.cl_qianzheng')"
:value=
"3"
></el-option>
<el-option
:label=
"$t('active.cl_qianzheng')"
:value=
"3"
></el-option>
<el-option
:label=
"$t('active.cl_jipiao')"
:value=
"4"
></el-option>
<el-option
:label=
"$t('active.cl_jipiao')"
:value=
"4"
></el-option>
<el-option
label=
"门票
"
:value=
"5"
></el-option>
<el-option
:label=
"$t('scen.sc_piao')
"
:value=
"5"
></el-option>
<el-option
label=
"车辆
"
:value=
"6"
></el-option>
<el-option
:label=
"$t('MarketingActi.car')
"
:value=
"6"
></el-option>
<el-option
label=
"自由行
"
:value=
"7"
></el-option>
<el-option
:label=
"$t('MarketingActi.free')
"
:value=
"7"
></el-option>
<el-option
label=
"当地游
"
:value=
"8"
></el-option>
<el-option
:label=
"$t('MarketingActi.local')
"
:value=
"8"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</td>
</td>
<td>
<td>
<el-form-item
label=
"换购价
"
>
<el-form-item
:label=
"$t('MarketingActi.huangoujia')
"
>
<el-input
v-model=
"addMsg.redemptionPrice"
class=
"w217"
placeholder=
"请输入
"
/>
<el-input
v-model=
"addMsg.redemptionPrice"
class=
"w217"
:placeholder=
"$t('pub.pleaseImport')
"
/>
</el-form-item>
</el-form-item>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td>
<td>
<el-form-item
label=
"备注
"
>
<el-form-item
:label=
"$t('hotel.hotel_remark')
"
>
<el-input
v-model=
"addMsg.remark"
class=
"w217"
placeholder=
"请输入
"
/>
<el-input
v-model=
"addMsg.remark"
class=
"w217"
:placeholder=
"$t('pub.pleaseImport')
"
/>
</el-form-item>
</el-form-item>
</td>
</td>
</tr>
</tr>
...
...
src/components/activity/IntegralMall.vue
View file @
1e6deb4b
...
@@ -10,41 +10,41 @@
...
@@ -10,41 +10,41 @@
<ul
class=
"user_time_picker"
>
<ul
class=
"user_time_picker"
>
<li>
<li>
<span>
<span>
<em>
商品名称
</em>
<em>
{{
$t
(
'MarketingActi.commName'
)
}}
</em>
<el-input
v-model=
"msg.name"
@
keyup
.
enter
.
native=
"getList"
></el-input>
<el-input
v-model=
"msg.name"
@
keyup
.
enter
.
native=
"getList"
></el-input>
</span>
</span>
</li>
</li>
<li>
<li>
<span>
<span>
<em>
商品类型
</em>
<em>
{{
$t
(
'MarketingActi.commType'
)
}}
</em>
<el-select
filterable
v-model=
"msg.type"
>
<el-select
filterable
v-model=
"msg.type"
>
<el-option
label=
"不限
"
value=
""
key=
"0"
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')
"
value=
""
key=
"0"
></el-option>
<el-option
v-for=
"item in GoodsTypeList"
:label=
"item.name"
:value=
"item.id"
:key=
"item.id"
></el-option>
<el-option
v-for=
"item in GoodsTypeList"
:label=
"item.name"
:value=
"item.id"
:key=
"item.id"
></el-option>
</el-select>
</el-select>
</span>
</span>
</li>
</li>
<li>
<li>
<span>
<span>
<em>
状态
</em>
<em>
{{
$t
(
'admin.admin_status'
)
}}
</em>
<el-select
filterable
v-model=
"msg.state"
>
<el-select
filterable
v-model=
"msg.state"
>
<el-option
label=
"上架
"
:value=
"1"
></el-option>
<el-option
:label=
"$t('Operation.Op_shangjia')
"
:value=
"1"
></el-option>
<el-option
label=
"下架
"
:value=
"0"
></el-option>
<el-option
:label=
"$t('Operation.Op_xiajia')
"
:value=
"0"
></el-option>
<el-option
label=
"删除
"
:value=
"-1"
></el-option>
<el-option
:label=
"$t('system.table_delete')
"
:value=
"-1"
></el-option>
</el-select>
</el-select>
</span>
</span>
</li>
</li>
<li>
<li>
<span>
<span>
<em>
商品活动
</em>
<em>
{{
$t
(
'MarketingActi.commActivity'
)
}}
</em>
<el-select
filterable
v-model=
"msg.ishot"
>
<el-select
filterable
v-model=
"msg.ishot"
>
<el-option
label=
"不限
"
value=
""
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')
"
value=
""
></el-option>
<el-option
v-for=
"item in GoodsSeriesList"
:label=
"item.name"
:value=
"item.id"
:key=
"item.id"
></el-option>
<el-option
v-for=
"item in GoodsSeriesList"
:label=
"item.name"
:value=
"item.id"
:key=
"item.id"
></el-option>
</el-select>
</el-select>
</span>
</span>
</li>
</li>
<li>
<li>
<input
type=
"button"
@
click=
"getList"
class=
"hollowFixedBtn"
value=
"查询
"
>
<input
type=
"button"
@
click=
"getList"
class=
"hollowFixedBtn"
:value=
"$t('pub.searchBtn')
"
>
<input
type=
"button"
@
click=
"addIntegralMall('addIntegralMall', '',
'新增商品'
)"
class=
"normalBtn"
:value=
"$t('pub.addBtn')"
>
<input
type=
"button"
@
click=
"addIntegralMall('addIntegralMall', '',
$t('MarketingActi.addComm')
)"
class=
"normalBtn"
:value=
"$t('pub.addBtn')"
>
</li>
</li>
</ul>
</ul>
</div>
</div>
...
@@ -52,17 +52,17 @@
...
@@ -52,17 +52,17 @@
<div
class=
"clearfix"
></div>
<div
class=
"clearfix"
></div>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<tr>
<tr>
<th
width=
'80'
>
商品编号
</th>
<th
width=
'80'
>
{{
$t
(
'MarketingActi.commNum'
)
}}
</th>
<th>
商品名称
</th>
<th>
{{
$t
(
'MarketingActi.commName'
)
}}
</th>
<th>
商品数量
</th>
<th>
{{
$t
(
'MarketingActi.commNums'
)
}}
</th>
<th>
购买等级要求
</th>
<th>
{{
$t
(
'MarketingActi.buydegnjiyq'
)
}}
</th>
<th>
价格
</th>
<th>
{{
$t
(
'Operation.Op_price'
)
}}
</th>
<th>
市场价
</th>
<th>
{{
$t
(
'MarketingActi.Marketvalue'
)
}}
</th>
<th>
限购数
</th>
<th>
{{
$t
(
'MarketingActi.RestrictionNumber'
)
}}
</th>
<th>
配送说明
</th>
<th>
{{
$t
(
'MarketingActi.DistributionInstructions'
)
}}
</th>
<th>
所属活动
</th>
<th>
{{
$t
(
'MarketingActi.ActivitiesInvolved'
)
}}
</th>
<th>
商品状态
</th>
<th>
{{
$t
(
'MarketingActi.commState'
)
}}
</th>
<th>
操作
</th>
<th>
{{
$t
(
'system.table_operation'
)
}}
</th>
</tr>
</tr>
<tr
v-for=
"item in dataList"
>
<tr
v-for=
"item in dataList"
>
<td>
{{
item
.
id
}}
</td>
<td>
{{
item
.
id
}}
</td>
...
...
src/components/activity/LuckyDraw.vue
View file @
1e6deb4b
...
@@ -208,7 +208,7 @@
...
@@ -208,7 +208,7 @@
</el-form-item>
</el-form-item>
</td>
</td>
<td>
<td>
<el-form-item
label=
"抽奖类型
"
prop=
"lotteryType"
>
<el-form-item
:label=
"$t('active.cl_cjleixing')
"
prop=
"lotteryType"
>
<el-select
filterable
class=
"w217"
v-model=
"addMsg.lotteryType"
:placeholder=
"$t('system.ph_choice')"
@
change=
"addMsg.branchId = ''"
>
<el-select
filterable
class=
"w217"
v-model=
"addMsg.lotteryType"
:placeholder=
"$t('system.ph_choice')"
@
change=
"addMsg.branchId = ''"
>
<el-option
:label=
"$t('active.cl_huodong')"
:value=
"1"
:key=
"1"
></el-option>
<el-option
:label=
"$t('active.cl_huodong')"
:value=
"1"
:key=
"1"
></el-option>
<el-option
:label=
"$t('active.cl_renwu')"
:value=
"2"
:key=
"2"
></el-option>
<el-option
:label=
"$t('active.cl_renwu')"
:value=
"2"
:key=
"2"
></el-option>
...
@@ -371,12 +371,12 @@ export default {
...
@@ -371,12 +371,12 @@ export default {
}
}
},
},
rules
:{
rules
:{
branchId
:
[{
required
:
true
,
message
:
"请选择公司"
,
trigger
:
"change"
}],
branchId
:
[{
required
:
true
,
message
:
this
.
$t
(
'rule.company'
)
,
trigger
:
"change"
}],
lotteryName
:
[{
required
:
true
,
message
:
"请输入抽奖名称"
,
trigger
:
"blur"
}],
lotteryName
:
[{
required
:
true
,
message
:
this
.
$t
(
'rule.ldNmae'
)
,
trigger
:
"blur"
}],
lotteryCount
:
[{
required
:
true
,
message
:
"请输入抽奖次数"
,
trigger
:
"blur"
}],
lotteryCount
:
[{
required
:
true
,
message
:
this
.
$t
(
'rule.ldNum'
)
,
trigger
:
"blur"
}],
startDate
:
[{
required
:
true
,
message
:
"请选择开始日期"
,
trigger
:
"blur"
}],
startDate
:
[{
required
:
true
,
message
:
this
.
$t
(
'rule.startDate'
)
,
trigger
:
"blur"
}],
endDate
:
[{
required
:
true
,
message
:
"请选择结束日期"
,
trigger
:
"blur"
}],
endDate
:
[{
required
:
true
,
message
:
this
.
$t
(
'rule.endDate'
)
,
trigger
:
"blur"
}],
lotteryType
:
[{
required
:
true
,
message
:
"请选择抽奖类型"
,
trigger
:
"blur"
}],
lotteryType
:
[{
required
:
true
,
message
:
this
.
$t
(
'rule.ldType'
)
,
trigger
:
"blur"
}],
},
},
loading
:
false
,
loading
:
false
,
currentPage
:
1
,
currentPage
:
1
,
...
...
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