add

common/request.js

@@ -6,43 +6,7 @@ export default class Request {
 	http(router, data = {}, method,contentType) {
 		let that = this;
 		let type = 0;
-<<<<<<< HEAD
-		//let path = 'https://userapi.scrm.ylrzcloud.com'//云联融智
-		//let path = 'https://userappkyt.ylrzcloud.com'//宽益堂
-=======
-		// let path = 'https://user.test.ylrztop.com/api'//云联融智
-		 //let path = 'https://userappkyt.ylrzcloud.com'//宽益堂
->>>>>>> b53250c80fab209f9c8ef79b7d9ca16abd04a782
-		// let path = 'https://userapp.schstyl.cn'//鸿森堂
-		// let path = 'https://userapp.myks8.com'//恒春来
-		// let path = 'https://userapp.nmghysmytdyf.com'//蒙一堂
-		// let path = 'https://usercourse.beliyostore.com'//倍力优
-		// let path = 'https://app.bainian1000y.cn/prod-api'//百年康成
-		// let path = 'http://a9e258d6.natappfree.cc'//百年康成本地
-		// let path = 'https://userapp.zkhj6.com'//中康
-		// let path = 'http://192.168.10.158:8007'//中康
-		// let path = 'https://userapp.myks8.com' //恒春来
-		// let path = 'https://userapp.jiuzhouzaixian.com'//九州
-		// let path = 'https://userapp.bjyjbao.com'//医健宝
-		let path = 'https://userapp.yytcdta.com'//晚景如春 鹤颜堂
-		// let path = 'https://userapp.yixingjian.top'//宏医堂
-		// let path = 'https://userapp.cqsft.vip'//四福堂
-		// let path = 'https://userapp.ljhehualu.com'//济南联志健康
-		// let path = 'https://yjb.mynatapp.cc'//本地
-		// let path = 'https://hatuserapp.ylrzfs.com'//恒安图
-	    let path = 'https://ddgyuserapp.slxinxi.top'//叮当国医
-		// let path = 'https://userapp.cykbja.cn/prod-api'//纯正堂
-		// let path = 'https://userapp.moonxiang.com'//存在文化
-		// let path = 'https://userapp.jilinmaoq.cn'//顺亿景
-<<<<<<< HEAD
-		// let path = 'https://userapp.bjyjbao.com'//医健宝
-		//let path = 'https://userapp.bainian1000y.cn'//百年康成
-=======
-		//let path = 'https://userapp.bjyjbao.com'//医健宝
-		// let path = 'https://userapp.bainian1000y.cn'//百年康成
->>>>>>> b53250c80fab209f9c8ef79b7d9ca16abd04a782
-		// let path = 'https://userapp.jilinmaoq.cn'//致医
-		// let path = 'https://userapp.cfrytjkzx.cn'//润元堂
+		let path= "https://userapp.jnmyunl.com" // 金牛
 		uni.setStorageSync('requestPath',path)
 		// uni.showLoading({
 		// 	  title: '加载中'

manifest.json

@@ -50,25 +50,22 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-<<<<<<< HEAD
-        "appid" : "wx36b87a0820734de8",
-=======
-        "appid" : "wx90ad5ee96038c413",
->>>>>>> b53250c80fab209f9c8ef79b7d9ca16abd04a782
+        "appid" : "wxdfcdcbf21e915589",
         "setting" : {
             "urlCheck" : false,
-            "minified" : true
+            "minified" : true,
+            "postcss" : false,
+            "es6" : false
+        },
+        "optimization" : {
+            "subPackages" : true
         },
-<<<<<<< HEAD
-        "lazyCodeLoading" : "requiredComponents",
         "usingComponents" : true,
-        "secureNetwork" : {
-            "enable" : false
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "获取位置用于给您推送相关信息"
+            }
         }
-
-=======
-        "usingComponents" : true
->>>>>>> b53250c80fab209f9c8ef79b7d9ca16abd04a782
     },
     "mp-alipay" : {
         "usingComponents" : true

pages.json

@@ -28,17 +28,6 @@
 				"navigationBarTitleText" : ""
 			}
 		},
