From 91c143ca68e3ac2ab8b191b898057fd6f25dcb72 Mon Sep 17 00:00:00 2001
From: hflllll <violeteverdack@gmail.com>
Date: Sun, 27 Apr 2025 14:01:33 +0800
Subject: [PATCH] =?UTF-8?q?1,9=20=E8=BF=98=E5=89=A9=E4=B8=8B=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/order.vue                       |  4 +---
 pages_order/components/order/placeOrder.vue |  4 ++--
 pages_order/location/pickupPoint.vue        |  2 +-
 pages_order/mine/team.vue                   | 34 +++++++++--------------------
 pages_order/product/productDetail.vue       | 13 ++++++++++-
 5 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/pages/index/order.vue b/pages/index/order.vue
index 4869475..12678fd 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -32,9 +32,7 @@
 		<view class="order-list" v-else>
 			<OrderItem v-for="(order, index) in orderList" :key="order.id" :order="order" @cancel="handleCancelOrder"
 				@pay="handlePayOrder" @tap="goToOrderDetail(order)" />
-			<view style="
-			margin-top: 200rpx;
-			min-width: 700rpx;">
+			<view style="margin-top: 200rpx; min-width: 700rpx;">
 				<uv-empty mode="order" v-if="orderList.length == 0"></uv-empty>
 			</view>
 		</view>
diff --git a/pages_order/components/order/placeOrder.vue b/pages_order/components/order/placeOrder.vue
index 82c62c5..5ae93e0 100644
--- a/pages_order/components/order/placeOrder.vue
+++ b/pages_order/components/order/placeOrder.vue
@@ -19,7 +19,7 @@
                     <text style="font-size: 42rpx;" v-show="!pickupPoint">
                         请选择取餐地点
                     </text>
-                    <view v-show="pickupPoint" class="place-order-address-content">
+                    <view v-if="pickupPoint" class="place-order-address-content">
                         <view class="place-order-address-content-name">
                             {{ pickupPoint.name }}，{{ pickupPoint.phone }}
                         </view>
@@ -146,7 +146,7 @@ export default {
         }
     },
     mounted(){
-        this.open();
+        // this.open();
         this.listenPickupPoint();
     },
     beforeDestroy() {
diff --git a/pages_order/location/pickupPoint.vue b/pages_order/location/pickupPoint.vue
index 76b2ea9..4976531 100644
--- a/pages_order/location/pickupPoint.vue
+++ b/pages_order/location/pickupPoint.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="page">
         <!-- 导航栏 -->
-        <navbar title="取餐点" tap @tap="$utils.navigateBack" bgColor="#019245" color="#fff" />
+        <navbar title="取餐点" leftClick @leftClick="$utils.navigateBack" color="#fff" />
 
         <view class="container">
             <view class="header">
diff --git a/pages_order/mine/team.vue b/pages_order/mine/team.vue
index abf6abd..0b0680a 100644
--- a/pages_order/mine/team.vue
+++ b/pages_order/mine/team.vue
@@ -42,13 +42,14 @@
                     <input class="input" type="number" v-model="formData.contactPhone" placeholder="请输入您的手机号"
                         placeholder-class="placeholder" />
                 </view>
-                <view class="form-item region-item" @tap="showRegionPicker">
+
+                <view class="form-item region-item">
                     <text class="label">所在地区</text>
-                    <view class="region-value">
-                        <text :class="{ 'placeholder': !formData.region }" style="color: #000;">{{ formData.region ||
-                            '请选择' }}</text>
-                        <uv-icon name="arrow-right" color="#000" />
-                    </view>
+
+                    <picker mode="region" @change="regionSelect">
+                        <text style="font-size: 30rpx;">{{ formData.region || '请选择' }}</text>
+                    </picker>
+                    <uv-icon name="arrow-right" color="#000"  style="margin-left: 2rpx;"/>
                 </view>
                 <view class="address-item">
                     <text class="label">详细地址</text>
@@ -109,15 +110,8 @@ export default {
         },
 
         // 显示地区选择器（当前只是一个简单的点击反应）
-        showRegionPicker() {
-            // 模拟选择了一个地区
-            this.formData.region = '长沙市雨花区'
-
-            // 显示提示
-            uni.showToast({
-                title: '已选择地区',
-                icon: 'none'
-            })
+        regionSelect(e) {
+            this.formData.region = e.detail.value[1] + e.detail.value[2]
         },
 
         // 提交申请
@@ -322,7 +316,7 @@ export default {
 }
 
 .placeholder,
-.region-item .region-value text.placeholder {
+.region-item  text.placeholder {
     // height: 60rpx;
     color: #999;
 }
@@ -330,14 +324,6 @@ export default {
 .region-item {
     cursor: pointer;
 
-    .region-value {
-        flex: 1;
-        text-align: right;
-        font-size: 28rpx;
-        display: flex;
-        justify-content: flex-end;
-        align-items: center;
-    }
 }
 
 .address-item {
diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue
index 8655664..317873f 100644
--- a/pages_order/product/productDetail.vue
+++ b/pages_order/product/productDetail.vue
@@ -170,9 +170,20 @@
 					if(res.code == 200){
 						uni.showToast({
 							title: '加入购物车成功',
-							icon: 'none'
+							icon: 'success'
+						})
+					}else{
+						uni.showToast({
+							title: '加入购物车失败',
+							icon: 'error'
 						})
 					}
+				},
+				error => {
+					uni.showToast({
+						title: '加入购物车失败',
+						icon: 'error'
+					})
 				})
 			},
 			// 立即下单