Skip to content

S
SuperMan
Commit a8927ed3 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

提交抽奖配置 ，配置java测试环境接口地址

parent 990e0d14
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 35 deletions
src/App.vue
View file @ a8927ed3
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
} }
</script> </script>
<style> <style>
@import "//at.alicdn.com/t/font_635492_pz3qcmnou88.css"; @import "//at.alicdn.com/t/font_635492_k0w3yrpxjyg.css";
@import "./assets/css/Semibold.css"; @import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css"; @import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css"; @import "./assets/css/fileIcon.css";
......
src/assets/common/lang/zh.js
View file @ a8927ed3
...@@ -738,6 +738,8 @@ export const active = { ...@@ -738,6 +738,8 @@ export const active = {
cl_wsxiao: '未生效', cl_wsxiao: '未生效',
cl_ygqi: '已过期', cl_ygqi: '已过期',
cl_deleteCoupon: '删除优惠券', cl_deleteCoupon: '删除优惠券',
cl_jyCoupon: '禁用优惠券',
cl_hfCoupon: '恢复优惠券',
cl_couponType: '优惠券类型', cl_couponType: '优惠券类型',
cl_yhqmiane: '优惠券面额', cl_yhqmiane: '优惠券面额',
cl_dkjezk: '抵扣金额/折扣', cl_dkjezk: '抵扣金额/折扣',
...@@ -1300,6 +1302,8 @@ export const tips = { ...@@ -1300,6 +1302,8 @@ export const tips = {
hqsjshibai: '数据获取失败！', hqsjshibai: '数据获取失败！',
accWorkTips: '注：指定银行卡收支方向的单据会自动分发到各个窗口，管理员在设定时应注意以下窗口是否涵盖了所有的业务，如果没有请及时设定，以免造成单据混乱', accWorkTips: '注：指定银行卡收支方向的单据会自动分发到各个窗口，管理员在设定时应注意以下窗口是否涵盖了所有的业务，如果没有请及时设定，以免造成单据混乱',
qrscchuangkou: '确定删除窗口？', qrscchuangkou: '确定删除窗口？',
qrjinyong: '确定禁用',
qrhuifu: '确定恢复',
} }
export const Operation = { export const Operation = {
Op_ShortName:'线路简称', Op_ShortName:'线路简称',
......
src/components/SalesModule/CustomerCertification.vue
View file @ a8927ed3
...@@ -13,7 +13,11 @@ ...@@ -13,7 +13,11 @@
<div class="topMsg"> <div class="topMsg">
<!-- <img v-if="!item.photo" src="../../assets/img/litheader.png"> <!-- <img v-if="!item.photo" src="../../assets/img/litheader.png">
<img v-if="item.photo" :onerror="defaultImg" :src="item.photo"> --> <img v-if="item.photo" :onerror="defaultImg" :src="item.photo"> -->
<p>{{item.CustomerName}}</p> <p>{{item.CustomerName}}
<span v-if="item.ApplyState === 0" class="_status_str _status_str_y">审核中</span>
<span v-if="item.ApplyState === 1" class="_status_str _status_str_g">已通过</span>
<span v-if="item.ApplyState === 2" class="_status_str _status_str_r">已拒绝</span>
</p>
<p class="mt5"> <p class="mt5">
<i class="iconfont icon-img_dianhua fz12" style="color: #09d49d;"></i> <i class="iconfont icon-img_dianhua fz12" style="color: #09d49d;"></i>
<span class="fz14 color333">{{item.Customer}}</span> <span class="fz14 color333">{{item.Customer}}</span>
...@@ -31,19 +35,21 @@ ...@@ -31,19 +35,21 @@
<div class="salesApprovalLayercontentBtn"> <div class="salesApprovalLayercontentBtn">
<p class="fz12 color999 mt5">认证方式：{{item.ApplyType==1?"三证合一":"身份证+名片"}}</p> <p class="fz12 color999 mt5">认证方式：{{item.ApplyType==1?"三证合一":"身份证+名片"}}</p>
<p class="fz12 color999 mt5">申请时间：{{item.CreateDateStr}}</p> <p class="fz12 color999 mt5">申请时间：{{item.CreateDateStr}}</p>
<div v-if="item.CertificationPics&&item.CertificationPics.length>0"> <div v-if="item.CertificationPics&&item.CertificationPics.length>0" class="mt10">
<div v-for="picItem in item.CertificationPics"> <img v-if="!picItem" src="../../assets/img/litheader.png"> <div v-for="picItem in item.CertificationPics" class="img_box">
<img v-if="picItem" :onerror="defaultImg" :src="picItem"></div> <img v-if="!picItem" src="../../assets/img/litheader.png">
<img v-if="picItem" :src="picItem"></div>
</div> </div>
<div> <div>
<span class="fz14 color333">审批意见</span> <span class="fz14 color333">审批意见</span>
</div> </div>
<p class="mt20"> <p class="mt10">
<el-input type="textarea" v-model="Reason"></el-input> <el-input v-if="item.ApplyState === 0" type="textarea" v-model="Reason"></el-input>
<span v-else>Reason</span>
</p> </p>
<input type="button" class="normalBtn mt20 fr" value="通过" @click="saveIdea(item,1)"> <input type="button" class="hollowFixedBtn mt20 fr" value="取消" @click="closeLayer">
<input type="button" class="normalBtn mt20 fr" value="拒绝" @click="saveIdea(item,2)"> <input type="button" class="normalBtn mt20 fr" v-if="item.ApplyState === 0" value="通过" @click="saveIdea(item,1)">
<span class="fr cursorpointer colorE95252" @click="closeLayer">取消</span> <input type="button" class="normalBtn mt20 fr" v-if="item.ApplyState === 0" value="拒绝" @click="saveIdea(item,2)">
</div> </div>
</div> </div>
</div> </div>
...@@ -104,11 +110,12 @@ ...@@ -104,11 +110,12 @@
v-loading="loading" v-loading="loading"
> >
<tr> <tr>
<th width="20%">门店名称</th> <th width="10%">门店名称</th>
<th width="10%">联系人</th> <th width="10%">联系人</th>
<th width="10%">电话</th> <th width="10%">电话</th>
<th width="10%">地址</th> <th width="10%">地址</th>
<th width="10%">申请时间</th> <th width="10%">申请时间</th>
<th width="10%">申请状态</th>
<th width="10%">操作</th> <th width="10%">操作</th>
</tr> </tr>
<tr> <tr>
...@@ -120,6 +127,11 @@ ...@@ -120,6 +127,11 @@
<td>{{item.ContactPhone}}</td> <td>{{item.ContactPhone}}</td>
<td>{{item.Addres}}</td> <td>{{item.Addres}}</td>
<td>{{item.CreateDateStr}}</td> <td>{{item.CreateDateStr}}</td>
<td>
<span v-if="item.ApplyState === 0" class="_status_str _status_str_y">审核中</span>
<span v-if="item.ApplyState === 1" class="_status_str _status_str_g">已通过</span>
<span v-if="item.ApplyState === 2" class="_status_str _status_str_r">已拒绝</span>
</td>
<td> <td>
<input <input
type="button" type="button"
...@@ -270,11 +282,9 @@ export default { ...@@ -270,11 +282,9 @@ export default {
color: #333; color: #333;
} }
.CertificationDetail .list .item { .CertificationDetail .list .item {
width: 380px;
height: auto; height: auto;
overflow: hidden; overflow: hidden;
border: 1px solid #e6e6e6; border: 1px solid #e6e6e6;
margin: 20px 0 20px 20px;
padding: 20px; padding: 20px;
} }
.CertificationDetail .list .item .topMsg { .CertificationDetail .list .item .topMsg {
...@@ -298,9 +308,8 @@ export default { ...@@ -298,9 +308,8 @@ export default {
padding: 15px 0; padding: 15px 0;
} }
.CertificationDetail .list .itemAnswer { .CertificationDetail .list .itemAnswer {
width: 380px;
height: auto; height: auto;
margin: 20px 0 20px 20px; margin: 20px;
padding: 20px; padding: 20px;
background: #ebf0ff; background: #ebf0ff;
} }
...@@ -373,4 +382,22 @@ export default { ...@@ -373,4 +382,22 @@ export default {
.salesApprovalLayercontentDiv { .salesApprovalLayercontentDiv {
width: 450px !important; width: 450px !important;
} }
.salesApprovalLayercontentBtn .img_box img{
height: 120px;
}
._status_str{
float: right;
}
._status_str_y{
color: #E6A23C;
}
._status_str_g{
color: #67C23A;
}
._status_str_r{
color: #F56C6C;
}
td ._status_str{
float: initial
}
</style> </style>
\ No newline at end of file
src/components/activity/CouponList.vue
View file @ a8927ed3
...@@ -17,9 +17,16 @@ ...@@ -17,9 +17,16 @@
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
/* .page_CouponList .el-button.is-circle{
border-radius: 4px
} */
.text_al_left{
text-align: left;
padding: 0 10px;
}
</style> </style>
<template> <template>
<div class="flexOne"> <div class="flexOne page_CouponList">
<div class="query-box"> <div class="query-box">
<ul class="user_time_picker"> <ul class="user_time_picker">
<li> <li>
...@@ -141,24 +148,45 @@ ...@@ -141,24 +148,45 @@
<span v-if="item.couponStatus == 3" style="color: red">{{$t('system.ph_shanchu')}}</span> <span v-if="item.couponStatus == 3" style="color: red">{{$t('system.ph_shanchu')}}</span>
</td> </td>
<td>{{item.createUserName}}</td> <td>{{item.createUserName}}</td>
<td> <td class="text_al_left">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top"> <!-- <el-button-group> -->
<el-button <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
type="primary" <el-button
icon="el-icon-edit" v-if="item.couponEffectStatus === 2 && item.couponStatus === 1"
circle type="primary"
@click="outerVisible=true,dialogTitle=$t('pub.updateMsg'),updateData(item),getCompany()" icon="el-icon-edit"
></el-button> circle
</el-tooltip> @click="outerVisible=true,dialogTitle=$t('pub.updateMsg'),updateData(item),getCompany()"
<el-tooltip class="item" effect="dark" :content="$t('active.cl_deleteCoupon')" placement="top"> ></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('active.cl_jyCoupon')" placement="top">
<el-button <el-button
v-if="item.couponStatus !== 3" v-if="item.couponStatus !== 2"
type="danger" type="danger"
icon="iconfont icon-img_delete_small" icon="iconfont icon-jinyong"
circle circle
@click="deleteItem(item)" @click="deleteItem(item, 2)"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('active.cl_hfCoupon')" placement="top">
<el-button
v-if="item.couponStatus === 2"
type="success"
icon="iconfont icon-huifu"
circle
@click="deleteItem(item, 3)"
></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('active.cl_deleteCoupon')" placement="top">
<el-button
v-if="item.couponStatus === 2"
type="danger"
icon="iconfont icon-img_delete_small"
circle
@click="deleteItem(item)"
></el-button>
</el-tooltip>
<!-- </el-button-group> -->
</td> </td>
</tr> </tr>
</table> </table>
...@@ -536,13 +564,22 @@ export default { ...@@ -536,13 +564,22 @@ export default {
this.isleaveBtn = true; this.isleaveBtn = true;
}, },
// 删除 // 删除
deleteItem: function (item) { deleteItem: function (item, type) {
this.$confirm(this.$t('tips.qrsc')+'“'+ item.couponsName +'”'+this.$t('tips.scyhquan'), this.$t('tips.tips'), { let text = this.$t('tips.qrsc');
let status = 3;
if (type == 2) {
text = this.$t('tips.qrjinyong');
status = 2
} else if (type == 3) {
text = this.$t('tips.qrhuifu');
status = 1
}
this.$confirm(text+'“'+ item.couponsName +'”'+this.$t('active.ad_yhq'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'), confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.apiJavaPost("/api/sell/coupon/updateCouponStatus", {couponId: item.id, status: 3,}, res => { this.apiJavaPost("/api/sell/coupon/updateCouponStatus", {couponId: item.id, status: status,}, res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.getList(); this.getList();
......
src/plug/index.js
View file @ a8927ed3
...@@ -118,9 +118,9 @@ export default { ...@@ -118,9 +118,9 @@ export default {
let domainUrl = ''; let domainUrl = '';
let locationName = window.location.hostname; let locationName = window.location.hostname;
// domainUrl = "http://192.168.2.65:8025"; //214主域名 // domainUrl = "http://192.168.2.65:8025"; //214主域名
// domainUrl = "http://192.168.2.214:8082"; //214主域名 domainUrl = "http://192.168.2.214:8082"; //214主域名
// domainUrl = "http://192.168.0.119:8082"; // domainUrl = "http://192.168.0.119:8082";
domainUrl = "http://192.168.2.16:8083"; // domainUrl = "http://192.168.2.16:8083";
if (locationName.indexOf('oytour') !== -1) { if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com"; domainUrl = "http://reborn.oytour.com";
} else if (locationName.indexOf('viitto') !== -1) { } else if (locationName.indexOf('viitto') !== -1) {
...@@ -151,7 +151,7 @@ export default { ...@@ -151,7 +151,7 @@ export default {
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120", UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
//文件站点 //文件站点
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130', ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://efficient.oytour.com" : "http://192.168.2.215:9000", javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
}; };
return obj; return obj;
}, },
......
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