add

common/request.js

@@ -6,8 +6,13 @@ 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'//蒙一堂
@@ -19,7 +24,7 @@ export default class Request {
 		// 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.yytcdta.com'//晚景如春 鹤颜堂
 		// let path = 'https://userapp.yixingjian.top'//宏医堂
 		// let path = 'https://userapp.cqsft.vip'//四福堂
 		// let path = 'https://userapp.ljhehualu.com'//济南联志健康
@@ -29,9 +34,15 @@ export default class Request {
 		// 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'//润元堂
 		uni.setStorageSync('requestPath',path)
 		// uni.showLoading({
 		// 	  title: '加载中'
@@ -40,7 +51,7 @@ export default class Request {
 		if(router.indexOf("/companyapp")!=-1){
 			type = 1;
 			// router =router.replace('/companyapp','')
-			 // path = 'https://companyapp.ljhehualu.com'//济南联志
+			// path = 'https://companyapp.ljhehualu.com'//济南联志
 			 token = uni.getStorageSync('ManageToken');
 		}
 		if(router.indexOf("/course_uniapp")!=-1){

components/toolA.vue

@@ -0,0 +1,287 @@
+<template>
+	<view class="column" style="position: relative">
+		<view class="top-content">
+			<view class="status_bar" :style="{ height: statusBarHeight + 'px' }"></view>
+			<view class="top-title">首页</view>
+		</view>
+	
+		<view class="index-body" :style="{ marginTop: statusBarHeight+64 + 'px' }">
+			<swiper
+				:autoplay="swiper.autoplay"
+				:circular="true"
+				class="swipr-box"
+				:duration="swiper.duration"
+				:easingFunction="swiper.easing"
+				:indicatorActiveColor="swiper.activeColor"
+				:indicatorColor="swiper.color"
+				:indicatorDots="swiper.indicatorDots"
+				:interval="swiper.interval"
+				:nextMargin="swiper.lrmargin"
+				:previousMargin="swiper.lrmargin">
+				<swiper-item class="seiper-smbox" v-for="(item, index) in imgUrls" :key="index">
+					<navigator hoverClass="none" openType="navigate" :url="item.openpath">
+						<image class="slide-image" :src="item.img"></image>
+					</navigator>
+				</swiper-item>
+			</swiper>
+			<view class="newlist">
+				<view v-for="(item, idx) in grid9.slice(0, 1)" :key="idx" 
+						@tap="handleNav(item.openpath)" class="first-list">
+					<view class="ml40 pt40">
+						<view class="justify-start align-center">
+							<image class="w90 h90" :src="item.img" mode="aspectFill"></image>
+							<view class="colorf ml12">{{ item.text }}</view>
+						</view>
+						<view class="colorf mt12">{{item.desc}}</view>
+					</view>
+					<view class="box-shi">点击使用</view>
+				</view>
+				<view class="mt40 column justify-between">
+					<view v-for="(item, idx) in grid9.slice(1, 3)" :key="idx" 
+						@tap="handleNav(item.openpath)" class="second-list justify-start align-center ml20 bgf p12 radius20 ">
+						<view class="">
+							<image class="w90 h90" :src="item.img" mode="aspectFill"></image>
+						</view>
+						<view class="colorf ml20">
+							<view class="base-color-3">{{ item.text }}</view>
+							<view class="base-color-6">{{ item.desc }}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view >
+				<view class=" justify-between wrap " style="width: calc(100% - 40rpx);padding: 0 10rpx;" >
+					<view v-for="(item, idx) in grid9.slice(3, 7)" :key="idx"  style="width: calc(50% - 40rpx);height: 180rpx;"
+						@tap="handleNav(item.openpath)" class=" justify-start align-center mt20 bgf ml20 pl20 radius20 ">
+						<view class="">
+							<image class="w90 h90" :src="item.img" mode="aspectFill"></image>
+						</view>
+						<view class="colorf ml20">
+							<view class="base-color-3">{{ item.text }}</view>
+							<view class="base-color-6">{{ item.desc }}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="h90"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'tools',
+	data() {
+		return {
+			statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
+			swiper: {
+				indicatorDots: true,
+				autoplay: true,
+				interval: 5000,
+				duration: 1000,
+				lrmargin: '40rpx',
+				easing: 'easeInOutCubic',
+				activeColor: '#fff',
+				color: 'rgba(255, 255, 255, .3)'
+			},
+			imgUrls: [
+				{
+					img: 'https://zkzh-2025.oss-cn-beijing.aliyuncs.com/fs/20250901/55d56de7b34d4450bb39464a16fc591c.jpg',
+					openpath: ''
+				}
+			],
+			recommend: [
+				{
+					img: '/static/images/toolIcon/weather.png',
+					openpath: '../../pages/weather/weather',
+					text: '天气'
+				},
+				{
+					img: '/static/images/toolIcon/qrcode.png',
+					openpath: '../../pages/qrcode/index',
+					text: '生成二维码'
+				},
+				{
+					img: '/static/images/toolIcon/hl.png',
+					openpath: '../../pages/cand/index',
+					text: '程序员黄历'
+				}
+			],
+			server: [
+				{
+					img: '/static/images/toolIcon/sdm.png',
+					openpath: '/pages_tool/pages/christmasHat/index/index',
+					text: '圣诞帽',
+					desc:'合成节日氛围图片'
+				},
+				{
+					img: '/static/images/toolIcon/weather.png',
+					openpath: '/pages_tool/pages/wxyj/index',
+					text: '五险一金计算',
+					desc:'计算薪资个税'
+				},
+				{
+					img: '/static/images/toolIcon/gz.png',
+					openpath: '/pages_tool/pages/game/game',
+					text: '摇骰子',
+					desc:'娱乐工具，模拟六面骰子'
+				},
+				{
+					img: '/static/images/toolIcon/cha.png',
+					openpath: '/pages_tool/pages/pinyin/index',
+					text: '查拼音',
+					desc:"查询生僻汉字的拼音"
+				},
+				{
+					img: '/static/images/toolIcon/clac.png',
+					openpath: '/pages_tool/pages/calc/index',
+					text: '计算器',
+					desc:'日常使用计算器'
+				},
+				{
+					img: '/static/images/toolIcon/wsyt.png',
+					openpath: '/pages_tool/pages/gojuuonn/gojuuonn',
+					text: '五十音图'
+				},
+				{
+					img: '/static/images/toolIcon/sc.png',
+					openpath: '/pages_tool/pages/figure/figure',
+					text: '身材计算',
+					desc:'身体质量指数'
+				},
+				
+				{
+					img: '/static/images/toolIcon/qrcode.png',
+					openpath: '/pages_tool/pages/qrcode/index',
+					text: '生成二维码',
+					desc:'生成网页地址二维码'
+				},
+				{
+					img: '/static/images/toolIcon/historyToday.png',
+					openpath: '/pages_tool/pages/historyToday/historyToday',
+					text: '历史今天',
+					desc:'历史使用工具'
+				}
+			]
+		};
+	},
+computed: {
+    grid9() {
+        return Array.isArray(this.server) ? this.server.slice(0, 9) : [];
+    }
+},
+	methods: {
+		handleNav(url) {
+			if (!url) return;
+			const finalUrl = url.startsWith('/') ? url : `/${url.replace(/^\/+/, '')}`;
+			try {
+				uni.navigateTo({ url: finalUrl });
+			} catch (e) {
+				console.error('navigateTo failed:', e, finalUrl);
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+	.newlist{
+		width: calc(100% - 40rpx);
+		display: flex;
+		padding: 20rpx;
+		.first-list{
+			width: 50%;
+			height: 420rpx;
+			background: linear-gradient(180deg,#2E7DF6 ,#80B0F8);
+			border-radius: 20rpx;
+			margin-top: 40rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			.box-shi{
+				border: 2rpx solid #fff;
+				color: #fff;
+				border-radius: 20rpx;
+				padding: 20rpx 40rpx;
+				margin: 40rpx 40rpx;
+				text-align: center;
+			}
+		}
+		.second-list{
+			height: 168rpx;
+		}
+	}
+	
+.top-content {
+	width: 100%;
+	z-index: 10;
+	position: fixed;
+	top: 0;
+	left: 0;
+	background-color: #ffffff;
+	.top-title {
+		height: 88rpx;
+		line-height: 88rpx;
+		font-size: 42rpx;
+		font-family: Source Han Sans CN;
+		font-weight: bold;
+		color: #222222;
+		padding-left: 41rpx;
+		background-color: #ffffff;
+	}
+}
+
+.swipr-box {
+	width: 100%;
+	height: 280rpx;
+	padding: 20rpx 0rpx;
+	background-color: #fff;
+	box-shadow: 0rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.05);
+}
+
+.seiper-smbox {
+	padding: 0rpx 0rpx;
+	box-sizing: border-box;
+	width: 100%;
+}
+
+.slide-image {
+	display: inline-block;
+	width: 100%;
+	height: 280rpx;
+	border-radius: 10rpx;
+}
+
+.recommend-box {
+	margin: 20rpx 0rpx;
+	padding: 0rpx 30rpx;
+}
+
+.recommend-box,
+.recommend-smbox {
+	width: 100%;
+	box-sizing: border-box;
+}
+
+.recommend-smbox {
+	background-color: #fff;
+	border-radius: 10rpx;
+	padding: 30rpx 0rpx;
+	display: flex;
+	justify-content: space-around;
+	box-shadow: 0rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.05);
+}
+</style>
+<style lang="scss" scoped>
+.empty-box {
+    width: 100%;
+    padding: 60rpx 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.empty-text {
+    color: #9ca3af;
+    font-size: 28rpx;
+}
+</style>

manifest.json

@@ -50,17 +50,25 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
+<<<<<<< HEAD
         "appid" : "wx36b87a0820734de8",
+=======
+        "appid" : "wx90ad5ee96038c413",
+>>>>>>> b53250c80fab209f9c8ef79b7d9ca16abd04a782
         "setting" : {
             "urlCheck" : false,
             "minified" : true
         },
+<<<<<<< HEAD
         "lazyCodeLoading" : "requiredComponents",
         "usingComponents" : true,
         "secureNetwork" : {
             "enable" : false
         }
 
+=======
+        "usingComponents" : true
+>>>>>>> b53250c80fab209f9c8ef79b7d9ca16abd04a782
     },
     "mp-alipay" : {
         "usingComponents" : true

pages.json

@@ -6,7 +6,6 @@
 		// 		"navigationBarTitleText": "首页"
 		// 	}
 		// },
-		
 		{
 			"path" : "pages/about/index",
 			"style" : 
@@ -29,21 +28,31 @@
 				"navigationBarTitleText" : ""
 			}
 		},
+<<<<<<< HEAD
 
+=======
+		// {
+		// 	"path" : "pages/course/videovip",
+		// 	"style" : 
+		// 	{
+		// 		"navigationBarTitleText" : ""
+		// 	}
+		// },
+>>>>>>> b53250c80fab209f9c8ef79b7d9ca16abd04a782
 		{
 			"path" : "pages/healthTest/healthTest",
 			"style" : 
 			{
 				"navigationBarTitleText" : "关于"
 			}
-		},
-		{
-			"path" : "pages/auth/login",
-			"style" : 
-			{
-				"navigationBarTitleText" : "登录"
-			}
 		}
+		// {
+		// 	"path" : "pages/auth/login",
+		// 	"style" : 
+		// 	{
+		// 		"navigationBarTitleText" : "登录"
+		// 	}
+		// }
 	],
 	"subPackages": [
 		{
@@ -95,31 +104,32 @@
 							"bounce": "none" // 页面回弹
 						}
 					}
-				},{
-					"path" : "voiceItem",
-					"style" : 
-					{
-						"navigationBarTitleText" : "声音录制",
-						"enablePullDownRefresh": false,
-						"navigationBarBackgroundColor":"#ffffff",
-						"navigationBarTextStyle":"black",
-						"app-plus": {
-							"bounce": "none" // 页面回弹
-						}
-					}
-				},{
-					"path" : "voiceList",
-					"style" : 
-					{
-						"navigationBarTitleText" : "声音录制",
-						"enablePullDownRefresh": false,
-						"navigationBarBackgroundColor":"#ffffff",
-						"navigationBarTextStyle":"black",
-						"app-plus": {
-							"bounce": "none" // 页面回弹
-						}
-					}
 				}
+				// ,{
+				// 	"path" : "voiceItem",
+				// 	"style" : 
+				// 	{
+				// 		"navigationBarTitleText" : "声音录制",
+				// 		"enablePullDownRefresh": false,
+				// 		"navigationBarBackgroundColor":"#ffffff",
+				// 		"navigationBarTextStyle":"black",
+				// 		"app-plus": {
+				// 			"bounce": "none" // 页面回弹
+				// 		}
+				// 	}
+				// },{
+				// 	"path" : "voiceList",
+				// 	"style" : 
+				// 	{
+				// 		"navigationBarTitleText" : "声音录制",
+				// 		"enablePullDownRefresh": false,
+				// 		"navigationBarBackgroundColor":"#ffffff",
+				// 		"navigationBarTextStyle":"black",
+				// 		"app-plus": {
+				// 			"bounce": "none" // 页面回弹
+				// 		}
+				// 	}
+				// }
 			]
 		},
 		{
@@ -164,7 +174,8 @@
 		},
 		{
 			"root": "pages_managedata",
-			"pages": [{
+			"pages": [
+				{
 					"path": "coursedetail",
 					"style": {
 						"navigationBarTitleText": "课程详情",

pages/about/index.vue

@@ -12,6 +12,7 @@
 	import{getenterprise} from '@/api/index.js'
 	import tools from '@/components/tools.vue'
 	// import tools from '@/components/tools1.vue'
+	// import tools from '@/components/toolA.vue'
 	export default {
 		components: {
 			tools,

pages_index/voice.vue

@@ -1,12 +1,12 @@
 <template>
 	<view class="container">
-		<view class="textbox">
+		<view class="textbox" v-if="ManageToken!=''">
 			<view class="header-tips">请朗读以下文字</view>
 			<view class="textbox-con" :style="{height: textHeight}">
 				在这片神奇的森林里，小鸟轻快地唱着歌，仿佛在诉说着春天的故事。
 			</view>
 		</view>
-		<view class="voice-footer">
+		<view class="voice-footer" v-if="ManageToken!=''">
 			<view class="voice-footer-tips">1、选择安静的录音环境，可在房间或车内录音。</view>
 			<view class="voice-footer-tips">2、保持20cm距离，避免手机太远录音不清晰。</view>
 			<view class="voice-footer-tips">3、使用普通话朗读，语速适中，吐字清晰。</view>
@@ -54,7 +54,8 @@
 				voicePath: '',
 				status: "stop",
 				isVoicePlay: false,
-				btnLoading: false
+				btnLoading: false,
+				ManageToken:''
 			}
 		},
 		onLoad() {
@@ -62,8 +63,9 @@
 			// #ifndef H5
 			this.recorderManager = uni.getRecorderManager();
 			innerAudioContext = uni.createInnerAudioContext();
-			
+			 this.ManageToken= uni.getStorageSync('ManageToken')
 			let self = this;
+			console.log('==r22222222==',this.ManageToken)
 			console.log('==recorderManager22222222==',this.recorderManager)
 			if(this.recorderManager) {
 				console.log('==recorderManager==')

pages_manage/components/manageIndex.vue

@@ -74,16 +74,14 @@
 				</view>
 				<view class="line"></view>
 				<view class="menus">
-					<view class="menu-item" @click="navTo('/pages_index/voice')">
-						<!-- <image :src="imgPath+'/app/manergevip/about.png'"></image> -->
+					<!-- <view class="menu-item" @click="navTo('/pages_index/voice')">
 						<u-icon name="mic"  size="28"></u-icon>
 						<view class="m-name">声音录制</view>
 					</view>
 					<view class="menu-item" @click="navTo('/pages_index/voiceList')">
-						<!-- <image :src="imgPath+'/app/manergevip/about.png'"></image> -->
 						<u-icon name="mic"  size="28"></u-icon>
 						<view class="m-name">声音采集</view>
-					</view>
+					</view> -->
 					<view class="menu-item" @click="navTo('/pages_managedata/about')">
 						<image :src="imgPath+'/app/manergevip/about.png'"></image>
 						<view class="m-name">关于我们</view>

pages_managedata/coursedetail.vue

@@ -1,17 +1,16 @@
 <template>
 	<view class="column">
-		<view class="video-box" >
+		<view class="video-box" v-if="showvideo">
 			<video id="myVideo" :src='listdetail.videoUrl' show-mute-btn='false'
 			vslide-gesture-in-fullscreen='true'   loop='true' enable-progress-gesture='true'
 			 enable-danmu controls='true'  autoplay="true" object-fit='contain' show-center-play-btn='true'
-			class="videotop" :playback-rate="playbackRate"></video> 
-			
+			class="videotop" :playback-rate="playbackRate" v-if="showvideo"></video> 
 		</view>
 		<view class="speed-controls">
 			<view @click="changeSpeed(item.value,index)" v-for="(item,index) in speadvideo" 
 			:key="index" :class="actTime==index?'actstyle':''">{{item.name}}</view>
 		</view>
-		<view class="title-content" id="title-content">
+		<view class="title-content" id="title-content" v-if="listdetail.videoUrl">
 			<!-- 课程标题 -->
 			<view >
 				{{listdetail.title}} 
@@ -94,7 +93,8 @@
 					name:'2.0倍速',
 					value:2
 					}
-				]
+				],
+				showvideo:false
 			}
 		},
 		mounted() {
@@ -179,6 +179,7 @@
 					if(res.code==200){
 						this.viewload=false
 						this.listdetail=res.data
+						this.showvideo=true
 						this.listdetail.questionBankList= this.listdetail.questionBankList.map(item => ({
 							...item,
 							question: JSON.parse(item.question),

pages_managedata/coursedetail1.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<video id="myVideo" src='https://ddgytcpv.ylrzcloud.com/course_transcode_100301/20251019/1760848477815.mp4'></video> 
+		<!-- <video id="myVideo" src='https://ddgytcpv.ylrzcloud.com/course_transcode_100301/20251019/1760848477815.mp4'></video> -->
 	</view>
 </template>
 

store/index.js

@@ -11,14 +11,18 @@ export default new Vuex.Store({
 	state: {
 		coureLogin: uni.getStorageSync('coureLogin') || 0,
 		webviewUrl: '',
-		wsDanmuUrl: 'wss://userapp.zkhj6.com', // 弹幕评论接口地址
+		wsDanmuUrl: 'wss://userapp.cqsft.vip', // 弹幕评论接口地址
 		//红包领取规则:
 		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',
@@ -29,12 +33,12 @@ export default new Vuex.Store({
 		// imgpath: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com',//医健宝图片请求地址
 		// logoname:'医建宝',
 		// appid:'wx71a02aea709ca916',
-		// imgpath: 'https://cdhyt-1323137866.cos.ap-chongqing.myqcloud.com',//鹤颜堂图片请求地址
-		// logoname:'鹤颜堂',
-		// appid:'wx0447a16ef6199f03',
+		imgpath: 'https://cdhyt-1323137866.cos.ap-chongqing.myqcloud.com',//鹤颜堂图片请求地址
+		logoname:'鹤颜堂',
+		appid:'wxd61fe671f8b52a81',
 		// imgpath: 'https://sft-1361917636.cos.ap-chongqing.myqcloud.com',//四福堂图片请求地址
 		// logoname:'四福堂',
-		// appid:'wxb3841ced43815810',
+		// appid:'wxf1bb222ab166cd69',
 		// imgpath: 'htps://whhm-1361716159.cos.ap-chongqing.myqcloud.com',//惠名大药房图片请求地址
 		// logoname:'惠名大药房',
 		// appid:'wxc9553ad82d0d61b8'//h5,
@@ -46,7 +50,7 @@ export default new Vuex.Store({
 		// appid:'wx301ab2fad04c658a',
 		// imgpath: 'https://bnkc-1323137866.cos.ap-chongqing.myqcloud.com',//百年康城图片请求地址
 		// logoname:'百年康成',
-		// appid:'wx65e5d520e35bf3f5'//,
+		// appid:'wx65e5d520e35bf3f5'//百年康成服务,
 		// imgpath: 'https://drk-1363981074.cos.ap-chongqing.myqcloud.com',//德瑞康图片请求地址
 		// logoname:'青岛市德瑞康',
 		// appid:'wx29d26f63f836be7f',
@@ -54,17 +58,21 @@ export default new Vuex.Store({
 		// logoname:'食养生活',
 		// appid:'wx94951f52d3ac5e25',
 		// imgpath: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com',//医健宝图片请求地址
-		// logoname:'医建宝',
+		// 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', //宽益堂
+		// imgpath: 'https://hcl-1323137866.cos.ap-chongqing.myqcloud.com', //恒春来
 		// logoname: '恒春来',
-		// appid: 'wxf5d10a5cb02eb145',
+		// appid: 'wxa322a80a64bcba71',
 		// imgpath: 'https://fs-1314500630.cos.ap-beijing.myqcloud.com',//蒙一堂商城图片请求地址
 		// // https://fs-1314500630.cos.ap-beijing.myqcloud.com/shop  蒙一堂商城图片链接
 		// logoname:'蒙一堂',
@@ -77,14 +85,20 @@ export default new Vuex.Store({
 		// appid:'wx61494812051353e1',
 		// imgpath: 'https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com',//济南联志健康
 		// logoname:'济南联志健康',
-		// appid:'wxeb3304fc98a3d35d',
+		// 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',//北京存在文化
@@ -100,6 +114,10 @@ export default new Vuex.Store({
 		// 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',//
 	},
 	mutations: {
 		setCount(state, value) {

unpackage/dist/build/web/index.html

@@ -1,2 +0,0 @@
-<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>lookCourse_common_uniapp</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.6c186752.js></script><script src=/static/js/index.5f2ccf88.js></script></body></html>

unpackage/dist/build/web/static/js/pages-user-userAgreement.9d0c72a9.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-user-userAgreement"],{"22f4":function(t,e,n){"use strict";n("6a54"),Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,n("c9b5"),n("bf0f"),n("ab80");var r=n("adb8"),u={data:function(){return{texturl:"",requestPath:uni.getStorageSync("requestPath")}},onLoad:function(t){t.type&&(this.texturl=t.type,console.log(this.requestPath+this.texturl))},methods:{getuserAgreement:function(){var t=this;(0,r.userAgreement)().then((function(e){console.log(e),200==e.code&&(t.texturl=e.data)}))},getprivacyPolicy:function(t){function e(){return t.apply(this,arguments)}return e.toString=function(){return t.toString()},e}((function(){var t=this;getprivacyPolicy().then((function(e){console.log(e),200==e.code&&(t.texturl=e.data)}))}))}};e.default=u},3988:function(t,e,n){"use strict";n.d(e,"b",(function(){return r})),n.d(e,"c",(function(){return u})),n.d(e,"a",(function(){}));var r=function(){var t=this.$createElement,e=this._self._c||t;return e("v-uni-view",[e("v-uni-web-view",{attrs:{src:this.requestPath+this.texturl}})],1)},u=[]},"70d7":function(t,e,n){"use strict";n.r(e);var r=n("22f4"),u=n.n(r);for(var i in r)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(i);e["default"]=u.a},fe0e:function(t,e,n){"use strict";n.r(e);var r=n("3988"),u=n("70d7");for(var i in u)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return u[t]}))}(i);var o=n("828b"),a=Object(o["a"])(u["default"],r["b"],r["c"],!1,null,"6af3d50a",null,!1,r["a"],void 0);e["default"]=a.exports}}]);

unpackage/dist/build/web/static/js/pages_course-H5reward.f781e095.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages_course-H5reward"],{3286:function(e,n,t){"use strict";t.r(n);var r=t("ee08"),u=t("c295");for(var i in u)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(i);var a=t("828b"),c=Object(a["a"])(u["default"],r["b"],r["c"],!1,null,"37a7a13c",null,!1,r["a"],void 0);n["default"]=c.exports},ac7b:function(e,n,t){"use strict";t("6a54"),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={data:function(){return{h5viewUrl:uni.getStorageSync("h5viewUrl")}}};n.default=r},c295:function(e,n,t){"use strict";t.r(n);var r=t("ac7b"),u=t.n(r);for(var i in r)["default"].indexOf(i)<0&&function(e){t.d(n,e,(function(){return r[e]}))}(i);n["default"]=u.a},ee08:function(e,n,t){"use strict";t.d(n,"b",(function(){return r})),t.d(n,"c",(function(){return u})),t.d(n,"a",(function(){}));var r=function(){var e=this.$createElement,n=this._self._c||e;return n("v-uni-view",[n("v-uni-web-view",{attrs:{src:this.h5viewUrl}})],1)},u=[]}}]);