wangxiaowei/jianbing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改文件

Browse Source
This commit is contained in:
wangxiaowei
2025-09-04 17:04:21 +08:00
parent ff5e4af2d4
commit 55205f6e4d
11 changed files with 641 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bundle/pages/setting/setting.vue
View File

@ -2,7 +2,7 @@
<view>
<u-cell-group :border="false">
<u-cell-item title="退出登录" @click="logout" hover-class="none"></u-cell-item>
<u-cell-item title="收货地址" @click="toAddress" :border-bottom="false" hover-class="none"></u-cell-item>
<!-- <u-cell-item title="收货地址" @click="toAddress" :border-bottom="false" hover-class="none"></u-cell-item> -->
</u-cell-group>
<u-modal v-model="showLogout" :content="content" :show-cancel-button="true" @confirm="confirmLogout"></u-modal>

36
components/appointment-time/appointment-time.vue
View File

@ -1,9 +1,12 @@
<template>
<view>
<u-popup v-model="showPop" mode="bottom" border-radius="16" :safe-area-inset-bottom="true" :closeable="true">
<view class="appointment-time">
<view class="bold-700 lg u-p-t-24 u-p-b-24 u-text-center">选择预约时间</view>
<view class="block row" style="height: 700rpx;">
<u-popup v-model="showPop" mode="bottom" border-radius="16" :safe-area-inset-bottom="true" >
<view class="appointment-time u-relative">
<view class="bold-700 lg u-p-t-30 u-p-b-30 u-text-center time-text">选择预约时间</view>
<view class="u-absolute close" @click="onClose">
<u-icon size="40" name="close"></u-icon>
</view>
<view class="block row" style="height: 560rpx;">
<view class="aside">
<scroll-view style="height: 100%;" scroll-y="true" scroll-with-animation="true">
<view style="padding-bottom: 200rpx;">
@ -19,8 +22,8 @@
<view class="main">
<scroll-view style="height: 100%" scroll-y="true" scroll-with-animation="true">
<view class="main-wrap u-m-t-32">
<view class="bg-white br16 row u-col-top u-m-b-24 nr" v-for="(item, index) in timeList" :key="index" @click="selectTime(index)">
<view class="main-wrap">
<view class="bg-white br16 row u-col-top nr time-block" v-for="(item, index) in timeList" :key="index" @click="selectTime(index)">
<view>{{ item.start_time }}-{{ item.end_time }}</view>
</view>
</view>
@ -123,8 +126,17 @@
<style lang="scss">
.appointment-time {
height: 800rpx;
max-height: 800rpx;
height: 560rpx;
max-height: 560rpx;
}
.time-text {
font-size: 40rpx;
}
.close {
right: 30rpx;
top: 40rpx;
}
.block {
@ -141,6 +153,7 @@
text-align: center;
height: 108rpx;
line-height: 108rpx;
width: 200rpx;
&.active {
color: $-color-theme;
@ -159,6 +172,12 @@
}
}
.time-block {
height: 108rpx;
line-height: 108rpx;
border-bottom: 2rpx solid #F5F5F5;
}
.main {
height: 100%;
flex: 1;
@ -166,6 +185,7 @@
.main-wrap {
position: relative;
padding: 0 20rpx;
padding-bottom: 108rpx;
.goods {
padding-bottom: 200rpx;
.info {

52
components/cate-one/cate-one.vue
View File

@ -5,7 +5,8 @@
<scroll-view style="height: 100%;" scroll-y="true" scroll-with-animation="true">
<view style="padding-bottom: 200rpx;">
<block v-for="(item, index) in cateList" :key="index">
<view :class="'one-item sm ' + (index == selectIndex ? 'active bg-white' : '')" @click="changeActive(index)">
<view :class="'one-item sm ' + (index == selectIndex ? 'active bg-white' : '')"
@click="changeActive(index)">
<text class="name">{{ item.name }}</text>
<view v-if="index == selectIndex" class="active-line bg-default"></view>
</view>
@ -15,15 +16,19 @@
</view>
<view class="main">
<scroll-view style="height: 100%" scroll-y="true" scroll-with-animation="true" @scrolltolower="getGoodsSearchFun">
<scroll-view style="height: 100%" scroll-y="true" scroll-with-animation="true"
@scrolltolower="getGoodsSearchFun">
<view class="main-wrap">
<view class="goods">
<view class="u-p-t-32 bold-600">{{ cateName }}</view>
<view class="u-p-t-32">
<navigator :url="`/pages/shop/shop?id=${item.id}`" hover-class="none" class="bg-white br16 row u-col-top u-m-b-24" v-for="(item, index) in goodsList" :key="index" >
<navigator :url="`/pages/shop/shop?id=${item.id}`" hover-class="none"
class="bg-white br16 row u-col-top u-m-b-24" v-for="(item, index) in goodsList"
:key="index">
<view>
<u-image :src="item.image" width="136" height="136" border-radius="16"></u-image>
<u-image :src="item.image" width="136" height="136"
border-radius="16"></u-image>
</view>
<view class="info">
<view>
@ -31,10 +36,13 @@
<view class="u-p-t-20 row-between">
<view class="row">
<view class="primary">
<price-format :price="item.price" :subscriptSize="22" :firstSize="34" :secondSize="26"></price-format>
<price-format :price="item.price" :subscriptSize="22"
:firstSize="34" :secondSize="26"></price-format>
</view>
<view class="u-m-l-8">
<price-format :price="item.market_price" :lineThrough="true" color="#C0C0C0" :subscriptSize="22" :firstSize="22" :secondSize="22"></price-format>
<price-format :price="item.market_price" :lineThrough="true"
color="#C0C0C0" :subscriptSize="22" :firstSize="22"
:secondSize="22"></price-format>
</view>
</view>
</view>
@ -78,7 +86,8 @@
共计
</text>
<view class="primary u-m-t-10 u-m-l-20">
<price-format :price="totalPrice" :subscriptSize="26" :firstSize="34" :secondSize="26"></price-format>
<price-format :price="totalPrice" :subscriptSize="26" :firstSize="34"
:secondSize="26"></price-format>
</view>
</view>
<view class="text-fff" v-else>
@ -93,11 +102,12 @@
<u-popup v-model="showCart" mode="bottom" :border-radius="16">
<view style="max-height: 800rpx;">
<view class="px20 text-999 mt20">
温馨提示：请适量点餐
温馨提示：请适量点餐,（套餐与单品系列限购2套）
</view>
<view v-if="cartLists.length > 0">
<scroll-view style="height: 700rpx;" scroll-y="true" scroll-with-animation="true">
<view class="row-start u-row-between u-p-t-20 u-padding-bottom-20 px20" v-for="(item, index) in cartLists" :key="index">
<view class="row-start u-row-between u-p-t-20 u-padding-bottom-20 px20"
v-for="(item, index) in cartLists" :key="index">
<view class="row-start">
<view>
<u-image :src="item.img" width="136" height="136" border-radius="16"></u-image>
@ -112,7 +122,8 @@
<text>味浓芳香</text>
</view>
<view class="primary">
<price-format :price="item.price" :subscriptSize="22" :firstSize="34" :secondSize="26"></price-format>
<price-format :price="item.price" :subscriptSize="22" :firstSize="34"
:secondSize="26"></price-format>
</view>
</view>
</view>
@ -121,13 +132,17 @@
<u-icon class="u-p-t-10" name="trash" size="32"></u-icon>
</view>
<view class="u-p-t-30">
<u-number-box :disabled="item.cart_status != 0" :min="1" :max="item.item_stock" :value="item.goods_num" @blur="countChange($event, item.cart_id, item)" @minus="countChange($event, item.cart_id, item)" @plus="countChange($event, item.cart_id, item)"></u-number-box>
<u-number-box :disabled="item.cart_status != 0" :min="1" :max="item.first_category_id == 1 || item.first_category_id == 2 ? 2 : item.stock"
:value="item.goods_num" @blur="countChange($event, item.cart_id, item)"
@minus="countChange($event, item.cart_id, item)"
@plus="countChange($event, item.cart_id, item)"></u-number-box>
</view>
</view>
</view>
<view class="settle-btn">
<u-button @tap="goSettle" shape="circle" :hair-line="false" hover-class="none" :customStyle="{backgroundColor: themeColor, color: '#fff', border: 'none', padding: '36rpx'}">去结算</u-button>
<u-button @tap="goSettle" shape="circle" :hair-line="false" hover-class="none"
:customStyle="{ backgroundColor: themeColor, color: '#fff', border: 'none', padding: '36rpx' }">去结算</u-button>
</view>
</scroll-view>
</view>
@ -137,7 +152,8 @@
</view>
</u-popup>
<shop-spec v-model="showSpec" :name="goodsName" :spec="goods_spec" @close="showSpec = false" @confirm="confirmSpec"></shop-spec>
<shop-spec v-model="showSpec" :name="goodsName" :spec="goods_spec" @close="showSpec = false"
@confirm="confirmSpec"></shop-spec>
</view>
</template>
@ -190,8 +206,12 @@
}
},
created() {
this.getCartNum()
this.getCartListFun()
this.getCartNum();
this.getCartListFun();
uni.$on('refreshCartList', this.getCartListFun);
},
beforeDestroy() {
uni.$off('refreshCartList', this.getCartListFun);
},
methods: {
...mapActions(['getCartNum']),
@ -317,6 +337,7 @@
total_amount
} = res.data;
this.cartLists = lists;
console.log("🚀 ~ getCartListFun ~ lists:", lists)
// // let cartType = 0;
// // if (lists.length == 0) {
@ -454,6 +475,7 @@
.main-wrap {
position: relative;
padding: 0 20rpx 160rpx;
.goods {
.info {
width: 100%;

3
components/coupon-obj/coupon-obj.vue
View File

@ -47,7 +47,6 @@
};
},
props: {
list: {
type: Array,
@ -58,6 +57,7 @@
},
couponId: [Number, String]
},
watch: {
list: {
handler(val) {
@ -72,6 +72,7 @@
immediate: true,
}
},
methods: {
onSelect(id) {
const {

3
components/order-goods/order-goods.vue
View File

@ -59,9 +59,6 @@
</view>
<template v-if="mode === 'confirm'">
<view class="delivery" v-if="delivery === 1 && !item.is_express"
>该商品不支持快递配送</view
>
<view class="delivery" v-if="delivery === 2 && !item.is_selffetch"
>该商品不支持门店自提</view
>

20
components/shop-spec/shop-spec.vue
View File

@ -29,7 +29,8 @@
</view> -->
</view>
<view class="flex1 u-text-right">
<u-number-box v-model="goodsNum" :min="1" :max="checkedGoods.stock"
<!-- 限购逻辑:套餐和单品内的商品列表，每个都是只能购买两个 -->
<u-number-box v-model="goodsNum" :min="1" :max="goods.first_category_id == 1 || goods.first_category_id == 2 ? 2 : checkedGoods.stock"
:disabled="disabledNumberBox"></u-number-box>
</view>
</view>
@ -157,6 +158,23 @@
},
// 商品数量变化
handleCountChange({ value }) {
console.log("🚀 ~ countChange ~ value:", value)
console.log("🚀 ~ countChange ~ goods:", this.goods)
if (this.goods.first_category_id === 1 || this.goods.first_category_id === 2) {
// 套餐和单品系列限购2套
if (value > 2) {
this.disabledNumberBox = true
return this.$toast({
title: '套餐与单品系列限购2套',
})
} else {
this.goodsNum = value
}
}
},
// 选择规格
// chooseSpec(item, index1, index2, attr) {
// if (item.name == '辣度') {

47
pages/index/index.vue
View File

@ -8,14 +8,14 @@
<u-icon name="arrow-right" size="28" class="right-icon"></u-icon>
</navigator>
</view>
<view class="u-m-t-8 u-line-1">
<!-- <view class="u-m-t-8 u-line-1">
<navigator class="u-flex " url="/bundle/pages/address/address?type=1" hover-class="none">
<u-icon name="map" size="32"></u-icon>
<view class="u-line-1">
{{userAddress || '请选择收货地址'}}
</view>
</navigator>
</view>
</view> -->
</view>
<view>
<u-button shape="circle" :hair-line="false" hover-class="none" :customStyle="{backgroundColor: themeColor, color: '#fff', border: 'none', padding: '36rpx'}" @click="signin">签到</u-button>
@ -53,7 +53,14 @@
</view>
<!-- 下单 -->
<view class="order u-flex u-row-center bg-white">
<view class="order u-flex u-row-center bg-white" @click="toStore">
<view>
<view class="reserve">预约下单</view>
<view class="desc">极速送达更便捷</view>
</view>
<view>
<u-image :src="cloudPath + 'img/home_image1.png'" width="204" height="204"></u-image>
</view>
<!-- <view class="bg-white u-text-center">
<navigator url="/pages/store/store?type=1" hover-class="none">
<view class="text-default xxl">预约下单</view>
@ -63,7 +70,7 @@
</view>
</navigator>
</view> -->
<view class="u-text-center">
<!-- <view class="u-text-center">
<navigator url="/pages/store/store?type=2" hover-class="none">
<view class="text-default xxl">现在点单</view>
<view class="xs text-999">预约下单更便捷</view>
@ -71,7 +78,7 @@
<u-image :src="cloudPath + 'img/icon_order.png'" width="132" height="133" mode="aspectFit"></u-image>
</view>
</navigator>
</view>
</view> -->
</view>
<!-- 活动图 -->
@ -157,6 +164,12 @@
uni.navigateTo({
url: '/pages/signin/signin'
})
},
toStore() {
uni.navigateTo({
url: '/pages/store/store'
})
}
},
computed: {
@ -200,9 +213,31 @@
.order {
margin: 30rpx 20rpx;
height: 300rpx;
justify-content: center;
align-items: center;
& > view {
border-radius: 16rpx;
padding: 40rpx 86rpx;
}
.reserve {
font-weight: 500;
font-size: 44rpx;
color: #254062;
line-height: 26rpx;
font-weight: 500;
margin-bottom: 34rpx;
}
.desc {
font-weight: 400;
font-size: 22rpx;
color: #999999;
line-height: 26rpx;
text-align: center;
font-style: normal;
text-transform: none;
}
}
}

3
pages/login/login.vue
View File

@ -141,7 +141,10 @@
// 更新新注册的用户信息
async handleSubmitMobile(e) {
console.log("🚀 ~ handleSubmitMobile ~ e:", e)
const wxCode = await getWxCode()
console.log("🚀 ~ handleSubmitMobile ~ wxCode:", wxCode)
console.log("🚀 ~ handleSubmitMobile ~ client:", client)
const res = await accountLogin({ account: e.mobile, code: wxCode, client })
if (res.code == 1) {
this.loginHandle(res.data)

3
pages/order_now/order_now.vue
View File

@ -181,8 +181,7 @@
<script>
import { orderBuy, getOrderCoupon, getDelivery } from '@/api/order'
import { prepay, getPayway } from '@/api/app'
import { wxpay, alipay } from '@/utils/pay'
export default {
data() {
return {

55
pages/shop/shop.vue
View File

@ -2,7 +2,8 @@
<view>
<view class="shop">
<view>
<u-swiper :list="goods.goods_image" name="uri" height="500" border-radius="0" mode="number" indicator-pos="bottomRight"></u-swiper>
<u-swiper :list="goods.goods_image" name="uri" height="500" border-radius="0" mode="number"
indicator-pos="bottomRight"></u-swiper>
</view>
<view class="bg-white mx24 px24 u-m-t-24 u-padding-top-20 u-padding-bottom-20 br24">
@ -10,11 +11,13 @@
<view class="mt10 row u-row-between">
<view class="row">
<view class="primary">
<price-format :price="goods.min_price" :subscriptSize="22" :firstSize="34" :secondSize="26"></price-format>
<price-format :price="goods.min_price" :subscriptSize="22" :firstSize="34"
:secondSize="26"></price-format>
</view>
<view class="sale u-text-center primary u-m-l-12">0折</view>
<view class="primary u-m-l-12">
<price-format :lineThrough="true" color="#999" :subscriptSize="22" :firstSize="22" :secondSize="22" :price="goods.market_price"></price-format>
<price-format :lineThrough="true" color="#999" :subscriptSize="22" :firstSize="22"
:secondSize="22" :price="goods.market_price"></price-format>
</view>
</view>
<view class="text-999">已售66</view>
@ -37,8 +40,7 @@
<view>
<u-button @click="openSpec" hover-class="none"
:customStyle="{ width: '116rpx', height: '46rpx', lineHeight: '46rpx', fontSize: '24rpx', backgroundColor: themeColor, color: '#fff', border: 'none', paddingTop: '8rpx' }"
:hair-line="false"
shape="circle">
:hair-line="false" shape="circle">
选规格
</u-button>
</view>
@ -75,14 +77,14 @@
<view class="u-m-l-64 flex1">
<u-button hover-class="none" @click="showSpecFun"
:customStyle="{ height: '92rpx', fontSize: '24rpx', backgroundColor: themeColor, color: '#fff', border: 'none', paddingTop: '8rpx' }"
:hair-line="false"
shape="circle">
:hair-line="false" shape="circle">
立即购买
</u-button>
</view>
</view>
<shop-spec v-model="showSpec" :name="goods.name" :goods="goods" @confirm="confirmSpec" @buynow="onBuy"></shop-spec>
<shop-spec v-model="showSpec" :name="goods.name" :goods="goods" @confirm="confirmSpec"
@buynow="onBuy"></shop-spec>
</view>
</template>
@ -124,6 +126,10 @@
this.showSpec = this.showPopup
},
onUnload() {
uni.$emit('refreshCartList');
},
onShow() {
this.getGoodsDetailFun();
this.getCartNum()
@ -207,27 +213,28 @@
// 购买商品
onBuy(e) {
if (e.type === 'cart') {
// 限购逻辑:套餐和单品内的商品列表，每个都是只能购买两个
if (this.goods.first_category_id == 1 || this.goods.first_category_id == 2) {
console.log("🚀 ~ onBuy ~ this.cartLists:", this.cartLists)
const totalNum = this.cartLists
.filter(i => i.first_category_id === this.goods.first_category_id)
.reduce((sum, i) => sum + (i.goods_num || 0), 0);
if (totalNum >= 2) {
this.$toast({ title: '该类商品每人限购2件' });
return;
} else {
let {id} = e.detail
let { id, goodsNum } = e.detail
addCart({
item_id: id,
goods_num: 1
goods_num: goodsNum
}).then(res => {
this.getCartListFun()
if (res.code == 0) {
this.$toast({
title: res.msg
});
return;
}
this.getCartListFun()
if (this.showPopup) {
setTimeout(() => {
uni.redirectTo({
url: '/pages/store/store'
});
}, 300);
}
this.showSpec = false
});
} else {
let { id, goodsNum } = e.detail
let goods = [{ item_id: id, num: goodsNum }]
@ -248,6 +255,7 @@
<style lang="scss">
.shop {
padding-bottom: 180rpx;
.sale {
background-color: #FEFBEA;
width: 100rpx;
@ -271,5 +279,4 @@
line-height: 40rpx;
border-radius: 100%;
}
</style>

9
pages/store/store.vue
View File

@ -10,14 +10,14 @@
MEET轻食店
<u-icon name="arrow-right" size="28" class="right-icon u-m-l-4"></u-icon>
</view>
<view class="u-flex u-m-t-8" @click="chooseAddress">
<!-- <view class="u-flex u-m-t-8" @click="chooseAddress">
<u-icon name="map" size="32"></u-icon>
门店地址
</view> -->
</view>
</view>
<view>
<!-- <view>
<u-button shape="circle" :hair-line="false" hover-class="none" :customStyle="{backgroundColor: themeColor, color: '#fff', border: 'none', padding: '36rpx'}" @click="signin">自取</u-button>
</view>
</view> -->
</view>
<view class="">
<u-alert-tips type="warning" title="当前门店已休息"></u-alert-tips>
@ -37,7 +37,6 @@
keyword: ''
}
},
onLoad() {
this.getCatrgoryFun();
},