wangzimeng/zhongtuanCatering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

保存

Browse Source
This commit is contained in:
wangzimeng 2025-08-14 16:20:24 +08:00
parent a278bf103d
commit af6a57f378
10 changed files with 97 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pages/app/score-shop.vue
View File

@ -1,6 +1,9 @@
<!-- 页面 --> <!-- 页面 -->
<template> <template>
<s-layout title="积分商城"> <s-layout title="积分商城">
<scroll-view @scrolltolower="onScrolltolower" :refresher-enabled="true" :refresher-triggered="homrS"
@refresherrefresh="onS" scroll-y="true" class="flex align-items "
style="height: 100vh;box-sizing: border-box;">
<view class="container"> <view class="container">
<!-- 顶部信息 --> <!-- 顶部信息 -->
<view class="conTop"> <view class="conTop">
@ -14,33 +17,42 @@
</view> </view>
</view> </view>
</view> </view>
<!-- tabs页签 --> <!-- tabs页签
<view class="tabs-box"> <view class="tabs-box">
<su-tabs :list="tabMaps" @change="onChange" :scrollable="false" :current="currentTab"></su-tabs> <su-tabs :list="tabMaps" @change="onChange" :scrollable="false" :current="currentTab"></su-tabs>
</view> </view>-->
<!-- 可兑换券列表 --> <!-- 可兑换券列表 -->
<scroll-view @scrolltolower="onScrolltolower" :refresher-enabled="true" :refresher-triggered="homrS"
@refresherrefresh="onS" scroll-y="true" class="flex align-items"
style="height: 1250rpx;box-sizing: border-box;">
<!-- 满减券 --> <!-- 满减券 -->
<view class="exChangeBox" v-if="currentTab == 0"> <view class="exChangeBox">
<view class="scoreBox" style="display: flex;justify-content: center;align-items: center;width: 100%;margin: 40rpx 30rpx;">
<view style="width: 60rpx;height: 8rpx;background-color: #fcc74e;"></view>
<view style="color: #333333;font-size: 42rpx;font-weight: bold;line-height: 28rpx;margin: 0 30rpx;font-family: PingFang SC;;">积分兑换</view>
<view style="width: 60rpx;height: 8rpx;background-color: #fcc74e;"></view>
</view>
<view class="couponsList"> <view class="couponsList">
<view class="list-item" v-for="(item, index) in couponList" :key="index" @click="openCouponPro(item)"> <view class="list-item" v-for="(item, index) in couponList" :key="index" @click="openCouponPro(item)">
<image style="width: 330rpx;height: 200rpx;" src="https://jiangxiaoxian.0rui.cn/fullCoupon.png"> <view >
</image> <image v-if="item.status == 1" style="width: 330rpx;height: 200rpx;" src="https://jiangxiaoxian.0rui.cn/fullCoupon.png">
<view class="item-text"> </image>
<view class="fs30 c3" style="margin: 0 auto;text-align: center;">{{item.name}}</view> <image v-else style="width: 330rpx;height: 200rpx;"
<view class="exchangeBtn"> src="https://jiangxiaoxian.0rui.cn/scoreNumCoupon.png"></image>
{{item.score}}积分兑换 <view class="item-text">
<view class="fs30 c3" style="margin: 0 auto;text-align: center;">{{item.name}}</view>
<view class="exchangeBtn">
{{item.score}}积分兑换
</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- 次数券 --> <!-- 次数券
<view class="exChangeBox" v-if="currentTab == 1"> <view class="exChangeBox">
<view class="couponsList"> <view class="couponsList">
<view class="list-item" v-for="(item, index) in couponList" :key="index" @click="openCouponPro(item)"> <view class="list-item" v-for="(item, index) in couponList" :key="index" @click="openCouponPro(item)">
<image style="width: 330rpx;height: 200rpx;" <image style="width: 330rpx;height: 200rpx;"
@ -54,9 +66,9 @@
</view> </view>
</view> </view>
</view> </view>-->
</scroll-view>
@ -85,6 +97,8 @@
</view> </view>
</scroll-view>
</s-layout> </s-layout>
</template> </template>
@ -146,10 +160,10 @@
const couponCount = ref(0) const couponCount = ref(0)
const homrS = ref(false) const homrS = ref(false)
async function getCouponList() { async function getCouponList() {
// status: listQuery.value.status,
const res = await sheep.$api.app.scoreShop.fullList({ const res = await sheep.$api.app.scoreShop.fullList({
page: listQuery.value.page, page: listQuery.value.page,
limit: listQuery.value.limit, limit: listQuery.value.limit,
status: listQuery.value.status,
order: 'normal' order: 'normal'
}); });
if (res.code === 1) { if (res.code === 1) {

2
pages/canteenRent/fabu.vue
View File

@ -72,7 +72,7 @@
style="margin-top: 20rpx;padding: 30rpx"> style="margin-top: 20rpx;padding: 30rpx">
<view class="row align-items" style=""> <view class="row align-items" style="">
<view class="label flex align-items" style="width: auto;"> <view class="label flex align-items" style="width: auto;">
详细信息 餐厅信息
</view> </view>
<view style="margin-top: 20rpx;height: 120rpx;margin-bottom: 30rpx;"> <view style="margin-top: 20rpx;height: 120rpx;margin-bottom: 30rpx;">
<textarea v-model="form.content" style="height: 120rpx;width: 100%;" maxlength="400" <textarea v-model="form.content" style="height: 120rpx;width: 100%;" maxlength="400"

2
pages/canteenRent/rentEdit.vue
View File

@ -70,7 +70,7 @@
style="margin-top: 20rpx;padding: 30rpx;"> style="margin-top: 20rpx;padding: 30rpx;">
<view class="row align-items" style=""> <view class="row align-items" style="">
<view class="label flex align-items" style="width: auto;"> <view class="label flex align-items" style="width: auto;">
详细信息 餐厅信息
</view> </view>
<view style="margin-top: 20rpx;height: 120rpx;margin-bottom: 30rpx;"> <view style="margin-top: 20rpx;height: 120rpx;margin-bottom: 30rpx;">
<textarea v-model="form.content" style="height: 120rpx;width: 100%;" maxlength="400" <textarea v-model="form.content" style="height: 120rpx;width: 100%;" maxlength="400"

2
pages/canteenRent/rentList.vue
View File

@ -17,7 +17,7 @@
<view class="locTop-left-left" @click="state.showRegion = true"> <view class="locTop-left-left" @click="state.showRegion = true">
<view @click="state.showRegion = true" <view @click="state.showRegion = true"
style="font-size: 28rpx;font-weight: 400;line-height: 32rpx;color: #999999;max-width: 140rpx;"> style="font-size: 28rpx;font-weight: 400;line-height: 32rpx;color: #999999;max-width: 140rpx;">
{{state.model.city_name ? state.model.city_name:'全国' }} {{state.model.city_name ? state.model.city_name:'全部地区' }}
</view> </view>
<image @click="state.showRegion = true" <image @click="state.showRegion = true"
style="width: 27rpx;height: 27rpx;margin-left: 10rpx;" style="width: 27rpx;height: 27rpx;margin-left: 10rpx;"

32
pages/goods/components/detail/detail-navbar.vue
View File

@ -62,11 +62,11 @@
value: 'goods', value: 'goods',
to: 'detail-swiper-selector', to: 'detail-swiper-selector',
}, },
{ // {
label: '评价', // label: '评价',
value: 'comment', // value: 'comment',
to: 'detail-comment-selector', // to: 'detail-comment-selector',
}, // },
{ {
label: '详情', label: '详情',
value: 'detail', value: 'detail',
@ -150,30 +150,34 @@
.icon-box { .icon-box {
box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12); box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
border-radius: 30rpx; border-radius: 30rpx;
width: 134rpx; width: 150rpx;
height: 56rpx; height: 64rpx;
// width: 134rpx;
// height: 56rpx;
margin-left: 8rpx; margin-left: 8rpx;
border: 1px solid rgba(#fff, 0.4); border: 1px solid rgba(#fff, 0.4);
.line { .line {
width: 2rpx; width: 3rpx;
height: 24rpx; height: 30rpx;
background: #e5e5e7; // height: 24rpx;
// background: #e5e5e7;
background-color: #000;
} }
.sicon-back { .sicon-back {
font-size: 32rpx; font-size: 36rpx;
color: #000; color: #000;
} }
.sicon-home { .sicon-home {
font-size: 32rpx; font-size: 36rpx;
color: #000; color: #000;
} }
.sicon-more { .sicon-more {
font-size: 32rpx; font-size: 36rpx;
color: #000; color: #000;
} }
.icon-button { .icon-button {
width: 67rpx; width: 67rpx;
height: 56rpx; height: 56rpx;s
&-left:hover { &-left:hover {
background: rgba(0, 0, 0, 0.16); background: rgba(0, 0, 0, 0.16);
border-radius: 30rpx 0px 0px 30rpx; border-radius: 30rpx 0px 0px 30rpx;

10
pages/goods/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view> <view>
<s-layout :onShareAppMessage="shareInfo" navbar="goods"> <s-layout :onShareAppMessage="shareInfo" navbar="goods">
<!-- 标题栏 --> <!-- 标题栏 -->
<detailNavbar /> <detailNavbar />
<!-- 骨架屏 --> <!-- 骨架屏 -->
@ -68,6 +68,8 @@
<!-- 详情 --> <!-- 详情 -->
<detail-content-card class="detail-content-selector" :content="state.goodsInfo.content" /> <detail-content-card class="detail-content-selector" :content="state.goodsInfo.content" />
<view style="width: 100%;height: 100rpx;"></view>
<!-- 活动跳转 --> <!-- 活动跳转 -->
<detail-activity-tip v-if="state.goodsInfo.activities" :data="state.goodsInfo"></detail-activity-tip> <detail-activity-tip v-if="state.goodsInfo.activities" :data="state.goodsInfo"></detail-activity-tip>
@ -332,7 +334,8 @@
// 购买 // 购买
.buy-box { .buy-box {
.add-btn { .add-btn {
width: 214rpx; // width: 214rpx;
width: 312rpx;
height: 72rpx; height: 72rpx;
font-weight: 500; font-weight: 500;
font-size: 28rpx; font-size: 28rpx;
@ -342,7 +345,8 @@
} }
.buy-btn { .buy-btn {
width: 214rpx; // width: 214rpx;
width: 312rpx;
height: 72rpx; height: 72rpx;
font-weight: 500; font-weight: 500;
font-size: 28rpx; font-size: 28rpx;

10
pages/index/index.vue
View File

@ -3,8 +3,8 @@
<s-layout title="首页" navbar="custom" tabbar="/pages/index/index" :bgStyle="template.style?.background" <s-layout title="首页" navbar="custom" tabbar="/pages/index/index" :bgStyle="template.style?.background"
:navbarStyle="template.style?.navbar" onShareAppMessage :showFloatButton="true" bgColor="#fcc74e"> :navbarStyle="template.style?.navbar" onShareAppMessage :showFloatButton="true" bgColor="#fcc74e">
<scroll-view @scrolltolower="onScrolltolower" :refresher-enabled="true" :refresher-triggered="homrS" <scroll-view @scrolltolower="onScrolltolower" :refresher-enabled="true" :refresher-triggered="homrS"
@refresherrefresh="onS" scroll-y="true" class="scrollBox align-items" @refresherrefresh="onS" scroll-y="true" class="scrollBox align-items"
style="height: 1080rpx;box-sizing: border-box;"> style="height: 84vh;box-sizing: border-box;">
<view class="container"> <view class="container">
<!-- 顶部 --> <!-- 顶部 -->
<view class="top"> <view class="top">
@ -77,7 +77,7 @@
</view> </view>
<view class="cityBox" @click="state.showRegion = true"> <view class="cityBox" @click="state.showRegion = true">
<view style="margin-right: 10rpx;font-size: 30rpx;font-weight: 800;line-height: 45rpx; <view style="margin-right: 10rpx;font-size: 30rpx;font-weight: 800;line-height: 45rpx;
white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"> white-space: nowrap;overflow: hidden;text-overflow: ellipsis;color: #999999;">
{{ state.model.city_name ? state.model.city_name : '地区筛选'}} {{ state.model.city_name ? state.model.city_name : '地区筛选'}}
</view> </view>
<image style="width: 25rpx;height: 13rpx;" <image style="width: 25rpx;height: 13rpx;"
@ -139,7 +139,7 @@
</view> </view>
</view> </view>
<view class="viewCan" style="width: 100%;height: 200rpx;"></view> <view class="viewCan" style="width: 100%;height: 300rpx;"></view>
</view> </view>
</scroll-view> </scroll-view>
@ -565,7 +565,7 @@
height: 520rpx; height: 520rpx;
background-image: url('https://jiangxiaoxian.0rui.cn/topBack.png'); background-image: url('https://jiangxiaoxian.0rui.cn/topBack.png');
background-size: 100%; background-size: 100%;
padding: 30rpx 30rpx 30rpx 30rpx; padding: 30rpx;
display: grid; display: grid;
.locTop { .locTop {

2
pages/user/myRelease/list.vue
View File

@ -225,7 +225,7 @@
const res = await sheep.$api.rent.rentlist({ const res = await sheep.$api.rent.rentlist({
page: listQuery.value.page, page: listQuery.value.page,
limit: listQuery.value.limit, limit: listQuery.value.limit,
order: 'normal', order: 'new',
status: listQuery.value.status, status: listQuery.value.status,
my: 1, my: 1,
}); });

23
sheep/components/s-custom-navbar/s-custom-navbar.vue
View File

@ -161,24 +161,31 @@
box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08),
0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12); 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
border-radius: 30rpx; border-radius: 30rpx;
width: 134rpx; width: 150rpx;
height: 56rpx; height: 64rpx;
// width: 134rpx;
// height: 56rpx;
margin-left: 8rpx; margin-left: 8rpx;
.line { .line {
width: 2rpx; width: 4rpx;
height: 24rpx; height: 30rpx;
background: #e5e5e7; // height: 24rpx;
// background: #e5e5e7;
background-color: #000;
} }
.sicon-back { .sicon-back {
font-size: 32rpx; // font-size: 32rpx;
font-size: 36rpx;
color: #000; color: #000;
} }
.sicon-home { .sicon-home {
font-size: 32rpx; // font-size: 32rpx;
font-size: 36rpx;
color: #000; color: #000;
} }
.sicon-more { .sicon-more {
font-size: 32rpx; // font-size: 32rpx;
font-size: 36rpx;
color: #000; color: #000;
} }
.icon-button { .icon-button {

25
sheep/ui/su-navbar/su-navbar.vue
View File

@ -186,7 +186,7 @@
}, },
leftWidth: { leftWidth: {
type: [Number, String], type: [Number, String],
default: 80, default: 86,
}, },
rightWidth: { rightWidth: {
type: [Number, String], type: [Number, String],
@ -285,25 +285,31 @@
background: #ffffff; background: #ffffff;
box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12); box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
border-radius: 30rpx; border-radius: 30rpx;
// width: 150rpx;
height: 64rpx;
width: 134rpx; width: 134rpx;
height: 56rpx; // height: 56rpx;
margin-left: 8rpx; margin-left: 8rpx;
.line { .line {
width: 2rpx; width: 4rpx;
height: 24rpx; height: 30rpx;
// background: #e5e5e7; // height: 24rpx;
background: #3d3d3d; // background: #e5e5e7;
background: #000;
} }
.sicon-back { .sicon-back {
font-size: 32rpx; // font-size: 32rpx;
font-size: 36rpx;
color: #000; color: #000;
} }
.sicon-home { .sicon-home {
font-size: 32rpx; // font-size: 32rpx;
font-size: 34rpx;
color: #000; color: #000;
} }
.sicon-more { .sicon-more {
font-size: 32rpx; // font-size: 32rpx;
font-size: 34rpx;
color: #000; color: #000;
} }
.icon-button { .icon-button {
@ -401,6 +407,7 @@
/* #endif */ /* #endif */
width: 120rpx; width: 120rpx;
justify-content: flex-start; justify-content: flex-start;
// justify-content: center;
align-items: center; align-items: center;
} }