Merge branch 'dev-lg'

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

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);
 
-      uni.navigateToMiniProgram(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];
-			uni.navigateTo({
-				url: "/pages/product/product?productId=" + productId + "&skuId=" + skuId + "&contentImg=" + contentImg + "&contentImgLen=" + contentImgLen + "&shareTitle=" + shareTitle + "&shareImg=" + shareImg + "&tabName=" + tabName + "&title=" + title
-			})
+			
+			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/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);