From d82bbf1584f5ff51bf543309a9b22cfd5cd33023 Mon Sep 17 00:00:00 2001
From: Double-_-Z <2492419643@qq.com>
Date: Fri, 7 Feb 2025 21:28:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E7=80=91=E5=B8=83=E6=B5=81=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/config.service.js                  |  8 ++--
 manifest.json                             | 36 ++++++++-------
 pages/mobile_web/my/child_pages/login.vue |  5 +++
 pages/mobile_web/recharge/detail.vue      |  8 +++-
 pages/mobile_web/wall/detail.vue          | 39 ++++++++++++++--
 pages/mobile_web/work/work.vue            | 55 +++++++++++++++++++----
 6 files changed, 118 insertions(+), 33 deletions(-)

diff --git a/common/config.service.js b/common/config.service.js
index f1b8285..c26c834 100644
--- a/common/config.service.js
+++ b/common/config.service.js
@@ -4,12 +4,12 @@
 let BASE_URL = '/pixelApi';
 // #endif
 // #ifdef APP-PLUS ||MP
-let BASE_URL = 'http://8.138.171.103/pixelApi';// 测试环境
-// let BASE_URL = 'https://www.ylemai.cn/pixelApi';// 正式环境
+// let BASE_URL = 'http://8.138.171.103/pixelApi';// 测试环境
+let BASE_URL = 'https://www.ylemai.cn/pixelApi';// 正式环境
 // #endif
 
-let IP = 'http://8.138.171.103/';// 测试环境
-// let IP = 'https://www.ylemai.cn/';// 正式环境
+// let IP = 'http://8.138.171.103/';// 测试环境
+let IP = 'https://www.ylemai.cn/';// 正式环境
 let FILE_URL = IP+'static/';
 // 阿里OSS地址
 let ALIOSS_URL = 'http://guojunjie.oss-cn-hangzhou.aliyuncs.com';
diff --git a/manifest.json b/manifest.json
index 21f8406..f6c3edb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -136,6 +136,7 @@
             "proxy" : {
                 "/pixelApi" : {
                     "target" : "http://8.138.171.103/pixelApi", // 测试环境
+
                     // "target" : "https://www.ylemai.cn/pixelApi",// 正式环境
                     "changeOrigin" : true,
                     "secure" : true,
@@ -146,20 +147,23 @@
                 },
                 "/upload" : {
                     "target" : "http://8.138.171.103", // 测试环境
+
+                    // "target" : "https://www.ylemai.cn",// 正式环境
+                    "changeOrigin" : true,
+                    "secure" : true,
+                    "ws" : false
+                },
+                "/static" : {
+                    "target" : "http://8.138.171.103", // 测试环境
+
                     // "target" : "https://www.ylemai.cn",// 正式环境
                     "changeOrigin" : true,
                     "secure" : true,
                     "ws" : false
                 },
-				"/static" : {
-				    "target" : "http://8.138.171.103", // 测试环境
-				    // "target" : "https://www.ylemai.cn",// 正式环境
-				    "changeOrigin" : true,
-				    "secure" : true,
-				    "ws" : false
-				},
                 "/aiupload" : {
                     "target" : "http://8.138.171.103/upload", // 测试环境
+
                     // "target" : "https://www.ylemai.cn/upload",// 正式环境
                     "changeOrigin" : true,
                     "secure" : true,
@@ -187,15 +191,15 @@
                         "^/otherOssUpload/" : ""
                     }
                 },
