From 438b0e566a6f39f2cfce926aa134e1a87493a788 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 27 Feb 2024 10:43:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E8=BD=AC=E5=94=AE=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/newFun.js             |  4 ++++
 pages/news3/shopOrder.vue | 27 +++++++++++++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/api/newFun.js b/api/newFun.js
index 1f40174..4b5931e 100644
--- a/api/newFun.js
+++ b/api/newFun.js
@@ -176,6 +176,10 @@ export const updateDelivery = (param) => {
 export const updateAddress = (param) => {
   return request.post('StoreKeeper/updateAddress', param)
 }
+//店长 查地址
+export const addressList = (param) => {
+  return request.post('Address/list', param)
+}
 // 店长同意拒绝
 export const audit = (param) => {
   return request.post('storeKeeper/audit', param)
diff --git a/pages/news3/shopOrder.vue b/pages/news3/shopOrder.vue
index 1427a37..0985e79 100644
--- a/pages/news3/shopOrder.vue
+++ b/pages/news3/shopOrder.vue
@@ -62,8 +62,10 @@
 					<view class="btn primary"
 						v-show="!item.order_refund_id&&item.order_status==10&&item.pay_status==20&&item.delivery_status==30"
 						@click="goJump('/pages/news3/sendOutGoods',item,2)">发货</view>
-					<view class="btn info" v-show="item.audit_status==0&&(item.order_status!=20)" @click="refuseOrder(item,20)">拒绝</view>
-					<view class="btn primary" v-show="item.audit_status==0&&(item.order_status!=20)" @click="refuseOrder(item,10)">同意</view>
+					<view class="btn info" v-show="item.audit_status==0&&(item.order_status!=20)"
+						@click="refuseOrder(item,20)">拒绝</view>
+					<view class="btn primary" v-show="item.audit_status==0&&(item.order_status!=20)"
+						@click="refuseOrder(item,10)">同意</view>
 					<view class="btn info" @click="onDelete(item)"
 						v-show="(!item.order_refund_id&&item.order_status==30&&item.pay_status==20&&item.delivery_status==20)||(!item.order_refund_id&&item.order_status==20&&item.pay_status==10&&item.delivery_status==10)">
 						删除订单</view>
@@ -274,8 +276,8 @@
 			this.getList()
 		},
 		onLoad(option) {
-			this.delivery_type = option.delivery_type ||'';
-			this.user_id = option.user_id||''
+			this.delivery_type = option.delivery_type || '';
+			this.user_id = option.user_id || ''
 		},
 		methods: {
 			reset() {
@@ -312,8 +314,8 @@
 					payMethod: this.payIndex > 0 ? this.payList[this.payIndex].val : '',
 					orderSource: this.sourceIndex > 0 ? this.selectList[this.sourceIndex].val : '',
 					betweenTime: this.endTime ? [this.startTime, this.endTime].join(',') : '',
-					delivery_type:this.delivery_type,
-					user_id:this.user_id,
+					delivery_type: this.delivery_type,
+					user_id: this.user_id,
 				});
 				if (status == 200) {
 					uni.hideLoading();
@@ -395,6 +397,19 @@
 				return idList.join(',')
 
 			},
+			async getAddressList() {
+
+				let {
+					status,
+					message,
+					data
+				} = await newFunApi.addressList({
+					user_id: 10006
+				});
+				if (status == 200) {
+					console.log(data)
+				}
+			},
 			// 同意拒绝
 			refuseOrder(item, status) {
 				this.itemInfor = item;