Merge branch '20221201' into dev

pages/courseDetail/courseDetail.vue

@@ -322,7 +322,7 @@
 		onReady(){
 		onReady(){
 			this.videoContext = uni.createVideoContext('myVideo');
 			this.videoContext = uni.createVideoContext('myVideo');
 		},
 		},
-		destroyed() {
+		onUnload(){
 			if(this.timer){
 			if(this.timer){
 				clearInterval(this.timer)
 				clearInterval(this.timer)
 			}
 			}

pages/myShare/myShare.vue

@@ -78,14 +78,23 @@
 			return {
 			return {
 				queryDate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
 				queryDate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
 				maxDate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
 				maxDate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}`,
-				userId:'1',
-				coursesCountInfos:{},
+				userId:uni.getStorageSync('cffp_userId'),
+				coursesCountInfos: {
+							shareFrequencyMonth:0,
+							integralMonth:0,
+							shareSectionMonth:0,
+							shareFrequencyCount:0,
+							integralCount:0,
+							shareSectionCount:0
+						},
 				userShareCourses:[]
 				userShareCourses:[]
 			}
 			}
 		},
 		},
 		methods: {
 		methods: {
 		   bindDateChange: function(e) {
 		   bindDateChange: function(e) {
-				this.queryDate = e.detail.value
+				this.queryDate = e.detail.value;
+				this.userShareCount();
+				this.userShareQuery();
 			},
 			},
 			userShareCount(){
 			userShareCount(){
 				const params = {
 				const params = {
@@ -95,7 +104,17 @@
 				api.userShareCount(params).then(res=>{
 				api.userShareCount(params).then(res=>{
 					console.log(res)
 					console.log(res)
 					if(res['success']){
 					if(res['success']){
-						this.coursesCountInfos = res['data'];
+						this.coursesCountInfos = res['data'] ? res['data'] : this.coursesCountInfos;
+					}else{
+						this.coursesCountInfos = {
+							shareFrequencyMonth:0,
+							integralMonth:0,
+							shareSectionMonth:0,
+							shareFrequencyCount:0,
+							integralCount:0,
+							shareSectionCount:0
+						};
+						console.log(this.coursesCountInfos)
 					}
 					}
 				})
 				})
 			},
 			},
@@ -109,6 +128,8 @@
 					console.log(res)
 					console.log(res)
 					if(res['success']){
 					if(res['success']){
 						this.userShareCourses = res['data']['userShareCourses'];
 						this.userShareCourses = res['data']['userShareCourses'];
+					}else{
+						this.userShareCourses = [];
 					}
 					}
 				})
 				})
 			},
 			},

pages/orderStatus/orderStatus.vue

 <template>
 <template>
 	<view class="container">
 	<view class="container">
 		<view class="statusBox">
 		<view class="statusBox">
-			<view class="successBox" v-if="orderStatus==='1'">
+			<view class="successBox" v-if="orderStatus=='1'">
 				<i class="iconfont icon-dengdai"></i>
 				<i class="iconfont icon-dengdai"></i>
 				<text class="statusText">订单支付成功</text>
 				<text class="statusText">订单支付成功</text>
 				<text @click="viewDetail()" class="viewOrder">查看订单 ></text>
 				<text @click="viewDetail()" class="viewOrder">查看订单 ></text>
 			</view>
 			</view>
-			<view class="failBox" v-if="orderStatus!=='1'">
+			<view class="failBox" v-if="orderStatus!='1'">
 				<text style="color:#F04604"><i class="iconfont icon-guanbi"></i>订单支付失败</text>
 				<text style="color:#F04604"><i class="iconfont icon-guanbi"></i>订单支付失败</text>
 				<view class="optionBox">
 				<view class="optionBox">
 					<text @click="cancelOrder()">取消订单</text>
 					<text @click="cancelOrder()">取消订单</text>
@@ -66,6 +66,7 @@
 			this.orderId = options.orderId;
 			this.orderId = options.orderId;
 			this.orderStatus = options.orderStatus;
 			this.orderStatus = options.orderStatus;
 			this.fileId = options.fileId;
 			this.fileId = options.fileId;
+			console.log(this.orderStatus)
 		}
 		}
 	}
 	}
 </script>
 </script>