Browse Source

修改了样式

feature/feature-compatible
wangkesi 7 years ago
parent
commit
483a91fb0f
2 changed files with 28 additions and 11 deletions
  1. 4
      src/models/utils-model.js
  2. 35
      src/view/order-detail.vue

4
src/models/utils-model.js

@ -14,8 +14,8 @@ instance.interceptors.request.use(
if (token) {
config.headers.encodeToken = token;
}
// config.headers.encodeToken =
// "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE1NzEyMjQ3Mjc1OTcsInBheWxvYWQiOiJcIjE4MDYwMTE0MDkyODM4NDEwMXwxNTM5Njg4NzI3NTc5XCIifQ.sJBefUfJwybtWTNauW3j-w8VA6BlV56ASKmgQvDJc_Y";
config.headers.encodeToken =
"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE1NzEyMjQ3Mjc1OTcsInBheWxvYWQiOiJcIjE4MDYwMTE0MDkyODM4NDEwMXwxNTM5Njg4NzI3NTc5XCIifQ.sJBefUfJwybtWTNauW3j-w8VA6BlV56ASKmgQvDJc_Y";
console.log(config);
return config;
},

35
src/view/order-detail.vue

@ -9,7 +9,7 @@
<img src="../assets/images/order-list/address.png">
<div class="item-top-address">{{info.merchantName}}</div>
</div>
<div class="item-top-state">{{stateText}}</div>
<div class="item-top-state" :class="'state'+state">{{stateText}}</div>
</div>
<div class="item-main">
<img :src="imghost+info.goodsImgUrl">
@ -19,7 +19,7 @@
<div class="tips">
{{info.shortDesc}}
</div>
<div class="price">¥{{info.totalPrice/100}}</div>
<div class="price">¥{{info.totalPrice?info.totalPrice/100:''}}</div>
</div>
<div class="tag-box">
<i class="tag" v-for="item in labelList" v-if="item.labelText">{{item.labelText}}</i>
@ -45,7 +45,7 @@
<div class="time-item">下单时间
<div class="time">{{info.create}}</div>
</div>
<div class="time-item">付款时间
<div class="time-item" v-show="info.payTime">付款时间
<div class="time">{{info.payTime}}</div>
</div>
</div>
@ -53,7 +53,7 @@
<div class="money-box-top">
<div class="order">
<div class="text">订单金额</div>
<div class="num">¥{{info.totalPrice/100}}</div>
<div class="num">¥{{info.totalPrice?info.totalPrice/100:""}}</div>
</div>
<div class="discount">
<div class="text">
@ -62,7 +62,7 @@
</div>
<span class="discount-name" v-if="info.primeCoupon">{{info.primeCoupon.couponName}}</span>
</div>
<div class="num">¥{{info.couponPrice/100}}</div>
<div class="num">¥{{info.couponPrice?info.couponPrice/100:''}}</div>
</div>
</div>
<div class="money-box-bottom" :class="{right:state!==0&&state!==10}">
@ -82,10 +82,10 @@
<div class="button" role="button" v-if="state==30||state==21" @click="go(1)">
重新下单
</div>
<div class="button" role="button" v-if="state===0" @click="pay()">
<div class="button" role="button" style="background:#00BA86;color:white;" v-if="state===0" @click="pay()">
立即付款
</div>
<div class="button" role="button" v-if="state==10||state==11" @click="go(2)">
<div class="button" role="button" style="background:#00BA86;color:white;" v-if="state==10||state==11" @click="go(2)">
预约服务
</div>
<div class="button" role="button" v-if="state==20">
@ -141,11 +141,15 @@ export default {
},
methods: {
getData() {
this.$vux.loading.show({
text: "Loading"
});
orderApi
.getDetail({
orderNo: this.orderNo
})
.then(res => {
this.$vux.loading.hide();
if (res.code === 0 && res.response.data) {
this.authUrl = res.response.authUrl || "";
let info = res.response.data;
@ -385,6 +389,18 @@ export default {
color: #999;
font-size: 0.28rem;
}
.state0 {
color: #fcac21;
}
.state10 {
color: #00ba86;
}
.state11 {
color: #00ba86;
}
.state20 {
color: #fc4f21;
}
}
.item-main {
display: flex;
@ -516,6 +532,7 @@ export default {
margin-bottom: 0.12rem;
}
.box {
word-break: break-all;
width: 100%;
height: 1.47rem;
font-size: 0.28rem;
@ -530,8 +547,7 @@ export default {
}
.time-box {
width: 100%;
// height: 1.5rem;
padding: 0.4rem 0.2rem;
padding: 0.4rem 0.2rem 0rem 0.2rem;
background-color: #fff;
box-sizing: border-box;
margin-bottom: 0.2rem;
@ -541,6 +557,7 @@ export default {
.time-item {
display: flex;
font-size: 0.28rem;
margin-bottom: 0.3rem;
align-items: center;
line-height: 1;
color: #666;

Loading…
Cancel
Save