-				"/anotherOssUpload" : {
-				    "target" : "http://pixel-ai-file.oss-cn-guangzhou.aliyuncs.com",
-				    "changeOrigin" : true,
-				    "secure" : true,
-				    "ws" : false,
-				    "pathRewrite" : {
-				        "^/anotherOssUpload/" : ""
-				    }
-				},
+                "/anotherOssUpload" : {
+                    "target" : "http://pixel-ai-file.oss-cn-guangzhou.aliyuncs.com",
+                    "changeOrigin" : true,
+                    "secure" : true,
+                    "ws" : false,
+                    "pathRewrite" : {
+                        "^/anotherOssUpload/" : ""
+                    }
+                },
                 "/asyncOssUpload" : {
                     "target" : "https://dashscope-result-bj.oss-cn-beijing.aliyuncs.com",
                     "changeOrigin" : true,
diff --git a/pages/mobile_web/my/child_pages/login.vue b/pages/mobile_web/my/child_pages/login.vue
index 2e91de8..9412aa6 100644
--- a/pages/mobile_web/my/child_pages/login.vue
+++ b/pages/mobile_web/my/child_pages/login.vue
@@ -75,6 +75,11 @@
 <script>
 	import configService from '@/common/config.service.js';
 	export default {
+		// #ifdef MP
+		options: {
+			styleIsolation: 'shared'
+		},
+		// #endif
 		data(){
 			return{
 				// #ifdef MP
diff --git a/pages/mobile_web/recharge/detail.vue b/pages/mobile_web/recharge/detail.vue
index 44daa1f..af87cfc 100644
--- a/pages/mobile_web/recharge/detail.vue
+++ b/pages/mobile_web/recharge/detail.vue
@@ -281,7 +281,11 @@ export default {
 		},
 		// 支付
 		async payClick() {
-			// #ifndef APP
+			// #ifdef APP || MP
+			this.$refs.uToast.show({type:'warning',title: "暂未开通小程序和APP端的支付方式，请使用外部浏览器进行充值"});
+			return;
+			// #endif
+			// #ifndef APP || MP
 			if(this.isMpWeb()) return;
 			// #endif
 			
@@ -317,7 +321,7 @@ export default {
 				this.payLoading = false;
 			}
 		},
-		// #ifndef APP
+		// #ifndef APP || MP
 		// 判断是否在微信内置浏览器打开
 		isMpWeb(){
 			if(navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == 'micromessenger'){
diff --git a/pages/mobile_web/wall/detail.vue b/pages/mobile_web/wall/detail.vue
index db5d04e..4f19cf9 100644
--- a/pages/mobile_web/wall/detail.vue
+++ b/pages/mobile_web/wall/detail.vue
@@ -295,14 +295,25 @@ export default {
 				if(this.touchNum == 1){
 					if(item.mask){
 						// 添加淡出的class样式
+						// #ifdef MP
+						this.$refs.uWaterfall.modify(item.id, 'display', 1);
+						// #endif
+						// #ifndef MP
 						item.display = 1;
+						// #endif
 						this.$refs.uWaterfall.$forceUpdate();
 						// 下面的操作应该替换为请求后端数据后，再停止旋转
 						// 模拟刷新操作，这里用setTimeout模拟  
 						setTimeout(() => {  
 						    // 移除淡出类
+							// #ifdef MP
+							this.$refs.uWaterfall.modify(item.id, 'mask', 0);
+							this.$refs.uWaterfall.modify(item.id, 'display', 0);
+							// #endif
+							// #ifndef MP
 							item.mask = 0;
 							item.display = 0;
+							// #endif
 							this.$refs.uWaterfall.$forceUpdate();
 						}, 800); 
 					}else{
@@ -315,18 +326,34 @@ export default {
 					const result = item.mask?0:1;
 					if(result === 0){
 						// 添加淡出的class样式
+						// #ifdef MP
+						this.$refs.uWaterfall.modify(item.id, 'display', 1);
+						// #endif
+						// #ifndef MP
 						item.display = 1;
+						// #endif
 						this.$refs.uWaterfall.$forceUpdate();
 						// 下面的操作应该替换为请求后端数据后，再停止旋转
 						// 模拟刷新操作，这里用setTimeout模拟  
 						setTimeout(() => {  
 						    // 移除淡出类
+							// #ifdef MP
+							this.$refs.uWaterfall.modify(item.id, 'mask', result);
+							this.$refs.uWaterfall.modify(item.id, 'display', 0);
+							// #endif
+							// #ifndef MP
 							item.mask = result;
 							item.display = 0;
+							// #endif
 							this.$refs.uWaterfall.$forceUpdate();
 						}, 800); 
 					}else{
-						item.mask = result;	
+						// #ifdef MP
+						this.$refs.uWaterfall.modify(item.id, 'mask', result);
+						// #endif
+						// #ifndef MP
+						item.mask = result;
+						// #endif
 						this.$refs.uWaterfall.$forceUpdate();
 					}
 				}
@@ -377,8 +404,14 @@ export default {
 						if(resp?.success){
 							await that.download(resp.data.originalPath);
 							// 关掉蒙层
+							// #ifdef MP
+							this.$refs.uWaterfall.modify(item.id, 'mask', 0);
+							this.$refs.uWaterfall.modify(item.id, 'display', 0);
+							// #endif
+							// #ifndef MP
 							item.mask = 0;
 							item.display = 0;
+							// #endif
 							that.$refs.uWaterfall.$forceUpdate();
 						}else{
 							this.$refs.uToast.show({type:'error',title: "购买失败，请检查余额是否充足!"});
@@ -388,7 +421,7 @@ export default {
 			});
 		},
 		// 判断是否在微信内置浏览器打开
-		// #ifndef APP
+		// #ifndef APP || MP
 		isMpWeb(){
 			if(navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == 'micromessenger'){
 				this.$refs.uToast.show({type:'warning',title: "请在浏览器打开进行下载，或长按图片保存到相册!"});
@@ -402,7 +435,7 @@ export default {
 		async download(path = ''){
 			let that = this;
 			
-			// #ifndef APP
+			// #ifndef APP || MP
 			if(this.isMpWeb()) return;
 			// #endif
 		
diff --git a/pages/mobile_web/work/work.vue b/pages/mobile_web/work/work.vue
index 3e88151..df7a6f1 100644
--- a/pages/mobile_web/work/work.vue
+++ b/pages/mobile_web/work/work.vue
@@ -38,16 +38,17 @@
 			<u-waterfall class="show-work" v-model="current===0?workList:collectList" ref="uWaterfall">
 				<template v-slot:left="{leftList}">
 					<view @click="maskTouchend(item,index)" class="work-item work-item-odd" v-for="(item,index) in leftList" :key="item.id">
-						<image class="trash" :class="item.display ? 'hideTrash' : ''" :src="fileUrl+trash" v-show="item.mask" @click.stop="deleteCollect(item,index)"></image>
-						<u-lazy-load border-radius="30" class="work-picture"
-						:image="item.path"></u-lazy-load>
-						<view class="sign-text">{{ item.type || '暂无' }}</view>
 						<!-- #ifdef MP -->
+						<image class="trash" :class="item.display ? 'hideTrash' : ''" :src="item.trashIcon" v-if="item.mask" @click.stop="deleteCollect(item,index)"></image>
 						<image :lazy-load="true" class="sign" :src="item.signIcon"></image>
 						<!-- #endif -->
 						<!-- #ifndef MP -->
+						<image class="trash" :class="item.display ? 'hideTrash' : ''" :src="fileUrl+trash" v-if="item.mask" @click.stop="deleteCollect(item,index)"></image>
 						<image :lazy-load="true" class="sign" :src="fileUrl+sign"></image>
 						<!-- #endif -->
+						<u-lazy-load border-radius="30" class="work-picture"
+						:image="item.path"></u-lazy-load>
+						<view class="sign-text">{{ item.type || '暂无' }}</view>
 						<!-- <image class="compare-sign" mode="widthFix" :src="item.compare"></image> -->
 						<view class="item-mask" :class="item.display ? 'hideMask' : ''" v-if="!current&&item.mask">
 							<button class="mask-public" @click.stop="publicWork(item,index)">发布</button>
@@ -57,16 +58,17 @@
 				</template>
 				<template v-slot:right="{rightList}">
 					<view @click="maskTouchend(item,index)" class="work-item work-item-even" v-for="(item,index) in rightList" :key="item.id">
-						<image class="trash" :class="item.display ? 'hideTrash' : ''" :src="fileUrl+trash" v-show="item.mask" @click.stop="deleteCollect(item,index)"></image>
-						<u-lazy-load border-radius="30" class="work-picture"
-						:image="item.path"></u-lazy-load>
-						<view class="sign-text">{{ item.type || '暂无' }}</view>
 						<!-- #ifdef MP -->
+						<image class="trash" :class="item.display ? 'hideTrash' : ''" :src="item.trashIcon" v-if="item.mask" @click.stop="deleteCollect(item,index)"></image>
 						<image :lazy-load="true" class="sign" :src="item.signIcon"></image>
 						<!-- #endif -->
 						<!-- #ifndef MP -->
+						<image class="trash" :class="item.display ? 'hideTrash' : ''" :src="fileUrl+trash" v-if="item.mask" @click.stop="deleteCollect(item,index)"></image>
 						<image :lazy-load="true" class="sign" :src="fileUrl+sign"></image>
 						<!-- #endif -->
+						<u-lazy-load border-radius="30" class="work-picture"
+						:image="item.path"></u-lazy-load>
+						<view class="sign-text">{{ item.type || '暂无' }}</view>
 						<!-- <image class="compare-sign" mode="widthFix" :src="item.compare"></image> -->
 						<view class="item-mask" :class="item.display ? 'hideMask' : ''" v-if="!current&&item.mask">
 							<button class="mask-public" @click.stop="publicWork(item,index)">发布</button>
@@ -202,6 +204,7 @@ export default {
 						let nowResult = {...item,path: that.getImagePath(item.path),display:0,mask:0};
 						// #ifdef MP
 						nowResult.signIcon = that.fileUrl+that.sign;
+						nowResult.trashIcon = that.fileUrl+that.trash;
 						// #endif
 						return nowResult;
 					});
@@ -210,6 +213,7 @@ export default {
 						let nowResult = {...item,path: that.getImagePath(item.path),display:0,mask:0};
 						// #ifdef MP
 						nowResult.signIcon = that.fileUrl+that.sign;
+						nowResult.trashIcon = that.fileUrl+that.trash;
 						// #endif
 						return nowResult;
 					}));
@@ -234,6 +238,7 @@ export default {
 						let nowResult = {...item,path: that.getImagePath(item.path),display:0,mask:0};
 						// #ifdef MP
 						nowResult.signIcon = that.fileUrl+that.sign;
+						nowResult.trashIcon = that.fileUrl+that.trash;
 						// #endif
 						return nowResult;
 					});
@@ -242,6 +247,7 @@ export default {
 						let nowResult = {...item,path: that.getImagePath(item.path),display:0,mask:0};
 						// #ifdef MP
 						nowResult.signIcon = that.fileUrl+that.sign;
+						nowResult.trashIcon = that.fileUrl+that.trash;
 						// #endif
 						return nowResult;
 					}));
@@ -299,14 +305,25 @@ export default {
 				if(this.touchNum == 1){
 					if(item.mask){
 						// 添加淡出的class样式
+						// #ifdef MP
+						this.$refs.uWaterfall.modify(item.id, 'display', 1);
+						// #endif
+						// #ifndef MP
 						item.display = 1;
+						// #endif
 						this.$refs.uWaterfall.$forceUpdate();
 						// 下面的操作应该替换为请求后端数据后，再停止旋转
 						// 模拟刷新操作，这里用setTimeout模拟  
 						setTimeout(() => {  
 						    // 移除淡出类
+							// #ifdef MP
+							this.$refs.uWaterfall.modify(item.id, 'mask', 0);
+							this.$refs.uWaterfall.modify(item.id, 'display', 0);
+							// #endif
+							// #ifndef MP
 							item.mask = 0;
 							item.display = 0;
+							// #endif
 							this.$refs.uWaterfall.$forceUpdate();
 						}, 800); 
 					}else{
@@ -319,18 +336,34 @@ export default {
 					const result = item.mask?0:1;
 					if(result === 0){
 						// 添加淡出的class样式
+						// #ifdef MP
+						this.$refs.uWaterfall.modify(item.id, 'display', 1);
+						// #endif
+						// #ifndef MP
 						item.display = 1;
+						// #endif
 						this.$refs.uWaterfall.$forceUpdate();
 						// 下面的操作应该替换为请求后端数据后，再停止旋转
 						// 模拟刷新操作，这里用setTimeout模拟  
 						setTimeout(() => {  
 						    // 移除淡出类
+							// #ifdef MP
+							this.$refs.uWaterfall.modify(item.id, 'mask', result);
+							this.$refs.uWaterfall.modify(item.id, 'display', 0);
+							// #endif
+							// #ifndef MP
 							item.mask = result;
 							item.display = 0;
+							// #endif
 							this.$refs.uWaterfall.$forceUpdate();
 						}, 800); 
 					}else{
+						// #ifdef MP
+						this.$refs.uWaterfall.modify(item.id, 'mask', result);
+						// #endif
+						// #ifndef MP
 						item.mask = result;
+						// #endif
 						this.$refs.uWaterfall.$forceUpdate();
 					}
 				}
@@ -351,8 +384,14 @@ export default {
 						});
 						if(res?.success){
 							// 关掉蒙层
+							// #ifdef MP
+							this.$refs.uWaterfall.modify(item.id, 'mask', 0);
+							this.$refs.uWaterfall.modify(item.id, 'display', 0);
+							// #endif
+							// #ifndef MP
 							item.mask = 0;
 							item.display = 0;
+							// #endif
 							that.$refs.uWaterfall.$forceUpdate();
 							that.$refs.uToast.show({type:'success',title: '作品上传分享成功！'});
 						}else{