From 298e68b99ef2bcf63fc0f3851dba028d8f465b7a Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 19 Jun 2023 17:33:58 +0800
Subject: [PATCH] =?UTF-8?q?improve:=20=E5=8F=91=E8=B4=A7=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/pages/admin/delivery/index.vue  | 16 ++++++++++------
 template/uni-app/pages/admin/orderList/index.vue |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/template/uni-app/pages/admin/delivery/index.vue b/template/uni-app/pages/admin/delivery/index.vue
index f168a5ce9..a2bcc75bf 100644
--- a/template/uni-app/pages/admin/delivery/index.vue
+++ b/template/uni-app/pages/admin/delivery/index.vue
@@ -22,14 +22,15 @@
 			<view class="item acea-row row-between-wrapper">
 				<view>{{$t(`发货方式`)}}</view>
 				<view class="mode acea-row row-middle row-right">
-					<view class="goods" :class="active === index ? 'on' : ''" v-for="(item, index) in types"
-						:key="index" @click="changeType(item, index)">
+					<view class="goods" :class="active === item.key ? 'on' : ''"
+						v-for="item in virtualType == 3? types.slice(2,3):types.slice(0,3)" :key="item.key"
+						@click="changeType(item, item.key)">
 						{{ item.title }}<span class="iconfont icon-xuanzhong2"></span>
 					</view>
 				</view>
 			</view>
 			<block v-if="logistics.length>0">
-				<view class="list" v-show="active === 0">
+				<view class="list" v-show="active === 1">
 					<view class="item acea-row row-between-wrapper" v-if="delivery.config_export_open == 1">
 						<view>{{$t(`发货类型`)}}</view>
 						<view class="mode acea-row row-middle row-right">
@@ -101,7 +102,7 @@
 				</view>
 			</block>
 
-			<view class="list" v-show="active === 1">
+			<view class="list" v-show="active === 2">
 				<view class="item acea-row row-between-wrapper">
 					<view>{{$t(`送货人`)}}</view>
 					<view class="select-box" v-if="postPeople.length>0">
@@ -113,7 +114,7 @@
 					</view>
 				</view>
 			</view>
-			<textarea v-show="active === 2" v-model="fictitious_content" class="textarea" @blur="bindTextAreaBlur"
+			<textarea v-show="active === 3" v-model="fictitious_content" class="textarea" @blur="bindTextAreaBlur"
 				:placeholder="$t(`备注`)" :maxlength="500" auto-height />
 		</view>
 		<view style="height:1.2rem;"></view>
@@ -164,7 +165,7 @@
 					},
 				],
 				curExpress: 1,
-				active: 0,
+				active: 1,
 				order_id: "",
 				delivery: [],
 				logistics: [],
@@ -179,6 +180,7 @@
 				to_addr: "", // 发货人地址	
 				postPeople: [], //配送人
 				postIndex: 0,
+				virtualType: 0,
 				fictitious_content: '',
 				// #ifdef H5
 				isWeixin: this.$wechat.isWeixin()
@@ -196,6 +198,8 @@
 		},
 		onLoad: function(option) {
 			this.order_id = option.id;
+			this.virtualType = option.virtualType;
+			if (this.virtualType == 3) this.active = 3
 			this.getIndex();
 			this.getLogistics();
 			this.orderDeliveryInfo()
diff --git a/template/uni-app/pages/admin/orderList/index.vue b/template/uni-app/pages/admin/orderList/index.vue
index fb3d83fd1..33e667901 100644
--- a/template/uni-app/pages/admin/orderList/index.vue
+++ b/template/uni-app/pages/admin/orderList/index.vue
@@ -95,7 +95,7 @@
 						</view>
 						<navigator class="bnt"
 							v-if="where.status == 1 && item.shipping_type === 1 && (item.pinkStatus === null || item.pinkStatus === 2)"
-							:url="'/pages/admin/delivery/index?id='+item.order_id+'&listId='+item.id+'&totalNum='+item.total_num+'&orderStatus='+item._status+'&comeType=1'">
+							:url="'/pages/admin/delivery/index?id='+item.order_id+'&listId='+item.id+'&totalNum='+item.total_num+'&orderStatus='+item._status+'&comeType=1'+'&virtualType='+item.virtual_type">
 							{{$t(`去发货`)}}
 						</navigator>
 					</view>