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
2fc22c9b
Commit
2fc22c9b
authored
Mar 21, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
‘完善活动国际化’
parent
65432eaa
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
28 deletions
+53
-28
jp.js
src/assets/common/lang/jp.js
+13
-0
zh.js
src/assets/common/lang/zh.js
+13
-0
CouponDetail.vue
src/components/activity/CouponDetail.vue
+27
-28
No files found.
src/assets/common/lang/jp.js
View file @
2fc22c9b
...
@@ -686,4 +686,17 @@ export const active = {
...
@@ -686,4 +686,17 @@ export const active = {
cl_team
:
'チーム'
,
cl_team
:
'チーム'
,
cl_qianzheng
:
'ビザ'
,
cl_qianzheng
:
'ビザ'
,
cl_jipiao
:
'航空券'
,
cl_jipiao
:
'航空券'
,
cl_wsyong
:
'未使用'
,
cl_ysyong
:
'使用済み'
,
cl_yzfei
:
'もう廃れた'
,
cl_hdtujing
:
'方法を得る'
,
cl_hdqudao
:
'ルートを得る'
,
cl_syzhuangtai
:
'使用状態'
,
cl_orderType
:
'注文タイプ'
,
cl_syriqi
:
'使用日'
,
cl_user
:
'ユーザー'
,
cl_hdriqi
:
'日付を得る'
,
cl_choujiang
:
'賞をもらう'
,
cl_zanwu
:
'見送る'
,
cl_qita
:
'其他'
,
}
}
\ No newline at end of file
src/assets/common/lang/zh.js
View file @
2fc22c9b
...
@@ -688,6 +688,19 @@ export const active = {
...
@@ -688,6 +688,19 @@ export const active = {
cl_team
:
'团队'
,
cl_team
:
'团队'
,
cl_qianzheng
:
'签证'
,
cl_qianzheng
:
'签证'
,
cl_jipiao
:
'机票'
,
cl_jipiao
:
'机票'
,
cl_wsyong
:
'未使用'
,
cl_ysyong
:
'已使用'
,
cl_yzfei
:
'已作废'
,
cl_hdtujing
:
'获得途径'
,
cl_hdqudao
:
'获得渠道'
,
cl_syzhuangtai
:
'使用状态'
,
cl_orderType
:
'订单类型'
,
cl_syriqi
:
'使用日期'
,
cl_user
:
'用户'
,
cl_hdriqi
:
'获得日期'
,
cl_choujiang
:
'抽奖'
,
cl_zanwu
:
'暂无'
,
cl_qita
:
'其他'
,
}
}
export
const
rule
=
{
export
const
rule
=
{
company
:
'请选择公司'
,
company
:
'请选择公司'
,
...
...
src/components/activity/CouponDetail.vue
View file @
2fc22c9b
...
@@ -7,11 +7,11 @@
...
@@ -7,11 +7,11 @@
<ul
class=
"user_time_picker"
>
<ul
class=
"user_time_picker"
>
<li>
<li>
<span>
<span>
<em>
状态
</em>
<em>
{{
$t
(
'admin.admin_status'
)
}}
</em>
<el-select
filterable
v-model=
"msg.useState"
>
<el-select
filterable
v-model=
"msg.useState"
>
<el-option
label=
"未使用
"
value=
"1"
></el-option>
<el-option
:label=
"$t('active.cl_wsyong')
"
value=
"1"
></el-option>
<el-option
label=
"已使用
"
value=
"2"
></el-option>
<el-option
:label=
"$t('active.cl_ysyong')
"
value=
"2"
></el-option>
<el-option
label=
"已作废
"
value=
"3"
></el-option>
<el-option
:label=
"$t('active.cl_yzfei')
"
value=
"3"
></el-option>
</el-select>
</el-select>
</span>
</span>
</li>
</li>
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
<input
<input
type=
"button"
type=
"button"
class=
"hollowFixedBtn"
class=
"hollowFixedBtn"
value=
"查询
"
:value=
"$t('pub.searchBtn')
"
@
click=
"resetPageIndex(),getList()"
@
click=
"resetPageIndex(),getList()"
>
>
</li>
</li>
...
@@ -27,43 +27,42 @@
...
@@ -27,43 +27,42 @@
</div>
</div>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<tr>
<th>
获得途径
</th>
<th>
{{
$t
(
'active.cl_hdtujing'
)
}}
</th>
<th>
获得渠道
</th>
<th>
{{
$t
(
'active.cl_hdqudao'
)
}}
</th>
<th>
{{
$t
(
'active.cl_syzhuangtai'
)
}}
</th>
<th>
使用状态
</th>
<th>
{{
$t
(
'hotel.order_Number'
)
}}
</th>
<th>
订单号
</th>
<th>
{{
$t
(
'active.cl_orderType'
)
}}
</th>
<th>
订单类型
</th>
<th>
{{
$t
(
'active.cl_syriqi'
)
}}
</th>
<th>
使用日期
</th>
<th>
{{
$t
(
'system.query_type'
)
}}
</th>
<th>
类型
</th>
<th>
{{
$t
(
'active.cl_user'
)
}}
</th>
<th>
用户
</th>
<th>
{{
$t
(
'active.cl_hdriqi'
)
}}
</th>
<th>
获得日期
</th>
<!--
<th>
操作
</th>
-->
<!--
<th>
操作
</th>
-->
</tr>
</tr>
<tr
v-for=
"(item,index) in DataList"
v-loading=
"loading"
>
<tr
v-for=
"(item,index) in DataList"
v-loading=
"loading"
>
<td>
<td>
<span
v-if=
"item.accessType == 1"
>
抽奖
</span>
<span
v-if=
"item.accessType == 1"
>
{{
$t
(
'active.cl_choujiang'
)
}}
</span>
</td>
</td>
<td>
{{
item
.
acessName
}}
</td>
<td>
{{
item
.
acessName
}}
</td>
<td>
<td>
<span
v-if=
"item.useState == 1"
style=
"color: green"
>
未使用
</span>
<span
v-if=
"item.useState == 1"
style=
"color: green"
>
{{
$t
(
'active.cl_wsyong'
)
}}
</span>
<span
v-if=
"item.useState == 2"
style=
"color: gary"
>
已使用
</span>
<span
v-if=
"item.useState == 2"
style=
"color: gary"
>
{{
$t
(
'active.cl_ysyong'
)
}}
</span>
<span
v-if=
"item.useState == 3"
style=
"color: red"
>
已作废
</span>
<span
v-if=
"item.useState == 3"
style=
"color: red"
>
{{
$t
(
'active.cl_yzfei'
)
}}
</span>
</td>
</td>
<td>
<td>
<span
v-if=
"item.orderId === 0"
>
暂无
</span>
<span
v-if=
"item.orderId === 0"
>
{{
$t
(
'active.cl_zanwu'
)
}}
</span>
<span
v-else
>
{{
item
.
orderId
}}
</span>
<span
v-else
>
{{
item
.
orderId
}}
</span>
</td>
</td>
<td>
<td>
<span
v-if=
"item.orderType === 0"
>
暂无
</span>
<span
v-if=
"item.orderType === 0"
>
{{
$t
(
'active.cl_zanwu'
)
}}
</span>
<span
v-else
>
<span
v-else
>
<span
v-if=
"item.orderType == 1"
>
团队
</span>
<span
v-if=
"item.orderType == 1"
>
{{
$t
(
'active.cl_team'
)
}}
</span>
<span
v-if=
"item.orderType == 2"
>
签证
</span>
<span
v-if=
"item.orderType == 2"
>
{{
$t
(
'active.cl_qianzheng'
)
}}
</span>
<span
v-if=
"item.orderType == 3"
>
机票
</span>
<span
v-if=
"item.orderType == 3"
>
{{
$t
(
'active.cl_jipiao'
)
}}
</span>
</span>
</span>
</td>
</td>
<td>
{{
item
.
useDate
?
item
.
useDate
:
'未使用'
}}
</td>
<td>
{{
item
.
useDate
?
item
.
useDate
:
$t
(
'active.cl_wsyong'
)
}}
</td>
<td>
{{
item
.
couponsType
===
1
?
"抵用券"
:
"折扣券"
}}
</td>
<td>
{{
item
.
couponsType
===
1
?
$t
(
'active.cl_dyquan'
)
:
$t
(
'active.cl_zkquan'
)
}}
</td>
<td>
{{
item
.
userPlatform
===
1
?
"B2B"
:
"其他"
}}
:
{{
item
.
userName
}}
</td>
<td>
{{
item
.
userPlatform
===
1
?
"B2B"
:
$t
(
'active.cl_qita'
)
}}
:
{{
item
.
userName
}}
</td>
<td>
{{
item
.
acessDate
}}
</td>
<td>
{{
item
.
acessDate
}}
</td>
<!--
<td>
<!--
<td>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"修改用户信息"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"修改用户信息"
placement=
"top"
>
...
@@ -88,7 +87,7 @@
...
@@ -88,7 +87,7 @@
</table>
</table>
<div
class=
"noDataNotice"
v-if=
"DataList.length
<1
"
>
<div
class=
"noDataNotice"
v-if=
"DataList.length
<1
"
>
<i
class=
"iconfont icon-kong"
></i>
<i
class=
"iconfont icon-kong"
></i>
<p>
没有找到你需要的数据
</p>
<p>
{{
$t
(
'active.ld_noData'
)
}}
</p>
</div>
</div>
<el-pagination
<el-pagination
background
background
...
...
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