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-29 16:06:36 +08:00
parent 46e0975e89 83b1a6f1a6
commit 7399719cdf
5 changed files with 2587 additions and 2515 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifest.json
View File

@ -10,13 +10,13 @@
"usingComponents" : true,
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
"screenOrientation" : [
//可选，字符串数组类型，应用支持的横竖屏
"portrait-primary", //可选，字符串类型，支持竖屏
"portrait-secondary", //可选，字符串类型，支持反向竖屏
"landscape-primary", //可选，字符串类型，支持横屏
"landscape-secondary" //可选，字符串类型，支持反向横屏
],
"screenOrientation" : [
//可选，字符串数组类型，应用支持的横竖屏
"portrait-primary", //可选，字符串类型，支持竖屏
"portrait-secondary", //可选，字符串类型，支持反向竖屏
"landscape-primary", //可选，字符串类型，支持横屏
"landscape-secondary" //可选，字符串类型，支持反向横屏
],
"compatible" : {
"ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
},
@ -76,6 +76,7 @@
},
/* ios打包配置 */
"ios" : {
"UIRequiresFullScreen" : false, // 允许非全屏模式
"urlschemewhitelist" : [ "iosmap" ],
"dSYMs" : false,
"plistcmds" : [

11
pages.json
View File

@ -599,6 +599,8 @@
{
"path": "pages/shop/photoAlbum/videoplayer",
"style": {
"navigationBarTitleText": "全屏视频播放",
"pageOrientation": "auto",
"navigationStyle": "custom"
}
},
@ -969,10 +971,11 @@
"selectedIconPath": "/static/images/tabbar/home_icon_active.png",
"pagePath": "pages/home/home"
},
{ "iconPath": "/static/images/tabbar/new_message_gray.png",
"text": "消息",
"selectedIconPath": "/static/images/tabbar/new_message.png",
"pagePath": "pages/message/message"
{
"iconPath": "/static/images/tabbar/new_message_gray.png",
"text": "消息",
"selectedIconPath": "/static/images/tabbar/new_message.png",
"pagePath": "pages/message/message"
},
{
"iconPath": "/static/images/tabbar/my_icon_dis.png",

5064
pages/address/search.vue
View File

File diff suppressed because it is too large Load Diff

8
pages/shop/add-service.vue
View File

@ -134,9 +134,9 @@
</view>
<view class="detail-row">
<text class="form-label required">服务功效</text>
<text class="form-label required">服务内容</text>
<view class="detail-textarea-wrap">
<textarea class="detail-textarea" v-model="detailForm.effect" placeholder="请输入服务功效"
<textarea class="detail-textarea" v-model="detailForm.effect" placeholder="请输入服务内容"
placeholder-class="placeholder" maxlength="200"></textarea>
<text class="detail-count">{{(detailForm.effect || '').length}}/200</text>
</view>
@ -442,7 +442,7 @@
// 如果新字段都为空，则尝试从旧的 detail 数组中提取（兼容旧数据）
if (!this.formData.efficacy && !this.formData.crowd && !this.formData.product) {
(detail || []).forEach((item) => {
if (item.title === "服务功效") {
if (item.title === "服务内容" || item.title === "服务功效") {
this.detailForm.effect = item.text || "";
} else if (item.title === "适用人群") {
this.detailForm.crowd = item.text || "";
@ -475,7 +475,7 @@
checkDetailForm() {
if (!this.detailForm.effect || !this.detailForm.effect.trim()) {
uni.showToast({
title: "请输入服务功效",
title: "请输入服务内容",
icon: "none",
});
return false;

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

@ -166,8 +166,8 @@
obj.name = item.name || item.auth_name
}
if (item.id == 0) {
obj.url = item.url
obj.name = item.name
obj.url = item.url || item.auth_url
obj.name = item.name || item.name
}
if (item.type == 2) {
obj.url = obj.url + `?x-oss-process=video/snapshot,t_1000,m_fast,f_jpg,w_600,ar_auto`