Merge branch 'master' into dev

pages/feedingIndex/feedingIndex.vue

@@ -2883,12 +2883,13 @@ function forceResetRecorderManager() {
 
 // 开始录音
 async function startRecording() {
-
-	md.sensorLogTake({
-		xcxClick: "小程序页面点击事件",
-		pageName: "喂养工具首页",
-		buttonName: "语音识别录制开始按钮",
-	});
+	if (!recordingState.value.isRecording) {
+		md.sensorLogTake({
+			xcxClick: "小程序页面点击事件",
+			pageName: "喂养工具首页",
+			buttonName: "语音识别录制开始按钮",
+		});
+	}
 
 	console.log('开始录音请求...')
 	console.log('当前录音状态:', {
@@ -2990,11 +2991,7 @@ async function startRecording() {
 async function stopRecording() {
 	console.log('停止录音请求...')
 
-	md.sensorLogTake({
-		xcxClick: "小程序页面点击事件",
-		pageName: "喂养工具首页",
-		buttonName: "语音识别录制结束按钮",
-	});
+
 
 	// 检查录音是否真正开始
 	if (!recordingState.value.isRecording || !recordingState.value.recordingStartTime) {
@@ -3002,6 +2999,13 @@ async function stopRecording() {
 		return
 	}
 
+
+	md.sensorLogTake({
+		xcxClick: "小程序页面点击事件",
+		pageName: "喂养工具首页",
+		buttonName: "语音识别录制结束按钮",
+	});
+
 	console.log('停止录音...')
 	recordingState.value.isRecording = false
 	voiceRecognitionState.value.isRecording = false

pages/syWebview/syWebview.vue

@@ -107,17 +107,16 @@ onLoad(async (options) => {
 		return
 	}
 
-	// 固定写死的 URL（不从 options 读取 baseUrl）
-	const baseUrl = res.data.url
+	let baseUrl = res.data.url
 	const cuk = globalStore.cuk
 	const openId = globalStore.openId
 	const unionId = globalStore.unionId
 
 	// scene 需要使用 decodeURIComponent 才能获取到生成二维码时传入的 scene
-	// const scene = decodeURIComponent(options.scene)
-	// options.scene = null
+	const scene = decodeURIComponent(decodeURIComponent(options.scene))
+	options.scene = null
 
-	// console.warn("scene", scene)
+	console.warn("scene", scene)
 
 	// 将 options 的所有参数原样作为查询参数传给 H5，并补齐 cuk
 	const params = { ...(options || {}) }
@@ -141,6 +140,16 @@ onLoad(async (options) => {
 	// 示例：
 	// https://25niansuyuan.feihe.com/projects/Firmus/dev/index?p=xmh&openId=用户openid&unionId=用户unionid&&pt=yzhd123&shareToken=yzhd123&cuk=12121
 
+
+
+	if (scene) {
+		if (scene[0] === '?') {
+			baseUrl += scene
+		} else {
+			baseUrl += `?${scene}`
+		}
+	}
+
 	webviewUrl.value = paramStr
 		? baseUrl + (baseUrl.includes('?') ? '&' : '?') + paramStr
 		: baseUrl

views/Integral.vue

@@ -573,37 +573,28 @@
 		},
 		"vipLvsQuanyi": [
 			{
-				"qunyiList": [0, 2, 4, 5],
+				"qunyiList": [0, 2, 5],
 				"isNewArr": []
 			},
 			{
-				"qunyiList": [6, 7, 0, 2, 4, 5],
+				"qunyiList": [6, 7, 0, 2, 5],
 				"isNewArr": [6, 7]
 			},
 			{
-				"qunyiList": [8, 1, 6, 7, 0, 2, 4, 5],
+				"qunyiList": [8, 1, 6, 7, 0, 2, 5],
 				"isNewArr": [8, 1]
 			},
 			{
-				"qunyiList": [9, 8, 1, 6, 7, 0, 2, 4, 5],
+				"qunyiList": [9, 8, 1, 6, 7, 0, 2, 5],
 				"isNewArr": [9]
 			},
 			{
-				"qunyiList": [9, 8, 1, 6, 7, 0, 2, 4, 5],
+				"qunyiList": [9, 8, 1, 6, 7, 0, 2, 5],
 				"isNewArr": [9]
 			}
 		]
 	},
 	"vipActive": [
-		{
-			"img": "vipAct1.png",
-			"url": "subPackages/shopMainList/topicNew/index?id=1000912",
-			"type": 2,
-			"extra": {
-				"appId": "wx4205ec55b793245e",
-				"envVersion": "release"
-			}
-		},
 		{
 			"img": "vipAct2.png",
 			"url": "/subPackages/shopMainProcess/lottery/index?utm_campaign=%E6%BA%AF%E6%BA%90%E6%8A%BD%E5%A5%96&_channel_track_key=ngSppZAj",