From 1f1e5037a384027ebcca8be0ad7a1ed78e70879a Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Wed, 23 Jul 2025 16:09:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E8=AE=A2=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/other/index.vue   | 41 +++++++++++++++++++++--------------------
 pages/regiest/index.vue | 37 +++++++++++++++++++------------------
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/pages/other/index.vue b/pages/other/index.vue
index 6648f66..a8c1b63 100644
--- a/pages/other/index.vue
+++ b/pages/other/index.vue
@@ -75,7 +75,7 @@
         >
           <u-input v-model="form.pkGradeVal" disabled border="none" />
         </u-form-item>
-        <u-form-item
+        <!-- <u-form-item
           :label="'发货方式'"
           required
           borderBottom
@@ -90,8 +90,8 @@
             />
             <u-icon name="arrow-right"></u-icon>
           </view>
-        </u-form-item>
-        <u-form-item
+        </u-form-item> -->
+        <!-- <u-form-item
           :label="'运输方式'"
           :required="isDeliveryWay"
           borderBottom
@@ -106,20 +106,8 @@
             />
             <u-icon name="arrow-right"></u-icon>
           </view>
-        </u-form-item>
-        <u-form-item
-          v-if="howSure"
-          required
-          :label="'创客空间'"
-          borderBottom
-          @click="ishowSure = true"
-          prop="makerSpaceMemberLabel"
-        >
-          <view class="disFlex justBwn">
-            <u-input v-model="form.makerSpaceMemberLabel" border="none" />
-            <u-icon name="arrow-right"></u-icon>
-          </view>
-        </u-form-item>
+        </u-form-item> -->
+
         <u-form-item
           :label="'仓库'"
           v-if="userInfo.pkSettleCountry != 1"
@@ -152,7 +140,7 @@
           </span>
         </view>
         <view v-if="isDeliveryWay">
-          <u-form-item :label="'收货人'" borderBottom prop="recName">
+          <u-form-item :label="'收货人'" borderBottom required prop="recName">
             <u-input
               v-model.trim="form.recName"
               border="none"
@@ -163,6 +151,7 @@
           <u-form-item
             :label="'收货电话'"
             borderBottom
+            required
             prop="recPhone"
             v-if="pkCountry == 1"
           >
@@ -174,7 +163,13 @@
               :placeholder="'请输入收货电话'"
             />
           </u-form-item>
-          <u-form-item :label="'收货电话'" borderBottom prop="recPhone" v-else>
+          <u-form-item
+            :label="'收货电话'"
+            borderBottom
+            required
+            prop="recPhone"
+            v-else
+          >
             <u-input
               v-model.trim="form.recPhone"
               border="none"
@@ -185,6 +180,7 @@
           <u-form-item
             :label="'收货地址'"
             borderBottom
+            required
             prop="diqu"
             @click="getDiqu"
           >
@@ -197,7 +193,12 @@
               <u-icon name="arrow-right"></u-icon>
             </view>
           </u-form-item>
-          <u-form-item :label="'详细地址'" borderBottom prop="recAddress">
+          <u-form-item
+            :label="'详细地址'"
+            required
+            borderBottom
+            prop="recAddress"
+          >
             <u-input
               v-model.trim="form.recAddress"
               border="none"
diff --git a/pages/regiest/index.vue b/pages/regiest/index.vue
index 863ee70..0239381 100644
--- a/pages/regiest/index.vue
+++ b/pages/regiest/index.vue
@@ -175,7 +175,7 @@
         >
           <u-input v-model="form.idCard" border="none" />
         </u-form-item>
-        <u-form-item
+        <!-- <u-form-item
           :label="'发货方式'"
           required
           borderBottom
@@ -206,20 +206,8 @@
             />
             <u-icon name="arrow-right"></u-icon>
           </view>
-        </u-form-item>
-        <u-form-item
-          v-if="howSure"
-          :label="'创客空间'"
-          borderBottom
-          required
-          @click="ishowSure = true"
-          prop="makerSpaceMemberLabel"
-        >
-          <view class="disFlex justBwn">
-            <u-input v-model="form.makerSpaceMemberLabel" border="none" />
-            <u-icon name="arrow-right"></u-icon>
-          </view>
-        </u-form-item>
+        </u-form-item> -->
+
         <!-- <u-form-item
           :label="'仓库'"
           v-if="pkCountry != 1"
@@ -256,7 +244,7 @@
           </span>
         </view>
         <view v-if="isDeliveryWay">
-          <u-form-item :label="'收货人'" borderBottom prop="recName">
+          <u-form-item :label="'收货人'" required borderBottom prop="recName">
             <u-input
               v-model.trim="form.recName"
               border="none"
@@ -266,6 +254,7 @@
           </u-form-item>
           <u-form-item
             :label="'收货电话'"
+            required
             borderBottom
             prop="recPhone"
             v-if="pkCountry == 1"
@@ -278,7 +267,13 @@
               :placeholder="'请输入收货电话'"
             />
           </u-form-item>
-          <u-form-item :label="'收货电话'" borderBottom prop="recPhone" v-else>
+          <u-form-item
+            :label="'收货电话'"
+            required
+            borderBottom
+            prop="recPhone"
+            v-else
+          >
             <u-input
               v-model.trim="form.recPhone"
               border="none"
@@ -289,6 +284,7 @@
           <u-form-item
             :label="'收货地址'"
             borderBottom
+            required
             prop="diqu"
             @click="getDiqu"
           >
@@ -301,7 +297,12 @@
               <u-icon name="arrow-right"></u-icon>
             </view>
           </u-form-item>
-          <u-form-item :label="'详细地址'" borderBottom prop="recAddress">
+          <u-form-item
+            :label="'详细地址'"
+            required
+            borderBottom
+            prop="recAddress"
+          >
             <u-input
               v-model.trim="form.recAddress"
               border="none"