Skip to content

A
Athena
Commit 500c351a authored by zhengke's avatar zhengke
Browse files
Options

积分

parent 691f5bb9
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 40 deletions
src/components/IntegralMall/OrderCompleted.vue
View file @ 500c351a
......@@ -75,7 +75,7 @@
margin-top:10px;
}
.OrderCompleted .OC_btmList{
width:320px;
width:380px;
margin-top:63px;
font-size:12px;
color:#333333;
......@@ -87,7 +87,7 @@
border-bottom:1px solid #DDDDDD;
}
.OrderCompleted .OC_jishu{
width:58%;
width:50%;
}
.OrderCompleted .OC_jifen{
display: inline-block;
......@@ -135,28 +135,28 @@
<img src="../../assets/img/ticket/icons8-tick-box-96.png" alt=""/>
<div class="OC_riContent">
<div class="OC_paySuccsss">支付成功！</div>
<div class="OC_dianhua">如有任何疑问可致电028-56540254，点击 <span class="Order_more" @click="goUrl('OrderdetailsCompleted')">查看订单>></span></div>
<div class="OC_dianhua">如有任何疑问可致电028-56540254，点击 <span class="Order_more" @click="goUrl('myPointOrder')">查看订单>></span></div>
</div>
</div>
<div class="OC_btmList">
<div>
<div class="OC_jifen OC_jishu">
支付积分：￥9900
支付积分：￥{{pay}}
</div>
<div class="OC_jifen">
剩余积分：￥190010
剩余积分：￥{{residue}}
</div>
</div>
<div>
<div class="OC_jifen OC_jishu">
订单编号：45612312321
订单编号：{{orderNum}}
</div>
<div class="OC_jifen">
下单时间：2019-02-21
下单时间：{{createTime | YMDHMS}}
</div>
</div>
</div>
<input type="button" value="返回积分商城" class="OC_backBtn"/>
<input type="button" value="返回积分商城" @click="goUrl('IntegralMall')" class="OC_backBtn"/>
</div>
<div class="OC_rightImg">
<img src="../../assets/img/ticket/back.png" alt=""/>
......@@ -173,12 +173,20 @@ export default {
props:{},
data(){
return{
createTime:'',
orderNum:'',
pay:'',
residue:''
}
},methods: {
goUrl: function (path) {
this.$router.push({name: path,query: { id: this.$route.query.id}});
this.$router.push({name: path});
}
},mounted() {
this.createTime = this.$route.query.createTime;
this.orderNum = this.$route.query.orderNum;
this.pay = this.$route.query.pay;
this.residue = this.$route.query.residue;
}
}
</script>
src/components/IntegralMall/OrderdetailsCompleted.vue
View file @ 500c351a
......@@ -157,10 +157,7 @@
<span>完成</span>
</div>
<div class="Order_jifen">
支付积分：￥9900
</div>
<div>
剩余积分：￥{{score}}
支付积分：￥{{dataList.goodsPrice*dataList.buyNum}}
</div>
</div>
<div class="Order_Top_right">
......@@ -179,15 +176,15 @@
<img src="../../assets/img/orderLins.png" alt=""/>
</div>
<div class="Submit_Orders">
<i class="iconfont icon-gerenzhongxindingdandaishouhuo"/>
确认兑换
<i class="iconfont icon-gerenzhongxindingdandaishouhuo"></i>
等待收货
</div>
<div class="SubmitComLine">
<img src="../../assets/img/orderLins.png" alt=""/>
</div>
<div class="Submit_Orders">
<!-- <div><img src="../../assets/img/ticket/icons8-tick-box-96.png" alt=""/></div> -->
<div><img src="../../assets/img/ticket/huigou.png" alt=""/></div>
<div v-if="dataList.orderStatus==3"><img src="../../assets/img/ticket/icons8-tick-box-96.png" alt=""/></div>
<div v-else><img src="../../assets/img/ticket/huigou.png" alt=""/></div>
订单完成
</div>
</div>
......@@ -195,23 +192,23 @@
<table class="myPointTable">
<tr>
<td colspan="3">
<span class="pointOrderTime">{{orderTime | YMDHMS}}</span>
<span class="pointOrderTitle">订单号：</span><span class="pointOrderNum">451648</span>
<span class="pointOrderTime">{{dataList.crateTime | YMDHMS}}</span>
<span class="pointOrderTitle">订单号：</span><span class="pointOrderNum">{{dataList.orderNum}}</span>
</td>
</tr>
<tr>
<td width="325px">
<div class="po_info">
<div class="po_left">
<img :src="imageUrl" alt=""/>
<img :src="dataList.goodsImg" alt=""/>
</div>
<div class="po_right">
{{orderTitle}}
{{dataList.goodsName}}
</div>
</div>
</td>
<td>
<div class="OrderShouContent" v-if="index<num" v-for="(item,index) in data">
<!-- <div class="OrderShouContent" v-if="index<num" v-for="(item,index) in data">
<div class="Order_left">
{{item.time}}
</div>
......@@ -222,10 +219,15 @@
<span @click="DataLength(2)" v-if="num>1&&index==data.length-1&&subIndex==item.list.length-1" class="Order_more">收起>></span>
</div>
</div>
</div> -->
<div>
<span v-if="dataList.orderStatus==1">待发货</span>
<span v-if="dataList.orderStatus==2">待收货</span>
<span v-if="dataList.orderStatus==3">交易成功</span>
</div>
</td>
<td width="132px" style="text-align:center;">
<input type="button" class="pointCancelBtn" value="取消订单">
<input type="button" class="pointCancelBtn" @click="goUrl('integral')" value="再次兑换">
</td>
</tr>
</table>
......@@ -239,12 +241,7 @@ export default {
return {
num:1,
id:0,
//时间
orderTime:'',
//订单号
orderNum:'',
//图片
imageUrl:'',
dataList:[],
//标题
orderTitle:'',
score:'',
......@@ -279,14 +276,11 @@ export default {
},
getInfo(){
let msg = {
goodId:this.id
id:this.id
}
this.apiJavaPost('/api/goodsMarket/getGoodsDetail',msg,res=>{
this.apiJavaPost('/api/orderForm/getOrderDetail',msg,res=>{
if(res.data.resultCode==1){
this.dataList = res.data.data;
this.orderTime = dataList.updateTime;
this.imageUrl = dataList.images.images.split(',')[0];
this.orderTitle = dataList.name;
}else{
this.Error(res.data.message);
}
......@@ -302,6 +296,9 @@ export default {
}
});
},
goUrl: function (path) {
this.$router.push({name: path});
}
},mounted(){
this.getInfo();
this.getScore();
......
src/components/IntegralMall/confirOrder.vue
View file @ 500c351a
......@@ -457,8 +457,10 @@ export default {
this.$router.push({
path:'/OrderCompleted',
query:{
// id:this.id,
//payScore:dataList.
createTime:dataList.createTime,
orderNum:dataList.orderNum,
pay:dataList.pay,
residue:dataList.residue
}
})
......
src/components/IntegralMall/myPointOrder.vue
View file @ 500c351a
......@@ -296,7 +296,7 @@
<span v-if="item.orderStatus==3">交易成功</span>
</td>
<td width="150px">
<input type="button" class="pointDetailBtn" @click="goUrl('OrderdetailsCompleted')" value="查看详情">
<input type="button" class="pointDetailBtn" @click="goUrl('OrderdetailsCompleted',item.id)" value="查看详情">
<!-- <div><input type="button" class="pointCancelBtn" value="取消订单"></div> -->
</td>
</tr>
......@@ -375,8 +375,13 @@ export default {
this.msg.pageIndex = parseInt(val);
this.getList();
},
goUrl: function (path) {
this.$router.push({name: path});
goUrl: function (path,id) {
this.$router.push({
name: path,
query:{
id:id
}
});
},
handleCommandTwo(command) {
this.orderTime = command.Day;
......
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