Merge branch 'master' into feature/20250901_share

api/reservation/reservation-request.js

@@ -9,6 +9,7 @@ import {
 //const baseUrl = 'https://feihe.jzvcode.com/feihe';
 //const baseUrl = 'https://factory-walk-test.feihe.com/feihe';
 const baseUrl = 'https://factory-walk.feihe.com/feihe';
+//const baseUrl = 'https://factory-walk-uat.feihe.com/feihe';
 
 const request = (options = {}) => {
   // 对options.data 进行一些处理 

manifest.json

@@ -52,7 +52,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx88ab296d52e9835d",
+        "appid" : "wxc83b55d61c7fc51d",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
@@ -65,7 +65,8 @@
                 "desc" : "请允许获取位置信息，用于提供附近服务"
             }
         },
-        "requiredBackgroundModes" : [ "share" ]
+        "requiredBackgroundModes" : [ "share" ],
+        "embeddedAppIdList": ["wx4205ec55b793245e"]
     },
     "mp-alipay" : {
         "usingComponents" : true

pages.json

@@ -63,6 +63,20 @@
 				"navigationBarTitleText": ""
 			}
 		},
+		{
+			"path": "pages/naming/naming",
+			"style": {
+				"navigationBarTitleText": "星妈起名",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/naming/namingResult",
+			"style": {
+				"navigationBarTitleText": "星妈起名",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/expertTeamPage/expertTeamPage",
 			"style": {

pages/index/index.vue

@@ -38,7 +38,7 @@ const shareOptions = {
   0: {
     title: "8000万中国妈妈信赖的育儿品牌",
     path: "/pages/index/index?pageType=home",
-    imageUrl: $baseUrl + "share/share_home.png",
+    imageUrl: $baseUrl + "share/share_home0901.jpg",
   },
   1: {
     title: "飞鹤提供家庭营养一站式解决方案",

pages/naming/naming.vue

@@ -170,10 +170,10 @@
 					<view class="item_line"></view>
 				</view>
 
-				<!--避讳字-->
+				<!--避免字-->
 				<view class="taboo_word">
 					<view class="item_top">
-						<span class="title_txt">避讳字</span>
+						<span class="title_txt">避免字</span>
 						<input class="taboo_input" :placeholder="showPlaceholder2 ? '示例：然、萌' : ''" v-model="avoidChars"
 							@blur="e => enforceSeparator(e, 2)" @click="showPlaceholder2 = false" />
 					</view>
@@ -293,7 +293,7 @@
 	//必有字
 	const requiredChars = ref('');
 	const showPlaceholder2 = ref(true);
-	//避讳字
+	//避免字
 	const avoidChars = ref('');
 	//期望风格
 	const expectedStyle = ref('');
@@ -416,7 +416,7 @@
 		return input.length <= filtered.length || input === filtered
 	}
 
-	//设置必有字和避讳字，用、隔开每一个字
+	//设置必有字和避免字，用、隔开每一个字
 	const enforceSeparator = (e, idx) => {
 		let text = e.detail.value
 		// 1. 移除所有现有分隔符（避免干扰）

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>

pages/syWebview/syWebview.vue

@@ -164,6 +164,8 @@ onShareAppMessage((options) => {
 	console.log('分享数据:', share.value)
 	console.log('分享选项:', options)
 
+	debugger;
+
 	md.sensorLogTake({
 		xcxClick: "suyuan202508H5Click",
 		pageName: "星妈会分享页",

reservation/home/index.less

@@ -81,8 +81,8 @@
     height: 200rpx;
     overflow: hidden;
     image {
-      width: 54rpx;
-      height: 54rpx;
+      width: 58rpx;
+      height: 58rpx;
     }
   }
 }

reservation/home/index.vue

@@ -24,13 +24,13 @@
       <view class="footer-item blur-bg" @click="gofeihe()">
         <view>
           <image
-            style="width: 59rpx; height: 59rpx"
-            src="@/assets/reservation-images/twitter.png"
+            style="width: 64rpx; height: 64rpx"
+            src="@/assets/reservation-images/twitter_new.png"
             mode="widthFix"
           >
           </image>
         </view>
-        <view>了解飞鹤</view>
+        <view style="margin-top:4rpx;">了解飞鹤</view>
       </view>
       <view
         class="footer-item blur-bg"
@@ -38,11 +38,11 @@
       >
         <view>
           <image
-            src="@/assets/reservation-images/briefcase.png"
+            src="@/assets/reservation-images/briefcase_new.png"
             mode="widthFix"
           ></image>
         </view>
-        <view>现在预约</view>
+        <view style="margin-top:4rpx;">现在预约</view>
       </view>
       <view
         class="footer-item blur-bg"
@@ -50,11 +50,11 @@
       >
         <view>
           <image
-            src="@/assets/reservation-images/calendar.png"
+            src="@/assets/reservation-images/calendar_new.png"
             mode="widthFix"
           ></image>
         </view>
-        <view>预约记录</view>
+        <view style="margin-top:4rpx;">预约记录</view>
       </view>
     </view>
     <!-- 底部箭头 -->
@@ -98,7 +98,6 @@ const changeCurrent = () => {
 
 const handleScrollChange = (e) => {
   console.log(e)
-  console.log(123)
   current.value = e.detail.current
 }
 

stores/pageCfg.js

 import { defineStore } from "pinia";
-import { myObj } from "../mock/my";
 import { fetchUserJSON } from "@/api/user";
 
 export const usePageCfgStore = defineStore("pageCfg", {

utils/index.js

@@ -36,7 +36,11 @@ export function jump({ type, url, extra = {} }) {
 
       console.log("jumpParams:", jumpParams);
 
+      if(extra.embedded){
+        uni.openEmbeddedMiniProgram(jumpParams);
+      }else{
         uni.navigateToMiniProgram(jumpParams);
+      }
       break;
     case JumpType.H5:
       // 跳转到 https 网络链接

views/Brand.vue

@@ -536,9 +536,27 @@ export default {
 			}
 			const { productId, skuId, contentImg, contentImgLen, shareTitle, shareImg, title } = item;
 			const tabName = this.productTabList[this.channelTabIndex];
+			
+			if(productId && skuId){
+				const url = `subPackages/shopMainProcess/product/index?productId=${productId}&skuId=${skuId}`;
+				const type = JumpType.MINI;
+				const extra = {
+					appId: 'wx4205ec55b793245e',	//星妈优选小程序
+					extraData: {},
+					envVersion: 'release',
+					embedded: true,
+				};
+
+				jump({
+					type: type,
+					url: url,
+					extra:extra
+				})
+			}else{
 				uni.navigateTo({
 					url: "/pages/product/product?productId=" + productId + "&skuId=" + skuId + "&contentImg=" + contentImg + "&contentImgLen=" + contentImgLen + "&shareTitle=" + shareTitle + "&shareImg=" + shareImg + "&tabName=" + tabName + "&title=" + title
 				})
+			}
 		},
 		channelTabHandler(_index, evt) {
 			if (evt) {

views/Home.vue

@@ -58,8 +58,8 @@
 					<swiper-item v-for="(item, index) in toolList.tools" :key="index"
 						:class="['swiperItem', { 'active': currentIndex === index }]">
 						<view class="tool">
-							<button v-if="homeStore && !homeStore.isLogin && index > 0" open-type="getPhoneNumber"
-								@getphonenumber="onGetPhoneNumber" class="sq_btn"></button>
+							<button v-if="homeStore && !homeStore.isLogin && item.title!='星妈起名' && item.title!='体质测试'"
+								open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber" class="sq_btn"></button>
 							<image class="tool_bg" :src="$baseUrl + item.icon" @tap="handleToolClick(item)">
 							</image>
 							<!-- <image class="tool_icon" :src="$baseUrl + item.icon"></image>
@@ -328,62 +328,62 @@
 
 
 <script>
-import {
+	import {
 		jump,
 		JumpType
-} from '../utils';
-import {
+	} from '../utils';
+	import {
 		useHomeStore
-} from '../stores/home';
-import {
+	} from '../stores/home';
+	import {
 		fetchHomeJSON
-} from '../api/home';
-import {
+	} from '../api/home';
+	import {
 		useUserStore
-} from '../stores/user';
-import RegisterLayer from "../components/RegisterLayer.vue";
-import md from '../md';
-import ExposureTracker from '../utils/exposure';
-import {
+	} from '../stores/user';
+	import RegisterLayer from "../components/RegisterLayer.vue";
+	import md from '../md';
+	import ExposureTracker from '../utils/exposure';
+	import {
 		getHealthField
-} from "@/api/common";
+	} from "@/api/common";
 
-// const homeStore = useHomeStore();
-const userStore = useUserStore();
+	// const homeStore = useHomeStore();
+	const userStore = useUserStore();
 
-// 定义需要曝光检测的元素配置
-const EXPOSURE_CONFIGS = [{
+	// 定义需要曝光检测的元素配置
+	const EXPOSURE_CONFIGS = [{
 			id: 'firstScreen',
 			logParams: {
 				xcxPage: '首页-首屏页面浏览',
 				pageName: '首页-首屏'
 			}
-},
-// 可以添加更多需要曝光检测的元素配置
-{
+		},
+		// 可以添加更多需要曝光检测的元素配置
+		{
 			id: 'secondScreen',
 			logParams: {
 				xcxPage: '首页-二屏页面浏览',
 				pageName: '首页-二屏'
 			}
-},
-{
+		},
+		{
 			id: 'thirdScreen',
 			logParams: {
 				xcxPage: '首页-三屏页面浏览',
 				pageName: '首页-三屏'
 			}
-},
-{
+		},
+		{
 			id: 'fourthScreen',
 			logParams: {
 				xcxPage: '首页-四屏页面浏览',
 				pageName: '首页-四屏'
 			}
-}
-];
+		}
+	];
 
-export default {
+	export default {
 		beforeDestroy() {
 			if (this.exposureTracker) {
 				this.exposureTracker.resetAllExposure();
@@ -1051,13 +1051,13 @@ export default {
 				}
 			}
 		}
-}
+	}
 </script>
 
 <style lang="less" scoped>
-@import '@/common.less';
+	@import '@/common.less';
 
-.home-container {
+	.home-container {
 		width: 100vw;
 		overflow-x: hidden;
 		background-color: white;
@@ -1952,5 +1952,5 @@ export default {
 				z-index: 10;
 			}
 		}
-}
+	}
 </style>
\ No newline at end of file

views/Integral.vue

@@ -2047,8 +2047,7 @@ import ShengriliTipPanel from '../components/quanyi/shengriliTipPanel.vue';
 		const type = item.type;
 		const extra = item.extra;
 
-
-
+		extra.embedded = true;	//半屏拉起小程序
 
 		console.log('url11111=',url);
 
@@ -3010,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

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