Commit 9eff1e6b by LJM

css

parent 2b63fcad
...@@ -153,6 +153,7 @@ ...@@ -153,6 +153,7 @@
font-size: 24rpx; font-size: 24rpx;
color: #484b59; color: #484b59;
line-height: 40rpx; line-height: 40rpx;
white-space: nowrap;
} }
.price { .price {
font-size: 26rpx; font-size: 26rpx;
...@@ -160,33 +161,72 @@ ...@@ -160,33 +161,72 @@
font-weight: bold; font-weight: bold;
} }
.right-bar { .right-bar {
.btn {
margin-right: 24rpx;
&:last-child {
margin-right: 0;
}
}
.btn0 { .btn0 {
width: 142rpx; width: 142rpx;
height: 48rpx; height: 48rpx;
background: #f98119;
border-radius: 6rpx;
font-size: 22rpx;
color: #fff;
}
.btn1 {
width: 142rpx;
height: 48rpx;
border-radius: 6rpx;
border: 1px solid #1969f9;
font-size: 22rpx;
color: #1969f9;
}
.btn2 {
width: 142rpx;
height: 48rpx;
border-radius: 6rpx;
border: 1px solid #1969f9;
font-size: 22rpx;
color: #1969f9;
}
.btn3 {
width: 142rpx;
height: 48rpx;
background: #ffffff; background: #ffffff;
border-radius: 6rpx; border-radius: 6rpx;
opacity: 0.54;
border: 1px solid #c6c7cc; border: 1px solid #c6c7cc;
font-size: 22rpx; font-size: 22rpx;
color: #484b59; color: #484b59;
} }
.btn1 { .btn4 {
width: 142rpx;
height: 48rpx;
background: #1969f9;
border-radius: 6rpx;
font-size: 22rpx;
color: #fff;
}
.btn5 {
width: 142rpx; width: 142rpx;
height: 48rpx; height: 48rpx;
background: #ffffff; background: #ffffff;
border-radius: 6rpx; border-radius: 6rpx;
opacity: 0.54; opacity: 0.54;
border: 1px solid #c6c7cc; border: 1px solid #c6c7cc;
margin-right: 24rpx;
font-size: 22rpx; font-size: 22rpx;
color: #484b59; color: #484b59;
} }
.btn2 { .btn6 {
width: 142rpx; width: 142rpx;
height: 48rpx; height: 48rpx;
background: #f98119; background: #1969f9;
border-radius: 6rpx; border-radius: 6rpx;
font-size: 22rpx; font-size: 22rpx;
color: #ffffff; color: #fff;
} }
} }
} }
......
<template> <template>
<view class="page-userOrder"> <view class="page-userOrder">
<drag-button-follow follow="left,right" className="drag-button" class="drag-button" :url="kfurl"></drag-button-follow> <!-- <drag-button-follow follow="left,right" className="drag-button" class="drag-button" :url="kfurl"></drag-button-follow> -->
<view class="top"> <view class="top">
<view class="head row bothSide verCenter"> <view class="head row bothSide verCenter">
<view class="left row verCenter"> <view class="left row verCenter">
...@@ -33,21 +33,21 @@ ...@@ -33,21 +33,21 @@
<view class="p1 row bothSide verCenter"> <view class="p1 row bothSide verCenter">
<view class="row verCenter"> <view class="row verCenter">
<text class="t1">订单号:</text> <text class="t1">订单号:</text>
<text class="t2">12022071810404SZ</text> <text class="t2">{{ item.order_sn }}</text>
<text class="t3">2023.04.24 11:40</text> <text class="t3">{{ item.create_time }}</text>
</view> </view>
<text class="color2">待审核</text> <text class="color2">{{ item.status_val }}</text>
</view> </view>
<view class="p2 row bothSide verCenter"> <view class="p2 row bothSide verCenter">
<view class="row verCenter"> <view class="row verCenter">
<text class="t1">附加费:</text> <text class="t1">附加费:</text>
<text class="t2" style="margin-right: 24rpx;">¥3580.23</text> <text class="t2" style="margin-right: 24rpx;">{{ item.extend_fee_format }}</text>
<text class="t1">运费:</text> <text class="t1">运费:</text>
<text class="t2">¥10.00</text> <text class="t2">{{ item.shipping_price_format }}</text>
</view> </view>
<view class="right-bar"> <view class="right-bar">
<text class="bar-t1"></text> <text class="bar-t1"></text>
<text class="bar-t2">4</text> <text class="bar-t2">{{ item.list.length }}</text>
<text class="bar-t1">件商品</text> <text class="bar-t1">件商品</text>
<text class="iconfont icon-jt"></text> <text class="iconfont icon-jt"></text>
</view> </view>
...@@ -55,9 +55,17 @@ ...@@ -55,9 +55,17 @@
<view class="p3 row bothSide verCenter"> <view class="p3 row bothSide verCenter">
<view class="row verCenter"> <view class="row verCenter">
<text class="t1">总金额:</text> <text class="t1">总金额:</text>
<text class="price">¥3580.23</text> <text class="price">{{ item.order_amount_format }}</text>
</view>
<view class="right-bar row">
<view class="btn btn0 row rowCenter verCenter" v-if="item.status == 2 || item.status == 3" @click.stop="nowPay(item.order_id)">立即支付</view>
<view class="btn btn1 row rowCenter verCenter" v-if="item.status == 10 || item.status == -1" @click.stop="rebuy(item.order_id)">再次购买</view>
<view class="btn btn2 row rowCenter verCenter" v-if="item.status == 4" @click.stop="sendTip(item.order_sn, item.user_id)">提醒发货</view>
<view class="btn btn3 row rowCenter verCenter" v-if="item.status != 1" @click.stop="downpd(item.order_id)">下载合同</view>
<view class="btn btn4 row rowCenter verCenter" v-if="item.status == 7 || item.status == 8 || item.status == 10" @click.stop="ship(item.order_id, item.order_sn, item.zy_delivery_type, item.status)">查看物流</view>
<view class="btn btn5 row rowCenter verCenter" v-if="item.status == 2 || item.status == 1" @click.stop="cancelOrder(item.order_id)">取消订单</view>
<view class="btn btn6 row rowCenter verCenter" v-if="item.status == 8" @click.stop="sureSend(item.order_id)">确认收货</view>
</view> </view>
<view class="right-bar row"><view class="btn0 row rowCenter verCenter">取消订单</view></view>
</view> </view>
</view> </view>
</view> </view>
...@@ -152,6 +160,40 @@ export default { ...@@ -152,6 +160,40 @@ export default {
bindDateChange: function(e) { bindDateChange: function(e) {
this.date = e.detail.value; this.date = e.detail.value;
}, },
/**
* 立即支付
* @param {Object} order_id
*/
nowPay(order_id) {},
/**
* 再次购买
* @param {Object} order_id
*/
rebuy(order_id) {},
/**
* 提醒发货
* @param {Object} order_sn
* @param {Object} user_id
*/
sendTip(order_sn, user_id) {},
/**
* 取消订单
* @param {Object} order_id
*/
cancelOrder(order_id) {},
/**
* 查看物流
* @param {Object} order_id
* @param {Object} order_sn
* @param {Object} zy_delivery_type
* @param {Object} status
*/
ship(order_id, order_sn, zy_delivery_type, status) {},
/**
*确认收货
* @param {Object} order_id
*/
sureSend(order_id) {},
getData() { getData() {
this.request(Api_Url + '/order/lists', 'POST', this.searchParams, true, true).then(res => { this.request(Api_Url + '/order/lists', 'POST', this.searchParams, true, true).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
...@@ -164,5 +206,5 @@ export default { ...@@ -164,5 +206,5 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
@import '@/assets/css/mine/userOrder.scss'; @import '@/assets/css/mine/shoporder.scss';
</style> </style>
...@@ -3,7 +3,7 @@ import API_BASE from '../util/api.js' ...@@ -3,7 +3,7 @@ import API_BASE from '../util/api.js'
* 请求封装 * 请求封装
*/ */
const request = (url = '', type = 'GET', param = {}, Loading, headertype) => { const request = (url = '', type = 'GET', param = {}, Loading, headertype) => {
//是否启动加载 //是否启动加载
if (Loading) { if (Loading) {
uni.showLoading({ uni.showLoading({
...@@ -16,7 +16,7 @@ const request = (url = '', type = 'GET', param = {}, Loading, headertype) => { ...@@ -16,7 +16,7 @@ const request = (url = '', type = 'GET', param = {}, Loading, headertype) => {
pf: 2 pf: 2
}); });
//请求es相关 //请求es相关
if (url.indexOf("so12.ichunt.") != -1 || url.indexOf("/esapi/") != -1|| url.indexOf("/goods/detail") != -1) { if (url.indexOf("so12.ichunt.") != -1 || url.indexOf("/esapi/") != -1 || url.indexOf("/goods/detail") != -1) {
params = Object.assign(param, { hkyefgyd: 1 }); params = Object.assign(param, { hkyefgyd: 1 });
} }
...@@ -40,6 +40,11 @@ const request = (url = '', type = 'GET', param = {}, Loading, headertype) => { ...@@ -40,6 +40,11 @@ const request = (url = '', type = 'GET', param = {}, Loading, headertype) => {
success: response => { success: response => {
if (Loading) uni.hideLoading(); if (Loading) uni.hideLoading();
if (response.statusCode === 200) { if (response.statusCode === 200) {
if (response.data.err_code == 11012) {
uni.navigateTo({
url: '/login'
})
}
let result = response.data; let result = response.data;
resolve(result); resolve(result);
} else { } else {
......
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