Skip to content

A
Athena
Commit 6c7da5b6 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

修改订单列表

parent bd1b9704
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 864 additions and 149 deletions
src/components/global/pay.vue
View file @ 6c7da5b6
<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/newPersonalCenter/block/MemberCenter.vue
View file @ 6c7da5b6
......@@ -2,23 +2,25 @@
@import "../../../assets/css/newPersonalCenter/block/MemberCenter.css";
</style>
<template>
<el-row class="MemberCenter">
<el-row>
<el-row class="MemberCenter" v-show="!showRule">
<el-row class="level_info">
<el-row class="chart">
<el-col :span="6" class="left">
<div class="head_img">
<img src="../../../assets/img/head_normal1.png" alt="">
<img v-if="userInfo.photo" src="userInfo.photo" alt="">
<img v-else src="../../../assets/img/head_normal1.png" alt="">
</div>
<p class="name">李山田</p>
<p class="name">{{userInfo.name}}</p>
<p><i class="_vip_level">V0</i></p>
</el-col>
<el-col :span="18" class="right">
<p class="tit"><span>会员成长值</span><span class="__cp">等级规则</span></p>
<p class="tit"><span>会员成长值</span><span class="__cp" @click="showRule = true">等级规则</span></p>
<div id="chartsMap" style="height:155px;width:100%;"></div>
</el-col>
</el-row>
<el-row class="tequan">
<p class="tit"><span>我的会员特权</span><span class="__cp">等级权益</span></p>
<p class="tit"><span>我的会员特权</span><span class="__cp" @click="showRule = true">等级权益</span></p>
<el-carousel indicator-position="none" arrow="always" :autoplay="false" height="110px">
<el-carousel-item v-for="(item, index) in iconList" :key="index">
<div class="_icon_list">
......@@ -97,15 +99,21 @@
</el-row>
</el-row>
</el-row>
<Rule v-show="showRule" @childrenFun="changeShow"/>
</el-row>
</template>
<script>
import Rule from "./model/Rule.vue";
export default {
components: {
Rule: Rule,
},
data(){
return {
UserMemberExp: {},
showRule: false,
point: 0,
userInfo: {},
iconList: [
{
......@@ -131,115 +139,154 @@ export default {
},
mounted() {
this.userInfo = this.getLocalStorage();
let myChart = this.$echarts.init(document.getElementById("chartsMap"));
myChart.setOption({
title: {
left: "left",
textStyle: {
fontWeight: "bold",
fontSize: 14,
color: "#333333",
height: "30px"
},
padding: [
20, // 上
20, // 右
20, // 下
20 // 左
]
},
tooltip: {
trigger: "item",
formatter: "{b} : {c}"
},
xAxis: {
type: "category",
axisLine: {
show: false,
lineStyle: {
width: 30
this.getUserMemberExp()
},
methods: {
// 获取会员经验与下个会员等级信息
getUserMemberExp: function () {
this.apiJavaPost(
"/api/member/getUserMemberExp",
{customer: this.userInfo.customerId},
res => {
if (res.data.resultCode == 1) {
console.log(res)
let UserMemberExp = res.data.data
let getExpArr = [0]
let getExpTimeArr = ['-']
let getExpNullArr = ['-']
UserMemberExp.exps.forEach((element, index) => {
getExpArr.push(element.exp)
getExpTimeArr.push(element.time)
if (index === UserMemberExp.exps.length-1) {
getExpNullArr.push(element.exp)
this.point = index
} else {
getExpNullArr.push('-')
}
},
axisTick: false,
data: ['一月', '二月', '三月', '四月', '五月', '六月'],
},
grid: {
x: -100,
y: 20,
x2: 0,
y2: 0,
containLabel: true,
tooltip: {
textStyle:{
color: 'red'
});
getExpArr.push('-')
getExpTimeArr.push(UserMemberExp.next.rate)
getExpNullArr.push(UserMemberExp.next.gap)
this.creatChart(getExpArr, getExpTimeArr, getExpNullArr)
} else {
this.Error(res.data.message);
}
}
},
yAxis: {
type: "value",
// axisLine: {
// show: false
// },
min: '10',
axisTick: false,
splitLine: {
show: false,
lineStyle: {
color: "rgba(245,245,245,1)"
},
null
);
},
getColor:function (param) {
console.log(param.dataIndex, this.point+1)
if (param.dataIndex === this.point+1) {
return '#67C23A';
} else {
return "#FFFFFF"
}
},
creatChart: function(getExpArr, getExpTimeArr, getExpNullArr) {
let that = this
console.log(getExpArr, getExpTimeArr, getExpNullArr,[0, 1000, 2000, '-', '-','-'],['-', '-', 2000, 4000, 6000, 8000])
let myChart = this.$echarts.init(document.getElementById("chartsMap"));
myChart.setOption({
title: {
left: "left",
textStyle: {
fontWeight: "bold",
fontSize: 14,
color: "#333333",
height: "30px"
},
padding: [
20, // 上
20, // 右
20, // 下
20 // 左
]
},
tooltip: {
trigger: "item",
formatter: "{b} : {c}"
},
xAxis: {
type: "category",
axisLine: {
show: false,
lineStyle: {
width: 30
}
},
axisTick: false,
data: getExpTimeArr,
// data: ['一月', '二月', '三月', '四月', '五月', '六月'],
},
grid: {
x: -100,
y: 20,
x2: 0,
y2: 0,
containLabel: true,
tooltip: {
textStyle:{
color: 'red'
}
}, //去除网格线
// axisLable: {
// show: false,
// }
},
series: [
{
name:'',
type: "line",
smooth: false,
data: [0, 1000, 2000, '-', '-','-'],
markPoint: {
data: [
{name: '周最低', value: 1000, xAxis: 1, yAxis: -1.5},
]
},
// data: then.dateList,
lineStyle: {
width: 3,
color: "#E5AF63"
},
itemStyle: {
borderWidth: 5,
color: "#FFFFFF"
},
},
{
name:'',
type: "line",
smooth: false,
data: ['-', '-', 2000, 4000, 6000, 8000],
markPoint: {
data: [
{name: '周最低', value: 1000, xAxis: 1, yAxis: -1.5},
]
},
// data: then.dateList,
lineStyle: {
width: 3,
color: "#808290",
type: 'dashed'
},
itemStyle: {
borderWidth: 5,
color: "#FFFFFF"
},
}
]
},true);
},
methods: {
},
yAxis: {
type: "value",
// axisLine: {
// show: false
// },
min: '10',
axisTick: false,
splitLine: {
show: false,
lineStyle: {
color: "rgba(245,245,245,1)"
}
}, //去除网格线
// axisLable: {
// show: false,
// }
},
series: [
{
name:'',
type: "line",
smooth: false,
data: getExpArr,
// data: [0, 1000, 2000, '-', '-','-'],
lineStyle: {
width: 3,
color: "#E5AF63"
},
itemStyle: {
borderWidth: 5,
color: "#FFFFFF"
},
},
{
name:'',
type: "line",
smooth: false,
data: getExpNullArr,
// data: ['-', '-', 2000, 4000, 6000, 8000],
// data: then.dateList,
lineStyle: {
width: 3,
color: "#808290",
type: 'dashed'
},
itemStyle: {
borderWidth: 5,
color: that.getColor
},
}
]
},true);
},
changeShow: function () {
this.showRule = false
}
}
}
</script>
src/components/newPersonalCenter/block/model/OrderInfoModel/TCTable(作废).vue 0 → 100644
View file @ 6c7da5b6
<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 @ 6c7da5b6
This diff is collapsed.
src/components/newPersonalCenter/newPersonalCenter.vue
View file @ 6c7da5b6
......@@ -50,7 +50,7 @@
<i class="iconfont icon-huiyuanicon"></i>
<span slot="title">会员中心</span>
</el-menu-item>
<el-submenu index="3">
<el-submenu index="9">
<template slot="title">
<i class="iconfont icon-huiyuanicon"></i>
<span>定制游</span>
......
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