Skip to content

A
Athena
Commit 0fb97810 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

update

parents e6099954 0f97a1be
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1129 additions and 159 deletions
src/App.vue
View file @ 0fb97810
......@@ -30,7 +30,6 @@ export default {
}
this.apipost('admin_get_GetGroupDomain',msg,r=>{
let g={}
console.log("r",r)
g.i=r.data.data.GroupId
g.n=r.data.data.GroupName
g.l=r.data.data.Logo
......@@ -60,7 +59,7 @@ export default {
<style>
@import './assets/global/font.css';
@import '//at.alicdn.com/t/font_863923_mmwwh61s03g.css';
@import '//at.alicdn.com/t/font_863923_pxnr9ox66cp.css';
@import './assets/global/global.css';
body,html{
padding: 0px;
......
src/components/global/head.vue
View file @ 0fb97810
......@@ -88,12 +88,13 @@ color:rgba(51,51,51,1);
<el-menu-item index="2-2">一日游</el-menu-item>
</el-submenu> -->
<el-menu-item index="0" @click="goUrl('Home',true)"><a href="javascript:void(0);">首页</a></el-menu-item>
<!-- <el-menu-item index="0" @click="goUrl('Home',true)"><a href="javascript:void(0);">首页</a></el-menu-item> -->
<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="2-2" @click="handleSelect('2-2',true)"><a href="javascript:void(0);">一日游</a></el-menu-item>
<el-menu-item index="2-3" @click="handleSelect('2-3',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>
<el-menu-item index="5" @click="goUrl('IndependentTravel',true)"><a href="javascript:void(0);">自由行</a></el-menu-item> -->
<!-- <el-menu-item index="5"><a href="javascript:void(0);">机票</a></el-menu-item>
<el-menu-item index="2"><a href="javascript:void(0);">酒店</a></el-menu-item>
......@@ -221,8 +222,10 @@ export default {
if(key === '2-1') {
this.$router.push({ path: '/heel'})
this.ifOneDay = false
} else if(key === '2-2') {
this.$router.push({ path: '/OneDayTour'})
} else if(key === '2-2' || key === '2-3') {
let path = '/OneDayTour'
path = path + (key === '2-3' ? '2' : '')
this.$router.push({ path: path})
this.ifOneDay = true
}
},
......
src/components/global/pay.vue
View file @ 0fb97810
<template>
<div class="templatePayURL" style="display: inline-block; float: right; margin-right: 10px; display: flex;">
<div class="templatePayURL" style="display: inline-block; float: right; margin-right: 10px; ">
<el-popover width="320" @hide='clearTimer'>
<div>
<p style="margin:0 0 15px 0;">二维码收款</p>
......@@ -33,9 +33,9 @@
size="mini"
type="danger"
@click="isOpen(item,2)">立即付款</el-button>
</el-popover>
&nbsp;
</el-popover>
<el-button
style="margin-top: 10px;"
size="mini"
@click="deleteOrder(item)">取消订单</el-button>
</div>
......
src/components/mall/OneDayTour.vue
View file @ 0fb97810
......@@ -198,7 +198,8 @@ export default {
pageSize:4,
companyId:this.companyId,
lineId:x.id,
lineTeamId:y.id
lineTeamId:y.id,
Is_PacketGroup: 0, //是否小包团1-是0-否
}
this.apipost('b2b_get_GetB2BHomeLineTravelPageList',msg,res=>{
this.recoItems.line[index].lineTeam[sIndex].pageData=res.data.data.pageData
......
src/components/mall/OneDayTour2.vue 0 → 100644
View file @ 0fb97810
This diff is collapsed.
src/components/newPersonalCenter/block/model/OrderInfoModel/TCTable(作废).vue 0 → 100644
View file @ 0fb97810
<style>
</style>
<template>
<el-row>
<el-table :data="tableData" style="width: 100%">
<el-table-column prop="orderId" label="订单号" width="80"></el-table-column>
<el-table-column prop="title" label="团名" width="180">
<template slot-scope="scope">
<el-tooltip class="item" popper-class="w180" effect="dark" :content="scope.row.title" placement="bottom-end">
<p class="_row_2">{{scope.row.title}}</p>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="startDate" label="团期"></el-table-column>
<el-table-column prop="guestNum" label="人数" width="80"></el-table-column>
<el-table-column prop="preferPrice" label="金额" width="80"></el-table-column>
<el-table-column prop="orderState" label="订单状态" width="100">
<template slot-scope="scope">
<span v-if="scope.row.orderState === 1">待付定金</span>
<span v-else-if="scope.row.orderState === 2">待付尾款</span>
<span v-else-if="scope.row.orderState === 3">待发团</span>
<span v-else-if="scope.row.orderState === 4">交易完成</span>
<span v-else-if="scope.row.orderState === 0">取消</span>
</template>
</el-table-column>
<!-- 操作按钮 -->
<el-table-column align="left" label="操作">
<template slot-scope="scope">
<payurlItem
v-if="scope.row.orderState !== 0 && scope.row.orderState !== 4"
@b2b_get_GetWaitDealOrderPageList="b2b_get_GetWaitDealOrderPageList"
:item="scope.row"
></payurlItem>
</template>
</el-table-column>
</el-table>
</el-row>
</template>
<script>
import payURL from "../../../../global/pay.vue";
export default {
components: {
payurlItem: payURL,
},
props:["tableData"],
data() {
return {};
},
mounted() {},
methods: {
b2b_get_GetWaitDealOrderPageList() {
//获取待处理订单
let msg = {
pageIndex: 1,
pageSize: 100
};
this.apipost(
"b2b_get_GetWaitDealOrderPageList",
msg,
r => {
if (r.data.resultCode == 1) {
this.WaitDealOrderPageList = r.data.data.pageData;
} else {
this.$message.error(r.data.message);
}
},
null
);
},
}
};
</script>
src/components/newPersonalCenter/block/model/Rule.vue 0 → 100644
View file @ 0fb97810
<style>
/* 等级权益 */
.level_equity{
margin: 20px 0;
background-color: white;
}
.level_equity>p,.level_rule>p,.level_question>p{
font-size: 16px;
color: #333333;
font-family: "PingFangR";
font-weight: bold;
padding: 22px;
border:1px solid rgba(230,230,230,1);
border-bottom: 0;
}
.level_equity>p span,.level_rule>p span,.level_question>p span{
display: inline-block;
height: 14px;
width: 4px;
background-color: #DBA261;
margin-right: 5px;
}
.MemberCenter .info_box table{
border-collapse: collapse;
border-spacing: 0;
width: 100%;
}
.MemberCenter .info_box table thead th{
color: #909399;
}
.MemberCenter .info_box table tbody th{
font-weight: normal;
}
.MemberCenter .info_box table tbody tr:hover{
background-color: #FFF0F0 !important;
}
.MemberCenter .info_box th{
background-color: #fff1f1
}
.MemberCenter .info_box th, .MemberCenter .info_box td {
height: 38px;
border: 1px solid #e8e8e8;
text-align: center;
color: #666;
font-size: 14px;
}
.MemberCenter .info_box td i.icon-xuanzhong2{
font-size: 12px;
width: 18px;
height: 18px;
border-radius: 50%;
display: inline-block;
background-color: #67c93c;
text-align: center;
line-height: 18px;
color: white
}
.level_rule{
margin-bottom: 20px;
background-color: white;
}
.level_rule td{
text-align: left !important;
padding:5px 20px;
}
.level_question{
margin-bottom: 20px;
background-color: white;
}
.level_question>p{
border-bottom: 1px solid rgba(230,230,230,1);
}
.level_question .modu_con {
width: auto;
padding: 0 20px 0 22px;
color: #666;
border: 1px solid rgba(230,230,230,1);
border-top: none;
}
.level_question .modu_con p {
padding: 16px 0 12px 0;
}
.return{
text-align: right;
font-size: 14px;
color: #EE4454;
padding-right: 20px;
}
.level_equity ._yes{
display: inline-block;
height: 15px;
width: 15px;
text-align: center;
line-height: 15px;
font-weight: bold;
font-size: 12px;
border-radius: 50%;
background-color: #67c93c;
color: white
}
</style>
<template>
<el-row class="MemberCenter">
<el-row class="return">
<span class="__cp" @click="childMethod">返回</span>
</el-row>
<el-row class="info_box">
<!-- 等级权益 -->
<el-row class="level_equity">
<p><span></span>等级权益</p>
<table>
<thead>
<tr>
<th width="200">权益\等级</th>
<th v-for="item in MemberRateSimpleList">{{item.name}}</th>
</tr>
</thead>
<tbody>
<tr v-for="(item, index) in privilege">
<th>{{item.name}}</th>
<td v-for="(s, sIndex) in MemberRateSimpleList">
<span v-if="item[`V${sIndex}`]" class="_yes iconfont icon-gou2"></span>
</td>
</tr>
</tbody>
</table>
</el-row>
<!-- 等级规则 -->
<el-row class="level_rule">
<p><span></span>等级规则</p>
<table class="group">
<tbody>
<tr>
<th class="modu_level_tit" width="80">会员级别</th>
<th>级别标准</th>
<th>等级说明</th>
</tr>
<tr v-for="(item, index) in RuleList">
<td>{{item.name}}</td>
<td>{{item.tradeMoneyReq}}{{index !== RuleList.length-1 ? `-${RuleList[index+1].tradeMoneyReq}` : ''}}</td>
<td colspan="2" style="text-align: center">{{item.remark}}</td>
</tr>
</tbody>
</table>
</el-row>
<!-- 常见问题 -->
<el-row class="level_question">
<p><span></span>常见问题</p>
<div class="modu_con">
<p>1.会员星级有效期多久？<br>二星以上会员的星级有效期为1年，自完成升星之日算起；注册及一星会员的星级有效期长期有效。</p>
<p>2.二星及以上会员的星级有效期限能延长吗？<br>当会员星级到期后，如未能达到升级标准，按照对应星级的保级标准，达到顺延一年,未达到顺次下调一个会员星级（最低只降到一星会员，不会再降到普通会员）同时按照下调日更新会员级别有效期。</p>
</div>
</el-row>
</el-row>
</el-row>
</template>
<script>
export default {
data(){
return {
dataList: [],
msg: {
state: -1,
name: '',
memberId: -1,
},
MemberRateSimpleList: [],
privilege: [],
RuleList: [],
}
},
computed: {
},
created(){
},
mounted() {
this.getMemberRateSimpleList()
this.getRuleList()
},
methods: {
//获取特权数据
getAllJurisdictions: function () {
this.loading = true;
this.apiJavaPost("/api/member/getAllJurisdictions", this.msg, res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
this.getPrivilege()
} else {
this.Error(res.data.message)
}
}, null);
},
// 获取所有会员等级
getMemberRateSimpleList: function () {
this.apiJavaPost("/api/member/getMemberRateSimpleList", this.msg, res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.MemberRateSimpleList = res.data.data;
this.getAllJurisdictions()
} else {
this.Error(res.data.message)
}
}, null);
},
//组装对应的等级权益
getPrivilege: function () {
let privilege = []
this.dataList.forEach(x=>{
if (x.state === '-1') return
let obj = {
name: x.name,
}
this.MemberRateSimpleList.forEach((y, index)=>{
obj[`V${index}`] = x.rateName.indexOf(y.name) != -1 ? true : false
})
privilege.push(obj)
})
this.privilege = privilege
},
//组装对应的等级规则
getRuleList: function () {
let msg = {
state: -1,
name: '',
}
this.apiJavaPost("/api/member/getmemberrate", msg, res => {
if (res.data.resultCode === 1) {
this.RuleList = res.data.data;
} else {
this.Error(res.data.message)
}
}, null);
},
childMethod: function () {
this.$emit('childrenFun');
}
}
}
</script>
\ No newline at end of file
src/router.js
View file @ 0fb97810
......@@ -102,6 +102,15 @@ export default new Router({
title: "一日游-印象之旅~感动与世界同步"
}
},
{
path: "/OneDayTour2",
name: "OneDayTour2",
component: resolve =>
require(["@/components/mall/OneDayTour2"], resolve),
meta: {
title: "当地游-印象之旅~感动与世界同步"
}
},
{
path: "/coding",
name: "coding",
......
src/views/index.vue
View file @ 0fb97810
......@@ -4,8 +4,8 @@
<template>
<div class="home-box" v-if="isPhone">
<!-- <mallHead msg="" @forword='goUrl("2-1")' @siteCity="siteCity"/> -->
<newHead/>
<mallHead msg="" @forword='goUrl("2-1")' @siteCity="siteCity"/>
<!-- <newHead/> -->
<div :style='{"min-height":minHeight+"px"}'>
<transition name="slide">
<router-view :changeCity='changeCity'></router-view>
......
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