Merge branch 'dev' into 'master'

Dev

See merge request !109

components/commonTimePicker/commonTimePicker.vue

@@ -16,8 +16,8 @@
         <uni-popup ref="timePopup" type="bottom" :maskClick="false">
             <view class="timeBox">
                 <view class="titleBox">
-                    <view @click="cancel" style="color:#333;">取消</view>
-                    <view style="color:#20279b;" @click="confirm">确定</view>
+                    <view @click.stop="cancel" style="color:#333;">取消</view>
+                    <view style="color:#20279b;" @click.stop="confirm">确定</view>
                 </view>
                 <picker-view :indicator-style="indicatorStyle" :value="value" @change="bindChange" class="picker-view">
                     <picker-view-column v-if="showYear">
@@ -178,6 +178,7 @@ export default {
             immediate: true,
             handler(newVal) {
                 if (newVal && (newVal.year || newVal.month || newVal.day)) {
+					
                     this.updateSelectedDate(newVal);
                 } else {
                     // 没有传入有效日期时，清空显示

pages/courselist/courselist.vue

@@ -231,6 +231,7 @@
 			}
 
 		},
+		
 		onShow() {
 			this.isLoading = false
 			this.generatedImage = ''
@@ -308,8 +309,6 @@
 						'产品中心',
 						'pages/courselist/courselist'
 					)
-
-					console.log('env', dataHandling.h5RuntimeEnv() == 'wechat-miniprogram');
 					if (dataHandling.h5RuntimeEnv() == 'wechat-miniprogram') {
 						this.jumpMplogin()
 						return
@@ -392,21 +391,23 @@
 						title: this.shareItem.fileTitle,
 						desc: this.shareItem.fileSynopsis,
 						link: `${shareURL}/pages/lanch/index?fileId=${this.shareItem.fileId}&coursesharing=1&serialsNo=${nanoid()}&shareCode=${shareCode}&shareUserId=${this.userId}&jumpUrl=${jumptime}&landingPage=courseDetail&miniShare=1`,
-						// link: shareURL + "/pages/courseDetail/courseDetail?fileId=" + this.shareItem.fileId +
-						// 	'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode +
-						// 	'&shareUserId=' +
-						// 	this.userId + '&jumpUrl=' + jumptime + "&", //分享链接
 						imgUrl: this.shareItem.displayImage, //图片
 						commonId: this.shareItem.fileId,
-						sharePage: 'courseDetail' //分享出去得页面
+						sharePage: 'courseDetail', //分享出去得页面
+						userId:this.userId,
+						fileId:this.shareItem.fileId,
+						shareCode:shareCode,
+						isSaveShare:'1',//是否存贮分享便于统计分享数据
 					}
 					wx.miniProgram.postMessage({
 						data: {
 							type: 'share',
-							shareData: JSON.stringify(shareInfo)
+							shareData: JSON.stringify(shareInfo),
+							messageId: nanoid()  // 唯一消息ID
 						}
 
 					})
+					
 					return
 				}
 				this.getshareData2(shareCode, jumptime, this.shareItem)

pages/index/index.vue

@@ -341,6 +341,7 @@
 			this.dataToken = ''
 		  // 清除事件监听
 		  uni.$off('loginUpdate', this.queryAreaCenterInfo);
+		  
 		},
 		methods: {
 			 // 初始化首页分享   注意sdk时序问题。传递的url一定要是当前页面的url window.location.href.split('#')[0]

pages/lanch/index.vue

@@ -123,7 +123,7 @@
 					})
 				}else if(landingPage == 'orderStatus'){
 					uni.reLaunch({
-						url:`/pages/orderStatus/orderStatus?orderId=${jumpInfo.value.orderId}&fileId=${jumpInfo.value.fileId}&orderStatus=2&userId=${res.data.userId}`
+						url:`/pages/orderStatus/orderStatus?orderId=${jumpInfo.value.orderId}&fileId=${jumpInfo.value.fileId}&orderStatus=2&userId=${res.data.userId}&backMySelf=1`
 					})
 				}
 			} else {

pages/orderStatus/orderStatus.vue

@@ -57,6 +57,8 @@
 	import courseItem from "@/components/courseItem/courseItem.vue";
 	import tabBar from '../../components/tabBar/tabBar.vue';
 	import { initJssdkShare, setWechatShare } from '@/util/fiveshare';
+	import dataHandling from "@/util/dataHandling";
+	import wx from 'weixin-js-sdk'
 	export default {
 		components:{tabBar,courseItem},
 		data() {
@@ -155,6 +157,7 @@
 			this.orderId = options.orderId;
 			this.orderStatus = options.orderStatus;
 			this.fileId = options.fileId;
+			
 			// 没有oldToken代表支付订单人和提供订单人不是同一个人
 			if(options.userId && options.userId != "undefined"&&!uni.getStorageSync('oldToken')){
 				this.userId = options.userId;