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
8f4ea258
Commit
8f4ea258
authored
Mar 21, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
‘活动页面国际化...’
parent
80eb1639
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
196 additions
and
100 deletions
+196
-100
App.vue
src/App.vue
+1
-1
jp.js
src/assets/common/lang/jp.js
+60
-0
zh.js
src/assets/common/lang/zh.js
+36
-0
CouponList.vue
src/components/activity/CouponList.vue
+76
-76
LuckyDraw.vue
src/components/activity/LuckyDraw.vue
+2
-2
awardList.vue
src/components/activity/awardList.vue
+21
-21
No files found.
src/App.vue
View file @
8f4ea258
...
...
@@ -108,7 +108,7 @@ export default {
}
</
script
>
<
style
>
@import
"//at.alicdn.com/t/font_635492_
zhaw2pckn4j
.css"
;
@import
"//at.alicdn.com/t/font_635492_
a59svrd6x1
.css"
;
@import
"./assets/css/Semibold.css"
;
@import
"./assets/css/global/config.css"
;
@import
"./assets/css/fileIcon.css"
;
...
...
src/assets/common/lang/jp.js
View file @
8f4ea258
...
...
@@ -627,3 +627,63 @@ 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
:
'ありがとう参加'
,
ad_ybjx
:
'一般賞'
,
ad_yhq
:
'クーポン'
,
ad_jxgl
:
'賞の関連'
,
ad_ssxl
:
'所属シリーズ'
,
ad_xlmc
:
'シリーズ名'
,
cl_couponName
:
'クーポンの名前'
,
cl_yizuofei
:
'もう廃れた'
,
cl_addCoupon
:
'追加クーポン'
,
cl_couponNum
:
'クーポンの数'
,
cl_ffzongliang
:
'数を支給する'
,
cl_sytiaojian
:
'使用条件'
,
cl_miane
:
'額面'
,
cl_djshiyong
:
'重ねて使用する'
,
cl_sxriqi
:
'発効日'
,
cl_sxzhuangtai
:
'発効状態'
,
cl_gqriqi
:
'期限切れの期日'
,
cl_addPp
:
'創建者'
,
cl_dyquan
:
'相殺券'
,
cl_zkquan
:
'割引券'
,
cl_byxu
:
'許さない'
,
cl_yuncu
:
'許可する'
,
cl_sxzhong
:
'発効中'
,
cl_wsxiao
:
'未発効'
,
cl_ygqi
:
'期限が切れた'
,
cl_deleteCoupon
:
'クーポンを削除'
,
cl_couponType
:
'クーポンのタイプ'
,
cl_yhqmiane
:
'クーポンの額面'
,
cl_dkjezk
:
'金額を控除する/割引'
,
cl_mdskeyong
:
'満了する'
,
cl_yxjzhiri
:
'有効期限'
,
cl_zuofei
:
'廃棄する'
,
cl_syfanwei
:
'適用範囲'
,
cl_tongyong
:
'通用する'
,
cl_team
:
'チーム'
,
cl_qianzheng
:
'ビザ'
,
cl_jipiao
:
'航空券'
,
}
\ No newline at end of file
src/assets/common/lang/zh.js
View file @
8f4ea258
...
...
@@ -652,6 +652,42 @@ export const active = {
ad_status
:
'奖项状态'
,
ad_type
:
'奖项类型'
,
ad_thankCome
:
'谢谢参与'
,
ad_ybjx
:
'一般奖项'
,
ad_yhq
:
'优惠券'
,
ad_jxgl
:
'奖项关联'
,
ad_ssxl
:
'所属系列'
,
ad_xlmc
:
'系列名称'
,
cl_couponName
:
'优惠券名称'
,
cl_yizuofei
:
'已作废'
,
cl_addCoupon
:
'新增优惠券'
,
cl_couponNum
:
'优惠券数量'
,
cl_ffzongliang
:
'发放数量'
,
cl_sytiaojian
:
'使用条件'
,
cl_miane
:
'面额'
,
cl_djshiyong
:
'叠加使用'
,
cl_sxriqi
:
'生效日期'
,
cl_sxzhuangtai
:
'生效状态'
,
cl_gqriqi
:
'过期日期'
,
cl_addPp
:
'创建人'
,
cl_dyquan
:
'抵用券'
,
cl_zkquan
:
'折扣券'
,
cl_byxu
:
'不允许'
,
cl_yuncu
:
'允许'
,
cl_sxzhong
:
'生效中'
,
cl_wsxiao
:
'未生效'
,
cl_ygqi
:
'已过期'
,
cl_deleteCoupon
:
'删除优惠券'
,
cl_couponType
:
'优惠券类型'
,
cl_yhqmiane
:
'优惠券面额'
,
cl_dkjezk
:
'抵扣金额/折扣'
,
cl_mdskeyong
:
'满多少可用'
,
cl_yxjzhiri
:
'有效截止日'
,
cl_zuofei
:
'作废'
,
cl_syfanwei
:
'适用范围'
,
cl_tongyong
:
'通用'
,
cl_team
:
'团队'
,
cl_qianzheng
:
'签证'
,
cl_jipiao
:
'机票'
,
}
export
const
rule
=
{
company
:
'请选择公司'
,
...
...
src/components/activity/CouponList.vue
View file @
8f4ea258
...
...
@@ -24,13 +24,13 @@
<ul
class=
"user_time_picker"
>
<li>
<span>
<em>
公司
</em>
<em>
{{
$t
(
'system.table_company'
)
}}
</em>
<el-select
filterable
:disabled=
"msg.IsParentCompany==2"
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"
...
...
@@ -42,36 +42,36 @@
</li>
<li>
<span>
<em>
所属线路
</em>
<em>
{{
$t
(
'system.table_ssLine'
)
}}
</em>
<el-select
filterable
v-model=
"msg.lineId"
@
change=
"getLineTeamList(msg.lineId, 2)"
>
<el-option
label=
"不限
"
:value=
"0"
></el-option>
<el-option
:label=
"$t('system.ph_buxian')
"
:value=
"0"
></el-option>
<el-option
v-for=
"item in LineList"
:label=
"item.LineName"
:value=
"item.LineID"
:key=
"item.LineID"
></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>
所属系列
</em>
<em>
{{
$t
(
'active.ad_ssxl'
)
}}
</em>
<el-select
filterable
v-model=
"msg.lineteamId"
>
<el-option
label=
"不限
"
:value=
"0"
></el-option>
<el-option
:label=
"$t('system.ph_buxian')
"
:value=
"0"
></el-option>
<el-option
v-for=
"item in QLineTeamList"
:label=
"item.LtName"
:value=
"item.LtID"
:key=
"item.LtID"
></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>
优惠券名称
</em>
<em>
{{
$t
(
'active.cl_couponName'
)
}}
</em>
<el-input
v-model=
"msg.couponsName"
@
keyup
.
enter
.
native=
"getList"
></el-input>
</span>
</li>
<li>
<span>
<em>
状态
</em>
<em>
{{
$t
(
'admin.admin_status'
)
}}
</em>
<el-select
filterable
v-model=
"msg.couponStatus"
>
<el-option
label=
"不限
"
:value=
"-1"
></el-option>
<el-option
label=
"正常
"
:value=
"1"
></el-option>
<el-option
label=
"禁用
"
:value=
"2"
></el-option>
<el-option
label=
"已作废
"
:value=
"3"
></el-option>
<el-option
:label=
"$t('system.ph_buxian')
"
:value=
"-1"
></el-option>
<el-option
:label=
"$t('pub.normalSel')
"
:value=
"1"
></el-option>
<el-option
:label=
"$t('active.ld_jinyong')
"
:value=
"2"
></el-option>
<el-option
:label=
"$t('active.cl_yizuofei')
"
:value=
"3"
></el-option>
</el-select>
</span>
</li>
...
...
@@ -79,14 +79,14 @@
<input
type=
"button"
class=
"hollowFixedBtn"
value=
"查询
"
:value=
"$t('pub.searchBtn')
"
@
click=
"resetPageIndex(),getList()"
>
<input
type=
"button"
@
click=
"outerVisible = true,isleaveBtn=false,dialogTitle=
'新增优惠券'
,getCompany()"
@
click=
"outerVisible = true,isleaveBtn=false,dialogTitle=
$t('active.cl_addCoupon')
,getCompany()"
class=
"normalBtn"
value=
"新增
"
:value=
"$t('pub.addBtn')
"
>
</li>
</ul>
...
...
@@ -94,23 +94,23 @@
<div
class=
"clearfix"
></div>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<th>
优惠券名
</th>
<th>
优惠券数量
</th>
<th>
发放数量
</th>
<th>
剩余数量
</th>
<th>
线路名称
</th>
<th>
系列名称
</th>
<th>
类型
</th>
<th>
使用条件
</th>
<th>
面额
</th>
<th>
{{
$t
(
'active.cl_couponName'
)
}}
</th>
<th>
{{
$t
(
'active.cl_couponNum'
)
}}
</th>
<th>
{{
$t
(
'active.cl_ffzongliang'
)
}}
</th>
<th>
{{
$t
(
'active.ad_endNum'
)
}}
</th>
<th>
{{
$t
(
'system.query_lineName'
)
}}
</th>
<th>
{{
$t
(
'active.ad_xlmc'
)
}}
</th>
<th>
{{
$t
(
'system.query_type'
)
}}
</th>
<th>
{{
$t
(
'active.cl_sytiaojian'
)
}}
</th>
<th>
{{
$t
(
'active.cl_miane'
)
}}
</th>
<!--
<th>
使用状态
</th>
-->
<th>
叠加使用
</th>
<th>
生效日期
</th>
<th>
生效状态
</th>
<th>
过期日期
</th>
<th>
状态
</th>
<th>
创建人
</th>
<th>
操作
</th>
<th>
{{
$t
(
'active.cl_djshiyong'
)
}}
</th>
<th>
{{
$t
(
'active.cl_sxriqi'
)
}}
</th>
<th>
{{
$t
(
'active.cl_sxzhuangtai'
)
}}
</th>
<th>
{{
$t
(
'active.cl_gqriqi'
)
}}
</th>
<th>
{{
$t
(
'admin.admin_status'
)
}}
</th>
<th>
{{
$t
(
'active.cl_addPp'
)
}}
</th>
<th>
{{
$t
(
'system.table_operation'
)
}}
</th>
</tr>
<tr
v-for=
"(item,index) in DataList"
v-loading=
"loading"
>
<td>
{{
item
.
couponsName
}}
</td>
...
...
@@ -119,36 +119,36 @@
<span
class=
"_couponReceiveCount"
@
click=
"item.couponReceiveCount === 0 ? '' : goDetail('CouponDetail', item)"
>
{{
item
.
couponReceiveCount
}}
</span>
</td>
<td>
{{
(
item
.
couponCount
-
item
.
couponReceiveCount
)
>
0
?
(
item
.
couponCount
-
item
.
couponReceiveCount
)
:
0
}}
</td>
<td>
{{
item
.
lineId
<=
0
?
'不限'
:
item
.
lineName
}}
</td>
<td>
{{
item
.
lineteamId
<=
0
?
'不限'
:
item
.
lineTeamName
}}
</td>
<td>
{{
item
.
couponsType
===
1
?
"抵用券"
:
"折扣券"
}}
</td>
<td>
{{
item
.
lineId
<=
0
?
$t
(
'pub.unlimitedSel'
)
:
item
.
lineName
}}
</td>
<td>
{{
item
.
lineteamId
<=
0
?
$t
(
'pub.unlimitedSel'
)
:
item
.
lineTeamName
}}
</td>
<td>
{{
item
.
couponsType
===
1
?
$t
(
'active.cl_dyquan'
)
:
$t
(
'active.cl_zkquan'
)
}}
</td>
<td>
{{
item
.
useCondition
}}
</td>
<td>
{{
item
.
denomination
}}
</td>
<!--
<td>
{{
item
.
useState
}}
</td>
-->
<td>
{{
item
.
overlapUse
===
0
?
"不允许"
:
"允许"
}}
</td>
<td>
{{
item
.
overlapUse
===
0
?
$t
(
'active.cl_byxu'
)
:
$t
(
'active.cl_yuncu'
)
}}
</td>
<td>
{{
item
.
effectDate
}}
</td>
<td>
<span
v-if=
"item.couponEffectStatus === 1"
style=
"color: green"
>
生效中
</span>
<span
v-if=
"item.couponEffectStatus === 2"
style=
"color: gray"
>
未生效
</span>
<span
v-if=
"item.couponEffectStatus === 3"
style=
"color: red"
>
已过期
</span>
<span
v-if=
"item.couponEffectStatus === 1"
style=
"color: green"
>
{{
$t
(
'active.cl_sxzhong'
)
}}
</span>
<span
v-if=
"item.couponEffectStatus === 2"
style=
"color: gray"
>
{{
$t
(
'active.cl_wsxiao'
)
}}
</span>
<span
v-if=
"item.couponEffectStatus === 3"
style=
"color: red"
>
{{
$t
(
'active.cl_ygqi'
)
}}
</span>
</td>
<td>
{{
item
.
expirationDate
}}
</td>
<td>
<span
v-if=
"item.couponStatus == 1"
style=
"color: green"
>
正常
</span>
<span
v-if=
"item.couponStatus == 2"
style=
"color: gray"
>
禁用
</span>
<span
v-if=
"item.couponStatus == 3"
style=
"color: red"
>
删除
</span>
<span
v-if=
"item.couponStatus == 1"
style=
"color: green"
>
{{
$t
(
'pub.normalSel'
)
}}
</span>
<span
v-if=
"item.couponStatus == 2"
style=
"color: gray"
>
{{
$t
(
'active.ld_jinyong'
)
}}
</span>
<span
v-if=
"item.couponStatus == 3"
style=
"color: red"
>
{{
$t
(
'system.ph_shanchu'
)
}}
</span>
</td>
<td>
{{
item
.
createUserName
}}
</td>
<td>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"修改
"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('pub.updateMsg')
"
placement=
"top"
>
<el-button
type=
"primary"
icon=
"el-icon-edit"
circle
@
click=
"outerVisible=true,dialogTitle=
'修改'
,updateData(item),getCompany()"
@
click=
"outerVisible=true,dialogTitle=
$t('pub.updateMsg')
,updateData(item),getCompany()"
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"删除优惠券
"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('active.cl_deleteCoupon')
"
placement=
"top"
>
<el-button
v-if=
"item.couponStatus !== 3"
type=
"danger"
...
...
@@ -162,7 +162,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
...
...
@@ -184,12 +184,12 @@
<table
class=
"layerTable layerNoIcon"
>
<tr>
<td>
<el-form-item
label=
"公司
"
prop=
"branchId"
>
<el-form-item
:label=
"$t('system.table_company')
"
prop=
"branchId"
>
<el-select
filterable
class=
"w217"
v-model=
"addMsg.branchId"
placeholder=
"请选择
"
:placeholder=
"$t('system.ph_choice')
"
>
<el-option
v-for=
"item in layerCompanyList"
...
...
@@ -201,7 +201,7 @@
</el-form-item>
</td>
<td>
<el-form-item
label=
"优惠券名称
"
prop=
"couponsName"
>
<el-form-item
:label=
"$t('active.cl_couponName')
"
prop=
"couponsName"
>
<el-input
maxlength=
"20"
class=
"w217"
...
...
@@ -213,17 +213,17 @@
</td>
</tr>
<td>
<el-form-item
label=
"线路
"
prop=
"lineId"
>
<el-form-item
:label=
"$t('advmanager.v_line')
"
prop=
"lineId"
>
<el-select
filterable
v-model=
"addMsg.lineId"
@
change=
"getLineTeamList(addMsg.lineId)"
>
<el-option
label=
"不限
"
:value=
"0"
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')
"
:value=
"0"
></el-option>
<el-option
v-for=
"item in LineList"
:label=
"item.LineName"
:value=
"item.LineID"
:key=
"item.LineID"
></el-option>
</el-select>
</el-form-item>
</td>
<td>
<el-form-item
label=
"系列
"
prop=
"lineteamId"
>
<el-form-item
:label=
"$t('advmanager.v_xilie')
"
prop=
"lineteamId"
>
<el-select
filterable
v-model=
"addMsg.lineteamId"
>
<el-option
label=
"不限
"
:value=
"0"
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')
"
:value=
"0"
></el-option>
<el-option
v-for=
"item in LineTeamList"
:label=
"item.LtName"
:value=
"item.LtID"
:key=
"item.LtID"
></el-option>
</el-select>
</el-form-item>
...
...
@@ -231,41 +231,41 @@
</tr>
<tr>
<td>
<el-form-item
label=
"优惠券类型
"
prop=
"couponsType"
>
<el-form-item
:label=
"$t('active.cl_couponType')
"
prop=
"couponsType"
>
<el-select
filterable
v-model=
"addMsg.couponsType"
@
change=
"addMsg.denomination = ''"
>
<el-option
label=
"抵用券
"
:value=
"1"
></el-option>
<el-option
label=
"折扣券
"
:value=
"2"
></el-option>
<el-option
:label=
"$t('active.cl_dyquan')
"
:value=
"1"
></el-option>
<el-option
:label=
"$t('active.cl_zkquan')
"
:value=
"2"
></el-option>
</el-select>
</el-form-item>
</td>
<td>
<el-form-item
label=
"优惠券面额
"
prop=
"denomination"
>
<el-form-item
:label=
"$t('active.cl_yhqmiane')
"
prop=
"denomination"
>
<el-input
@
input=
"maxValue"
maxlength=
"20"
class=
"w217"
type=
"number"
v-model=
"addMsg.denomination"
placeholder=
"抵扣金额/折扣
"
:placeholder=
"$t('active.cl_dkjezk')
"
></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item
label=
"优惠券数量
"
prop=
"couponCount"
>
<el-form-item
:label=
"$t('active.cl_couponNum')
"
prop=
"couponCount"
>
<el-input
v-model=
"addMsg.couponCount"
class=
"w217"
type=
"number"
/>
</el-form-item>
</td>
<td>
<el-form-item
label=
"使用条件
"
prop=
"useCondition"
>
<el-input
v-model=
"addMsg.useCondition"
class=
"w217"
placeholder=
"满多少可用
"
/>
<el-form-item
:label=
"$t('active.cl_sytiaojian')
"
prop=
"useCondition"
>
<el-input
v-model=
"addMsg.useCondition"
class=
"w217"
:placeholder=
"$t('active.cl_mdskeyong')
"
/>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item
label=
"生效日期
"
prop=
"effectDate"
>
<el-form-item
:label=
"$t('active.cl_sxriqi')
"
prop=
"effectDate"
>
<el-date-picker
value-format=
"yyyy-MM-dd HH:mm:ss"
class=
"w217"
...
...
@@ -275,7 +275,7 @@
</el-form-item>
</td>
<td>
<el-form-item
label=
"有效截止日
"
prop=
"expirationDate"
>
<el-form-item
:label=
"$t('active.cl_yxjzhiri')
"
prop=
"expirationDate"
>
<el-date-picker
value-format=
"yyyy-MM-dd HH:mm:ss"
class=
"w217"
...
...
@@ -287,31 +287,31 @@
</tr>
<tr>
<td>
<el-form-item
label=
"叠加使用
"
prop=
"overlapUse"
>
<el-form-item
:label=
"$t('active.cl_djshiyong')
"
prop=
"overlapUse"
>
<el-select
filterable
v-model=
"addMsg.overlapUse"
class=
"w217"
>
<el-option
label=
"不允许
"
:value=
"0"
></el-option>
<el-option
label=
"允许
"
:value=
"1"
></el-option>
<el-option
:label=
"$t('active.cl_byxu')
"
:value=
"0"
></el-option>
<el-option
:label=
"$t('active.cl_yuncu')
"
:value=
"1"
></el-option>
</el-select>
</el-form-item>
</td>
<td>
<el-form-item
label=
"状态
"
>
<el-form-item
:label=
"$t('admin.admin_status')
"
>
<el-select
filterable
v-model=
"addMsg.couponStatus"
>
<el-option
label=
"正常
"
:value=
"1"
></el-option>
<el-option
label=
"禁用
"
:value=
"2"
></el-option>
<el-option
label=
"作废
"
:value=
"3"
></el-option>
<el-option
:label=
"$t('pub.normalSel')
"
:value=
"1"
></el-option>
<el-option
:label=
"$t('active.ld_jinyong')
"
:value=
"2"
></el-option>
<el-option
:label=
"$t('active.cl_zuofei')
"
:value=
"3"
></el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item
label=
"适用范围
"
>
<el-form-item
:label=
"$t('active.cl_syfanwei')
"
>
<el-select
filterable
v-model=
"addMsg.couponsUseScope"
>
<el-option
label=
"通用
"
:value=
"1"
></el-option>
<el-option
label=
"团队
"
:value=
"2"
></el-option>
<el-option
label=
"签证
"
:value=
"3"
></el-option>
<el-option
label=
"机票
"
:value=
"4"
></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_qianzheng')
"
:value=
"3"
></el-option>
<el-option
:label=
"$t('active.cl_jipiao')
"
:value=
"4"
></el-option>
</el-select>
</el-form-item>
</td>
...
...
@@ -319,8 +319,8 @@
</table>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible = false,resetForm('addMsg')"
>
取 消
</button>
<button
class=
"normalBtn"
@
click=
"submitForm('addMsg')"
>
保存
</button>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible = false,resetForm('addMsg')"
>
{{
$t
(
'pub.cancelBtn'
)
}}
</button>
<button
class=
"normalBtn"
@
click=
"submitForm('addMsg')"
>
{{
$t
(
'pub.saveBtn'
)
}}
</button>
</div>
</el-dialog>
</div>
...
...
src/components/activity/LuckyDraw.vue
View file @
8f4ea258
...
...
@@ -112,8 +112,8 @@
<em>
{{
$t
(
'active.ld_status'
)
}}
</em>
<el-select
filterable
v-model=
"msg.lotteryStatus"
>
<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-option
:label=
"$t('pub.normalSel')"
:value=
"1"
></el-option>
<el-option
:label=
"$t('active.ld_jinyong')"
:value=
"2"
></el-option>
</el-select>
</span>
</li>
...
...
src/components/activity/awardList.vue
View file @
8f4ea258
...
...
@@ -27,16 +27,16 @@
<td>
{{
item
.
awardWinningCount
}}
</td>
<td>
{{
item
.
awardCount
-
item
.
awardWinningCount
>=
0
?
item
.
awardCount
-
item
.
awardWinningCount
:
0
}}
</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>
<td
v-if=
"item.awardType==1"
>
{{
$t
(
'active.ad_thankCome'
)
}}
</td>
<td
v-if=
"item.awardType==2"
>
{{
$t
(
'active.ad_ybjx'
)
}}
</td>
<td
v-if=
"item.awardType==3"
>
{{
$t
(
'active.ad_yhq'
)
}}
</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>
</td>
...
...
@@ -57,29 +57,29 @@
<table
class=
"layerTable layerNoIcon"
>
<tr>
<td>
<el-form-item
label=
"奖项名
"
prop=
"awardName"
>
<el-input
v-model=
"addMsg.awardName"
class=
"w217"
placeholder=
"奖项名
"
/>
<el-form-item
:label=
"$t('active.ad_adName')
"
prop=
"awardName"
>
<el-input
v-model=
"addMsg.awardName"
class=
"w217"
:placeholder=
"$t('active.ad_adName')
"
/>
</el-form-item>
</td>
<td>
<el-form-item
label=
"奖项数量
"
prop=
"awardCount"
>
<el-form-item
:label=
"$t('active.ad_allNum')
"
prop=
"awardCount"
>
<el-input
v-model=
"addMsg.awardCount"
class=
"w217"
@
keyup
.
native=
"checkInteger(addMsg,'awardCount')"
placeholder=
"奖项数量"
/>
</el-form-item>
</td>
</tr>
<td>
<el-form-item
label=
"奖项类型
"
prop=
"awardType"
>
<el-form-item
:label=
"$t('active.ad_type')
"
prop=
"awardType"
>
<el-select
filterable
v-model=
"addMsg.awardType"
class=
"w217"
@
change=
"getAwardRelationId(addMsg.awardType)"
>
<el-option
label=
"谢谢参与
"
:value=
"1"
></el-option>
<el-option
label=
"一般奖项
"
:value=
"2"
></el-option>
<el-option
label=
"优惠券
"
:value=
"3"
></el-option>
<el-option
:label=
"$t('active.ad_thankCome')
"
:value=
"1"
></el-option>
<el-option
:label=
"$t('active.ad_ybjx')
"
:value=
"2"
></el-option>
<el-option
:label=
"$t('active.ad_yhq')
"
:value=
"3"
></el-option>
</el-select>
</el-form-item>
</td>
<td>
<el-form-item
label=
"奖项关联
"
prop=
"awardRelationId"
v-if=
"addMsg.awardType==3"
>
<el-form-item
:label=
"$t('active.ad_jxgl')
"
prop=
"awardRelationId"
v-if=
"addMsg.awardType==3"
>
<el-select
filterable
v-model=
"addMsg.awardRelationId"
class=
"w217"
>
<el-option
label=
"不限
"
:value=
"0"
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')
"
:value=
"0"
></el-option>
<el-option
v-for=
"item in awardRelationList"
:label=
"item.couponsName"
:value=
"item.couponId"
:key=
"item.couponId"
></el-option>
</el-select>
</el-form-item>
...
...
@@ -87,15 +87,15 @@
</tr>
<tr>
<td>
<el-form-item
label=
"排序
"
prop=
"rank"
>
<el-input
v-model=
"addMsg.rank"
class=
"w217"
@
keyup
.
native=
"checkInteger(addMsg,'rank')"
placeholder=
"排序
"
/>
<el-form-item
:label=
"$t('system.table_rank')
"
prop=
"rank"
>
<el-input
v-model=
"addMsg.rank"
class=
"w217"
@
keyup
.
native=
"checkInteger(addMsg,'rank')"
:placeholder=
"$t('system.table_rank')
"
/>
</el-form-item>
</td>
<td>
<el-form-item
label=
"奖项状态
"
prop=
"awardStatus"
>
<el-form-item
:label=
"$t('active.ad_status')
"
prop=
"awardStatus"
>
<el-select
filterable
v-model=
"addMsg.awardStatus"
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>
...
...
@@ -103,8 +103,8 @@
</table>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible = false"
>
取 消
</button>
<button
class=
"normalBtn"
@
click=
"submitForm('addMsg')"
>
保存
</button>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible = false"
>
{{
$t
(
'pub.cancelBtn'
)
}}
</button>
<button
class=
"normalBtn"
@
click=
"submitForm('addMsg')"
>
{{
$t
(
'pub.saveBtn'
)
}}
</button>
</div>
</el-dialog>
</div>
...
...
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