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

Compare commits

base: wangzimeng:485e45e1231c549474a2a1e3ae9950605751a2fc
Branches Tags
wangzimeng:main
wangzimeng:wzm-registerScore
wangzimeng:2025-08-11中团内部测试版，上线的第一版内容
..
compare: wangzimeng:e96d67023b1888e423af418341f1fa8f40de18f6
Branches Tags
wangzimeng:main
wangzimeng:wzm-registerScore
wangzimeng:2025-08-11中团内部测试版，上线的第一版内容

No commits in common. "485e45e1231c549474a2a1e3ae9950605751a2fc" and "e96d67023b1888e423af418341f1fa8f40de18f6" have entirely different histories.
485e45e123 ... e96d67023b

9 changed files with 31 additions and 38 deletions
Show Stats Expand all files Collapse all files

2
packageA/search/index.vue
View File

@ -36,7 +36,7 @@
<image v-if="item.recommend == 1" <image v-if="item.recommend == 1"
style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;" style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;"
src="https://jiangxiaoxian.0rui.cn/hot.png"></image> src="https://jiangxiaoxian.0rui.cn/hot.png"></image>
<image class="iamges-mainImg" :src="item.images[0]" mode="aspectFill"></image> <image class="iamges-mainImg" :src="item.images[0]"></image>
</view> </view>
<!-- 右侧内容 --> <!-- 右侧内容 -->
<view class="listItem-contents"> <view class="listItem-contents">

11
pages/canteenRent/rentDetail.vue
View File

@ -5,12 +5,12 @@
<view class="swiper-box"> <view class="swiper-box">
<view class="swiper_s"> <view class="swiper_s">
<swiper class="swiper_s" :circular="true" :autoplay="true" :indicator-dots="false" :current="currentImgIndex" <swiper class="swiper_s" :circular="true" :autoplay="true" :indicator-dots="false" :current="currentImgIndex"
@change="swiperChange" @animationfinish="animationfinish"> @change="swiperChange" :duration="2000" @animationfinish="animationfinish">
<!-- v-for="(item, index) in swiperList" :key="index" @click="openSwiper(item)"--> <!-- v-for="(item, index) in swiperList" :key="index" @click="openSwiper(item)"-->
<swiper-item style="margin: 0 auto;" v-for="(item,index) in imageList" :key="index"> <swiper-item style="margin: 0 auto;" v-for="(item,index) in imageList" :key="index">
<view style="position: relative;width: 100%;height: 100%;" <view style="position: relative;width: 100%;height: 100%;"
> >
<image class="swiper-image" :src="item" mode="widthFix"/> <image class="swiper-image" :src="item" />
</view> </view>
</swiper-item> </swiper-item>
@ -449,14 +449,15 @@
.swiper-box { .swiper-box {
width: 100%; width: 100%;
// padding: 0 30rpx;
// display: grid;
// justify-content: center;
height: 750rpx; height: 750rpx;
// height: auto;
position: relative; position: relative;
.swiper_s { .swiper_s {
width: 100%; width: 100%;
height: 750rpx; height: 100%;
// height: 100%;
// display: grid; // display: grid;
// justify-content: center; // justify-content: center;

7
pages/canteenRent/rentList.vue
View File

@ -59,7 +59,7 @@
<image v-if="item.recommend != 1" <image v-if="item.recommend != 1"
style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;" style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;"
src=""></image> src=""></image>
<image class="iamges-mainImg" :src="item.images[0]" mode="aspectFill"></image> <image class="iamges-mainImg" :src="item.images[0]"></image>
</view> </view>
<!-- 右侧内容 --> <!-- 右侧内容 -->
<view class="listItem-contents"> <view class="listItem-contents">
@ -190,7 +190,6 @@
console.log('onRegionConfirm33', state.model, proCity.value); console.log('onRegionConfirm33', state.model, proCity.value);
listQuery.value.province = state.model.province_id listQuery.value.province = state.model.province_id
listQuery.value.city = state.model.city_id listQuery.value.city = state.model.city_id
rentList.value = []
getList() getList()
state.showRegion = false; state.showRegion = false;
}; };
@ -222,7 +221,6 @@
listQuery.value.cate_ids = tagList.value[e.detail.value].id; listQuery.value.cate_ids = tagList.value[e.detail.value].id;
dictLabel.value = tagList.value[e.detail.value].name; dictLabel.value = tagList.value[e.detail.value].name;
console.log('标签', listQuery.value); console.log('标签', listQuery.value);
rentList.value = []
getList(listQuery.value); getList(listQuery.value);
} }
@ -274,7 +272,7 @@
} }
//加载更多 //加载更多
function onScrolltolower() { function onScrolltolower() {
if (rentList.value.length < rentCount.value) { if (rentList.value.length < classCount.value) {
listQuery.value.page += 1; listQuery.value.page += 1;
getList(); getList();
} }
@ -472,7 +470,6 @@
right: 0rpx; right: 0rpx;
bottom: 18rpx; bottom: 18rpx;
z-index: 1; z-index: 1;
border-radius: 12rpx;
} }
} }

