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
c80137e3
Commit
c80137e3
authored
Mar 21, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
多语言...
parent
90032027
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
84 additions
and
52 deletions
+84
-52
zh.js
src/assets/common/lang/zh.js
+32
-0
LuckyDraw.vue
src/components/activity/LuckyDraw.vue
+41
-41
awardList.vue
src/components/activity/awardList.vue
+11
-11
No files found.
src/assets/common/lang/zh.js
View file @
c80137e3
...
...
@@ -629,3 +629,35 @@ export const advmanager = {
export
const
insManage
=
{
im_acc
:
'下属账号'
,
}
export
const
active
=
{
ld_name
:
'抽奖名称'
,
ld_name2
:
'抽奖名'
,
ld_status
:
'抽奖状态'
,
ld_jinyong
:
'禁用'
,
ld_addld
:
'新增抽奖'
,
ld_cjcs
:
'抽奖次数(每人)'
,
ld_editInfo
:
'修改抽奖信息'
,
ld_seeDr
:
'查看奖项'
,
ld_deletAC
:
'删除活动'
,
ld_noData
:
'没有找到你需要的数据'
,
ld_cjNum
:
'抽奖次数'
,
ld_cjRule
:
'抽奖规则'
,
ld_djscwj
:
'点击/拖拽上传'
,
ad_addad
:
'新增奖项'
,
ad_xuhao
:
'序号'
,
ad_adName
:
'奖项名'
,
ad_allNum
:
'奖项数量'
,
ad_num
:
'中奖数量'
,
ad_endNum
:
'剩余数量'
,
ad_status
:
'奖项状态'
,
ad_type
:
'奖项类型'
,
ad_thankCome
:
'谢谢参与'
,
}
export
const
rule
=
{
company
:
'请选择公司'
,
ldNmae
:
'请输入抽奖名称'
,
ldNum
:
'请输入抽奖次数'
,
startDate
:
'请选择开始日期'
,
endDate
:
'请选择结束日期'
,
}
\ No newline at end of file
src/components/activity/LuckyDraw.vue
View file @
c80137e3
...
...
@@ -72,12 +72,12 @@
<ul
class=
"user_time_picker"
>
<li>
<span>
<em>
公司
</em>
<em>
{{
$t
(
'system.table_company'
)
}}
</em>
<el-select
filterable
v-model=
"msg.branchId"
>
<el-option
label=
"不限
"
:value=
"-1"
></el-option>
<el-option
:label=
"$t('system.ph_buxian')
"
:value=
"-1"
></el-option>
<el-option
v-for=
"item in companyList"
:label=
"item.BName"
...
...
@@ -89,31 +89,31 @@
</li>
<li>
<span>
<em>
抽奖名
</em>
<em>
{{
$t
(
'active.ld_name2'
)
}}
</em>
<el-input
v-model=
"msg.lotteryName"
@
keyup
.
enter
.
native=
"getList"
></el-input>
</span>
</li>
<li>
<span>
<em>
开始日期
</em>
<em>
{{
$t
(
'hotel.hotel_StartDate'
)
}}
</em>
<el-date-picker
type=
"date"
v-model=
"msg.startDate"
:picker-options=
"pickerBeginDateBefore"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
</span>
</li>
<li>
<span>
<em>
结束日期
</em>
<em>
{{
$t
(
'hotel.hotel_EndDate'
)
}}
</em>
<el-date-picker
type=
"date"
v-model=
"msg.endDate"
:picker-options=
"pickerBeginDateBefore"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
</span>
</li>
<li>
<span>
<em>
抽奖状态
</em>
<em>
{{
$t
(
'active.ld_status'
)
}}
</em>
<el-select
filterable
v-model=
"msg.lotteryStatus"
>
<el-option
label=
"不限
"
:value=
"0"
></el-option>
<el-option
label=
"正常"
:value=
"1"
></el-option>
<el-option
label=
"禁用"
:value=
"2"
></el-option>
<el-option
:label=
"$t('system.ph_buxian')
"
:value=
"0"
></el-option>
<el-option
:label=
"$t('pub.normalSel')"
label=
"正常"
:value=
"1"
></el-option>
<el-option
:label=
"$t('active.ld_jinyong')"
label=
"禁用"
:value=
"2"
></el-option>
</el-select>
</span>
</li>
...
...
@@ -121,24 +121,24 @@
<input
type=
"button"
class=
"hollowFixedBtn"
value=
"查询
"
:value=
"$t('pub.searchBtn')
"
@
click=
"resetPageIndex(),getList()"
>
<input
type=
"button"
@
click=
"outerVisible = true,dialogTitle=
'新增抽奖',resSetInfo()"
class=
"normalBtn"
value=
"新增
"
>
<input
type=
"button"
@
click=
"outerVisible = true,dialogTitle=
$t('active.ld_addld'),resSetInfo()"
class=
"normalBtn"
:value=
"$t('pub.addBtn')
"
>
</li>
</ul>
</div>
<div
class=
"clearfix"
></div>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<tr>
<th>
抽奖名称
</th>
<th>
公司名称
</th>
<th>
抽奖次数(每人)
</th>
<th>
开始日期
</th>
<th>
结束日期
</th>
<th>
抽奖状态
</th>
<th
width=
"400"
>
备注
</th>
<th>
操作
</th>
<th>
{{
$t
(
'active.ld_name'
)
}}
</th>
<th>
{{
$t
(
'admin.admin_company'
)
}}
</th>
<th>
{{
$t
(
'active.ld_cjcs'
)
}}
</th>
<th>
{{
$t
(
'hotel.hotel_StartDate'
)
}}
</th>
<th>
{{
$t
(
'hotel.hotel_StartDate'
)
}}
</th>
<th>
{{
$t
(
'active.ld_status'
)
}}
</th>
<th
width=
"400"
>
{{
$t
(
'hotel.hotel_remark'
)
}}
</th>
<th>
{{
$t
(
'hotel.table_operat'
)
}}
</th>
</tr>
<tr
v-for=
"item in dataList"
>
<td>
{{
item
.
lotteryName
}}
</td>
...
...
@@ -146,18 +146,18 @@
<td>
{{
item
.
lotteryCount
}}
</td>
<td>
{{
item
.
startDate
}}
</td>
<td>
{{
item
.
endDate
}}
</td>
<td>
{{
item
.
lotteryStatus
==
1
?
'正常'
:
'禁用'
}}
</td>
<td>
{{
item
.
lotteryStatus
==
1
?
$t
(
'pub.normalSel'
)
:
$t
(
'active.ld_jinyong'
)
}}
</td>
<td>
{{
item
.
remark
}}
</td>
<td>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"修改抽奖信息
"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('active.ld_editInfo')
"
placement=
"top"
>
<el-button
type=
"primary"
icon=
"el-icon-edit"
circle
@
click=
"outerVisible=true,dialogTitle=
'修改抽奖信息'
,updateData(item)"
@
click=
"outerVisible=true,dialogTitle=
$t('active.ld_editInfo')
,updateData(item)"
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"查看奖项
"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('active.ld_seeDr')
"
placement=
"top"
>
<el-button
type=
"primary"
icon=
"iconfont icon-chakan"
...
...
@@ -165,7 +165,7 @@
@
click=
"goUrl(item)"
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"删除活动
"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('active.ld_deletAC')
"
placement=
"top"
>
<el-button
type=
"danger"
icon=
"iconfont icon-img_delete_small"
...
...
@@ -178,7 +178,7 @@
</table>
<div
class=
"noDataNotice"
v-if=
"dataList.length
<1
"
>
<i
class=
"iconfont icon-kong"
></i>
<p>
没有找到你需要的数据
</p>
<p>
{{
$t
(
"active.ld_noData"
)
}}
</p>
</div>
<el-pagination
background
...
...
@@ -201,13 +201,13 @@
<table
class=
"layerTable layerNoIcon"
>
<tr>
<td>
<el-form-item
label=
"抽奖名称
"
prop=
"lotteryName"
>
<el-input
v-model=
"addMsg.lotteryName"
class=
"w217"
placeholder=
"抽奖名称
"
/>
<el-form-item
:label=
"$t('active.ld_name')
"
prop=
"lotteryName"
>
<el-input
v-model=
"addMsg.lotteryName"
class=
"w217"
:placeholder=
"$t('active.ld_name')
"
/>
</el-form-item>
</td>
<td>
<el-form-item
label=
"公司
"
prop=
"branchId"
>
<el-select
filterable
class=
"w217"
v-model=
"addMsg.branchId"
placeholder=
"请选择
"
>
<el-form-item
:label=
"$t('system.table_company')
"
prop=
"branchId"
>
<el-select
filterable
class=
"w217"
v-model=
"addMsg.branchId"
:placeholder=
"$t('system.ph_choice')
"
>
<el-option
v-for=
"item in companyList"
:label=
"item.BName"
...
...
@@ -219,28 +219,28 @@
</td>
</tr>
<td>
<el-form-item
label=
"抽奖次数
"
prop=
"lotteryCount"
>
<el-input
v-model=
"addMsg.lotteryCount"
class=
"w217"
@
keyup
.
native=
"checkInteger(addMsg,'lotteryCount')"
placeholder=
"抽奖次数
"
/>
<el-form-item
:label=
"$t('active.ld_cjNum')
"
prop=
"lotteryCount"
>
<el-input
v-model=
"addMsg.lotteryCount"
class=
"w217"
@
keyup
.
native=
"checkInteger(addMsg,'lotteryCount')"
:placeholder=
"$t('active.ld_cjNum')
"
/>
</el-form-item>
</td>
<td>
<el-form-item
label=
"抽奖状态
"
prop=
"lotteryStatus"
>
<el-form-item
:label=
"$t('active.ld_status')
"
prop=
"lotteryStatus"
>
<el-select
filterable
v-model=
"addMsg.lotteryStatus"
class=
"w217"
>
<el-option
label=
"正常
"
:value=
"1"
></el-option>
<el-option
label=
"禁用
"
:value=
"2"
></el-option>
<el-option
:label=
"$t('pub.normalSel')
"
:value=
"1"
></el-option>
<el-option
:label=
"$t('active.ld_jinyong')
"
:value=
"2"
></el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item
label=
"开始日期
"
prop=
"startDate"
>
<el-form-item
:label=
"$t('hotel.hotel_StartDate')
"
prop=
"startDate"
>
<el-date-picker
type=
"datetime"
v-model=
"addMsg.startDate"
value-format=
"yyyy-MM-dd HH:mm:ss"
placeholder
></el-date-picker>
</el-form-item>
</td>
<td>
<el-form-item
label=
"结束日期
"
prop=
"endDate"
>
<el-form-item
:label=
"$t('hotel.hotel_EndDate')
"
prop=
"endDate"
>
<el-date-picker
type=
"datetime"
v-model=
"addMsg.endDate"
value-format=
"yyyy-MM-dd HH:mm:ss"
placeholder
></el-date-picker></el-date-picker>
...
...
@@ -249,14 +249,14 @@
</tr>
<tr>
<td
colspan=
"2"
>
<el-form-item
label=
"抽奖规则
"
prop=
"lotteryRules"
>
<el-form-item
:label=
"$t('active.ld_cjRule')
"
prop=
"lotteryRules"
>
<quill-editor
class=
"w595"
:options=
"editorOption"
v-model=
"addMsg.lotteryRules"
></quill-editor>
</el-form-item>
</td>
</tr>
<tr>
<td
colspan=
"2"
>
<el-form-item
label=
"备注
"
prop=
"remark"
>
<el-form-item
:label=
"$t('hotel.hotel_remark')
"
prop=
"remark"
>
<el-input
type=
"textarea"
v-model=
"addMsg.remark"
class=
"w595"
/>
</el-form-item>
</td>
...
...
@@ -278,7 +278,7 @@
:http-request=
"uploadFileBtn"
:multiple=
"false"
:show-file-list=
"false"
action=
""
>
<i
class=
"el-icon-plus avatar-uploader-icon"
></i>
<div
class=
"el-upload__text"
>
点击/拖拽上传
</div>
<div
class=
"el-upload__text"
>
{{$t("active.ld_djscwj")}}
</div>
</el-upload>
</div>
</div>
...
...
@@ -287,8 +287,8 @@
</table>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible = false,resetForm('addMsg'),resSetInfo()"
>
取 消
</button>
<button
class=
"normalBtn"
@
click=
"submitForm('addMsg')"
>
保存
</button>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible = false,resetForm('addMsg'),resSetInfo()"
>
{{$t('pub.cancelBtn')}}
</button>
<button
class=
"normalBtn"
@
click=
"submitForm('addMsg')"
>
{{$t('pub.saveBtn')}}
</button>
</div>
</el-dialog>
<div
v-if=
'picIsShow'
class=
"_show_img_box"
@
click=
"picIsShow=false"
>
...
...
src/components/activity/awardList.vue
View file @
c80137e3
...
...
@@ -3,7 +3,7 @@
<div
class=
"query-box"
>
<ul
class=
"user_time_picker"
>
<li>
<input
type=
"button"
@
click=
"outerVisible = true,dialogTitle=
'新增奖项',resetInfo()"
class=
"normalBtn"
value=
"新增
"
>
<input
type=
"button"
@
click=
"outerVisible = true,dialogTitle=
$t('active.ad_addad'),resetInfo()"
class=
"normalBtn"
:value=
"$t('pub.addBtn')
"
>
</li>
</ul>
</div>
...
...
@@ -11,14 +11,14 @@
<div
class=
"clearfix"
></div>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<tr>
<th>
序号
</th>
<th>
奖项名
</th>
<th>
奖项数量
</th>
<th>
中奖数量
</th>
<th>
剩余数量
</th>
<th>
奖项状态
</th>
<th>
奖项类型
</th>
<th>
操作
</th>
<th>
{{
$t
(
'active.ad_xuhao'
)
}}
</th>
<th>
{{
$t
(
'active.ad_adName'
)
}}
</th>
<th>
{{
$t
(
'active.ad_allNum'
)
}}
</th>
<th>
{{
$t
(
'active.ad_num'
)
}}
</th>
<th>
{{
$t
(
'active.ad_endNum'
)
}}
</th>
<th>
{{
$t
(
'active.ad_status'
)
}}
</th>
<th>
{{
$t
(
'active.ad_type'
)
}}
</th>
<th>
{{
$t
(
'system.table_operation'
)
}}
</th>
</tr>
<tr
v-for=
"item in dataList"
>
<td>
{{
item
.
rank
}}
</td>
...
...
@@ -26,7 +26,7 @@
<td>
{{
item
.
awardCount
}}
</td>
<td>
{{
item
.
awardWinningCount
}}
</td>
<td>
{{
item
.
awardCount
-
item
.
awardWinningCount
>=
0
?
item
.
awardCount
-
item
.
awardWinningCount
:
0
}}
</td>
<td>
{{
item
.
awardStatus
==
1
?
'正常'
:
'禁用'
}}
</td>
<td>
{{
item
.
awardStatus
==
1
?
$t
(
'pub.normalSel'
)
:
$t
(
'active.ld_jinyong'
)
}}
</td>
<td
v-if=
"item.awardType==1"
>
谢谢参与
</td>
<td
v-if=
"item.awardType==2"
>
一般奖项
</td>
<td
v-if=
"item.awardType==3"
>
优惠券
</td>
...
...
@@ -44,7 +44,7 @@
</table>
<div
class=
"noDataNotice"
v-if=
"dataList.length
<1
"
>
<i
class=
"iconfont icon-kong"
></i>
<p>
没有找到你需要的数据
</p>
<p>
{{
$t
(
"active.ld_noData"
)
}}
</p>
</div>
<el-dialog
custom-class=
"w800"
...
...
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