订单详情弹窗
This commit is contained in:
parent
3f42bd0cd8
commit
0379a03adc
3
App.vue
3
App.vue
@ -10,7 +10,8 @@
|
||||
// +----------------------------------------------------------------------
|
||||
// #ifdef APP-PLUS
|
||||
var jpushModule = uni.requireNativePlugin("JG-JPush");
|
||||
// #endif import {
|
||||
// #endif
|
||||
import {
|
||||
checkLogin
|
||||
} from "./libs/login";
|
||||
import {
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -525,6 +525,13 @@
|
||||
title: '线下支付',
|
||||
payStatus: 2,
|
||||
},
|
||||
{
|
||||
"name": "先货后款",
|
||||
"icon": "icon-a-lujing17324 ",
|
||||
value: 'offline',
|
||||
title: `结算周期:30天 日利率:0.05%`,
|
||||
payStatus: 1,
|
||||
},
|
||||
],
|
||||
tagStyle: {
|
||||
img: 'width:100%;display:block;',
|
||||
|
@ -40,14 +40,17 @@
|
||||
</view>
|
||||
<!--定金预售订单-->
|
||||
<view v-if="presellProList.length > 0" class="event_container">
|
||||
<navigator class="acea-row row-between" url="/pages/users/presell_order_list/index" hover-class='none' >
|
||||
<navigator class="acea-row row-between" url="/pages/users/presell_order_list/index" hover-class='none'>
|
||||
<view class="info">
|
||||
<view class="title">预售尾款订单转到这里了!</view>
|
||||
<view class="desc">有 <text class="t-color">{{ presellOrderCount }}</text> 笔预售尾款订单待付款,请点击查看</view>
|
||||
<view class="desc">有 <text class="t-color">{{ presellOrderCount }}</text> 笔预售尾款订单待付款,请点击查看
|
||||
</view>
|
||||
</view>
|
||||
<view class="photo acea-row row-between">
|
||||
<view class='picture'>
|
||||
<image :src='(presellProList[0].orderProduct[0].cart_info.productAttr && presellProList[0].orderProduct[0].cart_info.productAttr.image) || presellProList[0].orderProduct[0].cart_info.product.image'></image>
|
||||
<image
|
||||
:src='(presellProList[0].orderProduct[0].cart_info.productAttr && presellProList[0].orderProduct[0].cart_info.productAttr.image) || presellProList[0].orderProduct[0].cart_info.product.image'>
|
||||
</image>
|
||||
</view>
|
||||
<view class="more_btn"><text class="iconfont icon-gengduo3"></text></view>
|
||||
</view>
|
||||
@ -63,68 +66,84 @@
|
||||
<view class="acea-row row-middle left-wrapper">
|
||||
{{item.group_order_sn}}
|
||||
</view>
|
||||
<view class='t-color'>{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}</view>
|
||||
<view class='t-color'>
|
||||
{{ item.orderList[0].activity_type === 2 && item.orderList[0].orderProduct[0].cart_info.productPresell.presell_type ==2 ? "待付定金" : "待付款" }}
|
||||
</view>
|
||||
</view>
|
||||
<view v-for="(order,j) in item.orderList" :key="order.order_id+j">
|
||||
<!--预售-->
|
||||
<view v-if="order.activity_type === 2">
|
||||
<block v-for="(goods,g) in order.orderProduct">
|
||||
<view class='item-info acea-row row-between row-top'>
|
||||
<!--预售-->
|
||||
<view v-if="order.activity_type === 2">
|
||||
<block v-for="(goods,g) in order.orderProduct">
|
||||
<view class='item-info acea-row row-between row-top'>
|
||||
<view class='pictrue'>
|
||||
<image :src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'></image>
|
||||
<image
|
||||
:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
|
||||
</image>
|
||||
</view>
|
||||
<view class='text acea-row row-between'>
|
||||
<view class='name line1'>
|
||||
<text class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
|
||||
<text
|
||||
class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
|
||||
<view class="event_ship event_color">发货时间:
|
||||
<!--全款预售-->
|
||||
<text v-if="goods.cart_info.productPresell.presell_type === 1">
|
||||
<text
|
||||
v-if="goods.cart_info.productPresell.presell_type === 1">
|
||||
{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内
|
||||
</text>
|
||||
<!--定金预售-->
|
||||
<text v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
|
||||
<text
|
||||
v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class='money'>
|
||||
<view>¥{{goods.cart_info.productPresellAttr.presell_price}}</view>
|
||||
<view>¥{{goods.cart_info.productPresellAttr.presell_price}}
|
||||
</view>
|
||||
<view>x{{goods.product_num}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="goods.cart_info.productPresell.presell_type === 2" class="event_price">
|
||||
定金待支付 <text class="t-color">¥{{ order.pay_price }}</text>
|
||||
尾款待支付 <text class="t-color">¥{{ order.presellOrder.pay_price }}</text>
|
||||
<view v-if="goods.cart_info.productPresell.presell_type === 2"
|
||||
class="event_price">
|
||||
定金待支付 <text class="t-color">¥{{ order.pay_price }}</text>
|
||||
尾款待支付 <text
|
||||
class="t-color">¥{{ order.presellOrder.pay_price }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
<view v-else>
|
||||
<block v-for="(goods,g) in order.orderProduct">
|
||||
<view class='item-info acea-row row-between row-top'>
|
||||
<view class='pictrue'>
|
||||
<image :src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'></image>
|
||||
<view class='item-info acea-row row-between row-top'>
|
||||
<view class='pictrue'>
|
||||
<image
|
||||
:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
|
||||
</image>
|
||||
</view>
|
||||
<view class='text acea-row row-between'>
|
||||
|
||||
<view class='name line2'>{{goods.cart_info.product.store_name}}
|
||||
</view>
|
||||
<view class='text acea-row row-between'>
|
||||
|
||||
<view class='name line2'>{{goods.cart_info.product.store_name}}</view>
|
||||
|
||||
<view class='money' v-if="item.orderList[0].activity_type == 4">
|
||||
<view v-if="goods.cart_info.activeSku">¥{{goods.cart_info.activeSku.active_price}}</view>
|
||||
<view>x{{goods.product_num}}</view>
|
||||
</view>
|
||||
<view v-else class='money'>
|
||||
<view>¥{{goods.cart_info.productAttr.price}}</view>
|
||||
<view>x{{goods.product_num}}</view>
|
||||
</view>
|
||||
|
||||
<view class='money' v-if="item.orderList[0].activity_type == 4">
|
||||
<view v-if="goods.cart_info.activeSku">
|
||||
¥{{goods.cart_info.activeSku.active_price}}</view>
|
||||
<view>x{{goods.product_num}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
<view v-else class='money'>
|
||||
<view>¥{{goods.cart_info.productAttr.price}}</view>
|
||||
<view>x{{goods.product_num}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
</view>
|
||||
<view class='totalPrice' v-if="item.orderList[0].activity_type !== 2">共{{item.total_num || 0}}件商品,总金额
|
||||
<view class='totalPrice' v-if="item.orderList[0].activity_type !== 2">
|
||||
共{{item.total_num || 0}}件商品,总金额
|
||||
<text class='money p-color'>¥{{item.pay_price}}</text>
|
||||
</view>
|
||||
<view class='bottom acea-row row-right row-middle'>
|
||||
<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>立即付款</view>
|
||||
<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
|
||||
立即付款</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -140,7 +159,8 @@
|
||||
<text class="iconfont icon-xiangyou"></text>
|
||||
</view>
|
||||
<view v-if="item.status == 0" class='t-color'>
|
||||
<text v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
|
||||
<text
|
||||
v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
|
||||
<text v-else>待发货</text>
|
||||
</view>
|
||||
<view v-if="item.status == 1" class='t-color'>待收货</view>
|
||||
@ -149,22 +169,30 @@
|
||||
<view v-if="item.status == -1" class='t-color'>已退款</view>
|
||||
</view>
|
||||
<view v-if="item.activity_type === 2">
|
||||
<view class='item-info acea-row row-between row-top' v-for="(goods,index) in item.orderProduct" :key="index">
|
||||
<view class='item-info acea-row row-between row-top'
|
||||
v-for="(goods,index) in item.orderProduct" :key="index">
|
||||
<view class='pictrue'>
|
||||
<image :src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'></image>
|
||||
<image
|
||||
:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
|
||||
</image>
|
||||
</view>
|
||||
<view class='text acea-row row-between'>
|
||||
<view class='name '>
|
||||
<view class='name' :class="item.status === 0 ? 'line1' : 'line2'">
|
||||
<text class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
|
||||
<text
|
||||
class="event_name event_bg">预售</text><text>{{goods.cart_info.product.store_name}}</text>
|
||||
<view v-if="item.status == 0" class="event_ship event_color">发货时间:
|
||||
<!--全款预售-->
|
||||
<text v-if="goods.cart_info.productPresell.presell_type === 1">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
|
||||
<text
|
||||
v-if="goods.cart_info.productPresell.presell_type === 1">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付成功后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
|
||||
<!--定金预售-->
|
||||
<text v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
|
||||
<text
|
||||
v-if="goods.cart_info.productPresell.presell_type === 2">{{ goods.cart_info.productPresell.delivery_type === 1 ? '支付尾款后' : '预售结束后' }}{{ goods.cart_info.productPresell.delivery_day }}天内</text>
|
||||
</view>
|
||||
</view>
|
||||
<view style="margin-top: 10rpx;" class="t-color">{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}</view>
|
||||
<view style="margin-top: 10rpx;" class="t-color">
|
||||
{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
|
||||
</view>
|
||||
</view>
|
||||
<view class='money'>
|
||||
<view>¥{{goods.cart_info.productPresellAttr.presell_price}}</view>
|
||||
@ -174,23 +202,30 @@
|
||||
</view>
|
||||
</view>
|
||||
<view v-else>
|
||||
<view class='item-info acea-row row-between row-top' v-for="(goods,index) in item.orderProduct" :key="index">
|
||||
<view class='item-info acea-row row-between row-top'
|
||||
v-for="(goods,index) in item.orderProduct" :key="index">
|
||||
<view class='pictrue'>
|
||||
<image :src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'></image>
|
||||
<image
|
||||
:src='(goods.cart_info.productAttr && goods.cart_info.productAttr.image) || goods.cart_info.product.image'>
|
||||
</image>
|
||||
</view>
|
||||
<view class='text acea-row row-between'>
|
||||
<view class='name '>
|
||||
<view class='name line2'>
|
||||
<text>{{goods.cart_info.product.store_name}}</text>
|
||||
</view>
|
||||
<view style="margin-top: 10rpx;" class="t-color">{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}</view>
|
||||
<view style="margin-top: 10rpx;" class="t-color">
|
||||
{{goods.is_refund==1?'退款中':goods.is_refund==2?'部分退款':goods.is_refund==3?'全部退款':''}}
|
||||
</view>
|
||||
</view>
|
||||
<view class='money' v-if="item.activity_type == 3">
|
||||
<view v-if="goods.cart_info.productAssistAttr">¥{{goods.cart_info.productAssistAttr.assist_price}}</view>
|
||||
<view v-if="goods.cart_info.productAssistAttr">
|
||||
¥{{goods.cart_info.productAssistAttr.assist_price}}</view>
|
||||
<view>x{{goods.product_num}}</view>
|
||||
</view>
|
||||
<view class='money' v-else-if="item.activity_type == 4">
|
||||
<view v-if="goods.cart_info.activeSku">¥{{goods.cart_info.activeSku.active_price}}</view>
|
||||
<view v-if="goods.cart_info.activeSku">
|
||||
¥{{goods.cart_info.activeSku.active_price}}</view>
|
||||
<view>x{{goods.product_num}}</view>
|
||||
</view>
|
||||
<view class='money' v-else>
|
||||
@ -206,26 +241,40 @@
|
||||
<view class='totalPrice' v-else>共{{item.orderNum || 0}}件商品,总金额
|
||||
<text class='money p-color'>¥{{item.pay_price}}</text>
|
||||
</view>
|
||||
<view class="totalPrice">
|
||||
共1件商品,结算周期到期后付款¥100
|
||||
</view>
|
||||
</view>
|
||||
<view class='bottom acea-row row-right row-middle'>
|
||||
<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt' @click.stop='applyInvoice(item.order_id)'>申请开票</view>
|
||||
<view v-if="!item.receipt && item.status != -1" class='bnt cancelBnt'
|
||||
@click.stop='applyInvoice(item.order_id)'>申请开票</view>
|
||||
<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
|
||||
<view v-if="!item.receipt && item.status != -1" class="bnt cancelBnt">一键转卖</view>
|
||||
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'>查看详情</view>
|
||||
</block>
|
||||
<block v-if="item.status == 1">
|
||||
<view class='bnt cancelBnt' v-if="item.delivery_type == 1 || item.delivery_type == 2" @click='goOrderDetails(item.order_id)'>查看物流</view>
|
||||
<view class='bnt cancelBnt'
|
||||
v-if="item.delivery_type == 1 || item.delivery_type == 2"
|
||||
@click='goOrderDetails(item.order_id)'>查看物流</view>
|
||||
<view class='bnt b-color' @tap='confirmOrder(item,index)'>确认收货</view>
|
||||
</block>
|
||||
<block v-if="item.status == 2">
|
||||
<navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
|
||||
<navigator v-if="community_status == 1 && !item.community_id"
|
||||
:url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id"
|
||||
class='bnt colorBnt' hover-class="none">
|
||||
<text class="iconfont icon-fabu"></text>
|
||||
发布种草
|
||||
</navigator>
|
||||
<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价</view>
|
||||
<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价
|
||||
</view>
|
||||
</block>
|
||||
<block v-if="item.status == 3">
|
||||
<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">查看详情</view>
|
||||
<navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
|
||||
<view class='bnt b-color' @click='goOrderDetails(item.order_id)'
|
||||
v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">
|
||||
查看详情</view>
|
||||
<navigator v-if="community_status == 1 && !item.community_id"
|
||||
:url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id"
|
||||
class='bnt colorBnt' hover-class="none">
|
||||
<text class="iconfont icon-fabu"></text>
|
||||
发布种草
|
||||
</navigator>
|
||||
@ -245,8 +294,21 @@
|
||||
</view>
|
||||
<home></home>
|
||||
<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
|
||||
<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id" :totalPrice='totalPrice'></payment>
|
||||
<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
|
||||
:totalPrice='totalPrice'></payment>
|
||||
<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
|
||||
<u-popup :show="show" bgColor='transparent' mode='center'>
|
||||
<view class="warp">
|
||||
<image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image>
|
||||
<image src="@/static/images/shouhuo.png" mode="widthFix"></image>
|
||||
</view>
|
||||
<view class="textp">
|
||||
<h3>确认收到货了吗?</h3>
|
||||
<span>此订单为先货后款订单,确认收货后将开始计算结算周期。为保障售后权益,请检查后再确认收货。</span>
|
||||
<button class="shouhuobtn" @click="queding()">确认收货</button>
|
||||
<view class="cle" @click="close">取消</view>
|
||||
</view>
|
||||
</u-popup>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -274,15 +336,23 @@
|
||||
import {
|
||||
getUserInfo
|
||||
} from '@/api/user.js';
|
||||
import {openOrderSubscribe} from '@/utils/SubscribeMessage.js';
|
||||
import {
|
||||
openOrderSubscribe
|
||||
} from '@/utils/SubscribeMessage.js';
|
||||
import payment from '@/components/payment';
|
||||
import home from '@/components/home/index.vue';
|
||||
import addInvoicing from '@/components/addInvoicing';
|
||||
import { mapGetters } from "vuex";
|
||||
import {
|
||||
mapGetters
|
||||
} from "vuex";
|
||||
import authorize from '@/components/Authorize';
|
||||
import emptyPage from '@/components/emptyPage.vue';
|
||||
import { configMap } from '@/utils'
|
||||
import { HTTP_REQUEST_URL } from '@/config/app';
|
||||
import {
|
||||
configMap
|
||||
} from '@/utils'
|
||||
import {
|
||||
HTTP_REQUEST_URL
|
||||
} from '@/config/app';
|
||||
export default {
|
||||
components: {
|
||||
payment,
|
||||
@ -337,18 +407,23 @@
|
||||
invoice: {
|
||||
invoice: false,
|
||||
add: false,
|
||||
},
|
||||
show: false,
|
||||
shouhuo: {
|
||||
index: '',
|
||||
id: ''
|
||||
}
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['isLogin','viewColor']),
|
||||
...mapGetters(['isLogin', 'viewColor']),
|
||||
...configMap(['hide_mer_status', 'community_status', 'alipay_open', 'yue_pay_status']),
|
||||
},
|
||||
watch: {
|
||||
alipay_open(n){
|
||||
alipay_open(n) {
|
||||
this.payMode[1].payStatus = n
|
||||
},
|
||||
yue_pay_status(n){
|
||||
yue_pay_status(n) {
|
||||
this.payMode[2].payStatus = n
|
||||
}
|
||||
},
|
||||
@ -366,16 +441,14 @@
|
||||
this.isShowAuth = true
|
||||
}
|
||||
},
|
||||
onReady(){
|
||||
},
|
||||
mounted: function() {
|
||||
},
|
||||
onReady() {},
|
||||
mounted: function() {},
|
||||
methods: {
|
||||
// 去商铺
|
||||
goMall(item){
|
||||
if(this.hide_mer_status == 0){
|
||||
goMall(item) {
|
||||
if (this.hide_mer_status == 0) {
|
||||
uni.navigateTo({
|
||||
url:'/pages/store/home/index?id='+item.mer_id
|
||||
url: '/pages/store/home/index?id=' + item.mer_id
|
||||
})
|
||||
}
|
||||
},
|
||||
@ -537,15 +610,15 @@
|
||||
title: '缺少订单号无法查看订单详情和评价'
|
||||
});
|
||||
// #ifdef MP
|
||||
if (self.orderStatus == 0) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/order_details/stay?order_id=' + order_id
|
||||
})
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: '/pages/order_details/index?order_id=' + order_id
|
||||
})
|
||||
}
|
||||
if (self.orderStatus == 0) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/order_details/stay?order_id=' + order_id
|
||||
})
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: '/pages/order_details/index?order_id=' + order_id
|
||||
})
|
||||
}
|
||||
// #endif
|
||||
// #ifndef MP
|
||||
if (self.orderStatus == 0) {
|
||||
@ -580,7 +653,7 @@
|
||||
if (that.loading) return;
|
||||
that.loading = true;
|
||||
that.loadTitle = "加载更多";
|
||||
if(that.isReady){
|
||||
if (that.isReady) {
|
||||
that.isReady = false
|
||||
if (that.orderStatus == 0) {
|
||||
groupOrderList({
|
||||
@ -591,7 +664,8 @@
|
||||
let list = res.data.list || [];
|
||||
let loadend = list.length < that.limit;
|
||||
// console.log(that.orderList)
|
||||
that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that.orderList);
|
||||
that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
|
||||
.orderList);
|
||||
that.$set(that, 'orderList', that.orderList);
|
||||
// console.log(that.orderList)
|
||||
that.getProductCount();
|
||||
@ -608,7 +682,8 @@
|
||||
}).then(res => {
|
||||
let list = res.data.list || [];
|
||||
let loadend = list.length < that.limit;
|
||||
that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that.orderList);
|
||||
that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that
|
||||
.orderList);
|
||||
that.$set(that, 'orderList', that.orderList);
|
||||
that.getProductCount();
|
||||
that.loadend = loadend;
|
||||
@ -641,15 +716,15 @@
|
||||
/**
|
||||
* 获取单个订单商品数量
|
||||
*/
|
||||
getProductCount: function(){
|
||||
if(this.orderStatus !== 0){
|
||||
this.orderList.forEach((item,i) => {
|
||||
getProductCount: function() {
|
||||
if (this.orderStatus !== 0) {
|
||||
this.orderList.forEach((item, i) => {
|
||||
let orderNum = 0
|
||||
if(item.orderProduct){
|
||||
if (item.orderProduct) {
|
||||
item.orderProduct.forEach((val) => {
|
||||
orderNum += val.product_num
|
||||
})
|
||||
this.orderList[i]['orderNum']=orderNum;
|
||||
orderNum += val.product_num
|
||||
})
|
||||
this.orderList[i]['orderNum'] = orderNum;
|
||||
}
|
||||
})
|
||||
}
|
||||
@ -676,29 +751,50 @@
|
||||
},
|
||||
// 确认收货
|
||||
confirmOrder: function(item, index) {
|
||||
let that = this;
|
||||
uni.showModal({
|
||||
title: '确认收货',
|
||||
content: '为保障权益,请收到货确认无误后,再确认收货',
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
orderTake(item.order_id).then(res => {
|
||||
return that.$util.Tips({
|
||||
title: '操作成功',
|
||||
icon: 'success'
|
||||
}, function() {
|
||||
that.orderList.splice(index, 1);
|
||||
that.getOrderData();
|
||||
});
|
||||
}).catch(err => {
|
||||
return that.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
this.show = true
|
||||
this.shouhuo.id = item.order_id
|
||||
this.shouhuo.index = index
|
||||
// uni.showModal({
|
||||
// title: '确认收货',
|
||||
// content: '为保障权益,请收到货确认无误后,再确认收货',
|
||||
// success: function(res) {
|
||||
// if (res.confirm) {
|
||||
// orderTake(item.order_id).then(res => {
|
||||
// return that.$util.Tips({
|
||||
// title: '操作成功',
|
||||
// icon: 'success'
|
||||
// }, function() {
|
||||
// that.orderList.splice(index, 1);
|
||||
// that.getOrderData();
|
||||
// });
|
||||
// }).catch(err => {
|
||||
// return that.$util.Tips({
|
||||
// title: err
|
||||
// });
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
},
|
||||
queding() {
|
||||
let that = this;
|
||||
orderTake(this.shouhuo.id).then(res => {
|
||||
return that.$util.Tips({
|
||||
title: '操作成功',
|
||||
icon: 'success',
|
||||
}, function() {
|
||||
that.orderList.splice(this.shouhuo.index, 1);
|
||||
that.getOrderData();
|
||||
});
|
||||
that.show=false
|
||||
}).catch(err => {
|
||||
return that.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
that.show=false
|
||||
})
|
||||
},
|
||||
/*申请开票*/
|
||||
applyInvoice(order_id) {
|
||||
let that = this;
|
||||
@ -709,13 +805,13 @@
|
||||
},
|
||||
// 关闭发票弹窗
|
||||
changeInvoiceClose: function(data) {
|
||||
if(data)this.getInvoiceData(data);
|
||||
this.$set(this.invoice, 'invoice', false);
|
||||
if (data) this.getInvoiceData(data);
|
||||
this.$set(this.invoice, 'invoice', false);
|
||||
},
|
||||
// 开票回调
|
||||
getInvoiceData(data) {
|
||||
let that = this
|
||||
applyInvoiceApi(that.invoice_order_id,data).then(res => {
|
||||
applyInvoiceApi(that.invoice_order_id, data).then(res => {
|
||||
return that.$util.Tips({
|
||||
title: res.message,
|
||||
});
|
||||
@ -724,6 +820,9 @@
|
||||
title: err
|
||||
});
|
||||
})
|
||||
},
|
||||
close() {
|
||||
this.show = false
|
||||
}
|
||||
},
|
||||
onReachBottom: function() {
|
||||
@ -738,9 +837,19 @@
|
||||
padding: 0 30rpx;
|
||||
background-color: var(--view-theme);
|
||||
}
|
||||
.t-color{color: var(--view-theme);}
|
||||
.p-color{color: var(--view-priceColor);}
|
||||
.b-color{background-color:var(--view-theme);}
|
||||
|
||||
.t-color {
|
||||
color: var(--view-theme);
|
||||
}
|
||||
|
||||
.p-color {
|
||||
color: var(--view-priceColor);
|
||||
}
|
||||
|
||||
.b-color {
|
||||
background-color: var(--view-theme);
|
||||
}
|
||||
|
||||
.my-order .header .picTxt {
|
||||
height: 190rpx;
|
||||
}
|
||||
@ -859,13 +968,16 @@
|
||||
width: 320rpx;
|
||||
color: #282828;
|
||||
}
|
||||
.event_bg{
|
||||
|
||||
.event_bg {
|
||||
background: #FF7F00;
|
||||
}
|
||||
.event_color{
|
||||
|
||||
.event_color {
|
||||
color: #FF7F00;
|
||||
}
|
||||
.my-order .list .item .event_name{
|
||||
|
||||
.my-order .list .item .event_name {
|
||||
display: inline-block;
|
||||
margin-right: 9rpx;
|
||||
color: #fff;
|
||||
@ -875,13 +987,16 @@
|
||||
text-align: center;
|
||||
border-radius: 6rpx;
|
||||
}
|
||||
.my-order .list .item .event_ship{
|
||||
|
||||
.my-order .list .item .event_ship {
|
||||
font-size: 20rpx;
|
||||
margin-top: 10rpx;
|
||||
}
|
||||
.my-order .list .event_price{
|
||||
|
||||
.my-order .list .event_price {
|
||||
margin: 0 0 50rpx 120rpx;
|
||||
}
|
||||
|
||||
.my-order .list .item .item-info .text .money {
|
||||
text-align: right;
|
||||
}
|
||||
@ -920,14 +1035,17 @@
|
||||
border: 1px solid #ddd;
|
||||
color: #aaa;
|
||||
}
|
||||
|
||||
.my-order .list .item .bottom .bnt.colorBnt {
|
||||
border: 1px solid var(--view-theme);
|
||||
color: var(--view-theme);
|
||||
}
|
||||
.my-order .list .item .bottom .bnt .icon-fabu{
|
||||
|
||||
.my-order .list .item .bottom .bnt .icon-fabu {
|
||||
font-size: 26rpx;
|
||||
margin-right: 10rpx;
|
||||
}
|
||||
|
||||
.my-order .list .item .bottom .bnt~.bnt {
|
||||
margin-left: 17rpx;
|
||||
}
|
||||
@ -947,7 +1065,8 @@
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
.event_container{
|
||||
|
||||
.event_container {
|
||||
width: 690rpx;
|
||||
background-image: url(../static/images/presell_orderBg.png);
|
||||
background-size: cover;
|
||||
@ -955,30 +1074,37 @@
|
||||
margin: 20rpx auto;
|
||||
padding: 26rpx 30rpx;
|
||||
border-radius: 16rpx;
|
||||
.info{
|
||||
|
||||
.info {
|
||||
width: 420rpx;
|
||||
.title{
|
||||
|
||||
.title {
|
||||
color: #282828;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
.desc{
|
||||
|
||||
.desc {
|
||||
color: #999;
|
||||
font-size: 24rpx;
|
||||
margin-top: 30rpx;
|
||||
}
|
||||
}
|
||||
.photo{
|
||||
|
||||
.photo {
|
||||
width: 180rpx;
|
||||
.picture{
|
||||
|
||||
.picture {
|
||||
width: 120rpx;
|
||||
height: 120rpx;
|
||||
image{
|
||||
|
||||
image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
border-radius: 8rpx;
|
||||
}
|
||||
}
|
||||
.more_btn{
|
||||
|
||||
.more_btn {
|
||||
color: #fff;
|
||||
background: #F97E3B;
|
||||
width: 40rpx;
|
||||
@ -988,13 +1114,14 @@
|
||||
line-height: 40rpx;
|
||||
position: relative;
|
||||
top: 40rpx;
|
||||
text{
|
||||
|
||||
text {
|
||||
font-size: 20rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.search {
|
||||
height: 70rpx;
|
||||
padding: 0 30rpx;
|
||||
@ -1003,10 +1130,62 @@
|
||||
background-color: #FFFFFF;
|
||||
font-size: 26rpx;
|
||||
color: #999999;
|
||||
|
||||
|
||||
.iconfont {
|
||||
margin-right: 10rpx;
|
||||
font-size: 23rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
.warp {
|
||||
margin: auto;
|
||||
|
||||
.guanbi {
|
||||
position: absolute;
|
||||
right: 0px;
|
||||
z-index: 1;
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
.textp {
|
||||
width: 320px;
|
||||
padding-bottom: 20px;
|
||||
position: absolute;
|
||||
top: 130px;
|
||||
border-radius: 10px;
|
||||
|
||||
h3 {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
span {
|
||||
display: block;
|
||||
width: 280px;
|
||||
padding-top: 20px;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
.shouhuobtn {
|
||||
margin: auto;
|
||||
line-height: 54px;
|
||||
margin-top: 30px;
|
||||
width: 191px;
|
||||
height: 54px;
|
||||
color: white;
|
||||
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
|
||||
border-radius: 27px 27px 27px 27px;
|
||||
}
|
||||
|
||||
.cle {
|
||||
margin: auto;
|
||||
text-align: center;
|
||||
margin-top: 15px;
|
||||
height: 40px;
|
||||
background-color: #FFFFFF;
|
||||
border-radius: 10px;
|
||||
color: #999999;
|
||||
}
|
||||
}
|
||||
</style>
|
79
static/iconfont/icontan.css
Normal file
79
static/iconfont/icontan.css
Normal file
@ -0,0 +1,79 @@
|
||||
@font-face {
|
||||
font-family: "icontan"; /* Project id 3552766 */
|
||||
src: url('iconfont.woff2?t=1688454694052') format('woff2'),
|
||||
url('iconfont.woff?t=1688454694052') format('woff'),
|
||||
url('iconfont.ttf?t=1688454694052') format('truetype');
|
||||
}
|
||||
|
||||
.iconfont {
|
||||
font-family: "iconfont" !important;
|
||||
font-size: 16px;
|
||||
font-style: normal;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
.icon-a-lujing17324:before {
|
||||
content: "\e601";
|
||||
}
|
||||
|
||||
.icon-dianpu:before {
|
||||
content: "\e600";
|
||||
}
|
||||
|
||||
.icon-clock:before {
|
||||
content: "\e627";
|
||||
}
|
||||
|
||||
.icon-ditu_dingwei_o:before {
|
||||
content: "\ebbb";
|
||||
}
|
||||
|
||||
.icon-f24gl-telephone:before {
|
||||
content: "\e953";
|
||||
}
|
||||
|
||||
.icon-sound-Mute:before {
|
||||
content: "\e766";
|
||||
}
|
||||
|
||||
.icon-vehivles:before {
|
||||
content: "\e76b";
|
||||
}
|
||||
|
||||
.icon-shoes:before {
|
||||
content: "\e76c";
|
||||
}
|
||||
|
||||
.icon-aviation:before {
|
||||
content: "\e770";
|
||||
}
|
||||
|
||||
.icon-landtransportation:before {
|
||||
content: "\e773";
|
||||
}
|
||||
|
||||
.icon-dingwei:before {
|
||||
content: "\e8c4";
|
||||
}
|
||||
|
||||
.icon-favorites-fill:before {
|
||||
content: "\e721";
|
||||
}
|
||||
|
||||
.icon-rmb:before {
|
||||
content: "\e761";
|
||||
}
|
||||
|
||||
.icon-scanning:before {
|
||||
content: "\e762";
|
||||
}
|
||||
|
||||
.icon-raw:before {
|
||||
content: "\e75e";
|
||||
}
|
||||
|
||||
.icon-service:before {
|
||||
content: "\e764";
|
||||
}
|
||||
|
BIN
static/images/shouhuo.png
Normal file
BIN
static/images/shouhuo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 76 KiB |
BIN
static/images/wenhao.png
Normal file
BIN
static/images/wenhao.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.0 KiB |
BIN
static/images/yuqi.png
Normal file
BIN
static/images/yuqi.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 56 KiB |
Loading…
x
Reference in New Issue
Block a user