Merge branch 'master' of http://1.14.104.71:10880/root/his_user_miniapp

api/course.js

@@ -41,7 +41,7 @@ export function getIsAddKf(data) {
 }
 
 // 流量(缓冲百分比)
-export function getInternetTraffic(data) {
+export function internetTraffic(data) {
 	return request('/app/course/getInternetTraffic', data, 'POST', 'application/json;charset=UTF-8','https://h5api.his.cdwjyyh.com');
 }
 

components/CustomCamera/WeChat/Layout.vue

@@ -38,19 +38,19 @@
 				isLogin: false
 			}
 		},
-		onShow() {
-			this.$isLogin().then(
-				res => {
-					if(res){
-						this.isLogin = true
-						this.getCount()
-					} else{
-						this.isLogin = false
-					}
-				}
-			);
-		},
 		methods: {
+			initShow() {
+				this.$isLogin().then(
+					res => {
+						if(res){
+							this.isLogin = true
+							this.getCount()
+						} else{
+							this.isLogin = false
+						}
+					}
+				);
+			},
 			switchCamera(){
 				if(!this.isLogin){
 					uni.navigateTo({

components/CustomCamera/WeChat/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<Layout @instruct="handleInstruct" @switchCamera="switchCamera()" @takePhoto="takePhoto" >
+	<Layout ref="Layout" @instruct="handleInstruct" @switchCamera="switchCamera()" @takePhoto="takePhoto" >
 		<camera class="camera"  mode="normal" :device-position="device" @error="error"
 			style="width: 100%; height: 100%;">
 			<cover-view class="cover-view">
@@ -63,6 +63,9 @@
 			// this.coverImage = '/static/images/portrait.jpg'
 		},
 		methods: {
+			initShow() {
+				this.$refs.Layout.initShow()
+			},
 			navTo() {
 				uni.navigateTo({
 					url: "/pages_user/tongue/ques"

pages_course/video.vue

@@ -147,7 +147,7 @@
 				<view class="popupbox-content">
 					<view :class="lineIndex == index ? 'line-item line-active': 'line-item'"
 						v-for="(it,index) in lineList" :key="index" @click="handleLine(index)">
-						线路{{numberToChinese(lineIndex + 1)}}</view>
+						线路{{numberToChinese(index + 1)}}</view>
 				</view>
 			</view>
 		</uni-popup>
@@ -264,7 +264,7 @@
 		courseAnswer,
 		getFinishCourseVideo,
 		getIsAddKf,
-		getInternetTraffic,
+		internetTraffic,
 		getIntegralByH5Video,
 		sendReward,
 		loginByMp,
@@ -667,7 +667,6 @@
 							this.isFinish = res.isFinish || 0
 							this.duration = res.course && res.course.duration ? res.course.duration : 0
 							this.playDuration = res.playDuration || 0
-							this.playDurationSeek = res.playDuration || 0
 							this.tipsTime = res.tipsTime || 0
 							let lineList = []
 							if (res.course && res.course.lineOne) {
@@ -708,6 +707,7 @@
 								// this.options.poster = res.course && res.course.imgUrl ? res.course.imgUrl : ''
 								// this.initVideo()
 								this.playTime = this.playDuration >= this.duration ? 0 : this.playDuration
+								this.playDurationSeek = this.playTime
 								setTimeout(()=>{
 									this.player = uni.createVideoContext('video-content-box');
 									this.player.seek(this.playTime)
@@ -723,6 +723,7 @@
 								// 	}
 								// }
 								this.playTime = this.playTime > this.playDuration ? this.playTime : this.playDuration >= this.duration ? 0 : this.playDuration
+								this.playDurationSeek = this.playTime
 								this.player.seek(this.playTime)
 								this.player.play();
 							}
@@ -979,11 +980,20 @@
 							this.isCheckRealUrl = false
 							this.goLogin()
 						} else if (res.code == 566) {
-							this.isAddKf = 1
-							this.isCheckRealUrl = true
 							// 官方群发通用链接
 							const url = res.courseLink.realLink.split('?course=')[1]
 							this.urlOption = JSON.parse(url)
+							this.isAddKf = 1
+							this.isCheckRealUrl = true
+							this.getH5CourseVideoDetails()
+						} else if (res.code == 567) {
+							// 群聊通用链接
+							this.urlOption = {
+								...this.urlOption,
+								qwExternalId: res.qwExternalId
+							}
+							this.isAddKf = 1
+							this.isCheckRealUrl = true
 							this.getH5CourseVideoDetails()
 						} else {
 							this.isCheckRealUrl = false
@@ -1043,7 +1053,7 @@
 					bufferRate: Number(this.bufferRate.toFixed(2)),
 				}
 				if(!param.bufferRate) return
-				getInternetTraffic(param)
+				internetTraffic(param)
 			},
 			getErrMsg(err,type) {
 				let msgerr = {

pages_course/videoOld.vue

@@ -228,7 +228,7 @@
 		courseAnswer,
 		getFinishCourseVideo,
 		getIsAddKf,
-		getInternetTraffic,
+		internetTraffic,
 		getIntegralByH5Video,
 		sendReward,
 		loginByMp,
@@ -1038,7 +1038,7 @@
 					bufferRate: Number(this.bufferRate.toFixed(2)),
 				}
 				if(!param.bufferRate) return
-				getInternetTraffic(param).then(res=>{
+				internetTraffic(param).then(res=>{
 					if(res&&res.code==500&&res.msg == '未知异常，请联系管理员'){
 						this.sendErrorLog('/app/course/getInternetTraffic',param)
 					}

pages_order/inquiryForm2_2.vue

@@ -479,6 +479,13 @@
 					});
 					return;
 				}
+				if(this.form.isVisit=='未就诊'){
+					uni.showToast({
+						icon:'none',
+						title: '仅支持复诊',
+					});
+					return;
+				}
 				if(this.orderKey==null){
 					this.confirm();
 				}

pages_order/inquiryPay.vue

@@ -189,7 +189,7 @@
 				);
 			},
 			getMyEnableCouponList(){
-				var data={couponType:3}
+				var data={couponType:3,orderId:this.orderId}
 				getMyEnableCouponList(data).then(
 					res => {
 						if(res.code==200){

pages_order/packageOrderPay.vue

@@ -342,7 +342,9 @@
 				);
 			},
 			getMyEnableCouponList(){
-				var data={}
+				var data={
+					orderId:this.orderId
+				}
 				if(this.package.isShow==0){
 					data.couponType=5;
 					data.cateId=this.package.privateType

pages_order/storeOrderPay.vue

@@ -244,9 +244,9 @@
 				);
 			},
 			getMyEnableCouponList(){
-				let data={couponType:2}
+				let data={couponType:2,orderId:this.orderId}
 				if(this.order.orderType == 2) {
-					data={couponType:'2,4'}
+					data={couponType:'2,4',orderId:this.orderId}
 				}
 				getMyEnableCouponList(data).then(
 					res => {

pages_user/tongue/index.vue

@@ -20,6 +20,11 @@
 		onLoad(options) {
 			this.coverImageType = options.coverImageType
 		},
+		onShow() {
+			this.$nextTick(()=>{
+				this.$refs.CustomCamera.initShow()
+			})
+		},
 		onShareAppMessage(res) {
 			return {
 				title: "AI舌诊",