Merge branch 'dev' of http://139.224.139.2:9091/chaosun/CFFP into dev

components/myteam/lazy-tree.vue

@@ -64,8 +64,10 @@
 						<!-- </view> -->
 
 					</view>
-					<view class="d-td" v-if="item.levelCode == 'A1'">{{ item.levelName }}</view>
-					<view class="d-td" v-else></view>
+					<view class="d-td" >
+						<text v-if="item.itemType == '2'">{{ item.levelName }}</text>
+						<text v-else></text>
+					</view>
 					<view class="d-td" style="padding-right: 10rpx;">{{ item.count }}</view>
 				</view>
 			</block>
@@ -184,6 +186,7 @@
 				}
 			},
 			checkLazy(id) {
+				console.log(id, 1515515)
 				return ~this.lazyList.findIndex(o => o === id);
 			},
 			checkOpen(id) {
@@ -200,6 +203,7 @@
 				this.openList = list;
 			},
 			async open(item, index) {
+				console.log(item, 581515)
 				if(index == 0 || item.itemType == '2'){
 					return false
 				}
@@ -220,7 +224,6 @@
 											icon: 'none'
 										});
 									}
-									console.log(res, 7744)
 									res.data.list.forEach((x) => {
 										this.$set(x, 'hasChildren', true)
 										this.$set(x, 'children', [])
@@ -245,7 +248,6 @@
 				}
 			},
 			setTreeNode(list = [], id, children = []) {
-				console.log(children, '值传过来了吗?')
 				const o = list.find(o => {
 					if (o.id === id) {
 						o.children = children;

pages/courseDetail/courseDetail.vue

@@ -164,13 +164,14 @@
 				serialsNo: null,
 				shareCode: null,
 				sharelogin: false,
-				startTime:'',
+				startTime: '',
 			};
 		},
 		methods: {
 			close(val) {
 				if (val) {
 					this.startTime = Date.parse(new Date()) / 1000;
+					localStorage.setItem('h5_startTime', this.startTime)
 					this.sharelogin = false
 					this.userId = val
 					// uni.setStorageSync('cffp_userId', this.userId);
@@ -208,7 +209,7 @@
 					// 		window.location = "www.baidu.com"; //ios下载地址
 					// 	}
 					// }, 500);
-					
+
 				}
 			},
 			goBack() {
@@ -222,8 +223,9 @@
 			reinvite() {
 				const shareCode = nanoid() + this.userId
 				let dataWXform = {
-					href:"https://mdev.zuihuibi.cn/cffp/pages/courseDetail/courseDetail?fileId=" + this.fileId +
-						'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode+'&shareUserId=' + this.userId,
+					href: "https://mdev.zuihuibi.cn/cffp/pages/courseDetail/courseDetail?fileId=" + this.fileId +
+						'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
+						this.userId,
 					title: this.courseInfo.fileTitle,
 					summary: `加入我们开启学习之旅`,
 					imageUrl: this.courseInfo.displayImage,
@@ -250,28 +252,33 @@
 					})
 				} else {
 					// let h5userId = uni.getStorageSync('h5_userId')
-					let h5userId = localStorage.getItem('h5_userId')
-					if (this.coursesharing == '1' && h5userId == '') {
-						this.sharelogin = true
+					if (this.coursesharing == '1') {
+						this.h5jump()
 					} else {
 						this.jumppurchase()
 					}
 				}
 			},
-			jumppurchase() {
-				if(localStorage.getItem('h5_userId')){
-					let h5userId = localStorage.getItem('h5_userId')
+			h5jump() {
+				let h5userId = localStorage.getItem('h5_userId')
+				if (h5userId == '') {
+					this.sharelogin = true
+				} else {
+					this.jumppurchase()
 				}
+			},
+			jumppurchase() {
 				const param = {
 					productType: '1',
 					productId: this.courseInfo.fileId,
-					userId: this.coursesharing == 1? h5userId : uni.getStorageSync('cffp_userId'),
+					userId: this.coursesharing == 1 ? localStorage.getItem('h5_userId') : uni.getStorageSync('cffp_userId'),
 					shareUserId: this.shareUserId,
 					shareReadId: this.shareReadId,
 					shareCode: this.shareCode,
-					dataSource: this.coursesharing == 1 ? '2': this.dataSource
+					dataSource: this.coursesharing == 1 ? '2' : this.dataSource
 				}
 				api.saveOrder(param).then(res => {
+					console.log(res, 545415)
 					if (res['success']) {
 						this.orderId = res['data']['id'];
 						uni.navigateTo({
@@ -302,7 +309,6 @@
 				api.lecturerQuery({
 					id: this.lecturerId
 				}).then(res => {
-					console.log('讲师信息', res);
 					if (res['success']) {
 						this.lecturerInfo = res['data']['lecturerInfos'][0];
 					} else {
@@ -316,13 +322,13 @@
 			},
 			// 课程详情页面
 			courseDetail() {
-				console.log(this.fileId, 545545)
 				api.courseDetail({
 					fileId: this.fileId,
-					userId: this.coursesharing == 1? uni.getStorageSync('h5_userId') : uni.getStorageSync('cffp_userId'),
+					userId: this.coursesharing == '1' ? uni.getStorageSync('h5_userId') : uni.getStorageSync(
+						'cffp_userId'),
 					packFileId: this.courseInfo.packFileId
 				}).then(res => {
-					console.log(res, 22554)
+					console.log('详情页面--res', res, 1251255)
 					if (res['success']) {
 						this.courseInfo = res['data']['data'];
 						this.lecturerId = res['data']['data']['fileLecturerId'];
@@ -466,10 +472,10 @@
 				api.userRead(UserReadRequestVO).then(res => {
 					if (res['success']) {
 						this.shareReadId = res.data.id
-						if(uni.getStorageSync('h5_userId')){
+						if (uni.getStorageSync('h5_userId')) {
 							this.jumppurchase()
 						}
-						
+
 					}
 				})
 			},
@@ -486,6 +492,7 @@
 			// },
 		},
 		onLoad(option) {
+			console.log(option, 1541515)
 			this.fileId = option.fileId;
 			if (option.coursesharing) {
 				this.userId = ''
@@ -495,7 +502,8 @@
 				this.shareUserId = option.shareUserId
 				this.getuserRead()
 				let endTime = Date.parse(new Date()) / 1000;
-				if((endTime - startTime) > 3600 * 24) {
+				let startTime =  localStorage.getItem('h5_startTime')
+				if (endTime - startTime > 3600 * 24) {
 					this.userId = ''
 				}
 				uni.setStorageSync('h5_coursesharing', this.coursesharing);
@@ -506,7 +514,7 @@
 			// this.switchTab(1);
 		},
 		onShow() {
-			if(uni.getStorageSync('h5_coursesharing')){
+			if (uni.getStorageSync('h5_coursesharing')) {
 				this.coursesharing = uni.getStorageSync('h5_coursesharing')
 			}
 			this.switchTab(1);
@@ -605,6 +613,7 @@
 			justify-content: space-between;
 			align-items: center;
 			margin-right: 30rpx;
+
 			.image {
 				width: 50rpx;
 				height: 50rpx;

pages/orderConfirm/orderConfirm.vue

@@ -148,7 +148,7 @@
 				isDeduction:false,
 				userId: uni.getStorageSync('cffp_userId'),
 				intergralInfo:{},
-				orderId:'1',
+				orderId:'',
 				paymentBtnDisabled:false,
 				action:'',
 				params:'',