From 4667b2f4ba4a2f21f954863fdd6b257e603af629 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Tue, 27 May 2025 23:09:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E7=BB=84=E4=BB=B6=E5=88=B0=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在多个页面中添加 QuickOrderEntry 组件以提供快捷下单功能
- 全局注册 QuickOrderEntry 组件
- 优化 QuickOrderEntry 组件逻辑，添加 token 检查
- 移除部分页面中不必要的 QuickOrderEntry 导入和刷新逻辑
- 修改首页轮播图点击跳转到快速创建订单页面
---
 components/QuickOrderEntry.vue        | 13 ++++++++-----
 components/productItem.vue            |  3 ++-
 main.js                               |  2 ++
 pages/index/cart.vue                  |  5 +++++
 pages/index/category.vue              | 11 ++---------
 pages/index/center.vue                | 17 +++--------------
 pages/index/index.vue                 | 18 ++++++------------
 pages/index/order.vue                 |  4 ++++
 pages_order/mine/about.vue            |  4 ++++
 pages_order/mine/address.vue          |  3 +++
 pages_order/mine/help.vue             |  4 ++++
 pages_order/mine/individualTeam.vue   |  4 ++++
 pages_order/mine/promotion.vue        |  6 +++++-
 pages_order/mine/purse.vue            |  4 ++++
 pages_order/mine/runningWater.vue     |  4 ++++
 pages_order/order/orderDetail.vue     |  4 ++++
 pages_order/product/productDetail.vue |  3 +++
 pages_order/product/productList.vue   |  4 ++++
 store/store.js                        |  1 +
 19 files changed, 72 insertions(+), 42 deletions(-)

diff --git a/components/QuickOrderEntry.vue b/components/QuickOrderEntry.vue
index 7f47ae9..9472992 100644
--- a/components/QuickOrderEntry.vue
+++ b/components/QuickOrderEntry.vue
@@ -45,6 +45,9 @@ export default {
             isInitialized: false
         }
     },
+	mounted() {
+		this.getQuickOrderInfo()
+	},
     methods: {
         // 处理点击事件
         handleClick() {
@@ -69,6 +72,11 @@ export default {
         
         // 获取快捷下单的信息
         getQuickOrderInfo() {
+			
+			if(!uni.getStorageSync('token')){
+				return
+			}
+			
             // 调用接口获取快捷下单信息
             this.$api('getOrderInfo', {}, res => {
                 if (res.code === 200 && res.result) {
@@ -137,11 +145,6 @@ export default {
         getMessageCount() {
             return this.innerMessageCount;
         },
-        
-        // 获取当前订单信息
-        getOrderInfo() {
-            return this.orderInfo;
-        }
     },
 }
 </script>
diff --git a/components/productItem.vue b/components/productItem.vue
index cda73b2..d6e70b9 100644
--- a/components/productItem.vue
+++ b/components/productItem.vue
@@ -13,10 +13,11 @@
 	            <text style="font-size: 30rpx; ">￥{{item.price}}</text>元/{{item.unit}}
 	        </view>
 	    </view>
-	    <view class="buy-shop" v-if="btn">
+	    <view class="buy-shop">
 	        <uv-button 
 	        type="primary" 
 	        shape="circle" 
+			v-if="btn"
 	        text="立即购买"></uv-button>
 			
 			<view class="tips">
diff --git a/main.js b/main.js
index 47c1892..fc4b8fe 100644
--- a/main.js
+++ b/main.js
@@ -22,10 +22,12 @@ Vue.mixin(mixinConfigList)
 import configPopup from '@/components/config/configPopup.vue'
 import navbar from '@/components/base/navbar.vue'
 import kefu from '@/components/base/kefu.vue'
+import QuickOrderEntry from '@/components/QuickOrderEntry.vue'
 
 Vue.component('configPopup',configPopup)
 Vue.component('navbar',navbar)
 Vue.component('kefu',kefu)
+Vue.component('QuickOrderEntry', QuickOrderEntry)
 
 const app = new Vue({
 	...App,
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index bf4cacd..ac4cd95 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -101,6 +101,11 @@
 			</view>
 		</view>
 		
+		<quick-order-entry
+		ref="quickOrderEntry"
+		bottom="50vh"
+		/>
+		
 		<kefu></kefu>
 
 		<tabber select="cart" />
diff --git a/pages/index/category.vue b/pages/index/category.vue
index f07bc70..37bd07d 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -54,7 +54,7 @@
 		
 		
 		<quick-order-entry 
-		    ref="quickOrderEntry"
+		ref="quickOrderEntry"
 		/>
 		
 		<kefu/>
@@ -66,14 +66,10 @@
 <script>
 	import tabber from '@/components/base/tabbar.vue'
 	import productItem from '@/components/productItem.vue'
-
-	import QuickOrderEntry from '@/components/QuickOrderEntry.vue'
-
 	export default {
 		components: {
 			tabber,
 			productItem,
-			QuickOrderEntry,
 		},
 		data() {
 			return {
@@ -99,10 +95,7 @@
 			this.getCategory()
 		},
 		onShow() {
-			if(uni.getStorageSync('token')){
-				// 刷新快捷下单信息
-                this.$refs.quickOrderEntry.refresh();
-			}
+           this.$refs.quickOrderEntry.refresh();
 		},
 		methods: {
 			clickTabs({index}){
diff --git a/pages/index/center.vue b/pages/index/center.vue
index aff341b..2c4dd7d 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -60,9 +60,8 @@
 					<uv-swiper 
 						class="uv-swaip"
 						height="240rpx"
-						:list="bannerList" 
+						:list="[configList.banner_icon]" 
 						circular 
-                        keyName="image"
 						indicator="true"
 						bgColor="#ffffff">
 					</uv-swiper>
@@ -131,10 +130,10 @@
 		</view>
 		
 		
-		<!-- <quick-order-entry 
+		<quick-order-entry 
 		ref="quickOrderEntry"
 		bottom="50vh"
-		/> -->
+		/>
 		
 		<kefu/>
 
@@ -158,7 +157,6 @@
 		data() {
 			return {
 				list: [],
-				bannerList : [],
 			}
 		},
 		onShow() {
@@ -166,17 +164,8 @@
 				// 刷新快捷下单信息
                 this.$store.commit('getUserInfo')
             }
-			this.getBanner()
 		},
 		methods: {
-			// 获取轮播图
-			getBanner() {
-				this.$api('getBanner', res => {
-					if (res.code == 200) {
-						this.bannerList = res.result
-					}
-				})
-			},
 		}
 	}
 </script>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7e5957b..dd613ce 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -27,10 +27,14 @@
             </view>
         </view>
 
-        <view class="image-home">
+        <view class="image-home"
+		@click="$utils.navigateTo('/pages_order/order/fastCreateOrder')">
             <uv-swiper class="uv-swaip" 
 			keyName="image"
-			height="350rpx" :list="bannerList" circular bgColor="#ffffff">
+			height="350rpx" 
+			:list="bannerList" 
+			circular 
+			bgColor="#ffffff">
             </uv-swiper>
         </view>
 
@@ -72,7 +76,6 @@
 <script>
 import PrivacyAgreementPoup from '@/components/config/PrivacyAgreementPoup.vue'
 import tabber from '@/components/base/tabbar.vue'
-import QuickOrderEntry from '@/components/QuickOrderEntry.vue'
 import productItem from '@/components/productItem.vue'
 import mixinsList from '@/mixins/list.js'
 export default {
@@ -80,7 +83,6 @@ export default {
     components: {
         tabber,
         PrivacyAgreementPoup,
-        QuickOrderEntry,
 		productItem,
     },
     data() {
@@ -99,8 +101,6 @@ export default {
 		this.getBanner()
 		this.getMenu()
 		if(uni.getStorageSync('token')){
-			// 刷新快捷下单信息
-			this.refreshQuickOrder()
             this.$store.commit('getUserInfo')
 		}
 	},
@@ -142,12 +142,6 @@ export default {
    //              url: item.url,
    //          })
 		},
-        // 刷新快捷下单信息
-        refreshQuickOrder() {
-            if (this.$refs.quickOrderEntry) {
-                this.$refs.quickOrderEntry.refresh();
-            }
-        },
     }
 }
 </script>
diff --git a/pages/index/order.vue b/pages/index/order.vue
index 261a6d3..707c83a 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -61,6 +61,10 @@
         </view>
 
 		<kefu/>
+		
+		<quick-order-entry
+		ref="quickOrderEntry"
+		/>
 
     </view>
 </template>
diff --git a/pages_order/mine/about.vue b/pages_order/mine/about.vue
index 3cb3433..fb4d065 100644
--- a/pages_order/mine/about.vue
+++ b/pages_order/mine/about.vue
@@ -10,6 +10,10 @@
 			<uv-parse :content="configList.config_aboutus"></uv-parse>
 		</view>
 		
+		<quick-order-entry
+		ref="quickOrderEntry"
+		/>
+		
 	</view>
 </template>
 
diff --git a/pages_order/mine/address.vue b/pages_order/mine/address.vue
index 46b4440..1775499 100644
--- a/pages_order/mine/address.vue
+++ b/pages_order/mine/address.vue
@@ -19,6 +19,9 @@
 		@saveOrUpdate="saveOrUpdate" 
 		:title="title"></redactAddress>
 		
+		<quick-order-entry
+		ref="quickOrderEntry"
+		/>
 
 		<view class="add-btn">
 			<view @click="addBtn" class="btn">
diff --git a/pages_order/mine/help.vue b/pages_order/mine/help.vue
index 746bcd5..6123350 100644
--- a/pages_order/mine/help.vue
+++ b/pages_order/mine/help.vue
@@ -51,6 +51,10 @@
 				<view @click="submit">确认</view>
 			</view>
 		</view>
+		
+		<quick-order-entry
+		ref="quickOrderEntry"
+		/>
 	</view>
 </template>
 
diff --git a/pages_order/mine/individualTeam.vue b/pages_order/mine/individualTeam.vue
index 7df7e3e..f852267 100644
--- a/pages_order/mine/individualTeam.vue
+++ b/pages_order/mine/individualTeam.vue
@@ -62,6 +62,10 @@
 				</view>
 			</view>
 		</view>
+		
+		<quick-order-entry
+		ref="quickOrderEntry"
+		/>
 	</view>
 </template>
 
diff --git a/pages_order/mine/promotion.vue b/pages_order/mine/promotion.vue
index b953efe..7ea524f 100644
--- a/pages_order/mine/promotion.vue
+++ b/pages_order/mine/promotion.vue
@@ -2,7 +2,7 @@
 	<view class="promotion">
 		
 		<navbar title="二维码" 
-		bgColor="rgb(235, 51, 0)"
+		bgColor="#DC2828"
 		color="#fff"
 		leftClick @leftClick="$utils.navigateBack" />
 		
@@ -19,6 +19,10 @@
 			保存到相册
 		</view>
 		
+		<!-- <quick-order-entry
+		ref="quickOrderEntry"
+		/> -->
+		
 	</view>
 </template>
 
diff --git a/pages_order/mine/purse.vue b/pages_order/mine/purse.vue
index 5d0ae0f..065c1a8 100644
--- a/pages_order/mine/purse.vue
+++ b/pages_order/mine/purse.vue
@@ -35,6 +35,10 @@
 		<view class="b-fiexd">
 			<view class="button-submit">提交</view>
 		</view>
+		
+		<quick-order-entry
+		ref="quickOrderEntry"
+		/>
 
 	</view>
 </template>
diff --git a/pages_order/mine/runningWater.vue b/pages_order/mine/runningWater.vue
index 6903223..8ab9e73 100644
--- a/pages_order/mine/runningWater.vue
+++ b/pages_order/mine/runningWater.vue
@@ -48,6 +48,10 @@
 				<uv-empty mode="history" textSize="28rpx" iconSize="100rpx" />
 			</view>
 		</view>
+		
+		<quick-order-entry
+		ref="quickOrderEntry"
+		/>
 
 		<!-- 日历选择器 -->
 		<uv-calendars 
diff --git a/pages_order/order/orderDetail.vue b/pages_order/order/orderDetail.vue
index 878ccb2..b259784 100644
--- a/pages_order/order/orderDetail.vue
+++ b/pages_order/order/orderDetail.vue
@@ -182,6 +182,10 @@
 		
 		<kefu></kefu>
 		
+		<quick-order-entry
+		ref="quickOrderEntry"
+		/>
+		
         <!-- 联系客服弹框 -->
         <customerServicePopup ref="customerServicePopup" />
     </view>
diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue
index 4047837..4c119c1 100644
--- a/pages_order/product/productDetail.vue
+++ b/pages_order/product/productDetail.vue
@@ -68,6 +68,9 @@
 		<!-- 联系客服弹框 -->
 		<customerServicePopup ref="customerServicePopup" />
 		
+		<quick-order-entry
+		ref="quickOrderEntry"
+		/>
 		
 		<kefu/>
 	</view>
diff --git a/pages_order/product/productList.vue b/pages_order/product/productList.vue
index 809bb9e..65657cd 100644
--- a/pages_order/product/productList.vue
+++ b/pages_order/product/productList.vue
@@ -18,6 +18,10 @@
 			:item="item" v-for="(item, index) in list" :key="index"/>
 		</view>
 		
+		<quick-order-entry
+		ref="quickOrderEntry"
+		/>
+		
 		<kefu/>
 	</view>
 </template>
diff --git a/store/store.js b/store/store.js
index ced0ef9..467b838 100644
--- a/store/store.js
+++ b/store/store.js
@@ -166,6 +166,7 @@ const store = new Vuex.Store({
 			uni.getImageInfo({
 				src: `${Vue.prototype.$config.baseUrl}/info/createQrCode?token=${uni.getStorageSync('token')}`,
 				success : res => {
+					uni.hideLoading()
 					that.commit('setPromotionUrl', res.path)
 				},
 				fail : err => {