1.修复分享清除缓存页面内容不正确。

2.修复兑换记录是否可以点击
3.修复H5 自定义分享页面样式自定义

pages/application-process/work-experience.vue

@@ -17,7 +17,7 @@
 			<text class="line"></text>
 			<text class="line"></text>
 			<text class="num">8</text>
 			<text class="num">8</text>
 		</view>
 		</view>
-		<view class="wrapper">
+		<view class="wrapper" style="padding-bottom: 200rpx;">
 			<view class="title">
 			<view class="title">
 			   <view>
 			   <view>
 					<text class="line"></text>从业经历
 					<text class="line"></text>从业经历
@@ -154,6 +154,7 @@
 			     this.dataForm.targetId = this.applyParam.id
 			     this.dataForm.targetId = this.applyParam.id
 				if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){
 				if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){
 					CommonUpload(this.dataForm).then(res => {
 					CommonUpload(this.dataForm).then(res => {
+						console.log(res, 541154)
 						this.applyParam.certificate = res.data.filePath;
 						this.applyParam.certificate = res.data.filePath;
 						this.picList.push(this.applyParam.certificate);
 						this.picList.push(this.applyParam.certificate);
 					});
 					});

pages/courseDetail/courseDetail.vue

@@ -182,17 +182,14 @@
 			close(val) {
 			close(val) {
 				if (val) {
 				if (val) {
 					this.startTime = Date.parse(new Date()) / 1000;
 					this.startTime = Date.parse(new Date()) / 1000;
-					localStorage.setItem('h5_startTime', this.startTime)
+					uni.setStorageSync('h5_startTime', this.startTime)
 					this.sharelogin = false
 					this.sharelogin = false
 					this.userId = val
 					this.userId = val
-					// uni.setStorageSync('cffp_userId', this.userId);
-					// localStorage.setItem('h5_userId', this.userId)
-					uni.setStorageSync('cffp_userId',this.userId);
+					uni.setStorageSync('h5_userId', this.userId);
 					this.getuserRead(1)
 					this.getuserRead(1)
 				} else {
 				} else {
 					this.sharelogin = false
 					this.sharelogin = false
 				}
 				}
-
 			},
 			},
 			jumpapp() {
 			jumpapp() {
 				let platform = uni.getSystemInfoSync().platform
 				let platform = uni.getSystemInfoSync().platform
@@ -233,10 +230,11 @@
 			// 打开微信分享啊
 			// 打开微信分享啊
 			reinvite() {
 			reinvite() {
 				const shareCode = nanoid() + this.userId
 				const shareCode = nanoid() + this.userId
+				const jumptime =  Date.parse(new Date()) / 1000
 				let dataWXform = {
 				let dataWXform = {
 					href: "https://mdev.zuihuibi.cn/cffp/pages/courseDetail/courseDetail?fileId=" + this.fileId +
 					href: "https://mdev.zuihuibi.cn/cffp/pages/courseDetail/courseDetail?fileId=" + this.fileId +
 						'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
 						'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
-						this.userId + '&jumpUrl=' + new Date(),
+						this.userId + '&jumpUrl=' + jumptime + "&",
 					title: this.courseInfo.fileTitle,
 					title: this.courseInfo.fileTitle,
 					summary: `加入我们开启学习之旅`,
 					summary: `加入我们开启学习之旅`,
 					imageUrl: this.courseInfo.displayImage,
 					imageUrl: this.courseInfo.displayImage,
@@ -257,7 +255,6 @@
 			},
 			},
 			// 订单保存
 			// 订单保存
 			saveOrder() {
 			saveOrder() {
-				alert(uni.getStorageSync('cffp_userId'), 1)
 				if (this.loginType === 'visitor') {
 				if (this.loginType === 'visitor') {
 					uni.navigateTo({
 					uni.navigateTo({
 						url: '/components/login/login'
 						url: '/components/login/login'
@@ -271,7 +268,7 @@
 				}
 				}
 			},
 			},
 			h5jump() {
 			h5jump() {
-				// let h5userId = localStorage.getItem('h5_userId')
+				let h5userId = uni.getStorageSync('h5_userId');
 				if (h5userId) {
 				if (h5userId) {
 					this.jumppurchase()
 					this.jumppurchase()
 				} else {
 				} else {
@@ -282,7 +279,7 @@
 				const param = {
 				const param = {
 					productType: '1',
 					productType: '1',
 					productId: this.courseInfo.fileId,
 					productId: this.courseInfo.fileId,
-					userId: this.coursesharing == 1 ? localStorage.getItem('h5_userId') : uni.getStorageSync(
+					userId: this.coursesharing == 1 ?  uni.getStorageSync('h5_userId') : uni.getStorageSync(
 						'cffp_userId'),
 						'cffp_userId'),
 					shareUserId: this.shareUserId,
 					shareUserId: this.shareUserId,
 					shareReadId: this.shareReadId,
 					shareReadId: this.shareReadId,
@@ -290,11 +287,10 @@
 					dataSource: this.coursesharing == 1 ? '2' : this.dataSource
 					dataSource: this.coursesharing == 1 ? '2' : this.dataSource
 				}
 				}
 				api.saveOrder(param).then(res => {
 				api.saveOrder(param).then(res => {
-					console.log(res, 545415)
 					if (res['success']) {
 					if (res['success']) {
 						this.orderId = res['data']['id'];
 						this.orderId = res['data']['id'];
 						if (this.coursesharing == '1') {
 						if (this.coursesharing == '1') {
-							this.userId = localStorage.getItem('h5_userId') ? localStorage.getItem('h5_userId') :
+							this.userId =  uni.getStorageSync('h5_userId') ? uni.getStorageSync('h5_userId') :
 								this.userId
 								this.userId
 						}
 						}
 						uni.navigateTo({
 						uni.navigateTo({
@@ -528,14 +524,13 @@
 				this.shareCode = option.shareCode
 				this.shareCode = option.shareCode
 				this.shareUserId = option.shareUserId
 				this.shareUserId = option.shareUserId
 				this.getuserRead()
 				this.getuserRead()
-				// let endTime = Date.parse(new Date()) / 1000;
-				// let startTime = localStorage.getItem('h5_startTime')
-				// if (endTime - startTime > 3600 * 24) {
-				// 	localStorage.setItem('h5_userId', '')
-				// }
-				alert(uni.getStorageSync('cffp_userId'), 1)
+				let endTime = Date.parse(new Date()) / 1000;
+				let startTime = uni.getStorageSync('h5_startTime')
+				if (endTime - startTime > 3600 * 24) {
+					uni.setStorageSync('h5_userId', '')
+				}
 				uni.setStorageSync('h5_coursesharing', this.coursesharing);
 				uni.setStorageSync('h5_coursesharing', this.coursesharing);
-
+				this.getshareData()
 			}
 			}
 			
 			
 			let dataForm = uni.getStorageSync('userinfodataForm')
 			let dataForm = uni.getStorageSync('userinfodataForm')

pages/exchangeRecord/exchangeRecord.vue

@@ -42,7 +42,7 @@
 				})
 				})
 			},
 			},
 			toWithdralDtl(item){
 			toWithdralDtl(item){
-				if(item.productType || item.productTypeName =='兑换提现' ){
+				if(item.productType == '2' || item.productTypeName =='兑换提现' ){
 					uni.navigateTo({
 					uni.navigateTo({
 						url:`/pages/withdrawal/withdrawalDetail?partnerTradeNo=${item.partnerTradeNo}`
 						url:`/pages/withdrawal/withdrawalDetail?partnerTradeNo=${item.partnerTradeNo}`
 					})
 					})

pages/orderConfirm/orderConfirm.vue

@@ -302,7 +302,7 @@
 					if(this.deviceType == 3){
 					if(this.deviceType == 3){
 						this.tipsFlag = true;
 						this.tipsFlag = true;
 						this.paymentBtnDisabled = false;
 						this.paymentBtnDisabled = false;
-						let url = window.location.href + `&isRedirect=1&amount=${this.amount}&jumptime=${new Date()}`;
+						let url = window.location.href + `&isRedirect=1&amount=${this.amount}&jumptime=${new Date()}&isDeduction=${this.isDeduction}&deductionCore=${this.deductionCore}`;
 						window.history.replaceState(null, '',url);
 						window.history.replaceState(null, '',url);
 						return;
 						return;
 					}
 					}
@@ -405,10 +405,10 @@
 			if(this.isRedirect == 1){
 			if(this.isRedirect == 1){
 				if(option.amount){
 				if(option.amount){
 					this.amount = option.amount;
 					this.amount = option.amount;
+					this.isDeduction = option.isDeduction;
+					this.deductionCore = option.deductionCore;
 				}
 				}
-				console.log(this.amount)
 				this.totalPrice = this.amount;
 				this.totalPrice = this.amount;
-				console.log(this.totalPrice);
 				setTimeout(()=>{
 				setTimeout(()=>{
 					this.pay();
 					this.pay();
 				},500)
 				},500)

uni_modules/uni-share-wx/index.vue

@@ -54,7 +54,6 @@
 				this.$refs.sharewx.close()
 				this.$refs.sharewx.close()
 			},
 			},
 			uniShare(type) {
 			uniShare(type) {
-				let platform = uni.getSystemInfoSync().platform
 				let that = this
 				let that = this
 				this.closeShare()
 				this.closeShare()
 				this.submitsuessc(type)
 				this.submitsuessc(type)
@@ -62,7 +61,6 @@
 					provider: "weixin",
 					provider: "weixin",
 					scene: type === 1 ? "WXSceneSession" : "WXSceneTimeline",
 					scene: type === 1 ? "WXSceneSession" : "WXSceneTimeline",
 					type: 0,
 					type: 0,
-					systemType: platform == 'ios'? '0': '1',
 					href: that.WXdata.href,
 					href: that.WXdata.href,
 					title: that.WXdata.title,
 					title: that.WXdata.title,
 					summary: that.WXdata.summary,
 					summary: that.WXdata.summary,
@@ -101,8 +99,11 @@
 				// 			}
 				// 			}
 			},
 			},
 			submitsuessc(type){
 			submitsuessc(type){
+				let platform = uni.getSystemInfoSync().platform
+				
 				let that = this
 				let that = this
 				let UserShareRequestVO = {
 				let UserShareRequestVO = {
+					systemType: platform == 'ios'? '1': '0',
 					userId: uni.getStorageSync('cffp_userId'),
 					userId: uni.getStorageSync('cffp_userId'),
 					businessType: '1', // 分享类型
 					businessType: '1', // 分享类型
 					businessId: that.WXdata.fileId, // 课程Id
 					businessId: that.WXdata.fileId, // 课程Id