wk450097098
/
mrr.sj.front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mrr_sj_develop_丁杰_20260413_pricer' of https://gitee.com/qtvbidt/mrr.sj.front into mrr_sj_develop_丁杰_20260413_pricer

This commit is contained in:
BAKEYi 2026-04-21 19:06:54 +08:00
parent 211b33f63f e500cb9e71
commit d25533df33
5 changed files with 58 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
pages/shop/photoAlbum/photoManage.vue
View File

@ -5,7 +5,7 @@
<view class="container-titles flex-row-center-between">
<view class="titles-left">
<view class="titles-bar"></view>
<text class="titles-title">我的资料</text>
<text class="titles-title">{{ titleList[type].title2 }}</text>
</view>
<view class="titles-right" @click="todetail">
<text class="titles-text">展示位置及拍摄技巧</text>
@ -112,6 +112,16 @@
}
],
},
titleList: {
1: {
title: "商家图片",
title2: "商家相册"
},
2: {
title: "视频作品",
title2: "商家视频"
},
},
imgVideoList: {
},
@ -179,25 +189,28 @@
// });
},
goAdd(id, item) {
if (this.type == 1) {
if (this.imgVideoList[id] && this.imgVideoList[id].length >= 21) {
uni.showToast({
title: '最多上传20张图片',
icon: 'none',
duration: 2000
});
return
}
} else if (this.type == 2) {
if (this.imgVideoList[id] && this.imgVideoList[id].length >= 10) {
uni.showToast({
title: '最多上个10张视频',
icon: 'none',
duration: 2000
});
return
if (!item) {
if (this.type == 1) {
if (this.imgVideoList[id] && this.imgVideoList[id].length >= 20) {
uni.showToast({
title: '最多上传20张图片',
icon: 'none',
duration: 2000
});
return
}
} else if (this.type == 2) {
if (this.imgVideoList[id] && this.imgVideoList[id].length >= 10) {
uni.showToast({
title: '最多上个10张视频',
icon: 'none',
duration: 2000
});
return
}
}
}
// 1. 原有逻辑：分类id为空，拦截提示
if (!id) {
uni.showToast({

37
pages/shop/photoAlbum/videoList.vue
View File

@ -171,25 +171,28 @@
},
goAdd(id, item) {
if (this.isManage) return; // 管理模式下禁止跳转
if (this.type == 1) {
if (this.imgVideoList.length >= 20) {
uni.showToast({
title: '最多上传20张图片',
icon: 'none',
duration: 2000
});
return
}
} else if (this.type == 2) {
if (this.imgVideoList.length >= 10) {
uni.showToast({
title: '最多上10个视频',
icon: 'none',
duration: 2000
});
return
if(!item){
if (this.type == 1) {
if (this.imgVideoList.length >= 20) {
uni.showToast({
title: '最多上传20张图片',
icon: 'none',
duration: 2000
});
return
}
} else if (this.type == 2) {
if (this.imgVideoList.length >= 10) {
uni.showToast({
title: '最多上10个视频',
icon: 'none',
duration: 2000
});
return
}
}
}
if (!id) {
uni.showToast({
title: '参数异常，无法上传',

6
pages/shop/staff/addStaff.vue
View File

@ -12,7 +12,7 @@
<searchBox placeholder="请输入员工手机号" class="searchBox" v-model="queryData.phone" bgClor="transparent" @confirm="search"
@search="search">
</searchBox>
<scroll-view :style="{ height:`calc(100vh - ${statusBarHeight + 200}rpx)`} ">
<scroll-view scroll-y :style="{ height:`calc(100vh - ${statusBarHeight + 200}rpx)`} ">
<view class="page-container" v-if="sryDetail && sryDetail.id">
<!-- 个人信息栏 -->
<view class="user-info">
@ -72,11 +72,13 @@
<text>，再进行添加操作。</text>
</view>
</view>
<view class="" style="height: 200rpx;"></view>
<view class="agreement-footer" @click="sjinvitesyr" v-if="sryDetail && sryDetail.id && sryDetail.bind_state!=1">
<view class="agreement-btn">邀请员工</view>
</view>
<!-- <view class="" style="height: 98rpx;background-color: aquamarine;"></view> -->
</scroll-view>
</view>
</template>

1
pages/shop/staff/serviceList.vue
View File

@ -142,6 +142,7 @@
background-color: #fff;
margin: 20rpx 20rpx 26rpx 20rpx;
border-radius: 10rpx;
padding-bottom: 150rpx;
.service-item {
padding-top: 20rpx;

4
utils/request.js
View File

@ -134,12 +134,12 @@ const request = async (options, isUpdate) => {
if (process.env.NODE_ENV === 'development') {
baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
//baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。
//baseURL = 'http://60.247.146.5:96'; // 发布到生产环境时，此处代码会被摇树移除掉。
//baseURL = 'https://app.mrrweb.com.cn';
} else {
baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
//baseURL = url; // 发布到生产环境时，此处代码会被摇树移除掉。
baseURL = 'http://60.247.146.5:93'; // 发布到生产环境时，此处代码会被摇树移除掉。
//baseURL = 'http://60.247.146.5:96'; // 发布到生产环境时，此处代码会被摇树移除掉。
//baseURL = 'https://app.mrrweb.com.cn';