Kroytz/yshop-drink
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui 色调调整

Browse Source
This commit is contained in:
hupeng committed 2024-10-19 10:39:11 +08:00
1 parent a7ec5f2ca0
commit 61a540b685
16 files changed
+970 -947
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

yshop-drink-uniapp-vue3/pages.json
+180 -180
View File
@@ -1,207 +1,207 @@
{ {
"pages": [ "pages": [
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
"navigationBarTitleText": "首页" "navigationBarTitleText": "首页"
} }
}, },
{ {
"path" : "pages/menu/menu", "path" : "pages/menu/menu",
"style" : "style" :
{ {
"navigationBarTitleText": "点餐", "navigationBarTitleText": "点餐",
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
} }
,{ ,{
"path" : "pages/order/order", "path" : "pages/order/order",
"style" : "style" :
{ {
"navigationBarTitleText": "订单", "navigationBarTitleText": "订单",
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
} }
,{ ,{
"path" : "pages/mine/mine", "path" : "pages/mine/mine",
"style" : "style" :
{ {
"navigationBarTitleText": "我的", "navigationBarTitleText": "我的",
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
} }
,{ ,{
"path" : "pages/cart/cart", "path" : "pages/cart/cart",
"style" : "style" :
{ {
"navigationBarTitleText": "购物车", "navigationBarTitleText": "购物车",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }
], ],
"subPackages": [{ "subPackages": [{
"root": "pages/components", "root": "pages/components",
"pages": [ { "pages": [ {
"path": "pages/mine/content", "path": "pages/mine/content",
"style": { "style": {
"navigationBarTitleText": "内容", "navigationBarTitleText": "内容",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff" "navigationBarBackgroundColor": "#ffffff"
} }
}, { }, {
"path": "pages/pay/pay", "path": "pages/pay/pay",
"style": { "style": {
"navigationBarTitleText": "支付", "navigationBarTitleText": "支付",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff" "navigationBarBackgroundColor": "#ffffff"
} }
}, { }, {
"path": "pages/remark/remark", "path": "pages/remark/remark",
"style": { "style": {
"navigationBarTitleText": "备注", "navigationBarTitleText": "备注",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff" "navigationBarBackgroundColor": "#ffffff"
} }
}, { }, {
"path": "pages/packages/index", "path": "pages/packages/index",
"style": { "style": {
"navigationBarTitleText": "可用优惠券", "navigationBarTitleText": "可用优惠券",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff", "navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": true "enablePullDownRefresh": true
} }
}, },
{ {
"path": "pages/login/login", "path": "pages/login/login",
"style": { "style": {
"navigationBarTitleText": "登录", "navigationBarTitleText": "登录",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff" "navigationBarBackgroundColor": "#ffffff"
} }
}, },
{ {
"path": "pages/login/logout", "path": "pages/login/logout",
"style": { "style": {
"navigationBarTitleText": "退出登录" "navigationBarTitleText": "退出登录"
} }
}, },
{ {
"path": "pages/address/address", "path": "pages/address/address",
"style": { "style": {
"navigationBarTitleText": "我的地址", "navigationBarTitleText": "我的地址",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff" "navigationBarBackgroundColor": "#ffffff"
} }
}, { }, {
"path": "pages/address/add", "path": "pages/address/add",
"style": { "style": {
"navigationBarTitleText": "添加地址", "navigationBarTitleText": "添加地址",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff" "navigationBarBackgroundColor": "#ffffff"
} }
}, { }, {
"path": "pages/orders/orders", "path": "pages/orders/orders",
"style": { "style": {
"navigationBarTitleText": "历史订单", "navigationBarTitleText": "历史订单",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff", "navigationBarBackgroundColor": "#ffffff",
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"onReachBottomDistance": 50 "onReachBottomDistance": 50
} }
}, { }, {
"path": "pages/orders/detail", "path": "pages/orders/detail",
"style": { "style": {
"navigationBarTitleText": "订单详情", "navigationBarTitleText": "订单详情",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff" "navigationBarBackgroundColor": "#ffffff"
} }
}, { }, {
"path": "pages/coupons/coupons", "path": "pages/coupons/coupons",
"style": { "style": {
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
"navigationBarTitleText": "我的卡券", "navigationBarTitleText": "我的卡券",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff" "navigationBarBackgroundColor": "#ffffff"
} }
}, { }, {
"path": "pages/mine/userinfo", "path": "pages/mine/userinfo",
"style": { "style": {
"navigationBarTitleText": "用户信息", "navigationBarTitleText": "用户信息",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff" "navigationBarBackgroundColor": "#ffffff"
} }
}, },
{ {
"path": "pages/shop/shop", "path": "pages/shop/shop",
"style": { "style": {
"navigationBarTitleText": "店铺", "navigationBarTitleText": "店铺",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff" "navigationBarBackgroundColor": "#ffffff"
} }
}, { }, {
"path": "pages/balance/bill", "path": "pages/balance/bill",
"style": { "style": {
"navigationBarTitleText": "账单", "navigationBarTitleText": "账单",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#ffffff" "navigationBarBackgroundColor": "#ffffff"
} }
} }
,{ ,{
"path" : "pages/orders/refund", "path" : "pages/orders/refund",
"style" : "style" :
{ {
"navigationBarTitleText": "退款", "navigationBarTitleText": "退款",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }
] ]
}], }],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": " ", "navigationBarTitleText": " ",
"navigationBarBackgroundColor": "#F8F8F8", "navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8",
"navigationStyle": "custom" "navigationStyle": "custom"
}, },
"tabBar": { "tabBar": {
"color": "#919293", "color": "#919293",
"selectedColor": "#dd524d", "selectedColor": "#09b4f1",
"backgroundColor": "#fff", "backgroundColor": "#fff",
"borderStyle": "black", "borderStyle": "black",
"list": [{ "list": [{
"pagePath": "pages/index/index", "pagePath": "pages/index/index",
"text": "首页", "text": "首页",
"iconPath": "static/images/tabBar/index.png", "iconPath": "static/images/tabBar/index.png",
"selectedIconPath": "static/images/tabBar/index_selected.png" "selectedIconPath": "static/images/tabBar/index_selected.png"
}, },
{ {
"pagePath": "pages/menu/menu", "pagePath": "pages/menu/menu",
"text": "点餐", "text": "点餐",
"iconPath": "static/images/tabBar/drink.png", "iconPath": "static/images/tabBar/drink.png",
"selectedIconPath": "static/images/tabBar/drink-selected.png" "selectedIconPath": "static/images/tabBar/drink-selected.png"
}, { }, {
"pagePath": "pages/cart/cart", "pagePath": "pages/cart/cart",
"text": "购物车", "text": "购物车",
"iconPath": "static/images/tabBar/cart.png", "iconPath": "static/images/tabBar/cart.png",
"selectedIconPath": "static/images/tabBar/cart-selected.png" "selectedIconPath": "static/images/tabBar/cart-selected.png"
},{ },{
"pagePath": "pages/order/order", "pagePath": "pages/order/order",
"text": "订单", "text": "订单",
"iconPath": "static/images/tabBar/order.png", "iconPath": "static/images/tabBar/order.png",
"selectedIconPath": "static/images/tabBar/order-selected.png" "selectedIconPath": "static/images/tabBar/order-selected.png"
}, { }, {
"pagePath": "pages/mine/mine", "pagePath": "pages/mine/mine",
"text": "我的", "text": "我的",
"iconPath": "static/images/tabBar/mine.png", "iconPath": "static/images/tabBar/mine.png",
"selectedIconPath": "static/images/tabBar/mine_selected.png" "selectedIconPath": "static/images/tabBar/mine_selected.png"
} }
] ]
}, },
"uniIdRouter": {} "uniIdRouter": {}
} }
yshop-drink-uniapp-vue3/pages/cart/cart.vue
+3 -3
View File
@@ -38,15 +38,15 @@
</view> </view>
<view class="fixed-bottom flex justify-between align-center bg-white "> <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 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> </view>
<uv-toast ref="uToast"></uv-toast> <uv-toast ref="uToast"></uv-toast>
</template> </template>
<script setup> <script setup>
import { import {
ref, ref,
computed computed
} from 'vue' } from 'vue'
import { useMainStore } from '@/store/store' import { useMainStore } from '@/store/store'
import { storeToRefs } from 'pinia' import { storeToRefs } from 'pinia'
yshop-drink-uniapp-vue3/pages/components/pages/mine/userinfo.vue
+4 -4
View File
@@ -17,7 +17,7 @@
<uv-avatar :src="member.avatar" size="60"></uv-avatar> <uv-avatar :src="member.avatar" size="60"></uv-avatar>
</view> </view>
<view v-if="!member.avatar" class="flex-1" style="right:0;height: 60rpx;"> <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> </view>
</view> </view>
@@ -80,16 +80,16 @@
</template> </template>
<script setup> <script setup>
import { import {
ref, ref,
computed computed
} from 'vue' } from 'vue'
import { useMainStore } from '@/store/store' import { useMainStore } from '@/store/store'
import { storeToRefs } from 'pinia' import { storeToRefs } from 'pinia'
import { onLoad,onShow} from '@dcloudio/uni-app' import { onLoad,onShow} from '@dcloudio/uni-app'
import { formatDateTime } from '@/utils/util' import { formatDateTime } from '@/utils/util'
import { import {
userEdit userEdit
} from '@/api/user' } from '@/api/user'
import { VUE_APP_UPLOAD_URL } from '@/config'; import { VUE_APP_UPLOAD_URL } from '@/config';
const main = useMainStore() const main = useMainStore()
yshop-drink-uniapp-vue3/pages/components/pages/orders/detail.vue
+4 -4
View File
@@ -191,14 +191,14 @@
</template> </template>
<script setup> <script setup>
import { import {
ref ref
} from 'vue' } from 'vue'
import { onLoad} from '@dcloudio/uni-app' import { onLoad} from '@dcloudio/uni-app'
import { formatDateTime } from '@/utils/util' import { formatDateTime } from '@/utils/util'
import { import {
orderDetail, orderDetail,
orderReceive, orderReceive,
} from '@/api/order' } from '@/api/order'
const title = ref('订单详情') const title = ref('订单详情')
const order = ref({ const order = ref({
@@ -483,6 +483,6 @@ const refund = (order) => {
font-size: 60rpx; font-size: 60rpx;
} }
.iconfont-yshop { .iconfont-yshop {
color: #dd524d; color: #09b4f1;
} }
</style> </style>
yshop-drink-uniapp-vue3/pages/components/pages/pay/pay.vue
+712 -712
View File
File diff suppressed because it is too large. Load diff
yshop-drink-uniapp-vue3/pages/index/index.vue
+26 -3
View File
@@ -29,8 +29,20 @@
</view> </view>
</view> </view>
<view class="content"> <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="entrance">
<view class="item " @tap="takein"> <!-- <view class="item " @tap="takein">
<view> <view>
<view class="font-md">自取</view> <view class="font-md">自取</view>
<view class="font-small text-light-black flex-1">下单免排队</view> <view class="font-small text-light-black flex-1">下单免排队</view>
@@ -46,7 +58,7 @@
</view> </view>
<view class="index-img"><image src="/static/images/index003.png" mode="aspectFit" class="img-02"></image></view> <view class="index-img"><image src="/static/images/index003.png" mode="aspectFit" class="img-02"></image></view>
</view> </view> -->
</view> </view>
<view class="info"> <view class="info">
<view class="integral_section"> <view class="integral_section">
@@ -150,6 +162,17 @@ onLoad(() => {
</script> </script>
<style lang="scss"> <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 { .index-img {
width: 120px; width: 120px;
height: 120rpx; height: 120rpx;
@@ -244,7 +267,7 @@ page {
.icon { .icon {
font-size: 90rpx; font-size: 90rpx;
// color: #5A5B5C; // color: #5A5B5C;
color: #dd524d; color: #09b4f1;
} }
.title { .title {
yshop-drink-uniapp-vue3/pages/menu/menu.vue
+5 -5
View File
@@ -233,10 +233,10 @@
</template> </template>
<script setup> <script setup>
import { import {
ref, ref,
computed, computed,
nextTick nextTick
} from 'vue' } from 'vue'
import { useMainStore } from '@/store/store' import { useMainStore } from '@/store/store'
import { storeToRefs } from 'pinia' import { storeToRefs } from 'pinia'
@@ -244,10 +244,10 @@ import { onLoad,onShow ,onPullDownRefresh,onHide} from '@dcloudio/uni-app'
import { formatDateTime,kmUnit } from '@/utils/util' import { formatDateTime,kmUnit } from '@/utils/util'
import { import {
shopNearby, shopNearby,
menuGoods menuGoods
} from '@/api/goods' } from '@/api/goods'
import { import {
menuAds menuAds
} from '@/api/market' } from '@/api/market'
const main = useMainStore() const main = useMainStore()
const { orderType,address, store,location,isLogin } = storeToRefs(main) const { orderType,address, store,location,isLogin } = storeToRefs(main)
@@ -1363,7 +1363,7 @@ const toPay = () => {
.tag { .tag {
//background-color: $color-warning; //background-color: $color-warning;
background-color: #dd524d;; background-color: #09b4f1;;
color: $text-color-white; color: $text-color-white;
display: flex; display: flex;
justify-content: center; justify-content: center;
yshop-drink-uniapp-vue3/static/images/index002.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

yshop-drink-uniapp-vue3/static/images/index003.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

yshop-drink-uniapp-vue3/static/images/tabBar/cart-selected.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

yshop-drink-uniapp-vue3/static/images/tabBar/drink-selected.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

yshop-drink-uniapp-vue3/static/images/tabBar/index_selected.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

yshop-drink-uniapp-vue3/static/images/tabBar/mine_selected.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

yshop-drink-uniapp-vue3/static/images/tabBar/order-selected.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

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