ui 色调调整

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": {}
+}

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'

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()

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>

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 {

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;

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';

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;
 // 中性色