Skip to content

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

..

parent 07e5230e
Hide whitespace changes
Inline Side-by-side
Showing with 302 additions and 7 deletions
src/assets/css/common.css
View file @ d92aa035
......@@ -51,4 +51,34 @@
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.commonF .cee{
color: #EE4454
}
.commonF .c11{
color: #111111
}
.commonF .c22{
color: #222222
}
.commonF .c33{
color: #333333
}
.commonF .c44{
color: #444444
}
.commonF .c55{
color: #555555
}
.commonF .c66{
color: #666666
}
.commonF .c77{
color: #777777
}
.commonF .c88{
color: #888888
}
.commonF .c99{
color: #999999
}
\ No newline at end of file
src/components/newPersonalCenter/integral/RedEnvelopes.vue
View file @ d92aa035
......@@ -21,6 +21,64 @@
</el-row>
</div>
</div>
<div class="rentou-box">
<div class="box-tit">
<span class="f16 pfR">人头返佣</span>
<span class="f12 c33">规则说明</span>
</div>
<el-row class="rentou-box-table" :gutter="35">
<el-col :span="16">
<table style="width: 100%;">
<tr class="f16 c66 rentou-box-table-head">
<th>订单信息</th>
<th>系列</th>
<th>人数</th>
<th>返佣</th>
</tr>
<tr class="c11">
<td>2566</td>
<td>好嗨哦感觉沙河是</td>
<td>2</td>
<td class="cee">+￥45.00</td>
</tr>
<tr class="c11">
<td>2566</td>
<td>好嗨哦感觉沙河是</td>
<td>2</td>
<td class="cee">+￥45.00</td>
</tr>
<tr class="c11">
<td>2566</td>
<td>好嗨哦感觉沙河是</td>
<td>2</td>
<td class="cee">+￥45.00</td>
</tr>
<tr class="c11">
<td>2566</td>
<td>好嗨哦感觉沙河是</td>
<td>2</td>
<td class="cee">+￥45.00</td>
</tr><tr class="c11">
<td>2566</td>
<td>好嗨哦感觉沙河是</td>
<td>2</td>
<td class="cee">+￥45.00</td>
</tr>
</table>
</el-col>
<el-col :span="8">
<p class="f14 c99">数据占比</p>
<div class="shujuzhanbi">
<div class="zhanbitu" id="zhanbi">
</div>
</div>
</el-col>
</el-row>
</div>
<div>
<div id="chartsMap" style="height:165px;width:100%;"></div>
</div>
<div class="jyeDiv">
<p>当前交易额：¥<span class="f30 pfR">124565456</span></p>
<div class="jyItem">
......@@ -140,10 +198,148 @@ export default {
}
},
mounted() {
this.creatChart()
this.creatZhanBi()
},
methods: {
creatZhanBi(){
let myChart = this.$echarts.init(document.getElementById('zhanbi'));
myChart.setOption({
tooltip: {
trigger: 'item',
formatter: "{a} <br/>{b}: {c} ({d}%)"
},
series: [
{
name:'访问来源',
type:'pie',
radius: ['50%', '70%'],
avoidLabelOverlap: false,
label: {
normal: {
show: false,
position: 'center'
},
emphasis: {
show: true,
textStyle: {
fontSize: '30',
fontWeight: 'bold'
}
}
},
labelLine: {
normal: {
show: false
}
},
data:[
{value:335, name:'直接访问'},
{value:310, name:'邮件营销'},
{value:234, name:'联盟广告'},
{value:135, name:'视频广告'},
{value:1548, name:'搜索引擎'}
]
}
]
},true)
},
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 // 左
]
},
xAxis: {
type: "category",
axisLine: {
show: false,
lineStyle: {
width: 30
}
},
axisTick: false,
data: ['一月', '二月', '三月', '四月', '五月', '六月'],
},
grid: {
x: -100,
y: 20,
x2: 0,
y2: 0,
containLabel: true,
tooltip: {
textStyle:{
color: 'red'
}
}
},
yAxis: {
type: "value",
min: '10',
axisTick: true,
splitLine: {
show: true,
lineStyle: {
color: "rgba(245,245,245,1)"
}
},
},
series: [
{
type: "line",
smooth: true,
symbol: 'none',
data: [0, 500, 235, 689, 600,'-'],
lineStyle: {
width: 3,
color: "#36C7D9"
},
itemStyle: {
borderWidth: 5,
color: "#FFFFFF"
},
areaStyle: {
color: "#A4E6EE"
}
},
{
type: "line",
smooth: true,
data: ['-', '-', '-', '-', 600, 352],
lineStyle: {
width: 3,
color: "#ED6A6B",
type: 'dashed'
},
itemStyle: {
borderWidth: 5,
},
markPoint: {
data: [
{name: '123', value: 700, xAxis: 2, yAxis: 2}
]
},
areaStyle: {
color: "#FAD2D2"
}
}
]
},true);
},
}
}
</script>
......@@ -293,5 +489,37 @@ export default {
padding:0 60px 0 40px;
box-sizing: border-box;
}
#Red .rentou-box{
margin-top: 35px;
background-color: #FFFFFF;
}
.rentou-box .box-tit{
display: flex;
padding: 19px 30px;
align-items: center;
justify-content: space-between;
border-bottom:1px solid rgba(234,234,234,1);
}
.rentou-box th,.rentou-box td {
padding: 8px 20px;
text-align: left !important;
}
.rentou-box-table{
padding: 30px;
}
.rentou-box-table-head{
box-shadow:0px 1px 0px 0px rgba(221,221,221, .7);
}
.rentou-box-table table tr:nth-child(even){
background:rgba(245,245,245,1);
}
.shujuzhanbi{
margin-top: 10px;
}
.shujuzhanbi .zhanbitu{
width: 200px;
height: 200px;
margin: 0 auto;
background-color: rebeccapurple;
}
</style>
src/components/trade/order/indexTwo.vue
View file @ d92aa035
......@@ -288,6 +288,11 @@
<el-input size="small" v-model="ActivateCode" placeholder="请输入兑换码" style="width:200px"></el-input>
<el-button @click="GetCode" size="small" style="margin-left:10px">兑换</el-button>
</div>
<p>幸福存折</p>
<div>
<el-input size="small" v-model="RedEnvelopeMoney" @change="RedEnvelopeMoneyChange" placeholder="请输入金额" style="width:200px;margin-right: 10px;"></el-input>
<span>当前幸福存折余额：<span>{{RedEnvelopeMoneyALL}}</span></span>
</div>
</el-col>
<el-col class="_trip_xiangqing _coupon_box">
<p style="width:100%">优惠券</p>
......@@ -329,7 +334,8 @@
<div class="_pay_info">
<p>小计：<span class="_money">￥{{moneyFormat(price)}}</span></p>
<p>优惠：<span class="_money _font_bold">-￥{{moneyFormat(price-SettlementPrice)}}</span></p>
<p class="_font_bold _pay_money">实付款：<span class="_yang">￥</span><span class="_pay_num">{{moneyFormat(SettlementPrice)}}</span></p>
<p>幸福存折：<span class="_money _font_bold">-￥{{moneyFormat(RedEnvelopeMoney)}}</span></p>
<p class="_font_bold _pay_money">实付款：<span class="_yang">￥</span><span class="_pay_num">{{moneyFormat(SettlementPrice - RedEnvelopeMoney)}}</span></p>
</div>
</div>
</el-col>
......@@ -517,6 +523,8 @@ export default {
CouponList: [],
CouponIds: '',
Verification: '',
RedEnvelopeMoney: '',
RedEnvelopeMoneyALL: 0,
}
},
watch: {
......@@ -538,7 +546,7 @@ export default {
},
mounted () {
this.getProvince()
this.b2b_get_GetCustomerInfo()
this.b2b_get_GetCustomerInfo()
},
created() {
this.chosenObj.crCount = this.numPeople.crCount
......@@ -558,6 +566,29 @@ export default {
},err => {});
},
methods: {
// 输入使用余额
RedEnvelopeMoneyChange(){
console.log(this.RedEnvelopeMoney)
if (this.RedEnvelopeMoney == '') {
this.RedEnvelopeMoney = 0
} else if (this.RedEnvelopeMoney > this.RedEnvelopeMoneyALL) {
this.RedEnvelopeMoney = this.RedEnvelopeMoneyALL
this.$message.error('使用金额不能超过幸福存折余额！')
}
// this.calcMoney()
},
// 获取幸福存折余额
getRedEnvelopeMoney(){
this.apipost("customer_post_GetCustomerBigRedEnvelopeBalance",{CustomerId: this.customer.customerId},
res => {
if(res.data.resultCode==1){
this.RedEnvelopeMoneyALL = res.data.data
}else{
this.Error(res.data.message)
}
},
err => {});
},
GetCode(){
this.apiJavaPost('/api/b2b/user/updateUseCouponBycode',{ActivateCode:this.ActivateCode},res=>{
if(res.data.resultCode==1){
......@@ -640,6 +671,8 @@ export default {
} else {
this.SettlementPrice = this.price
}
// 计算幸福存折
// this.SettlementPrice = this.SettlementPrice - this.RedEnvelopeMoney
},
goLogin(){
this.$router.push({ path:'/login?type=1',query:{path:this.$route.name,id:encodeURIComponent(this.$route.params.id)} })
......@@ -729,6 +762,8 @@ export default {
}else{
this.chosenObj.unicoArr.isSup=-2
}
// 计算幸福存折
// this.SettlementPrice = this.SettlementPrice - this.RedEnvelopeMoney
this.$forceUpdate()
},
saveOrder(){
......@@ -807,7 +842,7 @@ export default {
OldPeopleNum:this.chosenObj.lrCount,
SingleRoomNum:this.chosenObj.df,
PreferPrice:this.price,
DiscountMoney:this.price - this.SettlementPrice,
DiscountMoney:this.price - this.SettlementPrice - this.RedEnvelopeMoney,
CouponAllotIds: this.CouponIds!== '' ? this.CouponIds.slice(0,this.CouponIds.length-1) : '',
YSeatNum:y,
ESeatNum:f,
......@@ -837,7 +872,8 @@ export default {
ScenicRefundArr:[],
CommissionSharePeople:0,
CommissionShareMoney:0,
OrderSource:2
OrderSource:2,
RedEnvelopeMoney: this.RedEnvelopeMoney
}
this.apipost("sellorder_post_SetOrderInfoForB2B",msg,
res => {
......@@ -945,6 +981,7 @@ export default {
},
err => {}
);
this.getRedEnvelopeMoney()
}else{
this.customer = null
}
......
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