Skip to content

S
SuperMan
Commit 05201f5f authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 9b5e9143 7c4854cb
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 33 deletions
src/assets/common/lang/zh-tw.js
View file @ 05201f5f
......@@ -102,7 +102,7 @@ export const login = {
login_password: "請輸入密碼",
login_btn: '登入',
login_forgetpwd:'忘記密碼',
login_h2_trps:'歡迎登陸',
login_h2_trps:'歡迎登录',
}
export const system = {
label_zhifei:'直飛',
......
src/assets/common/lang/zh.js
View file @ 05201f5f
......@@ -103,7 +103,7 @@ export const login = {
login_password: "请输入密码",
login_btn: '登录',
login_forgetpwd:'忘记密码',
login_h2_trps:'欢迎登陆',
login_h2_trps:'欢迎登录',
}
export const system = {
label_zhifei:'直飞',
......
src/assets/common/lang/zhCN/fill.js
View file @ 05201f5f
......@@ -374,9 +374,9 @@ export const obj = {
danyemianmsts: '单页面多标签模式（此模式适合电脑性能高的用户）',
duoyemianmsts: '多页面单标签模式（此模式适合电脑性能较低的用户）',
querenxuanzhe: '确认选择',
denglu: '登陆',
dengluzhong: '登陸中...',
xiacizidongdl: '下次自動登陸',
denglu: '登录',
dengluzhong: '登录中...',
xiacizidongdl: '下次自動登录',
bangdinshoujihao: '绑定手机号',
yanzhengma: '验证码',
huoquyanzhengma: '获取验证码',
......
src/assets/common/lang/zhTW/fill.js
View file @ 05201f5f
......@@ -374,9 +374,9 @@ export const obj = {
danyemianmsts: '單頁面多標簽模式（此模式適合電腦性能高的用戶）',
duoyemianmsts: '多頁面單標簽模式（此模式適合電腦性能較低的用戶）',
querenxuanzhe: '確認選擇',
denglu: '登陸',
dengluzhong: '登陸中...',
xiacizidongdl: '下次自動登陸',
denglu: '登录',
dengluzhong: '登录中...',
xiacizidongdl: '下次自動登录',
bangdinshoujihao: '綁定手機號',
yanzhengma: '驗證碼',
huoquyanzhengma: '獲取驗證碼',
......
src/components/SalesModule/CouponsList.vue
View file @ 05201f5f
......@@ -238,10 +238,10 @@
</span>
</span>
<el-dropdown-menu class="changelanguage" slot="dropdown">
<el-dropdown-item
@click.native="dropdownText = $t('pub.unlimitedSel'), msg.couponsUseScope = 0, getList(), resetPageIndex()">{{$t('pub.unlimitedSel')}}
<el-dropdown-item v-for="(item,index) in ScopeOfUseList" :key="index"
@click.native="dropdownText = $t('pub.unlimitedSel'), msg.CouponsUseScope = item.Id, getList(), resetPageIndex()">{{ item.Name }}
</el-dropdown-item>
<el-dropdown-item
<!-- <el-dropdown-item
@click.native="dropdownText = $t('active.cl_tongyong'), msg.couponsUseScope = 1, getList(), resetPageIndex()">{{$t('active.cl_tongyong')}}
</el-dropdown-item>
<el-dropdown-item
......@@ -257,25 +257,25 @@
</el-dropdown-item>
<el-dropdown-item
@click.native="dropdownText = $t('hotel.hotel'), msg.couponsUseScope = 10, getList(), resetPageIndex()">{{$t('hotel.hotel')}}
</el-dropdown-item>
</el-dropdown-item> -->
</el-dropdown-menu>
</el-dropdown>
</li>
<li>
<span class="__cp" :class="{_active: typeActive === 1 }"
@click="typeActive = 1, msg.couponsType = 0, msg.couponEffectStatus = 1, getList(), resetPageIndex()">{{$t('objFill.quanbuyouhuiquan')}}</span>
@click="typeActive = 1, msg.CouponStatus = 0, msg.CouponsType = 0, getList(), resetPageIndex()">{{$t('objFill.quanbuyouhuiquan')}}</span>
</li>
<li>
<span class="__cp" :class="{_active: typeActive === 2 }"
@click="typeActive = 2, msg.couponsType = 2, msg.couponEffectStatus = 1, getList(), resetPageIndex()">{{$t('active.cl_zkquan')}}</span>
@click="typeActive = 2, msg.CouponsType = 2, msg.CouponStatus = 1, getList(), resetPageIndex()">{{$t('active.cl_zkquan')}}</span>
</li>
<li>
<span class="__cp" :class="{_active: typeActive === 3 }"
@click="typeActive = 3, msg.couponsType = 1, msg.couponEffectStatus = 1, getList(), resetPageIndex()">{{$t('objFill.dikouquan')}}</span>
@click="typeActive = 3, msg.CouponsType = 1, msg.CouponStatus = 1, getList(), resetPageIndex()">{{$t('objFill.dikouquan')}}</span>
</li>
<li>
<span class="__cp" :class="{_active: typeActive === 4 }"
@click="typeActive = 4, msg.couponEffectStatus = 3, getList(), resetPageIndex()">{{$t('active.cl_ygqi')}}</span>
@click="typeActive = 4,msg.CouponsType=0, msg.CouponStatus = 3, getList(), resetPageIndex()">{{$t('active.cl_ygqi')}}</span>
</li>
</ul>
</el-row>
......@@ -314,36 +314,49 @@
pageSize: 1,
msg: {
pageIndex: 1,
pageSize: 8,
useState: 1,
lineId: 0,
lineteamId: 0,
couponsName: "",
couponsType: "",
couponStatus: 1,
couponEffectStatus: 1,
couponsUseScope: 0,
userId: '',
pageSize: 14,
userId: 0, //CustomerAccountId
lineId: 0, //线路
lineteamId: 0, //系列ID
CustomerType: 0, //0-同行，1-直客
CouponStatus: 0, //1未使用 2已使用 3已过期
CouponsUseScope: -1, //优惠券使用范围 有枚举
FromPlatform: 0, //来源平台 1app 2小程序
CouponsType: 0, //优惠券类型 1：抵用券，2：折扣卷
},
dataList: [],
dataLoading: false,
currentPage: 1,
Count: 1,
ScopeOfUseList: [],
};
},
computed: {},
created() {},
mounted() {
this.getScopeOfUse()
this.getList();
if (this.$route.query.customerId) {
this.msg.userId = this.$route.query.customerId;
}
},
methods: {
getScopeOfUse() {
this.apipost("coupon_post_GetCouponAllotOrderTypeEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.ScopeOfUseList = res.data.data
this.ScopeOfUseList.unshift({
Id: -1,
Name: '不限'
})
}
}, (error) => {
})
},
// 获取数据
getList() {
this.dataLoading = true;
this.apiJavaPost("/api/b2b/user/getUserCouponAllotList",
this.apipost("coupon_post_GetUserCanUseCouponPageList",
this.msg,
res => {
let nowTime = moment().format("YYYY-MM-DD HH:mm:ss");
......@@ -369,7 +382,6 @@
null
);
},
//查询初始化页码
resetPageIndex() {
this.msg.pageIndex = 1;
......
src/components/SalesModule/SmallComponents/Coupon.vue
View file @ 05201f5f
......@@ -128,7 +128,7 @@ p._info_coupon_name{
<img v-if="item.fromPlatform=='2'" src="../../../assets/img/yhq/xcx.png" alt="">
<img v-if="item.fromPlatform=='3'" src="../../../assets/img/yhq/pc.png" alt="">
</div>
<div class="_top" :class="{'_blue':item.couponsType===1,'_gray':item.couponEffectStatus===3 || !Platfrom(item.fromPlatform)}">
<div class="_top" :class="{'_blue':item.couponsType===1,'_gray': !Platfrom(item.fromPlatform)}">
<div class="_top_raduis">
<span></span>
<span></span>
......@@ -148,7 +148,7 @@ p._info_coupon_name{
</div>
<div class="_overdue" v-if="item.warning">{{$t('objFill.v101.Rest.jijianguoqi')}}</div>
<div class="_info_details">
<p class="_info_coupon_name" :title="item.couponsName">{{item.couponsName}}</p>
<p class="_info_coupon_name" :title="item.couponName">{{item.couponName}}</p>
<p class="_info_sale" v-if="item.couponsType !== 1">
{{item.denomination}}
<span>{{$t('objFill.v101.Rest.zhe')}}</span>
......@@ -158,7 +158,7 @@ p._info_coupon_name{
{{item.denomination}}
</p>
<p class="_info_full">{{$t('active.cl_man')}}{{item.useCondition}}{{$t('active.cl_keyong')}}</p>
<p class="_info_time _time">{{$t('objFill.v101.Rest.youxiaoshijian')}}：{{item.effectDate | YMD}}-{{item.expirationDate | YMD}}</p>
<p class="_info_time _time">{{$t('objFill.v101.Rest.youxiaoshijian')}}：{{item.effectDate}}-{{item.expirationDate}}</p>
<p class="_info_bottom" @click="goUrl('heel',true)">{{$t('objFill.v101.Rest.qushiyong')}}</p>
</div>
</div>
......@@ -166,7 +166,7 @@ p._info_coupon_name{
<p class="_bottom_tit">{{$t('objFill.v101.Rest.keyongxljxl')}}</p>
<p
class="_bottom_info"
>{{item.lineName === '' ? $t('pub.unlimitedSel') : item.lineName}}-{{item.lineTeamName === '' ? $t('pub.unlimitedSel') : item.lineTeamName}}</p>
>{{item.lineNameStr === '' ? $t('pub.unlimitedSel') : item.lineNameStr}}-{{item.lineteamNameStr === '' ? $t('pub.unlimitedSel') : item.lineteamNameStr}}</p>
<p class="_bottom_tit">{{$t('objFill.v101.Rest.youhuiqly')}}</p>
<p class="_bottom_info _margin_bt0">{{item.remark}}</p>
</div>
......
src/store/actions/initNimSDK.js
View file @ 05201f5f
......@@ -62,7 +62,7 @@ export function initNimSDK ({ state, commit, dispatch }, loginInfo) {
WindowsPhone: '手机版'
}
let str = error.from
let errorMsg = '你的帐号已在其他地方登陆'// `你的帐号于${util.formatDate(new Date())}被${(map[str] || '其他端')}踢出下线，请确定帐号信息安全!`
let errorMsg = '你的帐号已在其他地方登录'// `你的帐号于${util.formatDate(new Date())}被${(map[str] || '其他端')}踢出下线，请确定帐号信息安全!`
// pageUtil.turnPage(errorMsg, 'login')
// ipc.send('signOut')
break
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment