From 61a540b685a5cb0d9382749e3e4effe2c83bb0e6 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Sat, 19 Oct 2024 10:39:11 +0800
Subject: [PATCH] =?UTF-8?q?ui=20=E8=89=B2=E8=B0=83=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yshop-drink-uniapp-vue3/pages.json            |  360 ++---
 yshop-drink-uniapp-vue3/pages/cart/cart.vue   |    6 +-
 .../pages/components/pages/mine/userinfo.vue  |    8 +-
 .../pages/components/pages/orders/detail.vue  |    8 +-
 .../pages/components/pages/pay/pay.vue        | 1424 ++++++++---------
 yshop-drink-uniapp-vue3/pages/index/index.vue |   29 +-
 yshop-drink-uniapp-vue3/pages/menu/menu.vue   |   10 +-
 .../static/images/index002.png                |  Bin 6171 -> 5848 bytes
 .../static/images/index003.png                |  Bin 23574 -> 6126 bytes
 .../static/images/tabBar/cart-selected.png    |  Bin 4457 -> 3903 bytes
 .../static/images/tabBar/drink-selected.png   |  Bin 4187 -> 3811 bytes
 .../static/images/tabBar/index_selected.png   |  Bin 4157 -> 3517 bytes
 .../static/images/tabBar/mine_selected.png    |  Bin 7778 -> 4755 bytes
 .../static/images/tabBar/order-selected.png   |  Bin 3977 -> 3753 bytes
 yshop-drink-uniapp-vue3/uni.scss              |   70 +-
 .../uni_modules/uni-scss/theme.scss           |    2 +-
 16 files changed, 970 insertions(+), 947 deletions(-)

diff --git a/yshop-drink-uniapp-vue3/pages.json b/yshop-drink-uniapp-vue3/pages.json
index c4ac09b..90b8c6d 100644
--- a/yshop-drink-uniapp-vue3/pages.json
+++ b/yshop-drink-uniapp-vue3/pages.json
@@ -1,207 +1,207 @@
-{
-  "pages": [
-    {
-      "path": "pages/index/index",
-      "style": {
-        "navigationBarTitleText": "首页"
-      }
-    },
-   
-      {
-            "path" : "pages/menu/menu",
+{
+  "pages": [
+    {
+      "path": "pages/index/index",
+      "style": {
+        "navigationBarTitleText": "首页"
+      }
+    },
+   
+      {
+            "path" : "pages/menu/menu",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "点餐",
                 "enablePullDownRefresh": true
             }
-            
-        }
-        ,{
-            "path" : "pages/order/order",
+            
+        }
+        ,{
+            "path" : "pages/order/order",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "订单",
                 "enablePullDownRefresh": true
             }
-            
-        }
-        ,{
-            "path" : "pages/mine/mine",
+            
+        }
+        ,{
+            "path" : "pages/mine/mine",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "我的",
                 "enablePullDownRefresh": true
             }
-            
-        }
-        ,{
-            "path" : "pages/cart/cart",
+            
+        }
+        ,{
+            "path" : "pages/cart/cart",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "购物车",
                 "enablePullDownRefresh": false
             }
-            
-        }
+            
+        }
     ],
-	"subPackages": [{
-		"root": "pages/components",
-		"pages": [ {
-				"path": "pages/mine/content",
-				"style": {
-					"navigationBarTitleText": "内容",
-					"navigationBarTextStyle": "black",
-					"navigationBarBackgroundColor": "#ffffff"
-				}
-			}, {
-				"path": "pages/pay/pay",
-				"style": {
-					"navigationBarTitleText": "支付",
-					"navigationBarTextStyle": "black",
-					"navigationBarBackgroundColor": "#ffffff"
-				}
-			}, {
-				"path": "pages/remark/remark",
-				"style": {
-					"navigationBarTitleText": "备注",
-					"navigationBarTextStyle": "black",
-					"navigationBarBackgroundColor": "#ffffff"
-				}
-			}, {
-				"path": "pages/packages/index",
-				"style": {
-					"navigationBarTitleText": "可用优惠券",
-					"navigationBarTextStyle": "black",
-					"navigationBarBackgroundColor": "#ffffff",
-					"enablePullDownRefresh": true
-				}
-			 },
-			 {
-				"path": "pages/login/login",
-				"style": {
-					"navigationBarTitleText": "登录",
-					"navigationBarTextStyle": "black",
-					"navigationBarBackgroundColor": "#ffffff"
-				}
-			},
-			{
-				"path": "pages/login/logout",
-				"style": {
-					"navigationBarTitleText": "退出登录"
-				}
-			},
-			{
-				"path": "pages/address/address",
-				"style": {
-					"navigationBarTitleText": "我的地址",
-					"navigationBarTextStyle": "black",
-					"navigationBarBackgroundColor": "#ffffff"
-				}
-			}, {
-				"path": "pages/address/add",
-				"style": {
-					"navigationBarTitleText": "添加地址",
-					"navigationBarTextStyle": "black",
-					"navigationBarBackgroundColor": "#ffffff"
-				}
-			}, {
-				"path": "pages/orders/orders",
-				"style": {
-					"navigationBarTitleText": "历史订单",
-					"navigationBarTextStyle": "black",
-					"navigationBarBackgroundColor": "#ffffff",
-					"enablePullDownRefresh": true,
-					"onReachBottomDistance": 50
-				}
-			}, {
-				"path": "pages/orders/detail",
-				"style": {
-					"navigationBarTitleText": "订单详情",
-					"navigationBarTextStyle": "black",
-					"navigationBarBackgroundColor": "#ffffff"
-				}
-			}, {
-				"path": "pages/coupons/coupons",
-				"style": {
-					"enablePullDownRefresh": true,
-					"navigationBarTitleText": "我的卡券",
-					"navigationBarTextStyle": "black",
-					"navigationBarBackgroundColor": "#ffffff"
-				}
-			}, {
-				"path": "pages/mine/userinfo",
-				"style": {
-					"navigationBarTitleText": "用户信息",
-					"navigationBarTextStyle": "black",
-					"navigationBarBackgroundColor": "#ffffff"
-				}
-			},
-			 {
-				"path": "pages/shop/shop",
-				"style": {
-					"navigationBarTitleText": "店铺",
-					"navigationBarTextStyle": "black",
-					"navigationBarBackgroundColor": "#ffffff"
-				}
-			}, {
-				"path": "pages/balance/bill",
-				"style": {
-					"navigationBarTitleText": "账单",
-					"navigationBarTextStyle": "black",
-					"navigationBarBackgroundColor": "#ffffff"
-				}
-			}
-		    ,{
-                    "path" : "pages/orders/refund",
+	"subPackages": [{
+		"root": "pages/components",
+		"pages": [ {
+				"path": "pages/mine/content",
+				"style": {
+					"navigationBarTitleText": "内容",
+					"navigationBarTextStyle": "black",
+					"navigationBarBackgroundColor": "#ffffff"
+				}
+			}, {
+				"path": "pages/pay/pay",
+				"style": {
+					"navigationBarTitleText": "支付",
+					"navigationBarTextStyle": "black",
+					"navigationBarBackgroundColor": "#ffffff"
+				}
+			}, {
+				"path": "pages/remark/remark",
+				"style": {
+					"navigationBarTitleText": "备注",
+					"navigationBarTextStyle": "black",
+					"navigationBarBackgroundColor": "#ffffff"
+				}
+			}, {
+				"path": "pages/packages/index",
+				"style": {
+					"navigationBarTitleText": "可用优惠券",
+					"navigationBarTextStyle": "black",
+					"navigationBarBackgroundColor": "#ffffff",
+					"enablePullDownRefresh": true
+				}
+			 },
+			 {
+				"path": "pages/login/login",
+				"style": {
+					"navigationBarTitleText": "登录",
+					"navigationBarTextStyle": "black",
+					"navigationBarBackgroundColor": "#ffffff"
+				}
+			},
+			{
+				"path": "pages/login/logout",
+				"style": {
+					"navigationBarTitleText": "退出登录"
+				}
+			},
+			{
+				"path": "pages/address/address",
+				"style": {
+					"navigationBarTitleText": "我的地址",
+					"navigationBarTextStyle": "black",
+					"navigationBarBackgroundColor": "#ffffff"
+				}
+			}, {
+				"path": "pages/address/add",
+				"style": {
+					"navigationBarTitleText": "添加地址",
+					"navigationBarTextStyle": "black",
+					"navigationBarBackgroundColor": "#ffffff"
+				}
+			}, {
+				"path": "pages/orders/orders",
+				"style": {
+					"navigationBarTitleText": "历史订单",
+					"navigationBarTextStyle": "black",
+					"navigationBarBackgroundColor": "#ffffff",
+					"enablePullDownRefresh": true,
+					"onReachBottomDistance": 50
+				}
+			}, {
+				"path": "pages/orders/detail",
+				"style": {
+					"navigationBarTitleText": "订单详情",
+					"navigationBarTextStyle": "black",
+					"navigationBarBackgroundColor": "#ffffff"
+				}
+			}, {
+				"path": "pages/coupons/coupons",
+				"style": {
+					"enablePullDownRefresh": true,
+					"navigationBarTitleText": "我的卡券",
+					"navigationBarTextStyle": "black",
+					"navigationBarBackgroundColor": "#ffffff"
+				}
+			}, {
+				"path": "pages/mine/userinfo",
+				"style": {
+					"navigationBarTitleText": "用户信息",
+					"navigationBarTextStyle": "black",
+					"navigationBarBackgroundColor": "#ffffff"
+				}
+			},
+			 {
+				"path": "pages/shop/shop",
+				"style": {
+					"navigationBarTitleText": "店铺",
+					"navigationBarTextStyle": "black",
+					"navigationBarBackgroundColor": "#ffffff"
+				}
+			}, {
+				"path": "pages/balance/bill",
+				"style": {
+					"navigationBarTitleText": "账单",
+					"navigationBarTextStyle": "black",
+					"navigationBarBackgroundColor": "#ffffff"
+				}
+			}
+		    ,{
+                    "path" : "pages/orders/refund",
                     "style" :                                                                                    
 					{
 						"navigationBarTitleText": "退款",
 						"enablePullDownRefresh": false
 					}
-                
-            }
-            ]
-	}],
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": " ",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8",
-    "navigationStyle": "custom"
+                
+            }
+            ]
+	}],
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": " ",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8",
+    "navigationStyle": "custom"
   },
-  "tabBar": {
-  		"color": "#919293",
-  		"selectedColor": "#dd524d",
-  		"backgroundColor": "#fff",
-  		"borderStyle": "black",
-  		"list": [{
-  				"pagePath": "pages/index/index",
-  				"text": "首页",
-  				"iconPath": "static/images/tabBar/index.png",
-  				"selectedIconPath": "static/images/tabBar/index_selected.png"
-  			},
-  			{
-  				"pagePath": "pages/menu/menu",
-  				"text": "点餐",
-  				"iconPath": "static/images/tabBar/drink.png",
-  				"selectedIconPath": "static/images/tabBar/drink-selected.png"
-  			}, {
-  				"pagePath": "pages/cart/cart",
-  				"text": "购物车",
-  				"iconPath": "static/images/tabBar/cart.png",
-  				"selectedIconPath": "static/images/tabBar/cart-selected.png"
-  			},{
-  				"pagePath": "pages/order/order",
-  				"text": "订单",
-  				"iconPath": "static/images/tabBar/order.png",
-  				"selectedIconPath": "static/images/tabBar/order-selected.png"
-  			}, {
-  				"pagePath": "pages/mine/mine",
-  				"text": "我的",
-  				"iconPath": "static/images/tabBar/mine.png",
-  				"selectedIconPath": "static/images/tabBar/mine_selected.png"
-  			}
-  		]
-  	},
-  "uniIdRouter": {}
-}
+  "tabBar": {
+  		"color": "#919293",
+  		"selectedColor": "#09b4f1",
+  		"backgroundColor": "#fff",
+  		"borderStyle": "black",
+  		"list": [{
+  				"pagePath": "pages/index/index",
+  				"text": "首页",
+  				"iconPath": "static/images/tabBar/index.png",
+  				"selectedIconPath": "static/images/tabBar/index_selected.png"
+  			},
+  			{
+  				"pagePath": "pages/menu/menu",
+  				"text": "点餐",
+  				"iconPath": "static/images/tabBar/drink.png",
+  				"selectedIconPath": "static/images/tabBar/drink-selected.png"
+  			}, {
+  				"pagePath": "pages/cart/cart",
+  				"text": "购物车",
+  				"iconPath": "static/images/tabBar/cart.png",
+  				"selectedIconPath": "static/images/tabBar/cart-selected.png"
+  			},{
+  				"pagePath": "pages/order/order",
+  				"text": "订单",
+  				"iconPath": "static/images/tabBar/order.png",
+  				"selectedIconPath": "static/images/tabBar/order-selected.png"
+  			}, {
+  				"pagePath": "pages/mine/mine",
+  				"text": "我的",
+  				"iconPath": "static/images/tabBar/mine.png",
+  				"selectedIconPath": "static/images/tabBar/mine_selected.png"
+  			}
+  		]
+  	},
+  "uniIdRouter": {}
+}
diff --git a/yshop-drink-uniapp-vue3/pages/cart/cart.vue b/yshop-drink-uniapp-vue3/pages/cart/cart.vue
index 80ad3fd..3599853 100644
--- a/yshop-drink-uniapp-vue3/pages/cart/cart.vue
+++ b/yshop-drink-uniapp-vue3/pages/cart/cart.vue
@@ -38,15 +38,15 @@
 	 </view>
 	 <view class="fixed-bottom flex justify-between align-center bg-white ">
 	 	<view class="mx-2 ont-weight-light">应付:<text class="text-danger">￥{{ getCartGoodsPrice }}</text></view>