-<<<<<<< HEAD
-
-=======
-		// {
-		// 	"path" : "pages/course/videovip",
-		// 	"style" : 
-		// 	{
-		// 		"navigationBarTitleText" : ""
-		// 	}
-		// },
->>>>>>> b53250c80fab209f9c8ef79b7d9ca16abd04a782
 		{
 			"path" : "pages/healthTest/healthTest",
 			"style" : 

pages_course/video.vue

@@ -11,46 +11,45 @@
 			</view>
 			<view class="header-title" :style="{width:menuButtonLeft + 'px',height:menuButtonH+'px',lineHeight:menuButtonH+'px'}">{{courseInfo.title}}</view>
 		</view>
-		
-		  <ylvideo
-				  :videoUrl="videoUrl" 
-				  :showCover="!isLogin || isAddKf!=1"
-				  :poster="poster" 
-				  :title="title"
-				  :autoplay="false"
-				  :enableDanmu="enableDanmu"
-				  :danmuList="danmuList"
-				  :danmuBtnShow="openCommentStatus==2&&isfull&&crtShow&&isLogin&&isAddKf==1"
-				  :danmuBtnImage="imgPath+'/app/image/danmu_set.png'"
-				  :courseLogo="courseLogo"
-				  :controls="true"
-				  :show-center-play-btn="true"
-				  :enable-progress-gesture="false"
-				  :auto-pause-if-open-native="true"
-				  :auto-pause-if-navigate="true"
-				  :show-progress="showProgress"
-				  :picture-in-picture-mode="[]"
-				  :show-background-playback-button="false"
-				  :isVip="false"
-				  :showDanmu="showDanmu"
-				  :openCommentStatus="openCommentStatus"
-				  :cmd="playerCmd"
-				  :seekDuration="seekDuration"
-				  @timeupdate="onTimeUpdate" 
-				  @play="getPlay" 
-				  @pause="getPause" 
-				  @ended="getEnded" 
-				  @error="videoErrorCallback"
-				  @progress="progressChange"
-				  @controlstoggle="controlstoggle"
-				  @fullscreenchange="fullscreenchange"
-				  @danmu-btn-click="openDanmu(1)">
-					
-			</ylvideo>
 
-		<!-- <view class="video-box">
+		<view class="video-box">
 			<image v-if="!isLogin || isAddKf!=1" class="video-poster" :src="courseInfo.imgUrl" mode="aspectFill"></image>
-			<video 
+			<ylvideo
+			  :videoUrl="videoUrl" 
+			  :showCover="!isLogin || isAddKf!=1"
+			  :poster="poster" 
+			  :title="title"
+			  :autoplay="true"
+			  :enableDanmu="enableDanmu"
+			  :danmuList="danmuList"
+			  :danmuBtnShow="openCommentStatus==2&&isfull&&crtShow&&isLogin&&isAddKf==1"
+			  :danmuBtnImage="imgPath+'/app/image/danmu_set.png'"
+			  :courseLogo="courseLogo"
+			  :controls="true"
+			  :show-center-play-btn="true"
+			  :enable-progress-gesture="false"
+			  :auto-pause-if-open-native="true"
+			  :auto-pause-if-navigate="true"
+			  :show-progress="showProgress"
+			  :picture-in-picture-mode="[]"
+			  :show-background-playback-button="false"
+			  :isVip="false"
+			  :showDanmu="showDanmu"
+			  :openCommentStatus="openCommentStatus"
+			  :cmd="playerCmd"
+			  :seekDuration="seekDuration"
+			  @timeupdate="onTimeUpdate" 
+			  @play="getPlay" 
+			  @pause="getPause" 
+			  @ended="getEnded" 
+			  @error="videoErrorCallback"
+			  @progress="progressChange"
+			  @controlstoggle="controlstoggle"
+			  @fullscreenchange="fullscreenchange"
+			  @danmu-btn-click="openDanmu(1)">
+				
+		</ylvideo>
+			<!-- <video 
 				@timeupdate="onTimeUpdate" 
 				@progress="progressChange" 
 				@error="videoErrorCallback" 
@@ -82,8 +81,8 @@
 					<cover-image class="video-danmu-image" :src="imgPath+'/app/image/danmu_set.png'" @click="openDanmu(1)"></cover-image>
 				</cover-view>
 				<cover-image v-if="courseLogo" :class="isfull?'logo-full':'logo'" :src="courseLogo" mode="widthFix"></cover-image>
-			</video>
-		</view> -->
+			</video> -->
+		</view>
 	
 		<!-- 弹幕方法 -->
 		<commentBox
@@ -351,7 +350,7 @@
 				scrollTop: 0,
 				height: '0px',
 				isLogin: false,
-				videoUrl: "https://ddgytcpv.ylrzcloud.com/course_transcode_100301/20251016/1760584777981.mp4",
+				videoUrl: "",
 				videoId: "",
 				//现在的时长
 				playTime: 0,

store/index.js

@@ -15,109 +15,9 @@ export default new Vuex.Store({
 		//红包领取规则:
 		answerType: 1, //红包领取规则 0：完课且最后一分钟（第二次无需最后一分钟）， 1:按完课百分比答题领红包
 		isSpare:1, // 0，主要小程序，1：备选
-<<<<<<< HEAD
-		uploadFile: 'https://userapp.zkhj6.com',
-		// imgpath: 'https://hylj-1323137866.cos.ap-chongqing.myqcloud.com',//云联融智图片请求地址
-		// logoname:'云联融智工具',
-		// appid:'wx36b87a0820734de8',
-=======
-		uploadFile: 'https://userapp.cqsft.vip',
->>>>>>> b53250c80fab209f9c8ef79b7d9ca16abd04a782
-		// imgpath: 'https://hylj-1323137866.cos.ap-chongqing.myqcloud.com',//云联融智图片请求地址
-		// logoname:'云联融智优选',
-		// appid:'wxd70f99287830cb51',
-		// imgpath: 'https://zkzh-2025.oss-cn-beijing.aliyuncs.com',//中康未来智慧药房图片请求地址
-		// //https://zkzh-2025.oss-cn-beijing.aliyuncs.com/shop  中康商城图片链接
-		// logoname:'中康未来智慧',
-		// appid:'wx964c80711d03b653',//中康未来智慧炮灰
-		// imgpath: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com',//医健宝图片请求地址
-		// logoname:'医建宝',
-		// appid:'wx71a02aea709ca916',
-		imgpath: 'https://cdhyt-1323137866.cos.ap-chongqing.myqcloud.com',//鹤颜堂图片请求地址
-		logoname:'鹤颜堂',
-		appid:'wxd61fe671f8b52a81',
-		// imgpath: 'https://sft-1361917636.cos.ap-chongqing.myqcloud.com',//四福堂图片请求地址
-		// logoname:'四福堂',
-		// appid:'wxf1bb222ab166cd69',
-		// imgpath: 'htps://whhm-1361716159.cos.ap-chongqing.myqcloud.com',//惠名大药房图片请求地址
-		// logoname:'惠名大药房',
-		// appid:'wxc9553ad82d0d61b8'//h5,
-		// imgpath: 'https://liangmiao.obs.cn-southwest-2.myhuaweicloud.com',//良苗图片请求地址
-		// logoname:'良苗',
-		// appid:'wx80dc06697b583cd9',
-		// imgpath: 'https://beiliyo-2025.obs.cn-north-4.myhuaweicloud.com',//倍力优图片请求地址
-		// logoname:'倍力优',
-		// appid:'wx301ab2fad04c658a',
-		// imgpath: 'https://bnkc-1323137866.cos.ap-chongqing.myqcloud.com',//百年康城图片请求地址
-		// logoname:'百年康成',
-		// appid:'wx65e5d520e35bf3f5'//百年康成服务,
-		// imgpath: 'https://drk-1363981074.cos.ap-chongqing.myqcloud.com',//德瑞康图片请求地址
-		// logoname:'青岛市德瑞康',
-		// appid:'wx29d26f63f836be7f',
-		// imgpath: 'https://bjczwh.oss-cn-beijing.aliyuncs.com',//北京存在文化
-		// logoname:'食养生活',
-		// appid:'wx94951f52d3ac5e25',
-		// imgpath: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com',//医健宝图片请求地址
-		// logoname:'医建宝', 
-		// // appid:'wx292f374177ff847b',
-		// imgpath: 'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com', //宽益堂
-		// logoname: '宽益堂',
-<<<<<<< HEAD
-		// appid: 'wx0cc48207ad9a8d72',
-=======
-		// appid: 'wx4e3a6125cb947879',
->>>>>>> b53250c80fab209f9c8ef79b7d9ca16abd04a782
-		// imgpath: 'https://hst2-1323137866.cos.ap-chongqing.myqcloud.com',//鸿森堂商城图片请求地址
-		// logoname:'鸿森堂',
-		// appid:'wx3cdd3fe77e04836d',//鸿森堂
-		// imgpath: 'https://hcl-1323137866.cos.ap-chongqing.myqcloud.com', //恒春来
-		// logoname: '恒春来',
-		// appid: 'wxa322a80a64bcba71',
-		// imgpath: 'https://fs-1314500630.cos.ap-beijing.myqcloud.com',//蒙一堂商城图片请求地址
-		// // https://fs-1314500630.cos.ap-beijing.myqcloud.com/shop  蒙一堂商城图片链接
-		// logoname:'蒙一堂',
-		// appid:'wx0e1a02ff5612ef1b',//蒙一堂
-		// imgpath: 'https://hcl-1b2b.obs.cn-south-1.myhuaweicloud.com',//恒春来
-		// logoname:'恒春来',
-		// appid:'wxa322a80a64bcba71', //
-		// imgpath: 'https://obs.yixingjian.top',//宏医堂
-		// logoname:'宏医堂工具',
-		// appid:'wx61494812051353e1',
-		// imgpath: 'https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com',//济南联志健康
-		// logoname:'济南联志健康',
-		// appid:'wx0b01b2fc3be51747',
-		// imgpath: 'https://hat-1323137866.cos.ap-chongqing.myqcloud.com',//恒安图
-		// logoname:'恒安图',
-		// appid:'wx790b9935df1b8d7d',
-		// imgpath: 'https://ddgy-1323137866.cos.ap-chongqing.myqcloud.com',//叮当国医
-<<<<<<< HEAD
-		logoname:'叮当国医',
-		appid:'wx10f9a97f2885949a',
-		imgpath: 'https://ddgy-1323137866.cos.ap-chongqing.myqcloud.com',//叮当国医
-=======
-		// logoname:'叮当国医',
-		// appid:'wxa283e62f92580eb0',
-		// imgpath: 'https://ddgy-1323137866.cos.ap-chongqing.myqcloud.com',//叮当国医
->>>>>>> b53250c80fab209f9c8ef79b7d9ca16abd04a782
-		// logoname:'干少五百货店',
-		// appid:'wx0f78bf88b743688d',
-		// imgpath: 'https://bjczwh.oss-cn-beijing.aliyuncs.com',//北京存在文化
-		// logoname:'食养生活',
-		// appid:'wx3941db546233c2a7',//家常食养记
-		// imgpath: 'https://czt-1323137866.cos.ap-chongqing.myqcloud.com',//纯正堂商城图片请求地址
-		// // https://czt-1323137866.cos.ap-chongqing.myqcloud.com/shop  纯正堂商城图片链接
-		// logoname:'纯正堂',
-		// appid:'wx6688e6b9b6fb8700',//纯正堂
-		// imgpath: 'https://fs-1382281328.cos.ap-guangzhou.myqcloud.com',//顺亿景图片请求地址
-		// logoname:'顺亿景',
-		// appid:'wx8276bbbc1753ba90',//顺亿景
-		// imgpath: 'https://sczy-bucket.oss-cn-chengdu.aliyuncs.com',//致医商城药房图片请求地址
-		// logoname:'致医互联网医院',
-		// appid:'wx1ab5921165510962',//致医商城
-		// imgpath: 'https://cfryt-1323137866.cos.ap-chongqing.myqcloud.com',//润元堂商城图片请求地址
-		// // https://cfryt-1323137866.cos.ap-chongqing.myqcloud.com/shop  润元堂商城图片链接
-		// logoname:'润元堂',
-		// appid:'wxa955dc06e1031b02',//
+		logoname:'孪有百货店H',
+		appid:'wxdfcdcbf21e915589',
+		imgpath: 'https://obs.jnmyunl.com',//金牛
 	},
 	mutations: {
 		setCount(state, value) {