Commit 862dd81c by liangjianmin

Merge branch 'master' of http://119.23.72.7/liangjianmin/h5

# Conflicts:
#	view/0.js
#	view/21.js
#	view/22.js
#	view/23.js
#	view/24.js
#	view/25.js
#	view/26.js
#	view/27.js
#	view/28.js
#	view/29.js
#	view/30.js
#	view/31.js
#	view/32.js
#	view/33.js
#	view/34.js
#	view/35.js
#	view/36.js
#	view/39.js
#	view/4.js
#	view/40.d34fc3c1d6c06f536672.hot-update.js
#	view/40.js
#	view/41.js
#	view/42.js
#	view/43.js
#	view/44.js
#	view/45.js
#	view/46.js
#	view/47.js
#	view/48.js
#	view/49.js
#	view/50.js
#	view/58.ed4a816c5074b0d656b6.hot-update.js
#	view/58.js
#	view/app.js
#	view/index.html
parents 7387b3cc d15c6c0e
Showing with 611 additions and 12 deletions
<template>
<div id="app">
<keep-alive exclude="samplespecial,newsDetail,pointchange,wallet,walletRetrieve,walletDetail,walletRecord,walletStatus,walletWithdraw,walletRecharge,xianhuo,lxshop,brand,brandList,sampleapply,samplecominfo,samplebasinfo,risk,risksuccess,sample,addressp">
<keep-alive exclude="samplespecial,newsDetail,pointchange,wallet,walletRetrieve,walletDetail,walletRecord,walletStatus,walletWithdraw,walletRecharge,xianhuo,lxshop,brand,brandList,sampleapply,samplecominfo,samplebasinfo,risk,risksuccess,sample,addressp,orderDetail,shipping">
<router-view class="router-view"></router-view>
</keep-alive>
</div>
......
html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}html *{outline:0;-webkit-text-size-adjust:none !important;-webkit-tap-highlight-color:transparent !important}html,body{font-family:sans-serif;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background:#f8f8f8}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td,hr,button,article,aside,details,figcaption,figure,footer,header,menu,nav,section{margin:0;padding:0}button,input,select,textarea{font-size:100%;border:none;-webkit-appearance:none}input[type=button],input[type=file],input[type=submit]{cursor:pointer}table{border-collapse:collapse;border-spacing:0}ol,ul,dl{list-style:none}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:500}em,b,i{font-style:normal}a{text-decoration:none}img{border:none}.clr{*zoom:1;clear:both}.clr:after{content:".";clear:both;height:0;visibility:hidden;display:block}.fl{float:left;_display:inline}.f-orange{color:#ffa200 !important}.fr{float:right;_display:inline}.va-t{vertical-align:top}.va-m{vertical-align:middle}.va-b{vertical-align:bottom}.i-hide{display:none}.i-show{display:block}.lineBlock{display:inline-block;*display:inline;zoom:1;letter-spacing:normal;word-spacing:normal}.lbBox{font-size:0 !important;*word-spacing:-1px !important}.boxsiz{-webkit-box-sizing:border-box;box-sizing:border-box}html,body{width:100%;height:100%;-webkit-overflow-scrolling:touch}body{overflow-x:hidden}.f-blue{color:#1080d0}.f-red{color:#ff0000}.f-999{color:#999}.f-333{color:#666}.fw{font-weight:bold}.ta-c{text-align:center}.ta-l{text-align:left}.ta-r{text-align:right}.mt-10{margin-top:10px}.emptys{margin-left:-1px;width:1px;height:100%;font-size:0;vertical-align:middle}@media (min-width: 750px){html{background:rgba(0,0,0,0.5)}html body{max-width:480px;margin:0 auto;background:#fff}html body .main-interface .container-wrap::-webkit-scrollbar{width:10px;height:11px}html body .main-interface .container-wrap::-webkit-scrollbar-thumb{background-color:#ffffff;box-shadow:0px 0px 0px 0px rgba(73,73,73,0.92);border-radius:10px;border:solid 1px #e5e5e5;padding:2px}html body .main-interface .container-wrap::-webkit-scrollbar-track{background-color:#eeeeee;box-shadow:inset 1px 3px 5px 0px rgba(192,186,186,0.75);border-radius:10px}}.column{display:flex;flex-direction:column}.row{display:flex;flex-direction:row}.boxsiz{-webkit-box-sizing:border-box;box-sizing:border-box}.bothSide{justify-content:space-between}.avarage{justify-content:space-around}.rowCenter{justify-content:center}.verCenter{align-items:center}.boxFlex{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}
html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}html *{outline:0;-webkit-text-size-adjust:none !important;-webkit-tap-highlight-color:transparent !important}html,body{font-family:sans-serif;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background:#f8f8f8}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td,hr,button,article,aside,details,figcaption,figure,footer,header,menu,nav,section{margin:0;padding:0}button,input,select,textarea{font-size:100%;border:none;-webkit-appearance:none}input[type=button],input[type=file],input[type=submit]{cursor:pointer}table{border-collapse:collapse;border-spacing:0}ol,ul,dl{list-style:none}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:500}em,b,i{font-style:normal}a{text-decoration:none}img{border:none}.clr{*zoom:1;clear:both}.clr:after{content:".";clear:both;height:0;visibility:hidden;display:block}.fl{float:left;_display:inline}.f-orange{color:#FF693D !important}.fr{float:right;_display:inline}.va-t{vertical-align:top}.va-m{vertical-align:middle}.va-b{vertical-align:bottom}.i-hide{display:none}.i-show{display:block}.lineBlock{display:inline-block;*display:inline;zoom:1;letter-spacing:normal;word-spacing:normal}.lbBox{font-size:0 !important;*word-spacing:-1px !important}.boxsiz{-webkit-box-sizing:border-box;box-sizing:border-box}html,body{width:100%;height:100%;-webkit-overflow-scrolling:touch}body{overflow-x:hidden}.f-blue{color:#1080d0}.f-red{color:#ff0000}.f-999{color:#999}.f-333{color:#666}.fw{font-weight:bold}.ta-c{text-align:center}.ta-l{text-align:left}.ta-r{text-align:right}.mt-10{margin-top:10px}.emptys{margin-left:-1px;width:1px;height:100%;font-size:0;vertical-align:middle}@media (min-width: 750px){html{background:rgba(0,0,0,0.5)}html body{max-width:480px;margin:0 auto;background:#fff}html body .main-interface .container-wrap::-webkit-scrollbar{width:10px;height:11px}html body .main-interface .container-wrap::-webkit-scrollbar-thumb{background-color:#ffffff;box-shadow:0px 0px 0px 0px rgba(73,73,73,0.92);border-radius:10px;border:solid 1px #e5e5e5;padding:2px}html body .main-interface .container-wrap::-webkit-scrollbar-track{background-color:#eeeeee;box-shadow:inset 1px 3px 5px 0px rgba(192,186,186,0.75);border-radius:10px}}.column{display:flex;flex-direction:column}.row{display:flex;flex-direction:row}.boxsiz{-webkit-box-sizing:border-box;box-sizing:border-box}.bothSide{justify-content:space-between}.avarage{justify-content:space-around}.rowCenter{justify-content:center}.verCenter{align-items:center}.boxFlex{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}
......@@ -77,7 +77,7 @@ img {
}
.f-orange {
color: #ffa200 !important;
color: #FF693D !important;
}
.fr {
......
......@@ -63,7 +63,7 @@ img {
_display: inline; }
.f-orange {
color: #ffa200 !important; }
color: #FF693D !important; }
.fr {
float: right;
......
......@@ -74,6 +74,7 @@
height: 17px;
line-height: 17px;
margin-bottom: 0.44rem;
a{color:#666;}
span{
color:#333;
display: inline-block;
......
.order-detail{
.order-top{
width: 9.6rem;
background: #FFFFFF;
box-shadow: 0rem 0rem 0.09rem 0rem rgba(180, 202, 211, 0.38);
border-radius: 0.08rem;
margin:0 auto;
padding:0.28rem;
padding-bottom: 0.51rem;
box-sizing: border-box;
margin-top: 0.28rem;
.t1-box{
display: flex;
font-size: 12px;
padding-bottom: 0.36rem;
border-bottom:1px solid #e5e5e5;
line-height: 0.83rem;
img{height:0.83rem;width:0.83rem;margin-right: 0.4rem;}
.ordersta{
height:0.83rem;
color:#333;
.van-count-down{
font-size: 12px;
color:#FF693D;
display: inline;
}
}
&.wl{
position: relative;
cursor: pointer;
.ordersta{
width:6.4rem;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
i{font-size: 12px;color:#000!important;position: absolute;right:0;}
}
}
.t2-box{
padding-top: 0.4rem;
line-height: 0.6rem;
color:#6F6F6F;
font-size: 12px;
margin-bottom: 0.1rem;
font{
display: inline-block;cursor: pointer;
width: 1.12rem;
height: 0.45rem;
background: #F9F9F9;
border-radius: 0.03rem;
border: 0.01rem solid #E5E5E5;
color:#333;
text-align: center;
line-height: 0.45rem;
margin-right: 0.2rem;
}
}
.t3-box{
padding-top: 0.2rem;
.t2-gro{
height:0.6rem;
line-height: 0.6rem;
color:#333;
}
.cp-t{
display: flex;
border-top: 1px solid #e5e5e5;
padding-top: 0.32rem;
margin-top: 0.71rem;
margin-bottom: 0.71rem;
img{
width: 1.07rem;
height: 1.07rem;
border-radius: 100%;
margin-right: 0.3rem;
}
.ri-text{
color:#6F6F6F;
position: relative;
p{
line-height: 0.6rem;
}
}
}
}
.show-detail-btn{
width: 2.53rem;
height: 0.61rem;
background: #FFFFFF;
border-radius: 0.3rem;
border: 1px solid #D2D2D2;
text-align: center;
line-height: 0.61rem;
color:#6f6f6f;
font-size: 12px;
margin:0 auto;
i{font-size: 12px;margin-left: 0.12rem;}
}
}
.order-sec{
width:9.6rem;
margin:0 auto;
margin-top: 0.25rem;
.oda-group{
display: block;
padding:0.47rem 0.28rem ;
background: #FFFFFF;
box-shadow: 0rem 0rem 0.09rem 0rem rgba(180, 202, 211, 0.38);
border-radius: 0.08rem;
margin-bottom: 0.35rem;
.title-goods{
color:#333;
font-size: 15px;
margin-bottom: 0.33rem;
span{max-width: 8rem;display: inline-block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;vertical-align: middle;}
i{color:#000;font-size: 12px;margin-left: 0.33rem;position: relative;top:.02rem;}
}
.attrs{
color:#6F6F6F;
font-size: 12px;
.f-333{color:#333;}
.group-trr{
line-height: 0.66rem;
div{width:50%;}
}
}
}
}
.order-footer{
width: 9.4rem;
height: 1.32rem;
line-height: 1.32rem;
background: #FFFFFF;
border: 0.01rem solid #D6D6D6;
position: fixed;
bottom: 0px;
padding-left: 0.6rem;
left:0px;
color:#666;
font-size: 12px;
font{
color:#F3632C;
}
span{color:#F3632C;font-weight: bold;font-size: 21px;}
.fl{
width:6.32rem;
height:1.32rem;
overflow: hidden;
white-space: nowrap;
}
.fr{
width: 3.08rem;
height:1.32rem;text-align: center;
color:#fff;
background: #F3632C;
font-size: 18px;
}
}
}
\ No newline at end of file
.order-detail .order-top{width:9.6rem;background:#FFFFFF;box-shadow:0 0 .09rem 0 rgba(180,202,211,0.38);border-radius:.08rem;margin:0 auto;padding:.28rem;padding-bottom:.51rem;box-sizing:border-box;margin-top:.28rem}.order-detail .order-top .t1-box{display:flex;font-size:12px;padding-bottom:.36rem;border-bottom:1px solid #e5e5e5;line-height:.83rem}.order-detail .order-top .t1-box img{height:.83rem;width:.83rem;margin-right:.4rem}.order-detail .order-top .t1-box .ordersta{height:.83rem;color:#333}.order-detail .order-top .t1-box .ordersta .van-count-down{font-size:12px;color:#FF693D;display:inline}.order-detail .order-top .t1-box.wl{position:relative;cursor:pointer}.order-detail .order-top .t1-box.wl .ordersta{width:6.4rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.order-detail .order-top .t1-box.wl i{font-size:12px;color:#000 !important;position:absolute;right:0}.order-detail .order-top .t2-box{padding-top:.4rem;line-height:.6rem;color:#6F6F6F;font-size:12px;margin-bottom:.1rem}.order-detail .order-top .t2-box font{display:inline-block;cursor:pointer;width:1.12rem;height:.45rem;background:#F9F9F9;border-radius:.03rem;border:.01rem solid #E5E5E5;color:#333;text-align:center;line-height:.45rem;margin-right:.2rem}.order-detail .order-top .t3-box{padding-top:.2rem}.order-detail .order-top .t3-box .t2-gro{height:.6rem;line-height:.6rem;color:#333}.order-detail .order-top .t3-box .cp-t{display:flex;border-top:1px solid #e5e5e5;padding-top:.32rem;margin-top:.71rem;margin-bottom:.71rem}.order-detail .order-top .t3-box .cp-t img{width:1.07rem;height:1.07rem;border-radius:100%;margin-right:.3rem}.order-detail .order-top .t3-box .cp-t .ri-text{color:#6F6F6F;position:relative}.order-detail .order-top .t3-box .cp-t .ri-text p{line-height:.6rem}.order-detail .order-top .show-detail-btn{width:2.53rem;height:.61rem;background:#FFFFFF;border-radius:.3rem;border:1px solid #D2D2D2;text-align:center;line-height:.61rem;color:#6f6f6f;font-size:12px;margin:0 auto}.order-detail .order-top .show-detail-btn i{font-size:12px;margin-left:.12rem}.order-detail .order-sec{width:9.6rem;margin:0 auto;margin-top:.25rem}.order-detail .order-sec .oda-group{display:block;padding:.47rem .28rem;background:#FFFFFF;box-shadow:0 0 .09rem 0 rgba(180,202,211,0.38);border-radius:.08rem;margin-bottom:.35rem}.order-detail .order-sec .oda-group .title-goods{color:#333;font-size:15px;margin-bottom:.33rem}.order-detail .order-sec .oda-group .title-goods span{max-width:8rem;display:inline-block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;vertical-align:middle}.order-detail .order-sec .oda-group .title-goods i{color:#000;font-size:12px;margin-left:.33rem;position:relative;top:.02rem}.order-detail .order-sec .oda-group .attrs{color:#6F6F6F;font-size:12px}.order-detail .order-sec .oda-group .attrs .f-333{color:#333}.order-detail .order-sec .oda-group .attrs .group-trr{line-height:.66rem}.order-detail .order-sec .oda-group .attrs .group-trr div{width:50%}.order-detail .order-footer{width:9.4rem;height:1.32rem;line-height:1.32rem;background:#FFFFFF;border:.01rem solid #D6D6D6;position:fixed;bottom:0px;padding-left:.6rem;left:0px;color:#666;font-size:12px}.order-detail .order-footer font{color:#F3632C}.order-detail .order-footer span{color:#F3632C;font-weight:bold;font-size:21px}.order-detail .order-footer .fl{width:6.32rem;height:1.32rem;overflow:hidden;white-space:nowrap}.order-detail .order-footer .fr{width:3.08rem;height:1.32rem;text-align:center;color:#fff;background:#F3632C;font-size:18px}
\ No newline at end of file
......@@ -27,7 +27,7 @@
cursor: pointer;
}
input{
width:5.33rem;height: 27px;
width:7rem;height: 27px;
border-radius: 27px;
padding-left: 1rem;
background: #FFFFFF;
......@@ -59,6 +59,20 @@
position: fixed;
z-index: 2;
left:0px;top:40px;right:0px;
.tab-bc{
position: relative;
text-align: center;
&::before{
content:"";
height:25px;
width:1px;
top:12px;
background: #E5E5E5;
position: absolute;
z-index: 1;
}
}
}
.o-list{
.van-hairline--surround::after,.van-hairline--top::after{
......@@ -74,6 +88,7 @@
height: 17px;
line-height: 17px;
margin-bottom: 0.44rem;
a{color:#666;}
span{
color:#333;
display: inline-block;
......
......@@ -43,8 +43,8 @@ const userInfo = resolve => require(['@/views/user/userInfo'], resolve);
const userCoupon = resolve => require(['@/views/user/coupon'], resolve);
const userAddress = resolve => require(['@/views/user/address'], resolve);
const userOrder = resolve => require(['@/views/user/order'], resolve);
const orderDetail = resolve => require(['@/views/user/orderDetail'], resolve);
const shipping = resolve => require(['@/views/user/shipping'], resolve);
const shiplist = resolve => require(['@/views/user/shiplist'], resolve);
const brand = resolve => require(['@/views/brand/brand'], resolve);
......@@ -350,6 +350,14 @@ const routes = [
}
},
{
path: '/orderDetail',
component: orderDetail,
meta: {
title: '订单详情页',
back: true
}
},
{
path: '/userShipping',
component: shipping,
meta: {
......
import Vue from 'vue'
import { services as Services } from '../../../api/index'
import { Toast } from 'vant'
Vue.use(Toast);
var qs = require('qs');
const state = {
loading: false,
orderDetailInfo:{}
}
const mutations = {
}
const actions = {
getOrderDetail({ commit }, payload) {
state.loading = true;
var params = {
order_id: payload.order_id
}
Services.orderInfo(qs.stringify(params)).then((res) => {
state.loading = false;
console.log(res.data)
if (res.data.err_code == 0) {
state.orderDetailInfo=res.data.data
}else{
Toast(res.data.err_msg)
}
}).catch(function (err) {
state.loading = false;
});
},
orderDetailsureSend({ commit }, payload) {
state.loading = true;
var params = {
order_id: payload.order_id
}
Services.sureSend(qs.stringify(params)).then((res) => {
state.loading = false;
Toast(res.data.err_msg)
setTimeout(()=>{
window.location.href=window.location.href.split("&status")[0]+'&status=10'
},1000)
}).catch(function (err) {
state.loading = false;
});
},
}
const getters = {}
export default {
state,
mutations,
actions,
getters
}
......@@ -24,6 +24,7 @@ import user from './modules/user/index'
import coupon from './modules/user/coupon'
import userInfo from './modules/user/userInfo'
import userOrder from './modules/user/order'
import orderDetail from './modules/user/orderDetail'
import shipping from './modules/user/shipping'
import address from './modules/user/address'
......@@ -67,6 +68,7 @@ export default new Vuex.Store({
coupon,
address,
userOrder,
orderDetail,
brand,
rank,
download,
......
......@@ -23,7 +23,7 @@
<div class="o-list" v-if="currentList.length>0">
<div class="list-group van-hairline--surround" v-for="item in currentList">
<div class="l-h clr">
<a class="fl">订单号:{{item.order_sn}}</a>
<a class="fl" :href="'/h5/view/#/orderDetail?order_id='+item.order_id+'&status='+item.status">订单号:{{item.order_sn}}</a>
<span class="fl" @click="copy(item.order_sn)">复制</span>
<p class="fl">{{item.create_time}}</p>
......@@ -222,8 +222,10 @@
},
watch: {
$route(to,from) {
this.tabUi();
this.getData()
if(to.path=="/userOrder"&&to.query.status!=from.query.status){
this.tabUi();
this.getData()
}
},
againBuy: {
handler(newVal, oldVal) {
......@@ -254,8 +256,8 @@
},
methods: {
tabUi() {
var status = this.$route.query.status;
this.orderStatus = status || 0;
var status = this.$route.query.status || 0;
this.orderStatus = status;
var index = status == 1 ? 1 : (status == 2 ? 2 : status == 3 ? 3 : (status == 4 ? 4 : (status == 7 ? 5 :
(
status == 8 ? 6 : (status == 10 ? 7 : (status == -1 ? 8 : 0))))))
......@@ -292,7 +294,7 @@
})
},
isMaskShow() {
alert(0)
this.isMask = 0
},
//再次购买
......
<template>
<section class="order-detail">
<textarea id="domainxk" style="position:absolute;top:-9999px;">{{orderDetailInfo.order_sn}}</textarea>
<div class="order-top">
<div class="t1-box" v-if="status==2">
<img src="../../assets/images/user/timer.png" alt="猎芯网">
<div class="ordersta">订单已通过审核! 此订单会为您
<van-count-down :time="orderDetailInfo.self_rest_time" format="还剩DD天HH时" />
</div>
</div>
<a class="t1-box wl" :href="'/h5/view/#/userShipping?order_id='+orderDetailInfo.order_id+'&order_sn='+orderDetailInfo.order_sn"
v-else-if="orderDetailInfo.status==7||orderDetailInfo.status==8||orderDetailInfo.status==10">
<img src="../../assets/images/user/wuliud.png" alt="猎芯网">
<div class="ordersta" v-if="wlInfo.info">{{wlInfo.info[0].AcceptStation}}</div>
<i class="icon iconfont">&#xe67c;</i>
</a>
<div class="t1-box" v-else>
<img src="../../assets/images/user/orders.png" alt="猎芯网">
<div class="ordersta">订单状态:{{orderDetailInfo.status_val}}</div>
</div>
<div class="t2-box">
<div class="t2-gro clr">
<span class="fl">订单编号</span>
<span class="fr">
<font @click="copy(orderDetailInfo.order_sn)">复制</font>{{orderDetailInfo.order_sn}}
</span>
</div>
<div class="t2-gro clr">
<span class="fl">下单时间 </span>
<span class="fr">{{orderDetailInfo.create_time}}</span>
</div>
</div>
<div class="t3-box" v-show="isShowMore">
<div class="t2-gro clr">
<span class="fl">交货地点</span>
<span class="fr">{{orderDetailInfo.delivery_place==1?'国内交货':'香港交货'}}</span>
</div>
<div class="t2-gro clr">
<span class="fl">附加费用</span>
<span class="fr">{{orderDetailInfo.extend_fee_format}}</span>
</div>
<div class="t2-gro clr">
<span class="fl">运费</span>
<span class="fr">{{orderDetailInfo.shipping_price_format}}</span>
</div>
<div class="t2-gro clr">
<span class="fl">商品金额</span>
<span class="fr">{{orderDetailInfo.goods_total_format}}</span>
</div>
<div class="t2-gro clr">
<span class="fl">优惠金额</span>
<span class="fr f-orange">{{orderDetailInfo.activity_price_format?orderDetailInfo.activity_price_format:orderDetailInfo.preferential_price_format}}</span>
</div>
<div class="t2-gro clr">
<span class="fl">应付金额</span>
<span class="fr f-orange fw">{{orderDetailInfo.topay_amount_format}}</span>
</div>
<div class="t2-gro clr">
<span class="fl">交易成功获得积分</span>
<span class="fr ">{{orderDetailInfo.mkt_point}}</span>
</div>
<div class="t2-gro clr">
<span class="fl">发票类型</span>
<span class="fr " v-if="orderDetailInfo.inv">{{orderDetailInfo.inv.inv_type_val}}</span>
</div>
<div class="cp-t ">
<img v-if="userInfo.user_info.user_head" :src="userInfo.user_info.user_head" alt="猎芯网">
<img v-else src="https://static.ichunt.com/dist/res/home/images/headimg/boy9.png" alt="猎芯网">
<div class="ri-text">
<p>{{userInfo.user_info.user_name||userInfo.user_info.mobile}}{{userInfo.user_info.mobile}}</p>
<p>{{userInfo.company_info.com_address}}</p>
</div>
</div>
</div>
<div class="show-detail-btn" v-show="isShowMore" @click="isShowMore=!isShowMore">收起<i class="icon iconfont">&#xe61c;</i></div>
<div class="show-detail-btn" v-show="!isShowMore" @click="isShowMore=!isShowMore">展开<i class="icon iconfont">&#xe610;</i></div>
</div>
<div class="order-sec" v-if="orderDetailInfo.list">
<a class="oda-group" v-for="item in orderDetailInfo.list" :href="(item.goods_type==1||item.goods_type==2)?('/goods_'+item.goods_id+'.html'):('/item/'+item.goods_id+'.html')">
<div class="title-goods"><span>{{item.goods_name}}</span><i class="icon iconfont">&#xe67c;</i></div>
<div class="attrs">
<div class="group-trr clr">
<div class="fl">封装规格:{{item.goods_encap||'- -'}}</div>
<div class="fl">订货量:{{item.goods_number}}</div>
</div>
<div class="group-trr clr">
<div class="fl">制造商:{{item.brand_name}}</div>
<div class="fl">商品金额:{{item.goods_amount_format}}</div>
</div>
<div class="group-trr clr">
<div class="fl">货期:{{item.delivery_time}}</div>
<div class="fl f-333">实付金额:{{item.single_pre_price_amount}}</div>
</div>
</div>
</a>
</div>
<div class="order-footer">
<div class="fl" v-if="orderDetailInfo.topay_amount_format">应付金额:<span>{{orderDetailInfo.topay_amount_format.substring(1)}}</span>
<font >{{orderDetailInfo.topay_amount_format.substring(0,1)!='$'?'元':'美元'}}</font>(含运费)
</div>
<a class="fr" v-if="orderDetailInfo.status==2||orderDetailInfo.status==3" @click="nowPay(orderDetailInfo.order_id)">去支付</a>
<a class="fr" v-if="orderDetailInfo.status==8" @click="sureSend(orderDetailInfo.order_id)">确认收货</a>
</div>
<van-loading type="spinner" color="#000" class="loading-background" v-if="loading" />
</section>
</template>
<script>
import Vue from 'vue';
import {
mapState
} from 'vuex'
import {
Loading,
CountDown,
Toast,
Dialog,
} from 'vant';
Vue.use(Loading).use(CountDown).use(Toast).use(Dialog)
export default {
name: 'orderDetail',
data() {
return {
order_id: "",
status: "",
isShowMore:0
}
},
computed: {
...mapState({
loading: state => state.orderDetail.loading,
userInfo: state => state.shipping.userInfo,
orderDetailInfo: state => state.orderDetail.orderDetailInfo,
wlInfo: state => state.shipping.wlInfo,
}),
},
watch: {
},
created() {
this.order_id = this.$route.query.order_id;
this.status = this.$route.query.status;
this.$store.dispatch({
type: "getUserbase"
})
if (this.status == 7 || this.status == 8 || this.status == 10) {
this.$store.dispatch({
type: "shipping",
order_id: this.order_id
})
}
this.$store.dispatch({
type: "getOrderDetail",
order_id: this.order_id
})
},
methods: {
copy(order_sn) {
this.$nextTick(() => {
var copyobject = document.getElementById("domainxk");
copyobject.select();
document.execCommand("Copy");
Toast('复制成功');
})
},
//立即支付
nowPay(order_id) {
if (isMiniProgram) {
wx.miniProgram.navigateTo({
url: '/pages/pay/pay?order_id=' + order_id
});
return
}
window.location.href = window.location.origin + "/v3/pay/online?id=" + order_id
},
//确认收货
sureSend(order_id) {
Dialog.confirm({
message: '您要确认收货吗?',
})
.then(() => {
// on confirm
var datap = {
type: 'orderDetailsureSend',
order_id: order_id,
}
this.$store.dispatch(datap)
})
.catch(() => {
// on cancel
});
},
},
components: {
}
}
</script>
<style scoped>
@import "../../assets/css/user/orderDetail.min.css";
</style>
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"90560ff6039f47ece920","c":{"58":true}}
\ No newline at end of file
{"h":"0f23f2a1a141f2369817","c":{"58":true}}
\ No newline at end of file
{"h":"df880c2eeb25edeebcf0","c":{"39":true}}
\ No newline at end of file
{"h":"f8705dc72c5f5a5f0609","c":{"58":true}}
\ No newline at end of file
{"h":"9a7cf76c603b636f2ffb","c":{"58":true}}
\ No newline at end of file
{"h":"ebaefe1774caea93caca","c":{"58":true}}
\ No newline at end of file
{"h":"485d0a79c85cf2abaca1","c":{"58":true}}
\ No newline at end of file
{"h":"2de744e89307503574fb","c":{}}
\ No newline at end of file
{"h":"833716da0b4658d04db9","c":{"58":true}}
\ No newline at end of file
{"h":"4d12cc17df296ff81a48","c":{"app":true}}
\ No newline at end of file
{"h":"0f3770463ad731f3bf67","c":{"58":true}}
\ No newline at end of file
{"h":"ce62125d9853f70b07e0","c":{"58":true}}
\ No newline at end of file
{"h":"d500ac3e3f27e4a6175c","c":{"58":true}}
\ No newline at end of file
{"h":"494ddff44839105ccb09","c":{"58":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
{"h":"9660a639e1649c0a98da","c":{"58":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"d31691454701f5375446","c":{"app":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"f60df0dad4bf2fcb5f47","c":{"58":true}}
\ No newline at end of file
{"h":"a8cf6edcd076898687fd","c":{"58":true}}
\ No newline at end of file
{"h":"3c32a72188fc52d55007","c":{"58":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"61e66424d68ddd4c2b8a","c":{"58":true}}
\ No newline at end of file
{"h":"bf387ead14d53eac9a92","c":{"58":true}}
\ No newline at end of file
{"h":"7d028e8b46d74b398179","c":{"58":true}}
\ No newline at end of file
{"h":"906f2d95088eb37e70c6","c":{}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"d4c6350b5e462498d9e8","c":{}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"e304693d8349c0b3bc76","c":{"58":true}}
\ No newline at end of file
{"h":"d23be62dd51039985aa2","c":{"58":true}}
\ No newline at end of file
{"h":"e1489783f035c302307a","c":{"58":true}}
\ No newline at end of file
{"h":"ca95cae2ec2d515f2f0e","c":{"58":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"06a3d6a757030d0e2c35","c":{"40":true}}
\ No newline at end of file
{"h":"edec13a2055674eacb7d","c":{"app":true}}
\ No newline at end of file
{"h":"18f552682ffc4bc41ed3","c":{"58":true}}
\ No newline at end of file
{"h":"5f410be7a6a4a4b93479","c":{"58":true}}
\ No newline at end of file
{"h":"b8511e0b81f8d69f501b","c":{"58":true}}
\ No newline at end of file
{"h":"cf8fe7c1452036ca41c1","c":{"58":true}}
\ No newline at end of file
{"h":"d34fc3c1d6c06f536672","c":{"40":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"ca3898df29849695fa4f","c":{"39":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"aa7a7819fb97096098c3","c":{"58":true}}
\ No newline at end of file
{"h":"c77d44f5fe1164ba7740","c":{"58":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"37a5a87129319e1596fc","c":{"58":true}}
\ No newline at end of file
{"h":"5bb2599fc53fde7629d3","c":{"58":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"a975e87ff92d87e98380","c":{"58":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
{"h":"f054e524e36e2d8a32ca","c":{"40":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
{"h":"d470f0cb280a14045cf2","c":{"58":true}}
\ No newline at end of file
{"h":"85168a265641ff3c1f62","c":{"58":true}}
\ No newline at end of file
{"h":"9f09a2841c30d060ebab","c":{"58":true}}
\ No newline at end of file
{"h":"8c8574fa01e7c4118c12","c":{"58":true}}
\ No newline at end of file
{"h":"66a9bf04a271380cee45","c":{"39":true}}
\ No newline at end of file
{"h":"b8517fa04e4d6f38ad83","c":{"40":true}}
\ No newline at end of file
{"h":"891780dc1e825595b8a4","c":{"58":true}}
\ No newline at end of file
{"h":"fe6cfa14b61ebd2a28e5","c":{"39":true}}
\ No newline at end of file
{"h":"bd081fecba31d420dd82","c":{"39":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
{"h":"534c708b042069227635","c":{"58":true}}
\ No newline at end of file
{"h":"b6f90d89dd192c93f19f","c":{"58":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"b56844ea06b5d20de3ac","c":{"58":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
{"h":"7b46994cbc46aedc3e94","c":{"58":true}}
\ No newline at end of file
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
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 sign in to comment