1
pages/index/fabu.vue
View File

@ -82,7 +82,6 @@
<!-- 图片 --> <!-- 图片 -->
<s-uploader v-model:url="state.formData.images" fileMediatype="image" limit="9" mode="grid" <s-uploader v-model:url="state.formData.images" fileMediatype="image" limit="9" mode="grid"
:imageStyles="{ width: '168rpx', height: '168rpx'}"></s-uploader> :imageStyles="{ width: '168rpx', height: '168rpx'}"></s-uploader>
<view style="color: red;margin-top: 10rpx;font-size: 24rpx;">请上传尺寸大小为390*390的图片</view>
</view> </view>
<span class="line-row" style="margin: 30rpx 0;"></span> <span class="line-row" style="margin: 30rpx 0;"></span>

4
pages/index/index.vue
View File

@ -90,7 +90,7 @@
<image v-if="item.recommend == 1" <image v-if="item.recommend == 1"
style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;" style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;"
src="https://jiangxiaoxian.0rui.cn/hot.png"></image> src="https://jiangxiaoxian.0rui.cn/hot.png"></image>
<image class="iamges-mainImg" :src="item.images[0]" mode="aspectFill"></image> <image class="iamges-mainImg" :src="item.images[0]"></image>
</view> </view>
<!-- 右侧内容 --> <!-- 右侧内容 -->
<view class="listItem-contents"> <view class="listItem-contents">
@ -619,7 +619,7 @@
right: 0rpx; right: 0rpx;
bottom: 18rpx; bottom: 18rpx;
z-index: 1; z-index: 1;
border-radius: 12rpx;
} }
} }

2
pages/school/schoolIndex.vue
View File

@ -207,7 +207,7 @@
background-size: 100%; background-size: 100%;
padding: 30rpx; padding: 30rpx;
display: grid; display: grid;
// margin-bottom: 30rpx; margin-bottom: 30rpx;
.locTop { .locTop {
width: 96%; width: 96%;

32
pages/user/goods-collect.vue
View File

@ -20,10 +20,7 @@
<image v-if="item.recommend == 1" <image v-if="item.recommend == 1"
style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;" style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;"
src="https://jiangxiaoxian.0rui.cn/hot.png"></image> src="https://jiangxiaoxian.0rui.cn/hot.png"></image>
<image v-if="item.recommend != 1" <image class="iamges-mainImg" :src="item.images[0]"></image>
style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;"
src=""></image>
<image class="iamges-mainImg" :src="item.images[0]" mode="aspectFill"></image>
</view> </view>
<!-- 右侧内容 --> <!-- 右侧内容 -->
<view class="listItem-contents"> <view class="listItem-contents">
@ -74,8 +71,7 @@
<view class="exchangeBtn" v-if="item.is_collect == 1" @click="classCollect(item,index)"> <view class="exchangeBtn" v-if="item.is_collect == 1" @click="classCollect(item,index)">
取消收藏 取消收藏
</view> </view>
<view class="exchangeBtn1" v-if="item.is_collect == 0" <view class="exchangeBtn1" v-if="item.is_collect == 0" @click="classCollect(item,index)">
@click="classCollect(item,index)">
收藏 收藏
</view> </view>
</view> </view>
@ -305,9 +301,9 @@
}) })
} }
} }
//课程收藏 //课程收藏
function classCollect(item, index) { function classCollect(item,index) {
console.log('收藏', item.is_collect); console.log('收藏', item.is_collect);
if (item.is_collect == 1) { if (item.is_collect == 1) {
collectSchoolList.value[index].is_collect = 0 collectSchoolList.value[index].is_collect = 0
@ -316,10 +312,10 @@
is_collect: item.is_collect is_collect: item.is_collect
} }
sheep.$api.school.classesCollect(data).then((res) => { sheep.$api.school.classesCollect(data).then((res) => {
if (res.code == 1) { if(res.code == 1) {
uni.showToast({ uni.showToast({
title: '已取消收藏', title:'已取消收藏',
icon: 'none', icon:'none',
duration: 2000, duration: 2000,
}) })
} }
@ -331,10 +327,10 @@
is_collect: item.is_collect is_collect: item.is_collect
} }
sheep.$api.school.classesCollect(data1).then((res) => { sheep.$api.school.classesCollect(data1).then((res) => {
if (res.code == 1) { if(res.code == 1) {
uni.showToast({ uni.showToast({
title: '已收藏', title:'已收藏',
icon: 'none', icon:'none',
duration: 2000, duration: 2000,
}) })
} }
@ -413,9 +409,9 @@
height: 190rpx; height: 190rpx;
position: relative; position: relative;
right: 0rpx; right: 0rpx;
bottom: 18rpx; bottom: 0rpx;
z-index: 1; z-index: 1;
border-radius: 12rpx;
} }
} }
@ -546,7 +542,7 @@
line-height: 30rpx; line-height: 30rpx;
font-weight: 400; font-weight: 400;
} }
.exchangeBtn1 { .exchangeBtn1 {
margin-top: 30rpx; margin-top: 30rpx;
background-color: #fcc74e; background-color: #fcc74e;
@ -562,7 +558,7 @@
line-height: 30rpx; line-height: 30rpx;
font-weight: 400; font-weight: 400;
} }
} }
} }

