Merge branch 'master' into 20250901_915Act

pages/product/product.vue

@@ -107,13 +107,13 @@ export default {
 			});
 		},
 	},
-	// onShareAppMessage() {
-	// 	return {
-	// 		title: this.shareTitle,
-	// 		path: '/pages/product/product?productId=' + this.productId + '&skuId=' + this.skuId + '&contentImg=' + this.contentImg + '&contentImgLen=' + this.contentImgLen + '&shareTitle=' + this.shareTitle + '&shareImg=' + this.shareImg + '&tabName=' + this.tabName+'&title=' + this.title,
-	// 		imageUrl: this.shareImg
-	// 	}
-	// },
+	onShareAppMessage() {
+		return {
+			title: this.shareTitle,
+			path: '/pages/product/product?productId=' + this.productId + '&skuId=' + this.skuId + '&contentImg=' + this.contentImg + '&contentImgLen=' + this.contentImgLen + '&shareTitle=' + this.shareTitle + '&shareImg=' + this.shareImg + '&tabName=' + this.tabName+'&title=' + this.title,
+			imageUrl: this.shareImg
+		}
+	},
 	
 }
 </script>

views/Integral.vue

@@ -3009,7 +3009,7 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
 			.vip-active-img {
 				width: 100%;
 				height: 100%;
-				// border-radius: 16rpx;
+				border-radius: 32rpx;
 			}
 			
 		}

views/My.vue

@@ -955,7 +955,7 @@ defineExpose({});
 			.vip-active-img {
 				width: 100%;
 				height: 100%;
-				// border-radius: 16rpx;
+				border-radius: 32rpx;
 			}
     }
   }