From d675cfe80732e51635f2076385933fa8d2369a6f Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Sat, 16 Mar 2024 18:00:57 +0800
Subject: [PATCH] 1

---
 api/order.js                        |  242 +--
 pages/store/home/index.vue          |   66 +-
 pages/users/order_confirm/index.vue |    9 +
 pages/users/order_list/index.vue    | 2159 ++++++++++++++-------------
 4 files changed, 1302 insertions(+), 1174 deletions(-)

diff --git a/api/order.js b/api/order.js
index afacfac..29beff4 100644
--- a/api/order.js
+++ b/api/order.js
@@ -9,19 +9,27 @@
 // +----------------------------------------------------------------------
 import request from "@/utils/request.js";
 
+/**
+ * 上传对公账户凭证
+ * @param numType boolean true 购物车数量,false=购物车产品数量
+ */
+export function uploadEnvidenceApi(orderId, url) {
+	return request.post("order/upload/" + orderId + '?url=' + url);
+}
+
 /**
  * 获取购物车列表
  * @param numType boolean true 购物车数量,false=购物车产品数量
  */
 export function getCartCounts(data) {
-  return request.get("user/cart/count", data);
+	return request.get("user/cart/count", data);
 }
 /**
  * 获取购物车列表
  * 
  */
 export function getCartList(data) {
-  return request.get("user/cart/lst", data);
+	return request.get("user/cart/lst", data);
 }
 
 /**
@@ -30,74 +38,74 @@ export function getCartList(data) {
  * @param int number 修改数量
  */
 export function changeCartNum(cartId, data) {
-  return request.post("user/cart/change/"+cartId,data);
+	return request.post("user/cart/change/" + cartId, data);
 }
 /**
  * 清除购物车
  * @param object ids
-*/
-export function cartDel(data){
-  return request.post('user/cart/delete', data);
+ */
+export function cartDel(data) {
+	return request.post('user/cart/delete', data);
 }
 /**
  * 购物车商品属性
  * @param object ids
-*/
-export function cartProductAttr(id){
-  return request.get(`store/product/get_attr_value/${id}`);
+ */
+export function cartProductAttr(id) {
+	return request.get(`store/product/get_attr_value/${id}`);
 }
 /**
  * 订单列表
  * @param object data
-*/
-export function getOrderList(data){
-  return request.get('order/list',data);
+ */
+export function getOrderList(data) {
+	return request.get('order/list', data);
 }
 
 /**
  * 订单产品信息
  * @param string unique 
-*/
-export function orderProduct(orderId){
-  return request.get('reply/product/'+orderId);
+ */
+export function orderProduct(orderId) {
+	return request.get('reply/product/' + orderId);
 }
 
 /**
  * 订单评价
  * @param object data
  * 
-*/
-export function orderComment(id,data){
-  return request.post('reply/'+id,data);
+ */
+export function orderComment(id, data) {
+	return request.post('reply/' + id, data);
 }
 
 /**
  * 订单支付
  * @param object data
-*/
-export function orderPay(id,data){
-  return request.post('order/pay/'+id,data);
+ */
+export function orderPay(id, data) {
+	return request.post('order/pay/' + id, data);
 }
 
 /**
  * 积分商品订单支付
  * @param object data
-*/
-export function integralOrderPay(id,data){
-  return request.post('order/points/pay/'+id,data);
+ */
+export function integralOrderPay(id, data) {
+	return request.post('order/points/pay/' + id, data);
 }
 /**
  * 订单统计数据
-*/
-export function orderData(data){
-  return request.get('order/number', data)
+ */
+export function orderData(data) {
+	return request.get('order/number', data)
 }
 
 /**
  * 订单取消
  * @param string id
  * 
-*/
+ */
 // export function orderCancel(id){
 //   return request.post('order/cancel',{id:id});
 // }
@@ -106,57 +114,57 @@ export function orderData(data){
  * 未支付订单取消
  * @param string id
  * 
-*/
-export function unOrderCancel(id){
-  return request.post('order/cancel/'+id);
+ */
+export function unOrderCancel(id) {
+	return request.post('order/cancel/' + id);
 }
 
 /**
  * 删除已完成订单
  * @param string uni
  * 
-*/
-export function orderDel(id){
-  return request.post('order/del/'+id);
+ */
+export function orderDel(id) {
+	return request.post('order/del/' + id);
 }
 
 /**
  * 订单详情
  * @param string uni 
-*/
-export function getOrderDetail(uni){
-  return request.get('order/detail/'+uni);
+ */
+export function getOrderDetail(uni) {
+	return request.get('order/detail/' + uni);
 }
 
 /**
  * 订单详情
  * @param string uni 
-*/
-export function groupOrderDetail(uni){
-  return request.get('order/group_order_detail/'+uni);
+ */
+export function groupOrderDetail(uni) {
+	return request.get('order/group_order_detail/' + uni);
 }
 
 // 支付状态订单
-export function getPayOrder(uni){
-  return request.get('order/status/'+uni);
+export function getPayOrder(uni) {
+	return request.get('order/status/' + uni);
 }
 
 /**
  * 再次下单
  * @param string uni
  * 
-*/
-export function orderAgain(data){
-  return request.post('user/cart/again',data);
+ */
+export function orderAgain(data) {
+	return request.post('user/cart/again', data);
 }
 
 /**
  * 订单收货
  * @param string uni
  * 
-*/
-export function orderTake(uni){
-  return request.post('order/take/'+uni);
+ */
+export function orderTake(uni) {
+	return request.post('order/take/' + uni);
 }
 
 /**
@@ -164,52 +172,52 @@ export function orderTake(uni){
  * @returns {*}
  */
 export function express(id) {
-  return request.post("order/express/" + id);
+	return request.post("order/express/" + id);
 }
 /**
  * 退款单查询物流信息
  * @returns {*}
  */
-export function refundOrderExpress(merId,id) {
-  return request.get(`server/${merId}/refund/express/${id}`);
+export function refundOrderExpress(merId, id) {
+	return request.get(`server/${merId}/refund/express/${id}`);
 }
 /**
  * 获取退款理由
  * 
-*/
-export function ordeRefundReason(){
-  return request.get('order/refund/reason');
+ */
+export function ordeRefundReason() {
+	return request.get('order/refund/reason');
 }
 
 /**
  * 订单退款审核
  * @param object data
-*/
-export function orderRefundVerify(data){
-  return request.post('order/refund/verify',data);
+ */
+export function orderRefundVerify(data) {
+	return request.post('order/refund/verify', data);
 }
 
 /**
  * 订单确认获取订单详细信息
  * @param string cartId
-*/
-export function orderConfirm(data){
-  return request.post('order/check', data);
+ */
+export function orderConfirm(data) {
+	return request.post('order/check', data);
 }
 /**
  * 订单确认获取订单详细信息
  * @param string cartId
-*/
-export function getOrderConfirm(data){
-  return request.post('v2/order/check', data);
+ */
+export function getOrderConfirm(data) {
+	return request.post('v2/order/check', data);
 }
 /**
  * 获取当前金额能使用的优惠卷
  * @param string price
  * 
-*/
-export function getCouponsOrderPrice(price, data){
-  return request.get('coupons/order/' + price, data)
+ */
+export function getCouponsOrderPrice(price, data) {
+	return request.get('coupons/order/' + price, data)
 }
 
 
@@ -221,50 +229,68 @@ export function getCouponsOrderPrice(price, data){
  * @returns {*}
  */
 export function postOrderComputed(key, data) {
-  return request.post("/order/computed/" + key, data);
+	return request.post("/order/computed/" + key, data);
 }
 
 // 生成订单
 export function orderCreate(data) {
-	return request.post("order/create",data,{ noAuth : true });
+	return request.post("order/create", data, {
+		noAuth: true
+	});
 }
 // 新的生成订单
 export function createOrder(data) {
-	return request.post("v2/order/create",data,{ noAuth : true });
+	return request.post("v2/order/create", data, {
+		noAuth: true
+	});
 }
 // 未支付订单
 export function groupOrderList(data) {
-	return request.get("order/group_order_list",data,{ noAuth : true });
+	return request.get("order/group_order_list", data, {
+		noAuth: true
+	});
 }
 
 // 批量退款列表
 export function refundBatch(id) {
-	return request.get("refund/batch_product/"+id,{ noAuth : true });
+	return request.get("refund/batch_product/" + id, {
+		noAuth: true
+	});
 }
 
 // 退款商品
-export function refundProduct(id,data) {
-	return request.get("refund/product/"+id,data,{ noAuth : true });
+export function refundProduct(id, data) {
+	return request.get("refund/product/" + id, data, {
+		noAuth: true
+	});
 }
 
 // 申请退款
-export function refundApply(id,data) {
-	return request.post("refund/apply/"+id,data,{ noAuth : true });
+export function refundApply(id, data) {
+	return request.post("refund/apply/" + id, data, {
+		noAuth: true
+	});
 }
 
 // 退款理由
 export function refundMessage() {
-	return request.get("common/refund_message",{ noAuth : true });
+	return request.get("common/refund_message", {
+		noAuth: true
+	});
 }
 
 // 退款列表
 export function refundList(data) {
-	return request.get("refund/list",data,{ noAuth : true });
+	return request.get("refund/list", data, {
+		noAuth: true
+	});
 }
 
 // 退款详情
 export function refundDetail(id) {
-	return request.get("refund/detail/"+id,{ noAuth : true });
+	return request.get("refund/detail/" + id, {
+		noAuth: true
+	});
 }
 
 // 物流列表
@@ -273,71 +299,79 @@ export function expressList() {
 }
 
 // 退回商品提交
-export function refundBackGoods(id,data) {
-	return request.post("refund/back_goods/"+id,data,{ noAuth : true });
+export function refundBackGoods(id, data) {
+	return request.post("refund/back_goods/" + id, data, {
+		noAuth: true
+	});
 }
 
 // 退款记录删除
 export function refundDel(id) {
-	return request.post("refund/del/"+id,{ noAuth : true });
+	return request.post("refund/del/" + id, {
+		noAuth: true
+	});
 }
 
 // 退款记录删除
 export function refundExpress(id) {
-	return request.get("refund/express/"+id,{ noAuth : true });
+	return request.get("refund/express/" + id, {
+		noAuth: true
+	});
 }
 
 // 核销二维码
 export function verifyCode(id) {
-	return request.get("order/verify_code/"+id);
+	return request.get("order/verify_code/" + id);
 }
 /**
  * 预售尾款支付
  * @param object data
-*/
-export function presellOrderPay(id,data){
-  return request.post('presell/pay/'+id,data);
+ */
+export function presellOrderPay(id, data) {
+	return request.post('presell/pay/' + id, data);
 }
 
 /**
  * 发票订单
  * @param object data
-*/
-export function receiptOrder(data){
-  return request.get('user/receipt/order',data);
+ */
+export function receiptOrder(data) {
+	return request.get('user/receipt/order', data);
 }
 /**
  * 发票订单
  * @param object data
-*/
-export function getReceiptOrder(id){
-  return request.get('user/receipt/order/'+id);
+ */
+export function getReceiptOrder(id) {
+	return request.get('user/receipt/order/' + id);
 }
 /**
  * 发票订单
  * @param object data
-*/
-export function getCallBackUrlApi(key){
-  return request.get('common/pay_key/'+key, {},{ noAuth : true});
+ */
+export function getCallBackUrlApi(key) {
+	return request.get('common/pay_key/' + key, {}, {
+		noAuth: true
+	});
 }
 /**
  * 发票订单
  * @param object data
-*/
-export function develiveryDetail(id){
-  return request.get(`order/delivery/${id}`);
+ */
+export function develiveryDetail(id) {
+	return request.get(`order/delivery/${id}`);
 }
 /**
  * 订单申请开票
  * @param object data
-*/
-export function applyInvoiceApi(id, data){
-  return request.post(`order/receipt/${id}`, data);
+ */
+export function applyInvoiceApi(id, data) {
+	return request.post(`order/receipt/${id}`, data);
 }
 /**
  * 退款单取消申请
  * @param object data
-*/
-export function refundCancelApi(id){
-  return request.post(`refund/cancel/${id}`);
+ */
+export function refundCancelApi(id) {
+	return request.post(`refund/cancel/${id}`);
 }
\ No newline at end of file
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index d023ca0..858a4e7 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -11,12 +11,12 @@
 					<text class="search-txt">搜索商品名称</text>
 					<text class="search-btn">搜索</text>
 				</navigator>
-				<view class="iconfont icon-gouwuche" style="color: #fff;" @click="toGwc"></view>
 			</view>
 
 			<view class="shop">
 				<view class="shop-img">
-					<u-image width="100rpx" height="154rpx" :lazyLoad="true" :fade="true" :src="store.mer_avatar">
+					<u-image width="100rpx" height="154rpx" :lazyLoad="true" :fade="true" :src="store.mer_avatar"
+						radius="10">
 						<template v-slot:loading>
 							<u-loading-icon color="#999"></u-loading-icon>
 						</template>
@@ -24,7 +24,7 @@
 				</view>
 
 				<view class="shop-info">
-					<view class="shop-info-title line1">{{store.mer_name}}</view>
+					<view class="shop-info-title">{{store.mer_name}}</view>
 					<view class="shop-info-eva">
 						<view class="star">
 							<u-rate count="5" :value="score.star" size="12" activeColor="#FFBC21"
@@ -32,13 +32,14 @@
 							<text
 								style="color:#FFBC21;font-size: 12px;margin: 0 10rpx 0 4rpx;">{{ score.number.toFixed(1) }}</text>
 						</view>
-						<view class="shop-info-sale">月销2000+</view>
+						<view class="shop-info-sale">月销{{store.sales}}+</view>
 						<view v-if="store.services_type == 0" class="iconfont icon-kefu3" @click="goService"></view>
 						<view v-else-if="store.services_type == 1" class="iconfont icon-kefu3" @click="call(1)"></view>
 						<view v-else class="iconfont icon-kefu3" @click="call(0)"> </view>
 					</view>
 					<view class="shop-info-runtime">营业时间 : 90:00－21:00</view>
-					<view class="shop-info-addr iconfont iconfont-xiangyou">{{store.mer_address}}</view>
+					<view class="shop-info-addr iconfont iconfont-xiangyou" @click="showMaoLocation">
+						{{store.mer_address}}</view>
 				</view>
 
 				<view class="shop-logo">
@@ -687,23 +688,37 @@
 			}
 		},
 		// #endif
-		mounted: function() {
-			const query = uni.createSelectorQuery().in(this);
-			// query.select('#store').boundingClientRect(data => {
-			// 	this.storeHeight = data.height;
-			// 	this.storeTop = data.top;
-			// }).exec();
-		},
-
 		methods: {
-			// 购物车
-			toGwc() {
-				uni.switchTab({
-					url: "/pages/order_addcart/order_addcart",
-					fail(err) {
-						console.log(err);
-					}
-				})
+			// 查看地图
+			showMaoLocation: function() {
+				if (!this.store.lat || !this.store.long) return this
+					.$util.Tips({
+						title: '请设置允许商城访问您的位置！'
+					});
+				let that = this,
+					lat = parseFloat(this.store.lat),
+					long = parseFloat(this.store.long)
+				//#ifdef H5
+				if (that.$wechat.isWeixin() === true) {
+					that.$wechat.seeLocation({
+						latitude: Number(lat),
+						longitude: Number(long),
+						address: this.store.mer_address ? this.store.mer_address : ''
+					}).then(res => {
+						console.log('success');
+					})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: lat,
+						longitude: long,
+						address: this.store.mer_address ? this.store.mer_address : '',
+						scale: 8,
+						success: function() {},
+					});
+					// #ifdef H5
+				}
+				//#endif
 			},
 
 			// 列表高度
@@ -1167,8 +1182,8 @@
 
 	.header {
 		position: relative;
-		padding: 0 34rpx;
-		height: calc(300rpx + var(--status-bar-height));
+		padding: 0 34rpx 20rpx;
+		min-height: calc(300rpx + var(--status-bar-height));
 		background-color: #40AE36;
 
 		.head-menu {
@@ -1194,7 +1209,7 @@
 				align-items: center;
 				height: 58rpx;
 				border-radius: 29rpx;
-				margin: 0 32rpx;
+				margin-left: 32rpx;
 				background-color: #FFFFFF;
 
 				.iconfont {
@@ -1237,6 +1252,8 @@
 
 			.shop-img {
 				margin-right: 20rpx;
+				border-radius: 10rpx;
+				overflow: hidden;
 			}
 
 			.shop-info {
@@ -1246,6 +1263,7 @@
 					font-weight: 600;
 					font-size: 28rpx;
 					color: #FFFFFF;
+					word-break: break-word;
 				}
 
 				.shop-info-eva {
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 619635f..19b972c 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -1518,6 +1518,15 @@
 								url: goPages + '&status=1'
 							});
 							break;
+						case "public":
+							//对公账户
+							return that.$util.Tips({
+								title: '下单成功,请上传支付凭证!'
+							}, {
+								tab: 5,
+								url: "/pages/users/order_list/index"
+							});
+							break;
 							// #ifdef H5
 						case 'h5':
 							let host = window.location.protocol + "//" + window.location.host;
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index e9f0963..f35703e 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -1,44 +1,46 @@
 <template>
-  <view :style="viewColor">
-    <view class='my-order'>
-      <view style="position: fixed; top: 0; left: 0; width: 100%; z-index: 999;">
-        <view class="order-nav">
-          <view class="btn_back" @click="navBack">
-            <text class="iconfont icon-fanhui" style="font-size: 36rpx;"></text>
-          </view>
-          <view class="btn_tab">
-            <view class="tab_item" :class="{'tab_item_active': sale_type==1}" @click="changeSaleType(1)">用户订单</view>
-            <view v-if="mer_info.mer_settlement_agree_status" class="tab_item" :class="{'tab_item_active': sale_type==2}" @click="changeSaleType(2)">商户订单</view>
-          </view>
-          <view class="btn_car">
-            <text class="iconfont icon-gouwuche" style="font-size: 36rpx;"></text>
-          </view>
-        </view>
-        <view class='nav acea-row row-around new-nav-tab'>
-          <view class='item' :class='orderStatus==-1 ? "on": ""' @click="statusClick(-1)">
-            <view>全部</view>
-            <view class='num'>{{orderData.all || 0}}</view>
-          </view>
-          <view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(0)">
-            <view>待付款</view>
-            <view class='num'>{{orderData.noPay || 0}}</view>
-          </view>
-          <view class='item' :class='orderStatus==1 ? "on": ""' @click="statusClick(1)">
-            <view>待发货</view>
-            <view class='num'>{{orderData.noPostage || 0}}</view>
-          </view>
-          <view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
-            <view>待收货</view>
-            <view class='num '>{{orderData.noDeliver || 0}}</view>
-          </view>
-          <view class='item' :class='orderStatus==3 ? "on": ""' @click="statusClick(3)">
-            <view>待评价</view>
-            <view class='num'>{{orderData.noComment || 0}}</view>
-          </view>
-        </view>
-      </view>
-      <view style="height: calc(200rpx + var(--status-bar-height));"></view>
-      <!-- <view class='header'>
+	<view :style="viewColor">
+		<view class='my-order'>
+			<view style="position: fixed; top: 0; left: 0; width: 100%; z-index: 999;">
+				<view class="order-nav">
+					<view class="btn_back" @click="navBack">
+						<text class="iconfont icon-fanhui" style="font-size: 36rpx;"></text>
+					</view>
+					<view class="btn_tab">
+						<view class="tab_item" :class="{'tab_item_active': sale_type==1}" @click="changeSaleType(1)">
+							用户订单</view>
+						<view v-if="mer_info.mer_settlement_agree_status" class="tab_item"
+							:class="{'tab_item_active': sale_type==2}" @click="changeSaleType(2)">商户订单</view>
+					</view>
+					<view class="btn_car">
+						<text class="iconfont icon-gouwuche" style="font-size: 36rpx;"></text>
+					</view>
+				</view>
+				<view class='nav acea-row row-around new-nav-tab'>
+					<view class='item' :class='orderStatus==-1 ? "on": ""' @click="statusClick(-1)">
+						<view>全部</view>
+						<view class='num'>{{orderData.all || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(0)">
+						<view>待付款</view>
+						<view class='num'>{{orderData.noPay || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==1 ? "on": ""' @click="statusClick(1)">
+						<view>待发货</view>
+						<view class='num'>{{orderData.noPostage || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
+						<view>待收货</view>
+						<view class='num '>{{orderData.noDeliver || 0}}</view>
+					</view>
+					<view class='item' :class='orderStatus==3 ? "on": ""' @click="statusClick(3)">
+						<view>待评价</view>
+						<view class='num'>{{orderData.noComment || 0}}</view>
+					</view>
+				</view>
+			</view>
+			<view style="height: calc(200rpx + var(--status-bar-height));"></view>
+			<!-- <view class='header'>
 				<view class='picTxt acea-row row-between-wrapper'>
 					<view class='text'>
 						<view class='name'>订单信息</view>
@@ -49,7 +51,7 @@
 					</view>
 				</view>
 			</view> -->
-      <!-- <view class='nav acea-row row-around'>
+			<!-- <view class='nav acea-row row-around'>
 				<view class='item' :class='orderStatus==-1 ? "on": ""' @click="statusClick(-1)">
 					<view>全部</view>
 					<view class='num'>{{orderData.all || 0}}</view>
@@ -71,1081 +73,1146 @@
 					<view class='num'>{{orderData.noComment || 0}}</view>
 				</view>
 			</view> -->
-      <navigator class="search acea-row row-middle" url="/pages/users/order_list/search" hover-class="none">
-        <text class="iconfont icon-sousuo"></text>
-        搜索我的订单
-      </navigator>
-      <!--定金预售订单-->
-      <view v-if="presellProList.length > 0" class="event_container"
-        :style="{ 'background-image': `url(${domain}/static/images/presell_orderBg.png)`}">
-        <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>
-          <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>
-            </view>
-            <view class="more_btn"><text class="iconfont icon-gengduo3"></text></view>
-          </view>
-        </navigator>
-      </view>
-      <view class='list'>
-        <!-- 代付款 -->
-        <view v-if="orderList.length > 0">
-          <block v-if="orderStatus == 0">
-            <view class='item' v-for="(item,index) in orderList" :key="index">
-              <view @click='goOrderDetails(item.group_order_id)'>
-                <view class='title acea-row row-between-wrapper'>
-                  <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>
-                <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 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 line1'>
-                            <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">
-                                {{ 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>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>
-                      </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>
-                        <view class='text acea-row row-between'>
-                          <view class='name line2'>
-                            <text v-if="goods.product_type != 0 && goods.product_type != 10"
-                              :class="'font_bg-red type'+goods.product_type">{{goods.product_type == 1 ? "秒杀" : goods.product_type == 2 ? "预售" : goods.product_type == 3 ? "助力" : goods.product_type == 4 ? "拼团" : ""}}</text>
-                            {{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>
-                      </view>
-                    </block>
-                  </view>
-                </view>
-                <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>
-              </view>
-            </view>
-          </block>
-          <!-- 待发货 待收货 待评价 已完成 -->
-          <block v-else>
-            <view class='item' v-for="(item,index) in orderList" :key="index">
-              <view @click='goOrderDetails(item.order_id)'>
-                <view class='title acea-row row-between-wrapper'>
-                  <view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
-                    <text class="iconfont icon-shangjiadingdan"></text>
-                    <view class="store-name">{{item.merchant.mer_name}}</view>
-                    <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-else>待发货</text>
-                  </view>
-                  <view v-if="item.status == 1" class='t-color'>待收货</view>
-                  <view v-if="item.status == 2" class='t-color'>待评价</view>
-                  <view v-if="item.status == 3" class='t-color'>已完成</view>
-                  <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='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 '>
-                        <view class='name' :class="item.status === 0 ? 'line1' : 'line2'">
-                          <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 === 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>
-                      <view class='money'>
-                        <view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
-                        <view>x{{goods.product_num}}</view>
-                      </view>
-                    </view>
-                  </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='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 '>
-                        <view class='name line2'>
-                          <text v-if="goods.product_type != 0 && goods.product_type != 10"
-                            :class="'font_bg-red type'+goods.product_type">{{goods.product_type == 1 ? "秒杀" : goods.product_type == 2 ? "预售" : goods.product_type == 3 ? "助力" : goods.product_type == 4 ? "拼团" : ""}}</text>
-                          <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>
-                      <view class='money' v-if="item.activity_type == 3">
-                        <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>x{{goods.product_num}}</view>
-                      </view>
-                      <view class='money' v-else>
-                        <view>￥{{goods.cart_info.productAttr.price}}</view>
-                        <view>x{{goods.product_num}}</view>
-                      </view>
-                    </view>
-                  </view>
-                </view>
-                <view class='totalPrice' v-if="item.activity_type == 2">共{{item.orderNum || 0}}件商品，总金额
-                  <text class='money p-color'>￥{{item.presell_price}}</text>
-                </view>
-                <view class='totalPrice' v-else>共{{item.orderNum || 0}}件商品，总金额
-                  <text class='money p-color'>￥{{item.pay_price}}</text>
-                </view>
-              </view>
-              <view class='bottom acea-row row-right row-middle'>
-                <view v-if="!item.receipt && item.status != -1 && item.open_receipt == 1 && item.order_type!==1"
-                  class='bnt cancelBnt' @click.stop='applyInvoice(item.order_id)'>申请开票</view>
-                <block v-if="item.status == 0 || item.status == 9 || item.status == -1">
-                  <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 b-color' @tap='confirmOrder(item,index)'>确认收货</view>
-                </block>
-                <block v-if="item.status == 2">
-                  <navigator v-if="community_status == 1 && !item.community_id"
+			<navigator class="search acea-row row-middle" url="/pages/users/order_list/search" hover-class="none">
+				<text class="iconfont icon-sousuo"></text>
+				搜索我的订单
+			</navigator>
+			<!--定金预售订单-->
+			<view v-if="presellProList.length > 0" class="event_container"
+				:style="{ 'background-image': `url(${domain}/static/images/presell_orderBg.png)`}">
+				<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>
+					<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>
+						</view>
+						<view class="more_btn"><text class="iconfont icon-gengduo3"></text></view>
+					</view>
+				</navigator>
+			</view>
+			<view class='list'>
+				<!-- 代付款 -->
+				<view v-if="orderList.length > 0">
+					<block v-if="orderStatus == 0">
+						<view class='item' v-for="(item,index) in orderList" :key="index">
+							<view @click='goOrderDetails(item.group_order_id)'>
+								<view class='title acea-row row-between-wrapper'>
+									<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>
+								<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 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 line1'>
+														<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">
+																{{ 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>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>
+											</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>
+												<view class='text acea-row row-between'>
+													<view class='name line2'>
+														<text v-if="goods.product_type != 0 && goods.product_type != 10"
+															:class="'font_bg-red type'+goods.product_type">{{goods.product_type == 1 ? "秒杀" : goods.product_type == 2 ? "预售" : goods.product_type == 3 ? "助力" : goods.product_type == 4 ? "拼团" : ""}}</text>
+														{{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>
+											</view>
+										</block>
+									</view>
+								</view>
+								<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' v-if="item.pay_type != 10">
+									<view class='bnt b-color' @click.stop='goPay(item.pay_price,item.group_order_id)'>
+										立即付款</view>
+								</view>
+								<view class='bottom acea-row row-right row-middle' v-else>
+									<view class='bnt b-color' @click.stop='uploadEnvidence(item.group_order_id)'>
+										上传凭证</view>
+								</view>
+							</view>
+						</view>
+					</block>
+					<!-- 待发货 待收货 待评价 已完成 -->
+					<block v-else>
+						<view class='item' v-for="(item,index) in orderList" :key="index">
+							<view @click='goOrderDetails(item.order_id)'>
+								<view class='title acea-row row-between-wrapper'>
+									<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
+										<text class="iconfont icon-shangjiadingdan"></text>
+										<view class="store-name">{{item.merchant.mer_name}}</view>
+										<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-else>待发货</text>
+									</view>
+									<view v-if="item.status == 1" class='t-color'>待收货</view>
+									<view v-if="item.status == 2" class='t-color'>待评价</view>
+									<view v-if="item.status == 3" class='t-color'>已完成</view>
+									<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='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 '>
+												<view class='name' :class="item.status === 0 ? 'line1' : 'line2'">
+													<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 === 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>
+											<view class='money'>
+												<view>￥{{goods.cart_info.productPresellAttr.presell_price}}</view>
+												<view>x{{goods.product_num}}</view>
+											</view>
+										</view>
+									</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='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 '>
+												<view class='name line2'>
+													<text v-if="goods.product_type != 0 && goods.product_type != 10"
+														:class="'font_bg-red type'+goods.product_type">{{goods.product_type == 1 ? "秒杀" : goods.product_type == 2 ? "预售" : goods.product_type == 3 ? "助力" : goods.product_type == 4 ? "拼团" : ""}}</text>
+													<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>
+											<view class='money' v-if="item.activity_type == 3">
+												<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>x{{goods.product_num}}</view>
+											</view>
+											<view class='money' v-else>
+												<view>￥{{goods.cart_info.productAttr.price}}</view>
+												<view>x{{goods.product_num}}</view>
+											</view>
+										</view>
+									</view>
+								</view>
+								<view class='totalPrice' v-if="item.activity_type == 2">共{{item.orderNum || 0}}件商品，总金额
+									<text class='money p-color'>￥{{item.presell_price}}</text>
+								</view>
+								<view class='totalPrice' v-else>共{{item.orderNum || 0}}件商品，总金额
+									<text class='money p-color'>￥{{item.pay_price}}</text>
+								</view>
+							</view>
+							<view class='bottom acea-row row-right row-middle'>
+								<view
+									v-if="!item.receipt && item.status != -1 && item.open_receipt == 1 && item.order_type!==1"
+									class='bnt cancelBnt' @click.stop='applyInvoice(item.order_id)'>申请开票</view>
+								<block v-if="item.status == 0 || item.status == 9 || item.status == -1">
+									<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 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">
                     <text class="iconfont icon-fabu"></text>
                     发布种草
-                  </navigator>
-                  <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"
+                  </navigator> -->
+									<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">
                     <text class="iconfont icon-fabu"></text>
                     发布种草
-                  </navigator>
-                  <view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-else>再次购买</view>
-                </block>
-              </view>
-            </view>
-          </block>
-        </view>
-      </view>
-      <view class='loadingicon acea-row row-center-wrapper' v-if="orderList.length>5">
-        <text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
-      </view>
-      <view v-if="orderList.length == 0 && page > 1">
-        <emptyPage title="暂无订单~"></emptyPage>
-      </view>
-    </view>
-    <!-- <home></home> -->
-    <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>
-  </view>
+                  </navigator> -->
+									<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-else>再次购买</view>
+								</block>
+							</view>
+						</view>
+					</block>
+				</view>
+			</view>
+			<view class='loadingicon acea-row row-center-wrapper' v-if="orderList.length>5">
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+			</view>
+			<view v-if="orderList.length == 0 && page > 1">
+				<emptyPage title="暂无订单~"></emptyPage>
+			</view>
+		</view>
+		<!-- <home></home> -->
+		<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>
+	</view>
 </template>
 
 <script>
-  // +----------------------------------------------------------------------
-  // | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-  // +----------------------------------------------------------------------
-  // | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
-  // +----------------------------------------------------------------------
-  // | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-  // +----------------------------------------------------------------------
-  // | Author: CRMEB Team <admin@crmeb.com>
-  // +----------------------------------------------------------------------
-  let app = getApp();
-  import {
-    getOrderList,
-    orderData,
-    unOrderCancel,
-    orderDel,
-    orderPay,
-    groupOrderList,
-    orderTake,
-    applyInvoiceApi
-  } from '@/api/order.js';
-  import { getUserInfo } from '@/api/user.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 emptyPage from '@/components/emptyPage.vue';
-  import { configMap } from '@/utils'
-  import { HTTP_REQUEST_URL } from '@/config/app';
-  import { toLogin } from '@/libs/login.js';
-  export default {
-    components: {
-      payment,
-      emptyPage,
-      home,
-      addInvoicing
-    },
-    data() {
-      return {
-        sale_type: 1, //1-普通商品,2-批发商品
-        loading: false, //是否加载中
-        loadend: false, //是否加载完毕
-        loadTitle: '加载更多', //提示语
-        orderList: [], //订单数组
-        presellProList: [], //定金预售订单
-        presellOrderCount: 0,
-        orderData: {}, //订单详细统计
-        orderStatus: 0, //订单状态
-        page: 1,
-        limit: 20,
-        domain: HTTP_REQUEST_URL,
-        payMode: [{
-            name: "微信支付",
-            icon: "icon-weixinzhifu",
-            value: 'wechat',
-            title: '微信快捷支付',
-            payStatus: 1
-          },
-          {
-            name: "支付宝支付",
-            icon: "icon-zhifubao",
-            value: 'alipay',
-            title: '支付宝支付',
-            payStatus: this.$store.getters.globalData.alipay_open
-          },
-          {
-            name: "余额支付",
-            icon: "icon-yuezhifu",
-            value: 'balance',
-            title: '可用余额:',
-            number: 0,
-            payStatus: this.$store.getters.globalData.yue_pay_status
-          }
-        ],
-        pay_close: false,
-        pay_order_id: '',
-        invoice_order_id: '',
-        totalPrice: '0',
-        isReady: true,
-        invoice: {
-          invoice: false,
-          add: false,
-        },
-        mer_info:{}
-      };
-    },
-    computed: {
-      ...mapGetters(['isLogin', 'viewColor']),
-      ...configMap(['hide_mer_status', 'community_status']),
-    },
-    watch: {
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	let app = getApp();
+	import {
+		getOrderList,
+		orderData,
+		unOrderCancel,
+		orderDel,
+		orderPay,
+		groupOrderList,
+		orderTake,
+		applyInvoiceApi,
+		uploadEnvidenceApi
+	} from '@/api/order.js';
+	import {
+		getUserInfo
+	} from '@/api/user.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 emptyPage from '@/components/emptyPage.vue';
+	import {
+		configMap
+	} from '@/utils'
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	export default {
+		components: {
+			payment,
+			emptyPage,
+			home,
+			addInvoicing
+		},
+		data() {
+			return {
+				sale_type: 1, //1-普通商品,2-批发商品
+				loading: false, //是否加载中
+				loadend: false, //是否加载完毕
+				loadTitle: '加载更多', //提示语
+				orderList: [], //订单数组
+				presellProList: [], //定金预售订单
+				presellOrderCount: 0,
+				orderData: {}, //订单详细统计
+				orderStatus: 0, //订单状态
+				page: 1,
+				limit: 20,
+				domain: HTTP_REQUEST_URL,
+				payMode: [{
+						name: "微信支付",
+						icon: "icon-weixinzhifu",
+						value: 'wechat',
+						title: '微信快捷支付',
+						payStatus: 1
+					},
+					{
+						name: "支付宝支付",
+						icon: "icon-zhifubao",
+						value: 'alipay',
+						title: '支付宝支付',
+						payStatus: this.$store.getters.globalData.alipay_open
+					},
+					{
+						name: "余额支付",
+						icon: "icon-yuezhifu",
+						value: 'balance',
+						title: '可用余额:',
+						number: 0,
+						payStatus: this.$store.getters.globalData.yue_pay_status
+					},
+					{
+						name: "对公转账",
+						icon: "icon-yuezhifu",
+						value: 'public',
+						title: '对公转账',
+						number: 0,
+						payStatus: 1
+					}
+				],
+				pay_close: false,
+				pay_order_id: '',
+				invoice_order_id: '',
+				totalPrice: '0',
+				isReady: true,
+				invoice: {
+					invoice: false,
+					add: false,
+				},
+				mer_info: {}
+			};
+		},
+		computed: {
+			...mapGetters(['isLogin', 'viewColor']),
+			...configMap(['hide_mer_status', 'community_status']),
+		},
+		watch: {
 
-    },
-    onShow() {
-      if (this.isLogin) {
-        this.page = 1;
-        this.loadend = false;
-        this.loading = false;
-        this.getOrderData();
-        this.getOrderList();
-        this.getUserInfo();
-        this.getpreSellOrderList();
-      } else {
-        toLogin()
-      }
-    },
-    onReady() {},
-    mounted: function() {},
-    methods: {
-      navBack(){
-        uni.navigateBack();
-      },
-      changeSaleType(type = 1) {
-        if (type != this.sale_type) {
-          this.sale_type = type;
-          this.page = 1;
-          this.loadend = false;
-          this.loading = false;
-          this.getOrderData();
-          this.getOrderList();
-          this.getUserInfo();
-          this.getpreSellOrderList();
-        }
-      },
-      // 去商铺
-      goMall(item) {
-        if (this.hide_mer_status == 0) {
-          uni.navigateTo({
-            url: '/pages/store/home/index?id=' + item.mer_id
-          })
-        }
-      },
-      /**
-       * 事件回调
-       *
-       */
-      onChangeFun: function(e) {
-        let opt = e;
-        let action = opt.action || null;
-        let value = opt.value != undefined ? opt.value : null;
-        (action && this[action]) && this[action](value);
-      },
-      /**
-       * 获取用户信息
-       *
-       */
-      getUserInfo: function() {
-        let that = this;
-        getUserInfo().then(res => {
-          that.payMode[2].number = res.data.now_money;
-          this.mer_info = res.data.mer_info;
-        });
-      },
-      /**
-       * 关闭支付组件
-       *
-       */
-      payClose: function() {
-        this.pay_close = false;
-      },
-      /**
-       * 生命周期函数--监听页面加载
-       */
-      onLoad: function(options) {
-        if (options.status) this.orderStatus = options.status;
-      },
-      /**
-       * 获取订单统计数据
-       *
-       */
-      getOrderData: function() {
-        let that = this;
-        orderData({
-          sale_type: this.sale_type
-        }).then(res => {
-          that.$set(that, 'orderData', res.data);
-        })
-      },
-      /**
-       * 取消订单
-       *
-       */
-      cancelOrder: function(index, order_id) {
-        let that = this;
-        if (!order_id) return that.$util.Tips({
-          title: '缺少订单号无法取消订单'
-        });
-        unOrderCancel(order_id).then(res => {
-          return that.$util.Tips({
-            title: res.message,
-            icon: 'success'
-          }, function() {
-            that.orderList.splice(index, 1);
-            that.$set(that, 'orderList', that.orderList);
-            that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
-            that.getOrderData();
-          });
-        }).catch(err => {
-          return that.$util.Tips({
-            title: err
-          });
-        });
-      },
-      /**
-       * 打开支付组件
-       *
-       */
-      goPay: function(pay_price, order_id) {
-        this.$set(this, 'pay_close', true);
-        this.order_id = order_id;
-        this.pay_order_id = order_id.toString()
-        this.$set(this, 'totalPrice', pay_price);
-      },
-      /**
-       * 支付成功回调
-       *
-       */
-      pay_complete: function() {
-        this.loadend = false;
-        this.page = 1;
-        this.$set(this, 'orderList', []);
-        this.pay_close = false;
-        this.pay_order_id = '';
-        this.getOrderData();
-        this.getOrderList();
-      },
-      /**
-       * 支付失败回调
-       *
-       */
-      pay_fail: function() {
-        this.pay_close = false;
-        this.pay_order_id = '';
-      },
-      /**
-       * 去订单详情
-       */
-      goOrderDetails: function(order_id) {
-        let self = this
-        if (!order_id) return that.$util.Tips({
-          title: '缺少订单号无法查看订单详情'
-        });
-        // #ifdef MP
-        uni.showLoading({
-          title: '正在加载',
-        })
-        openOrderSubscribe().then(() => {
-          uni.hideLoading();
-          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
-            })
-          }
-        }).catch(() => {
-          uni.hideLoading();
-        })
-        // #endif
-        // #ifndef 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
-          })
-        }
-        // #endif
-      },
-      /**
-       * 点击去评价
-       */
-      goOrderDetails_Evaluation: function(order_id) {
-        let self = this
-        if (!order_id) return that.$util.Tips({
-          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
-          })
-        }
-        // #endif
-        // #ifndef 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
-          })
-        }
-        // #endif
-      },
-      /**
-       * 切换类型
-       */
-      statusClick: function(status) {
-        if (status == this.orderStatus) return;
-        this.orderStatus = status;
-        this.loadend = false;
-        this.loading = false;
-        this.page = 1;
-        this.$set(this, 'orderList', []);
-        this.getOrderList();
-      },
-      /**
-       * 获取订单列表
-       */
-      getOrderList: function() {
-        let that = this;
-        if (that.loadend) return;
-        if (that.loading) return;
-        that.loading = true;
-        that.loadTitle = "加载更多";
-        if (that.isReady) {
-          that.isReady = false
-          if (that.orderStatus == 0) {
-            groupOrderList({
-              page: that.page,
-              limit: that.limit,
-              sale_type: this.sale_type //1-零售, 2-批发
-            }).then(res => {
-              that.isReady = true;
-              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.$set(that, 'orderList', that.orderList);
-              that.getProductCount();
-              that.loadend = loadend;
-              that.loading = false;
-              that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
-              that.page = that.page + 1
-            })
-          } else {
-            getOrderList({
-              status: that.orderStatus - 1,
-              page: that.page,
-              limit: that.limit,
-              sale_type: this.sale_type //1-零售, 2-批发
-            }).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.$set(that, 'orderList', that.orderList);
-              that.getProductCount();
-              that.loadend = loadend;
-              that.loading = false;
-              that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
-              that.page = that.page + 1;
-              that.isReady = true;
-            }).catch(err => {
-              that.loading = false;
-              that.loadTitle = "加载更多";
-            })
-          }
-        }
-      },
-      /**
-       * 获取定金预售订单列表
-       */
-      getpreSellOrderList: function() {
-        let that = this;
-        getOrderList({
-          status: 10,
-          page: 1,
-          limit: 1,
-          sale_type: this.sale_type //1-零售, 2-批发
-        }).then(res => {
-          let list = res.data.list || [];
-          that.presellOrderCount = res.data.count;
-          that.$set(that, 'presellProList', list);
-        })
-      },
-      /**
-       * 获取单个订单商品数量
-       */
-      getProductCount: function() {
-        if (this.orderStatus !== 0) {
-          this.orderList.forEach((item, i) => {
-            let orderNum = 0
-            if (item.orderProduct) {
-              item.orderProduct.forEach((val) => {
-                orderNum += val.product_num
-              })
-              this.orderList[i]['orderNum'] = orderNum;
-            }
-          })
-        }
-      },
-      /**
-       * 删除订单
-       */
-      delOrder: function(order_id, index) {
-        let that = this;
-        orderDel(order_id).then(res => {
-          that.orderList.splice(index, 1);
-          that.$set(that, 'orderList', that.orderList);
-          that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
-          that.getOrderData();
-          return that.$util.Tips({
-            title: '删除成功',
-            icon: 'success'
-          });
-        }).catch(err => {
-          return that.$util.Tips({
-            title: err
-          });
-        })
-      },
-      // 确认收货
-      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
-                });
-              })
-            }
-          }
-        })
-      },
-      /*申请开票*/
-      applyInvoice(order_id) {
-        let that = this;
-        that.invoice_order_id = order_id
-        that.invoice.invoice = true;
-        that.$refs.addInvoicing.popupTitle = false;
-        that.$refs.addInvoicing.getInvoiceDefault();
-        that.$refs.addInvoicing.getInvoiceList();
-      },
-      // 关闭发票弹窗
-      changeInvoiceClose: function(data) {
-        if (data) this.getInvoiceData(data);
-        this.$set(this.invoice, 'invoice', false);
-      },
-      // 开票回调
-      getInvoiceData(data) {
-        let that = this
-        applyInvoiceApi(that.invoice_order_id, data).then(res => {
-          return that.$util.Tips({
-            title: res.message,
-          });
-        }).catch(err => {
-          return that.$util.Tips({
-            title: err
-          });
-        })
-      }
-    },
-    onReachBottom: function() {
-      this.getOrderList();
-    }
-  }
+		},
+		onShow() {
+			if (this.isLogin) {
+				this.page = 1;
+				this.loadend = false;
+				this.loading = false;
+				this.getOrderData();
+				this.getOrderList();
+				this.getUserInfo();
+				this.getpreSellOrderList();
+			} else {
+				toLogin()
+			}
+		},
+		onReady() {},
+		mounted: function() {},
+		methods: {
+			navBack() {
+				uni.navigateBack();
+			},
+			changeSaleType(type = 1) {
+				if (type != this.sale_type) {
+					this.sale_type = type;
+					this.page = 1;
+					this.loadend = false;
+					this.loading = false;
+					this.getOrderData();
+					this.getOrderList();
+					this.getUserInfo();
+					this.getpreSellOrderList();
+				}
+			},
+			// 去商铺
+			goMall(item) {
+				if (this.hide_mer_status == 0) {
+					uni.navigateTo({
+						url: '/pages/store/home/index?id=' + item.mer_id
+					})
+				}
+			},
+			/**
+			 * 事件回调
+			 *
+			 */
+			onChangeFun: function(e) {
+				let opt = e;
+				let action = opt.action || null;
+				let value = opt.value != undefined ? opt.value : null;
+				(action && this[action]) && this[action](value);
+			},
+			/**
+			 * 获取用户信息
+			 *
+			 */
+			getUserInfo: function() {
+				let that = this;
+				getUserInfo().then(res => {
+					that.payMode[2].number = res.data.now_money;
+					this.mer_info = res.data.mer_info;
+				});
+			},
+			/**
+			 * 关闭支付组件
+			 *
+			 */
+			payClose: function() {
+				this.pay_close = false;
+			},
+			/**
+			 * 生命周期函数--监听页面加载
+			 */
+			onLoad: function(options) {
+				if (options.status) this.orderStatus = options.status;
+			},
+			/**
+			 * 获取订单统计数据
+			 *
+			 */
+			getOrderData: function() {
+				let that = this;
+				orderData({
+					sale_type: this.sale_type
+				}).then(res => {
+					that.$set(that, 'orderData', res.data);
+				})
+			},
+			/**
+			 * 取消订单
+			 *
+			 */
+			cancelOrder: function(index, order_id) {
+				let that = this;
+				if (!order_id) return that.$util.Tips({
+					title: '缺少订单号无法取消订单'
+				});
+				unOrderCancel(order_id).then(res => {
+					return that.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					}, function() {
+						that.orderList.splice(index, 1);
+						that.$set(that, 'orderList', that.orderList);
+						that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
+						that.getOrderData();
+					});
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				});
+			},
+			/**
+			 * 打开支付组件
+			 *
+			 */
+			goPay: function(pay_price, order_id) {
+				this.$set(this, 'pay_close', true);
+				this.order_id = order_id;
+				this.pay_order_id = order_id.toString()
+				this.$set(this, 'totalPrice', pay_price);
+			},
+
+			// 对公转账,上传支付凭证
+			uploadEnvidence(orderid) {
+				let that = this;
+				that.$util.uploadImageOne('upload/image', function(res) {
+					uploadEnvidenceApi(orderid, res.data.path).then(res => {
+						if (res.status == 200) {
+							that.$util.Tips({
+								title: "上传成功,请等待后台审核!"
+							})
+						} else {
+							that.$util.Tips({
+								title: res.message
+							})
+						}
+					})
+				});
+			},
+
+			/**
+			 * 支付成功回调
+			 *
+			 */
+			pay_complete: function() {
+				this.loadend = false;
+				this.page = 1;
+				this.$set(this, 'orderList', []);
+				this.pay_close = false;
+				this.pay_order_id = '';
+				this.getOrderData();
+				this.getOrderList();
+			},
+			/**
+			 * 支付失败回调
+			 *
+			 */
+			pay_fail: function() {
+				this.pay_close = false;
+				this.pay_order_id = '';
+			},
+			/**
+			 * 去订单详情
+			 */
+			goOrderDetails: function(order_id) {
+				let self = this
+				if (!order_id) return that.$util.Tips({
+					title: '缺少订单号无法查看订单详情'
+				});
+				// #ifdef MP
+				uni.showLoading({
+					title: '正在加载',
+				})
+				openOrderSubscribe().then(() => {
+					uni.hideLoading();
+					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
+						})
+					}
+				}).catch(() => {
+					uni.hideLoading();
+				})
+				// #endif
+				// #ifndef 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
+					})
+				}
+				// #endif
+			},
+			/**
+			 * 点击去评价
+			 */
+			goOrderDetails_Evaluation: function(order_id) {
+				let self = this
+				if (!order_id) return that.$util.Tips({
+					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
+					})
+				}
+				// #endif
+				// #ifndef 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
+					})
+				}
+				// #endif
+			},
+			/**
+			 * 切换类型
+			 */
+			statusClick: function(status) {
+				if (status == this.orderStatus) return;
+				this.orderStatus = status;
+				this.loadend = false;
+				this.loading = false;
+				this.page = 1;
+				this.$set(this, 'orderList', []);
+				this.getOrderList();
+			},
+			/**
+			 * 获取订单列表
+			 */
+			getOrderList: function() {
+				let that = this;
+				if (that.loadend) return;
+				if (that.loading) return;
+				that.loading = true;
+				that.loadTitle = "加载更多";
+				if (that.isReady) {
+					that.isReady = false
+					if (that.orderStatus == 0) {
+						groupOrderList({
+							page: that.page,
+							limit: that.limit,
+							sale_type: this.sale_type //1-零售, 2-批发
+						}).then(res => {
+							that.isReady = true;
+							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.$set(that, 'orderList', that.orderList);
+							that.getProductCount();
+							that.loadend = loadend;
+							that.loading = false;
+							that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
+							that.page = that.page + 1
+						})
+					} else {
+						getOrderList({
+							status: that.orderStatus - 1,
+							page: that.page,
+							limit: that.limit,
+							sale_type: this.sale_type //1-零售, 2-批发
+						}).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.$set(that, 'orderList', that.orderList);
+							that.getProductCount();
+							that.loadend = loadend;
+							that.loading = false;
+							that.loadTitle = loadend ? "我也是有底线的" : '加载更多';
+							that.page = that.page + 1;
+							that.isReady = true;
+						}).catch(err => {
+							that.loading = false;
+							that.loadTitle = "加载更多";
+						})
+					}
+				}
+			},
+			/**
+			 * 获取定金预售订单列表
+			 */
+			getpreSellOrderList: function() {
+				let that = this;
+				getOrderList({
+					status: 10,
+					page: 1,
+					limit: 1,
+					sale_type: this.sale_type //1-零售, 2-批发
+				}).then(res => {
+					let list = res.data.list || [];
+					that.presellOrderCount = res.data.count;
+					that.$set(that, 'presellProList', list);
+				})
+			},
+			/**
+			 * 获取单个订单商品数量
+			 */
+			getProductCount: function() {
+				if (this.orderStatus !== 0) {
+					this.orderList.forEach((item, i) => {
+						let orderNum = 0
+						if (item.orderProduct) {
+							item.orderProduct.forEach((val) => {
+								orderNum += val.product_num
+							})
+							this.orderList[i]['orderNum'] = orderNum;
+						}
+					})
+				}
+			},
+			/**
+			 * 删除订单
+			 */
+			delOrder: function(order_id, index) {
+				let that = this;
+				orderDel(order_id).then(res => {
+					that.orderList.splice(index, 1);
+					that.$set(that, 'orderList', that.orderList);
+					that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1);
+					that.getOrderData();
+					return that.$util.Tips({
+						title: '删除成功',
+						icon: 'success'
+					});
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				})
+			},
+			// 确认收货
+			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
+								});
+							})
+						}
+					}
+				})
+			},
+			/*申请开票*/
+			applyInvoice(order_id) {
+				let that = this;
+				that.invoice_order_id = order_id
+				that.invoice.invoice = true;
+				that.$refs.addInvoicing.popupTitle = false;
+				that.$refs.addInvoicing.getInvoiceDefault();
+				that.$refs.addInvoicing.getInvoiceList();
+			},
+			// 关闭发票弹窗
+			changeInvoiceClose: function(data) {
+				if (data) this.getInvoiceData(data);
+				this.$set(this.invoice, 'invoice', false);
+			},
+			// 开票回调
+			getInvoiceData(data) {
+				let that = this
+				applyInvoiceApi(that.invoice_order_id, data).then(res => {
+					return that.$util.Tips({
+						title: res.message,
+					});
+				}).catch(err => {
+					return that.$util.Tips({
+						title: err
+					});
+				})
+			}
+		},
+		onReachBottom: function() {
+			this.getOrderList();
+		}
+	}
 </script>
 
 <style scoped lang="scss">
-  .my-order .header {
-    height: 260rpx;
-    padding: 0 30rpx;
-    background-color: var(--view-theme);
-  }
+	.my-order .header {
+		height: 260rpx;
+		padding: 0 30rpx;
+		background-color: var(--view-theme);
+	}
 
-  .t-color {
-    color: var(--view-theme);
-  }
+	.t-color {
+		color: var(--view-theme);
+	}
 
-  .p-color {
-    color: var(--view-priceColor);
-  }
+	.p-color {
+		color: var(--view-priceColor);
+	}
 
-  .b-color {
-    background-color: var(--view-theme);
-  }
+	.b-color {
+		background-color: var(--view-theme);
+	}
 
-  .my-order .header .picTxt {
-    height: 190rpx;
-  }
+	.my-order .header .picTxt {
+		height: 190rpx;
+	}
 
-  .my-order .header .picTxt .text {
-    color: rgba(255, 255, 255, 0.8);
-    font-size: 26rpx;
-    // font-family: 'Guildford Pro';
-  }
+	.my-order .header .picTxt .text {
+		color: rgba(255, 255, 255, 0.8);
+		font-size: 26rpx;
+		// font-family: 'Guildford Pro';
+	}
 
-  .my-order .header .picTxt .text .name {
-    font-size: 34rpx;
-    font-weight: bold;
-    color: #fff;
-    margin-bottom: 20rpx;
-  }
+	.my-order .header .picTxt .text .name {
+		font-size: 34rpx;
+		font-weight: bold;
+		color: #fff;
+		margin-bottom: 20rpx;
+	}
 
-  .my-order .header .picTxt .pictrue {
-    width: 122rpx;
-    height: 109rpx;
-  }
+	.my-order .header .picTxt .pictrue {
+		width: 122rpx;
+		height: 109rpx;
+	}
 
-  .my-order .header .picTxt .pictrue image {
-    width: 100%;
-    height: 100%;
-  }
+	.my-order .header .picTxt .pictrue image {
+		width: 100%;
+		height: 100%;
+	}
 
-  .my-order .nav {
-    background-color: #fff;
-    width: 690rpx;
-    height: 140rpx;
-    border-radius: 16rpx;
-    margin: 20rpx auto 0 auto;
-  }
+	.my-order .nav {
+		background-color: #fff;
+		width: 690rpx;
+		height: 140rpx;
+		border-radius: 16rpx;
+		margin: 20rpx auto 0 auto;
+	}
 
-  .my-order .nav .item {
-    text-align: center;
-    font-size: 26rpx;
-    color: #282828;
-    padding: 29rpx 0;
-  }
+	.my-order .nav .item {
+		text-align: center;
+		font-size: 26rpx;
+		color: #282828;
+		padding: 29rpx 0;
+	}
 
-  .my-order .nav .item.on {
-    font-weight: bold;
-    border-bottom: 5rpx solid var(--view-theme);
-  }
+	.my-order .nav .item.on {
+		font-weight: bold;
+		border-bottom: 5rpx solid var(--view-theme);
+	}
 
-  .my-order .nav .item .num {
-    margin-top: 18rpx;
-  }
+	.my-order .nav .item .num {
+		margin-top: 18rpx;
+	}
 
-  .my-order .list {
-    width: 690rpx;
-    margin: 14rpx auto 0 auto;
-  }
+	.my-order .list {
+		width: 690rpx;
+		margin: 14rpx auto 0 auto;
+	}
 
-  .my-order .list .item {
-    background-color: #fff;
-    border-radius: 16rpx;
-    margin-bottom: 14rpx;
-  }
+	.my-order .list .item {
+		background-color: #fff;
+		border-radius: 16rpx;
+		margin-bottom: 14rpx;
+	}
 
-  .my-order .list .item .title {
-    height: 84rpx;
-    padding: 0 30rpx;
-    border-bottom: 1px solid #eee;
-    font-size: 28rpx;
-    color: #282828;
+	.my-order .list .item .title {
+		height: 84rpx;
+		padding: 0 30rpx;
+		border-bottom: 1px solid #eee;
+		font-size: 28rpx;
+		color: #282828;
 
-    .left-wrapper {
-      .iconfont {
-        margin-top: 5rpx;
-      }
+		.left-wrapper {
+			.iconfont {
+				margin-top: 5rpx;
+			}
 
-      .store-name {
-        margin: 0 10rpx;
-      }
+			.store-name {
+				margin: 0 10rpx;
+			}
 
-      .icon-xiangyou {
-        font-size: 20rpx;
-      }
-    }
-  }
+			.icon-xiangyou {
+				font-size: 20rpx;
+			}
+		}
+	}
 
-  .my-order .list .item .title .sign {
-    font-size: 24rpx;
-    padding: 0 7rpx;
-    height: 36rpx;
-    margin-right: 15rpx;
-  }
+	.my-order .list .item .title .sign {
+		font-size: 24rpx;
+		padding: 0 7rpx;
+		height: 36rpx;
+		margin-right: 15rpx;
+	}
 
-  .my-order .list .item .item-info {
-    padding: 0 30rpx;
-    margin-top: 22rpx;
-  }
+	.my-order .list .item .item-info {
+		padding: 0 30rpx;
+		margin-top: 22rpx;
+	}
 
-  .my-order .list .item .item-info .pictrue {
-    width: 120rpx;
-    height: 120rpx;
-  }
+	.my-order .list .item .item-info .pictrue {
+		width: 120rpx;
+		height: 120rpx;
+	}
 
-  .my-order .list .item .item-info .pictrue image {
-    width: 100%;
-    height: 100%;
-    border-radius: 6rpx;
-  }
+	.my-order .list .item .item-info .pictrue image {
+		width: 100%;
+		height: 100%;
+		border-radius: 6rpx;
+	}
 
-  .my-order .list .item .item-info .text {
-    width: 486rpx;
-    font-size: 28rpx;
-    color: #999;
-    margin-top: 6rpx;
-  }
+	.my-order .list .item .item-info .text {
+		width: 486rpx;
+		font-size: 28rpx;
+		color: #999;
+		margin-top: 6rpx;
+	}
 
-  .my-order .list .item .item-info .text .name {
-    width: 320rpx;
-    color: #282828;
-  }
+	.my-order .list .item .item-info .text .name {
+		width: 320rpx;
+		color: #282828;
+	}
 
-  .event_bg {
-    background: #FF7F00;
-  }
+	.event_bg {
+		background: #FF7F00;
+	}
 
-  .event_color {
-    color: #FF7F00;
-  }
+	.event_color {
+		color: #FF7F00;
+	}
 
-  .my-order .list .item .event_name {
-    display: inline-block;
-    margin-right: 9rpx;
-    color: #fff;
-    font-size: 20rpx;
-    padding: 0 8rpx;
-    line-height: 30rpx;
-    text-align: center;
-    border-radius: 6rpx;
-  }
+	.my-order .list .item .event_name {
+		display: inline-block;
+		margin-right: 9rpx;
+		color: #fff;
+		font-size: 20rpx;
+		padding: 0 8rpx;
+		line-height: 30rpx;
+		text-align: center;
+		border-radius: 6rpx;
+	}
 
-  .my-order .list .item .event_ship {
-    font-size: 20rpx;
-    margin-top: 10rpx;
-  }
+	.my-order .list .item .event_ship {
+		font-size: 20rpx;
+		margin-top: 10rpx;
+	}
 
-  .my-order .list .event_price {
-    margin: 0 0 50rpx 120rpx;
-  }
+	.my-order .list .event_price {
+		margin: 0 0 50rpx 120rpx;
+	}
 
-  .my-order .list .item .item-info .text .money {
-    text-align: right;
-  }
+	.my-order .list .item .item-info .text .money {
+		text-align: right;
+	}
 
-  .my-order .list .item .totalPrice {
-    font-size: 26rpx;
-    color: #282828;
-    text-align: right;
-    margin: 27rpx 0 0 30rpx;
-    padding: 0 30rpx 30rpx 0;
-  }
+	.my-order .list .item .totalPrice {
+		font-size: 26rpx;
+		color: #282828;
+		text-align: right;
+		margin: 27rpx 0 0 30rpx;
+		padding: 0 30rpx 30rpx 0;
+	}
 
-  .my-order .list .item .totalPrice .money {
-    font-size: 28rpx;
-    font-weight: bold;
-  }
+	.my-order .list .item .totalPrice .money {
+		font-size: 28rpx;
+		font-weight: bold;
+	}
 
-  .my-order .list .item .bottom {
-    height: 107rpx;
-    padding: 0 30rpx;
-    border-top: 1px solid #f0f0f0;
-  }
+	.my-order .list .item .bottom {
+		height: 107rpx;
+		padding: 0 30rpx;
+		border-top: 1px solid #f0f0f0;
+	}
 
-  .my-order .list .item .bottom .bnt {
-    width: 176rpx;
-    height: 60rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: #fff;
-    border-radius: 50rpx;
-    font-size: 27rpx;
-  }
+	.my-order .list .item .bottom .bnt {
+		width: 176rpx;
+		height: 60rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #fff;
+		border-radius: 50rpx;
+		font-size: 27rpx;
+	}
 
-  .my-order .list .item .bottom .bnt.cancelBnt {
-    border: 1px solid #ddd;
-    color: #aaa;
-  }
+	.my-order .list .item .bottom .bnt.cancelBnt {
+		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.colorBnt {
+		border: 1px solid var(--view-theme);
+		color: var(--view-theme);
+	}
 
-  .my-order .list .item .bottom .bnt .icon-fabu {
-    font-size: 26rpx;
-    margin-right: 10rpx;
-  }
+	.my-order .list .item .bottom .bnt .icon-fabu {
+		font-size: 26rpx;
+		margin-right: 10rpx;
+	}
 
-  .my-order .list .item .bottom .bnt~.bnt {
-    margin-left: 17rpx;
-  }
+	.my-order .list .item .bottom .bnt~.bnt {
+		margin-left: 17rpx;
+	}
 
-  .noCart {
-    margin-top: 171rpx;
-    padding-top: 0.1rpx;
-  }
+	.noCart {
+		margin-top: 171rpx;
+		padding-top: 0.1rpx;
+	}
 
-  .noCart .pictrue {
-    width: 414rpx;
-    height: 336rpx;
-    margin: 78rpx auto 56rpx auto;
-  }
+	.noCart .pictrue {
+		width: 414rpx;
+		height: 336rpx;
+		margin: 78rpx auto 56rpx auto;
+	}
 
-  .noCart .pictrue image {
-    width: 100%;
-    height: 100%;
-  }
+	.noCart .pictrue image {
+		width: 100%;
+		height: 100%;
+	}
 
-  .event_container {
-    width: 690rpx;
-    background-size: cover;
-    background-repeat: no-repeat;
-    margin: 20rpx auto;
-    padding: 26rpx 30rpx;
-    border-radius: 16rpx;
+	.event_container {
+		width: 690rpx;
+		background-size: cover;
+		background-repeat: no-repeat;
+		margin: 20rpx auto;
+		padding: 26rpx 30rpx;
+		border-radius: 16rpx;
 
-    .info {
-      width: 420rpx;
+		.info {
+			width: 420rpx;
 
-      .title {
-        color: #282828;
-        font-size: 26rpx;
-      }
+			.title {
+				color: #282828;
+				font-size: 26rpx;
+			}
 
-      .desc {
-        color: #999;
-        font-size: 24rpx;
-        margin-top: 30rpx;
-      }
-    }
+			.desc {
+				color: #999;
+				font-size: 24rpx;
+				margin-top: 30rpx;
+			}
+		}
 
-    .photo {
-      width: 180rpx;
+		.photo {
+			width: 180rpx;
 
-      .picture {
-        width: 120rpx;
-        height: 120rpx;
+			.picture {
+				width: 120rpx;
+				height: 120rpx;
 
-        image {
-          width: 100%;
-          height: 100%;
-          border-radius: 8rpx;
-        }
-      }
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 8rpx;
+				}
+			}
 
-      .more_btn {
-        color: #fff;
-        background: #F97E3B;
-        width: 40rpx;
-        height: 40rpx;
-        border-radius: 40rpx;
-        text-align: center;
-        line-height: 40rpx;
-        position: relative;
-        top: 40rpx;
+			.more_btn {
+				color: #fff;
+				background: #F97E3B;
+				width: 40rpx;
+				height: 40rpx;
+				border-radius: 40rpx;
+				text-align: center;
+				line-height: 40rpx;
+				position: relative;
+				top: 40rpx;
 
-        text {
-          font-size: 20rpx;
-        }
-      }
-    }
-  }
+				text {
+					font-size: 20rpx;
+				}
+			}
+		}
+	}
 
-  .search {
-    height: 70rpx;
-    padding: 0 30rpx;
-    border-radius: 35rpx;
-    // margin: -35rpx 30rpx 0;
-    margin: 20rpx 30rpx;
-    background-color: #FFFFFF;
-    font-size: 26rpx;
-    color: #999999;
+	.search {
+		height: 70rpx;
+		padding: 0 30rpx;
+		border-radius: 35rpx;
+		// margin: -35rpx 30rpx 0;
+		margin: 20rpx 30rpx;
+		background-color: #FFFFFF;
+		font-size: 26rpx;
+		color: #999999;
 
-    .iconfont {
-      margin-right: 10rpx;
-      font-size: 23rpx;
-    }
-  }
+		.iconfont {
+			margin-right: 10rpx;
+			font-size: 23rpx;
+		}
+	}
 
-  .order-nav {
-    display: flex;
-    justify-content: space-between;
-    padding: 20rpx 30rpx;
-    padding-top: calc(20rpx + var(--status-bar-height));
-    align-items: center;
-    background-color: #fff;
+	.order-nav {
+		display: flex;
+		justify-content: space-between;
+		padding: 20rpx 30rpx;
+		padding-top: calc(20rpx + var(--status-bar-height));
+		align-items: center;
+		background-color: #fff;
 
-    .btn_tab {
-      display: flex;
+		.btn_tab {
+			display: flex;
 
-      .tab_item {
-        margin: 0 20rpx;
-        font-size: 32rpx;
-      }
+			.tab_item {
+				margin: 0 20rpx;
+				font-size: 32rpx;
+			}
 
-      .tab_item_active {
-        font-weight: bolder;
+			.tab_item_active {
+				font-weight: bolder;
 
-        &::after {
-          display: block;
-          content: "";
-          height: 6rpx;
-          width: 64rpx;
-          border-radius: 6rpx;
-          margin: 10rpx auto 0 auto;
-          background-color: #40AE36;
-          transition: 300ms;
-        }
-      }
-    }
-  }
-  .new-nav-tab{
-    margin: 0 !important;
-    width: 100% !important;
-    height: auto !important; 
-    border-radius: 0 !important;
-    .item{
-      padding: 10rpx !important;
-    }
-  }
+				&::after {
+					display: block;
+					content: "";
+					height: 6rpx;
+					width: 64rpx;
+					border-radius: 6rpx;
+					margin: 10rpx auto 0 auto;
+					background-color: #40AE36;
+					transition: 300ms;
+				}
+			}
+		}
+	}
+
+	.new-nav-tab {
+		margin: 0 !important;
+		width: 100% !important;
+		height: auto !important;
+		border-radius: 0 !important;
+
+		.item {
+			padding: 10rpx !important;
+		}
+	}
 </style>
\ No newline at end of file