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

---
 .../src/pages/kefu/pc/components/delivery.vue     | 15 ++++++++++++++-
 .../src/pages/kefu/pc/components/rightMenu.vue    |  5 ++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/template/admin/src/pages/kefu/pc/components/delivery.vue b/template/admin/src/pages/kefu/pc/components/delivery.vue
index 584ef6b64..234bcc9b2 100644
--- a/template/admin/src/pages/kefu/pc/components/delivery.vue
+++ b/template/admin/src/pages/kefu/pc/components/delivery.vue
@@ -3,7 +3,9 @@
     <Form ref="formValidate" :model="formValidate" :rules="ruleInline" inline>
       <FormItem label="选择类型：" class="form-item" label-position="right" :label-width="100">
         <RadioGroup v-model="formValidate.gender">
-          <Radio :label="item.key" v-for="(item, index) in radioList" :key="index">{{ item.title }}</Radio>
+          <Radio :label="1" v-if="virtualType !== 3">发货</Radio>
+          <Radio :label="2" v-if="virtualType !== 3">送货</Radio>
+          <Radio :label="3">虚拟</Radio>
         </RadioGroup>
       </FormItem>
       <FormItem
@@ -113,6 +115,10 @@ export default {
       type: String | Number,
       default: '',
     },
+    virtualType: {
+      type: Number,
+      default: 0,
+    },
   },
   watch: {
     'formValidate.shipStatus': {
@@ -134,6 +140,13 @@ export default {
       },
       deep: true,
     },
+    virtualType: {
+      handler(nVal, oVal) {
+        console.log(nVal);
+        if (nVal == 3) this.formValidate.gender = 3;
+      },
+      immediate: true,
+    },
   },
   data() {
     return {
diff --git a/template/admin/src/pages/kefu/pc/components/rightMenu.vue b/template/admin/src/pages/kefu/pc/components/rightMenu.vue
index 805091b07..5d4ccafcc 100644
--- a/template/admin/src/pages/kefu/pc/components/rightMenu.vue
+++ b/template/admin/src/pages/kefu/pc/components/rightMenu.vue
@@ -235,7 +235,7 @@
     </template>
     <!-- 发货弹窗 -->
     <Modal v-model="isDelivery" title="订单发送货" :footer-hide="true">
-      <delivery v-if="isDelivery" @close="deliveryClose" @ok="deliveryOk" :orderId="orderId"></delivery>
+      <delivery v-if="isDelivery" :virtualType="virtual_type" @close="deliveryClose" @ok="deliveryOk" :orderId="orderId"></delivery>
     </Modal>
     <!-- 订单备注 -->
     <Modal
@@ -353,6 +353,7 @@ export default {
       userGroupSelect: [],
       model1: '',
       curMenuIndex: 0,
+      virtual_type: 0,
       menuList: [
         {
           key: '',
@@ -460,7 +461,9 @@ export default {
     },
     // 订单发货
     openDelivery(item) {
+      console.log(item);
       this.orderId = item.id;
+      this.virtual_type = item.virtual_type;
       this.isDelivery = true;
     },
     // 订单发货成功