puyao 2 viikkoa sitten
vanhempi
commit
4890ad342a

+ 3 - 2
App.vue

@@ -6,8 +6,9 @@
 		globalData: {
 			// wsUrl: 'wss://websocket.cdwjyyh.com',
 			wsUrl: '',
-			// appId:'wx0d1a3dd485268521',//益寿缘
-			appId:'wx50bcb040b4963a7e',//营口市康安健康服务(益寿缘)
+			// appId:'wx0d1a3dd485268521',//益 寿缘
+			// appId:'wx50bcb040b4963a7e',//营口市康安健康服务(益 寿缘)
+			appId:'wx77eb4fff8ea1384b',//其他(益 寿缘)
 		},
 		onLoad: function (){
 			

+ 5 - 37
common/request.js

@@ -4,17 +4,8 @@ import store from '@/store/index.js'
 export default class Request {
 	http(router, data = {}, method,contentType) {
 		let that = this;
-		//let path = 'http://localhost:7014';
-		// let path = 'https://test.userapp.store.cdwjyyh.com';
-		// let path = 'https://user.test.ylrztop.com/api';
-		// let path = 'https://userapp.zkhj6.com/store'//中康
-		// let path = 'https://userapp.cqsft.vip/store'//四福堂
-		let path = 'https://userapp.ysya.top/store'//益寿缘
-		// let path = 'https://userapp.ysya.top/ceshi/store'//益寿缘测试
-		
-		// let path = 'http://w43fa358.natappfree.cc/store'//本地接口
-		// let path = 'https://userapp.moonxiang.com/prod-api/store'//北京存在文化商城
-		// let path = 'https://user.test.ylrztop.com/prod-api/store'//云联融智优选
+		let path = 'https://userapp.ysya.top/store'//益 寿缘
+		// let path = 'https://userapp.ysya.top/ceshi/store'//益 寿缘测试
 		let type = 0
 		uni.setStorageSync('requestPath',path)
 		// uni.showLoading({
@@ -23,11 +14,7 @@ export default class Request {
 		let token = uni.getStorageSync('AppToken');
 		if(router.indexOf("/companyapp")!=-1){
 			// router =router.replace('/companyapp','')
-			// path = 'https://userapp.zkhj6.com'//中康
-			// path = 'https://userapp.cqsft.vip'//四福堂
-			path = 'https://userapp.ysya.top'//益寿缘
-			 // path = 'https://user.test.ylrztop.com/prod-api'//云联融智优选
-			 // path = 'http://w43fa358.natappfree.cc'//本地接口
+			path = 'https://userapp.ysya.top'//益 寿缘
 			 type = 1
 			 token = uni.getStorageSync('ManageToken');
 		}
@@ -35,13 +22,7 @@ export default class Request {
 		if(router.indexOf("/course_auto")!=-1){
 			type = 2
 			router =router.replace('/course_auto','')
-			// path = 'https://userapp.gjh2024.com/apis'//金康键
-			// path = 'https://userapp.moonxiang.com/prod-api'//青岛市德瑞康
-			// path = 'http://w43fa358.natappfree.cc'
-			// path = 'https://userapp.zkhj6.com'//中康
-			// path = 'https://userapp.cqsft.vip'//四福堂
-			// path = 'https://userapp.ysya.top'//益寿缘
-			path = 'https://h5.ysya.top'//益寿缘
+			path = 'https://h5.ysya.top'//益 寿缘
 			
 			// path = 'https://user.test.ylrztop.com/prod-api'//云联融智优选
 			token =uni.getStorageSync(TOKEN_KEYAuto)
@@ -51,20 +32,7 @@ export default class Request {
 			type = 3
 			router =router.replace('/course_uniapp','')
 			//张玉朋
-			// let path = 'http://192.168.10.158:7014'//
-			// path = 'https://userapp.zkhj6.com'//中康
-			// path = 'https://user.test.ylrztop.com/api'//云融融智
-			// path = 'https://userapp.ashyisheng.com'//蜂巢快药(爱上嘉园)
-			// path = 'https://userapp.liangmiaoedu.com'//良苗
-			// path = 'https://usercourse.beliyostore.com'//倍力优
-			// path = 'https://userapp.bainian1000y.cn/prod-api'//百年康城
-			// path = 'https://userapp.whhm.ylrzcloud.com/prod-api'//惠名大药房
-			// path = 'https://userapp.cqsft.vip'//四福堂
-			// path = 'https://userapp.drkzyy.cn/prod-api'//青岛市德瑞康
-			// path = 'http://w43fa358.natappfree.cc'
-			// path = 'https://userapp.zkhj6.com'//中康
-			// path = 'https://userapp.cqsft.vip'//四福堂
-			path = 'https://userapp.ysya.top'//益寿缘
+			path = 'https://userapp.ysya.top'//益 寿缘
 			// path = 'https://user.test.ylrztop.com/prod-api'//云联融智优选
 			token =uni.getStorageSync('TOKEN_WEXIN')
 		}

+ 1 - 1
manifest.json

@@ -52,7 +52,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx50bcb040b4963a7e",
+        "appid" : "wx77eb4fff8ea1384b",
         "setting" : {
             "urlCheck" : false
         },

+ 2 - 2
pages.json

@@ -24,7 +24,7 @@
 		{
 			"path": "pages/home/index",
 			"style": {
-				"navigationBarTitleText": "益寿缘商城",
+				"navigationBarTitleText": "久运天天康 商城",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
 				"app-plus": {
@@ -1249,7 +1249,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "益寿缘",
+		"navigationBarTitleText": "久运天天康 ",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF"
 	},

+ 1 - 1
pages/auth/login.vue

@@ -7,7 +7,7 @@
 		  	<view class="logo-img">
 		  		<image  :src="imgPath+'/app/image/logo.png'"></image>
 		  	</view>
-		  	<view class="title">益寿缘</view>
+		  	<view class="title">久运天天康 </view>
 		  </view>
         <!-- <open-data class="user-avatar" type="userAvatarUrl"></open-data>
         <open-data class="user-name" type="userNickName"></open-data> -->

+ 1 - 1
pages/common/launch.vue

@@ -5,7 +5,7 @@
 				<view class="circle"></view>
 				<image src="https://ysy-1329817240.cos.ap-guangzhou.myqcloud.com/app/image/logo.png"></image>
 			</view>
-			<text class="text">益寿缘</text>
+			<text class="text">久运天天康 </text>
 		</view>
 	</view>
 </template>

+ 10 - 8
pages/home/index.vue

@@ -8,8 +8,8 @@
 					<!-- 这里是状态栏 -->
 					<view class="status_bar" :style="{height: statusBarHeight}"></view>
 					<view class="top-title">
-						<!-- <view class="name">益寿缘</view> -->
-						<image class="name" src="https://ysy-1329817240.cos.ap-guangzhou.myqcloud.com/shop/images/name.png"></image>
+						<view class="name">久运天天康 </view>
+						<!-- <image class="name" src="https://ysy-1329817240.cos.ap-guangzhou.myqcloud.com/shop/images/name.png"></image> -->
 						<!-- <view class="dot">•</view><view class="sub-name">七彩互联网医院</view> -->
 					</view>
 					<!-- 搜索框、购物车、客服 -->
@@ -61,7 +61,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="open-class radius12">
+		<!-- <view class="open-class radius12">
 			<view class="title-box">
 				<text class="title">健康大讲堂</text>
 				<view class="more" @click="goClassList(1)">
@@ -79,7 +79,7 @@
 					<view class="ellipsis">{{item.courseName}}</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="modules">
 			<view class="module">
 			</view>
@@ -311,7 +311,7 @@
 		},
 		onShareAppMessage(res) {
 			return {
-				title: '益寿缘-您的专属健康解决方案',
+				title: '久运天天康 -您的专属健康解决方案',
 				path: `/pages/common/launch`,
 				imageUrl: this.$store.state.imgpath+'/app/image/logo.png'//分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
@@ -323,7 +323,7 @@
 		//分享到朋友圈
 		onShareTimeline(res) {
 			return {
-				title: '益寿缘-您的专属健康解决方案',
+				title: '久运天天康 -您的专属健康解决方案',
 				query: '', //页面参数
 				imageUrl: this.$store.state.imgpath+'/app/image/logo.png'//分享图标,路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
@@ -888,9 +888,11 @@
 				justify-content: flex-start;
 
 				.name {
-					margin-left: 15rpx;
-					width: 183rpx;
+					margin-left: 36rpx;
+					// width: 183rpx;
 					height: 75rpx;
+					font-size: 40rpx;
+					font-weight: bold;
 					image{
 						width:100%;
 						height:100%;

+ 65 - 0
pages_course/components/courseExpiration.vue

@@ -0,0 +1,65 @@
+<template>
+	<view class="container-body">
+		<image class="kfqrcode" v-if="qrcode" :src="qrcode" show-menu-by-longpress="true"></image>
+		<image v-else src="/static/course_expiration_img.png" mode="aspectFill"></image>
+		<u-parse class="title" :content="msg"></u-parse>
+		<view class="user" v-if="userId">#{{userId}}</view>
+		<view style="margin-bottom: 10vh;" v-show="code">状态码:{{code}}</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:['code','qrcode','msg','userId'],
+		data() {
+			return {
+			
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.kfqrcode {
+		height: 460rpx;
+		width: 460rpx;
+	}
+	.container-body {
+		background-color: #fff;
+		position: fixed;
+		top: 0;
+		right: 0;
+		z-index: 9998;
+		justify-content: center;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #757575;
+		line-height: 48rpx;
+		text-align: center;
+		height: 100vh;
+		width: 100vw;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		.title {
+			font-weight: bold;
+			font-size: 40rpx;
+			color: #1E2F67;
+			margin-bottom: 24rpx;
+			padding: 0 60rpx;
+		}
+		image {
+			width: 428rpx;
+			height: 360rpx;
+			margin-bottom: 30rpx;
+		}
+		.user {
+			// position: absolute;
+			right: 24rpx;
+			top: 124rpx;
+			z-index: 9999;
+		}
+	}
+</style>

+ 21 - 1
pages_course/video.vue

@@ -257,6 +257,9 @@
 				<button class="send" @click="handleChatInput">发送</button>
 			</view>
 		</view>
+		<ykscreenRecord></ykscreenRecord>
+		<courseExpiration v-if="showExpiration" :code="resCode" :msg="resMsg" :qrcode="qrcode"
+		:userId="user && user.userId ? user.userId : ''"></courseExpiration>
 	</view>
 </template>
 
@@ -281,6 +284,8 @@
 		loginByMp,
 		getRealLink
 	} from "@/api/courseAuto.js"
+	import ykscreenRecord from '@/components/yk-screenRecord/yk-screenRecord.vue'
+	import courseExpiration from './components/courseExpiration.vue'
 	import {
 		getConfigByKey
 	} from "@/api/user.js"
@@ -291,9 +296,14 @@
 			descInfo,
 			commentBox,
 			ques,
+			ykscreenRecord,
+			courseExpiration
 		},
 		data() {
 			return {
+				resMsg :'',
+				resCode:"",
+				showExpiration:false,
 				code: '',
 				baseUrl:uni.getStorageSync('requestPath'),
 				// 1 红包 2 积分
@@ -1128,14 +1138,17 @@
 						if (res.code == 200) {
 							this.isAddKf = 1
 							this.getH5CourseVideoDetails()
+							this.initExpiration(res.msg,res.code)
 						} else if (res.code == 400) {
 							this.isAddKf = 0
 							this.qrcode = res.qrcode
 							this.qrcodeMsg = res.msg
 							this.$refs.kfPopup.open()
+							this.initExpiration(res.msg,res.code)
 						} else if (res.code == 504) {
 							// 登录
-							// this.goLogin()
+							this.goLogin()
+							// this.initExpiration(res.msg,res.code)
 						} else if (res.code == 566) {
 							// 官方群发通用链接
 							const url = res.courseLink.realLink.split('?course=')[1]
@@ -1156,11 +1169,18 @@
 								title: res.msg,
 								icon: 'none'
 							});
+							this.initExpiration(res.msg,res.code)
 						}
 					},
 					err => {}
 				);
 			},
+			initExpiration(resMsg,resCode) {
+				if(resCode==401) return;
+				this.resMsg = resMsg
+				this.resCode = resCode
+				this.showExpiration = true
+			},
 			closeKFPop() {
 				this.$refs.kfPopup.close()
 			},

+ 23 - 0
pages_course/videovip.vue

@@ -268,6 +268,9 @@
 		</view>
 		<u-loading-page :loading="viewload" iconSize="32" loadingColor="#3c9cff" fontSize="24"
 		:loading-text="loadingtext"></u-loading-page>
+		<ykscreenRecord></ykscreenRecord>
+		<courseExpiration v-if="showExpiration" :code="resCode" :msg="resMsg" :qrcode="qrcode"
+		:userId="user && userInfo.userId ? userInfo.userId : ''"></courseExpiration>
 	</view>
 </template>
 
@@ -289,12 +292,21 @@
 		loginByMiniApp,
 		handleFsUserWx
 	} from "@/api/courseLook.js"
+	import ykscreenRecord from '@/components/yk-screenRecord/yk-screenRecord.vue'
+	import courseExpiration from './components/courseExpiration.vue'
 	import {
 		getConfigByKey
 	} from "@/api/user.js"
 	export default {
+		components:{
+			ykscreenRecord,
+			courseExpiration
+		},
 		data() {
 			return {
+				resMsg :'',
+				resCode:"",
+				showExpiration:false,
 				videoItem:{},
 				viewload:true,
 				loadingtext:"数据加载中...",
@@ -1496,6 +1508,7 @@
 								title: "请添加管理员微信,成为会员!",
 								icon: 'none'
 							});
+							this.initExpiration(res.msg,res.code)
 						}else if(res.code==505){
 							this.isAddKf = 0
 							this.qrcode=res.ext
@@ -1504,12 +1517,14 @@
 								title: "管理员开启了会员审核,请等待审核!",
 								icon: 'none'
 							});
+							this.initExpiration(res.msg,res.code)
 						}else if(res.code==406){
 							uni.hideLoading();
 							uni.showToast({
 								icon:'none',
 								title: '该用户已成为其他销售会员',
 							});
+							this.initExpiration(res.msg,res.code)
 						}else if(res.code==504){
 							this.isAddKf = 0
 							this.iskftype=1
@@ -1517,7 +1532,9 @@
 								title: res.msg,
 								icon: 'none'
 							});
+							this.initExpiration(res.msg,res.code)
 						}else {
+							this.initExpiration(res.msg,res.code)
 							this.isAddKf = 0
 							uni.showToast({
 								title: res.msg,
@@ -1528,6 +1545,12 @@
 					err => {}
 				);
 			},
+			initExpiration(resMsg,resCode) {
+				if(resCode==401) return;
+				this.resMsg = resMsg
+				this.resCode = resCode
+				this.showExpiration = true
+			},
 			closeKFPop() {
 				// this.$refs.kfPopup.close()
 				// this.kfPopup=!this.kfPopup

+ 2 - 1
pages_course/webview.vue

@@ -49,7 +49,7 @@ export default {
 		 const h5course=uni.getStorageSync('H5course')
 		  var data = {
 		  	code: datas,
-			appId:this.appId,
+			appId:this.appid,
 			companyId:h5course.companyId,
 			companyUserId:h5course.companyUserId,
 			projectId:h5course.projectId
@@ -64,6 +64,7 @@ export default {
 		  				icon:'none',
 		  				title: "成功获取用户信息",
 		  			});
+					this.$store.commit('setCoureLogin', 1);
 					this.userinfos.nickname=res.user.nickname
 					this.userinfos.avatar=res.user.avatar
 					uni.setStorageSync("userinfos",this.userinfos)

+ 2 - 2
pages_user/user/pay.vue

@@ -4,7 +4,7 @@
 			<view class="inner">
 				<view class="pay">
 					<view class="title">
-						<text class="name">付款给 益寿缘</text>
+						<text class="name">付款给 久运天天康 </text>
 						<text class="desc">微信收款</text>
 					</view>
 					<view class="pay-money">
@@ -64,7 +64,7 @@
 		},
 		onShareAppMessage(res) {
 			return {
-				title: '益寿缘-收款',
+				title: '久运天天康 -收款',
 				path: `/pages_user/user/pay?companyId=`+this.companyId+"&companyUserId="+this.companyUserId
 			}
 		},

+ 2 - 2
pages_user/user/userTuiAdd.vue

@@ -1,12 +1,12 @@
 <template>
   <view>
 		<view class="form-box">
-			<view class="title">你为什么想成为益寿缘健康推广?</view>
+			<view class="title">你为什么想成为久运天天康 健康推广?</view>
 			<view class="textarea-box">
 				<textarea v-model="question1" value="" placeholder="请输入..." maxlength="200" placeholder-class="textarea-place" />
 				<view class="num-box">{{ question1.length }}/200</view>
 			</view>
-			<view class="title">你是否了解益寿缘健康推广大使?</view>
+			<view class="title">你是否了解久运天天康 健康推广大使?</view>
 			<view class="textarea-box">
 				<textarea v-model="question2" value="" placeholder="请输入..." maxlength="200" placeholder-class="textarea-place" />
 				<view class="num-box">{{ question1.length }}/200</view>

BIN
static/course_expiration_img.png


+ 7 - 6
store/index.js

@@ -13,13 +13,14 @@ export default new Vuex.Store({
 	 wsDanmuUrl: 'wss://userapp.ysya.top', // 弹幕评论接口地址
 	 //红包领取规则:
 	 answerType: 1, //红包领取规则 0:完课且最后一分钟(第二次无需最后一分钟), 1:按完课百分比答题领红包
-	 isSpare:0, // 0,主要小程序,1:备选
+	 isSpare:1, // 0,主要小程序,1:备选
 	 uploadFile: 'https://userapp.ysya.top',
-	imgpath: 'https://ysy-1329817240.cos.ap-guangzhou.myqcloud.com',//益寿缘图片请求地址
-	logoname:'益寿缘',
-	// appid:'wx0d1a3dd485268521',//益寿缘
-	appid:'wx50bcb040b4963a7e',//营口市康安健康服务(益寿缘)
-	// appid:'wx6d21646ba042d66f',//久运健康线上服务(益寿缘)
+	imgpath: 'https://ysy-1329817240.cos.ap-guangzhou.myqcloud.com',//益 寿缘图片请求地址
+	logoname:'久运天天康 ',
+	// appid:'wx0d1a3dd485268521',//益 寿缘
+	// appid:'wx50bcb040b4963a7e',//营口市康安健康服务(益 寿缘)
+	// appid:'wx6d21646ba042d66f',//久运健康线上服务(益 寿缘)
+	appid:'wx77eb4fff8ea1384b',//营口市康安健康服务(益 寿缘)
   },
   mutations: {
     setCount(state, value) {