Merge branch 'dev' into sw0115

index.html

@@ -43,5 +43,18 @@
 			<!--app-html-->
 		</div>
 		<script type="module" src="/main.js"></script>
+		<!-- uni 的 SDK，必须引用。 -->
+		<script type="text/javascript" src="./static/uni.webview.1.5.4.js"></script>
+		<script type="text/javascript">
+			// 验证脚本是否加载成功（调试关键：控制台打印 webViewJs 确认）
+			const webViewJs = window.uni?.webView;
+			if (!webViewJs) {
+				console.error('uni.webview.js 加载失败！请检查路径是否正确');
+			} else {
+				console.log('uni.webview.js 加载成功', webViewJs);
+				// 将 webViewJs 挂载到 window 全局，供 Vue 组件访问
+				window.webViewJs = webViewJs;
+			}
+		</script>
 	</body>
 </html>
\ No newline at end of file

pages.json

 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -496,6 +497,13 @@
 				          "webviewDebug": true
 				        }
 			}
+		},
+		{
+			"path": "pages/lanch/index",
+			"style": {
+				"topWindow": false,
+				"navigationBarTitleText": "启动页"
+			}
 		}
 		
 	],

pages/courseDetail/courseDetail.vue

@@ -63,8 +63,8 @@
 		<view class="courseTitleContent">
 			<view class="courseTitle">
 				<view class="" style="width: 100%;">
-					<h4>{{courseInfo.fileSynopsis}}</h4>
-					<view>{{courseInfo.fileTitle}}</view>
+					<h4>{{courseInfo.fileTitle}}</h4>
+					<view>{{courseInfo.fileSynopsis}}</view>
 				</view>
 				
 			</view>

pages/courselist/courselist.vue

@@ -90,10 +90,10 @@
 						</view>
 						<view class="right">
 							<view class="one">
-								{{item.fileSynopsis}}
+								{{item.fileTitle}}
 							</view>
 							<view class="two">
-								{{item.fileTitle}}
+								{{item.fileSynopsis}}
 							</view>
 							<view class="three">
 								<text style="font-size: 28rpx;color: rgba(32, 39, 155, 1);">￥{{Number(item.coursePrice).toFixed(2)}}</text>

pages/index/index.vue

