Skip to content

A
Athena
Commit 74864b22 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

完善抽奖活动，

parent 44413693
Hide whitespace changes
Inline Side-by-side
Showing with 259 additions and 76 deletions
src/App.vue
View file @ 74864b22
......@@ -59,7 +59,7 @@ export default {
<style>
@import './assets/global/font.css';
@import '//at.alicdn.com/t/font_863923_l5hnd05afw.css';
@import '//at.alicdn.com/t/font_863923_lbsx2a06sr.css';
@import './assets/global/global.css';
body,html{
padding: 0px;
......
src/assets/mall/PsSystem.css
View file @ 74864b22
......@@ -196,7 +196,9 @@
padding: 10px;
}
._link{
color: blue;
color: #47A5FF !important;
cursor: pointer;
font-weight: 700;
}
.Authentication_tips{
background-color: white;
......@@ -213,4 +215,13 @@
.Authentication_tips i.iconfont {
font-size: 120px;
color: #ccc;
}
._status_str_y{
color: #E6A23C !important;
}
._status_str_g{
color: #67C23A !important;
}
._status_str_r{
color: #F56C6C !important;
}
\ No newline at end of file
src/components/ActivityCenter/TurnaroundDraw.vue
View file @ 74864b22
......@@ -122,6 +122,7 @@
}
.page_TurnaroundDraw .main_box .info_box .info_right .info_right_roll ul li>span._name{
max-width: 60px;
min-width: 60px;
}
.page_TurnaroundDraw .main_box .info_box .info_right .info_right_roll ul li>span._acc{
max-width: 72px;
......@@ -229,60 +230,10 @@
<img src="../../assets/img/active/active_tittle.png" alt="">
<div class="info_right_roll">
<ul id="RollBox">
<li>
<span class="_name">非法所得发</span>
<span class="_acc">158****1254</span>
<span class="_last">抽中<span class="_prize">满2000元减500元券</span></span>
</li>
<li>
<span class="_name">非法所得发</span>
<span class="_acc">158****1254</span>
<span class="_last">抽中<span class="_prize">满2000元减500元券</span></span>
</li>
<li>
<span class="_name">非法所得发</span>
<span class="_acc">158****1254</span>
<span class="_last">抽中<span class="_prize">满2000元减500元券</span></span>
</li>
<li>
<span class="_name">非法所得发</span>
<span class="_acc">158****1254</span>
<span class="_last">抽中<span class="_prize">满2000元减500元券</span></span>
</li>
<li>
<span class="_name">非法所得发</span>
<span class="_acc">158****1254</span>
<span class="_last">抽中<span class="_prize">满2000元减500元券</span></span>
</li>
<li>
<span class="_name">非法所得发</span>
<span class="_acc">158****1254</span>
<span class="_last">抽中<span class="_prize">满2000元减500元券</span></span>
</li>
<li>
<span class="_name">非法所得发</span>
<span class="_acc">158****1254</span>
<span class="_last">抽中<span class="_prize">满2000元减500元券</span></span>
</li>
<li>
<span class="_name">非法所得发</span>
<span class="_acc">158****1254</span>
<span class="_last">抽中<span class="_prize">满2000元减500元券</span></span>
</li>
<li>
<span class="_name">非法所得发</span>
<span class="_acc">158****1254</span>
<span class="_last">抽中<span class="_prize">满2000元减500元券</span></span>
</li>
<li>
<span class="_name">非法所得发</span>
<span class="_acc">158****1254</span>
<span class="_last">抽中<span class="_prize">满2000元减500元券</span></span>
</li>
<li>
<span class="_name">非法所得发</span>
<span class="_acc">158****1254</span>
<span class="_last">抽中<span class="_prize">满2000元减500元券</span></span>
<li v-for="item in TaskLotteryWinningList">
<span class="_name">{{item.userName}}</span>
<span class="_acc">{{item.mobile}}</span>
<span class="_last">抽中<span class="_prize">{{item.awardName}}</span></span>
</li>
</ul>
</div>
......@@ -327,10 +278,11 @@ export default {
insideRadius: 68, //大转盘内圆的半径
startAngle: 0, //开始角度
bRotate: false, //false:停止;ture:旋转
time: 2000,
time: 5000,
noBegun: false
},
LotteryAward: [],
TaskLotteryWinningList: [],
lotteryId: 0,
remainingCount: 0,
showTips: false,
......@@ -360,6 +312,7 @@ export default {
"#5fcbd5"
];
this.getChouJiang();
this.startmarquee('30', 20, 0, 'RollBox')
},
methods: {
getChouJiang: function () {
......@@ -408,7 +361,16 @@ export default {
this.LotteryAward = LotteryAward
}
this.drawRouletteWheel();
this.startmarquee('30', 20, 0, 'RollBox')
this.getTaskLotteryWinningList();
},null)
},
getTaskLotteryWinningList: function() {
this.apiJavaPost('/api/b2b/lottery/getTaskLotteryWinningList',{lotteryId: this.lotteryId, pageIndex: 1 ,pageSize: 20},res=>{
if(res.data.resultCode==1){
this.TaskLotteryWinningList = res.data.data.pageData
}else{
this.Error(res.data.message);
}
},null)
},
getCishu: function () {
......@@ -438,7 +400,8 @@ export default {
setTimeout(() => {
_this.text1= '很遗憾';
_this.text2= '未中奖';
this.showTips = true;
_this.showTips = true;
_this.getTaskLotteryWinningList()
}, this.turnplate.time)
}
})
......@@ -459,6 +422,7 @@ export default {
_this.text2= res.data.data.awardName;
}
_this.showTips = true;
_this.getTaskLotteryWinningList()
}, this.turnplate.time)
}
})
......
src/components/DependentTravel/IndependentTravel.vue
View file @ 74864b22
......@@ -15,7 +15,7 @@
<img class="right1" src="../../assets/img/travel/right1.png" alt>
<el-row class="max-w1500" :gutter="0">
<el-col :span="18" :offset="3">
<div class="pro_list">
<!-- <div class="pro_list">
<div @mouseenter="enter(0)" @mouseleave="leave">
<img v-if="prolist==0" src="../../assets/img/travel/hover0.png" alt>
<p>大阪</p>
......@@ -46,8 +46,57 @@
<p class="fg"></p>
<p>Mount Fuji</p>
</div>
</div>
</div> -->
<!-- 当季精选特惠 -->
<div class="_top_box clearfix">
<div class='wrap'>
<div class='left common'></div>
<div class='right common'></div>
<img src="../../assets/img/travel/top_1.png" alt="">
<p>快速提交需求单</p>
</div>
<div class="partition">
<span></span>
<span></span>
<span></span>
</div>
<div class='wrap'>
<div class='left common'></div>
<div class='right common'></div>
<img src="../../assets/img/travel/top_2.png" alt="">
<p>免费发送方案</p>
</div>
<div class="partition">
<span></span>
<span></span>
<span></span>
</div>
<div class='wrap'>
<div class='left common'></div>
<div class='right common'></div>
<img src="../../assets/img/travel/top_3.png" alt="">
<p>沟通确认行程</p>
</div>
<div class="partition">
<span></span>
<span></span>
<span></span>
</div>
<div class='wrap'>
<div class='left common'></div>
<div class='right common'></div>
<img src="../../assets/img/travel/top_4.png" alt="">
<p>签合同出行</p>
</div>
<div class="partition_last">
<span>></span>
</div>
<div class='wrap wrap2'>
<div class='left common'></div>
<div class='right common'></div>
<p>立即定制</p>
</div>
</div>
<div style="margin-top:40px">
<p style="text-align:center;font-family:PingFang-SC-Regular;">Hot areas in the season</p>
<div class="djjx">
......@@ -322,7 +371,7 @@
<span class="cont_bottom cont_bottom3">选择定制师定制你的专属行程</span>
</div>
</div>
<el-col :span="18" :offset="3" class="clearfix _item_box">
<!-- <el-col :span="18" :offset="3" class="clearfix _item_box">
<div class="_line"></div>
<div class="_content">
<div class="_t1 _t_item">
......@@ -351,7 +400,7 @@
<p class="_text">签订合同愉快出行</p>
</div>
</div>
</el-col>
</el-col> -->
<el-col :span="18" :offset="3" class="clearfix _someone">
<div class="_someone_item" @click="goPersonalTailor">
<div class="_someone_item_top">
......@@ -405,9 +454,45 @@
</div>
</div>
</div>
</el-col>
</el-col>
</el-row>
<div class="footer"></div>
<div class="footer">
<el-row>
<div class="footer_box">
<p>我们将提供什么？</p>
<el-row>
<el-col :span="6">
<div class="f_font_box">
<i class="iconfont icon-xihao"></i>
</div>
<p class="f_tit">拒绝程式化</p>
<p class="f_tit_s">自己掌握行程定制</p>
</el-col>
<el-col :span="6">
<div class="f_font_box">
<i class="iconfont icon-zhuguan"></i>
</div>
<p class="f_tit">1800+专业定制师</p>
<p class="f_tit_s">获取更高性价比的旅游线路</p>
</el-col>
<el-col :span="6">
<div class="f_font_box">
<i class="iconfont icon-wodefangan"></i>
</div>
<p class="f_tit">免费制作行程方案</p>
<p class="f_tit_s">旅游计划更省心</p>
</el-col>
<el-col :span="6">
<div class="f_font_box">
<i class="iconfont icon-service"></i>
</div>
<p class="f_tit">一站式服务</p>
<p class="f_tit_s">省去做攻略、预订资源的繁琐流程</p>
</el-col>
</el-row>
</div>
</el-row>
</div>
</div>
</template>
<script>
......@@ -612,10 +697,14 @@ export default {
position: absolute;
z-index: 2;
}
._someone{
margin-top: 40px;
}
._someone_item{
float: left;
cursor: pointer;
margin-right: 80px;
}
._someone_item_last{
margin-right: 0
......@@ -910,4 +999,118 @@ p {
border-radius: 100%;
background: #fff; */
}
._top_box{
height: 200px;
margin-top: 80px;
}
._top_box .wrap{
height: 80px;
width: 137px;
position: relative;
border-radius: 5px;
border:1px solid rgba(226, 178, 209, 1);
border-top: 0;
border-bottom: 0;
text-align: center;
float: left;
/* box-shadow:0px 1px 8px 0px rgba(164, 95, 17, 0.35); */
}
._top_box .wrap2{
background:rgba(71,165,255,1);
}
._top_box .wrap2 .common{
background:rgba(71,165,255,1);
}
._top_box .wrap2 P{
color: white;
font-weight: 800;
margin-top: 35px;
}
.wrap img{
position: relative;
top: -10px;
left: 5px;
}
.wrap p{
position: relative;
top: -10px;
}
._top_box .common{
position: absolute;
height: 100%;
width: 100%;
overflow: hidden;
left:0;
border:1px solid rgba(226, 178, 209, 1);
/* box-shadow:0px 1px 8px 0px rgba(164, 95, 17, 0.35); */
border-radius: 5px;
border-top: 0;
border-bottom: 0;
}
._top_box .left{
transform: rotate(60deg);
}
._top_box .right{
transform: rotate(-60deg);
}
.partition,.partition_last{
width: 80px;
float: left;
display: flex;
justify-content: space-around;
padding: 27px 15px 0 12px;
}
.partition span{
display: inline-block;
height: 12px;
width: 12px;
border-radius: 50%;
background-color: #E8E8E8;
}
.partition_last span{
width:38px;
height:38px;
background:rgba(205,182,214,1);
opacity:0.75;
border-radius:50%;
text-align: center;
line-height: 38px;
font-size: 14px;
font-weight: 800;
color: white
}
.footer{
}
.footer .footer_box{
height: 340px;
padding: 50px 50px 0 50px;
text-align: center;
background-color: rgba(255, 255, 255, 0.8);
width: 1200px;
margin: 80px auto 0 auto;
}
.footer_box>p{
font-weight: bold;
font-size: 18px;
}
.f_font_box{
height: 120px;
width: 120px;
border-radius: 8px;
background-color: white;
line-height: 120px;
margin: 25px auto;
}
.footer_box p.f_tit_s{
font-size: 14px;
color: #999999;
margin-top: 10px;
}
.f_font_box i{
font-size: 50px;
background-image: -webkit-gradient(linear, left 0, right 0, from(rgba(71,121,255,1)), to(rgba(71,165,255,1)));
-webkit-background-clip: text; /*必需加前缀 -webkit- 才支持这个text值 */
-webkit-text-fill-color: transparent; /*text-fill-color会覆盖color所定义的字体颜色： */
}
</style>
src/components/PersonalCenter/PsMyCoupon.vue
View file @ 74864b22
......@@ -8,6 +8,7 @@
<el-col :span="20" :offset="2" class="_content">
<el-row class="_el_tab">
<ul>
<li :class="active==3?'active':''" @click="active=3, msg.couponsUseScope = 1, getList(), resetPageIndex()">通用</li>
<li :class="active==0?'active':''" @click="active=0, msg.couponsUseScope = 2, getList(), resetPageIndex()">跟团游</li>
<li :class="active==1?'active':''" @click="active=1, msg.couponsUseScope = 4, getList(), resetPageIndex()">机票</li>
<li :class="active==2?'active':''" @click="active=2, msg.couponsUseScope = 3, getList(), resetPageIndex()">签证</li>
......@@ -87,7 +88,7 @@ export default {
},
data(){
return {
active: 0,
active: 3,
activeSub: 0,
totalCount: 20,
pageSize: 1,
......@@ -101,7 +102,7 @@ export default {
couponsType: '',
couponStatus: 1,
couponEffectStatus: 1,
couponsUseScope: 2,
couponsUseScope: 1,
},
dataList: [{a:1}],
dataLoading: false,
......
src/components/PersonalCenter/PsSystem.vue
View file @ 74864b22
......@@ -264,21 +264,21 @@
<div v-else>
<el-row v-if="Verification[0].ApplyState === 0" class="Authentication_tips">
<div>
<i class="iconfont icon-dkw_shenhezhong"></i>
<i class="iconfont icon-dkw_shenhezhong _status_str_y"></i>
</div>
<p >您的认证资料正在审核中。</p>
<p class="_status_str_y">您的认证资料正在审核中。</p>
</el-row>
<el-row v-else-if="Verification[0].ApplyState === 2" class="Authentication_tips">
<div>
<i class="iconfont icon-shenheshibai"></i>
<i class="iconfont icon-shenheshibai _status_str_r"></i>
</div>
<p>您的认证审核已经被拒绝，请 <span class="_link" @click="againUpLoad = true">重新上传资料</span> 进行认证！</p>
<p class="_status_str_r">您的认证审核已经被拒绝，请 <span class="_link" @click="againUpLoad = false">重新上传资料</span> 进行认证！</p>
</el-row>
<el-row v-else-if="Verification[0].ApplyState === 1" class="Authentication_tips">
<div>
<i class="iconfont icon-dkw_shenhetongguo"></i>
<i class="iconfont icon-dkw_shenhetongguo _status_str_g"></i>
</div>
<p >已认证。</p>
<p class="_status_str_g">已认证。</p>
</el-row>
</div>
</div>
......@@ -333,6 +333,7 @@ export default {
CertificationPics: [],
CustomerID: 0,
ApplyType: 0,
ID: 0,
},
showImg1: '',
showImg2: '',
......@@ -358,7 +359,9 @@ export default {
methods: {
subImg(){ // 提交审核
let userInfo = this.getLocalStorage();
this.VerificationMsg.CustomerID = userInfo.customerId
this.VerificationMsg.CustomerID = userInfo.customerId;
this.VerificationMsg.ApplyType = this.subTit;
this.VerificationMsg.ID = this.Verification[0] ? this.Verification[0].ID : 0;
this.apipost("app_customer_SetCertification", this.VerificationMsg, res => {
if (res.data.resultCode == 1) {
console.log(res.data.data)
......
src/components/trade/order/indexTwo.vue
View file @ 74864b22
......@@ -286,9 +286,9 @@
</el-col>
<el-col class="_trip_xiangqing _coupon_box">
<p style="width:100%">优惠券</p>
<p v-if="Verification[0].ApplyState !== 2" class="_trip_xiangqing_tips">您还为进行 <span @click="goShenqing">实名认证</span>，认证后可使用优惠券哦~如果已提认证申请，申请审核通过后即可使用优惠券！</p>
<p v-if="Verification.length && Verification[0].ApplyState !== 1" class="_trip_xiangqing_tips">您还为进行 <span @click="goShenqing">实名认证</span>，认证后可使用优惠券哦~如果已提认证申请，申请审核通过后即可使用优惠券！</p>
<div v-if="UserCanUseCouponList.length>0" class="_coupon_box">
<div class="_coupon_item" v-for="(item, index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab': Verification[0].ApplyState !== 2}" @click="Verification[0].ApplyState !== 2 ? '' : clickCoupon(item)">
<div class="_coupon_item" v-for="(item, index) in UserCanUseCouponList" :class="{'blue':item.couponsType===1,'_active':item.active,'disab': Verification.length && Verification[0].ApplyState !== 1}" @click="Verification.length && Verification[0].ApplyState !== 1 ? '' : clickCoupon(item)">
<div class="_left_raduis">
<span></span>
<span></span>
......@@ -438,6 +438,7 @@ export default {
label: '北京烤鸭'
}],
value8: '',
blankUrl: '',
pickerOptions:{
disabledDate(time) {
let isHave=true
......
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