4
pages/user/goods-log.vue
View File

@ -17,7 +17,7 @@
<image v-if="e.information.recommend != 1" <image v-if="e.information.recommend != 1"
style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;" style="width: 77rpx;height: 36rpx;z-index: 100;position: relative;top: 34rpx;left: 0rpx;"
src=""></image> src=""></image>
<image class="iamges-mainImg" :src="e.information.images[0]" mode="aspectFill"></image> <image class="iamges-mainImg" :src="e.information.images[0]"></image>
</view> </view>
<!-- 右侧内容 --> <!-- 右侧内容 -->
<view class="listItem-contents"> <view class="listItem-contents">
@ -294,7 +294,7 @@
right: 0rpx; right: 0rpx;
bottom: 18rpx; bottom: 18rpx;
z-index: 1; z-index: 1;
border-radius: 12rpx;
} }
} }

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

@ -17,7 +17,7 @@
<view class="reItemCon"> <view class="reItemCon">
<!-- 左侧图片 --> <!-- 左侧图片 -->
<view class="listItem-images"> <view class="listItem-images">
<image class="iamges-mainImg" :src="item.images[0]" mode="aspectFill"></image> <image class="iamges-mainImg" :src="item.images[0]" mode=""></image>
</view> </view>
<!-- 右侧内容 --> <!-- 右侧内容 -->
<view class="listItem-contents"> <view class="listItem-contents">
@ -65,7 +65,7 @@
<image v-if="item.status == 0" <image v-if="item.status == 0"
style="width: 151rpx;height: 210rpx;z-index: 100;position: relative;top: 78rpx;right: 15rpx;" style="width: 151rpx;height: 210rpx;z-index: 100;position: relative;top: 78rpx;right: 15rpx;"
src="https://jiangxiaoxian.0rui.cn/releasePanding.png"></image> src="https://jiangxiaoxian.0rui.cn/releasePanding.png"></image>
<image class="iamges-mainImg" :src="item.images[0]" mode="aspectFill"></image> <image class="iamges-mainImg" :src="item.images[0]" mode=""></image>
</view> </view>
<!-- 右侧内容 --> <!-- 右侧内容 -->
<view class="listItem-contents"> <view class="listItem-contents">
@ -115,7 +115,7 @@
<image v-if="item.status == 2" <image v-if="item.status == 2"
style="width: 151rpx;height: 210rpx;z-index: 100;position: relative;top: 78rpx;right: 15rpx;" style="width: 151rpx;height: 210rpx;z-index: 100;position: relative;top: 78rpx;right: 15rpx;"
src="https://jiangxiaoxian.0rui.cn/releaseFail.png"></image> src="https://jiangxiaoxian.0rui.cn/releaseFail.png"></image>
<image class="iamges-mainImg" :src="item.images[0]" mode="aspectFill"></image> <image class="iamges-mainImg" :src="item.images[0]"></image>
</view> </view>
<!-- 右侧内容 --> <!-- 右侧内容 -->
<view class="listItem-contents"> <view class="listItem-contents">