@@ -575,7 +575,7 @@
 						if(this.cffpCourseInfos.length>0){
 							this.cffpCourseInfos.forEach(item=>{
 								item.coursePrice =Number(item.coursePrice).toFixed(2) || '0.00'
-								if(item.productCode&&item.productCode=='C09'){
+								if(item.productCode&&item.productCode=='ZNTJ'){
 									this.productItem = item
 									uni.setStorageSync('productItem',this.productItem );
 								}
@@ -743,7 +743,7 @@
 						let result = res['data']['data'];
 						if(result.length>0){
 							result.forEach(item=>{
-								if(item.productCode&&item.productCode=='C09'){
+								if(item.productCode&&item.productCode=='ZNTJ'){
 									this.productItem = item
 									uni.setStorageSync('productItem',this.productItem );
 								}

pages/lanch/index.vue

+<template>
+	<view class="loadTxt">Loading...</view>
+</template>
+
+<script setup >
+	import { ref } from "vue";
+	import api from '@/api/api';
+	import { onLaunch, onLoad } from '@dcloudio/uni-app'
+	import * as environment from '@/environments/environment'
+	let dataToken = ref()
+	onLoad((options) => {
+		// 参数带token了重新登录
+		if (options.dataToken) {
+			// uni.clearStorageSync();
+			
+			dataToken.value = options.dataToken
+			reLogin(options.landingPage)
+		}
+
+	})
+
+	const reLogin = (landingPage) => {
+		uni.showLoading({
+			title: '加载中...'
+		});
+		// 添加iOS平台检测
+		const isIOS = navigator.platform.match(/(iPhone|iPod|iPad)/i);
+		const params = {
+			loginType: '5',
+			authToken: dataToken.value
+		}
+		api.loginVerification(params).then((res) => {
+			if (res['success']) {
+				uni.setStorageSync('isLogin', '1');
+				uni.setStorageSync('loginType', 'codelogin');
+				uni.setStorageSync('cffp_userId', res.data.userId);
+				uni.setStorageSync('uni-token', res.data['token']);
+				dataToken.value = ''
+				uni.removeStorageSync('dataToken')
+				if (landingPage == 'sfpHousePurchase') {
+					uni.reLaunch({ url: `/sfp/housePurchase/housePurchase` })
+
+				}else if(landingPage == 'sfpIndex'){
+					uni.reLaunch({ url: `/sfp/index/index` })
+				}
+			} else {
+				uni.showToast({
+					title: res['message'],
+					duration: 2000,
+					icon: 'none'
+				})
+			}
+		})
+		uni.hideLoading()
+
+	}
+</script>
+<style lang="scss" scoped>
+	.loadTxt {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 30rpx;
+	}
+</style>
\ No newline at end of file

pages/orderConfirm/orderConfirm.vue

@@ -10,8 +10,8 @@
 			<!-- 课程详情 -->
 					<template v-if="courseInfoItem">
 						<view class="courseItemBox" >
-							<course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileSynopsis"
-								:summaryBox="courseInfoItem.fileTitle"
+							<course-item :thumbnailPath="courseInfoItem.displayImage" :title="courseInfoItem.fileTitle"
+								:summaryBox="courseInfoItem.fileSynopsis"
 								:dataList="{coursePrice:courseInfoItem.coursePrice,salesNumber:courseInfoItem.salesNumber}"
 								:fileLecturerId="courseInfoItem.fileLecturerId" :fileId="fileId"></course-item>
 						</view>

pages/personalCenter/personalCenter.vue

@@ -225,7 +225,7 @@
 							{key:'06',title:'邀请加盟',icon:'icon-yaoqing',link:'/pages/inviteJoin/inviteJoin',isOpen:true,isShow:true,identity: true},
 							// {title:'我的团队',icon:'icon-tuandui',link:'/pages/personalCenter/myTeam',isOpen:true,isShow:true,identity: true},
 							{title:'我的团队',icon:'icon-tuandui',link:'/myPackageA/myTeam/myTeam',isOpen:true,isShow:true,identity: true},
-							{title:'育成团队',icon:'icon-yuchengguanxi',link:'/pages/personalCenter/myTeamIncubate',isOpen:true,isShow:true,identity: true},
+							// {title:'育成团队',icon:'icon-yuchengguanxi',link:'/pages/personalCenter/myTeamIncubate',isOpen:true,isShow:true,identity: true},
 						],
 					},{id:'03',categoryName:'学习研讨',
 						children:[
@@ -322,7 +322,8 @@
 						let cffpCourseInfos = res['data']['data'];
 						if(cffpCourseInfos.length>0){
 							cffpCourseInfos.forEach(item=>{
-								if(item.productCode&&item.productCode=='C09'){
+								
+								if(item.productCode&&item.productCode=='ZNTJ'){
 									this.productItem = item
 									uni.setStorageSync('productItem',this.productItem );
 								}
@@ -692,7 +693,7 @@
 						}
 						this.inviteEqrode = this.customerBasicInfo.invitationCode;
 						uni.setStorageSync('user_mobile', res.data.mobile)
-					
+						console.log('this.mainMenuLists',this.mainMenuLists);
 					}else {
 							
 							uni.setStorageSync('loginType','visitor')
@@ -702,10 +703,7 @@
 					}
 				})
 			},
-			// 获取名片状态
-			// getCard(){
 			
-			// }
 			// 我的名片页面
 			businessCard(){
 				if(!uni.getStorageSync('loginType')||uni.getStorageSync('loginType')=='visitor'){

static/uni.webview.1.5.4.js

+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e=e||self).uni=n()}(this,(function(){"use strict";try{var e={};Object.defineProperty(e,"passive",{get:function(){!0}}),window.addEventListener("test-passive",null,e)}catch(e){}var n=Object.prototype.hasOwnProperty;function i(e,i){return n.call(e,i)}var t=[];function r(){return window.__dcloud_weex_postMessage||window.__dcloud_weex_}var o=function(e,n){var i={options:{timestamp:+new Date},name:e,arg:n};if(r()){if("postMessage"===e){var o={data:[n]};return window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessage(o):window.__dcloud_weex_.postMessage(JSON.stringify(o))}var a={type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}};window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessageToService(a):window.__dcloud_weex_.postMessageToService(JSON.stringify(a))}if(!window.plus)return window.parent.postMessage({type:"WEB_INVOKE_APPSERVICE",data:i,pageId:""},"*");if(0===t.length){var d=plus.webview.currentWebview();if(!d)throw new Error("plus.webview.currentWebview() is undefined");var s=d.parent(),w="";w=s?s.id:d.id,t.push(w)}if(plus.webview.getWebviewById("__uniapp__service"))plus.webview.postMessageToUniNView({type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}},"__uniapp__service");else{var u=JSON.stringify(i);plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat("WEB_INVOKE_APPSERVICE",'",').concat(u,",").concat(JSON.stringify(t),");"))}},a={navigateTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;o("navigateTo",{url:encodeURI(n)})},navigateBack:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.delta;o("navigateBack",{delta:parseInt(n)||1})},switchTab:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;o("switchTab",{url:encodeURI(n)})},reLaunch:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;o("reLaunch",{url:encodeURI(n)})},redirectTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;o("redirectTo",{url:encodeURI(n)})},getEnv:function(e){r()?e({nvue:!0}):window.plus?e({plus:!0}):e({h5:!0})},postMessage:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};o("postMessage",e.data||{})}},d=/uni-app/i.test(navigator.userAgent),s=/Html5Plus/i.test(navigator.userAgent),w=/complete|loaded|interactive/;var u=window.my&&navigator.userAgent.indexOf(["t","n","e","i","l","C","y","a","p","i","l","A"].reverse().join(""))>-1;var g=window.swan&&window.swan.webView&&/swan/i.test(navigator.userAgent);var v=window.qq&&window.qq.miniProgram&&/QQ/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var c=window.tt&&window.tt.miniProgram&&/toutiaomicroapp/i.test(navigator.userAgent);var m=window.wx&&window.wx.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var p=window.qa&&/quickapp/i.test(navigator.userAgent);var f=window.ks&&window.ks.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var l=window.tt&&window.tt.miniProgram&&/Lark|Feishu/i.test(navigator.userAgent);var _=window.jd&&window.jd.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var E=window.xhs&&window.xhs.miniProgram&&/xhsminiapp/i.test(navigator.userAgent);for(var h,P=function(){window.UniAppJSBridge=!0,document.dispatchEvent(new CustomEvent("UniAppJSBridgeReady",{bubbles:!0,cancelable:!0}))},b=[function(e){if(d||s)return window.__dcloud_weex_postMessage||window.__dcloud_weex_?document.addEventListener("DOMContentLoaded",e):window.plus&&w.test(document.readyState)?setTimeout(e,0):document.addEventListener("plusready",e),a},function(e){if(m)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.wx.miniProgram},function(e){if(v)return window.QQJSBridge&&window.QQJSBridge.invoke?setTimeout(e,0):document.addEventListener("QQJSBridgeReady",e),window.qq.miniProgram},function(e){if(u){document.addEventListener("DOMContentLoaded",e);var n=window.my;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(g)return document.addEventListener("DOMContentLoaded",e),window.swan.webView},function(e){if(c)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(p){window.QaJSBridge&&window.QaJSBridge.invoke?setTimeout(e,0):document.addEventListener("QaJSBridgeReady",e);var n=window.qa;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(f)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.ks.miniProgram},function(e){if(l)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(_)return window.JDJSBridgeReady&&window.JDJSBridgeReady.invoke?setTimeout(e,0):document.addEventListener("JDJSBridgeReady",e),window.jd.miniProgram},function(e){if(E)return window.xhs.miniProgram},function(e){return document.addEventListener("DOMContentLoaded",e),a}],y=0;y<b.length&&!(h=b[y](P));y++);h||(h={});var B="undefined"!=typeof uni?uni:{};if(!B.navigateTo)for(var S in h)i(h,S)&&(B[S]=h[S]);return B.webView=h,B}));