Skip to content

A
Athena
Commit 6006d1f0 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

parents d1370027 74864b22
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3558 additions and 1079 deletions
public/index.html
View file @ 6006d1f0
This diff is collapsed.
src/App.vue
View file @ 6006d1f0
......@@ -29,7 +29,6 @@ export default {
B2BDomain:window.location.host.split(':')[0]
}
this.apipost('admin_get_GetGroupDomain',msg,r=>{
// console.log("res",r);
let g={}
g.i=r.data.data.GroupId
g.n=r.data.data.GroupName
......@@ -38,7 +37,7 @@ export default {
},null)
}
document.body.style.minWidth=(screen.availWidth-50)+'px';
this.$refs.wrap.wrap.addEventListener('scroll', this.handleScroll);
this.$refs.wrap.wrap.addEventListener('scroll', this.handleScroll);
let userInfo = this.getLocalStorage();
if(userInfo&&userInfo.account){
this.$store.commit('changeLogin',1);
......@@ -60,7 +59,7 @@ export default {
<style>
@import './assets/global/font.css';
@import '//at.alicdn.com/t/font_863923_lzf5ymeg5ss.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 @ 6006d1f0
.PsSystem{padding-top: 20px;}
.PsSystem{padding-top: 20px; background-color: #F5F5F5;}
.PsSystem ._left{
min-height: 600px;
background-color: #F2F2F2;
background-color: #ffffff;
}
.PsSystem ._left ul{padding: 0;}
.PsSystem ._left ul li{list-style: none;}
......@@ -14,7 +14,7 @@
font-size: 14px;
cursor: pointer;
display: flex;
align-items: center;
align-items: center;
padding:15px 20px;
justify-content: space-between;
}
......@@ -69,4 +69,159 @@
width: 100% !important;
}
.PsSystem .el-tag {margin-right: 10px;}
.PsSystem ._input_style ._tags{margin-right: 10px;}
\ No newline at end of file
.PsSystem ._input_style ._tags{margin-right: 10px;}
.PsSystem .Authentication ._real_name {
height: 70px;
}
.PsSystem .Authentication ._real_name ._rn_tit{
height: 58px;
font-size: 18px;
color: #5079ED;
background-color: white;
border:1px solid rgba(80,121,237,1);
text-align: center;
line-height: 58px;
cursor: pointer;
}
.PsSystem .Authentication ._real_name ._rn_tit._active{
background-color: #5079ED;
color: white;
font-weight: bold;
}
.kailong{
width:0;
height:0;
border-right: 10px solid transparent;
border-left: 10px solid transparent;
border-top: 10px solid #5079ed;
margin: 0 auto;
}
.Authentication ._at_tips{
height: 100px;
padding: 20px 100px;
background-color: white;
margin:20px 0px;
}
.Authentication ._at_tips p{
font-size: 12px;
color: #666666;
margin: 0;
}
.Authentication ._at_tips p._at_tips_tit{
font-size: 16px;
font-weight: bold;
color: #333333;
margin-bottom: 5px;
}
._up_box{
padding: 20px 100px 20px 100px;
background-color: white;
border-bottom: 1px solid #E6E6E6
}
.upload-demo{
height: 360px;
}
.upload-demo .el-upload-dragger{
height: 360px;
width: 260px;
}
.upload-demo_img{
height: 358px;
width: 258px;
}
._up_box_left,._up_box_right{
text-align: center;
}
._up_box_right img{
height: 358px;
width: 258px;
}
._up_box_left_tips,._up_box_right_tips{
font-size: 18px;
color: #666666;
margin: 10px;
}
._up_box_left_tips span,._up_box_right_tips span{
font-size: 18px;
color: #5079ED;
font-weight: bold
}
._up_box_right_tips span{
color: #666666;
}
._op_btn{
display: inline-block;
width: 100px;
height: 100px;
border-radius: 50%;
background-color: #5079ED;
color: white;
font-size: 54px;
font-weight: bolder;
line-height: 90px;
text-align: center;
position: absolute;
top: 130px;
left: 80px;
}
._op_btn:hover{
background-color: #2853CC;
}
.w215{
width: 215px;
}
.text_a_center{
text-align: center;
}
.upload-demo2 .el-upload-dragger{
width: 243px;
height: 152px;
}
.upload-demo_img2{
height: 150px;
}
._op_btn2{
left: 95px;
top: 45px;
width: 60px;
height: 60px;
line-height: 52px;
}
._up_box2{
padding-bottom: 0;
border: none;
}
._id_card .text_a_center{
background-color: white;
padding: 10px;
}
._link{
color: #47A5FF !important;
cursor: pointer;
font-weight: 700;
}
.Authentication_tips{
background-color: white;
text-align: center;
padding: 0px 0;
color: #999;
font-size: 14px;
padding: 40px;
}
.Authentication_tips p{
font-size: 18px;
padding:20px;
}
.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/assets/utils/awardRotate.js 0 → 100644
View file @ 6006d1f0
This diff is collapsed.
src/assets/utils/draw.js 0 → 100644
View file @ 6006d1f0
This diff is collapsed.
src/components/DependentTravel/PersonalTailor.vue 0 → 100644
View file @ 6006d1f0
This diff is collapsed.
src/components/PersonalCenter/PsMyCoupon.vue
View file @ 6006d1f0
......@@ -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 @ 6006d1f0
This diff is collapsed.
src/components/global/head.vue
View file @ 6006d1f0
......@@ -82,13 +82,13 @@ color:rgba(51,51,51,1);
</el-col>
<el-col :span="14" :offset="1">
<el-menu :default-active='defaultKey' class="el-menu-demo small" mode="horizontal" background-color="rgba(0,0,0,0)" active-text-color="#EF4455" @select='handleSelect'>
<el-submenu index="1">
<!-- <el-submenu index="1">
<template slot="title">旅游</template>
<el-menu-item index="2-1">跟团游</el-menu-item>
<el-menu-item index="2-2">一日游</el-menu-item>
<!-- <el-menu-item index="2-3">单团</el-menu-item>
<el-menu-item index="2-4">私人订制</el-menu-item> -->
</el-submenu>
</el-submenu> -->
<el-menu-item index="2-1" @click="handleSelect('2-1',false)"><a href="javascript:void(0);">跟团游</a></el-menu-item>
<el-menu-item index="2-2" @click="handleSelect('2-2',true)"><a href="javascript:void(0);">当地游</a></el-menu-item>
<el-menu-item index="3" @click="goUrl('TicketHome',true)"><a href="javascript:void(0);">机票</a></el-menu-item>
<el-menu-item index="4" @click="goUrl('VisaHomePage',true)"><a href="javascript:void(0);">签证</a></el-menu-item>
<el-menu-item index="5" @click="goUrl('IndependentTravel',true)"><a href="javascript:void(0);">自由行</a></el-menu-item>
......
src/components/trade/order/indexTwo.vue
View file @ 6006d1f0
......@@ -65,6 +65,10 @@
._coupon_box ._coupon_item.blue._active{
background-color: #6776D2;
}
._coupon_box ._coupon_item.disab,._coupon_box ._coupon_item.blue.disab ._repeat,._coupon_box ._coupon_item.blue.disab ._info_time{
background-color: #C3C3C3 !important;
color: #777777 !important
}
._coupon_box ._coupon_item ._time{
color: #A7711C !important;
}
......@@ -138,6 +142,14 @@
margin: 0 !important;
color: gray !important;
}
._trip_xiangqing_tips{
color: red !important;
font-size: 14px !important;
}
._trip_xiangqing_tips span{
color: #3965B0;
cursor: pointer;
}
</style>
<template>
<div class="trade" v-loading="loadingDataList">
......@@ -274,8 +286,9 @@
</el-col>
<el-col class="_trip_xiangqing _coupon_box">
<p style="width:100%">优惠券</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}" @click="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>
......@@ -325,6 +338,7 @@
需要你登录以后才能预定哦！登录后还能享受更加优惠的价格，<span class="link" @click="goLogin">立即登录吧</span>
</div>
</div>
<a :href='blankUrl' id='blankLink' target="_blank" style="display:none">1</a>
<!-- <div class="_invoice">
<p>发票信息</p>
<div class="_is_invoice">
......@@ -424,6 +438,7 @@ export default {
label: '北京烤鸭'
}],
value8: '',
blankUrl: '',
pickerOptions:{
disabledDate(time) {
let isHave=true
......@@ -495,6 +510,7 @@ export default {
UserCanUseCouponList: [],
CouponList: [],
CouponIds: '',
Verification: '',
}
},
watch: {
......@@ -526,8 +542,22 @@ export default {
this.chosenObj.startDate = this.numPeople.startDate
this.Remarks = this.numPeople.remark
this.getList(this.numPeople.startDate)
let userInfo = this.getLocalStorage();
this.apipost("app_customer_GetCertificationModel", { CustomerID: userInfo.customerId }, res => {
if (res.data.resultCode == 1) {
this.Verification = res.data.data
} else {
this.$message.error(res.data.message);
}
},err => {});
},
methods: {
goShenqing: function () {
let dom = document.querySelector("#blankLink")
dom.href=`http://${window.location.host}/#/PsSystem/${1}`
//console.log(that.$refs.blankLink.click())
dom.click()
},
clickCoupon: function (item) {
let list = [];
if (!item.active) { // 是否选中
......
src/main.js
View file @ 6006d1f0
......@@ -14,6 +14,7 @@ import htmlToPdf from './assets/utils/htmlToPdf'
import commonUtils from './assets/utils/commonUtils'
import languageUtils from './assets/utils/languageUtils' //引入语言转换帮助类
import moment from 'moment'
import co from 'co'
// 使用Vue.use()方法就会调用工具方法中的install方法
Vue.use(htmlToPdf)
......@@ -116,7 +117,41 @@ Vue.filter("YMD", function (date) {
return moment(date).format("YYYY-MM-DD");
})
Vue.prototype.random_string = function (len) {
len = len || 32;
var chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';
var maxPos = chars.length;
var pwd = '';
for (let i = 0; i < len; i++) {
pwd += chars.charAt(Math.floor(Math.random() * maxPos));
}
return pwd;
},
//上传文件到本地服务器
Vue.prototype.UploadSelfFileT = function (path, files, successCall) {
if (files && files.length > 0) {
let nameList = new Array()
for (let index = 0; index < files.length; index++) {
nameList.push(this.random_string());
}
let that = this;
co(function* () {
for (let index = 0; index < files.length; index++) {
let fileName = nameList[index]
fileName = path + fileName + "." + files[index].name.split('.').pop()
var formData = new FormData();
var uploadUrl = that.domainManager().UploadUrl + "/Upload?filePath=" + path;
formData.append("myfile", files[index]);
that.$http.post(uploadUrl, formData, {})
.then(res => {
successCall(res);
})
}
}).catch(function (err) {
console.log("上传文件出错" + err);
});
}
}
new Vue({
router,
store,
......
src/plugins/index.js
View file @ 6006d1f0
......@@ -16,8 +16,8 @@ export default {
// var domainUrl = "http://192.168.2.16:8083"//主域名
// let domainUrl = "https://reborn.oytour.com"; //刘东主域名
// let domainUrl = "https://reborn.oytour.com";
var domainUrl = "http://test.viitto.com"
let domainUrl = "https://reborn.oytour.com";
// var domainUrl = "http://test.viitto.com"
domainUrl = "http://192.168.2.214:8082"
let locationName = window.location.hostname;
if (this.isOnline()) {
......@@ -31,7 +31,7 @@ export default {
DomainUrl: domainUrl,
//常用提交数据URL
PostUrl: domainUrl + "/api/common/post",
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://47.96.12.235:9000" : "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",
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
......
src/router.js
View file @ 6006d1f0
This diff is collapsed.
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