-	 	<view><uv-button type="warning" color="#dd524d" :customStyle="customStyle" size="large" text="去结算" @click="toPay"></uv-button></view>
+	 	<view><uv-button type="warning" color="#09b4f1" :customStyle="customStyle" size="large" text="去结算" @click="toPay"></uv-button></view>
 	 </view>
 	 <uv-toast ref="uToast"></uv-toast>
 </template>
 
 <script setup>
-import {
+import {
   ref,
-  computed
+  computed
 } from 'vue'
 import { useMainStore } from '@/store/store'
 import { storeToRefs } from 'pinia'
diff --git a/yshop-drink-uniapp-vue3/pages/components/pages/mine/userinfo.vue b/yshop-drink-uniapp-vue3/pages/components/pages/mine/userinfo.vue
index 0170fee..4cefc13 100644
--- a/yshop-drink-uniapp-vue3/pages/components/pages/mine/userinfo.vue
+++ b/yshop-drink-uniapp-vue3/pages/components/pages/mine/userinfo.vue
@@ -17,7 +17,7 @@
 									<uv-avatar :src="member.avatar" size="60"></uv-avatar>
 								</view>
 								<view v-if="!member.avatar" class="flex-1" style="right:0;height: 60rpx;">
-									<button style="background-color: #dd524d;color:#fff;" size='mini' open-type="chooseAvatar" @chooseavatar="chooseavatar" type="success">更改头像</button>
+									<button style="background-color: #09b4f1;color:#fff;" size='mini' open-type="chooseAvatar" @chooseavatar="chooseavatar" type="success">更改头像</button>
 								</view>
 							</view>
 						</view>
@@ -80,16 +80,16 @@
 </template>
 
 <script setup>
-import {
+import {
   ref,
-  computed
+  computed
 } from 'vue'
 import { useMainStore } from '@/store/store'
 import { storeToRefs } from 'pinia'
 import { onLoad,onShow} from '@dcloudio/uni-app'
 import { formatDateTime } from '@/utils/util'
 import {
-  userEdit
+  userEdit
 } from '@/api/user'
 import { VUE_APP_UPLOAD_URL } from '@/config';
 const main = useMainStore()
diff --git a/yshop-drink-uniapp-vue3/pages/components/pages/orders/detail.vue b/yshop-drink-uniapp-vue3/pages/components/pages/orders/detail.vue
index 7d82698..649d1ff 100644
--- a/yshop-drink-uniapp-vue3/pages/components/pages/orders/detail.vue
+++ b/yshop-drink-uniapp-vue3/pages/components/pages/orders/detail.vue
@@ -191,14 +191,14 @@
 </template>
 
 <script setup>
-import {
-  ref
+import {
+  ref
 } from 'vue'
 import { onLoad} from '@dcloudio/uni-app'
 import { formatDateTime } from '@/utils/util'
 import {
   orderDetail,
-  orderReceive,
+  orderReceive,
 } from '@/api/order'
 const title = ref('订单详情')
 const order = ref({
@@ -483,6 +483,6 @@ const refund = (order) => {
 		font-size: 60rpx;
 	}
 	.iconfont-yshop {
-		color: #dd524d;
+		color: #09b4f1;
 	}
 </style>
diff --git a/yshop-drink-uniapp-vue3/pages/components/pages/pay/pay.vue b/yshop-drink-uniapp-vue3/pages/components/pages/pay/pay.vue
index 19764bb..bab24b8 100644
--- a/yshop-drink-uniapp-vue3/pages/components/pages/pay/pay.vue
+++ b/yshop-drink-uniapp-vue3/pages/components/pages/pay/pay.vue
@@ -4,224 +4,224 @@
 	  :title="title"
 	  left-arrow
 	  @leftClick="$onClickLeft"
-	/>
-	<view class="container position-relative">
-		<view style="margin-bottom: 130rpx;">
-			<view class="section-1">
-				<template v-if="store.distance > 0">
-					<list-cell class="location">
-						<view class="flex-fill d-flex justify-content-between align-items-center">
-							<view class="store-name flex-fill">{{ orderType == 'takeout' ? '外卖配送' : '点餐自取' }}</view>
-							<uv-switch activeColor="#dd524d" v-model="active" @change="takout">
-							</uv-switch>
-						</view>
-					</list-cell>
-				</template>
-
-				<template v-if="orderType == 'takeout'">
-					<list-cell @click="chooseAddress">
-						<view v-if="address.realName" class="w-100 d-flex flex-column">
-							<view class="d-flex align-items-center justify-content-between mb-10">
-								<view class="font-size-lg text-color-base">
-									{{ address.address + ' ' + address.detail }}
-								</view>
-								<image src="/static/images/navigator-1.png" class="arrow"></image>
-							</view>
-							<view class="d-flex text-color-assist font-size-sm align-items-center">
-								<view class="mr-10">{{ address.realName }}</view>
-								<view>{{ address.phone }}</view>
-							</view>
-						</view>
-						<view v-else class="flex-fill d-flex justify-content-between align-items-center">
-							<view class="store-name flex-fill">选择收货地址</view>
-							<image src="/static/images/navigator-1.png" class="arrow"></image>
-						</view>
-					</list-cell>
-				</template>
-			</view>
-
-			<view class="section-1">
-				<template>
-					<list-cell class="location" @click="goToShop">
-						<view class="flex-fill d-flex justify-content-between align-items-center">
-							<view class="store-name flex-fill">{{ store.name }}</view>
-							<image src="/static/images/navigator-1.png" class="arrow"></image>
-						</view>
-					</list-cell>
-				</template>
-
-				<template>
-					<list-cell arrow class="meal-time" v-if="orderType == 'takein'">
-						<view class="flex-fill d-flex justify-content-between align-items-center"
-							@click="takeinTIme = !takeinTIme">
-							<view class="title">取餐时间</view>
-							<view class="time">
-								{{ takeinRange[defaultSelector[0]].name }}
-								<u-picker v-model="takeinTIme" :range="takeinRange" range-key="name" mode="selector"
-									@cancel="takeinCancelTime" @confirm="takeinConfirmTime"
-									:default-selector="defaultSelector"></u-picker>
-							</view>
-						</view>
-					</list-cell>
-					<list-cell class="contact" last :hover="false" v-if="orderType == 'takein'">
-						<view class="flex-fill d-flex justify-content-between align-items-center">
-							<view class="title flex-fill">联系电话</view>
-							<view class="time"><input class="text-right" placeholder="请输入手机号码" :value="member.mobile" />
-							</view>
-							<button class="contact-tip font-size-sm">自动填写</button>
-						</view>
-					</list-cell>
-				</template>
-				<template v-if="orderType == 'takeout'">
-					<list-cell>
-						<view class="w-100 d-flex flex-column">
-							<view class="d-flex align-items-center font-size-base text-color-base">
-								<view class="flex-fill">预计送达时间</view>
-								<view class="mr-10">
-									{{ defaultTime }}
-									<u-picker :default-time="defaultTime" v-model="takeoutTIme" :params="paramsTime"
-										mode="time" @cancel="cancelTime" @confirm="choiceTime"></u-picker>
-								</view>
-							</view>
-						</view>
-					</list-cell>
-				</template>
-			</view>
-			<!-- 购物车列表 begin -->
-			<view class="section-2">
-				<view class="cart d-flex flex-column">
-					<list-cell last v-for="(item, index) in cart" :key="index">
-						<view class="w-100 d-flex flex-column">
-							<view class="d-flex align-items-center mb-10">
-								<view
-									class="d-flex flex-fill justify-content-between align-items-center text-color-base font-size-lg">
-									<image style="width: 80rpx;height: 80rpx;" mode="aspectFill" :src="item.image">
-									</image>
-								</view>
-								<view class="name-and-props overflow-hidden">
-									<view class="text-color-base font-size-lg">{{ item.name }}</view>
-								</view>
-								<view
-									class="d-flex flex-fill justify-content-between align-items-center text-color-base font-size-lg">
-									<view>x{{ item.number }}</view>
-									<view>￥{{ item.price }}</view>
-								</view>
-							</view>
-							<view class="text-truncate font-size-base text-color-assist">{{ item.valueStr }}</view>
-						</view>
-					</list-cell>
-				</view>
-				<list-cell arrow @click="goToPackages">
-					<view class="flex-fill d-flex justify-content-between align-items-center">
-						<view class="text-color-base">优惠券</view>
-						<view v-if="coupons == 0" class="text-color-base">暂无可用</view>
-						<view v-else-if="coupon.title" class="text-color-danger">
-							{{ coupon.title }}(满{{ coupon.least }}减{{ coupon.value }})
-						</view>
-						<view v-else class="text-color-primary">可用优惠券{{ coupons }}张</view>
-					</view>
-				</list-cell>
-				<list-cell last>
-					<view class="flex-fill d-flex justify-content-end align-items-center">
-						<view>
-							总计￥{{ total }}
-							<text v-if="orderType == 'takeout'">,配送费￥{{ store.deliveryPrice }}</text>
-							<text v-if="coupon.value">,￥-{{ coupon.value }}</text>
-							,实付
-						</view>
-						<view class="font-size-extra-lg font-weight-bold">￥{{ amount }}</view>
-					</view>
-				</list-cell>
-			</view>
-			<!-- 购物车列表 end -->
-			<view class="d-flex align-items-center justify-content-start font-size-sm text-color-warning"
-				style="padding: 20rpx 0;">
-			</view>
-			<!-- 支付方式 begin -->
-			<view class="payment">
-				<list-cell last :hover="false"><text>支付方式</text></list-cell>
-				<list-cell>
-					<view class="d-flex align-items-center justify-content-between w-100 disabled"
-						@click="setPayType('yue')">
-						<view class="iconfont iconbalance line-height-100 payment-icon"></view>
-						<view class="flex-fill">余额支付（余额￥{{ member.nowMoney }}）</view>
-						<view class="font-size-sm" v-if="member.nowMoney == 0">余额不足</view>
-						<view class="iconfont line-height-100 checkbox checked iconradio-button-on" v-if="payType == 'yue'">
-						</view>
-						<view class="iconfont line-height-100 checkbox iconradio-button-off" v-else></view>
-					</view>
-				</list-cell>
-				<list-cell last>
-					<view class="d-flex align-items-center justify-content-between w-100" @click="setPayType('weixin')">
-						<view class="iconfont iconwxpay line-height-100 payment-icon" style="color: #7EB73A"></view>
-						<view class="flex-fill">微信支付</view>
-						<view class="iconfont line-height-100 checkbox checked iconradio-button-on" v-if="payType == 'weixin'">
-						</view>
-						<view class="iconfont line-height-100 checkbox iconradio-button-off" v-else></view>
-					</view>
-				</list-cell>
-				<!-- #ifdef H5 -->
-				<list-cell>
-					<view class="d-flex align-items-center justify-content-between w-100" @click="setPayType('alipay')">
-						<view class="iconfont-yshop icon-alipay line-height-100 payment-icon" style="color:#07b4fd" ></view>
-						<view class="flex-fill">支付宝</view>
-						<view class="iconfont line-height-100 checkbox checked iconradio-button-on" v-if="payType == 'alipay'" ></view>
-						<view class="iconfont line-height-100 checkbox iconradio-button-off" v-else ></view>     
-					</view>
-				</list-cell>
-				<!-- #endif -->
-			</view>
-			<!-- 支付方式 end -->
-			<!-- 备注 begin -->
-			<list-cell  last @click="goToRemark">
-				<view class="d-flex flex-fill align-items-center justify-content-between overflow-hidden" style="margin-bottom: 110rpx;">
-					<view class="flex-shrink-0 mr-20">备注</view>
-					<view class="text-color-primary flex-fill text-truncate text-right">{{ form.remark || '点击填写备注' }}
-					</view>
-				</view>
-			</list-cell>
-			<!-- 备注 end -->
-		</view>
-		<!-- 付款栏 begin -->
-		<view style="z-index: 1;"
-			class="w-100 pay-box position-fixed fixed-bottom d-flex align-items-center justify-content-between bg-white">
-			<view class="font-size-sm" style="margin-left: 20rpx;">合计：</view>
-			<view class="font-size-lg flex-fill">￥{{ amount }}</view>
-			<view class="bg-primary h-100 d-flex align-items-center just-content-center text-color-white font-size-base"
-				style="padding: 0 60rpx;" @tap="debounce(submit, 500)">付款</view>
-		</view>
-		<!-- 付款栏 end -->
-		<modal :show="ensureAddressModalVisible" custom :mask-closable="false" :radius="'0rpx'" width="90%">
-			<view class="modal-content">
-				<view class="d-flex justify-content-end">
-					<image src="/static/images/pay/close.png" style="width: 40rpx; height: 40rpx;"
-						@tap="ensureAddressModalVisible = false"></image>
-				</view>
-				<view class="d-flex just-content-center align-items-center" style="margin-bottom: 40px;">
-					<view class="font-size-extra-lg text-color-base">请再次确认下单地址</view>
-				</view>
-				<view
-					class="d-flex font-size-base text-color-base font-weight-bold align-items-center justify-content-between mb-20">
-					<view>{{ address.realName }}</view>
-					<view>{{ address.phone }}</view>
-				</view>
-				<view class="d-flex font-size-sm text-color-assist align-items-center justify-content-between mb-40">
-					<view style="max-width: 60%;">{{ address.address + address.detail }}</view>
-					<button type="primary" size="mini" plain class="change-address-btn" style="white-space: nowrap;"
-						@click="chooseAddress">修改地址</button>
-				</view>
-				<button type="primary" class="pay_btn" @tap="debounce(pay, 500)">确认并付款</button>
-			</view>
+	/>
+	<view class="container position-relative">
+		<view style="margin-bottom: 130rpx;">
+			<view class="section-1">
+				<template v-if="store.distance > 0">
+					<list-cell class="location">
+						<view class="flex-fill d-flex justify-content-between align-items-center">
+							<view class="store-name flex-fill">{{ orderType == 'takeout' ? '外卖配送' : '点餐自取' }}</view>
+							<uv-switch activeColor="#09b4f1" v-model="active" @change="takout">
+							</uv-switch>
+						</view>
+					</list-cell>
+				</template>
+
+				<template v-if="orderType == 'takeout'">
+					<list-cell @click="chooseAddress">
+						<view v-if="address.realName" class="w-100 d-flex flex-column">
+							<view class="d-flex align-items-center justify-content-between mb-10">
+								<view class="font-size-lg text-color-base">
+									{{ address.address + ' ' + address.detail }}
+								</view>
+								<image src="/static/images/navigator-1.png" class="arrow"></image>
+							</view>
+							<view class="d-flex text-color-assist font-size-sm align-items-center">
+								<view class="mr-10">{{ address.realName }}</view>
+								<view>{{ address.phone }}</view>
+							</view>
+						</view>
+						<view v-else class="flex-fill d-flex justify-content-between align-items-center">
+							<view class="store-name flex-fill">选择收货地址</view>
+							<image src="/static/images/navigator-1.png" class="arrow"></image>
+						</view>
+					</list-cell>
+				</template>
+			</view>
+
+			<view class="section-1">
+				<template>
+					<list-cell class="location" @click="goToShop">
+						<view class="flex-fill d-flex justify-content-between align-items-center">
+							<view class="store-name flex-fill">{{ store.name }}</view>
+							<image src="/static/images/navigator-1.png" class="arrow"></image>
+						</view>
+					</list-cell>
+				</template>
+
+				<template>
+					<list-cell arrow class="meal-time" v-if="orderType == 'takein'">
+						<view class="flex-fill d-flex justify-content-between align-items-center"
+							@click="takeinTIme = !takeinTIme">
+							<view class="title">取餐时间</view>
+							<view class="time">
+								{{ takeinRange[defaultSelector[0]].name }}
+								<u-picker v-model="takeinTIme" :range="takeinRange" range-key="name" mode="selector"
+									@cancel="takeinCancelTime" @confirm="takeinConfirmTime"
+									:default-selector="defaultSelector"></u-picker>
+							</view>
+						</view>
+					</list-cell>
+					<list-cell class="contact" last :hover="false" v-if="orderType == 'takein'">
+						<view class="flex-fill d-flex justify-content-between align-items-center">
+							<view class="title flex-fill">联系电话</view>
+							<view class="time"><input class="text-right" placeholder="请输入手机号码" :value="member.mobile" />
+							</view>
+							<button class="contact-tip font-size-sm">自动填写</button>
+						</view>
+					</list-cell>
+				</template>
+				<template v-if="orderType == 'takeout'">
+					<list-cell>
+						<view class="w-100 d-flex flex-column">
+							<view class="d-flex align-items-center font-size-base text-color-base">
+								<view class="flex-fill">预计送达时间</view>
+								<view class="mr-10">
+									{{ defaultTime }}
+									<u-picker :default-time="defaultTime" v-model="takeoutTIme" :params="paramsTime"
+										mode="time" @cancel="cancelTime" @confirm="choiceTime"></u-picker>
+								</view>
+							</view>
+						</view>
+					</list-cell>
+				</template>
+			</view>
+			<!-- 购物车列表 begin -->
+			<view class="section-2">
+				<view class="cart d-flex flex-column">
+					<list-cell last v-for="(item, index) in cart" :key="index">
+						<view class="w-100 d-flex flex-column">
+							<view class="d-flex align-items-center mb-10">
+								<view
+									class="d-flex flex-fill justify-content-between align-items-center text-color-base font-size-lg">
+									<image style="width: 80rpx;height: 80rpx;" mode="aspectFill" :src="item.image">
+									</image>
+								</view>
+								<view class="name-and-props overflow-hidden">
+									<view class="text-color-base font-size-lg">{{ item.name }}</view>
+								</view>
+								<view
+									class="d-flex flex-fill justify-content-between align-items-center text-color-base font-size-lg">
+									<view>x{{ item.number }}</view>
+									<view>￥{{ item.price }}</view>
+								</view>
+							</view>
+							<view class="text-truncate font-size-base text-color-assist">{{ item.valueStr }}</view>
+						</view>
+					</list-cell>
+				</view>
+				<list-cell arrow @click="goToPackages">
+					<view class="flex-fill d-flex justify-content-between align-items-center">
+						<view class="text-color-base">优惠券</view>
+						<view v-if="coupons == 0" class="text-color-base">暂无可用</view>
+						<view v-else-if="coupon.title" class="text-color-danger">
+							{{ coupon.title }}(满{{ coupon.least }}减{{ coupon.value }})
+						</view>
+						<view v-else class="text-color-primary">可用优惠券{{ coupons }}张</view>
+					</view>
+				</list-cell>
+				<list-cell last>
+					<view class="flex-fill d-flex justify-content-end align-items-center">
+						<view>
+							总计￥{{ total }}
+							<text v-if="orderType == 'takeout'">,配送费￥{{ store.deliveryPrice }}</text>
+							<text v-if="coupon.value">,￥-{{ coupon.value }}</text>
+							,实付
+						</view>
+						<view class="font-size-extra-lg font-weight-bold">￥{{ amount }}</view>
+					</view>
+				</list-cell>
+			</view>
+			<!-- 购物车列表 end -->
+			<view class="d-flex align-items-center justify-content-start font-size-sm text-color-warning"
+				style="padding: 20rpx 0;">
+			</view>
+			<!-- 支付方式 begin -->
+			<view class="payment">
+				<list-cell last :hover="false"><text>支付方式</text></list-cell>
+				<list-cell>
+					<view class="d-flex align-items-center justify-content-between w-100 disabled"
+						@click="setPayType('yue')">
+						<view class="iconfont iconbalance line-height-100 payment-icon"></view>
+						<view class="flex-fill">余额支付（余额￥{{ member.nowMoney }}）</view>
+						<view class="font-size-sm" v-if="member.nowMoney == 0">余额不足</view>
+						<view class="iconfont line-height-100 checkbox checked iconradio-button-on" v-if="payType == 'yue'">
+						</view>
+						<view class="iconfont line-height-100 checkbox iconradio-button-off" v-else></view>
+					</view>
+				</list-cell>
+				<list-cell last>
+					<view class="d-flex align-items-center justify-content-between w-100" @click="setPayType('weixin')">
+						<view class="iconfont iconwxpay line-height-100 payment-icon" style="color: #7EB73A"></view>
+						<view class="flex-fill">微信支付</view>
+						<view class="iconfont line-height-100 checkbox checked iconradio-button-on" v-if="payType == 'weixin'">
+						</view>
+						<view class="iconfont line-height-100 checkbox iconradio-button-off" v-else></view>
+					</view>
+				</list-cell>
+				<!-- #ifdef H5 -->
+				<list-cell>
+					<view class="d-flex align-items-center justify-content-between w-100" @click="setPayType('alipay')">
+						<view class="iconfont-yshop icon-alipay line-height-100 payment-icon" style="color:#07b4fd" ></view>
+						<view class="flex-fill">支付宝</view>
+						<view class="iconfont line-height-100 checkbox checked iconradio-button-on" v-if="payType == 'alipay'" ></view>
+						<view class="iconfont line-height-100 checkbox iconradio-button-off" v-else ></view>     
+					</view>
+				</list-cell>
+				<!-- #endif -->
+			</view>
+			<!-- 支付方式 end -->
+			<!-- 备注 begin -->
+			<list-cell  last @click="goToRemark">
+				<view class="d-flex flex-fill align-items-center justify-content-between overflow-hidden" style="margin-bottom: 110rpx;">
+					<view class="flex-shrink-0 mr-20">备注</view>
+					<view class="text-color-primary flex-fill text-truncate text-right">{{ form.remark || '点击填写备注' }}
+					</view>
+				</view>
+			</list-cell>
+			<!-- 备注 end -->
+		</view>
+		<!-- 付款栏 begin -->
+		<view style="z-index: 1;"
+			class="w-100 pay-box position-fixed fixed-bottom d-flex align-items-center justify-content-between bg-white">
+			<view class="font-size-sm" style="margin-left: 20rpx;">合计：</view>
+			<view class="font-size-lg flex-fill">￥{{ amount }}</view>
+			<view class="bg-primary h-100 d-flex align-items-center just-content-center text-color-white font-size-base"
+				style="padding: 0 60rpx;" @tap="debounce(submit, 500)">付款</view>
+		</view>
+		<!-- 付款栏 end -->
+		<modal :show="ensureAddressModalVisible" custom :mask-closable="false" :radius="'0rpx'" width="90%">
+			<view class="modal-content">
+				<view class="d-flex justify-content-end">
+					<image src="/static/images/pay/close.png" style="width: 40rpx; height: 40rpx;"
+						@tap="ensureAddressModalVisible = false"></image>
+				</view>
+				<view class="d-flex just-content-center align-items-center" style="margin-bottom: 40px;">
+					<view class="font-size-extra-lg text-color-base">请再次确认下单地址</view>
+				</view>
+				<view
+					class="d-flex font-size-base text-color-base font-weight-bold align-items-center justify-content-between mb-20">
+					<view>{{ address.realName }}</view>
+					<view>{{ address.phone }}</view>
+				</view>
+				<view class="d-flex font-size-sm text-color-assist align-items-center justify-content-between mb-40">
+					<view style="max-width: 60%;">{{ address.address + address.detail }}</view>
+					<button type="primary" size="mini" plain class="change-address-btn" style="white-space: nowrap;"
+						@click="chooseAddress">修改地址</button>
+				</view>
+				<button type="primary" class="pay_btn" @tap="debounce(pay, 500)">确认并付款</button>
+			</view>
 		</modal>
-		<uv-toast ref="uToast"></uv-toast>
-	</view>
-</template>
-
+		<uv-toast ref="uToast"></uv-toast>
+	</view>
+</template>
+
 <script setup>
-import {
+import {
   ref,
   computed,
-  nextTick
+  nextTick
 } from 'vue'
 import { useMainStore } from '@/store/store'
 import { storeToRefs } from 'pinia'
@@ -232,69 +232,69 @@ import  debounce  from '@/uni_modules/uv-ui-tools/libs/function/debounce'
 import {
   orderSubmit,
   payUnify,
-  getWechatConfig
+  getWechatConfig
 } from '@/api/order'
 import {
-  couponCount
+  couponCount
 } from '@/api/coupon'
-// #ifdef H5
-import * as jweixin from 'weixin-js-sdk'
+// #ifdef H5
+import * as jweixin from 'weixin-js-sdk'
 // #endif
 const main = useMainStore()
 const { orderType,address, store,location,isLogin,member,mycoupon } = storeToRefs(main)
 const active = ref(false)
 const title = ref('支付')
-const jsStr = ref('')
-const cart = ref([])
-const form = ref({
-	remark: ''
-})
-const  ensureAddressModalVisible = ref(false)
-const  takeoutTIme = ref(false) // 外卖取餐时间picker
-const paramsTime = ref({
-	year: false,
-	month: false,
-	day: false,
-	hour: true,
-	minute: true,
-	second: false
-})
-const defaultTime = ref('00:00')
-const takeinTIme = ref(false) // 到店自取时间selector
-const takeinRange = ref([{
-		name: '立即用餐',
-		value: 0
-	},
-	{
-		name: '10分钟后',
-		value: 10
-	},
-	{
-		name: '20分钟后',
-		value: 20
-	},
-	{
-		name: '30分钟后',
-		value: 30
-	},
-	{
-		name: '40分钟后',
-		value: 40
-	},
-	{
-		name: '50分钟后',
-		value: 50
-	}
-])
-const defaultSelector = ref([0])
-const payType = ref('weixin') // 付款方式
-const coupons = ref(0) // 可用优惠券数量
-const coupon = ref(main.mycoupon) // 选中的
-const subscribeMss = ref({
-	'takein': '',
-	'takeout': '',
-	'takein_made': '',
-	'takeout_made': ''
+const jsStr = ref('')
+const cart = ref([])
+const form = ref({
+	remark: ''
+})
+const  ensureAddressModalVisible = ref(false)
+const  takeoutTIme = ref(false) // 外卖取餐时间picker
+const paramsTime = ref({
+	year: false,
+	month: false,
+	day: false,
+	hour: true,
+	minute: true,
+	second: false
+})
+const defaultTime = ref('00:00')
+const takeinTIme = ref(false) // 到店自取时间selector
+const takeinRange = ref([{
+		name: '立即用餐',
+		value: 0
+	},
+	{
+		name: '10分钟后',
+		value: 10
+	},
+	{
+		name: '20分钟后',
+		value: 20
+	},
+	{
+		name: '30分钟后',
+		value: 30
+	},
+	{
+		name: '40分钟后',
+		value: 40
+	},
+	{
+		name: '50分钟后',
+		value: 50
+	}
+])
+const defaultSelector = ref([0])
+const payType = ref('weixin') // 付款方式
+const coupons = ref(0) // 可用优惠券数量
+const coupon = ref(main.mycoupon) // 选中的
+const subscribeMss = ref({
+	'takein': '',
+	'takeout': '',
+	'takein_made': '',
+	'takeout_made': ''
 })// 微信订阅信息
 const uToast = ref()
 
@@ -344,473 +344,473 @@ onShow(() => {
 	
 })
 onHide(() => {
-	subscribeMss.value = [];
+	subscribeMss.value = [];
 	coupons.value = 0;
 })
-onLoad((option) => {
+onLoad((option) => {
 	cart.value = uni.getStorageSync('cart')
 	if(option.remark) {
 		form.value.remark = option.remark
 	}
 })
 
-const getSubscribeMss = async() => {
-	 let data = []
-	if (data) {
-		subscribeMss.value = data;
-	}
-}
-// 更改支付方式
-const setPayType = (paytype) => {
-	payType.value = 'weixin';
-	payType.value= paytype;
-	uni.setStorage({
-		key: 'paytype',
-		data: paytype
-	})
-}
-const getCoupons = async() => {
-	//0=通用,1=自取,2=外卖
-	let type = orderType.value == 'takein' ? 1 : 2;
-	let data = await couponCount({
-		shop_id: store.value.id ? store.value.id : 0,
-		type: type
-	});
-	if (data) {
-		coupons.value = data;
-	}
-}
-// 选择时间
-const choiceTime = (value) => {
-	let hour = value.hour;
-	let minute = value.minute;
-
-	let date = new Date(new Date().getTime() + 3600000); // 一个小时后
-	let nowhour = date.getHours();
-	let nowminute = date.getMinutes();
-
+const getSubscribeMss = async() => {
+	 let data = []
+	if (data) {
+		subscribeMss.value = data;
+	}
+}
+// 更改支付方式
+const setPayType = (paytype) => {
+	payType.value = 'weixin';
+	payType.value= paytype;
+	uni.setStorage({
+		key: 'paytype',
+		data: paytype
+	})
+}
+const getCoupons = async() => {
+	//0=通用,1=自取,2=外卖
+	let type = orderType.value == 'takein' ? 1 : 2;
+	let data = await couponCount({
+		shop_id: store.value.id ? store.value.id : 0,
+		type: type
+	});
+	if (data) {
+		coupons.value = data;
+	}
+}
+// 选择时间
+const choiceTime = (value) => {
+	let hour = value.hour;
+	let minute = value.minute;
+
+	let date = new Date(new Date().getTime() + 3600000); // 一个小时后
+	let nowhour = date.getHours();
+	let nowminute = date.getMinutes();
+
 	if ((hour * 60 * 60 + minute * 60) * 1000 - 3600000 < (nowhour * 60 * 60 + nowminute * 60) * 1000) {
 		uToast.value.show({
 			message: '请至少选择一个小时之后',
 			type: 'error'
 		});
-		return
-	}
-
-	if (hour < 10) {
-		hour = '0' + hour;
-	}
-	if (minute < 10) {
-		minute = '0' + minute;
-	}
-	defaultTime,value = hour + ':' + minute;
-	takeoutTIme.value = false;
-}
-const cancelTime = (value) => {
-	takeoutTIme.value = false;
-}
-// 到店自取-取消选择取餐时间
-const takeinCancelTime = (value) => {
-	takeinTIme.value = false;
-}
-// 到店自取-选择取餐时间
-const takeinConfirmTime = (value) => {
-	defaultSelector.value = value;
-}
-// 是否外卖开关
-const takout = (value) => {
-	let type = 'takeout';
-	if (value == false) {
-		type = 'takein';
-	}
-	main.SET_ORDER_TYPE(type);
-
-	// 如果存在优惠券看看需不需要清除
-	if (coupon.value.hasOwnProperty('type')) {
-		//0=通用,1=自取,2=外卖
-		if (coupon.value.type != 0) {
-			if (coupon.value.type == 1 && orderType.value == 'takeout') {
-				coupon.value = {};
-			}
-			if (coupon.value.type == 2 && orderType.value == 'takeint') {
-				coupon.value = {};
-			}
-		}
-	}
-	subscribeMss.value = [];
-	coupons.value = 0;
-	getCoupons();
-}
-const goToRemark = () => {
-	uni.navigateTo({
-		url: '/pages/components/pages/remark/remark?remark=' + form.value.remark
-	});
-}
-const chooseAddress = () => {
-	uni.navigateTo({
-		url: '/pages/components/pages/address/address?is_choose=true&scene=pay'
-	});
-}
-const goToPackages = () => {
-	let newamount = amount.value;
-	let coupon_id = coupon.value.id ? coupon.value.id : 0;
-	let type = orderType.value == 'takein' ? 1 : 2;
-	let shop_id = store.value.id;
-	uni.navigateTo({
-		url: '/pages/components/pages/packages/index?amount=' + newamount + '&coupon_id=' + coupon_id +
-			'&shop_id=' + shop_id + '&type=' + type
-	});
-}
-const goToShop = () => {
-	uni.navigateTo({
-		url: `/pages/components/pages/shop/shop`
-	});
-}
-const submit = () => {
-	if (orderType.value == 'takeout') {
-		// 外卖类型
+		return
+	}
+
+	if (hour < 10) {
+		hour = '0' + hour;
+	}
+	if (minute < 10) {
+		minute = '0' + minute;
+	}
+	defaultTime,value = hour + ':' + minute;
+	takeoutTIme.value = false;
+}
+const cancelTime = (value) => {
+	takeoutTIme.value = false;
+}
+// 到店自取-取消选择取餐时间
+const takeinCancelTime = (value) => {
+	takeinTIme.value = false;
+}
+// 到店自取-选择取餐时间
+const takeinConfirmTime = (value) => {
+	defaultSelector.value = value;
+}
+// 是否外卖开关
+const takout = (value) => {
+	let type = 'takeout';
+	if (value == false) {
+		type = 'takein';
+	}
+	main.SET_ORDER_TYPE(type);
+
+	// 如果存在优惠券看看需不需要清除
+	if (coupon.value.hasOwnProperty('type')) {
+		//0=通用,1=自取,2=外卖
+		if (coupon.value.type != 0) {
+			if (coupon.value.type == 1 && orderType.value == 'takeout') {
+				coupon.value = {};
+			}
+			if (coupon.value.type == 2 && orderType.value == 'takeint') {
+				coupon.value = {};
+			}
+		}
+	}
+	subscribeMss.value = [];
+	coupons.value = 0;
+	getCoupons();
+}
+const goToRemark = () => {
+	uni.navigateTo({
+		url: '/pages/components/pages/remark/remark?remark=' + form.value.remark
+	});
+}
+const chooseAddress = () => {
+	uni.navigateTo({
+		url: '/pages/components/pages/address/address?is_choose=true&scene=pay'
+	});
+}
+const goToPackages = () => {
+	let newamount = amount.value;
+	let coupon_id = coupon.value.id ? coupon.value.id : 0;
+	let type = orderType.value == 'takein' ? 1 : 2;
+	let shop_id = store.value.id;
+	uni.navigateTo({
+		url: '/pages/components/pages/packages/index?amount=' + newamount + '&coupon_id=' + coupon_id +
+			'&shop_id=' + shop_id + '&type=' + type
+	});
+}
+const goToShop = () => {
+	uni.navigateTo({
+		url: `/pages/components/pages/shop/shop`
+	});
+}
+const submit = () => {
+	if (orderType.value == 'takeout') {
+		// 外卖类型
 		if (typeof address.value.id == 'undefined') {
 			uToast.value.show({
 				message: '请选择收货地址',
 				type: 'error'
 			});
-			return
-		}
-
-		// 起送价钱
+			return
+		}
+
+		// 起送价钱
 		if (store.value.min_price > total.value) {
 			uToast.value.show({
 				message: '本店外卖起送价为￥' + store.value.min_price,
 				type: 'error'
 			});
-			return
-		}
-
-		pay();
-
-	} else {
-		pay();
-	}
-}
-const pay = async() => {
-	let that = this;
-	// #ifdef MP-WEIXIN
-	await new Promise(function(revolve) {
-		//订阅号信息id
-		 let subscribeMss = ['KBtfY9G1IWCzC6q-ZKo-Q-MmdP7aaF79nx0XFcBf3h4'];
-
-		wx.showModal({
-			title: '温馨提示',
-			content: '为更好的促进您与商家的交流，小程序需要在您成交时向您发送消息',
-			confirmText: "同意",
-			cancelText: "拒绝",
-			success: function(res) {
-				if (res.confirm) {
-					uni.requestSubscribeMessage({
-						tmplIds: subscribeMss,
-						complete(res) {
-							console.log(res)
-							revolve(true)
-						}
-					});
-				} else {
-					revolve(true)
-				}
-			}
-		})
-	});
-	
-
-	// #endif
-	uni.showLoading({
-		title: '加载中'
-	});
-
-	let data = {
-		orderType: orderType.value, // 购买类型:takein=自取,takeout=外卖
-		addressId:orderType.value == 'takeout' ? address.value.id : 0, // 外卖配送地址
-		shopId: store.value.id, // 店铺id
-		mobile: member.value.mobile, // 联系电话
-		gettime: takeinRange.value[defaultSelector.value[0]].value, // 取餐时间
-		payType: payType.value, // 支付类型
-		remark: form.value.remark, // 备注
-		productId: [],
-		spec: [],
-		number: [],
-		couponId: coupon.value.id ? coupon.value.id : 0 // 优惠券id
-	};
-
-	cart.value.forEach((item, index) => {
-		data.productId.push(item.id);
-		data.spec.push(item.valueStr.replace(/,/g, '|'));
-		//data.spec.push(item.valueStr);
-		data.number.push(item.number);
-	});
-
-	//console.log(data);
-	let order = await orderSubmit(data);
-	if (!order) {
-		uni.hideLoading();
-		return;
+			return
+		}
+
+		pay();
+
+	} else {
+		pay();
+	}
+}
+const pay = async() => {
+	let that = this;
+	// #ifdef MP-WEIXIN
+	await new Promise(function(revolve) {
+		//订阅号信息id
+		 let subscribeMss = ['KBtfY9G1IWCzC6q-ZKo-Q-MmdP7aaF79nx0XFcBf3h4'];
+
+		wx.showModal({
+			title: '温馨提示',
+			content: '为更好的促进您与商家的交流，小程序需要在您成交时向您发送消息',
+			confirmText: "同意",
+			cancelText: "拒绝",
+			success: function(res) {
+				if (res.confirm) {
+					uni.requestSubscribeMessage({
+						tmplIds: subscribeMss,
+						complete(res) {
+							console.log(res)
+							revolve(true)
+						}
+					});
+				} else {
+					revolve(true)
+				}
+			}
+		})
+	});
+	
+
+	// #endif
+	uni.showLoading({
+		title: '加载中'
+	});
+
+	let data = {
+		orderType: orderType.value, // 购买类型:takein=自取,takeout=外卖
+		addressId:orderType.value == 'takeout' ? address.value.id : 0, // 外卖配送地址
+		shopId: store.value.id, // 店铺id
+		mobile: member.value.mobile, // 联系电话
+		gettime: takeinRange.value[defaultSelector.value[0]].value, // 取餐时间
+		payType: payType.value, // 支付类型
+		remark: form.value.remark, // 备注
+		productId: [],
+		spec: [],
+		number: [],
+		couponId: coupon.value.id ? coupon.value.id : 0 // 优惠券id
+	};
+
+	cart.value.forEach((item, index) => {
+		data.productId.push(item.id);
+		data.spec.push(item.valueStr.replace(/,/g, '|'));
+		//data.spec.push(item.valueStr);
+		data.number.push(item.number);
+	});
+
+	//console.log(data);
+	let order = await orderSubmit(data);
+	if (!order) {
+		uni.hideLoading();
+		return;
 	}
 	
-	main.DEL_COUPON()
-
-
-	if (payType.value == 'weixin') {
-		// 微信支付
-		weixinPay(order);
-	} else if (payType.value == 'yue') {
-		// 余额支付
-		balancePay(order);
-	} else if (payType.value == 'alipay') {
-		// 余额支付
-		aliPay(order);
-	} 
-	uni.hideLoading()
-	return
-}
-const balancePay = async(order) => {
-	let from = 'routine'
-	// #ifdef H5
-	from = 'h5'
-	// #endif
-	let pay = await payUnify({
-		uni: order.orderId,
-		from: from,
-		paytype: 'yue'
-	});
-
-	uni.hideLoading();
-	if (!pay) {
-		return;
-	}
-
-	member.value.money -= amount.value
-	main.SET_MEMBER(member.value)
-	uni.removeStorageSync('cart');
-	uni.switchTab({
-		url: '/pages/order/order',
-		fail(res) {
-			console.log(res);
-		}
-	});
-}
-const weixinPay = async(order) => {
-	let from = 'routine'
-	// #ifdef H5
-	from = 'h5'
-	if(isWeixin()){
-		from = 'wechat'
-	}
-	
-	// #endif
-	//let that = this;
-	let data = await payUnify({
-		uni: order.orderId,
-		from: from,
-		paytype: 'weixin'
-	});
-	console.log('param2:',data)
-	if (!data) {
-		uni.hideLoading();
-		return;
-	}
-	if (data.trade_type == 'MWEB') {
-		// #ifdef H5
-		// 微信外的H5
-		console.log('data:',data)
-		location.href = data.data;
-		// #endif
-		console.log('data1:',data)
-	} else if (data.trade_type == 'JSAPI') {
-		console.log('param:',data)
-
-		// #ifdef MP-WEIXIN
-		uni.requestPayment({
-			provider: 'wxpay',
-			timeStamp: data.data.timeStamp,
-			nonceStr: data.data.nonceStr,
-			package: data.data.package,
-			signType: 'MD5',
-			paySign: data.data.paySign,
-			success: function(res) {
-
-				uni.removeStorageSync('cart');
-				uni.switchTab({
-					url: '/pages/order/order'
-				});
-			},
-			fail: function(err) {
-				console.log('fail:' + JSON.stringify(err));
-			}
-		});
-		// #endif
-	} else if (data.trade_type == 'W-JSAPI'){
-		//公众号支付
-	
-		
-	}else if (data.trade_type == 'APP') {
-
-	}
-}
-const aliPay = async(order) => {
-
-	// #ifdef H5
-	//let that = this;
-	if(isWeixin()){
-		uni.showToast({
-			title: '请普通浏览器打开进行支付宝支付~',
-			icon: 'none'
-		})
-		return
-	}
-	let data = await payUnify({
-		uni: order.orderId,
-		from: 'h5',
-		paytype: 'alipay'
-	});
-
-	console.log('data:',data.data)
-  // 支付宝支付，这里只要提交表单
-	let form = data.data
-	const div = document.createElement('formdiv');
-	div.innerHTML = form;
-	document.body.appendChild(div);      
-	//document.forms[0].setAttribute('target', ' self');
-	document.forms[0].submit();
-	//div.remove();
-
-// #endif
-
-
-}
+	main.DEL_COUPON()
 
 
-
-
-</script>
-
-<style lang="scss" scoped>
-	.container {
-		padding: 30rpx;
-	}
-
-	.arrow {
-		width: 50rpx;
-		height: 50rpx;
-		position: relative;
-		margin-right: -10rpx;
-	}
-
-	.location {
-		.store-name {
-			font-size: $font-size-lg;
-		}
-
-		.iconfont {
-			font-size: 50rpx;
-			line-height: 100%;
-			color: $color-primary;
-		}
-	}
-
-	.section-1 {
-		margin-bottom: 30rpx;
-
-		.contact {
-			.contact-tip {
-				margin-left: 10rpx;
-				border: 2rpx solid $color-primary;
-				padding: 6rpx 10rpx;
-				color: $color-primary;
-			}
-		}
-	}
-
-	.section-2 {
-		.name-and-props {
-			width: 65%;
-		}
-	}
-
-	.payment {
-		margin-bottom: 30rpx;
-
-		.disabled {
-			color: $text-color-grey;
-		}
-
-		.payment-icon {
-			font-size: 44rpx;
-			margin-right: 10rpx;
-		}
-
-		.checkbox {
-			font-size: 36rpx;
-			margin-left: 10rpx;
-		}
-
-		.checked {
-			color: $color-primary;
-		}
-	}
-
-	.pay-box {
-		box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.1);
-		height: 100rpx;
-	}
-
-	.modal-content {
-		.change-address-btn {
-			line-height: 2;
-			padding: 0 1em;
-		}
-
-		.pay_btn {
-			width: 100%;
-			border-radius: 50rem !important;
-			line-height: 3;
-		}
-	}
-
-	.choice {
-		background-color: $bg-color-grey;
-		border-radius: 38rpx;
-		display: flex;
-		align-items: center;
-		font-size: $font-size-sm;
-		padding: 0 38rpx;
-		color: $text-color-assist;
-
-		.dinein,
-		.takeout {
-			width: 50%;
-			position: relative;
-			display: flex;
-			align-items: center;
-
-			&.active {
-				padding: 14rpx 38rpx;
-				color: #ffffff;
-				background-color: $color-primary;
-				border-radius: 38rpx;
-			}
-		}
-
-		.takeout {
-			margin-left: 20rpx;
-			height: 100%;
-			flex: 1;
-			padding: 14rpx 0;
-		}
-
-		.dinein.active {
-			//margin-left: -38rpx;
-		}
-
-		.takeout.active {
-			//margin-right: -38rpx;
-		}
-	}
-</style>
+	if (payType.value == 'weixin') {
+		// 微信支付
+		weixinPay(order);
+	} else if (payType.value == 'yue') {
+		// 余额支付
+		balancePay(order);
+	} else if (payType.value == 'alipay') {
+		// 余额支付
+		aliPay(order);
+	} 
+	uni.hideLoading()
+	return
+}
+const balancePay = async(order) => {
+	let from = 'routine'
+	// #ifdef H5
+	from = 'h5'
+	// #endif
+	let pay = await payUnify({
+		uni: order.orderId,
+		from: from,
+		paytype: 'yue'
+	});
+
+	uni.hideLoading();
+	if (!pay) {
+		return;
+	}
+
+	member.value.money -= amount.value
+	main.SET_MEMBER(member.value)
+	uni.removeStorageSync('cart');
+	uni.switchTab({
+		url: '/pages/order/order',
+		fail(res) {
+			console.log(res);
+		}
+	});
+}
+const weixinPay = async(order) => {
+	let from = 'routine'
+	// #ifdef H5
+	from = 'h5'
+	if(isWeixin()){
+		from = 'wechat'
+	}
+	
+	// #endif
+	//let that = this;
+	let data = await payUnify({
+		uni: order.orderId,
+		from: from,
+		paytype: 'weixin'
+	});
+	console.log('param2:',data)
+	if (!data) {
+		uni.hideLoading();
+		return;
+	}
+	if (data.trade_type == 'MWEB') {
+		// #ifdef H5
+		// 微信外的H5
+		console.log('data:',data)
+		location.href = data.data;
+		// #endif
+		console.log('data1:',data)
+	} else if (data.trade_type == 'JSAPI') {
+		console.log('param:',data)
+
+		// #ifdef MP-WEIXIN
+		uni.requestPayment({
+			provider: 'wxpay',
+			timeStamp: data.data.timeStamp,
+			nonceStr: data.data.nonceStr,
+			package: data.data.package,
+			signType: 'MD5',
+			paySign: data.data.paySign,
+			success: function(res) {
+
+				uni.removeStorageSync('cart');
+				uni.switchTab({
+					url: '/pages/order/order'
+				});
+			},
+			fail: function(err) {
+				console.log('fail:' + JSON.stringify(err));
+			}
+		});
+		// #endif
+	} else if (data.trade_type == 'W-JSAPI'){
+		//公众号支付
+	
+		
+	}else if (data.trade_type == 'APP') {
+
+	}
+}
+const aliPay = async(order) => {
+
+	// #ifdef H5
+	//let that = this;
+	if(isWeixin()){
+		uni.showToast({
+			title: '请普通浏览器打开进行支付宝支付~',
+			icon: 'none'
+		})
+		return
+	}
+	let data = await payUnify({
+		uni: order.orderId,
+		from: 'h5',
+		paytype: 'alipay'
+	});
+
+	console.log('data:',data.data)
+  // 支付宝支付，这里只要提交表单
+	let form = data.data
+	const div = document.createElement('formdiv');
+	div.innerHTML = form;
+	document.body.appendChild(div);      
+	//document.forms[0].setAttribute('target', ' self');
+	document.forms[0].submit();
+	//div.remove();
+
+// #endif
+
+
+}
+
+
+
+
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		padding: 30rpx;
+	}
+
+	.arrow {
+		width: 50rpx;
+		height: 50rpx;
+		position: relative;
+		margin-right: -10rpx;
+	}
+
+	.location {
+		.store-name {
+			font-size: $font-size-lg;
+		}
+
+		.iconfont {
+			font-size: 50rpx;
+			line-height: 100%;
+			color: $color-primary;
+		}
+	}
+
+	.section-1 {
+		margin-bottom: 30rpx;
+
+		.contact {
+			.contact-tip {
+				margin-left: 10rpx;
+				border: 2rpx solid $color-primary;
+				padding: 6rpx 10rpx;
+				color: $color-primary;
+			}
+		}
+	}
+
+	.section-2 {
+		.name-and-props {
+			width: 65%;
+		}
+	}
+
+	.payment {
+		margin-bottom: 30rpx;
+
+		.disabled {
+			color: $text-color-grey;
+		}
+
+		.payment-icon {
+			font-size: 44rpx;
+			margin-right: 10rpx;
+		}
+
+		.checkbox {
+			font-size: 36rpx;
+			margin-left: 10rpx;
+		}
+
+		.checked {
+			color: $color-primary;
+		}
+	}
+
+	.pay-box {
+		box-shadow: 0 0 20rpx rgba(0, 0, 0, 0.1);
+		height: 100rpx;
+	}
+
+	.modal-content {
+		.change-address-btn {
+			line-height: 2;
+			padding: 0 1em;
+		}
+
+		.pay_btn {
+			width: 100%;
+			border-radius: 50rem !important;
+			line-height: 3;
+		}
+	}
+
+	.choice {
+		background-color: $bg-color-grey;
+		border-radius: 38rpx;
+		display: flex;
+		align-items: center;
+		font-size: $font-size-sm;
+		padding: 0 38rpx;
+		color: $text-color-assist;
+
+		.dinein,
+		.takeout {
+			width: 50%;
+			position: relative;
+			display: flex;
+			align-items: center;
+
+			&.active {
+				padding: 14rpx 38rpx;
+				color: #ffffff;
+				background-color: $color-primary;
+				border-radius: 38rpx;
+			}
+		}
+
+		.takeout {
+			margin-left: 20rpx;
+			height: 100%;
+			flex: 1;
+			padding: 14rpx 0;
+		}
+
+		.dinein.active {
+			//margin-left: -38rpx;
+		}
+
+		.takeout.active {
+			//margin-right: -38rpx;
+		}
+	}
+</style>
diff --git a/yshop-drink-uniapp-vue3/pages/index/index.vue b/yshop-drink-uniapp-vue3/pages/index/index.vue
index 57cdd2d..bcfe318 100644
--- a/yshop-drink-uniapp-vue3/pages/index/index.vue
+++ b/yshop-drink-uniapp-vue3/pages/index/index.vue
@@ -29,8 +29,20 @@
 				</view>
 			</view>
 			<view class="content">
+				<view class="flex justify-between yshop-menu">
+					<view class="flex flex-column align-center yshop-menu-item "  @tap="takein">
+						<view><image src="/static/images/index002.png" mode="aspectFit" class="img-01"></image></view>
+						<view>自取</view>
+						<view class="font-small text-light-black">下单免排队</view>
+					</view>
+					<view class="flex flex-column align-center yshop-menu-item "  @tap="takeout">
+						<view><image src="/static/images/index003.png" mode="aspectFit" class="img-01"></image></view>
+						<view>外卖</view>
+						<view class="font-small text-light-black">美食送到家</view>
+					</view>
+				</view>
 				<view class="entrance">
-					<view class="item " @tap="takein">
+				<!-- 	<view class="item " @tap="takein">
 						<view>
 							<view class="font-md">自取</view>
 							<view class="font-small text-light-black flex-1">下单免排队</view>
@@ -46,7 +58,7 @@
 						</view>
 						<view class="index-img"><image src="/static/images/index003.png" mode="aspectFit" class="img-02"></image></view>
 						
-					</view>
+					</view> -->
 				</view>
 				 <view class="info">
 					<view class="integral_section">
@@ -150,6 +162,17 @@ onLoad(() => {
 </script>
 
 <style lang="scss">
+// .yshop-menu {
+// 	margin-bottom: 10rpx;
+// 	position: relative;
+// 	margin-top: -42rpx;
+// }
+.yshop-menu-item {
+	background-color: #ffffff;
+	width: 350rpx;
+	padding-bottom: 30rpx;
+}
+	
 .index-img {
 	width: 120px;
 	height: 120rpx;
@@ -244,7 +267,7 @@ page {
 		.icon {
 			font-size: 90rpx;
 			// color: #5A5B5C;
-			color: #dd524d;
+			color: #09b4f1;
 		}
 		
 		.title {
diff --git a/yshop-drink-uniapp-vue3/pages/menu/menu.vue b/yshop-drink-uniapp-vue3/pages/menu/menu.vue
index 536291f..d59d6f3 100644
--- a/yshop-drink-uniapp-vue3/pages/menu/menu.vue
+++ b/yshop-drink-uniapp-vue3/pages/menu/menu.vue
@@ -233,10 +233,10 @@
 </template>
 
 <script setup>
-import {
+import {
   ref,
   computed,
-  nextTick
+  nextTick
 } from 'vue'
 import { useMainStore } from '@/store/store'
 import { storeToRefs } from 'pinia'
@@ -244,10 +244,10 @@ import { onLoad,onShow ,onPullDownRefresh,onHide} from '@dcloudio/uni-app'
 import { formatDateTime,kmUnit } from '@/utils/util'
 import {
   shopNearby,
-  menuGoods
+  menuGoods
 } from '@/api/goods'
 import {
-  menuAds
+  menuAds
 } from '@/api/market'
 const main = useMainStore()
 const { orderType,address, store,location,isLogin } = storeToRefs(main)
@@ -1363,7 +1363,7 @@ const toPay = () => {
 	
 			.tag {
 				//background-color: $color-warning;
-				background-color: #dd524d;;
+				background-color: #09b4f1;;
 				color: $text-color-white;
 				display: flex;
 				justify-content: center;
diff --git a/yshop-drink-uniapp-vue3/static/images/index002.png b/yshop-drink-uniapp-vue3/static/images/index002.png
index 11a9e0ff9c5e0d54ad67054d7af8e67de50494de..94d06208e755ebfeb310f1457d365b4ed3c30a4f 100644
GIT binary patch
literal 5848
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
Wdp0O|ZfNVjX9rssn|oHM#Qy@4UGBsH

literal 6171
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

diff --git a/yshop-drink-uniapp-vue3/static/images/index003.png b/yshop-drink-uniapp-vue3/static/images/index003.png
index 7ce099860cf1b7e36a1c365162466ad4bdc6a4d9..2f8579b25cccf3bbb427cccea50780a667d77c15 100644
GIT binary patch
literal 6126
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

literal 23574
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
P00000NkvXXu0mjf_!lP3

diff --git a/yshop-drink-uniapp-vue3/static/images/tabBar/cart-selected.png b/yshop-drink-uniapp-vue3/static/images/tabBar/cart-selected.png
index a8e7089e36c5b7cfbd9e84dd64db24f6e5beccb2..e105cdc9b05a70df99655e90353adae594266057 100644
GIT binary patch
delta 1171
zcmY*X4NMzl82;{h9amc6s2ws^@Utmel{H8P!UprkIw?ajWkfVMvk<bejsWFn;9}D2
zKvzKKHD;Sm1{pT~%t?R|D(;6FU~4pkhyw<cz-Xc15G>mODRh3<DvNoO%f0{4`#j&Q
ztTVj%n!ldNOHu94C?A;{d*#^ZKGDaTmN)O!esFF09e>Nd&q`9}?$&JqkJm3|yyc{>
z66<o!(1X7}RIe641I7QdbTL~nu3z&w#~;2IaQ^w_rPW0xyZp9LUd><p&8<`uB*Y17
z_84SIibhVq7_y20t6lH%xFN&EtV0I6F%GsH0j3(^5#k=KWiMA4&J`NB$!K6&0tS_i
z&I`hDW1Al-ujXafpiXll4K-3KOU2koLX2`i_hkfq2Gue^M%xYv*a#X1aZ4=k;yD8L
zJN4Qdh2u>Fbiaj^>i1j#_(_j0zaEbk2w;WDCXkobfankbWWH6fFRH<oPaOHMDvO|K
zV31$744u6%r_>TZRFyl?BcgVvOA(S$A8uw2!>cBlyE1L9y=A60i6)Grk=SA>%8pE~
zJbD$8U>0)S-N6V@Zs@6t`v0(l#+101cpLYH+H?7YIIL5#u*rKQH|VKbI)5(_K`{UF
zc3yHk8v9E@Afk@)an!iz+zjy?(zih~Tcd=niJP#Ep*!l6!=8{lHlOqpt~aQ%l+C9R
zWF!wZ8JoICd1>H@$Ll>?jR-#-p9z9smx0FB9MKWIK{TNTlp0ha31(LK5^6a7IT~Ve
zpHP~C;_T3Wvq+!}*Qsn7ay$M^n8Cf5b5dwaOmjrHo+HBRM!WOTCc3>hjKahsLTt(8
zq^8?%Z$*9pA*MNA3juCS>x<`;a;6)-j|tEnj5!>6zcUD#gzb}Ie2S)B%YJYfY8K8M
za3Ite!bMQ(Hg|#bi0_vm<v1Z8=rI98qNf4Z!vw+fAAo7Yh6j^9nN0<o2kUP0t?`oP
zhv$AZ4X^AX6=Tz_rLotGgw-7)zgD|l##Z)5xPI2LpQjS+)6Z_NG*9Oxv|RuJYHi=m
z3cLRVV_wReY?yz4*1eUzgNBiCy7frxdFImbGTW7T=OKM@*y;klSjC&Nyso{cFyutD
z-_IO1^E#?K(^BEizyLV|aP^grwT1gw>t8ok9@#v_9aAwFW**fY$8i!ek@1Sm2SWt+
zKC$j?!4TD>sP_~3T3VU(<pN1?NM%|7(fYPs+H?mP4qtcT))N&D`+SVENM90rJ!(q0
z|AoVL;r@?UTbMM)iTc^Ob2Ya-H!y1y{N^N<d_eB%>)DYgiu*(6%IWFqV!l#}`=%2U
zyn&KsU!XIvs63?bPF-!o!JP@BC~fb}Ps_ulq$K8Waf$LVA)CdF1hTfT8+hQyrKzj#
TjKME}5CD*}H%--)bnwJKeuKXe

delta 1729
zcmY*aYgAKL7QXiql0ZNcK?DqNxr8E4QF$mbKt0g#Y6c%*hrt9|<za;&Vi1B5k_=QY
zB6vkA12{U%fdMTLk(WRrwq^-61u9Y%kOC3o&_RTNW(o!80-c%Fvwxkv*IwV=-}jw$
zl(v)Dtqx-;^>PT;@1S^SYNWN0{js@hT-3Fh?r@oMWhl?a9z#%!$`PB-S!xdm?Y$lS
z12KQ@`*5xWN0!SHmt%KroqR`{MsD);+0xwDm<x*o5mi-HZNEDewW%nr1iJX!IE3ib
zRd&9MeUIij>;IZCt?L=4N#*QAE<|-CD!H2OTZoHnKZ1|s)0v>6RSqx!u~1oXhukL*
zcL=6*|NB}Fw3=&|`<%lY2s$wWge(}rJ#4$Lv1W}qNUSH5&y_(~0ZoTuy&qyA&7eMj
zLPz_>s4_^E_?wOn{0=1#k`9`xELKpS%YWI(+GNi{tB&T=2`?EtedK76vt)Ywk37&>
zfVU*EV9l}1(6{R*y6`(%`v`Z?h9`%qyqj@o)`KUDrRjEH+r&?QFd?4TwPzRio05Zw
z%N)UNgP$F+XvIu@YWY}F8k=?Wq`@&s{@wbev>y}An7gHoFP{n+!J&$HILx)kOWxQP
z0Nt=OLS@za(I%fBq~ZuiWN<7cA42FT(Kz^`yya0DNb7uSl9xd3|H<OO=T7c`5;6`1
zh(fyycUh%Jy)uy_;?<co_qJ3(Qj~N$llu=la|8o!S+1F*gN{GYRTdB9Q+$@*liD!h
z+Z$1$+6!&Qo2e5Mi-!TF>uSs`E*jkvCR*b+;hO_)%-{j`D!JFcS+K|I9@8lsYO}+l
zt^bRe_4PhXQ)87_dui5stqY3OGR|^i+BUIDPA~r$u6W01;4arSEi@FV*zhajIq9A{
zQsgfnIkyL{5AaCWJ7_AeD)nQ-?eN7{2U!0{b+HZNQ;@tegH?MJ*E_LN2Ill{m*;zH
z5ji*i%BMVJwL-zGB5zKp4q2}`0r>QU8FumV$dNXRYDoKRr6ES>3f4iDD}s~yZy~x|
zr_#PBpnh|*WzqWNo9XBHZW=DUP<o-DU%sN@s>ybV{~(0BiRAkzT(LqH1aqwlKYzIW
z^<xvt1`zMPt{GW%5}laM*vZSk#%ZCf-I@CuiZ^vll%%&9t1RHyhph$}u%;p*HWDkA
zofJBfUwtcsOl_s;wqU*fq|VKB_EIL3wS7f%Mo)&C+yS95`4yAd1-K^^Nu_g|gGAs=
zbh)7s8VXxA1Yp!>!O^ltx+?HSVqHU22j7A4B0d|A^Zphlp&)W$8Mt1lJX>Q*=g1%=
zk7WC-`mOFb17OnoOBGSgLGD0k1|Zmw33MLwzK&a~lnxrrO%Qgnv}kC$lmR&Zi*@=r
zC%eLBY50?l;mXwXK85m0<@}qcd)_^$_3p9t3D@cxCEFYJb)Jtc92_u?omx+!DI;u%
zLBLMfVF|Q3^`chDZCIfF>b*LBhzTL}*+KP#W0ODOs=5-tGbG|pu-R1f%dtOAO*EZC
zdC^&afhIjm22Q<Bca}711yJP62hS+MDNc1YPKsJ2a_;t<)tk^s;et4i``Q>0n!SR^
zz0rIFT@?4LkMEYuhjRsn6?e>@Opy(+^Q4X3h`7}Hi<$fAg3#Y-k95D#w7b}D*Q>>|
z=L7WQ6NcO-U42qzp$j6uL4Ta(-GRd#5ctUlMQ*(>MsYEV`1!<n8!D<Ed6D?VpwO`U
z`>KfW&KbX)J176O7oiYMG}no*OHb>o{VX@rbP}$B|4-FUb0f6$%#P2P1qP9++q$CC
zm$p=H_LVLsM;sr?keV^Up)$3m;f86q!1LwQk_UqcnmuqY<=8qVsR)HQBfBDS*jZ0w
zrPwk-)}`t4)Ri<@bI#l*`tJUEV}@leFLa?VZpP1hT(LQ;^<w_UIg^;#hJzo1%ViAI
z>Wr)Qb`sF_#m$ex!OH0%l{z!KL(glIO<hqJO9#dG4%+94my;LX-Mjg^cP1`F{c5hY
zIITSiBv|_!f{)5VAK4A<e}HC9tw%rDUDr1k53X}KJ<@HDhwjZh{Cixl<FGJG{3aKM
zGz}R%J5|`d6N@=+FN-9*j{nX5FeIz_eMvxk_#>C6%QzlU!iLZ<pIIxO2q3QxXU}tN
zFAoS<w732=M!Mo12waMR^PV+WNtp38%z5qi(9MrR^MMvaHDm9aLF5Su*vqZ+|MbuQ
E0gQjtGynhq

diff --git a/yshop-drink-uniapp-vue3/static/images/tabBar/drink-selected.png b/yshop-drink-uniapp-vue3/static/images/tabBar/drink-selected.png
index c11ddb037656896fc8a6c3578035398471debe75..62c0e487e8866ef9db6a4a855d833918284c1d71 100644
GIT binary patch
delta 1060
zcmZWmdr(wW82|2Lm)&)h3jzY|GKXcGSxaMM%C-gK0GGTtNXU>BqYN<;g9EidFE!e`
z>$E_+a+l1;gn0O1Mht~XO~z<bi*?c&L#7bp5lajg$e4_rd|+pF@}JH(bIzIH_kF)}
ze!uTJ^6O80t+BIQCZC%3-tgQ=;>NhAIlSS?X3^a}dToe3WQb*_zWQR{O!b)Zl4qvi
zjk#0(O*doZJ4zJ#zi0%{8u;htt(NfjyE=CzuNoPCVRQ^K_s|j83kuGRDE@k-NUL-b
z&_PDgOR13!(<)^Dwi45VTIZkY2UdCufB*V!338+RI~$g$(65f&#SOvatgWU=ZFUIO
zFj4Ns2n_1yBoSzpQOsi!K0ByjrJS7>iefnomG>wW3grIVCJcH4Q>^6NIqgovn`#5O
zTZ_pe3@od^YG<TDd_$Mj5%i$mXoCTr?`Z16$rKUy%y$E2)JvtVpYt2&ftZWU6nWAH
zv|1+urA63FtHQjH8}2K&#xopl4G6^)tIYw53ByPIk>9lj<E_+wx2rUb77jV0F1P5E
z=y^w0dUwToB|0NUvi4cVcf@^svCunrwy;^uGM_s(2F3_U?K;U$jxJpYnRm?==zZ+@
zXeQuW`H0zkY{#pp4=)YH<08vhtm#qWkV<g=v0j0eYXxvHBms~A)K{W-X!J$7=8}?K
z7RWT3b`<Ez2)+!=VC~-)hO^j-GhD_mv(toaa{BYN%0SbWSBwkE8SQlCcGCrI9z~!E
z(c5P35S~Fc(_j`Dghp_ri_o4Wv_HI*3kkG?kv8I{7|kx@W1MABQ+GA}-MBJ_T~=W)
zPF7!#+vYoj2xOb~EnkJIK4MwA7AXFj-2(>fq#m$o1PDQy4sY8#gvRP-IjU#tDFUe-
z-q)_QG=KOPfqSi!ogQefiuWkV!2TTG6wre5rw(3zmP|Y;G4Aw8lA<nw-gfxJn_;v8
ze*hEoX7bZ<;oNBO#BZNuGwPa`tSG>q+Oxe2>>J)TuIxLog8SXoIJ4pi{P>h<rCk}#
z9oBN{M}b)tqPN6yWhD$Jzi1X!djZEZ)SS*+_d_c&!wC*vmiYVXHL|Huo5HNtr&noI
z#&wQKBbO5vlgXkhDo)OcuaOz#WH~u>FI7jh_qrzi_v{sf06gH?XP|fy3>1ko!l&RV
z_5&~8Exl1Q$lJiM`Hn9UIsLW!@AoPxzKEwL3ad+|eaW)T6uze!kLOr*qVUZ)@V6B~
zC|7Dp0bV9;7AI^=x_cnMzNiW4`T_5dhJWIC@FQJB;m51Fh{%_3>)^bm?5uZ*SqEfg
MW@PhSX+_R|0kxZJoB#j-

delta 1444
zcmZXSSyU5u6vk&J14NcEfmnePV3ddgDpCOv5JreHp=@QT77t4?R*{{8LR|8Xl@d`g
z1hJ5U6vdQ9#3BVs0g**Xk%|e`%4UERMX757A}&oI`qJLt%f07(=brDL`%PJn;8)u9
z`8q-ldrNrM@a$NB@>sapHxsv=E0!{_fMP#V=%7T3yTOx7$K0opmScJFu5HXA|A@kn
z4a*C~zTdVd)px)8O;I_=n@dS~mK6NT(@*|aARzw_!XAeEQoN6(7@XAvi;ea9(-Gp}
z#8$=r7qk3Lcu~e<`sVwU0HpC#3OyT+!*I7VjOIr~*=8pyC`fKRLS>2|M2`hJ(?Z54
z5Hw#eJ&i8%-I>0%O&xJ$Es+}uoHuTkmO1$#q^aBG!cyz!2VuC9hllOCW{nXwF{K-D
z&`9I<H}4Fj6B50TjnvH$LS`Dgw3qSCaR9~TL2|k%KD7}*p}+f-!Z3;vP<2ax+lQi5
z0y3wO12^9Q2%+M@tp`D|RWsT_c+CJK>~{!P#z+xVG!Zlu#nD4W9`*}YCQq;)#KL_f
z8DLCEbSDkM0F*x1wPwL1D6N}HK=HcAXJB$W5u~wy+T_g#8K<~2M>D6~2+5OrR(aj)
z>}D&S9>%8i8|!sZ69ok$l@LnRp4d1tyhl*H4rJV`WmzBS*!Di)r4A0%yw}_Y2+>&$
zm=UshI|AmK;f{r#yJHhqgSXep#cx9<9%x);^_-5Htn-0DZN&B3JK;U7^nTfY=8%Ct
z&i~<&`^e$i`ljBi_cW3vA}?_3YsWL@3}P<YtZrT2{W*wRoAcaV=2yn#rD*QXq2w4b
z&RQ6(ovLuOHN`WLlIvApE(U@j9j<P76UrU2d~BnnB;Oks+=~6<21vX*b=lReBDd0s
z)sCb&l)6>~fT8xnPEeVErw-k*=J36qeG#KZ(fkgn3>8|!oIe+(diVx2?Zf?^)Ga_N
zl**KHau(|%@KoZTAhao-&SS|&+AaW$j?2F@>V#z&;aO@T9-B{cAe2BgHqOe{Dgm>l
z{2<!U?{MM<5$b^{DB|2<)!n+akbolYo<A5&C{wFk4EdPCH{y~Y8fe$7CzOMMpLnhC
z))=bhSutG|k<sfDC~>^1n#@m4MRH@CE~lW}x>FKRY*mwdcnGOfa}8;$W_@A1g`4$-
zr8^y^eO6>78pk_1@_^%IX++Ar50$8X%#6!pl#Z64LVMJMw>cdn2?I={9*^zAygWk+
z%BPKmziFJT-iohW#&>-edNQEELQrfK879jt=sm5Vu%%=U;ZLhq4yF<T#x4RBgG0@+
z-0g_U3YX?ewje?%o<U_=&`4RYCDEuOt`WGkg@%P`b#feYTcei$bVW9?c#eo>Em&Y{
zixI`I<td1;+oA6BQB!U7`3=cYhA>Ja&R#k_9W00M*n!ceZLYsG!}vaWpQNTegeru7
zrU*?lHiyrY`9lSE>8yMUL8sIHi?`wX3_aXpcix(gdJEhF=4dwNQ`i@ayaqK*pLrWW
zn8rO&!s}w-!&B&c)qJWh8~GQlJFRh;4QBcCX$NK)QL8rTv3VbCiAqzSYE8$E(4`>|
zomB)0*aOR}-_aB06=Y<VVPl4w_yQo#+lrV=RMPfjGux#$)o@=@d(g|CBPO`KsjhW~
zf?HIq%zXj+oU`|iQO+0eN>p~ZJYL$T>Am{!A)tyqTC?U3A#4DxD6-KS;6p25EoI-=
zvi1PdL7Tm!6fE8evv#2~0omWN3=t|@5(YjTpdrG}DjlImNmUMQA;_J%PygmQLK*Uv
z8&vT0IxNgErV*9?R(wb(>4t^MDwLc|igrP#sJQ4+)koeYyk&Uk{H`U~e<^IG(aqY`
Z&!9kQep~AF1y4v@oUK9Z%RaG3{{{wkV)+07

diff --git a/yshop-drink-uniapp-vue3/static/images/tabBar/index_selected.png b/yshop-drink-uniapp-vue3/static/images/tabBar/index_selected.png
index 5d52f032f3e8840e1817da6951995d91c2940ecf..016f4b332fcb2523355dd263b1705c8afe7c0f15 100644
GIT binary patch
delta 782
zcmV+p1M&R5AiW!~y$XK<>PbXFRCwC#o6B~hKomvKMU?mgvU<}0{|)|84|*61lqg`G
z9(3Y@N@+kN_^3N_u|%qNJ?`D53Q0V3hy&mNH~`NLV7gL+J={k{0I1;0(*YP^&pk$;
zud&BSo(6yiO%2by1`SUh8bBaB7My^v_ftTOr9{DrJRE>XlumycO1<-AlmLJd;|7G8
z<lJ!XJq&<IQmq&^Ms<P$1^$n8fE{-T8u!Gam@ukCI451n-~e8c=r_cThP+^lEnduP
z+~UOw!AHdkKJE@ch)kzgHX1QQ&KxuA^qwKtIcAOb$52cVd3QGhmRRcy3o))S!@}!&
zUx<t;mTmV04i10dn~^+g=Cpx#698;$IYLT>u+y#{A=L_D>*aG30469{U}9zfDu!pJ
zv{;l*7&SUE#XH_Hm74=FM#*|U2Y{ty%(%QLpGTs!G9U!lVTV9&27sBSe!7^MNzQjp
zVHQy(#xgj7y3~Bu^dsz#HSVGrR>3zQR4BiiWPbomsp)^i>RLSW`T%TF<D=@$>us~H
zW|G$hVB3_AOvS6l7!^xn-yuY5ds3_RbOP|5)bt%@<`EEq6xcFo-JaF}+Dc8|VJ*Bw
zQL$as*$TiBsexJU4iz62;&(cI9srx1EU@7k{Tx_a<R2{{oCIL|&<;}4d)Nl+6$#%E
zdz}INl+=Ip9Wj(n5VamOD*&6+v|Up-0l^|s$Cm9E0A_x@x6U7?z9jmM&8#&?&W)kd
z4FEQ&nahT2F7B%Hhf$Zc-f-SHi8fRB0f1R!3kV<8k4w!E#gZve_2NyYD+K{rf5TAU
z()1}&pE@nSR(~6*?wHYasjr8QV{J7hYJm;q_v(Mo;q2{%(RDJcf#YOb>-$^`MVYP?
zLSz~MP8>Zy41kZ3*B&%dEWNfe^iTlKu|WsG0dN2u00-bq0GIv_PaFUT;Bf%R74LBX
z8~_Kv0dN2u00+PUZ~z<t2fzWiDu6!BuD9no08bCV{dM-q0sI>Pgw#X^*Okch00000
MNks-uM6N<$f*!S8(*OVf

delta 1427
zcmV;E1#J4g8@(W~y$XK?YDq*vRCwC#n_XxeRTRhXeC*8JJ3AZOCQVG!G++BsQ3NZ3
zXkQB23dUmWLrbJS2=<{xs4wE@gF>KvFbE=4un$7D^uZcbN<<NAl?ts7LhXKJvu(F&
z(!`|6&dj|tvom{r*x6(ZDVsE#>?WD>w0CCiy=Q(ibME<{nPq<{rC=i);{)&k_y9IG
zfOJoH)h16tX&e9m!o=9R;Q(YLVY=P0>Hq*>SQ77b80O{;1K^ez&|1yB?A>-#3}`#d
zyt1wVXdK@+!_nj0EJs>se^%s4y-nYPj?=&H0E~&K9~6wEP5DA#E(XAnVhkYLW{(T7
z77qfS)aT82)(wAvtR$a?Ha=W$Q?9fvflwxjaYymDJRHS(duiVU&)6o9PPG{NG0(Pq
zgH8FRo?q1g3?b!QgQ*^<bLN~$Ao+R}>yLPkOCb55DAsqD+EW}T<OKOl8_^FBL20au
z7>y5dfvXB2g@PBF4Rx<vU>E=ZZ~z4<q+E?*?a76XkE4I!)i73{;9S3R9Hrwz=zJGZ
zUs-c^KmsWj+evP>K#M+D3<Vh&x)jCg?lS#;Ya_X5MYo^MQZOQg1|wMAx5%k!)d9p&
z@Ja-$yI6OA%u<?_LW5DPzOb17Nu&&JGjh+%g{8r(2>?kXUyFF2?-`ELNkRFpgJ?ZV
z8D|&<&u@RR)ctkN;vS!x0FZ(x9VW%d4gdg?JaBYg{<_uB4?oCwHzfHh#nyYb*nsr}
z%WF}rKU#ADQV`zuuIG0HtW8<*izbsCUCy|7MD!U~Fpf0l3$p<*2~j#ia97O$NI_{l
zOpJz7dsN^|iSj2m<;@Q(0e6}gPGZ)1v)OXQdBA_SR~<k`6sFtFqNpk6`8;mS)7Qm<
zbGDMP#bmjI<2-YEyJf?9;2Wz3V7{oyNJ6fp@K(xhh{8;pX@zEkr6f*u80MB$1)y<!
zUyh@1d2h+IBu;i3X8mg9@57Qf>6Onn#ellQ%!l0MsSt7)W`bwz2Ac*d4q!|~{cM38
z+nRr$%gRy^j)e(%cr|70{PZ|0@MODXBhS93ii@GFB%emM{+f4LN+NVKf^l0liWx}=
zZ$&(T@Q%Qlbq@QH?Bx3@t_FvYa&D`cI}mac6L(EcM6n*LW=$`S<YWx%;Zl1%z}S?L
zPBdEN{fYrdq2PrUL)`}pj5po=JBGE#K@ESH>&s)_1dQ<L%N7G4SvG(KQZ9Cq+-}|#
zCpJUD5DZ<8VfATHLzY0nKfAE{R7pwBaFk97$~Wyq>wRDVaTL4~!`iM=+h8cjLgm*m
z*7krJv?Nk~X(hQml6$c<meNrvG!Vw>%S#5}7A<C<Z;hq&uBd$9Nwoc-hAoMdfo6Xr
z*Bx|g5bj0$IgGXE77ZW?Q6@s>BKtH43ipKI*>bm2tyl&I&up@^gAX~y)vBl@Lx04u
z`b=2>DF{cygfw|-agNEMQ!S=`6s#f3O7iE>#&3A*kk@79ubsNO>%IWelK5|@C#@U}
zuz8*l`Wr0cZLkJyLXb{4)H?31L??fc9QW29X93L5u}1{X*z7QU(6K)TYuE_Ke=x<-
zcfIc-ycKCC-O~+j3p{S|s4Q3HC}17geBqXYa3oAf3-jZvhyJ(J4NJmwhhc5HPww5c
z7EbnlzIxwB0suf<R(@xG>OC~jNwk+-eLb<zo7$x+tZG_0U%kbfA*g)Iq<eq5K@us0
z000od>fTC}nW}7MeT~b?C6)p`g4Mmur@iIV`4>s+ngs9zyj8v+;sfvj_yBwWK7f@4
zu-xzP7$1NSVEq7KR<Mr`zz5(1@B#P$d;mTGAAk?Q2jBzn0jwy1)lha7na>B{16TwA
h|F5$f9Ke4A0B<N|&q$FnF#rny002ovPDHLkV1g2eqgVg{

diff --git a/yshop-drink-uniapp-vue3/static/images/tabBar/mine_selected.png b/yshop-drink-uniapp-vue3/static/images/tabBar/mine_selected.png
index 1b86b8c037a4506ef6af15b0eddac448e7119bf4..5f3b3aa43dc50a5ed4c7c37e190c932e01ddc935 100644
GIT binary patch
delta 2029
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
LNkvXXu0mjf<8Yv7

delta 5076
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

diff --git a/yshop-drink-uniapp-vue3/static/images/tabBar/order-selected.png b/yshop-drink-uniapp-vue3/static/images/tabBar/order-selected.png
index 26503122afca0f9219166d64de075602857908f8..e7b4f94c05c9f0efa6b50998146e98add7dac222 100644
GIT binary patch
delta 931
zcmeB_Un#p`FIPSDHBT4EkcwMxZa7Z5tsvlVF>!XQ{<F`|k|Ha-%Yscs)7b<jN&WiE
zyh3M|I_LDL*X>Kbi#n)aLPjMFm?Vm+Zr%Iq@9op$_B~}g&3T>2@_ju+_Vqije=<B#
zQTTe~?B-wE+gT!<9r750^l#YguIZn~kj;6*)!|i=v^w{M!vPGIY)ka^6>egXY-2iM
zF=5xmV<(xGNOLMAJG^QGsnAnt_`=+2VDUdG_KP&bOJ<=*E4Nup^7tOfFq2*7$o;-u
zWoivu7*_`5^e$yE;#<-*k*VH`af!SKtFq`6CJ$=?3kAj$ApwJLjZ7ZQAP$Rw1H(&p
zCU%win^{w2IAp4oAwtYRq4;M!910B#Mxq=tl@l14fb1=dA1hf;*zcX!4>oI(B3Ln_
zO9O+F1B0MK1BZYE3x@&|ivS}?HCPM7<OjSW&Oj9~k&O)@)t_(7V@!!xC^+KC<Y54$
zoM4h5gJdo}oiI;^L&dOwK}do_<@;j>6$^p8@{|AZ%1&OyBV0ezOycMaW`*m_jmmsN
z4o!@W%3?we3=o$9ZGJRCul>st2Zhc?<_QNJ6n4t9D;#Wm@s9z&D>2-EV#`5|V=@do
z<v3&tCol-{aL8<ggh4&nCmaIpC6-In*_k|fWExo5m`?t+VBq9)`OXgYeg~?32<I`O
z$w0yj>i(IWER$R;z=~%zZqbucsBD;W{qsjg4|xHPNqcO;67_zJOeg<YFjO)hiDsFg
z{}~i*Dzo?7GF0-j2wB*rbAdws5-*U=Fq4C2l5GLQCB~GLLdQt)W4CWIezKi#v6U@V
zSK|L%aRqzkMiosyhg*#@ku?!Xi!x?$E4+0`<8j{j>*GRJkexyg8B%ySR6GlSX^CYL
ziv=)svgl4aTgXrZv{U*qLkgcjfLROUi5i6kIV{W*J~uFIHsEkr$If()Nq}KuSgjJn
hWOi;<NzL+lc7{6U<UMb9pNVDw0#8>zmvv4FO#ld54;BCb

delta 1134
zcmZ1}+bO?cFP9g~HcuDFkcwMx?l}4jJ4!S>l-$<F;(Kc1Y)*R*ekuNc7W#2d73@9M
z%j7O{+4A;zqlXI9-MeMmFVB5$>wNj#nak^=Pdw}Jm?WpiJUN?BwVqR8wF09O8Z@el
zzqd!~)5F_)4%i$>7TbBBbxrK+bNYIWk{lj96%~B7Po6Pd6PRGj&?(4wKE$ry?ypsG
z-<H2SPc%$nRB^Mm*vcST?h8^Z^W)%3R*!s*hA-?w!d5`>mpv>K>KxcA54o$WZ``-f
zuAWI{X-$nxVe#ho`kV|e8CAZOW~jBO$e)U0zQlV%!GFul^Ve4&U8MO$IZo3e@A|VZ
zB|Cq8TYK|*G2;^32@<~xG~U+wGi0)>ESO<3jmM*2fzeGgz)0b4Ba1|+<H?3CER)hV
zcRUs9>zeT7rq0o#nT(m{j!ZpT3mG;EdTg(s(wrRa<x%9Psl@#03yYzxkD!AbBNMwy
zc{MlCr~)5pPK5>rCJ%Fk0*9jf`HYM#0uE(dEPYiI7??N|8n!Tg`c`_|o{uSrd%~Q{
zKbN1EoN${nsmkF~{B!Z?Kz$sOC-N9f&g12+U!tJ!Fek4(jbWyqfW;|CCXYmi2O8X9
z!-3{7Fm*5#PSg{BIhDC_36D&J2#?CrDPfvRmDBeIzn&7b`S5Y(B?$_*>Kho892f)@
z8aM<TSU41zSOge>8bNM?5EwEk>C%ghzA;YtSl@UckWa{gi<!wi(gUG`rK7uKCor9G
zsH8q%0NS9rvoL1<9gB5Jl-PyMDm$QqDX<F|jI#9;VwoD3D9JSZxqSWm`)h@tjhUHF
z+@JNc=I^J&$Jv14e(75*>x3#b54-(4d>TranLJhH*Mq%!i}~c{$RkBF6&fGkym@o|
z{qXSP4R_`%EaOo4{!M(sKL>@GdVCJ^7%tT*7W-*3O>)+F?(z2g&AaoMHt`Asr(C+s
zJmGkw15-V_f;9`%Ns|JGON<`#kFq{BSZ^tJ*V<to+a+#K<N52uyImho>AQdNv-s<;
z{qJk<Es^^p>tM$G(%RE!@+W)0+&k(Hw-|4xeN5C8c3oWyO1rT+ZCty9Zhm0~yVli$
z;UzoEBrl-(@*FCn4;WIc6(;z|uq)hV_S~7N6jq?^zCK0NcXHC!S6_9N6r!07eV3V=
zGDxy<Xb3kko+xl=uuKqW=;3FX!`#5oQL^GaM}r3@WO6}=t9IKnGfdE5ut$7TZao7K
Nc)I$ztaD0e0sv2(ko5on

diff --git a/yshop-drink-uniapp-vue3/uni.scss b/yshop-drink-uniapp-vue3/uni.scss
index 4936759..1bebb92 100644
--- a/yshop-drink-uniapp-vue3/uni.scss
+++ b/yshop-drink-uniapp-vue3/uni.scss
@@ -15,7 +15,7 @@
 /* 颜色变量 */
 /* 行为相关颜色 */
 // $color-primary: #ADB838;
-$color-primary: #dd524d;
+$color-primary: #09b4f1;
 $color-success: #4cd964;
 $color-warning: #FAB714;
 $color-error: #D12E32;
@@ -78,40 +78,40 @@ $font-size-paragraph:30rpx;
 $box-shadow: 0 20rpx 20rpx -20rpx rgba($color: #333, $alpha: 0.1);
 
 
-
-
-$uv-main-color: #333333;
-$uv-content-color: #999999;
-$uv-tips-color: #909193;
-$uv-light-color: #c0c4cc;
-$uv-border-color: #dadbde;
-$uv-bg-color: #f3f4f6;
-$uv-disabled-color: #c8c9cc;
-
-$uv-primary: #EE6D46;
-$uv-primary-dark: #EE6D46;
-$uv-primary-disabled: #FDEDE8;
-$uv-primary-light: #ecf5ff;
-
-$uv-warning: #f9ae3d;
-$uv-warning-dark: #f1a532;
-$uv-warning-disabled: #f9d39b;
-$uv-warning-light: #fdf6ec;
-
-$uv-success: #5ac725;
-$uv-success-dark: #53c21d;
-$uv-success-disabled: #a9e08f;
-$uv-success-light: #f5fff0;
-
-$uv-error: #f56c6c;
-$uv-error-dark: #e45656;
-$uv-error-disabled: #f7b2b2;
-$uv-error-light: #fef0f0;
-
-$uv-info: #909399;
-$uv-info-dark: #767a82;
-$uv-info-disabled: #c4c6c9;
-$uv-info-light: #f4f4f5;
+
+
+$uv-main-color: #333333;
+$uv-content-color: #999999;
+$uv-tips-color: #909193;
+$uv-light-color: #c0c4cc;
+$uv-border-color: #dadbde;
+$uv-bg-color: #f3f4f6;
+$uv-disabled-color: #c8c9cc;
+
+$uv-primary: #EE6D46;
+$uv-primary-dark: #EE6D46;
+$uv-primary-disabled: #FDEDE8;
+$uv-primary-light: #ecf5ff;
+
+$uv-warning: #f9ae3d;
+$uv-warning-dark: #f1a532;
+$uv-warning-disabled: #f9d39b;
+$uv-warning-light: #fdf6ec;
+
+$uv-success: #5ac725;
+$uv-success-dark: #53c21d;
+$uv-success-disabled: #a9e08f;
+$uv-success-light: #f5fff0;
+
+$uv-error: #f56c6c;
+$uv-error-dark: #e45656;
+$uv-error-disabled: #f7b2b2;
+$uv-error-light: #fef0f0;
+
+$uv-info: #909399;
+$uv-info-dark: #767a82;
+$uv-info-disabled: #c4c6c9;
+$uv-info-light: #f4f4f5;
 
 
 @import '~@/static/iconfont/iconfont.scss';
diff --git a/yshop-drink-uniapp-vue3/uni_modules/uni-scss/theme.scss b/yshop-drink-uniapp-vue3/uni_modules/uni-scss/theme.scss
index 80ee62f..014961c 100644
--- a/yshop-drink-uniapp-vue3/uni_modules/uni-scss/theme.scss
+++ b/yshop-drink-uniapp-vue3/uni_modules/uni-scss/theme.scss
@@ -9,7 +9,7 @@ $uni-success: #4cd964;
 // 警告色
 $uni-warning: #f0ad4e;
 // 错误色
-$uni-error: #dd524d;
+$uni-error: #09b4f1;
 // 描述色
 $uni-info: #909399;
 // 中性色