提交

App.vue

@@ -12,6 +12,7 @@
 			
 		},
 		onLaunch: function() {
+			this.checkUpdate()
 			// uni.hideTabBar({ animation: true })
 			// uni.$TUIKit = TIM.create({
 			// 	SDKAppID: 1400693126
@@ -89,6 +90,38 @@
 		},
 		 
 		methods: {
+			checkUpdate() {
+				const updateManager = uni.getUpdateManager();
+				updateManager.onCheckForUpdate(function(res) {
+					// 请求完新版本信息的回调
+					console.log('是否有新版本：', res.hasUpdate);
+				});
+			
+				updateManager.onUpdateReady(function() {
+					uni.showModal({
+						title: '更新提示',
+						content: '新版本已经准备好，是否重启小程序？',
+						confirmText: '立即重启',
+						confirmColor: '#2179f5',
+						showCancel: false,
+						success(res) {
+							if (res.confirm) {
+								// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+								updateManager.applyUpdate();
+							}
+						}
+					});
+				});
+			
+				updateManager.onUpdateFailed(function() {
+					// 新的版本下载失败
+					uni.showModal({
+						title: '更新提示',
+						content: '新版本下载失败，请检查网络后重试。',
+						showCancel: false
+					});
+				});
+			},
 			// TODO:
 			resetLoginData() {
 				// this.globalData.expiresIn = '';

api/common.js

@@ -27,9 +27,15 @@ let request = new Request().http
  	 return request('/app/common/getWeixinPrescribeTemps',null,'GET');
  }
  
- 
  export function getDictByKey(data) {
   	 return request('/app/common/getDictByKey',data,'GET');
  } 
- 
+ //用户协议
+ export function getuserAgreement(data) {
+  	 return request('/h5/newUserAgreement',data,'GET');
+ } 
+ //隐私保护
+ export function getprivacyPolicy(data) {
+  	 return request('/h5/newPrivacyPolicy',data,'GET');
+ } 
  

api/manageCompany.js

@@ -249,4 +249,8 @@ export function getprojectChange(data) {
 //生成小程序链接
 export function copyuniLink(data) {
 	return request('/companyapp/app/fs/course/getGotoWxAppLink', data, 'GET', 'application/json;charset=UTF-8');
+}
+//获取对应的项目编码
+export function getlinkCode(data) {
+	return request('/companyapp/app/fs/course/getProjectCode', data, 'GET', 'application/json;charset=UTF-8');
 }

assets/css/common.less

@@ -183,8 +183,8 @@ radio .wx-radio-input{
 }
 /* 选中后的 背景样式  */
 radio .wx-radio-input.wx-radio-input-checked{
-	background: linear-gradient(135deg, #66b2ef  0%, #2BC7B9 100%);
-	border: 1px solid #2BC7B9;
+	background: linear-gradient(135deg, #f95d44  0%, #C39A58 100%);
+	border: 1px solid #C39A58;
 }
 /* 选中后的 对勾样式 （白色对勾） */
 radio .wx-radio-input.wx-radio-input-checked::before{
@@ -197,8 +197,8 @@ checkbox .wx-checkbox-input{
 	border-radius: 50%;
 }
 checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-	background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
-	border: 1px solid #2BC7B9;
+	background: linear-gradient(135deg, #f95d44 0%, #C39A58 100%);
+	border: 1px solid #C39A58;
 	border-radius: 50%;
 }
 checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {

common/request.js

@@ -1,12 +1,14 @@
 // uni-app请求封装
 import {TOKEN_KEYAuto} from '@/utils/courseTool.js'
+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://userappkyt.ylrzcloud.com/store'//宽益堂
+		let path = 'https://userappkyt.ylrzcloud.com/store'//宽益堂九
+
 		let type = 0
 		uni.setStorageSync('requestPath',path)
 		// uni.showLoading({
@@ -15,7 +17,8 @@ export default class Request {
 		let token = uni.getStorageSync('AppToken');
 		if(router.indexOf("/companyapp")!=-1){
 			// router =router.replace('/companyapp','')
-			path = 'https://userappkyt.ylrzcloud.com'//宽益堂
+			path = 'https://userappkyt.ylrzcloud.com'//宽益堂九
+
 			 type = 1
 			 token = uni.getStorageSync('ManageToken');
 		}
@@ -24,7 +27,8 @@ export default class Request {
 			type = 2
 			router =router.replace('/course_auto','')
 			// path = 'http://w43fa358.natappfree.cc'
-			path = 'https://userappkyt.ylrzcloud.com'//宽益堂
+			path = 'https://userappkyt.ylrzcloud.com'//宽益堂九
+
 			token =uni.getStorageSync(TOKEN_KEYAuto)
 			console.log("TOKEN_KEYAuto===",TOKEN_KEYAuto,token)
 		}
@@ -33,7 +37,8 @@ export default class Request {
 			router =router.replace('/course_uniapp','')
 			//张玉朋
 			// let path = 'http://192.168.10.158:8113'//
-			path = 'https://userappkyt.ylrzcloud.com'//宽益堂
+			path = 'https://userappkyt.ylrzcloud.com'//宽益堂九
+
 			token =uni.getStorageSync('TOKEN_WEXIN')
 		}
 		return new Promise((resolve, reject) => {
@@ -55,6 +60,23 @@ export default class Request {
 				data: data,
 				method: method,
 				success: (res) => {
+					if(type !==0&&(res.data.code == 401 || res.data.code == 4001||res.data.code == 4004)) {
+						store.commit('setCoureLogin', 2);
+						uni.removeStorageSync("userinfos")
+						// uni.removeStorageSync('userInfo');
+						uni.removeStorageSync('TOKEN_WEXIN');
+						if(type==2) {
+							uni.removeStorageSync(TOKEN_KEYAuto)
+						}
+						if(type==1) {
+							uni.removeStorageSync('ManageToken');
+							uni.navigateTo({
+								url:'/pages_manage/login'
+							})
+						}
+						resolve({ code: 401, data: null });
+						return
+					}
 					//收到开发者服务器成功返回的回调函数
 					if(res.data.code==401){//没有权限直接退出到登录界面
 						let pages = getCurrentPages();

components/Menu.vue

@@ -139,7 +139,7 @@ export default {
 		.dot-active {
 			width: 40rpx;
 			height: 3rpx;
-			background: #2BC7B9;
+			background: #C39A58;
 			margin-right: 10rpx;
 		}
 	}

components/chengpeng-audio/free-audio.vue

@@ -15,7 +15,7 @@
 				:step='0.1'
 				backgroundColor="#E9F0F0"
 				:block-size='14'
-				block-color='#2BC7B9'>
+				block-color='#C39A58'>
 			</slider>
 		</view>
 		<view class='ml-3'>{{getTime(Math.round(currentTime))}}</view>

components/chengpeng-audio/redme.md

@@ -9,7 +9,7 @@
 ```javascript
 //html
 <template>
-  <free-audio startPic='https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/icon/play.png' endPic='https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/icon/stop.png' :audioId='audio1' :url='path'></free-audio>
+  <free-audio startPic='https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/icon/play.png' endPic='https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/icon/stop.png' :audioId='audio1' :url='path'></free-audio>
 </template>
 
 //js

components/evan-switch/evan-switch.vue

@@ -112,7 +112,7 @@
 		transition: background-color 0.3s;
 		width: 100upx;
 		height: 36upx;
-		background: #2BC7B9;
+		background: #C39A58;
 		border-radius: 18upx;
 		/* #ifndef APP-NVUE */
 		box-sizing: content-box;

components/im/tui-chat/message-elements/audio-message/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view :class="'audio-message ' + (isMine ? 'my-audio' : '')">
-		<image class="audio-icon" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/audio.png"></image>
+		<image class="audio-icon" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/audio.png"></image>
 		<view class="audio " @click="handlePlayAudioMessage" :style="'width: ' + 120 + 'rpx'">{{ '" ' + message.payload.second }}</view>
 	</view>
 </template>

components/im/tui-chat/message-elements/custom-message/index.vue

@@ -19,7 +19,7 @@
 			<view class="custom-content">
 				<view class="custom-content-title">{{ renderDom[0].title }}</view>
 				<view class="custom-content-score">
-					<image v-for="(item, index) in renderDom[0].score" :key="index" class="score-star" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/star.png"></image>
+					<image v-for="(item, index) in renderDom[0].score" :key="index" class="score-star" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/star.png"></image>
 				</view>
 				<view class="custom-content-description">{{ renderDom[0].description }}</view>
 			</view>

components/im/tui-chat/message-elements/file-message/index.vue

@@ -3,7 +3,7 @@
 		<view class="TUI-fileMessage">
 			<view class="fileMessage">
 				<view class="fileMessage-box">
-					<image class="file-icon" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/file.png"></image>
+					<image class="file-icon" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/file.png"></image>
 					<label @tap="download" class="file-title">{{ filePayload.fileName }}</label>
 				</view>
 			</view>

components/im/tui-chat/message-elements/video-message/index.vue

@@ -1,11 +1,11 @@
 <template>
 	<view :class="'video-box ' + (isMine ? 'my-video' : '')" @click="playerHander">
-		<image class="video-icon" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/video-play.png"></image>
+		<image class="video-icon" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/video-play.png"></image>
 	</view>
 </template>
 
 <script>
-import videoIcon from 'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/video-play.png';
+import videoIcon from 'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/video-play.png';
 export default {
 	data() {
 		return {

components/im/tui-chat/message-input/index.css

@@ -29,7 +29,7 @@
 	height: 48rpx;
 	margin-left: 16rpx;
 	border-radius: 24rpx;
-	background-color: #2BC7B9;
+	background-color: #C39A58;
 }
 
 .TUI-commom-function-item:first-child {

components/im/tui-chat/message-private/service-evaluation/index.vue

@@ -12,7 +12,7 @@
 						:key="index"
 						class="score-star"
 						:data-score="item"
-						:src="'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/star' + (item > score ? '-grey' : '') + '.png'"
+						:src="'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/star' + (item > score ? '-grey' : '') + '.png'"
 						@tap="handleScore"
 					></image>
 				</view>

components/likeProduct.vue

@@ -1,7 +1,7 @@
 <template>
    <view>
 		<view class="like-title" v-show="list &&list.length > 0">
-			<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/like.png" mode=""></image>
+			<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/like.png" mode=""></image>
 			<text class="text">猜你喜欢</text>
 		</view>
 		<view class="like-list">

components/px-popup-bottom/px-popup-bottom.vue

@@ -24,7 +24,7 @@
 </template>
 
 <script>
-	// import iconClose from 'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/close40.png'
+	// import iconClose from 'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/close40.png'
 	export default {
 		props: {
 			title: { //标题
@@ -82,7 +82,7 @@
 				isAnimaStart: false,
 				rpxRate: "",
 				cotRadius: 0,
-				closeIcon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/close40.png'
+				closeIcon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/close40.png'
 			}
 		},
 		watch: {

components/tabbar/tabbar.vue

@@ -71,36 +71,36 @@
 			},
 			themeicon() {
 				this.tabbarList = [{
-						iconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/home.png",
-						selectedIconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/home_sel.png",
+						iconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/home.png",
+						selectedIconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/home_sel.png",
 						Text: '首页',
 						url: '/pages/home/index',
 						isshowed:true
 					},
 					{
-						iconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/health.png",
-						selectedIconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/health_sel.png",
+						iconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/health.png",
+						selectedIconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/health_sel.png",
 						Text: '健康百科',
 						url: '/pages/healthy/index',
 						isshowed:true
 					},
 					{
-						iconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/archive.png",
-						selectedIconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/archive_sel.png",
+						iconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/archive.png",
+						selectedIconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/archive_sel.png",
 						Text: '健康档案',
 						url: '/pages/healthy/idea',
 						isshowed:false
 					},
 					{
-						iconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/shop_mall.png",
-						selectedIconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/shop_mall_sel.png",
+						iconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/shop_mall.png",
+						selectedIconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/shop_mall_sel.png",
 						Text: '健康产品',
 						url: '/pages/shopping/index',
 						isshowed:false
 					},
 					{
-						iconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/my.png",
-						selectedIconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/my_sel.png",
+						iconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/my.png",
+						selectedIconPath: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/my_sel.png",
 						Text: '我的',
 						url: '/pages/user/index',
 						isshowed:true
@@ -137,7 +137,7 @@
 		color: #626468;
 	}
 	.actcolor{
-		color: #2BC7B9;
+		color: #C39A58;
 	}
 	.tabbar-list{
 		display: flex;

components/tuiProduct.vue

@@ -1,7 +1,7 @@
 <template>
    <view>
 		<!-- <view class="like-title">
-			<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/tui.png" mode=""></image>
+			<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/tui.png" mode=""></image>
 			<text class="text">精选商品</text>
 		</view> -->
 		<view class="like-list">

components/yk-screenRecord/yk-screenRecord.vue

@@ -0,0 +1,163 @@
+<template>
+	<view class="zzc_mol" v-if="isRecording"></view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				isRecording: false
+			}
+		},
+		created() {
+			this.screenInit();
+		},
+		onUnload() {
+			this.AllowScreenshots()
+		},
+		beforeDestroy() {
+			this.AllowScreenshots()
+		},
+		methods: {
+			screenInit() {
+				let _this = this;
+				// #ifdef H5
+				uni.showToast({
+					title: '请在APP或者小程序环境下操作',
+					icon: 'error'
+				})
+				// #endif
+				// #ifndef H5
+				uni.getSystemInfo({
+					success: function(e) {
+						// #ifdef APP-PLUS
+						if (e.platform == 'android') {
+							//注意：一旦开启禁止截屏/录屏后将会全局生效，关闭页面时记得放开允许截屏/录屏
+							_this.NoscreenCapture();
+						} else {
+							//在APP IOS端截屏、录屏暂时没办法实现，可以寻求原生解决
+						}
+						// #endif
+
+						// #ifdef MP-WEIXIN
+						if (e.platform == 'android') {
+							//微信小程序在安卓手机上 禁止截屏/录屏(注意：禁止后录屏动作还是会进行，但录屏后的视频是黑屏的)
+							wx.setVisualEffectOnCapture({
+								visualEffect: 'hidden', //传入 hidden 则表示在截屏/录屏时隐藏屏幕
+								success: (res) => {
+									console.log(res)
+								},
+								fail: (err) => {
+									console.log(err)
+								},
+								complete: (res) => {
+									console.log(res)
+								}
+							})
+						} else {
+							//微信小程序在IOS手机上，注意：目前微信小程序在ios上也只能通过监听录屏状态，然后通过添加view层来进行阻止，截屏暂时无法实现
+							//监听用户录屏事件
+							wx.onScreenRecordingStateChanged(function(res) {
+								if (res.state == 'start') {
+									_this.isRecording = true
+								} else {
+									_this.isRecording = false
+								}
+							})
+							//查询用户是否在录屏
+							wx.getScreenRecordingState({
+								success: (res) => {
+									if (res.state == 'on') {
+										_this.isRecording = true
+									} else if (res.state == 'off') {
+										_this.isRecording = false
+									}
+								},
+								fail: (err) => {
+									_this.isRecording = false
+								}
+							})
+						}
+						// #endif
+					}
+				})
+				// #endif
+			},
+			//安卓端禁止截屏
+			NoscreenCapture() {
+				let osname = plus.os.name;
+				if (osname == "Android") {
+					var activity = plus.android.runtimeMainActivity();
+					plus.android.invoke(plus.android.invoke(activity, "getWindow"), "addFlags", 0x00002000);
+				}
+			},
+			//安卓端允许截屏  
+			AllowScreenshots() {
+				let _this = this;
+				uni.getSystemInfo({
+					success: function(e) {
+						// #ifdef MP-WEIXIN
+						if (e.platform == 'android') {
+							//微信小程序在安卓手机上 禁止截屏/录屏(注意：禁止后录屏动作还是会进行，但录屏后的视频是黑屏的)
+							wx.setVisualEffectOnCapture({
+								visualEffect: 'none', //传入 hidden 则表示在截屏/录屏时隐藏屏幕
+								success: (res) => {
+									console.log(res)
+								},
+								fail: (err) => {
+									console.log(err)
+								},
+								complete: (res) => {
+									console.log(res)
+								}
+							})
+						} else {
+							//微信小程序在IOS手机上，注意：目前微信小程序在ios上也只能通过监听录屏状态，然后通过添加view层来进行阻止，截屏暂时无法实现
+							//监听用户录屏事件
+							wx.onScreenRecordingStateChanged(function(res) {
+								if (res.state == 'start') {
+									_this.isRecording = false
+								} else {
+									_this.isRecording = false
+								}
+							})
+							//查询用户是否在录屏
+							wx.getScreenRecordingState({
+								success: (res) => {
+									if (res.state == 'on') {
+										_this.isRecording = false
+									} else if (res.state == 'off') {
+										_this.isRecording = false
+									}
+								},
+								fail: (err) => {
+									_this.isRecording = false
+								}
+							})
+						}
+						// #endif
+					}
+				})
+				// #ifdef APP-PLUS
+				let osname = plus.os.name;
+				if (osname == "Android") {
+					var activity = plus.android.runtimeMainActivity();
+					plus.android.invoke(plus.android.invoke(activity, "getWindow"), "clearFlags", 0x00002000);
+				}
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style>
+	.zzc_mol {
+		background: #000;
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		z-index: 99999;
+		top: 0;
+		left: 0;
+	}
+</style>

manifest.json

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

pages.json

@@ -24,7 +24,7 @@
 		{
 			"path": "pages/home/index",
 			"style": {
-				"navigationBarTitleText": "宽益堂商城",
+				"navigationBarTitleText": "宽益堂九",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom",
 				"app-plus": {
@@ -64,17 +64,17 @@
 			}
 
 		},
-		{
-			"path": "pages/healthy/idea",
-			"style": {
-				"navigationBarTitleText": "健康档案",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
+		// {
+		// 	"path": "pages/healthy/idea",
+		// 	"style": {
+		// 		"navigationBarTitleText": "健康档案",
+		// 		"enablePullDownRefresh": false,
+		// 		"navigationStyle": "custom",
+		// 		"app-plus": {
+		// 			"titleNView": false
+		// 		}
+		// 	}
+		// },
 		{
 			"path": "pages/home/productList",
 			"style": {
@@ -156,7 +156,7 @@
 		{
 			"path": "pages/shopping/index",
 			"style": {
-				"navigationBarTitleText": "商城",
+				"navigationBarTitleText": "",
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
@@ -600,14 +600,16 @@
 						"enablePullDownRefresh": false
 					}
 
-				}, {
-					"path": "user/patient",
-					"style": {
-						"navigationBarTitleText": "健康档案",
-						"enablePullDownRefresh": false
-					}
-
-				}, {
+				},
+				// {
+				// 	"path": "user/patient",
+				// 	"style": {
+				// 		"navigationBarTitleText": "健康档案",
+				// 		"enablePullDownRefresh": false
+				// 	}
+
+				// }, 
+				{
 					"path": "user/addAddress",
 					"style": {
 						"navigationBarTitleText": "新建收货地址",
@@ -772,29 +774,33 @@
 						"enablePullDownRefresh": false
 					}
 
-				}, {
-					"path": "user/doc",
-					"style": {
-						"navigationBarTitleText": "健康档案",
-						"enablePullDownRefresh": false
-					}
+				}, 
+				// {
+				// 	"path": "user/doc",
+				// 	"style": {
+				// 		"navigationBarTitleText": "健康档案",
+				// 		"enablePullDownRefresh": false
+				// 	}
 
-				}, {
+				// }, 
+				{
 					"path": "user/addDoc",
 					"style": {
 						"navigationBarTitleText": "创建健康档案",
 						"enablePullDownRefresh": false
 					}
 
-				}, {
-					"path": "user/docDetail",
-					"style": {
-						"navigationBarTitleText": "健康档案",
-						"navigationBarBackgroundColor": "#dff9f5",
-						"enablePullDownRefresh": false
-					}
-
-				}, {
+				},
+				// {
+				// 	"path": "user/docDetail",
+				// 	"style": {
+				// 		"navigationBarTitleText": "健康档案",
+				// 		"navigationBarBackgroundColor": "#dff9f5",
+				// 		"enablePullDownRefresh": false
+				// 	}
+
+				// },
+				{
 					"path": "user/docRecord",
 					"style": {
 						"navigationBarTitleText": "健康记录",
@@ -1249,13 +1255,13 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "宽益堂",
+		"navigationBarTitleText": "宽益堂九",
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF"
 	},
 	"tabBar": {
 		"color": "#666666",
-		"selectedColor": "#2BC7B9",
+		"selectedColor": "#C39A58",
 		// "custom": true, 
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
@@ -1265,23 +1271,23 @@
 		"spacing": "4px",
 		"list": [{
 				"pagePath": "pages/home/index",
-				"iconPath": "/static/tabbar/home.png",
-				"selectedIconPath": "/static/tabbar/home_sel.png",
+				"iconPath": "/static/tabbar04/home.png",
+				"selectedIconPath": "/static/tabbar04/home_sel.png",
 				"text": "首页"
 			},
 
 			{
 				"pagePath": "pages/healthy/index",
-				"iconPath": "/static/tabbar/health.png",
-				"selectedIconPath": "/static/tabbar/health_sel.png",
+				"iconPath": "/static/tabbar04/health.png",
+				"selectedIconPath": "/static/tabbar04/health_sel.png",
 				"text": "健康百科"
 			},
-			{
-				"pagePath": "pages/shopping/index",
-				"iconPath": "/static/tabbar/shop_mall.png",
-				"selectedIconPath": "/static/tabbar/shop_mall_sel.png",
-				"text": "健康产品"
-			},
+			// {
+			// 	"pagePath": "pages/shopping/index",
+			// 	"iconPath": "/static/tabbar04/shop_mall.png",
+			// 	"selectedIconPath": "/static/tabbar04/shop_mall_sel.png",
+			// 	"text": "健康产品"
+			// },
 			// {
 			// 	"pagePath": "pages/healthy/idea",
 			// 	"iconPath": "/static/tabbar/archive.png",
@@ -1290,8 +1296,8 @@
 			// },
 			{
 				"pagePath": "pages/user/index",
-				"iconPath": "/static/tabbar/my.png",
-				"selectedIconPath": "/static/tabbar/my_sel.png",
+				"iconPath": "/static/tabbar04/my.png",
+				"selectedIconPath": "/static/tabbar04/my_sel.png",
 				"text": "我的"
 			}
 		]

pages/auth/login.vue

@@ -7,7 +7,8 @@
 		  	<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> -->
@@ -21,8 +22,8 @@
 		 <view class="tips">
 			 <checkbox  :checked="isAgreement" @click="handleAgreement()" />
 			 <view  @click="handleAgreement()">您同意并接受</view>
-		 	<view class="btn"  @click="openH5('/h5/userAgreement')">《用户协议》</view>
-		 	<view class="btn" @click="openH5('/h5/privacyPolicy')">《隐私保护》</view>
+		 	<view class="btn"  @click="openH5(1)">《用户协议》</view>
+		 	<view class="btn" @click="openH5(2)">《隐私保护》</view>
 		 </view>
       </view>
     </view>
@@ -104,10 +105,10 @@ export default {
 			this.isAgreement=!this.isAgreement;
 		},
 		openH5(url){
-			var requestPath = uni.getStorageSync('requestPath');
-			uni.setStorageSync('url',requestPath+url);
+			// var requestPath = uni.getStorageSync('requestPath');
+			// uni.setStorageSync('url',requestPath+url);
 			uni.navigateTo({
-				url: '../home/h5'
+				url: '../home/h5?val='+url
 			})
 		},
 		getCode(){
@@ -184,7 +185,7 @@ export default {
 									uni.hideLoading();
 									uni.showToast({
 										icon:'none',
-										title: "授权登录失败,请重新登录",
+										title: res.msg,
 									});
 								}
 							   
@@ -308,8 +309,8 @@ export default {
     .author-btn {
       width: 630rpx;
       height: 80rpx;
-      background: linear-gradient(to right, #66b2ef  0%, #2BC7B9 100%);
-      background: -moz-linear-gradient(to right, #66b2ef 0%, #2BC7B9 100%);
+      background: linear-gradient(to right, #f95d44  0%, #C39A58 100%);
+      background: -moz-linear-gradient(to right, #f95d44 0%, #C39A58 100%);
       // box-shadow: 0px 7rpx 6rpx 0px rgba(229, 138, 0, 0.22);
       border-radius: 40rpx;
       font-size: 30rpx;
@@ -323,12 +324,12 @@ export default {
       height: 80rpx;
       margin-top: 30rpx;
       border-radius: 40rpx;
-      border: 2rpx solid #2BC7B9;
+      border: 2rpx solid #C39A58;
       background: none;
       font-size: 30rpx;
       font-family: PingFang SC;
       font-weight: 500;
-      color: #2BC7B9;
+      color: #C39A58;
     }
   }
 }
@@ -342,7 +343,7 @@ export default {
 	checkbox{
 	}
 	.btn{
-		color: #2BC7B9;
+		color: #C39A58;
 	}
 }
 
@@ -391,7 +392,7 @@ export default {
 				width: 50%;
 				height: 80rpx;
 				border-radius: 5rpx;
-				background-color: #2BC7B9;
+				background-color: #C39A58;
 				font-size: 30rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
@@ -403,12 +404,12 @@ export default {
 				width: 50%;
 				height: 80rpx;
 				border-radius: 5rpx;
-				border: 2rpx solid #2BC7B9;
+				border: 2rpx solid #C39A58;
 				background: none;
 				font-size: 30rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #2BC7B9;
+				color: #C39A58;
 			}
 		}
 	}

pages/common/launch.vue

@@ -5,7 +5,8 @@
 				<view class="circle"></view>
 				<image src="/static/logo.jpg"></image>
 			</view>
-			<text class="text">宽益堂商城</text>
+			<text class="text">宽益堂九
+</text>
 		</view>
 	</view>
 </template>

pages/healthy/detail.vue

@@ -18,14 +18,14 @@
 				<view class="peop-box" @click="showUsers">
 					<view class="head-box">
 						<view class="head" v-for="(subitem,j) in views" :key="j">
-							<image :src="subitem.avatar==null?'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/detault_head.jpg':subitem.avatar" mode=""></image>
+							<image :src="subitem.avatar==null?'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/detault_head.jpg':subitem.avatar" mode=""></image>
 						</view>
 					</view>
-					<image class="arrow" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow_gray.png" mode=""></image>
+					<image class="arrow" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow_gray.png" mode=""></image>
 				</view>
 			</view>
 			<!-- <view class="share-btn">
-				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/share.png" mode=""></image>
+				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/share.png" mode=""></image>
 				<text>分享</text>
 				<button  class="share" data-name="shareBtn" open-type="share">分享</button>
 			</view> -->
@@ -33,7 +33,7 @@
 		<!-- 咨询按钮 -->
 		<view class="inquiry">
 			<view class="content">
-				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/consult.png" mode=""></image>
+				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/consult.png" mode=""></image>
 				<text class="text">咨询</text>
 				<button class="contact-btn" open-type="contact"></button>
 			</view>
@@ -228,7 +228,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #2BC7B9;
+			background: #C39A58;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -273,7 +273,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2BC7B9;
+				color: #C39A58;
 				line-height: 1;
 			}
 			 

pages/healthy/idea.vue

@@ -21,7 +21,7 @@
 				<view class="period">备注 {{item.remark!=null?item.remark:''}}</view>
 			</view>
 			<view v-if="docs.length == 0" class="no-data-box" @click="getMyDocList()">
-				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no_data.png" mode="aspectFit"></image>
+				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no_data.png" mode="aspectFit"></image>
 				<view class="empty-title">暂无数据</view>
 			</view>
 		</view>
@@ -230,7 +230,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #2BC7B9;
+				background: #C39A58;
 				border-radius: 44upx;
 			}
 		}

pages/healthy/index.vue

@@ -7,7 +7,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 					<input type="text" v-model="searchValue" placeholder="输入关键字搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -32,11 +32,11 @@
 							<view class="readers">
 								<view class="head-box" v-if="item.viewsList!=null&&item.viewsList.length>0">
 									<view class="head" v-for="(subitem,j) in item.viewsList" :key="j" v-if="subitem!=null">
-										<image  :src="subitem.avatar==null?'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/detault_head.jpg':subitem.avatar" mode=""></image>
+										<image  :src="subitem.avatar==null?'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/detault_head.jpg':subitem.avatar" mode=""></image>
 									</view>
 								</view>
 								<view class="readings">
-									<image class="eye" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/eye.png" ></image>
+									<image class="eye" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/eye.png" ></image>
 									<text class="num">{{item.views}}</text>
 								</view>
 							</view>
@@ -80,7 +80,7 @@
 					},
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						icon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no_data.png',
+						icon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no_data.png',
 						tip: '暂无数据'
 					},
 					textNoMore:'已经到底了'
@@ -246,15 +246,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #2BC7B9;
-			background: #F5FFFE;
-			border: 1px solid #2BC7B9;
+			color: #C39A58;
+			background: #fff5f5;
+			border: 1px solid #C39A58;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #2BC7B9;
-				border: 1px solid #2BC7B9;
+				background: #C39A58;
+				border: 1px solid #C39A58;
 			}
 		}
 	}

pages/healthy/readUsers.vue

@@ -4,7 +4,7 @@
 		<view class="user-list">
 			<view class="item" v-for="(item,index) in dataList" :key="index">
 				<view class="img-box">
-					<image :src="item.avatar==null?'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/detault_head.jpg':item.avatar" mode=""></image>
+					<image :src="item.avatar==null?'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/detault_head.jpg':item.avatar" mode=""></image>
 				</view>
 				<text class="name">{{item.nickname}}</text>
 			</view>
@@ -32,7 +32,7 @@
 					},
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						icon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no_data.png',
+						icon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no_data.png',
 						tip: '暂无数据'
 					}
 				},

pages/home/doctorCase.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 					<input type="text"  v-model="searchVal" placeholder="输入关键字搜索"  confirm-type="搜索" @confirm="goSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -19,7 +19,7 @@
 					>
 						<view class="text">
 							{{ item.departmentName }}
-							<image v-show="deptId == item.departmentId" class="tab-bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/tab_bg.png" mode=""></image>
+							<image v-show="deptId == item.departmentId" class="tab-bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/tab_bg.png" mode=""></image>
 						</view>
 					</view>
 				</view>
@@ -56,16 +56,16 @@
 						<!-- 语音回答 -->
 						<view class="voice-inner" v-if="item.orderType == '2'">
 							<free-audio 
-								startPic='https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/play.png' 
-								endPic='https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/pause.png'
-								activeColor="#2BC7B9"
+								startPic='https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/play.png' 
+								endPic='https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/pause.png'
+								activeColor="#C39A58"
 								:audioId="'audio'+index"
 								:url='item.replyAudioUrl'
 							></free-audio>
 						</view>
 					</view>
 					<view class="read-box">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/eye.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/eye.png" mode=""></image>
 						<text class="text">{{item.views}}人看过</text>
 					</view>
 				</view>
@@ -101,7 +101,7 @@
 					},
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						icon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no_data.png',
+						icon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no_data.png',
 						tip: '暂无数据'
 					}
 				},

pages/home/h5.vue

@@ -1,22 +1,56 @@
 <template>
-	<view class="content">
-		 <web-view :src="webUrl"></web-view>
+	<view >
+		 <!-- <web-view :src="webUrl"></web-view> -->
+		 <view v-html="contText"></view>
 	</view>
 </template>
 
 <script>
- 
+ import {getuserAgreement,getprivacyPolicy} from'@/api/common.js'
  export default {
  	data() {
  		return {
 			webUrl:"",
+			contText:''
  		}
  	},
-	onLoad(val) {
+	onLoad(option) {
 		this.webUrl=uni.getStorageSync('url');
 		console.log(this.webUrl)
-	}
- 	 
+		if(option.val==1){
+			this.getuserAgreements()
+		}else{
+			this.getprivacyPolicys()
+		}
+	},
+ 	 methods:{
+		 getuserAgreements(){
+			 getuserAgreement().then(res=>{
+				 console.log(res)
+				 if(res.code==200){
+					 this.contText=res.data
+				 }else{
+					 uni.showToast({
+					 	title: res.msg,
+					 	icon: 'none'
+					 });
+				 }
+			 })
+		 },
+		 getprivacyPolicys(){
+			 getprivacyPolicy().then(res=>{
+				 console.log(res)
+				 if(res.code==200){
+					 this.contText=res.data
+				 }else{
+					 uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					 });
+				 }
+			 })
+		 }
+	 }
  }
  
  

pages/home/index.vue

@@ -1,21 +1,22 @@
 <template>
 	<view class="content">
 		<!-- 背景图片 -->
-		<image class="bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/hp_top_bg.png" mode=""></image>
+		<image class="bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/hp_top_bg.png" mode=""></image>
 		<view>
 			<view class="top-inner">
 				<view class="fixed-top-box" :style="{ background: bgColor }">
 					<!-- 这里是状态栏 -->
 					<view class="status_bar" :style="{height: statusBarHeight}"></view>
 					<view class="top-title">
-						<view class="name">宽益堂商城</view>
+						<view class="name">宽益堂九
+</view>
 						<!-- <view class="dot">•</view><view class="sub-name">七彩互联网医院</view> -->
 					</view>
 					<!-- 搜索框、购物车、客服 -->
 					<view class="func-cont">
 						<view class="search-cont" :style="{width:userinfoa.isShow==0 || isuser==true?'633rpx':''}">
 							<image class="icon-search"
-								src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode="">
+								src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode="">
 							</image>
 							<input type="text" value="" placeholder="请输入产品名称"
 								placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;"
@@ -25,12 +26,12 @@
 						<uni-badge size="small" :text="cartCount" absolute="rightTop" type="error"
 							v-show="userinfoa.isShow==1&&isuser==false">
 							<view class="img-item" @click="goAuthUrl('../shopping/cart')">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/cart_wihte.png"
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/cart_wihte.png"
 									mode=""></image>
 							</view>
 						</uni-badge>
 						<view class="img-item" style="position: relative;">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/customer.png" mode="">
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/customer.png" mode="">
 							</image>
 							<button class="contact-btn" open-type="contact"></button>
 						</view>
@@ -62,24 +63,24 @@
 			</view>
 
 		</view>
-		<view class="open-class bgf radius12">
+		<!-- <view class="open-class bgf radius12">
 			<view class="title-box">
 				<text class="title">健康大讲堂</text>
 				<view class="more" @click="goClassList(1)">
 					<text>查看全部</text>
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/toright.png"></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/toright.png"></image>
 				</view>
 			</view>
 			<view class="justify-start">
 				<view class="class-item" @click="goClass(item.courseId,1)" v-for="(item, index) in classList"
 					:key="index">
 					<view class="img-box">
-						<image :src="item.imgUrl || 'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no-img.png'"  ></image>
+						<image :src="item.imgUrl || 'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no-img.png'"  ></image>
 					</view>
 					<view>{{item.courseName}}</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="modules">
 			<view class="module">
 				<!--养生有道-->
@@ -98,7 +99,7 @@
 						<view class="title">养生讲堂</view>
 						<view class="more"  @click="navTo('/pages_index/index/doctorArticleList')" >
 							<view class="text">更多</view>
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow_gray.png"></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow_gray.png"></image>
 						</view>
 					</view>
 					<scroll-view :scroll-x="true" style="white-space: nowrap;">
@@ -131,7 +132,7 @@
 			    		<view class="title">养生干货</view>
 			    		<view class="more" @click="navTo('/pages_index/index/articleList')">
 			    			<view class="text">更多</view>
-			    			<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow_gray.png"></image>
+			    			<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow_gray.png"></image>
 			    		</view>
 			    	</view>
 			    	<view class="article-box" v-if="articles.length>0">
@@ -165,7 +166,7 @@
 					<text class="left">健康百科</text>
 					<view class="right" @click="switchTo('../healthy/index')">
 						<text class="text">更多</text>
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow_gray.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow_gray.png" mode=""></image>
 					</view>
 				</view>
 				<view class="inner">
@@ -178,11 +179,11 @@
 								@click="articleCateChange(item)">
 								<view class="text">
 									{{ item.cateName }}
-									<image v-show="item.cateId == cateId" class="tab-bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/tab_bg.png" mode=""></image>
+									<image v-show="item.cateId == cateId" class="tab-bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/tab_bg.png" mode=""></image>
 								</view>
 							</view>
 						</view>
-						<image class="right-mask" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/mask.png" mode=""></image>
+						<image class="right-mask" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/mask.png" mode=""></image>
 					</view>
 					 
 					<view class="know-list">
@@ -193,11 +194,11 @@
 									<view class="readers">
 										<view class="head-box" v-if="item.viewsList!=null&&item.viewsList.length>0">
 											<view class="head" v-for="(subitem,j) in item.viewsList" :key="j" v-if="subitem!=null" >
-												<image :src="subitem.avatar==null?'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/detault_head.jpg':subitem.avatar" mode=""></image>
+												<image :src="subitem.avatar==null?'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/detault_head.jpg':subitem.avatar" mode=""></image>
 											</view>
 										</view>
 										<view class="readings">
-											<image class="eye" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/eye.png" mode=""></image>
+											<image class="eye" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/eye.png" mode=""></image>
 											<text class="num">{{item.views}}</text>
 										</view>
 									</view>
@@ -220,7 +221,7 @@
 		<!-- 限时消息 -->
 		<!-- <view class="message-box" >
 			<view class="left">
-				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/close24.png" mode="" @click="closeMsg"></image>
+				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/close24.png" mode="" @click="closeMsg"></image>
 				<view class="text ellipsis">关注公众号了解更新</view>
 			</view>
 			<view class="btn">查看</view>
@@ -274,7 +275,7 @@
 	import {
 		getStoreConfig
 	} from '@/api/common'
-	// import tabBg from "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/tab_bg.png"
+	// import tabBg from "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/tab_bg.png"
 	import freeAudio from '@/components/chengpeng-audio/free-audio.vue'
 	import Menu from '@/components/Menu.vue'
 	import HotProduct from './components/HotProduct.vue'
@@ -307,7 +308,7 @@
 				}, {
 					text: '确定',
 					color: '#FFFFFF',
-					bgColor: '#2BC7B9',
+					bgColor: '#C39A58',
 					width: '150rpx',
 					height: '80rpx',
 					shape: 'fillet',
@@ -339,7 +340,7 @@
 				articles: [], //养生干货
 				// 状态栏的高度
 				statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
-				tabBg: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/tab_bg.png", // tab切换背景
+				tabBg: "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/tab_bg.png", // tab切换背景
 				// 问诊案例类型
 				orderTypes: [{
 					name: '全部',
@@ -446,7 +447,7 @@
 		},
 		onShareAppMessage(res) {
 			return {
-				title: '宽益堂商城-您的专属健康解决方案',
+				title: '宽益堂九-您的专属健康解决方案',
 				path: `/pages/common/launch`,
 				imageUrl: this.$store.state.imgpath+'/app/image/logo.png'//分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
@@ -458,7 +459,7 @@
 		//分享到朋友圈
 		onShareTimeline(res) {
 			return {
-				title: '宽益堂商城-您的专属健康解决方案',
+				title: '宽益堂九-您的专属健康解决方案',
 				query: '', //页面参数
 				imageUrl: this.$store.state.imgpath+'/app/image/logo.png'//分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
@@ -467,7 +468,7 @@
 			// 计算属性的 getter
 			bgColor: function() {
 				var top = this.top / 30;
-				return 'rgba(43,199,185, ' + top + ')';
+				return 'rgba(253,205,145, ' + top + ')';
 			},
 			imgPath() {
 			  return this.$store.state.imgpath
@@ -680,7 +681,7 @@
 						// }
 						// }
 						// console.log('图标', res.data)
-						// const menuNames = ['健康百科', '健康自测', '健康档案', '药品商城', '领券中心', '会员'];
+						// const menuNames = ['健康百科', '健康自测', '健康档案', '药品', '领券中心', '会员'];
 						this.menus = res.data
 						// this.menus = res.data.filter(item => menuNames.some(menuName => item.menuName.includes(menuName)) );
 					} else {
@@ -984,10 +985,10 @@
 		left: 0;
 		z-index: 1000;
 		transition: all 0.5s;
-		background-color: #2BC7B9;
+		background-color: #C39A58;
 
 		&.show-back {
-			// background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+			// background: linear-gradient(135deg, #f95d44 0%, #C39A58 100%);
 		}
 
 		.status_bar {
@@ -1026,7 +1027,7 @@
 					font-size: 42upx;
 					font-family: Source Han Sans CN;
 					font-weight: bold;
-					color: #FFFFFF;
+					color: #000;
 					padding-left: 41upx;
 				}
 
@@ -1110,7 +1111,7 @@
 					padding: 5upx 20rpx;
 					font-size: 24upx;
 					color: #FFFFFF;
-					background-color: #2BC7B9;
+					background-color: #C39A58;
 					border-radius: 50rpx;
 				}
 			}
@@ -1253,7 +1254,7 @@
 							}
 
 							.active {
-								color: #2BC7B9;
+								color: #C39A58;
 							}
 						}
 
@@ -1424,7 +1425,7 @@
 									font-family: PingFang SC;
 									font-weight: 500;
 									color: #FFFFFF;
-									background: #2BC7B9;
+									background: #C39A58;
 									border-radius: 10upx 4upx 10upx 4upx;
 									margin-right: 12upx;
 								}
@@ -1523,14 +1524,14 @@
 									.label {
 										font-size: 26upx;
 										font-weight: 500;
-										color: #2BC7B9;
+										color: #C39A58;
 										margin-right: 5upx;
 									}
 
 									.num {
 										font-size: 28upx;
 										font-weight: bold;
-										color: #2BC7B9;
+										color: #C39A58;
 									}
 								}
 							}
@@ -1550,7 +1551,7 @@
 						font-size: 26rpx;
 						font-family: PingFang SC;
 						font-weight: bold;
-						color: #2BC7B9;
+						color: #C39A58;
 
 						image {
 							margin-left: 8rpx;
@@ -2508,7 +2509,7 @@
 
 									.price {
 										padding: 5rpx 10rpx;
-										background-color: #2BC7B9;
+										background-color: #C39A58;
 										border-radius: 30rpx;
 										font-size: 20upx;
 										font-family: PingFang SC;
@@ -2578,7 +2579,7 @@
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #2BC7B9;
+				color: #C39A58;
 			}
 		}
 
@@ -2592,7 +2593,7 @@
 			font-weight: 500;
 			color: #FFFFFF;
 			border: 1px solid #D2E6FF;
-			background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+			background: linear-gradient(135deg, #f95d44 0%, #C39A58 100%);
 			border-radius: 24upx;
 			margin-left: 30upx;
 		}

pages/home/new/articleDetails.vue

@@ -15,7 +15,7 @@
 		<!-- 咨询按钮 -->
 		<view class="inquiry">
 			<view class="content">
-				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/consult.png" mode=""></image>
+				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/consult.png" mode=""></image>
 				<text class="text">咨询</text>
 				<button class="contact-btn" open-type="contact"></button>
 			</view>
@@ -173,7 +173,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #2BC7B9;
+			background: #C39A58;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -218,7 +218,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2BC7B9;
+				color: #C39A58;
 				line-height: 1;
 			}
 			 

pages/home/new/articleList.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 					<input type="text" v-model="keyword" placeholder="输入关键字搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -27,7 +27,7 @@
 						<view class="info-box">
 							<view class="readers">
 								<view class="readings">
-									<image class="eye" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/eye.png" ></image>
+									<image class="eye" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/eye.png" ></image>
 									<text class="num">{{item.views}}</text>
 								</view>
 							</view>
@@ -211,15 +211,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #2BC7B9;
+			color: #C39A58;
 			background: #ffffff;
-			border: 1px solid #2BC7B9;
+			border: 1px solid #C39A58;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #2BC7B9;
-				border: 1px solid #2BC7B9;
+				background: #C39A58;
+				border: 1px solid #C39A58;
 			}
 		}
 	}

pages/home/new/chineseMedicineDetails.vue

@@ -123,7 +123,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #2BC7B9;
+					background-color: #C39A58;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -155,7 +155,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #2BC7B9;
+				// border: 1rpx solid #C39A58;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -207,7 +207,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #2BC7B9;
+					background-color: #C39A58;
 					color: #fff;
 				}
 				 

pages/home/new/chineseMedicineList.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 					<input type="text" v-model="keyword" placeholder="输入关键字搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -12,7 +12,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#2BC7B9"
+				  lineColor="#C39A58"
 				 @change="tabChange">
 				 </u-tabs>
 			</view>
@@ -38,7 +38,7 @@
 					<view class="r-item" @click="showDetail(item)" v-for="item in dataList">
 						<view class="r-left">{{item.medicineName}}</view>
 						<view class="r-right">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/fire.png"></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/fire.png"></image>
 						</view>
 					</view>
 				</view>
@@ -242,14 +242,14 @@
 						border-radius: 5rpx;
 						width: 8rpx;
 						height:30rpx;
-						background-color: #2BC7B9;
+						background-color: #C39A58;
 					}
 					
 				}
 				.active{
 					background-color: #fff;
 					font-weight: bold;
-					color: #2BC7B9;
+					color: #C39A58;
 				}
 			}
 			
@@ -268,7 +268,7 @@
 				font-size: 40upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2BC7B9;
+				color: #C39A58;
 				line-height: 80upx;
 			}
 			.items{

pages/home/new/diseaseDetails.vue

@@ -102,7 +102,7 @@
 			.line{
 				width: 6rpx;
 				height:30rpx;
-				background-color: #2BC7B9;
+				background-color: #C39A58;
 				 
 			}
 			.title{

pages/home/new/diseaseList.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 					<input type="text" v-model="keyword" placeholder="输入关键字搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -27,7 +27,7 @@
 						<view class="title ellipsis1">{{ item.diseaseName }}</view>
 					</view>
 					<view class="right">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow_gray.png"></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow_gray.png"></image>
 					</view>
 				</view>
 			</view>
@@ -205,15 +205,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #2BC7B9;
+			color: #C39A58;
 			background: #ffffff;
-			border: 1px solid #2BC7B9;
+			border: 1px solid #C39A58;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #2BC7B9;
-				border: 1px solid #2BC7B9;
+				background: #C39A58;
+				border: 1px solid #C39A58;
 			}
 		}
 	}

pages/home/new/famousPrescribeDetails.vue

@@ -123,7 +123,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #2BC7B9;
+					background-color: #C39A58;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -155,7 +155,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #2BC7B9;
+				// border: 1rpx solid #C39A58;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -207,7 +207,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #2BC7B9;
+					background-color: #C39A58;
 					color: #fff;
 				}
 				 

pages/home/new/famousPrescribeList.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 					<input type="text" v-model="keyword" placeholder="输入关键字搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -12,7 +12,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#2BC7B9"
+				  lineColor="#C39A58"
 				 @change="tabChange">
 				 </u-tabs>
 			</view>
@@ -41,7 +41,7 @@
 					<view class="r-item" @click="showDetail(item)" v-for="item in dataList">
 						<view class="r-left">{{item.prescribeName}}</view>
 						<view class="r-right">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/fire.png"></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/fire.png"></image>
 						</view>
 					</view>
 				</view>
@@ -269,14 +269,14 @@
 						border-radius: 5rpx;
 						width: 8rpx;
 						height:30rpx;
-						background-color: #2BC7B9;
+						background-color: #C39A58;
 					}
 					
 				}
 				.active{
 					background-color: #fff;
 					font-weight: bold;
-					color: #2BC7B9;
+					color: #C39A58;
 				}
 			}
 			
@@ -295,7 +295,7 @@
 				font-size: 40upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2BC7B9;
+				color: #C39A58;
 				line-height: 80upx;
 			}
 			.items{

pages/home/new/medicatedFoodDetails.vue

@@ -98,7 +98,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #2BC7B9;
+					background-color: #C39A58;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -130,7 +130,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #2BC7B9;
+				// border: 1rpx solid #C39A58;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -182,7 +182,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #2BC7B9;
+					background-color: #C39A58;
 					color: #fff;
 				}
 				 

pages/home/new/medicatedFoodList.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 					<input type="text" v-model="keyword" placeholder="输入关键字搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -225,15 +225,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #2BC7B9;
+			color: #C39A58;
 			background: #ffffff;
-			border: 1px solid #2BC7B9;
+			border: 1px solid #C39A58;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #2BC7B9;
-				border: 1px solid #2BC7B9;
+				background: #C39A58;
+				border: 1px solid #C39A58;
 			}
 		}
 	}

pages/home/new/questionsDetails.vue

@@ -169,7 +169,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #2BC7B9;
+			background: #C39A58;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -214,7 +214,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2BC7B9;
+				color: #C39A58;
 				line-height: 1;
 			}
 			 

pages/home/new/questionsList.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 					<input type="text" v-model="keyword" placeholder="输入服务包搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -27,7 +27,7 @@
 						<view class="info-box">
 							<view class="readers">
 								<view class="readings">
-									<image class="eye" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/eye.png" ></image>
+									<image class="eye" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/eye.png" ></image>
 									<text class="num">{{item.views}}</text>
 								</view>
 							</view>
@@ -209,15 +209,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #2BC7B9;
+			color: #C39A58;
 			background: #ffffff;
-			border: 1px solid #66b2ef   ;
+			border: 1px solid #f95d44   ;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #2BC7B9   ;
-				border: 1px solid #2BC7B9;
+				background: #C39A58   ;
+				border: 1px solid #C39A58;
 			}
 		}
 	}

pages/home/new/test.vue

@@ -6,7 +6,7 @@
 					<text class="patient-title">选择体验者</text>
 					<view class="right" >
 						<text class="value">请点击添加</text>
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow_gray.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow_gray.png" mode=""></image>
 					</view>
 				</view>
 				<view class="patient" @click="addPatient()" v-if="patient!=null">
@@ -20,7 +20,7 @@
 						</view>
 					</view>
 					<view class="right" >
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow_gray.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow_gray.png" mode=""></image>
 					</view>
 				</view>
 			</view>
@@ -59,7 +59,7 @@
 			<view class="patient-box" @click="addPatient()" v-if="patient==null">
 				<text class="patient-title">选择体验者</text>
 				<view class="right" >
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow_gray.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow_gray.png" mode=""></image>
 				</view>
 			</view>
 			<view class="patient" @click="addPatient()" v-if="patient!=null">
@@ -73,7 +73,7 @@
 					</view>
 				</view>
 				<view class="right" >
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow_gray.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow_gray.png" mode=""></image>
 				</view>
 			</view>
 		</view>

pages/home/new/testDetails.vue

@@ -215,7 +215,7 @@
 			 		font-family: PingFang SC;
 			 		font-weight: bold;
 			 		color: #FFFFFF;
-			 		background: #2BC7B9;
+			 		background: #C39A58;
 			 		border-radius: 50upx;
 			 	}
 			 }

pages/home/new/testList.vue

@@ -183,7 +183,7 @@
 					.people-num{
 						font-size: 24upx;
 						font-family: PingFang SC;
-						color: #2BC7B9;
+						color: #C39A58;
 						.num{
 							font-weight: bold;
 							color: #814E1B;
@@ -194,7 +194,7 @@
 						font-size: 24upx;
 						font-family: PingFang SC;
 						font-weight: 500;
-						color: #2BC7B9;
+						color: #C39A58;
 					}
 				}
 			}

pages/home/new/testResult.vue

@@ -172,8 +172,8 @@
 			.bg{
 				width: 100%;
 				height:100%;
-				// background-color: #2BC7B9;
-				// background: linear-gradient(#66b2ef, #2BC7B9);
+				// background-color: #C39A58;
+				// background: linear-gradient(#f95d44, #C39A58);
 				position: fixed;
 				image{
 					width: 100%;
@@ -289,7 +289,7 @@
 								.title-line{
 									width: 8rpx;
 									height: 28rpx;
-									background: #2BC7B9;
+									background: #C39A58;
 									border-radius: 2px 2px 2px 2px;
 									opacity: 1;
 								}

pages/home/new/testResultImg.vue

@@ -189,7 +189,7 @@ page {
  		font-family: PingFang SC;
  		font-weight: 400;
  		color: #ffffff;
- 		background:#2BC7B9 !important;
+ 		background:#C39A58 !important;
  		border-radius: 44upx;
  	}
  }

pages/home/new/vesselDetails.vue

@@ -100,7 +100,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #2BC7B9;
+					background-color: #C39A58;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -132,7 +132,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #2BC7B9;
+				// border: 1rpx solid #C39A58;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -184,7 +184,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #2BC7B9;
+					background-color: #C39A58;
 					color: #fff;
 				}
 				 

pages/home/new/vesselList.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 					<input type="text" v-model="keyword" placeholder="输入关键字搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -12,7 +12,7 @@
 				 <u-tabs
 				  :scrollable="false"
 				  :list="tabs"  
-				  lineColor="#2BC7B9"
+				  lineColor="#C39A58"
 				 @change="tabChange">
 				 </u-tabs>
 			</view>
@@ -37,7 +37,7 @@
 					<view class="r-item" @click="showDetail(item)" v-for="item in dataList">
 						<view class="r-left">{{item.vesselName}}</view>
 						<view class="r-right">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/fire.png"></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/fire.png"></image>
 						</view>
 					</view>
 				</view>
@@ -242,14 +242,14 @@
 						border-radius: 5rpx;
 						width: 8rpx;
 						height:30rpx;
-						background-color: #2BC7B9;
+						background-color: #C39A58;
 					}
 					
 				}
 				.active{
 					background-color: #fff;
 					font-weight: bold;
-					color: #2BC7B9;
+					color: #C39A58;
 					padding-left: 0;
 					width: 100%;
 				}
@@ -270,7 +270,7 @@
 				font-size: 40upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2BC7B9;
+				color: #C39A58;
 				line-height: 80upx;
 			}
 			.items{

pages/home/productList.vue

@@ -4,12 +4,12 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 					<input type="text" @confirm="goSearch"   :value="form.productName" placeholder="输入药品名称" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 				<view class="icon-search">
-					<image @click="showChange(2)" v-if="showType==1"  src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search1.png" mode=""></image>
-					<image @click="showChange(1)" v-if="showType==2"  src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search2.png" mode=""></image>
+					<image @click="showChange(2)" v-if="showType==1"  src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search1.png" mode=""></image>
+					<image @click="showChange(1)" v-if="showType==2"  src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search2.png" mode=""></image>
 				</view>
 			</view>
 			<!-- 排序框 -->
@@ -20,19 +20,19 @@
 				<view class="item" @click="searchChange('2')">
 					<text class="label">价格</text>
 					<view class="sort-img">
-						<image v-if="form.priceOrder==null||form.priceOrder=='desc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/price_arrow_up.png" mode="" @click="priceUp(true)"></image>
-						<image v-if="form.priceOrder=='asc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/price_arrow_up2.png" mode="" @click="priceUp(false)"></image>
-						<image v-if="form.priceOrder==null||form.priceOrder=='asc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/price_arrow_down.png" mode="" @click="priceDown(true)"></image>
-						<image v-if="form.priceOrder=='desc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/price_arrow_down2.png" mode="" @click="priceDown(false)"></image>
+						<image v-if="form.priceOrder==null||form.priceOrder=='desc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/price_arrow_up.png" mode="" @click="priceUp(true)"></image>
+						<image v-if="form.priceOrder=='asc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/price_arrow_up2.png" mode="" @click="priceUp(false)"></image>
+						<image v-if="form.priceOrder==null||form.priceOrder=='asc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/price_arrow_down.png" mode="" @click="priceDown(true)"></image>
+						<image v-if="form.priceOrder=='desc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/price_arrow_down2.png" mode="" @click="priceDown(false)"></image>
 					</view>
 				</view>
 				<view class="item" @click="searchChange('3')">
 					<text class="label">销量</text>
 					<view class="sort-img">
-						<image v-if="form.salesOrder==null||form.salesOrder=='desc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/price_arrow_up.png" mode="" @click="saleUp(true)"></image>
-						<image v-if="form.salesOrder=='asc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/price_arrow_up2.png" mode="" @click="saleUp(false)"></image>
-						<image v-if="form.salesOrder==null||form.salesOrder=='asc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/price_arrow_down.png" mode="" @click="saleDown(true)"></image>
-						<image v-if="form.salesOrder=='desc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/price_arrow_down2.png" mode="" @click="saleDown(false)"></image>
+						<image v-if="form.salesOrder==null||form.salesOrder=='desc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/price_arrow_up.png" mode="" @click="saleUp(true)"></image>
+						<image v-if="form.salesOrder=='asc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/price_arrow_up2.png" mode="" @click="saleUp(false)"></image>
+						<image v-if="form.salesOrder==null||form.salesOrder=='asc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/price_arrow_down.png" mode="" @click="saleDown(true)"></image>
+						<image v-if="form.salesOrder=='desc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/price_arrow_down2.png" mode="" @click="saleDown(false)"></image>
 					</view>
 				</view>
 				<view class="item" :class="form.newOrder=='desc'?'active':''" @click="searchChange('4')">
@@ -110,7 +110,7 @@
 					},
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						icon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no_data.png',
+						icon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no_data.png',
 						tip: '暂无数据'
 					},
 					textNoMore:"已经到底了",
@@ -301,7 +301,7 @@
 			align-items: center;
 			justify-content: center;
 			&.active .label{
-				color: #2BC7B9;
+				color: #C39A58;
 			}
 			.label{
 				font-size: 26upx;

pages/home/productSearch.vue

@@ -3,14 +3,14 @@
 		<!-- 搜索框 -->
 		<view class="search-cont">
 			<view class="inner">
-				<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+				<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 				<input type="text" value="" placeholder="输入药品名称" confirm-type="搜索" @confirm="goSearch" :focus='setFocus' placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 			</view>
 		</view>
 		<!-- 搜索历史 -->
 		<view class="title-box">
 			<text class="title">历史搜索</text>
-			<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/del.png" mode="" @click="clearHistory"></image>
+			<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/del.png" mode="" @click="clearHistory"></image>
 		</view>
 		<view class="data-list">
 			<view class="item" v-for="(item,index) in searchHistory" :key="index" @click="doSearch(item)">

pages/shopping/cart.vue

@@ -22,12 +22,12 @@
 						</view>
 						<view class="num-box">
 							<view class="img-box" @click="delNum(item)">
-								<image v-if="item.cartNum <= 1" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/jian.png" mode=""></image>
-								<image v-else src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/jian2.png" mode=""></image>
+								<image v-if="item.cartNum <= 1" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/jian.png" mode=""></image>
+								<image v-else src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/jian2.png" mode=""></image>
 							</view>
 							<input  type="number" @change="changeNum($event,item)" :value="item.cartNum"   />
 							<view class="img-box" @click="addNum(item)">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/add.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/add.png" mode=""></image>
 							</view>
 						</view>
 					</view>
@@ -36,7 +36,7 @@
 		</view>
 	 
 		<view v-if="carts.length == 0" class="no-data-box">
-			<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no_data.png" mode="aspectFit"></image>
+			<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no_data.png" mode="aspectFit"></image>
 			<view class="empty-title">暂无数据</view>
 		</view>
 		<!-- 猜你喜欢 -->
@@ -301,7 +301,7 @@
 							font-family: PingFang SC;
 							font-weight: bold;
 							color: #FFFFFF;
-							background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+							background: linear-gradient(90deg, #f95d44 0%, #C39A58 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							flex-shrink: 0;
@@ -452,7 +452,7 @@
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #FFFFFF;
-					background: #2BC7B9;
+					background: #C39A58;
 					border-radius: 44upx;
 				}
 			}

pages/shopping/confirmOrder.vue

@@ -10,7 +10,7 @@
 					</vie>
 				</view>
 				<view class="arrow-box">
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow_gray.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow_gray.png" mode=""></image>
 				</view>
 			</view>
 			<view class="address-box" v-if="address!=null" @click="openAddress()">
@@ -24,7 +24,7 @@
 					</view>
 				</view>
 				<view class="arrow-box">
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow_gray.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow_gray.png" mode=""></image>
 				</view>
 			</view>
 			<!-- 药品列表 -->
@@ -61,12 +61,12 @@
 			<!-- 积分 -->
 			<view class="points">
 				<view class="left">
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/points.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/points.png" mode=""></image>
 					<text class="text">可用积分</text>
 				</view>
 				<view class="right">
 					<text class="text">{{price.usedIntegral}}积分</text>
-					<evan-switch @change="integralChange" v-model="checked" activeColor="#2BC7B9" inactiveColor="rgba(0, 0, 0, 0.1)"></evan-switch>
+					<evan-switch @change="integralChange" v-model="checked" activeColor="#C39A58" inactiveColor="rgba(0, 0, 0, 0.1)"></evan-switch>
 				</view>
 			</view>
 			<view class="points" @click="openCoupon()">
@@ -75,7 +75,7 @@
 				</view>
 				<view class="right">
 					<text class="text">{{couponText}}</text>
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow4.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow4.png" mode=""></image>
 				</view>
 			</view>
 			<view class="points">
@@ -109,8 +109,8 @@
 				 <div class="coupon-list" v-if="couponsList.length > 0">
 				   <div class="item acea-row row-center-wrapper"  v-for="(item, index) in couponsList" :key="index">
 				     <div class="money" >
-				       <image v-if="item.status==0" class="img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/coupon1.png" mode="widthFix"></image>
-				 	  <image v-if="item.status!=0" class="img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/coupon2.png" mode="widthFix"></image>
+				       <image v-if="item.status==0" class="img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/coupon1.png" mode="widthFix"></image>
+				 	  <image v-if="item.status!=0" class="img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/coupon2.png" mode="widthFix"></image>
 				 	  <div style="z-index: 999;">
 				         ￥<span class="num">{{ item.couponPrice }}</span>
 				       </div>
@@ -128,28 +128,29 @@
 				   </div>
 				 </div>
 				 <view v-if="couponsList.length == 0" class="no-data-box" >
-				 	<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no_data.png" mode="aspectFit"></image>
+				 	<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no_data.png" mode="aspectFit"></image>
 				 	<view class="empty-title">暂无数据</view>
 				 </view>
 			 </view>
 			 
 		</popupBottom>
+		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
 <script>
 	import {getWeixinOrderTemps} from '@/api/common'
-	
 	import {confirm,computed,create} from '@/api/storeOrder'
 	import { getMyEnableCouponList } from '@/api/coupon'
-	 
+	 import {ykscreenRecord} from "@/components/yk-screenRecord/yk-screenRecord.vue"
 	import EvanSwitch from '@/components/evan-switch/evan-switch.vue'
 	import popupBottom from '@/components/px-popup-bottom/px-popup-bottom.vue'
 	
 	export default {
 		components: {
 			EvanSwitch,
-			popupBottom
+			popupBottom,
+			ykscreenRecord
 		},
 		data() {
 			return {
@@ -393,7 +394,7 @@
 			min-height: 171upx;
 			background: #FFFFFF;
 			border-radius: 16upx;
-			background-image: url("https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/address_bg.png");
+			background-image: url("https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/address_bg.png");
 			background-repeat: no-repeat;
 			background-size: 100% 30upx;
 			background-position: left bottom;
@@ -474,7 +475,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+							background: linear-gradient(90deg, #f95d44 0%, #C39A58 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -681,7 +682,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #2BC7B9;
+				background: #C39A58;
 				border-radius: 44upx;
 			}
 		}

pages/shopping/index.vue

@@ -7,7 +7,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 					<input type="text" disabled   confirm-type="搜索" @click="toSearch" placeholder="输入药品名称" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -17,6 +17,7 @@
 				<view 
 					v-for="(item,index) in cates" 
 					:key="index" 
+					class="ellipsis"
 					:class="cateSelect == item.cateId?'item active':'item'" 
 					@click="choseCate(item)"
 				>{{item.cateName }}</view>
@@ -265,12 +266,12 @@
 					color: #333333;
 					position: relative;
 					&.active{
-						color: #2BC7B9;
+						color: #C39A58;
 						&::after{
 							content: "";
 							width: 8upx;
 							height: 50upx;
-							background: #2BC7B9;
+							background: #C39A58;
 							position: absolute;
 							top: 25upx;
 							left: 0;

pages/shopping/payOrder.vue

@@ -14,7 +14,7 @@
 				<view class="title">支付方式</view>
 				<view class="item">
 					<view class="left">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/wecha_pay.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/wecha_pay.png" mode=""></image>
 						<text class="text">微信支付</text>
 					</view>
 					<label>
@@ -47,12 +47,17 @@
 		<view class="btn-box">
 			<view class="btn" @click="payOrder()">去支付</view>
 		</view>
+		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
 <script>
 	import {pay,getStoreOrderById} from '@/api/storeOrder'
+	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
 	export default {
+		components:{
+			ykscreenRecord
+		},
 		data() {
 			return {
 				payLimitTime:null,
@@ -333,7 +338,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #2BC7B9;
+				background: #C39A58;
 				border-radius: 44upx;
 			}
 		}

pages/shopping/paymentOrder.vue

@@ -18,7 +18,7 @@
 				<radio-group  @change="payTypeChange" v-if="order.isEditMoney!=null&&order.isEditMoney==1">
 					<view class="item"  >
 						<view class="left"  >
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/wecha_pay.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/wecha_pay.png" mode=""></image>
 							<text class="text">微信支付</text>
 						</view>
 						<label>
@@ -27,7 +27,7 @@
 					</view>
 					<view class="item"  >
 						<view class="left">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/pay_de.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/pay_de.png" mode=""></image>
 							<text class="text">物流代收</text>
 						</view>
 						<label>
@@ -39,7 +39,7 @@
 				<radio-group @change="payTypeChange" v-else-if="order.orderCreateType!=null&& order.orderCreateType==3">
 					<view class="item"  >
 						<view class="left" >
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/wecha_pay.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/wecha_pay.png" mode=""></image>
 							<text class="text">微信支付</text>
 						</view>
 						<label>
@@ -48,7 +48,7 @@
 					</view>
 					<view class="item" >
 						<view class="left">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/pay_de.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/pay_de.png" mode=""></image>
 							<text class="text">物流代收</text>
 						</view>
 						<label>
@@ -58,7 +58,7 @@
 					<!-- <view class="item" v-if="user!=null&&user.level==1 "> -->
 					<view class="item" >
 						<view class="left">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/pay_1.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/pay_1.png" mode=""></image>
 							<text class="text">货到付款</text>
 						</view>
 						<label>
@@ -69,7 +69,7 @@
 				<radio-group @change="payTypeChange" v-else-if="order.orderCreateType!=null&& order.orderCreateType==2">
 					<view class="item" v-if="payType==1||payType==4" >
 						<view class="left" >
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/wecha_pay.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/wecha_pay.png" mode=""></image>
 							<text class="text">微信支付</text>
 						</view>
 						<label>
@@ -78,7 +78,7 @@
 					</view>
 					<view class="item" v-if="payType==2||payType==4">
 						<view class="left" >
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/pay_de.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/pay_de.png" mode=""></image>
 							<text class="text">物流代收</text>
 						</view>
 						<label>
@@ -88,7 +88,7 @@
 					<!-- <view class="item" v-if="user!=null&&user.level==1 "> -->
 					<view class="item" v-if="payType==1||payType==4" >
 						<view class="left">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/pay_1.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/pay_1.png" mode=""></image>
 							<text class="text">货到付款</text>
 						</view>
 						<label>
@@ -99,7 +99,7 @@
 				<radio-group @change="payTypeChange" v-else-if="order.orderCreateType!=null&&(order.orderCreateType==1)">
 					<view class="item"  >
 						<view class="left" >
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/wecha_pay.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/wecha_pay.png" mode=""></image>
 							<text class="text">微信支付</text>
 						</view>
 						<label>
@@ -142,6 +142,7 @@
 				<button  class="share" data-name="shareBtn" open-type="share">分享</button>
 			</view> -->
 		</view>
+		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
@@ -149,7 +150,11 @@
 	import {getUserInfo} from '@/api/user'
 	import {getStoreConfig} from '@/api/common'
 	import {editPayType,pay,getStoreOrderById,orderBindUser} from '@/api/storeOrder'
+	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
 	export default {
+		components:{
+			ykscreenRecord
+		},
 		data() {
 			return {
 				orderId:null,
@@ -560,7 +565,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #2BC7B9;
+				background: #C39A58;
 				border-radius: 44upx;
 				margin-bottom: 10rpx;
 			}
@@ -571,8 +576,8 @@
 				font-size: 30upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2BC7B9;
-				border: 1rpx solid #2BC7B9;
+				color: #C39A58;
+				border: 1rpx solid #C39A58;
 				text-align: center;
 				background: #FFFFFF;
 				border-radius: 44upx;

pages/shopping/prescribe.vue

@@ -3,7 +3,7 @@
 		<view class="fixed-top-box">
 			<view class="status_bar" :style="{height: statusBarHeight}"></view>
 			<view class="back-box" @click="back">
-				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/back_white.png" mode=""></image>
+				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/back_white.png" mode=""></image>
 				<text class="title">填写处方信息</text>
 				<text></text>
 			</view>
@@ -13,17 +13,17 @@
 			<!-- 步骤 -->
 			<view class="steps-box">
 				<view class="item active">填写信息</view>
-				<image class="arrow" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow4.png" mode=""></image>
+				<image class="arrow" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow4.png" mode=""></image>
 				<view class="item">医生开方</view>
-				<image class="arrow" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow4.png" mode=""></image>
+				<image class="arrow" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow4.png" mode=""></image>
 				<view class="item">支付订单</view>
-				<image class="arrow" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow4.png" mode=""></image>
+				<image class="arrow" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow4.png" mode=""></image>
 				<view class="item">厂家发货</view>
 			</view>
 			<!-- 提示 -->
 			<view class="tip-box">
 				<view class="top">
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/safe2.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/safe2.png" mode=""></image>
 					<text class="text">依据国家规定、处方药需凭处方购买</text>
 				</view>
 				<view class="time-tip">填写问诊人信息、处方信息</view>
@@ -34,7 +34,7 @@
 					<view class="title-box">
 						<text class="title">选择问诊人</text>
 						<view class="add-box" @click="addPeople()">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/add26.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/add26.png" mode=""></image>
 							<text >添加</text>
 						</view>
 					</view>
@@ -47,7 +47,7 @@
 								<text class="ege">{{utils.getAge(item.birthday)}}岁</text>
 							</view>
 							<!-- 选中的对号角标 -->
-							<image v-if="patientId == item.patientId" class="active-img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/sel_right50.png" mode=""></image>
+							<image v-if="patientId == item.patientId" class="active-img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/sel_right50.png" mode=""></image>
 						</view>
 					</view>
 				</view>
@@ -74,11 +74,11 @@
 						<view class="img" v-for="(item,index) in imgList" :key="index"  >
 							<image :src="item" mode="aspectFill"  @click="previewImage(index)"></image>
 							<view class="del" @click="delImg(index)" >
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/del2.png"></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/del2.png"></image>
 							</view>
 						</view>
 						<view class="chose-img" @tap="chooseImage(1)" v-if="imgList.length<4">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/adds.png"></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/adds.png"></image>
 						</view>
 					</view>
 					
@@ -104,7 +104,7 @@
 				<!-- 是否使用过此药 -->
 				<view class="check-box">
 					<view class="left">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/yao.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/yao.png" mode=""></image>
 						<text class="text">是否有过敏史</text>
 					</view>
 					<radio-group style="display: flex;align-items: center;">
@@ -120,7 +120,7 @@
 				</view>
 				<view class="check-box">
 					<view class="left">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/yao.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/yao.png" mode=""></image>
 						<text class="text">肝功能是否异常</text>
 					</view>
 					<radio-group style="display: flex;align-items: center;">
@@ -136,7 +136,7 @@
 				</view>
 				<view class="check-box">
 					<view class="left">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/yao.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/yao.png" mode=""></image>
 						<text class="text">肾功能是否异常</text>
 					</view>
 					<radio-group style="display: flex;align-items: center;">
@@ -152,7 +152,7 @@
 				</view>
 				<view class="check-box">
 					<view class="left">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/yao.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/yao.png" mode=""></image>
 						<text class="text">是否是备孕/怀孕/哺乳期</text>
 					</view>
 					<radio-group style="display: flex;align-items: center;">
@@ -439,7 +439,7 @@
 		justify-content: space-between;
 		.fixed-top-box{
 			width: 100%;
-			background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+			background: linear-gradient(135deg, #f95d44 0%, #C39A58 100%);
 			position: fixed;
 			top: 0;
 			left: 0;
@@ -479,7 +479,7 @@
 					color: #666666;
 					&.active{
 						font-weight: bold;
-						color: #2BC7B9;
+						color: #C39A58;
 					}
 				}
 				.arrow{
@@ -574,7 +574,7 @@
 							}
 							&.active{
 								background: rgba(230, 250, 247, 0);
-								border: 2upx solid #2BC7B9;
+								border: 2upx solid #C39A58;
 								position: relative;
 							}
 							.active-img{
@@ -647,15 +647,15 @@
 							font-size: 28upx;
 							font-family: PingFang SC;
 							font-weight: 500;
-							color: #2BC7B9;
-							background: #F5FFFE;
+							color: #C39A58;
+							background: #fff5f5;
 							border: 1px solid #8AD5CE;
 							padding: 0 20upx;
 							border-radius: 32upx;
 							margin: 0 20upx 20upx 0;
 							&.active{
-								background: #2BC7B9;
-								border: 1px solid #2BC7B9;
+								background: #C39A58;
+								border: 1px solid #C39A58;
 								color: #FFFFFF;
 							}
 						}
@@ -821,7 +821,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #2BC7B9;
+				background: #C39A58;
 				border-radius: 44upx;
 			}
 		}

pages/shopping/productDetails.vue

@@ -28,7 +28,7 @@
 		<!-- 详细信息 -->
 		<view class="det-info">
 			<view class="price-box">
-				<view class="price">
+				<!-- <view class="price">
 					<text class="label"  v-if="userinfo.isShow==1&&isuser==false">会员价</text>
 					<text class="label"  v-else>零售价</text>
 					<text class="unit">￥</text>
@@ -36,10 +36,18 @@
 					<text class="num" v-else>{{product.otPrice}}</text>
 					<text class="label" v-if="userinfo.isShow==1&&isuser==false">零售价</text>
 					<text class="old" v-if="userinfo.isShow==1&&isuser==false">¥{{product.otPrice}}</text>
+				</view> -->
+				<view class="price">
+					<text class="label"  >会员价</text>
+					<text class="unit">￥</text>
+					<text class="num" >{{product.price}}</text>
+					<!-- <text class="num" >{{product.otPrice}}</text> -->
+					<text class="label">零售价</text>
+					<text class="old" >¥{{product.otPrice}}</text>
 				</view>
 				<view class="share-box" v-if="userinfo.isShow==1&&isuser==false">
 					<text class="text">分享</text>
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/share1.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/share1.png" mode=""></image>
 					<button  class="share" data-name="shareBtn" open-type="share">分享</button>
 				</view>
 			</view>
@@ -49,7 +57,7 @@
 			<view class="intro" v-if="product.productInfo!=null" v-html="product.productInfo.replace(/\n/g,'<br>')">
 			</view>
 			<view class="safe-box">
-				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/safe.png" mode=""></image>
+				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/safe.png" mode=""></image>
 				<text class="text" v-if="userinfo.isShow==1&&isuser==false">免邮发货</text>
 				<view class="line" v-if="userinfo.isShow==1&&isuser==false"></view>
 				<view class="line"></view>
@@ -63,7 +71,7 @@
 			<view class="left">
 				<!-- <view class="head-box">
 					<view class="head" v-for="(item,j) in 5" :key="j">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/head.jpg" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/head.jpg" mode=""></image>
 					</view>
 				</view> --> 
 				<view class="num-box">
@@ -91,20 +99,21 @@
 			</view>
 		</view>
 		<!-- 底部按钮 -->
-		<view class="btn-foot" v-if="userinfo.isShow==1&&isuser==false">
+		<!-- <view class="btn-foot" v-if="userinfo.isShow==1&&isuser==false"> -->
+		<view class="btn-foot">
 			<view class="menu-box">
 				<view class="item" @click="goHome">
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/back_home.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/back_home.png" mode=""></image>
 					<text class="label">首页</text>
 				</view>
 				<view class="item" style="position: relative;">
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/consult_small.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/consult_small.png" mode=""></image>
 					<text class="label">咨询</text>
 					<button class="contact-btn" open-type="contact"></button>
 				</view>
 				<view class="item" @click="navgetTo('./cart')">
 					<uni-badge size="small" :text="cartCount" absolute="rightTop" type="error">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/cart36.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/cart36.png" mode=""></image>
 					</uni-badge>
 					<text class="label">购物车</text>
 				</view>
@@ -142,7 +151,7 @@
 							<view class="input-box">
 								<input type="text" v-model="storeName" placeholder="请选择门店" class="form-input" disabled="disabled" />
 							</view>
-							<image class="arrow" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow_gray.png" mode=""></image>
+							<image class="arrow" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow_gray.png" mode=""></image>
 						</view>
 					</picker>
 				</view> -->
@@ -167,12 +176,12 @@
 					<view class="label">数量</view>
 					<view class="num-box">
 						<view class="img-box" @click="lessNum()">
-							<image v-if="specNum <= 1" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/jian.png" mode=""></image>
-							<image v-else src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/jian2.png" mode=""></image>
+							<image v-if="specNum <= 1" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/jian.png" mode=""></image>
+							<image v-else src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/jian2.png" mode=""></image>
 						</view>
 						<input   type="number" @change="changeNum" v-model="specNum"   />
 						<view class="img-box" @click="addNum()">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/add.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/add.png" mode=""></image>
 						</view>
 					</view>
 				</view>
@@ -584,7 +593,7 @@
 			left: 0;
 			bottom: 0;
 			z-index: 9;
-			background-image: url(https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/black_mask.png);
+			background-image: url(https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/black_mask.png);
 			background-size: 20upx 44upx;
 			background-repeat: repeat-x;
 		}
@@ -676,7 +685,7 @@
 			.share-box{
 				width: 120upx;
 				height: 46upx;
-				border: 1px solid #2BC7B9;
+				border: 1px solid #C39A58;
 				border-radius: 23upx;
 				display: flex;
 				align-items: center;
@@ -686,7 +695,7 @@
 					font-size: 26upx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #2BC7B9;
+					color: #C39A58;
 				}
 				image{
 					margin-left: 2rpx;
@@ -722,7 +731,7 @@
 				display: inline-block;
 				padding: 0 6upx;
 				height: 30upx;
-				background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+				background: linear-gradient(90deg, #f95d44 0%, #C39A58 100%);
 				border-radius: 4upx;
 				margin-right: 10upx;
 				font-size: 22upx;
@@ -927,7 +936,7 @@
 					background: #FF6633;
 				}
 				&.buy{
-					background: #2BC7B9;
+					background: #C39A58;
 				}
 			}
 		}
@@ -1020,7 +1029,7 @@
 					&.active{
 						background: #F1FFFE;
 						border: 1px solid #8AD5CE;
-						color: #2BC7B9;
+						color: #C39A58;
 					}
 				}
 			}
@@ -1077,7 +1086,7 @@
 			font-family: PingFang SC;
 			font-weight: bold;
 			color: #FFFFFF;
-			background: #2BC7B9;
+			background: #C39A58;
 			border-radius: 44upx;
 			margin-top: 30upx;
 			// margin-bottom: 30upx;

pages/shopping/success.vue

@@ -3,7 +3,7 @@
 		<view class="inner">
 			<view class="top">
 				<text class="title">支付成功</text>
-				 <image class="icon" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/success.png" ></image>
+				 <image class="icon" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/success.png" ></image>
 				 <view   class="btn-box">
 				 	<view class="btn cancel" @click="goOrderDetails(order.id)"> 查看订单</view>
 				 </view>

pages/user/index.vue

@@ -7,7 +7,7 @@
 				<view class="user-info">
 					<view class="left">
 						<view class="head-img">
-							<image :src="user.avatar==null?'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/detault_head.jpg':user.avatar" mode="aspectFill"></image>
+							<image :src="user.avatar==null?'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/detault_head.jpg':user.avatar" mode="aspectFill"></image>
 						</view>
 						<view class="name-phone"  v-if="UserInfo">
 							<view class="name">{{user.nickname}}
@@ -24,12 +24,12 @@
 					<view class="right">
 						<uni-badge size="small" :text="msgNum" absolute="rightTop" type="error">
 							<view class="set" @click="navgetTo('/pages_user/user/personInfo')">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/icon-set.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/icon-set.png" mode=""></image>
 							</view>
 						</uni-badge>
 						<!-- <uni-badge size="small" :text="msgNum" absolute="rightTop" type="error">
 							<view class="msg-box" @click="navgetTo('/pages_user/user/message')">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/icon-msg.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/icon-msg.png" mode=""></image>
 							</view>
 							
 						</uni-badge> -->
@@ -42,35 +42,35 @@
 							<text class="title">我的订单</text>
 							<view class="all-order" @click="showOrder('')">
 								<text class="text">全部订单</text>
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow4.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow4.png" mode=""></image>
 							</view>
 						</view>
 						<view class="status-box">
 							<uni-badge size="small" :text=count0 absolute="rightTop" type="error">
 								<view class="item" @click="showOrder('0')">
-									<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/payment.png" mode=""></image>
+									<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/payment.png" mode=""></image>
 									<text class="text">待付款</text>
 								</view>
 							</uni-badge>
 							<uni-badge size="small" :text=count1 absolute="rightTop" type="error">
 							<view class="item" @click="showOrder('1')">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/send_goods.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/send_goods.png" mode=""></image>
 								<text class="text">待发货</text>
 							</view>
 							</uni-badge>
 							<uni-badge size="small" :text=count2 absolute="rightTop" type="error">
 							<view class="item" @click="showOrder('2')">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/sou_goods.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/sou_goods.png" mode=""></image>
 								<text class="text">待收货</text>
 							</view>
 							</uni-badge>
 							<view class="item" @click="showOrder('3')">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/completed.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/completed.png" mode=""></image>
 								<text class="text">已完成</text>
 							</view>
 							<uni-badge size="small" :text=afterSalesCount absolute="rightTop" type="error">
 							<view class="item" @click="navgetTo('/pages_user/user/refundOrderList')">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/after_sales.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/after_sales.png" mode=""></image>
 								<text class="text">售后/退款</text>
 							</view>
 							</uni-badge>
@@ -84,53 +84,61 @@
 						<view class="title">常用工具</view>
 						<view class="tools-list">
 							<view class="item" @click="navgetTo('/pages_user/user/address')" v-if="user.isShow==1">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/address.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/address.png" mode=""></image>
 								<text class="text">收货地址</text>
 							</view>
 							<!-- <view class="item no-marin-bottom" @click="navgetTo('/pages_user/user/integral')">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/integral.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/integral.png" mode=""></image>
 								<text class="text">积分管理</text>
 							</view> -->
 							<view class="item no-marin-bottom"  @click="navgetTo('/pages_shopping/shopping/myCoupon')">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/mycoupon.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/mycoupon.png" mode=""></image>
 								<text class="text">优惠券</text>
 							</view>
 							<view class="item no-marin-bottom" @click="navgetTo('/pages_user/user/storeProductRelation')">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/footprint.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/footprint.png" mode=""></image>
 								<text class="text">我的足迹</text>
 							</view>
-							<view class="item no-marin-bottom" @click="openH5('/h5/userAgreement')">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/service_file.png" mode=""></image>
-								<text class="text">用户协议</text>
-							</view>
-							<view class="item no-marin-bottom align-top"  @click="openH5('/h5/privacyPolicy')">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/advice.png" mode=""></image>
-								<text class="text">隐私保护</text>
-							</view>
 							<view class="item no-marin-bottom">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/customer1.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/customer1.png" mode=""></image>
 								<text class="text">专属客服</text>
 								<button class="contact-btn" open-type="contact"></button>
 							</view>
 							<!-- <view v-if="user.isPromoter==0" class="item no-marin-bottom"  @click="navgetTo('/pages_user/user/userTuiAdd')">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/my_promotion.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/my_promotion.png" mode=""></image>
 								<text class="text">申请健康大使</text>
 							</view> -->
 							<!-- <view v-if="user.isPromoter==1" class="item no-marin-bottom"  @click="navgetTo('/pages_user/user/userTui')">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/my_promotion.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/my_promotion.png" mode=""></image>
 								<text class="text">我的推广</text>
 							</view> -->
+						</view>
+					</view>
+				</view>
+				<view class="content">
+					<!-- 常用工具 -->
+					<view class="used-tools">
+						<view class="title">其他</view>
+						<view class="tools-list">
+							<view class="item no-marin-bottom" @click="openH5(1)">
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/service_file.png" mode=""></image>
+								<text class="text">用户协议</text>
+							</view>
+							<view class="item no-marin-bottom align-top"  @click="openH5(2)">
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/advice.png" mode=""></image>
+								<text class="text">隐私保护</text>
+							</view>
 							<view class="item no-marin-bottom"  @click="navgetTo('/pages/home/cert')">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/qualification.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/qualification.png" mode=""></image>
 								<text class="text">资质证书</text>
 							</view>
-	
+					
 							<view class="item no-marin-bottom" @click="toManager()">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/products_icon.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/products_icon.png" mode=""></image>
 								<text class="text">制单管理</text>
 							</view>
 							 <view class="item no-marin-bottom" @click="toManagerCourse()">
-							 	<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/sale_file.png" mode=""></image>
+							 	<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/sale_file.png" mode=""></image>
 							 	<text class="text">销售管理</text>
 							 </view>
 						</view>
@@ -174,7 +182,7 @@
 					isWeixinAuth:0,
 					phone:"",
 					nickname:"用户昵称",
-					avatarUrl:"https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/detault_head.png"
+					avatarUrl:"https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/detault_head.png"
 				},
 				// 状态栏的高度
 				statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
@@ -265,10 +273,10 @@
 				
 			},
 			openH5(url){
-				var requestPath = uni.getStorageSync('requestPath');
-				uni.setStorageSync('url',requestPath+url);
+				// var requestPath = uni.getStorageSync('requestPath');
+				// uni.setStorageSync('url',requestPath+url);
 				uni.navigateTo({
-					url: '../home/h5'
+					url: '../home/h5?val='+url
 				})
 			},
 			getUserInfo(){
@@ -321,9 +329,9 @@
 		width: 100%;
 		height: 494upx;
 		position: relative;
-		background-image: url(https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/personl_top_bg.png);
-		background-repeat: repeat-x;
-		background-size: 40upx 100%;
+		background-image: url(https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/personl_top_bg.png);
+		background-repeat: no-repeat;
+		background-size: 100%;
 		.top-inner{
 			width: 100%;
 			height: 100%;
@@ -476,7 +484,7 @@
 			background: #FFFFFF;
 			border-radius: 16upx;
 			padding: 40upx 30upx;
-			
+			width: 100%;
 			.title{
 				font-size: 34upx;
 				font-family: PingFang SC;
@@ -499,8 +507,8 @@
 					margin-bottom: 50upx;
 					position: relative;
 					image{
-						width: 44upx;
-						height: 44upx;
+						width: 48upx;
+						height: 48upx;
 					}
 					.text{
 						font-size: 24upx;

pages_company/alipayImg.vue

@@ -97,7 +97,7 @@ page {
  		font-family: PingFang SC;
  		font-weight: 400;
  		color: #FFFFFF;
- 		background:#2BC7B9 !important;
+ 		background:#C39A58 !important;
  		border-radius: 44upx;
  	}
  }

pages_company/auth/login.vue

@@ -137,7 +137,7 @@ export default {
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #2BC7B9;
+				background: #C39A58;
 				border-radius: 44upx;
 			}
 		}

pages_company/card.vue

@@ -99,7 +99,7 @@ page {
  		font-family: PingFang SC;
  		font-weight: 400;
  		color: #FFFFFF;
- 		background:#2BC7B9 !important;
+ 		background:#C39A58 !important;
  		border-radius: 44upx;
  	}
  }

pages_company/coupon.vue

@@ -14,7 +14,7 @@
 	</view>
     <view class="tui-coupon-list">
       <view class="tui-coupon-item tui-top20" v-for="(item, index) in couponsList" :key="index">
-         <image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/bg_coupon_3x.png" class="tui-coupon-bg" mode="widthFix"></image>
+         <image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/bg_coupon_3x.png" class="tui-coupon-bg" mode="widthFix"></image>
 		<view class="tui-coupon-item-left">
           <view class="tui-coupon-price-box" :class="{ 'tui-color-grey': item.receiveCount>0 }">
             <view class="tui-coupon-price-sign">￥</view>
@@ -48,7 +48,7 @@
 	<Loading :loaded="loadend" :loading="loading"></Loading>
 	<!--暂无优惠券-->
 	<view v-if="couponsList.length == 0 && page > 1" class="no-data-box" >
-		<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no_data.png" mode="aspectFit"></image>
+		<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no_data.png" mode="aspectFit"></image>
 		<view class="empty-title">暂无数据</view>
 	</view>
   </view>
@@ -149,15 +149,15 @@ page {
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #2BC7B9;
-			background: #F5FFFE;
+			color: #C39A58;
+			background: #fff5f5;
 			border: 1px solid #8AD5CE;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #2BC7B9;
-				border: 1px solid #2BC7B9;
+				background: #C39A58;
+				border: 1px solid #C39A58;
 			}
 		}
 	}

pages_company/couponDetails.vue

@@ -2,7 +2,7 @@
   <view class="container">
     <view class="tui-coupon-list">
       <view class="tui-coupon-item tui-top20"  >
-         <image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/bg_coupon_3x.png" class="tui-coupon-bg" mode="widthFix"></image>
+         <image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/bg_coupon_3x.png" class="tui-coupon-bg" mode="widthFix"></image>
 		<view class="tui-coupon-item-left">
           <view class="tui-coupon-price-box"  >
             <view class="tui-coupon-price-sign">￥</view>

pages_company/index.vue

@@ -17,31 +17,31 @@
 				<view class="title">常用工具</view>
 				<view class="tools-list">
 					<view class="item" @click="toCreateOrder()">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/order.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/order.png" mode=""></image>
 						<text class="text">商品制单</text>
 					</view>
 					<view class="item" @click="toCreateCoupon()">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/icon_coupon.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/icon_coupon.png" mode=""></image>
 						<text class="text">制单优惠券</text>
 					</view>
 					<view class="item" @click="toPay()">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/money.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/money.png" mode=""></image>
 						<text class="text">微信收款</text>
 					</view>
 					<!-- <view class="item" @click="alipay()">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/money.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/money.png" mode=""></image>
 						<text class="text">支付宝收款</text>
 					</view> -->
 					<view class="item" @click="toOrder()">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/order.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/order.png" mode=""></image>
 						<text class="text">我的订单</text>
 					</view>
 					<view class="item" @click="toPackage()">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/package.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/package.png" mode=""></image>
 						<text class="text">商品套餐</text>
 					</view>
 					<view class="item" @click="toCoupon()">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/icon_coupon.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/icon_coupon.png" mode=""></image>
 						<text class="text">套餐优惠券</text>
 					</view>
 					 <view class="item" @click="toPaywechat()">
@@ -243,7 +243,7 @@
 				font-weight: 500;
 				color: #FFFFFF;
 				border-radius: 8rpx;
-				background-color: #2BC7B9;
+				background-color: #C39A58;
 			}
 		}
 		.used-tools{

pages_company/order/cart.vue

@@ -22,12 +22,12 @@
 						</view>
 						<view class="num-box">
 							<view class="img-box" @click="delNum(item)">
-								<image v-if="item.cartNum <= 1" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/jian.png" mode=""></image>
-								<image v-else src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/jian2.png" mode=""></image>
+								<image v-if="item.cartNum <= 1" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/jian.png" mode=""></image>
+								<image v-else src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/jian2.png" mode=""></image>
 							</view>
 							<input type="text"  @change="changeNum($event,item)" :value="item.cartNum"   />
 							<view class="img-box" @click="addNum(item)">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/add.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/add.png" mode=""></image>
 							</view>
 						</view>
 					</view>
@@ -54,15 +54,18 @@
 				<view class="btn" @click="submit">制单</view>
 			</view>
 		</view>
-		
+		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
 <script>
 	import {getCarts,cartNum,delCart} from '@/api/product'
 	import {createSalesOrder} from '@/api/companyOrder.js'
+	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
 	export default {
-		 
+		 components:{
+		 	ykscreenRecord
+		 },
 		data() {
 			return {
 				totalMoney:0.00,
@@ -296,7 +299,7 @@
 							font-family: PingFang SC;
 							font-weight: bold;
 							color: #FFFFFF;
-							background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+							background: linear-gradient(90deg, #f95d44 0%, #C39A58 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							flex-shrink: 0;
@@ -444,7 +447,7 @@
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #FFFFFF;
-					background: #2BC7B9;
+					background: #C39A58;
 					border-radius: 44upx;
 				}
 			}

pages_company/order/confirmCompanyOrder.vue

@@ -57,12 +57,17 @@
 			<input type="text" v-model="inputTxt" placeholder="请输入实收金额" class="intxt" maxlength="8" />
 			<input type="text" v-model="payAmount" placeholder="请输入货到付款金额" class="intxt pay_type" maxlength="8" />
 		</modal>
+		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
 <script>
 	import {getSalesOrder,addUserCart,updateSalseOrderMoney} from '@/api/companyOrder.js'
+	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
 	export default {
+		components:{
+			ykscreenRecord
+		},
 		data() {
 			return {
 				inputShow:false,
@@ -85,7 +90,7 @@
 		//发送给朋友
 		onShareAppMessage(res) {
 			return {
-				title: "宽益堂商城-您的专属健康解决方案",
+				title: "宽益堂九-您的专属健康解决方案",
 				path: '/pages_company/order/confirmOrder?orderKey='+this.orderKey,
 				imageUrl: '/static/logo.jpg' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
@@ -94,9 +99,9 @@
 		//分享到朋友圈
 		onShareTimeline(res) {
 			return {
-				title:"宽益堂商城-您的专属健康解决方案",
+				title:"宽益堂九-您的专属健康解决方案",
 				query:'orderKey='+this.orderKey,
-				imageUrl:  '/static/logo.jpg' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
+				imageUrl: '/static/logo.jpg' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 			}
 		},
 		methods: {
@@ -219,7 +224,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+							background: linear-gradient(90deg, #f95d44 0%, #C39A58 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -425,7 +430,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #2BC7B9;
+				background: #C39A58;
 				border-radius: 44upx;
 				position: relative;
 				.share{

pages_company/order/confirmOrder.vue

@@ -50,18 +50,23 @@
 		</view>
 		<view class="message-box" v-if="messageShow">
 			<view class="left">
-				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/close24.png" mode="" @click="closeOrder()" ></image>
+				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/close24.png" mode="" @click="closeOrder()" ></image>
 				<view class="text ellipsis">您有{{count0}}个待支付订单</view>
 			</view>
 			<view class="btn" @click="showOrder()">查看</view>
 		</view>
+		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
 <script>
 	import {getOrderCount} from '@/api/storeOrder'
 	import {getSalesOrder,addUserCart} from '@/api/companyOrder.js'
+	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
 	export default {
+		components:{
+			ykscreenRecord
+		},
 		data() {
 			return {
 				count0:0,
@@ -206,7 +211,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+							background: linear-gradient(90deg, #f95d44 0%, #C39A58 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -412,7 +417,7 @@
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
-				background: #2BC7B9;
+				background: #C39A58;
 				border-radius: 44upx;
 			}
 		}
@@ -533,7 +538,7 @@
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #2BC7B9;
+				color: #C39A58;
 			}
 		}
 		.btn{
@@ -546,7 +551,7 @@
 			font-weight: 500;
 			color: #FFFFFF;
 			border: 1px solid #D2E6FF;
-			background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+			background: linear-gradient(135deg, #f95d44 0%, #C39A58 100%);
 			border-radius: 24upx;
 			margin-left: 30upx;
 		}

pages_company/order/coupon.vue

@@ -2,7 +2,7 @@
   <view ref="container">
     <view class="tui-coupon-list">
       <view class="tui-coupon-item tui-top20" v-for="(item, index) in couponsList" :key="index">
-         <image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/bg_coupon_3x.png" class="tui-coupon-bg" mode="widthFix"></image>
+         <image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/bg_coupon_3x.png" class="tui-coupon-bg" mode="widthFix"></image>
 		<view class="tui-coupon-item-left">
           <view class="tui-coupon-price-box" :class="{ 'tui-color-grey': item.receiveCount>0 }">
             <view class="tui-coupon-price-sign">￥</view>
@@ -36,7 +36,7 @@
 	<Loading :loaded="loadend" :loading="loading"></Loading>
 	<!--暂无优惠券-->
 	<view v-if="couponsList.length == 0 && page > 1" class="no-data-box" >
-		<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no_data.png" mode="aspectFit"></image>
+		<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no_data.png" mode="aspectFit"></image>
 		<view class="empty-title">暂无数据</view>
 	</view>
   </view>
@@ -123,15 +123,15 @@ page {
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #2BC7B9;
-			background: #F5FFFE;
+			color: #C39A58;
+			background: #fff5f5;
 			border: 1px solid #8AD5CE;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #2BC7B9;
-				border: 1px solid #2BC7B9;
+				background: #C39A58;
+				border: 1px solid #C39A58;
 			}
 		}
 	}

pages_company/order/productDetails.vue

@@ -39,7 +39,7 @@
 				{{product.productInfo}}
 			</view>
 			<view class="safe-box">
-				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/safe.png" mode=""></image>
+				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/safe.png" mode=""></image>
 				<text class="text">免邮发货</text>
 				<view class="line"></view>
 				<text class="text">药师服务</text>
@@ -52,7 +52,7 @@
 			<view class="left">
 				<!-- <view class="head-box">
 					<view class="head" v-for="(item,j) in 5" :key="j">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/head.jpg" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/head.jpg" mode=""></image>
 					</view>
 				</view> -->
 				<view class="num-box">
@@ -83,17 +83,17 @@
 		<view class="btn-foot">
 			<view class="menu-box">
 				<view class="item" @click="goHome">
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/back_home.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/back_home.png" mode=""></image>
 					<text class="label">首页</text>
 				</view>
 				<view class="item" style="position: relative;">
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/consult_small.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/consult_small.png" mode=""></image>
 					<text class="label">咨询</text>
 					<button class="contact-btn" open-type="contact"></button>
 				</view>
 				<view class="item" @click="navgetTo('./cart')">
 					<uni-badge size="small" :text="cartCount" absolute="rightTop" type="error">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/cart36.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/cart36.png" mode=""></image>
 					</uni-badge>
 					<text class="label">购物车</text>
 				</view>
@@ -142,12 +142,12 @@
 					<view class="label">数量</view>
 					<view class="num-box">
 						<view class="img-box" @click="lessNum()">
-							<image v-if="specNum <= 1" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/jian.png" mode=""></image>
-							<image v-else src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/jian2.png" mode=""></image>
+							<image v-if="specNum <= 1" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/jian.png" mode=""></image>
+							<image v-else src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/jian2.png" mode=""></image>
 						</view>
 						<input type="text" @change="changeNum" v-model="specNum"    />
 						<view class="img-box" @click="addNum()">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/add.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/add.png" mode=""></image>
 						</view>
 					</view>
 				</view>
@@ -445,7 +445,7 @@
 			left: 0;
 			bottom: 0;
 			z-index: 9;
-			background-image: url(https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/black_mask.png);
+			background-image: url(https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/black_mask.png);
 			background-size: 20upx 44upx;
 			background-repeat: repeat-x;
 		}
@@ -510,7 +510,7 @@
 			.share-box{
 				width: 120upx;
 				height: 46upx;
-				border: 1px solid #2BC7B9;
+				border: 1px solid #C39A58;
 				border-radius: 23upx;
 				display: flex;
 				align-items: center;
@@ -520,7 +520,7 @@
 					font-size: 26upx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #2BC7B9;
+					color: #C39A58;
 				}
 				image{
 					margin-left: 2rpx;
@@ -556,7 +556,7 @@
 				display: inline-block;
 				padding: 0 6upx;
 				height: 30upx;
-				background: linear-gradient(90deg, #2BC7B9 0%, #2BC7A4 100%);
+				background: linear-gradient(90deg, #C39A58 0%, #2BC7A4 100%);
 				border-radius: 4upx;
 				margin-right: 10upx;
 				font-size: 22upx;
@@ -761,7 +761,7 @@
 					background: #FF6633;
 				}
 				&.buy{
-					background: #2BC7B9;
+					background: #C39A58;
 				}
 			}
 		}
@@ -854,7 +854,7 @@
 					&.active{
 						background: #F1FFFE;
 						border: 1px solid #8AD5CE;
-						color: #2BC7B9;
+						color: #C39A58;
 					}
 				}
 			}
@@ -911,7 +911,7 @@
 			font-family: PingFang SC;
 			font-weight: bold;
 			color: #FFFFFF;
-			background: #2BC7B9;
+			background: #C39A58;
 			border-radius: 44upx;
 			margin-top: 30upx;
 			// margin-bottom: 30upx;

pages_company/order/productList.vue

@@ -4,13 +4,13 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 					<input type="text" @confirm="goSearch"   :value="form.productName" placeholder="输入药品名称" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 				<view class="icon-search">
-					<image @click="showChange(2)" v-if="showType==1"  src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search1.png" mode=""></image>
-					<image @click="showChange(1)" v-if="showType==2"  src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search2.png" mode=""></image>
-					<image @click="openCart()"   src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/carts.png" mode=""></image>
+					<image @click="showChange(2)" v-if="showType==1"  src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search1.png" mode=""></image>
+					<image @click="showChange(1)" v-if="showType==2"  src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search2.png" mode=""></image>
+					<image @click="openCart()"   src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/carts.png" mode=""></image>
 				</view>
 			</view>
 			<!-- 排序框 -->
@@ -21,19 +21,19 @@
 				<view class="item" @click="searchChange('2')">
 					<text class="label">价格</text>
 					<view class="sort-img">
-						<image v-if="form.priceOrder==null||form.priceOrder=='desc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/price_arrow_up.png" mode="" @click="priceUp(true)"></image>
-						<image v-if="form.priceOrder=='asc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/price_arrow_up2.png" mode="" @click="priceUp(false)"></image>
-						<image v-if="form.priceOrder==null||form.priceOrder=='asc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/price_arrow_down.png" mode="" @click="priceDown(true)"></image>
-						<image v-if="form.priceOrder=='desc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/price_arrow_down2.png" mode="" @click="priceDown(false)"></image>
+						<image v-if="form.priceOrder==null||form.priceOrder=='desc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/price_arrow_up.png" mode="" @click="priceUp(true)"></image>
+						<image v-if="form.priceOrder=='asc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/price_arrow_up2.png" mode="" @click="priceUp(false)"></image>
+						<image v-if="form.priceOrder==null||form.priceOrder=='asc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/price_arrow_down.png" mode="" @click="priceDown(true)"></image>
+						<image v-if="form.priceOrder=='desc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/price_arrow_down2.png" mode="" @click="priceDown(false)"></image>
 					</view>
 				</view>
 				<view class="item" @click="searchChange('3')">
 					<text class="label">销量</text>
 					<view class="sort-img">
-						<image v-if="form.salesOrder==null||form.salesOrder=='desc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/price_arrow_up.png" mode="" @click="saleUp(true)"></image>
-						<image v-if="form.salesOrder=='asc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/price_arrow_up2.png" mode="" @click="saleUp(false)"></image>
-						<image v-if="form.salesOrder==null||form.salesOrder=='asc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/price_arrow_down.png" mode="" @click="saleDown(true)"></image>
-						<image v-if="form.salesOrder=='desc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/price_arrow_down2.png" mode="" @click="saleDown(false)"></image>
+						<image v-if="form.salesOrder==null||form.salesOrder=='desc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/price_arrow_up.png" mode="" @click="saleUp(true)"></image>
+						<image v-if="form.salesOrder=='asc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/price_arrow_up2.png" mode="" @click="saleUp(false)"></image>
+						<image v-if="form.salesOrder==null||form.salesOrder=='asc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/price_arrow_down.png" mode="" @click="saleDown(true)"></image>
+						<image v-if="form.salesOrder=='desc'" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/price_arrow_down2.png" mode="" @click="saleDown(false)"></image>
 					</view>
 				</view>
 				<view class="item" :class="form.newOrder=='desc'?'active':''" @click="searchChange('4')">
@@ -112,7 +112,7 @@
 					},
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						icon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no_data.png',
+						icon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no_data.png',
 						tip: '暂无数据'
 					},
 					textNoMore:"已经到底了",
@@ -310,7 +310,7 @@
 			align-items: center;
 			justify-content: center;
 			&.active .label{
-				color: #2BC7B9;
+				color: #C39A58;
 			}
 			.label{
 				font-size: 26upx;

pages_company/order/productShowDetails.vue

@@ -40,7 +40,7 @@
 				{{product.productInfo}}
 			</view>
 			<view class="safe-box">
-				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/safe.png" mode=""></image>
+				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/safe.png" mode=""></image>
 				<text class="text">免邮发货</text>
 				<view class="line"></view>
 				<text class="text">药师服务</text>
@@ -53,7 +53,7 @@
 			<view class="left">
 				<!-- <view class="head-box">
 					<view class="head" v-for="(item,j) in 5" :key="j">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/head.jpg" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/head.jpg" mode=""></image>
 					</view>
 				</view> -->
 				<view class="num-box">
@@ -199,7 +199,7 @@
 			left: 0;
 			bottom: 0;
 			z-index: 9;
-			background-image: url(https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/black_mask.png);
+			background-image: url(https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/black_mask.png);
 			background-size: 20upx 44upx;
 			background-repeat: repeat-x;
 		}
@@ -264,7 +264,7 @@
 			.share-box{
 				width: 120upx;
 				height: 46upx;
-				border: 1px solid #2BC7B9;
+				border: 1px solid #C39A58;
 				border-radius: 23upx;
 				display: flex;
 				align-items: center;
@@ -274,7 +274,7 @@
 					font-size: 26upx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #2BC7B9;
+					color: #C39A58;
 				}
 				image{
 					margin-left: 2rpx;
@@ -310,7 +310,7 @@
 				display: inline-block;
 				padding: 0 6upx;
 				height: 30upx;
-				background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+				background: linear-gradient(90deg, #f95d44 0%, #C39A58 100%);
 				border-radius: 4upx;
 				margin-right: 10upx;
 				font-size: 22upx;

pages_company/storeOrder.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="search-cont">
 			<view class="inner">
-				<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+				<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 				<input type="text" value="" placeholder="输入订单号" confirm-type="搜索" @confirm="goSearch"   placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 			</view>
 		</view>
@@ -61,13 +61,18 @@
 				</view>
 			</view>
 		</mescroll-body>
+		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
 <script>
 	import {getCompanyStoreOrderList} from '@/api/storeOrder'
 	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
 	export default {
+		components:{
+			ykscreenRecord
+		},
 		mixins: [MescrollMixin], 
 		data() {
 			return {
@@ -83,7 +88,7 @@
 					},
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						icon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no_data.png',
+						icon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no_data.png',
 						tip: '暂无数据'
 					}
 				},
@@ -251,7 +256,7 @@
 						font-family: PingFang SC;
 						font-weight: 500;
 						color: #FFFFFF;
-						background-image: url(https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/recom.png);
+						background-image: url(https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/recom.png);
 						background-repeat: no-repeat;
 						background-size: 100% 100%;
 						margin-right: 8upx;
@@ -262,7 +267,7 @@
 						font-weight: 500;
 						line-height: 1;
 						&.success{
-							color: #2BC7B9;
+							color: #C39A58;
 						}
 						&.black{
 							color: #111111;
@@ -305,7 +310,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+								background: linear-gradient(90deg, #f95d44 0%, #C39A58 100%);
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -415,7 +420,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #2BC7B9;
+								background: #C39A58;
 								color: #FFFFFF;
 								position: relative;
 								.share{

pages_company/storeOrderDetail.vue

@@ -2,13 +2,13 @@
 	<view>
 		<view class="top-cont">
 			<!-- 背景图片 -->
-			<image class="bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/order_top_bg.png" mode=""></image>
+			<image class="bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/order_top_bg.png" mode=""></image>
 			<view class="top-inner">			
 				<!-- 这里是状态栏 -->
 				<view class="fixed-top-box">
 					<view class="status_bar" :style="{height: statusBarHeight}"></view>
 					<view class="back-box" @click="back">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/back_white.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/back_white.png" mode=""></image>
 						<text class="title">订单详情</text>
 						<text></text>
 					</view>
@@ -23,7 +23,7 @@
 					<!-- 待付款 -->
 					<view v-if="order.status == 0" class="inner">
 						<view class="img-box">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/pag96.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/pag96.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待付款</text>
@@ -33,7 +33,7 @@
 					<!-- 待发货 -->
 					<view v-if="order.status == 1" class="inner">
 						<view class="img-box">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/pag96.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/pag96.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待发货</text>
@@ -43,7 +43,7 @@
 					<!-- 已发货、待收货 -->
 					<view v-if="order.status == 2" class="inner">
 						<view class="img-box">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/receipt.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/receipt.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">待收货</text>
@@ -53,7 +53,7 @@
 					<!-- 已完成 -->
 					<view v-if="order.status == 3" class="inner">
 						<view class="img-box">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/finish96.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/finish96.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">已完成</text>
@@ -64,7 +64,7 @@
 					<!--交易取消 -->
 					<view v-if="order.status == -3" class="inner">
 						<view class="img-box">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/close_trade.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/close_trade.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">交易关闭</text>
@@ -73,7 +73,7 @@
 					</view>
 					<view v-if="order.status == -1" class="inner">
 						<view class="img-box">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/close_trade.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/close_trade.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">申请售后</text>
@@ -82,7 +82,7 @@
 					</view>
 					<view v-if="order.status == -2" class="inner">
 						<view class="img-box">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/close_trade.png" mode=""></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/close_trade.png" mode=""></image>
 						</view>
 						<view class="status-box">
 							<text class="status">退款成功</text>
@@ -93,7 +93,7 @@
 				<!-- 下单人信息 -->
 				<view class="order-placer">
 					<view class="inner">
-						<image class="location" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/location.png" mode=""></image>
+						<image class="location" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/location.png" mode=""></image>
 						<view class="info">
 							<view class="name-phone">
 								<text class="text">{{order.realName}}</text>
@@ -206,7 +206,7 @@
 							<text class="label">电子处方</text>
 							<view class="check-box" @click="showImg()">
 								<text class="text">查看</text>
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow4.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow4.png" mode=""></image>
 							</view>
 						</view>
 					</view>
@@ -244,13 +244,18 @@
 				</view>
 		  </view>
 		</view>
+		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
 <script>
 	import {getMyStoreOrderById } from '@/api/storeOrder'
 	import {editOrderMoney} from '@/api/companyOrder.js'
+	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
 	export default {
+		components:{
+			ykscreenRecord
+		},
 		data() {
 			return {
 				payMoney:0,
@@ -373,7 +378,7 @@
 <style lang="scss">
 	.fixed-top-box{
 		width: 100%;
-		background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+		background: linear-gradient(135deg, #f95d44 0%, #C39A58 100%);
 		position: fixed;
 		top: 0;
 		left: 0;
@@ -541,7 +546,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+							background: linear-gradient(90deg, #f95d44 0%, #C39A58 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -732,7 +737,7 @@
 			border-radius: 32upx;
 			margin-left: 15upx;
 			&.share-btn{
-				background: #2BC7B9;
+				background: #C39A58;
 				color: #FFFFFF;
 				position: relative;
 				.share{
@@ -833,7 +838,7 @@
 					font-family: PingFang SC;
 					font-weight: bold;
 					color: #FFFFFF;
-					background: #2BC7B9;
+					background: #C39A58;
 					border-radius: 44upx;
 				}
 			}

pages_company/storeProductPackage.vue

@@ -3,7 +3,7 @@
 		<view class="top-fixed">
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 					<input type="text" @confirm="goSearch"   :value="form.title" placeholder="输入套餐名称" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -67,13 +67,18 @@
 				</view>
 			</view>
 		</mescroll-body>
+		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
 <script>
 	import {getStoreProductPackage} from '@/api/storeProductPackage.js'
 	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
 	export default {
+		components:{
+			ykscreenRecord
+		},
 		mixins: [MescrollMixin], 
 		data() {
 			return {
@@ -93,7 +98,7 @@
 					},
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						icon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no_data.png',
+						icon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no_data.png',
 						tip: '暂无数据'
 					}
 				},
@@ -238,15 +243,15 @@
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #2BC7B9;
-				background: #F5FFFE;
+				color: #C39A58;
+				background: #fff5f5;
 				border: 1px solid #8AD5CE;
 				border-radius: 32upx;
 				margin: 0 20upx 20upx 0;
 				&.active{
 					color: #FFFFFF;
-					background: #2BC7B9;
-					border: 1px solid #2BC7B9;
+					background: #C39A58;
+					border: 1px solid #C39A58;
 				}
 			}
 		}
@@ -291,7 +296,7 @@
 						font-family: PingFang SC;
 						font-weight: 500;
 						color: #FFFFFF;
-						background-image: url(https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/recom.png);
+						background-image: url(https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/recom.png);
 						background-repeat: no-repeat;
 						background-size: 100% 100%;
 						margin-right: 8upx;
@@ -302,7 +307,7 @@
 						font-weight: 500;
 						line-height: 1;
 						&.success{
-							color: #2BC7B9;
+							color: #C39A58;
 						}
 						&.black{
 							color: #111111;
@@ -346,7 +351,7 @@
 								display: inline-block;
 								padding: 0 6upx;
 								height: 30upx;
-								background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+								background: linear-gradient(90deg, #f95d44 0%, #C39A58 100%);
 								border-radius: 4upx;
 								margin-right: 10upx;
 								font-size: 22upx;
@@ -471,7 +476,7 @@
 								color: #666666;
 							}
 							&.pay{
-								background: #2BC7B9;
+								background: #C39A58;
 								color: #FFFFFF;
 								position: relative;
 								.share{

pages_company/storeProductPackageDetails.vue

@@ -80,11 +80,11 @@
 		<view class="btn-foot">
 			<view class="menu-box">
 				<view class="item" @click="goHome">
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/back_home.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/back_home.png" mode=""></image>
 					<text class="label">首页</text>
 				</view>
 				<view class="item" style="position: relative;">
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/consult_small.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/consult_small.png" mode=""></image>
 					<text class="label">咨询</text>
 					<button class="contact-btn" open-type="contact"></button>
 				</view>
@@ -96,18 +96,23 @@
 		</view>
 		<view class="message-box" v-if="messageShow">
 			<view class="left">
-				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/close24.png" mode="" @click="closeOrder()" ></image>
+				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/close24.png" mode="" @click="closeOrder()" ></image>
 				<view class="text ellipsis">您有{{count0}}个待支付订单</view>
 			</view>
 			<view class="btn" @click="showOrder()">查看</view>
 		</view>
+		<ykscreenRecord></ykscreenRecord>
 	</view>
 </template>
 
 <script>
 	import {getOrderCount} from '@/api/storeOrder'
 	import {getStoreProductPackageDetails} from '@/api/storeProductPackage'
+	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
 	export default {
+		components:{
+			ykscreenRecord
+		},
 		data() {
 			return {
 				count0:0,
@@ -284,7 +289,7 @@
 			left: 0;
 			bottom: 0;
 			z-index: 9;
-			background-image: url(https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/black_mask.png);
+			background-image: url(https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/black_mask.png);
 			background-size: 20upx 44upx;
 			background-repeat: repeat-x;
 		}
@@ -349,7 +354,7 @@
 			.share-box{
 				width: 120upx;
 				height: 46upx;
-				border: 1px solid #2BC7B9;
+				border: 1px solid #C39A58;
 				border-radius: 23upx;
 				display: flex;
 				align-items: center;
@@ -359,7 +364,7 @@
 					font-size: 26upx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #2BC7B9;
+					color: #C39A58;
 				}
 				image{
 					margin-left: 2rpx;
@@ -395,7 +400,7 @@
 				display: inline-block;
 				padding: 0 6upx;
 				height: 30upx;
-				background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+				background: linear-gradient(90deg, #f95d44 0%, #C39A58 100%);
 				border-radius: 4upx;
 				margin-right: 10upx;
 				font-size: 22upx;
@@ -600,7 +605,7 @@
 					background: #FF6633;
 				}
 				&.buy{
-					background: #2BC7B9;
+					background: #C39A58;
 				}
 			}
 		}
@@ -693,7 +698,7 @@
 					&.active{
 						background: #F1FFFE;
 						border: 1px solid #8AD5CE;
-						color: #2BC7B9;
+						color: #C39A58;
 					}
 				}
 			}
@@ -750,7 +755,7 @@
 			font-family: PingFang SC;
 			font-weight: bold;
 			color: #FFFFFF;
-			background: #2BC7B9;
+			background: #C39A58;
 			border-radius: 44upx;
 			margin-top: 30upx;
 			// margin-bottom: 30upx;
@@ -803,7 +808,7 @@
 							display: inline-block;
 							padding: 0 6upx;
 							height: 30upx;
-							background: linear-gradient(90deg, #66b2ef 0%, #2BC7B9 100%);
+							background: linear-gradient(90deg, #f95d44 0%, #C39A58 100%);
 							border-radius: 4upx;
 							margin-right: 10upx;
 							font-size: 22upx;
@@ -891,7 +896,7 @@
 				font-size: 28upx;
 				font-family: PingFang SC;
 				font-weight: 500;
-				color: #2BC7B9;
+				color: #C39A58;
 			}
 		}
 		.btn{
@@ -904,7 +909,7 @@
 			font-weight: 500;
 			color: #FFFFFF;
 			border: 1px solid #D2E6FF;
-			background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
+			background: linear-gradient(135deg, #f95d44 0%, #C39A58 100%);
 			border-radius: 24upx;
 			margin-left: 30upx;
 		}

pages_company/wechatcode.vue

@@ -3,10 +3,10 @@
 		<view class="codeimg">
 			<view v-if="wechatImg!=null" class="centerV">
 				<image :src="wechatImg" style="width: 100%;" mode="aspectFit" :show-menu-by-longpress="true" ></image>
-				<view class="centerV">点击保存图片至本地！</view>
+				<view class="centerV">点击保存或长按图片保存至本地！</view>
 			</view>
 			<view v-else>
-				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no_data.png" style="width: 100%;"
+				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no_data.png" style="width: 100%;"
 					mode="aspectFill"></image>
 				<view class="centerV">暂无二维码，请点击生成二维码</view>
 			</view>
@@ -68,6 +68,7 @@
 			},
 			generatecode() {
 				const data = {
+					//companyUserId:uni.getStorageSync('companyUserInfoId'),
 					companyId: this.companyId,
 					appId: wx.getAccountInfoSync().miniProgram.appId
 				}
@@ -85,6 +86,7 @@
 			},
 			getcomapycodes() {
 				const data = {
+					//companyUserId:uni.getStorageSync('companyUserInfoId'),
 					companyId: this.companyId,
 					appId: wx.getAccountInfoSync().miniProgram.appId
 				}
@@ -112,7 +114,7 @@
 	}
 
 	.generate {
-		background-color: #2BC7B9;
+		background-color: #C39A58;
 		width: 70%;
 		margin: 0 auto;
 		border-radius: 40rpx;

pages_course/becomeSale.vue

@@ -47,7 +47,8 @@
 				companyId:'',
 				phoneNumber:'',
 				nickName:'',
-				password:''
+				password:'',
+				companyUserId:''
 			}
 		},
 		computed: {
@@ -57,6 +58,7 @@
 		  },
 		onLoad(option) {
 			this.companyId = option.id
+			this.companyUserId=option.companyUserId
 		},
 		methods: {
 			close() {},
@@ -66,7 +68,8 @@
 					companyId:this.companyId,
 					phoneNumber:this.phoneNumber,
 					nickName:this.nickName,
-					password:this.password
+					password:this.password,
+					companyUserId:this.companyUserId
 				}
 				if(this.phoneNumber==''){
 					uni.showToast({ title: '请输入手机号！', icon: 'none' });

pages_course/becomeVIP.vue

@@ -81,7 +81,7 @@
 			</view>
 		</u-popup>
 		<!--#endif-->
-		<view class="footer-tips">重庆云联融智提供技术支持</view>
+		<!-- <view class="footer-tips">重庆云联融智提供技术支持</view> -->
 	</view>
 </template>
 
@@ -144,7 +144,7 @@
 			let path = 'https://userapp.moonxiang.com/prod-api'//存在文化
 			uni.setStorageSync('requestPath',path)
 			if(uni.getStorageSync('userInfo')&&uni.getStorageSync('userInfo')!='{}') {
-				this.userInfo =  JSON.parse(uni.getStorageSync('userInfo')) 
+				this.userInfo = uni.getStorageSync('userInfo')
 			} else {
 				this.userInfo = {}
 			}
@@ -156,13 +156,22 @@
 			let obj=uni.getStorageSync('TOKEN_KEY');
 			// #endif
 			// let obj=uni.getStorageSync('AppToken');
+			let becomeVip={}
+			if(!option.becomeVip){
+				const keys = decodeURIComponent(Object.keys(option)[0]);
+				becomeVip=JSON.parse(keys.split('becomeVip=')[1])
+				console.log(becomeVip)
+			}else{
+				becomeVip = option.becomeVip ? JSON.parse(decodeURIComponent(option.becomeVip)) : {}
+			}
+			console.log(becomeVip)
 			this.isLogin = !!obj;
-			this.companyid = option.companyId || ''
-			this.companyUserId=option.companyUserId || 0
-			this.projectId=option.projectId
-			this.H5course.companyId=option.companyId
-			this.H5course.companyUserId=option.companyUserId
-			this.H5course.projectId=option.projectId
+			this.companyid = becomeVip.companyId || ''
+			this.companyUserId=becomeVip.companyUserId || 0
+			this.projectId=becomeVip.projectId
+			this.H5course.companyId=becomeVip.companyId
+			this.H5course.companyUserId=becomeVip.companyUserId
+			this.H5course.projectId=becomeVip.projectId
 			uni.setStorageSync('H5course',this.H5course)
 			console.log(this.H5course)
 			//#ifdef MP-WEIXIN
@@ -176,10 +185,11 @@
 				return
 			}
 			//#endif
-			if(option.tagids=="null"){
+			console.log(becomeVip)
+			if(becomeVip.tagids==null||becomeVip.tagids==''){
 				this.tagIds=[]
 			}else{
-				this.tagIds=option.tagids 
+				this.tagIds=becomeVip.tagids 
 				const arr =this.tagIds.split("，")
 				  .map(item => parseInt(item.trim(), 10))
 				  .filter(num => !isNaN(num)); // 过滤无效转换
@@ -198,12 +208,11 @@
 		onShow() {
 			this.getWebviewUrl()
 			if(uni.getStorageSync('userInfo')&&uni.getStorageSync('userInfo')!='{}') {
-				this.userInfo =JSON.parse(uni.getStorageSync('userInfo')) 
+				this.userInfo = uni.getStorageSync('userInfo')
 			} else {
 				this.userInfo = {}
 			}
 			//#ifdef MP-WEIXIN
-			console.log(111,uni.getStorageSync('userInfo'),this.userInfo)
 			this.userinfos=uni.getStorageSync('userInfo')
 			console.log(uni.getStorageSync('userinfos'))
 			let obj=uni.getStorageSync('TOKEN_WEXIN');
@@ -235,60 +244,7 @@
 						}
 					})
 			},
-			goLogin(){
-				uni.showLoading({
-					title: '加载中'
-				})
-				uni.login({
-					provider: "weixin",
-					success: async loginRes => {
-						let code = loginRes.code // 获取开发code
-						loginByMiniApp({
-						   // encryptedData: loginRes.mp.detail.encryptedData,
-						   // iv: loginRes.mp.detail.iv,
-						   code: code,
-						   companyId : this.companyid || '',
-						   companyUserId:this.companyUserId || 0,
-						   nickname:this.userinfos.nickname ||'',
-						   avatar:this.userinfos.avatar||'',
-						   authType:this.authType,
-						   appId:this.appid,
-						   projectId:this.projectId
-						})
-						.then( res => {
-							if(res.code==200){
-								console.log(res)
-								uni.hideLoading();
-								uni.showToast({
-									icon:'none',
-									title: "登录成功",
-								});
-								uni.setStorageSync('TOKEN_WEXIN', res.token);
-								uni.setStorageSync('userInfo', JSON.stringify(res.user));
-								this.userInfo=res.user;
-								this.isLogin = true
-								setTimeout(()=>{
-									this.registerCourse()
-								},200)
-							}else if(res.code==406){
-								uni.hideLoading();
-								uni.showToast({
-									icon:'none',
-									title: '该用户已成为其他销售会员',
-								});
-							}else{
-								uni.hideLoading();
-								uni.showToast({
-									icon:'none',
-									title: res.msg,
-								});
-							}
-						   
-						 })
-					},
-				})
-			},
-			goLogins(data) {
+			goLogin(data) {
 				console.log('huoqu111',data)
 				if(data){
 					console.log('huoqu1222',data)
@@ -662,7 +618,7 @@
 			},
 			// 成为会员
 			registerCourse() {
-				console.log(123333,this.userInfo.userId)
+				console.log(123333)
 				this.isVip = 0
 				// 确保从本地存储重新获取最新数据
 				  // if(uni.getStorageSync('userInfo')){

pages_course/becomeVIPs.vue

@@ -0,0 +1,870 @@
+<template>
+	<view class="content hb column justify-center align-center bgf">
+		<image :src="imgPath+'/app/image/becomevip.png'" mode="widthFix"></image>
+		<view class="justify-start align-center fs24 base-color-9" v-if="userInfo.userId">
+			<view>{{nameuser}}#</view>
+			<view>{{userInfo.userId}}</view>
+		</view>
+		<view class="bolds">成为会员，享受更多权益</view>
+		<!--#ifdef H5-->
+		<view class="sure" @click="registerCourse">{{isVip==1?'您已成为会员':viptext}}</view>
+		<!--#endif-->
+		<!--#ifdef MP-WEIXIN-->
+		
+		<view class="base-bg-orange colorf ptb20 plr40 radius60" 
+		v-if="(userInfos==null||userInfos=='')&&imgname=='乐氏本源'" @click="nato()">授权用户信息</view>
+		<view class="btns" v-else>
+			<!-- <button
+				class="author-btn"
+				open-type="getUserInfo"
+				:disabled="userdisabled"
+				@getuserinfo="userInfologin"  v-if="authType==0">{{isVip==1?'您已成为会员':'申请成为会员'}}</button>
+			<button
+				v-else
+				class="author-btn"
+				open-type="getPhoneNumber"
+				@getphonenumber="phoneLogin"  >{{isVip==1?'您已成为会员':'申请成为会员'}}</button> -->
+			<button class="author-btn"  @click="handleAgree()">{{viptext}}</button>
+		</view>
+		
+		<!--#endif-->
+		<!--#ifdef MP-WEIXIN-->
+		<u-popup :show="userlogo" mode="bottom" round='12'>
+			<view class="userlogo column">
+				<view class="mtb30 justify-start align-center ml20">
+					<u-avatar :src="imgPath+'/app/image/logo.png'" size="50"></u-avatar>
+					<view class="bold mlr20">{{imgname}}</view>
+					<view>申请</view>
+				</view>
+				<view class="bold fs36 ml20">授权你的昵称头像信息</view>
+				<view class="mtb20 justify-between align-center  plr20">
+					<view class="justify-start align-center">
+						<view class="boxweixin" :class="userinfos.nickname==''?'boxnosel':'boxsel'">
+							<view v-if="userinfos.nickname">√</view>
+						</view>
+						<view class="ml20">
+							<view class="base-color-3 bold">第一步</view>
+							<view class="fs24 base-color-9">请点击授权微信昵称</view>
+						</view>
+					</view>
+					<view class="button-container">
+					   <input 
+					     type="nickname"
+					     class="hidden-input"
+						@blur="onNickNameInput"
+						 @input="onNickNameInput"
+					   />
+					   <button class="custom-button" :class="nameuser==''?'subname':'subavt'">{{nameuser?"已授权":'允许授权'}}</button>
+					 </view>
+				</view>
+				<view class="mtb20 justify-between align-center  plr20 mt40">
+					<view class="justify-start align-center">
+						<view class="boxweixin" :class="userinfos.nickname==''?'boxnosel':'boxsel'">
+							<view v-if="userinfos.avatar">√</view>
+						</view>
+						<view class="ml20">
+							<view class="base-color-3 bold">第二步</view>
+							<view class="fs24 base-color-9">请点击授权微信头像</view>
+						</view>
+					</view>
+					<view class="button-container">
+					  <button open-type="chooseAvatar" @chooseavatar="onChooseAvatar" class="hidden-input" 
+					  v-if="nameuser">
+					    允许授权
+					  </button>
+					  <button class="custom-button sub" @click="shouquan" v-if="nameuser==''">允许授权</button>
+					   <button class="custom-button "  :class="avataruser==''?'subname':'subavt'"
+					   v-else>{{avataruser?"已授权":'允许授权'}}</button>
+					 </view>
+				</view>
+				<view class="submitname" @click="confimrname" :class="nameuser&&avataruser?'subact':'sub'">确定</view>
+			</view>
+		</u-popup>
+		<!--#endif-->
+		<view class="footer-tips">重庆云联融智提供技术支持</view>
+	</view>
+</template>
+
+<script>
+	import { loginByMp,registerCourses,loginByMiniApp,handleFsUserWx} from '@/api/courseLook'
+	import {
+		getConfigByKey
+	} from "@/api/user.js"
+	export default {
+		data() {
+			return {
+				isVip: 0,
+				isWechat: false,
+				isLogin: false,
+				companyid:'',
+				companyUserId:'',
+				userInfo:{},
+				tagIds:[],
+				isbecomevip:0,
+				viptext:'申请成为会员',
+				userlogo:false,
+				userinfos:{
+					nickname:'',
+					avatar:""
+				},
+				headImg:'',
+				authType:0,//0微信登录 1手机号登录
+				userdisabled:false,
+				projectId:'',
+				H5course:{}
+			}
+		},
+		computed: {
+		    imgPath() {
+		      return this.$store.state.imgpath
+		    },
+			imgname() {
+			  return this.$store.state.logoname
+			},
+			appid() {
+				return this.$store.state.appid
+			},
+			nameuser() {
+				return this.userinfos.nickname
+			},
+			avataruser() {
+				return this.userinfos.avatar
+			},
+		},
+		onLoad(option) {
+			uni.$on('usercode',(data)=>{
+				console.log('huoqu ',data)
+				this.goLogin(data)
+			})
+			uni.$on('vipMsg',(data)=>{
+				console.log('vipMsg ',data)
+				this.viptext=data
+			})
+			console.log(option)
+			let path = 'https://userapp.moonxiang.com/prod-api'//存在文化
+			uni.setStorageSync('requestPath',path)
+			if(uni.getStorageSync('userInfo')&&uni.getStorageSync('userInfo')!='{}') {
+				this.userInfo =  JSON.parse(uni.getStorageSync('userInfo')) 
+			} else {
+				this.userInfo = {}
+			}
+			// this.userInfo=JSON.parse(uni.getStorageSync('userInfo')) || {};
+			//#ifdef MP-WEIXIN
+			let obj=uni.getStorageSync('TOKEN_WEXIN');
+			//#endif
+			// #ifdef H5
+			let obj=uni.getStorageSync('TOKEN_KEY');
+			// #endif
+			// let obj=uni.getStorageSync('AppToken');
+			this.isLogin = !!obj;
+			this.companyid = option.companyId || ''
+			this.companyUserId=option.companyUserId || 0
+			this.projectId=option.projectId
+			this.H5course.companyId=option.companyId
+			this.H5course.companyUserId=option.companyUserId
+			this.H5course.projectId=option.projectId
+			uni.setStorageSync('H5course',this.H5course)
+			console.log(this.H5course)
+			//#ifdef MP-WEIXIN
+			// if(this.$store.state.logoname!=='乐氏本源'&&!uni.getStorageSync('userInfos')){
+			// 	this.userlogo=true
+			// }
+			if(!uni.getStorageSync('userInfos')&&this.$store.state.logoname=='乐氏本源'){
+				uni.navigateTo({
+					url:'/pages_course/webview'
+				})
+				return
+			}
+			//#endif
+			if(option.tagids=="null"){
+				this.tagIds=[]
+			}else{
+				this.tagIds=option.tagids 
+				const arr =this.tagIds.split("，")
+				  .map(item => parseInt(item.trim(), 10))
+				  .filter(num => !isNaN(num)); // 过滤无效转换
+				  this.tagIds =arr
+				// console.log(this.tagIds); 
+			}
+			// this.isWechat = String(navigator.userAgent.toLowerCase().match(/MicroMessenger/i)) === "micromessenger"
+			this.code = option.code
+				// #ifdef H5
+				if(this.code&&!this.isLogin) {
+					this.loginByMp()
+				}
+				// #endif
+				
+		},
+		onShow() {
+			this.getWebviewUrl()
+			if(uni.getStorageSync('userInfo')&&uni.getStorageSync('userInfo')!='{}') {
+				this.userInfo =JSON.parse(uni.getStorageSync('userInfo')) 
+			} else {
+				this.userInfo = {}
+			}
+			//#ifdef MP-WEIXIN
+			console.log(111,uni.getStorageSync('userInfo'),this.userInfo)
+			this.userinfos=uni.getStorageSync('userInfo')
+			console.log(uni.getStorageSync('userinfos'))
+			let obj=uni.getStorageSync('TOKEN_WEXIN');
+			//#endif
+			// #ifdef H5
+			let obj=uni.getStorageSync('TOKEN_KEY');
+			// #endif
+			this.isLogin = !!obj;
+			if(this.isLogin&&this.isVip!=1) {
+				this.registerCourse()
+			}
+			
+		},
+		methods: {
+			getWebviewUrl() {
+				var data = {
+					key: 'course.config'
+				}
+					getConfigByKey(data).then(res => {
+						if (res.code == 200) {
+							console.log("getConfigByKey====", JSON.parse(res.data))
+							let data = JSON.parse(res.data,)
+							uni.setStorageSync('setWebviewUrl',data.userCourseAuthDomain)
+						}else{
+							uni.showToast({
+								icon:'none',
+								title: res.msg,
+							});
+						}
+					})
+			},
+			goLogin(){
+				uni.showLoading({
+					title: '加载中'
+				})
+				uni.login({
+					provider: "weixin",
+					success: async loginRes => {
+						let code = loginRes.code // 获取开发code
+						loginByMiniApp({
+						   // encryptedData: loginRes.mp.detail.encryptedData,
+						   // iv: loginRes.mp.detail.iv,
+						   code: code,
+						   companyId : this.companyid || '',
+						   companyUserId:this.companyUserId || 0,
+						   nickname:this.userinfos.nickname ||'',
+						   avatar:this.userinfos.avatar||'',
+						   authType:this.authType,
+						   appId:this.appid,
+						   projectId:this.projectId
+						})
+						.then( res => {
+							if(res.code==200){
+								console.log(res)
+								uni.hideLoading();
+								uni.showToast({
+									icon:'none',
+									title: "登录成功",
+								});
+								uni.setStorageSync('TOKEN_WEXIN', res.token);
+								uni.setStorageSync('userInfo', JSON.stringify(res.user));
+								this.userInfo=res.user;
+								this.isLogin = true
+								setTimeout(()=>{
+									this.registerCourse()
+								},200)
+							}else if(res.code==406){
+								uni.hideLoading();
+								uni.showToast({
+									icon:'none',
+									title: '该用户已成为其他销售会员',
+								});
+							}else{
+								uni.hideLoading();
+								uni.showToast({
+									icon:'none',
+									title: res.msg,
+								});
+							}
+						   
+						 })
+					},
+				})
+			},
+			goLogins(data) {
+				console.log('huoqu111',data)
+				if(data){
+					console.log('huoqu1222',data)
+					uni.showLoading({
+						title: '加载中'
+					})
+					uni.login({
+						provider: "weixin",
+						success: async loginRes => {
+							console.log(loginRes)
+							let code = loginRes.code // 获取开发code
+							handleFsUserWx({
+							   code: code,
+							   appId:this.appid,
+							   userId:data.userId
+							})
+							.then( res => {
+								if(res.code==200){
+									console.log(res)
+									uni.hideLoading();
+									uni.showToast({
+										icon:'none',
+										title: "登录成功",
+									});
+									this.userinfos=uni.getStorageSync('userinfos')
+									uni.getStorageSync('TOKEN_WEXIN');
+									this.userInfo=uni.getStorageSync('userInfo');
+									this.isLogin = true
+									setTimeout(()=>{
+										this.registerCourse()
+									},200)
+								}else if(res.code==406){
+									uni.hideLoading();
+									uni.showToast({
+										icon:'none',
+										title: '该用户已成为其他销售会员',
+									});
+								}else{
+									uni.hideLoading();
+									uni.showToast({
+										icon:'none',
+										title: res.msg,
+									});
+								}
+							   
+							 })
+						},
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pages_course/webview?H5course='+uni.getStorageSync('H5course')
+					})
+				}
+				
+			},
+			shouquan(){
+				if(this.userinfos.nickname==''){
+					uni.showToast({
+						icon:'none',
+						title: "请先授权微信昵称",
+					});
+				}
+			},
+			confimrname(){
+				if(this.userinfos.nickname==''){
+					uni.showToast({
+						icon:'none',
+						title: "请授权微信昵称",
+					});
+					return
+				}
+				if(this.userinfos.avatar==''){
+					uni.showToast({
+						icon:'none',
+						title: "请授权微信头像",
+					});
+					return
+				}
+				uni.setStorageSync('userInfos',this.userinfos)
+				this.editUserA()
+				this.userlogo=false
+			},
+			onChooseAvatar(e){
+				this.userinfos.avatar=e.detail.avatarUrl
+				console.log(e.detail.avatarUrl)
+				uni.uploadFile({
+					url: uni.getStorageSync('requestPath')+'/app/common/uploadOSS', //仅为示例，非真实的接口地址
+					filePath: e.detail.avatarUrl,
+					name: 'file',
+					formData: {
+						'user': 'test'  // 上传附带参数
+					},
+					success: (uploadFileRes) => {
+						console.log(uploadFileRes)
+						// 根据接口具体返回格式   赋值具体对应url
+						var data=JSON.parse(uploadFileRes.data)
+						this.headImg=uni.getStorageSync('requestPath')+data.fileName
+						this.userinfos.avatar=data.url
+					}
+				});
+			},
+			onNickNameInput(e){
+				console.log(e)
+				this.userinfos.nickname=e.detail.value
+			},
+			nato(){
+				uni.navigateTo({
+					url:'/pages_course/webview'
+				})
+			},
+			handleAgree(){
+				console.log(144443)
+				if(this.isVip==1){
+					uni.showToast({
+						title: '您已成为会员!',
+						icon: 'none',
+						duration: 2000,
+					})
+				}else{
+					this.goLogin()
+					uni.showToast({
+						title: this.viptext,
+						icon: 'none',
+						duration: 2000,
+					})
+				}
+				
+			},
+			userInfologin(e) {
+				console.log(123333)
+				this.userdisabled=true
+				var that=this;
+				uni.showLoading({
+					title: "加载中..."
+				});
+				if (e.mp.detail.errMsg == 'getUserInfo:ok') {
+					this.utils.getProvider()
+					.then(provider => {
+						if (!provider) {
+							this.userdisabled=false
+						  reject()
+						}
+						// uni登录
+						uni.login({
+							provider: provider,
+							success: async loginRes => {
+								let code = loginRes.code // 获取开发code
+								this.userinfos=uni.getStorageSync('userInfos')?uni.getStorageSync('userInfos'):this.userinfos
+								loginByMiniApp({
+								   encryptedData: e.mp.detail.encryptedData,
+								   iv: e.mp.detail.iv,
+								   code: code,
+								   nickname:this.userinfos.nickname?this.userinfos.nickname:'',
+								   avatar:this.userinfos.avatar?this.userinfos.avatar:'',
+								   companyId : this.companyid || '',
+								   companyUserId:this.companyUserId || 0,
+								   authType:this.authType,
+								   appId:this.appid,
+								   projectId:this.projectId
+								})
+								.then( res => {
+									if(res.code==200){
+										// console.log(res)
+										uni.hideLoading();
+										uni.showToast({
+											icon:'none',
+											title: "登录成功",
+										});
+										uni.setStorageSync('TOKEN_WEXIN', res.token);
+										uni.setStorageSync('userInfo', JSON.stringify(res.user));
+										this.userInfo=res.user;
+										uni.hideLoading()
+										this.userdisabled=false
+										// this.isLogin = true
+										setTimeout(()=>{
+											this.checkUserInfoA()
+											// this.registerCourse()
+										},200)
+									}else if(res.code==406){
+										uni.hideLoading();
+										uni.showToast({
+											icon:'none',
+											title: '该用户已成为其他销售会员',
+										});
+									}
+									else{
+										uni.hideLoading();
+										uni.showToast({
+											icon:'none',
+											title: res.msg,
+										});
+									}
+								   
+								 })
+								 .catch(res=>{
+								 	 this.userdisabled=false
+								 })
+							},
+							fail() {
+								this.userdisabled=false
+							}
+						})
+					})
+					.catch(err => {
+						this.userdisabled=false
+						uni.showToast({
+							icon:'none',
+							title: err,
+						});
+					})
+					 
+				} else {
+					this.userdisabled=false
+					uni.showToast({
+						title: '已拒绝授权',
+						icon: 'none',
+						duration: 2000,
+					})
+				}
+			},
+			// 微信用户手机号登录
+			phoneLogin(e) {
+				var that=this;
+				uni.showLoading({
+					title: "加载中..."
+				});
+				if (e.mp.detail.errMsg == 'getPhoneNumber:ok') {
+					this.utils.getProvider()
+					.then(provider => {
+						if (!provider) {
+						  reject()
+						}
+						// uni登录
+						uni.login({
+							provider: provider,
+							success: async loginRes => {
+								let code = loginRes.code // 获取开发code
+								this.userinfos=uni.getStorageSync('userInfos')?uni.getStorageSync('userInfos'):this.userinfos
+								loginByMiniApp({
+								   encryptedData: e.mp.detail.encryptedData,
+								   iv: e.mp.detail.iv,
+								   code: code,
+								   nickname:this.userinfos.nickname?this.userinfos.nickname:'',
+								   avatar:this.userinfos.avatar?this.userinfos.avatar:'',
+								   companyId : this.companyid || '',
+								   companyUserId:this.companyUserId || 0,
+								    authType:this.authType,
+									appId:this.appid,
+									projectId:this.projectId
+								})
+								.then( res => {
+									if(res.code==200){
+										// console.log(res)
+										uni.hideLoading();
+										uni.showToast({
+											icon:'none',
+											title: "登录成功",
+										});
+										uni.setStorageSync('TOKEN_WEXIN', res.token);
+										uni.setStorageSync('userInfo', JSON.stringify(res.user));
+										this.userInfo=res.user;
+										uni.hideLoading()
+										// this.isLogin = true
+										// setTimeout(()=>{
+										// 	this.registerCourse()
+										// },200)
+										setTimeout(()=>{
+											this.checkUserInfoA()
+											// this.registerCourse()
+										},200)
+									}else if(res.code==406){
+										uni.hideLoading();
+										uni.showToast({
+											icon:'none',
+											title: '该用户已成为其他销售会员',
+										});
+									}
+									else{
+										uni.hideLoading();
+										uni.showToast({
+											icon:'none',
+											title: res.msg,
+										});
+									}
+								   
+								 })
+							}
+						})
+					})
+					.catch(err => {
+						uni.showToast({
+							icon:'none',
+							title: err,
+						});
+					})
+					 
+				} else {
+					uni.showToast({
+						title: '已拒绝授权',
+						icon: 'none',
+						duration: 2000,
+					})
+				}
+			},
+			getWechatCode() {
+				if (this.isWechat) {
+					let appid = "wx0d021524695f1943"; //微信APPid（百年康城）
+					let code = this.getUrlCode().code; //是否存在code
+					let local = window.location.href;
+					if (code == null || code === "") {
+
+						let urlPaths = local.split("/registerCourse");
+						uni.setStorageSync('beforLoginPage', urlPaths[1]);
+
+						//不存在就打开上面的地址进行授权
+						window.location.href =
+							"https://open.weixin.qq.com/connect/oauth2/authorize?appid=" +
+							appid +
+							"&redirect_uri=" +
+							encodeURIComponent(local) +
+							"&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
+					} else {
+						this.code = code;
+						this.loginByMp()
+					}
+				}else{
+					uni.showToast({
+						title: '请在微信浏览器中打开',
+						icon:'error'
+					})
+				}
+			},
+			getUrlCode() {
+				// 截取url中的code方法
+				var url = location.search;
+				var theRequest = new Object();
+				if (url.indexOf("?") != -1) {
+					var str = url.substr(1);
+					var strs = str.split("&");
+					for (var i = 0; i < strs.length; i++) {
+						theRequest[strs[i].split("=")[0]] = strs[i].split("=")[1];
+					}
+				}
+				return theRequest;
+			},
+			loginByMp() {
+				if (this.code == null) {
+					return;
+				}
+				uni.showLoading({
+					title: "处理中..."
+				});
+				loginByMp({code:this.code}).then(res => {
+						uni.hideLoading();
+						if (res.code == 200) {
+							uni.setStorageSync('TOKEN_KEY', res.token);
+							uni.setStorageSync('userInfo', JSON.stringify(res.user));
+							this.userInfo= res.user
+							let beforLoginUrl = uni.getStorageSync('beforLoginPage');
+							this.isLogin = true
+							this.registerCourse()
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							});
+						}
+					},
+					err => {}
+				);
+			},
+			// 成为会员
+			registerCourse() {
+				console.log(123333,this.userInfo.userId)
+				this.isVip = 0
+				// 确保从本地存储重新获取最新数据
+				  // if(uni.getStorageSync('userInfo')){
+				  // 	this.userInfo=JSON.parse(uni.getStorageSync('userInfo'));
+				  // }
+				  // if (!this.userInfo.userId) {
+				  // 	// 空值检查
+				  //   uni.showToast({ title: '用户未登录或信息不完整', icon: 'none' });
+				  //   return;
+				  // }
+				  if(this.tagIds==null){
+					  this.tagIds=""
+				  }
+				  // console.log(this.tagIds)
+				const data={
+					userId:this.userInfo.userId,
+					companyUserId:this.companyUserId,
+					companyId:this.companyid,
+					tagIds:this.tagIds,
+					projectId:this.projectId
+					}
+				if(this.isLogin) {
+					registerCourses(data).then(res=>{
+						if(res.code == 200) {
+							this.isVip = 1
+							this.isbecomevip=1
+							this.viptext='您已成为会员'
+							uni.showToast({
+								title: '注册成功',
+								icon:'none'
+							})
+						} else {
+							this.isbecomevip=1
+							// console.log(this.isbecomevip)
+							this.viptext=res.msg
+							uni.showToast({
+								icon:'none',
+								title: res.msg
+							})
+						}
+					})
+				} else {
+					// #ifdef H5
+					this.getWechatCode()
+					// #endif
+					
+				}
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.subname{
+		background-color: #00aa00;
+		color: #fff;
+	}
+	.subavt{
+		background-color: #fff;
+		border: 2rpx #0a0 solid;
+		color: #00aa00;
+	}
+	.boxweixin{
+		width: 44rpx;
+		height: 44rpx;
+		border-radius: 50%;
+		text-align: center;
+		line-height: 34rpx;
+		color: #0a0;
+	}
+	.boxnosel{
+		border: #757575 4rpx solid;
+	}
+	.boxsel{
+		border: #0a0 4rpx solid;
+	}
+	.button-container {
+	  position: relative;
+	  width: 240rpx;
+	}
+	.hidden-input {
+	  position: absolute;
+	  top: 0;
+	  left: 0;
+	  width: 100%;
+	  height: 100%;
+	  opacity: 0;
+	  z-index: 2;
+	}
+	.custom-button {
+	  position: relative;
+	  z-index: 1;
+	  /* 其他样式 */
+	  width:100%;
+	  margin: 0 auto;
+	  height: 80rpx;
+	  line-height: 60rpx;
+	  font-size: 28rpx;
+	  padding: 10rpx 20rpx;
+	}
+	.submitname{
+		width: 90%;
+		margin: 0 auto;
+		text-align: center;
+		padding: 30rpx;
+		margin-top: 40rpx;
+	}
+	.sub{
+		background-color: #f0f0f0;
+		color: #0a0;
+	}
+	.subact{
+		background-color: #0a0;
+		color: #fff;
+	}
+	.userlogo{
+		height: 760rpx;
+	}
+	.getlogo{
+		width:240rpx;
+		background-color: #fff;
+		// padding: 10rpx 20rpx;
+	}
+	::v-deep .u-popup {
+	 flex: 0 !important;
+	}
+	// .submitname{
+	// 	width: 60%;
+	// 	background-color: #05a8ee;
+	// 	color: #fff;
+	// 	margin: 0 auto;
+	// 	border-radius: 80rpx;
+	// 	text-align: center;
+	// 	padding: 20rpx;
+	// 	margin-top: 40rpx;
+	// }
+	.userlogo{
+		height: 760rpx;
+	}
+	.getlogo{
+		width:calc(60% - 40rpx);
+		margin: 0 auto;
+		background-color: #fff;
+		padding: 10rpx 20rpx;
+		image{
+			width: 80rpx !important;
+			height: 80rpx !important;
+		}
+	}
+	.footer-tips {
+			// margin-top: 14rpx;
+			position: fixed;
+			width: 100%;
+			bottom: 44rpx;
+			text-align: center;
+			font-family: PingFang SC,PingFang SC;
+			font-weight: 500;
+			font-size: 12px;
+			color: #bbb;
+			transform: scale(0.8); 
+		}
+	.content {
+		image {
+			width: 300rpx;
+			height: 300rpx;
+		}
+	}
+	.bolds {
+		color: #999;
+		font-size: 16px;
+		height: auto;
+		line-height: inherit;
+		margin-bottom: 0;
+		width: 304px;
+		word-break: break-all;
+		text-align: center;
+		margin: 50rpx 0 100rpx 0;
+	}
+	.sure {
+		width: 500rpx;
+		background-color: #1777ff;
+		line-height: 88rpx;
+		text-align: center;
+		border-radius: 8rpx;
+		color: #fff;
+	}
+	.btns{
+		position: relative;
+		width: 630rpx;
+		height: 80rpx;
+		.author-btn{				
+			z-index:100;
+			position: absolute;
+			width: 630rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+			text-align: center;
+			background: #1777ff;
+			border-radius: 40rpx;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+</style>

pages_course/components/courseExpiration.vue

@@ -0,0 +1,65 @@
+<template>
+	<view class="container-body">
+		<text class="user" v-if="userId">#{{userId}}</text>
+		<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>
+		<view class="title">{{msg}}</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>

pages_course/learn.vue

@@ -5,7 +5,7 @@
 			<view class="top-box">
 				<view class="title">{{learncourse.courseName}}</view>
 				<view class="txt">
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/learn1.png"></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/learn1.png"></image>
 					<text>共{{learnList.length}}节课</text>
 				</view>
 			</view>
@@ -15,13 +15,13 @@
 			<view class="list" v-for="(item,index) in learnList" :key="index">
 				<view class="img-box">
 					<view class="sub">第{{index+1}}课</view>
-					<image :src="item.videoImgUrl || 'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no-img.png'" mode="aspectFill"></image>
+					<image :src="item.videoImgUrl || 'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no-img.png'" mode="aspectFill"></image>
 				</view>
 				<view class="right">
 					<view class="title">{{item.title}}</view>
 					<view class="bottom">
 						<!-- <view class="tip">
-							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/learn3.png" mode="widthFix"></image>
+							<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/learn3.png" mode="widthFix"></image>
 							<text>答题送金币+200</text>
 						</view> -->
 						<!-- <view @click="goLive(item)" class="btn" v-if="item.stauts==0">已学习4%</view> -->

pages_course/reward.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="answerPopup-box bg">
 		<!-- 正确 -->
-		<image class="tipimg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/course_answer_img.png"
+		<image class="tipimg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/course_answer_img.png"
 			mode="aspectFill"></image>
 		<view class="answerPopup-title">恭喜你，回答正确</view>
 		<view class="answerPopup-desc">您有一份奖励待领取哦</view>

pages_course/teacherClassroom.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<view class="top">
 			<text class="title"><text class="title-brown">健康生活方式</text>大讲堂</text>
-			<image class="top-bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/famous1.png"></image>
+			<image class="top-bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/famous1.png"></image>
 			<view class="txt">
 				<view>让医学回归生活化,</view>
 				<view>以健康的生活方式,</view>
@@ -10,16 +10,16 @@
 			</view>
 		</view>
 		<view class="container-body">
-			<image class="bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/bg-class.png"></image>
+			<image class="bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/bg-class.png"></image>
 			<text class="title">{{type==1?'健康大讲堂':'生活大讲堂'}}</text>
 			<view class="card-box" v-for="(item,index) in cardList" :key="index" @click="goLearn(item.courseId)">
 				<view class="bar">
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/bar.png" mode="widthFix"></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/bar.png" mode="widthFix"></image>
 					<view class="tit">{{item.courseName}}</view>
 				</view>
 				<view class="img-box">
 					<view class="img">
-						<image :src="item.imgUrl || 'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no-img.png'" mode="widthFix"></image>
+						<image :src="item.imgUrl || 'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no-img.png'" mode="widthFix"></image>
 					</view>
 				</view>
 			</view>

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>
 
@@ -267,6 +270,9 @@
 	import commentBox from "./components/commentBox.vue"
 	import {TOKEN_KEYAuto,generateRandomString} from '@/utils/courseTool.js'
 	import dayjs from 'dayjs';
+	import { mapGetters } from 'vuex';
+	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
+	import courseExpiration from './components/courseExpiration.vue'
 	import {
 		getErrMsg,
 		getH5CourseByVideoId,
@@ -290,6 +296,8 @@
 			descInfo,
 			commentBox,
 			ques,
+			ykscreenRecord,
+			courseExpiration
 		},
 		data() {
 			return {
@@ -447,6 +455,7 @@
 			
 		},
 		computed:{
+			...mapGetters(['coureLogin']),
 			appid() {
 				return this.$store.state.appid
 			},
@@ -454,6 +463,19 @@
 				return this.$store.state.isSpare
 			},
 		},
+		watch: {
+		    coureLogin: {
+		      immediate: true,          // 页面一进入就检查一次
+		      handler(val) {
+		        if (val == 2&&this.isLogin) {
+					console.log("看课AppToken失效，请重新登录")
+					this.isLogin = false
+					this.isAddKf = 0
+					this.goLogin()
+		        }
+		      }
+		    }
+		},
 		onLoad(option) {
 			this.getWebviewUrl()
 			if(option.videoitem){
@@ -466,7 +488,7 @@
 			}else {
 				this.isOpen = 0
 				console.log(option.course)
-				this.urlOption = option.course ? JSON.parse(option.course) : {},
+				this.urlOption = option.course ? JSON.parse(decodeURIComponent(option.course)) : {},
 				// this.urlOption = option.course ? option.course : {}
 				
 				console.log(this.urlOption)
@@ -1120,9 +1142,11 @@
 							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]
@@ -1143,11 +1167,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()
 			},
@@ -1233,6 +1264,7 @@
 								}).then(res=>{
 									 uni.hideLoading();
 									 if (res.code == 200) {
+										 this.$store.commit('setCoureLogin', 1);
 										uni.setStorageSync(TOKEN_KEYAuto, res.token);
 										uni.setStorageSync('auto_userInfo', JSON.stringify(res.user));
 										this.user = res.user

pages_course/videovip.vue

@@ -268,12 +268,18 @@
 		</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>
 
 <script>
 	import { generateRandomString} from "@/utils/common.js"
 	import dayjs from 'dayjs';
+	import { mapGetters } from 'vuex';
+	import ykscreenRecord from "@/components/yk-screenRecord/yk-screenRecord.vue"
+	import courseExpiration from './components/courseExpiration.vue'
 	import {
 		getErrMsg,
 		getH5CourseByVideoId,
@@ -292,8 +298,15 @@
 		getConfigByKey
 	} from "@/api/user.js"
 	export default {
+		components:{
+			ykscreenRecord,
+			courseExpiration
+		},
 		data() {
 			return {
+				resMsg:'',
+				resCode:'',
+				showExpiration:false,
 				videoItem:{},
 				viewload:true,
 				loadingtext:"数据加载中...",
@@ -407,7 +420,6 @@
 				appToken:'',
 				kfPopup:false,
 				iskftype:0,
-				iskftypemsg:'',
 				courseLogo: '',
 				isquestion:false,
 				tipsPopup:false,
@@ -424,6 +436,7 @@
 				projectId:'',
 				showfalse:false,
 				contentmsg:null,
+				iskftypemsg:null,
 			}
 		},
 		filters: {
@@ -437,6 +450,7 @@
 			},
 		},
 		computed: {
+			...mapGetters(['coureLogin']),
 			isAnswer() {
 				return (item, name) => {
 					if (item.type == 1) {
@@ -465,6 +479,19 @@
 				return this.userinfos.avatar
 			},
 		},
+		watch: {
+		    coureLogin: {
+		      immediate: true,          // 页面一进入就检查一次
+		      handler(val) {
+		        if (val == 2&&this.isLogin) {
+					console.log("看课AppToken失效，请重新登录")
+					this.isLogin = false
+					this.isAddKf = 0
+					this.goLogin()
+		        }
+		      }
+		    }
+		},
 		onLoad(option) {
 			this.getWebviewUrl()
 			uni.$on('usercode',(data)=>{
@@ -484,7 +511,7 @@
 			this.videoContext = uni.createVideoContext('video-content-box', this)
 			this.code = option.code
 			if(uni.getStorageSync('userInfo')&&JSON.stringify(uni.getStorageSync('userInfo'))!='{}') {
-				this.userInfo =JSON.parse(uni.getStorageSync('userInfo')) 
+				this.userInfo = uni.getStorageSync('userInfo')
 			} else {
 				this.userInfo = {}
 			}
@@ -493,7 +520,7 @@
 				const keys = decodeURIComponent(Object.keys(option)[0]);
 				this.urlOption=JSON.parse(keys.split('course=')[1])
 			}else{
-				this.urlOption = option.course ? JSON.parse(option.course) : {}
+				this.urlOption = option.course ? JSON.parse(decodeURIComponent(option.course)) : {}
 			}
 			uni.setStorageSync('H5course',this.urlOption)
 			this.videoId = this.urlOption.videoId
@@ -522,7 +549,7 @@
 		},
 		onShow() {
 			this.userinfos=uni.getStorageSync('userinfos')
-			this.userinfo=uni.getStorageSync('userinfo')
+			this.userInfo=uni.getStorageSync('userInfo')
 			this.tipsOpen = false
 			this.isExpand = true
 			this.uuId = generateRandomString(16)
@@ -533,7 +560,7 @@
 			console.log(AppToken)
 			if(AppToken){
 				// this.isLogin=true
-				if(this.isAddKf == 1&&this.userinfo.userId){
+				if(this.isAddKf == 1&&this.userInfo.userId){
 					console.log(1233)
 					this.getH5CourseVideoDetails()
 				} else{
@@ -603,64 +630,7 @@
 						}
 					})
 			},
-			goLogin(){
-				uni.showLoading({
-					title: '加载中'
-				})
-				uni.login({
-					provider: "weixin",
-					success: async loginRes => {
-						let code = loginRes.code // 获取开发code
-						loginByMiniApp({
-						   // encryptedData: loginRes.mp.detail.encryptedData,
-						   // iv: loginRes.mp.detail.iv,
-						   code: code,
-						   companyId : this.companyId || '',
-						   companyUserId:this.companyUserId || 0,
-						   nickname:this.userinfos.nickname ||'',
-						   avatar:this.userinfos.avatar||'',
-						   authType:this.authType,
-						   appId:this.appid,
-						   projectId:this.projectId
-						})
-						.then( res => {
-							if(res.code==200){
-								console.log(res)
-								uni.hideLoading();
-								uni.showToast({
-									icon:'none',
-									title: "登录成功",
-								});
-								uni.setStorageSync('TOKEN_WEXIN', res.token);
-								uni.setStorageSync('userInfo', JSON.stringify(res.user));
-								this.userInfo=res.user;
-								// this.userinfos=uni.getStorageSync('userinfos')
-								// uni.getStorageSync('TOKEN_WEXIN');
-								// this.userInfo=uni.getStorageSync('userInfo');
-								this.isLogin = true
-								// this.getH5CourseVideoDetails()
-								setTimeout(()=>{
-									this.getIsAddKf()
-								},200)
-							}else if(res.code==406){
-								uni.hideLoading();
-								uni.showToast({
-									icon:'none',
-									title: '该用户已成为其他销售会员',
-								});
-							}else{
-								uni.hideLoading();
-								uni.showToast({
-									icon:'none',
-									title: res.msg,
-								});
-							}
-						   
-						 })
-					},
-				})
-			},
-			goLogins(data) {
+			goLogin(data) {
 				if(data){
 					console.log('huoqu1222',data)
 					uni.showLoading({
@@ -1208,6 +1178,11 @@
 									questionOption: JSON.parse(item.question),
 									answer: ''
 								}))
+						}else{
+							uni.showToast({
+								title:res.msg,
+								icon: "none"
+							})
 						}
 						this.getHeight()
 						this.getDescHeight()
@@ -1273,7 +1248,6 @@
 									console.log(12223131)
 									this.getIsAddKf()
 								} else if(this.iskftype==1){
-									
 									uni.showToast({
 										title: this.iskftypemsg,
 										icon: 'none'
@@ -1523,6 +1497,8 @@
 								if(this.userInfo.userId){
 									this.getH5CourseVideoDetails()
 									console.log(123223)
+								}else{
+									this.goLogin()
 								}
 								
 							}
@@ -1540,6 +1516,7 @@
 								title: "请添加管理员微信，成为会员！",
 								icon: 'none'
 							});
+							this.initExpiration(res.msg,res.code)
 						}else if(res.code==505){
 							this.isAddKf = 0
 							this.qrcode=res.ext
@@ -1548,13 +1525,14 @@
 								title: "管理员开启了会员审核，请等待审核!",
 								icon: 'none'
 							});
+							this.initExpiration(res.msg,res.code)
 						}else if(res.code==406){
 							uni.hideLoading();
-							this.iskftypemsg=res.msg
 							uni.showToast({
 								icon:'none',
 								title: '该用户已成为其他销售会员',
 							});
+							this.initExpiration(res.msg,res.code)
 						}else if(res.code==504){
 							this.isAddKf = 0
 							this.iskftype=1
@@ -1563,18 +1541,25 @@
 								title: res.msg,
 								icon: 'none'
 							});
+							this.initExpiration(res.msg,res.code)
 						}else {
 							this.isAddKf = 0
-							this.iskftypemsg=res.msg
 							uni.showToast({
 								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()
 				// this.kfPopup=!this.kfPopup

pages_course/videovips.vue

@@ -0,0 +1,2545 @@
+<template>
+	<view class="content " >
+		<!-- <view class="header-nav" :style="{height: `calc(88rpx + ${statusBarHeight}px)`,paddingTop: statusBarHeight + 'px'}">
+			<u-icon name="arrow-left" size="28" @click="tosales" v-if="appToken"></u-icon>
+			<view class="header-title" :style="{width:menuButtonLeft + 'px',height:menuButtonH+'px',lineHeight:menuButtonH+'px'}">{{courseInfo.title}}</view>
+		</view> -->
+		<view class="video-box" >
+			<image v-if="!isLogin || isAddKf!=1" class="video-poster" :src="courseInfo.imgUrl" mode="aspectFill">
+			</image>
+			<video 
+			@timeupdate="onTimeUpdate" 
+			@progress="progressChange" 
+			@error="videoErrorCallback" 
+			@play="getPlay"
+			@pause="getPause" 
+			@ended="getEnded" 
+			@fullscreenchange="fullscreenchange"
+			:title="courseInfo.title"
+			style="width: 100%;height: 420rpx;" 
+			:poster="poster"  
+			id="video-content-box"  
+			controls
+			:auto-pause-if-open-native="true"
+			:auto-pause-if-navigate="true"
+			:enable-progress-gesture="false" 
+			:show-progress="true"
+			:picture-in-picture-mode="[]"
+			:show-background-playback-button="false"
+			:src="videoUrl">
+				<!-- <cover-image v-if="courseLogo" :class="isFull?'logo-full':'logo'" :src="courseLogo" mode="widthFix"></cover-image> -->
+			</video>
+		</view>
+		
+		<view class="justify-start align-center fs24 base-color-9" v-if="userInfo.userId">
+			<view>{{nameuser?nameuser:'暂未授权昵称'}}#</view>
+			<view>{{userInfo.userId}}</view>
+		</view>
+		<view class="title-content" id="title-content">
+			<!-- 答题时展示小节课程名，其他展示课程名 -->
+			<!-- 小节课程名 -->
+			<view class="subtitlebox " v-if="isLogin&&isAddKf==1">
+				{{courseInfo.title|| ''}}
+			</view>
+			<!-- 课程名字 -->
+			<view class="miantitlebox" v-else>
+				{{courseInfo.courseName|| ''}}
+			</view>
+		</view>
+		<scroll-view class="scroll-view" :style="{height: height}" :scroll-top="scrollTop" scroll-y="true">
+			<!-- 介绍 -->
+			<view class="descbox">
+				<template v-if="!isLogin||isAddKf!=1">
+					<view class="descbox-title">{{courseInfo.title?courseInfo.title:''}}</view>
+					<view class="descbox-info">
+						<!-- <view class="descbox-info-l">
+							<view>{{courseInfo.views}}次播放</view>
+							<view class="descbox-info-time">总时长：{{courseInfo.totalDuration}}</view>
+						</view> -->
+						<view class="descbox-info-r expand" v-if="textHeight > 21">
+							<text @click="handleExpand">{{isExpand ? '收起简介' : '展开简介'}}</text>
+							<image :src="imgPath+'/app/image/course_arrow_up_icon.png'" v-show="isExpand"></image>
+							<image :src="imgPath+'/app/image/course_arrow_down_icon.png'" v-show="!isExpand"></image>
+						</view>
+					</view>
+				</template>
+				<view class="descbox-desc" id="descbox-desc" :style="{height: isExpand ? 'auto': '42rpx'}">
+					<text>{{courseInfo.description==null?'暂无简介':courseInfo.description}}</text>
+					<view :class="isExpand ? 'expand': 'expand expand-ab'" v-if="isLogin&&isAddKf==1&&textHeight > 21">
+						<text @click="handleExpand">{{isExpand ? '收起简介' : '展开简介'}}</text>
+						<image :src="imgPath+'/app/image/course_arrow_up_icon.png'" v-show="isExpand"></image>
+						<image :src="imgPath+'/app/image/course_arrow_down_icon.png'" v-show="!isExpand"></image>
+					</view>
+				</view>
+			</view>
+			<!-- 无效或者已过期 -->
+			<view class="nocourse" v-if="msg">
+				<image :src="imgPath+'/app/image/course_expiration_img.png'" mode="widthFix"></image>
+				<view>{{msg}}</view>
+			</view>
+			<!-- 问题 -->
+			<view class="ques-content" v-if="isLogin&&isAddKf==1">
+				<view class="ques-content-tit" v-if="isLogin &&!isquestion" >问答题</view>
+				<view v-for="(item,index) in quesList" :key="index">
+					<view class="ques-title">
+						<text >{{index + 1}}.</text>
+						<view class="ques-type" v-show="item.type == 1 || item.type == 2">
+							{{item.type == 1 ? '单选' : item.type == 2 ? '多选' : ''}}
+						</view>
+						<text class="fs40">{{item.title}}</text>
+					</view>
+					<view
+					:class="isAnswer(item,option.name) ?'ques-option ques-option-active':'ques-option'" 
+					v-for="(option,idx) in item.questionOption" 
+					:key="idx" 
+					@click="handleAnswer(item,option)">
+						<view class="fs40">
+							{{numberToLetter(idx)}}.
+						</view>
+						<view class="fs40">{{option.name}}</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+		<!-- 线路 -->
+		<!-- <view class="video-line" @click="openPop" v-if="isLogin&&isAddKf==1">
+			<image :src="imgPath+'/app/image/changePlayer-icon.png'"></image>
+			<text>线路{{lineIndex + 1 | numberToChinese}}</text>
+		</view> -->
+		<!-- 线路弹窗 -->
+		<!-- <uni-popup ref="popup" type="bottom"  class="full-width-popup">
+			<view class="popupbox">
+				<view class="popupbox-head">
+					<text>线路选择</text>
+					<image class="close-icon" :src="imgPath+'/app/image/tc_close_icon.png'" mode="aspectFill" @click="close">
+					</image>
+				</view>
+				<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)">
+						线路{{index + 1 | numberToChinese}}</view>
+				</view>
+			</view>
+		</uni-popup> -->
+		<!-- 温馨提示弹窗 -->
+		<u-popup  :show="tipsPopup" mode="center"  :closeOnClickOverlay='true' @close='tipsPopup=!tipsPopup' 
+		:safeAreaInsetBottom='false' round='12'>
+			<view class="tipsPopup-mask">
+				<image class="red_envelope_top" :src="imgPath+'/app/image/red_envelope_img.png'" mode="aspectFill"></image>
+				<view class="tipsPopup">
+					<image class="tipsPopup-close" :src="imgPath+'/app/image/course_close_white_icon.png'" mode="aspectFill"
+						@click="closeTipsPop"></image>
+					<view class="tipsPopup-line">
+						<view class="tipsPopup-box">
+							<view class="tipsPopup-head">
+								<image class="tipsPopup-head-title" :src="imgPath+'/app/image/tips_title_img.png'"
+									mode="widthFix"></image>
+							</view>
+							<view class="tipsPopup-content">
+								<view class="tipsPopup-content-title">亲爱的用户，</view>
+								<view>您已经观看课程{{timepath}}的时间了，请注意休息并保持专注。</view>
+							</view>
+							<view class="tipsPopup-btn-box">
+								<view class="tipsPopup-btn" @click="closeTipsPop">继续观看领奖励</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		<!-- 答题弹窗 -->
+		<u-popup :show="answerPopup" mode="center" @close="closepop()" @open="open" closeOnClickOverlay
+		:safeAreaInsetBottom='false' round='12'>
+			<view :class="errTitle == '恭喜你，回答正确' ? 'answerPopup-box bg':'answerPopup-box'">
+				<!-- 正确 -->
+				<image class="tipimg" v-if="errTitle == '恭喜你，回答正确'" :src="imgPath+'/app/image/course_answer_img.png'"
+					mode="aspectFill"></image>
+				<!-- 错误 -->
+				<image class="tipimg" v-else :src="imgPath+'/app/image/course_answer_incorrectly_img.png'" mode="aspectFill">
+				</image>
+				<view class="answerPopup-title">{{errTitle}}</view>
+				<view class="answerPopup-desc" v-html="errDesc"></view>
+				<!-- 选择奖励 -->
+				<!-- 错误题目 -->
+				<view class="errQuesbox" v-if="errQues&&errQues.length>0">
+					<view class="errQuesbox-item textOne" v-for="(it,index) in errQues" :key="index">{{it.title}}</view>
+				</view>
+				<view class="answerPopup-btn" v-if="errTitle == '恭喜你，回答正确'" @click="closeAnswerPopup">点击领取红包</view>
+				<view class="tipsPopup-btn-box" v-else
+					:style="{marginTop: errQues&&errQues.length>0 ? '40rpx':'54rpx'}">
+					<view class="tipsPopup-btn" @click="closeAnswerPopup">{{remain > 0 ? '重新答题': '确认'}}</view>
+				</view>
+			</view>
+		</u-popup>
+		<!-- 客服二维码弹窗 -->
+		<u-popup :show="kfPopup" mode="center" :mask-click="false" round='12' @close="kefpop">
+			<view class="kfqrcode-box">
+				<view class="justify-start align-center fs24 base-color-9">
+					<view>{{nameuser}}#</view>
+					<view>{{userInfo.userId}}</view>
+				</view>
+				<view>请添加客服</view>
+				<image class="kfqrcode" :src="qrcode" show-menu-by-longpress="true" mode="aspectFit"></image>
+				<!-- <view v-show="qrcodeMsg" style="margin-top: 30rpx;" v-html="qrcodeMsg"></view> -->
+				<!-- <image class="kfqrcode-close" :src="imgPath+'/app/image/course_close_white_icon.png'" mode="aspectFill"
+					@click="closeKFPop"></image> -->
+			</view>
+		</u-popup>
+		<u-popup :show="timepop" mode="center" round='12'>
+			<view class="timepopbox center column">
+				<view class="fs40 bold ">不在看课时间范围内</view>
+				<view class="mtb20">看课时间</view>
+				<view >{{videocont.startDateTime}}</view>
+				<view>至</view>
+				<view >{{videocont.endDateTime}}</view>
+				<view class="base-bg-orange colorf p20 radius50 mt20"
+				@click="getH5CourseVideoDetails">刷新时间</view>
+			</view>
+		</u-popup>
+		<u-popup :show="userlogo" mode="bottom" round='12'>
+			<view class="userlogo column">
+				<view class="mtb30 justify-start align-center ml20">
+					<u-avatar :src="imgPath+'/app/image/logo.png'" size="50"></u-avatar>
+					<view class="bold mlr20">{{imgname}}</view>
+					<view>申请</view>
+				</view>
+				<view class="bold fs36 ml20">授权你的昵称头像信息</view>
+				<view class="mtb20 justify-between align-center  plr20">
+					<view class="justify-start align-center">
+						<view class="boxweixin" :class="userinfos.nickname==''?'boxnosel':'boxsel'">
+							<view v-if="userinfos.nickname">√</view>
+						</view>
+						<view class="ml20">
+							<view class="base-color-3 bold">第一步</view>
+							<view class="fs32 base-color-9">请点击授权微信昵称</view>
+						</view>
+					</view>
+					<view class="button-container">
+					   <input 
+					     type="nickname"
+					     class="hidden-input"
+						 @blur="onNickNameInput"
+						 @input="onNickNameInput"
+					   />
+					   <button class="custom-button" :class="nameuser==''?'subname':'subavt'">{{nameuser?"已授权":'允许授权'}}</button>
+					 </view>
+				</view>
+				<view class="mtb20 justify-between align-center  plr20 mt40">
+					<view class="justify-start align-center">
+						<view class="boxweixin" :class="userinfos.nickname==''?'boxnosel':'boxsel'">
+							<view v-if="userinfos.avatar">√</view>
+						</view>
+						<view class="ml20">
+							<view class="base-color-3 bold">第二步</view>
+							<view class="fs32 base-color-9">请点击授权微信头像</view>
+						</view>
+					</view>
+					<view class="button-container">
+					  <button open-type="chooseAvatar" @chooseavatar="onChooseAvatar" class="hidden-input" 
+					  v-if="nameuser">
+					    允许授权
+					  </button>
+					  <button class="custom-button sub" @click="shouquan" v-if="nameuser==''">允许授权</button>
+					   <button class="custom-button "  :class="avataruser==''?'subname':'subavt'"
+					   v-else>{{avataruser?"已授权":'允许授权'}}</button>
+					 </view>
+				</view>
+				<view class="submitname" @click="confimrname" :class="nameuser&&avataruser?'subact':'sub'">确定</view>
+			</view>
+		</u-popup>
+		<!-- <view class="footer-tips">重庆云联融智提供技术支持</view> -->
+		<!-- footer -->
+		<view class="footer" v-if="videoId">
+			<view class="btns"  >
+<!-- 				<button
+					class="author-btn"
+					open-type="getPhoneNumber"
+					@getphonenumber="phoneLogin"  v-if="!isquestion&&authType==1">{{isLogin&&isAddKf==1 ? '提交答案领取奖励' : '立即学习'}}</button>
+				<button
+					class="author-btn"
+					open-type="getUserInfo" :disabled="userdisabled"
+					@getuserinfo="userInfologin"  v-if="authType==0&&!isquestion">{{isLogin&&isAddKf==1 ? '提交答案领取奖励' : '立即学习'}}</button> -->
+				<button class="author-btn"  
+				@click="submit">{{isLogin&&isAddKf==1 ?'提交答案领取奖励' : '立即学习'}}</button>
+			</view>
+		</view>
+		<view>
+			<u-modal :show="showfalse" title="提示" :content='contentmsg' @confirm='showfalse=false'></u-modal>
+		</view>
+		<u-loading-page :loading="viewload" iconSize="32" loadingColor="#3c9cff" fontSize="24"
+		:loading-text="loadingtext"></u-loading-page>
+	</view>
+</template>
+
+<script>
+	import { generateRandomString} from "@/utils/common.js"
+	import { mapGetters } from 'vuex';
+	import dayjs from 'dayjs';
+	import {
+		getErrMsg,
+		getH5CourseByVideoId,
+		getH5CourseVideoDetails,
+		courseAnswer,
+		getFinishCourseVideo,
+		getIsAddKf,
+		getInternetTraffic,
+		getIntegralByH5Video,
+		sendReward,
+		getRealLink,
+		loginByMiniApp,
+		handleFsUserWx
+	} from "@/api/courseLook.js"
+	import {
+		getConfigByKey
+	} from "@/api/user.js"
+	export default {
+		data() {
+			return {
+				videoItem:{},
+				viewload:true,
+				loadingtext:"数据加载中...",
+				baseUrl:uni.getStorageSync('requestPath'),
+				// 1 红包 2 积分
+				rewardType: [{
+					name: '红包奖励',
+					value: 1
+				}, {
+					name: '积分奖励',
+					value: 2
+				}],
+				currentReward: 1,
+				player: null,
+				loading: true,
+				progress: 0,
+				code: null,
+				statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
+				scrollTop: 0,
+				height: '0px',
+				isLogin: false,
+				videoUrl: "",
+				videoId: "",
+				//现在的时长
+				playTime: 0,
+				//总时长
+				duration: 0,
+				playDuration: 0,
+				// 用于续播
+				playDurationSeek: 0,
+				// 温馨提醒时间节点，
+				tipsTime: 0,
+				tipsOpen: false,
+				config: {},
+				courseInfo: {},
+				quesList: [],
+				lineList: [],
+				// 错题
+				errQues: [],
+				// 答题机会
+				remain: 0,
+				errTitle: "",
+				errDesc: "",
+				showPlay: true,
+				showControls: false,
+				playStatus: "",
+				isFull: false,
+				isAddKf: 0,
+				lineIndex: 0,
+				// 是否展开
+				isExpand: true,
+				textHeight: 0, //文本高度
+				qwUserId: "",
+				qrcode: "",
+				corpId: "",
+				periodId:"",//营期id
+				companyUserId:"",//销售id
+				companyId:"",//公司id
+				courseId:"",//课程id
+				qrcodeMsg: "",
+				urlOption: {},
+				bufferRate: 0, // 缓冲时间
+				uuId: "",
+				isEnded: false,
+				// 是否允许拖动进度条
+				linkType: 0,
+				ip: null,
+				checked: true,
+				isFinish: 0, // 是否完课
+				interval: null,
+				intervalIntegral: null, // 积分定时
+				options: {
+					sources: [{
+						src: ""
+					}],
+					poster: "",
+					live: false /* 是否直播 */ ,
+					controls: true,
+					autoplay: false,
+					licenseUrl: 'https://license.vod2.myqcloud.com/license/v2/1323137866_1/v_cube.license', // license 地址，参考准备工作部分，在视立方控制台申请 license 后可获得 licenseUrl,
+					LicenseKey: 'bcc5bd9a14b798b48c52ff005a21d926',
+					controlBar: {
+						volumePanel: false,
+						playbackRateMenuButton: false,
+						QualitySwitcherMenuButton: false,
+						// progressControl: false
+					},
+					plugins: {
+						// ProgressMarker: false,
+						ContextMenu: {
+							statistic: false
+						}
+					},
+				},
+				// 错误请求次数
+				errorCount: 0,
+				answerPopup: false,
+				sortLink:"",
+				// 课程是否过期
+				isExpire: false,
+				menuButtonLeft: 281,
+				menuButtonH: 45,
+				timer: null,
+				flag: false,
+				msg:'',
+				poster:'',
+				userInfo:{},
+				timeid:'',
+				videocont:{},
+				timepop:false,
+				appToken:'',
+				kfPopup:false,
+				iskftype:0,
+				iskftypemsg:'',
+				courseLogo: '',
+				isquestion:false,
+				tipsPopup:false,
+				timepath:'3分之1',
+				tipsTime2:0,
+				userlogo:false,
+				userinfos:{
+					nickname:"",
+					avatar:""
+				},
+				headImg:'',
+				authType:0,//0微信登录 1手机号登录
+				userdisabled:false,
+				projectId:'',
+				showfalse:false,
+				contentmsg:null,
+			}
+		},
+		filters: {
+			numberToChinese(number) {
+				if (number) {
+					const chineseNumber = ['一', '二', '三', '四', '五', '六', '七', '八', '九'];
+					return chineseNumber[number - 1];
+				} else {
+					return ''
+				}
+			},
+		},
+		computed: {
+			isAnswer() {
+				return (item, name) => {
+					if (item.type == 1) {
+						return item.answer == name
+					} else if (item.type == 2) {
+						const array = item.answer.split(',')
+						return array.some(i => i == name)
+					} else {
+						return false
+					}
+				}
+			},
+			imgPath() {
+			  return this.$store.state.imgpath
+			},
+			imgname() {
+			  return this.$store.state.logoname
+			},
+			appid() {
+				return this.$store.state.appid
+			},
+			nameuser() {
+				return this.userinfos.nickname
+			},
+			avataruser() {
+				return this.userinfos.avatar
+			},
+			...mapGetters(['coureLogin']),
+		},
+		watch: {
+		    coureLogin: {
+		      immediate: true,          // 页面一进入就检查一次
+		      handler(val) {
+				  console.log('huoqu ',val)
+		        if (val == 2&&this.isLogin) {
+					console.log("看课AppToken失效，请重新登录")
+					this.isLogin = false
+					this.isAddKf = 0
+					this.goLogins()
+		        }
+		      }
+		    }
+		},
+		onLoad(option) {
+			this.getWebviewUrl()
+			console.log('huoquoption ')
+			uni.$on('usercode',(data)=>{
+				console.log('huoqu ',data)
+				if(data) {
+					this.code=data.code
+					this.goLogins(data)
+				}
+			})
+			uni.$on('vipMsg',(data)=>{
+				console.log(4444,data)
+				this.contentmsg=data
+				this.showfalse=true
+				uni.showToast({
+					icon:'none',
+					title: data,
+					duration:5000
+				});
+			})
+			this.videoContext = uni.createVideoContext('video-content-box', this)
+			this.code = option.code
+			if(uni.getStorageSync('userInfo')&&JSON.stringify(uni.getStorageSync('userInfo'))!='{}') {
+				this.userInfo =JSON.parse(uni.getStorageSync('userInfo')) 
+			} else {
+				this.userInfo = {}
+			}
+			this.appToken=uni.getStorageSync('companyUserInfo')
+			if(!option.course){
+				const keys = decodeURIComponent(Object.keys(option)[0]);
+				this.urlOption=JSON.parse(keys.split('course=')[1])
+			}else{
+				this.urlOption = option.course ? JSON.parse(option.course) : {}
+			}
+			uni.setStorageSync('H5course',this.urlOption)
+			this.videoId = this.urlOption.videoId
+			this.courseId = this.urlOption.courseId
+			this.periodId = this.urlOption.periodId
+			this.companyId = this.urlOption.companyId
+			this.companyUserId = this.urlOption.companyUserId
+			this.projectId= this.urlOption.projectId
+			this.timeid=this.urlOption.id
+			console.log(this.urlOption)
+			console.log(decodeURIComponent(option.course))
+			// this.sortLink = this.urlOption.link || ''
+			this.getMenuButton()
+			// #ifdef MP-WEIXIN
+			// if(this.$store.state.logoname!=='乐氏本源'&&!uni.getStorageSync('userInfos')){
+			// 	this.userlogo=true
+			// }
+			console.log(uni.getStorageSync('userInfos'))
+			if(!uni.getStorageSync('userInfos')&&this.$store.state.logoname=='乐氏本源'){
+				uni.navigateTo({
+					url:'/pages_course/webview'
+				})
+				return
+			}
+			// #endif
+		},
+		onShow() {
+			this.userinfos=uni.getStorageSync('userinfos')
+			this.userinfo=uni.getStorageSync('userinfo')
+			this.tipsOpen = false
+			this.isExpand = true
+			this.uuId = generateRandomString(16)
+			if(this.videoId) {
+				this.getH5CourseByVideo()
+			}
+			const AppToken=uni.getStorageSync('TOKEN_WEXIN')
+			console.log(AppToken)
+			if (AppToken&&!this.code) {
+				// this.isLogin=true
+				if(this.isAddKf == 1&&this.userinfo.userId){
+					console.log(1233)
+					this.getH5CourseVideoDetails()
+				} else{
+					// this.checkUserInfoA()
+					this.getIsAddKf()
+				}
+			}
+			// if(this.sortLink){
+			// 	this.getLink()
+			// } else {
+			// 	uni.showToast({
+			// 		title: 'sortLink is not found',
+			// 		icon: 'none'
+			// 	});
+			// }
+		},
+		mounted() {
+			// this.getIP()
+			this.getHeight()
+			
+		},
+		onHide() {
+			// this.player = uni.createVideoContext('video-content-box');
+			if (this.player) {
+				this.player.pause()
+			}
+			// if (this.interval != null) {
+			// 	clearInterval(this.interval)
+			// 	this.interval = null
+			// }
+		},
+		onUnload() {
+			if (this.interval != null) {
+				clearInterval(this.interval)
+				this.interval = null
+			}
+			this.clearIntegral()
+			uni.$off('usercode')
+		},
+		beforeDestroy() {
+			this.player = uni.createVideoContext('video-content-box');
+			if (this.player) {
+				this.player.stop()
+				this.player = null
+			}
+			if (this.interval != null) {
+				clearInterval(this.interval)
+				this.interval = null
+			}
+			this.clearIntegral()
+		},
+		methods: {
+			getWebviewUrl() {
+				var data = {
+					key: 'course.config'
+				}
+					getConfigByKey(data).then(res => {
+						if (res.code == 200) {
+							console.log("getConfigByKey====", JSON.parse(res.data))
+							let data = JSON.parse(res.data,)
+							uni.setStorageSync('setWebviewUrl',data.userCourseAuthDomain)
+						}else{
+							uni.showToast({
+								icon:'none',
+								title: res.msg,
+							});
+						}
+					})
+			},
+			goLogin(){
+				uni.showLoading({
+					title: '加载中'
+				})
+				uni.login({
+					provider: "weixin",
+					success: async loginRes => {
+						let code = loginRes.code // 获取开发code
+						loginByMiniApp({
+						   // encryptedData: loginRes.mp.detail.encryptedData,
+						   // iv: loginRes.mp.detail.iv,
+						   code: code,
+						   companyId : this.companyId || '',
+						   companyUserId:this.companyUserId || 0,
+						   nickname:this.userinfos.nickname ||'',
+						   avatar:this.userinfos.avatar||'',
+						   authType:this.authType,
+						   appId:this.appid,
+						   projectId:this.projectId
+						})
+						.then( res => {
+							if(res.code==200){
+								console.log(res)
+								uni.hideLoading();
+								uni.showToast({
+									icon:'none',
+									title: "登录成功",
+								});
+								uni.setStorageSync('TOKEN_WEXIN', res.token);
+								uni.setStorageSync('userInfo', JSON.stringify(res.user));
+								this.userInfo=res.user;
+								// this.userinfos=uni.getStorageSync('userinfos')
+								// uni.getStorageSync('TOKEN_WEXIN');
+								// this.userInfo=uni.getStorageSync('userInfo');
+								this.isLogin = true
+								// this.getH5CourseVideoDetails()
+								setTimeout(()=>{
+									this.getIsAddKf()
+								},200)
+							}else if(res.code==406){
+								uni.hideLoading();
+								uni.showToast({
+									icon:'none',
+									title: '该用户已成为其他销售会员',
+								});
+							}else{
+								uni.hideLoading();
+								uni.showToast({
+									icon:'none',
+									title: res.msg,
+								});
+							}
+						   
+						 })
+					},
+				})
+			},
+			goLogins(data) {
+				if(data){
+					console.log('huoqu1222',data)
+					uni.showLoading({
+						title: '加载中'
+					})
+					uni.login({
+						provider: "weixin",
+						success: async loginRes => {
+							let code = loginRes.code // 获取开发code
+							handleFsUserWx({
+							   code: code,
+							   appId:this.appid,
+							   userId:data.userId
+							})
+							.then( res => {
+								if(res.code==200){
+									console.log(res)
+									uni.hideLoading();
+									uni.showToast({
+										icon:'none',
+										title: "登录成功",
+									});
+									this.userinfos=uni.getStorageSync('userinfos')
+									uni.getStorageSync('TOKEN_WEXIN');
+									this.userInfo=uni.getStorageSync('userInfo');
+									this.isLogin = true
+									this.getH5CourseVideoDetails()
+									// setTimeout(()=>{
+									// 	this.getIsAddKf()
+									// },200)
+								}else if(res.code==406){
+									uni.hideLoading();
+									uni.showToast({
+										icon:'none',
+										title: '该用户已成为其他销售会员',
+									});
+								}else{
+									uni.hideLoading();
+									uni.showToast({
+										icon:'none',
+										title: res.msg,
+									});
+								}
+							   
+							 })
+						},
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pages_course/webview?H5course='+uni.getStorageSync('H5course')
+					})
+				}
+				
+			},
+			shouquan(){
+				if(this.userinfos.nickname==''){
+					uni.showToast({
+						icon:'none',
+						title: "请先授权微信昵称",
+					});
+				}
+			},
+			confimrname(){
+				if(this.userinfos.nickname==''){
+					uni.showToast({
+						icon:'none',
+						title: "请授权微信昵称",
+					});
+					return
+				}
+				if(this.userinfos.avatar==''){
+					uni.showToast({
+						icon:'none',
+						title: "请授权微信头像",
+					});
+					return
+				}
+				uni.setStorageSync('userInfos',this.userinfos)
+				this.editUserA()
+				this.userlogo=false
+			},
+			onChooseAvatar(e){
+				this.userinfos.avatar=e.detail.avatarUrl
+				uni.uploadFile({
+					url: uni.getStorageSync('requestPath')+'/app/common/uploadOSS', //仅为示例，非真实的接口地址
+					filePath: e.detail.avatarUrl,
+					name: 'file',
+					formData: {
+						'user': 'test'  // 上传附带参数
+					},
+					success: (uploadFileRes) => {
+						console.log(uploadFileRes)
+						// 根据接口具体返回格式   赋值具体对应url
+						var data=JSON.parse(uploadFileRes.data)
+						this.headImg=uni.getStorageSync('requestPath')+data.fileName
+						this.userinfos.avatar=data.url
+					}
+				});
+			},
+			onNickNameInput(e){
+				console.log(e)
+				this.userinfos.nickname=e.detail.value
+			},
+			kefpop(){
+				if(this.appToken){
+					this.kfPopup==false
+				}
+			},
+			tosales(){
+				uni.switchTab({
+					url:"/pages/index/index"
+				})
+			},
+			closepop(){
+				this.answerPopup=false
+			},
+			open(){
+				
+			},
+			userInfologin(e){
+				console.log(e)
+				this.userdisabled=true
+				uni.showLoading({
+					title: "处理中..."
+				});
+				if (e.mp.detail.errMsg == 'getUserInfo:ok') {
+					this.utils.getProvider()
+					.then(provider => {
+						if (!provider) {
+							this.userdisabled=false
+						  reject()
+						}
+						// uni登录
+						uni.login({
+							provider: provider,
+							success: async loginRes => {
+								console.log(loginRes)
+								console.log(e)
+								let code = loginRes.code // 获取开发code
+								this.userinfos=uni.getStorageSync('userInfos')?uni.getStorageSync('userInfos'):this.userinfos
+								loginByMiniApp({
+								   encryptedData: e.mp.detail.encryptedData,
+								   iv: e.mp.detail.iv,
+								   code: code,
+								   companyId : this.companyId || '',
+								   companyUserId:this.companyUserId || 0,
+								   nickname:this.userinfos.nickname ||'',
+								   avatar:this.userinfos.avatar||'',
+								   authType:this.authType,
+								   appId:this.appid,
+								   projectId:this.projectId
+								})
+								.then( res => {
+									this.userdisabled=false
+									if(res.code==200){
+										console.log(res)
+										uni.hideLoading();
+										uni.showToast({
+											icon:'none',
+											title: "登录成功",
+										});
+										uni.setStorageSync('TOKEN_WEXIN', res.token);
+										uni.setStorageSync('userInfo', JSON.stringify(res.user));
+										this.userInfo=res.user;
+										uni.hideLoading()
+										// this.checkUserInfoA()
+										// this.isLogin = true
+										
+									}else if(res.code==406){
+										uni.hideLoading();
+										uni.showToast({
+											icon:'none',
+											title: '该用户已成为其他销售会员',
+										});
+									}else{
+										uni.hideLoading();
+										uni.showToast({
+											icon:'none',
+											title: res.msg,
+										});
+									}
+								   
+								 })
+								 .catch(res=>{
+									 this.userdisabled=false
+								 })
+							},
+							fail() {
+								this.userdisabled=false
+							}
+						})
+					})
+					.catch(err => {
+						this.userdisabled=false
+						uni.showToast({
+							icon:'none',
+							title: err,
+						});
+					})
+					 
+				} else {
+					this.userdisabled=false
+					uni.showToast({
+						title: '已拒绝授权',
+						icon: 'none',
+						duration: 2000,
+					})
+				}
+			},
+			phoneLogin(e) {
+				console.log(e)
+				this.userdisabled=false
+				uni.showLoading({
+					title: "处理中..."
+				});
+				if (e.mp.detail.errMsg == 'getPhoneNumber:ok') {
+					this.utils.getProvider()
+					.then(provider => {
+						if (!provider) {
+							this.userdisabled=false
+						  reject()
+						}
+						// uni登录
+						uni.login({
+							provider: provider,
+							success: async loginRes => {
+								this.userdisabled=false
+								console.log(loginRes)
+								console.log(e)
+								let code = loginRes.code // 获取开发code
+								this.userinfos=uni.getStorageSync('userInfos')?uni.getStorageSync('userInfos'):this.userinfos
+								loginByMiniApp({
+								   encryptedData: e.mp.detail.encryptedData,
+								   iv: e.mp.detail.iv,
+								   code: code,
+								   companyId : this.companyId || '',
+								   companyUserId:this.companyUserId || 0,
+								   nickname:this.userinfos.nickname||'',
+								   avatar:this.userinfos.avatar||"",
+								   authType:this.authType,
+								   appId:this.appid,
+								   projectId:this.projectId
+								})
+								.then( res => {
+									this.userdisabled=false
+									if(res.code==200){
+										console.log(res)
+										uni.hideLoading();
+										uni.showToast({
+											icon:'none',
+											title: "登录成功",
+										});
+										uni.setStorageSync('TOKEN_WEXIN', res.token);
+										uni.setStorageSync('userInfo', JSON.stringify(res.user));
+										this.userInfo=res.user;
+										uni.hideLoading()
+										this.checkUserInfoA()
+										// this.isLogin = true
+										// setTimeout(()=>{
+										// 	this.getIsAddKf()
+										// },200)
+									}else if(res.code==406){
+										uni.hideLoading();
+										uni.showToast({
+											icon:'none',
+											title: '该用户已成为其他销售会员',
+										});
+									}else{
+										uni.hideLoading();
+										uni.showToast({
+											icon:'none',
+											title: res.msg,
+										});
+									}
+								   
+								 })
+								 .catch(res=>{
+									 this.userdisabled=false
+								 })
+							},
+							fail() {
+								this.userdisabled=false
+							}
+						})
+						
+					})
+					.catch(err => {
+						this.userdisabled=false
+						uni.showToast({
+							icon:'none',
+							title: err,
+						});
+					})
+					 
+				} else {
+					this.userdisabled=false
+					uni.showToast({
+						title: '已拒绝授权',
+						icon: 'none',
+						duration: 2000,
+					})
+				}
+					
+			},
+			getMenuButton(){
+				const menuButtonInfo = uni.getMenuButtonBoundingClientRect()
+				this.menuButtonLeft = menuButtonInfo.left
+				this.menuButtonH = menuButtonInfo.height
+			},
+			//播放时间更新事件方法
+			onTimeUpdate(e){
+				let currentTime = Math.round(e.detail.currentTime)
+				if (this.playDurationSeek > 0) {
+					this.playTime = this.playDurationSeek
+					this.throttle(() => this.changeTime(this), 1000, false)
+				} else {
+					// console.log(this.isFinish)
+					if (this.linkType != 1 && (currentTime - this.playTime > 3 || currentTime - this.playTime < -3)&&this.isFinish!=1) {
+						uni.showToast({
+							title: '不能快进哦',
+							icon: 'none',
+						});
+						currentTime = this.playTime
+						this.player.seek(this.playTime);
+					}
+					
+					if (Math.floor(e.detail.currentTime) != this.flagTime) {
+						this.flagTime = Math.floor(e.detail.currentTime)
+						// 中途弹窗逻辑
+						if(!this.tipsOpen&&this.tipsTime && this.playTime == this.tipsTime) {
+							this.timepath='33%'
+								this.openTipsPop()
+							}
+						if(!this.tipsOpen&&this.tipsTime2 && this.playTime == this.tipsTime2) {
+							this.timepath='66%'
+								this.openTipsPop()
+							}
+					}
+					this.playTime = currentTime
+					
+				}
+			},
+			changeTime(that,e) {
+				that.playDurationSeek = 0
+			},
+			videoErrorCallback(e) {
+				this.clearIntegral()
+				this.errorCount++
+				if (this.errorCount > 3) return
+				console.log(e)
+				this.getErrMsg(e.target.errMsg)
+				this.getH5CourseVideoDetails('error')
+			},
+			// 当开始/继续播放时触发play事件
+			getPlay() {
+				this.errorCount = 0
+				// this.judgeDuration()
+			},
+			getPause() {
+				this.clearIntegral()
+			},
+			getEnded() {
+				this.clearIntegral()
+				this.isEnded = true
+				this.isFinish=1
+				this.getFinishCourseVideo()
+			},
+			getIP() {
+				uni.request({
+					url: 'https://ipinfo.io/json', //仅为示例，并非真实接口地址。
+					method: 'GET',
+					success: (res) => {
+						this.ip = res.data.ip
+					}
+				});
+			},
+			getHeight() {
+				this.$nextTick(() => {
+					const query = uni.createSelectorQuery().in(this);
+					query
+						.select("#title-content")
+						.boundingClientRect((data) => {
+							this.height =
+								`calc(100vh - ${data.height}px - 420rpx - ${this.statusBarHeight}px - 120rpx )`
+						})
+						.exec();
+				})
+			},
+			getDescHeight() {
+				this.$nextTick(() => {
+					const query = uni.createSelectorQuery().in(this);
+					query
+						.select("#descbox-desc")
+						.boundingClientRect((data) => {
+							this.textHeight = data.height
+						})
+						.exec();
+				})
+			},
+			numberToLetter(num) {
+				// 将数字转换为字母的 ASCII 码
+				let letterCode = num + 65;
+				// 将 ASCII 码转换为大写字母
+				let letter = String.fromCharCode(letterCode);
+				return letter;
+			},
+			updateTime() {
+				var that = this;
+				if (this.interval != null) {
+					clearInterval(this.interval)
+				}
+				this.interval = setInterval(function() {
+					that.getFinishCourseVideo()
+					that.getInternetTraffic()
+				}, 60000);
+			},
+			judgeDuration() {
+				var that = this;
+				if (this.intervalIntegral != null) {
+					clearInterval(this.intervalIntegral)
+					this.intervalIntegral = null
+				}
+				// 观看10分钟获得积分
+				this.intervalIntegral = setInterval(function() {
+					that.getIntegralByH5Video()
+				}, 600000);
+			},
+			clearIntegral() {
+				if (this.intervalIntegral != null) {
+					clearInterval(this.intervalIntegral)
+					this.intervalIntegral = null
+				}
+			},
+			// 展开简介
+			handleExpand() {
+				this.isExpand = !this.isExpand
+			},
+			getH5CourseByVideo() {
+				this.loading = true
+				getH5CourseByVideoId({
+					videoId: this.videoId
+				}).then(res => {
+						this.loading = false
+						if (res.code == 200) {
+							this.viewload=false
+							this.courseInfo = res.data
+							uni.setNavigationBarTitle({
+								title: this.courseInfo && this.courseInfo.title ? this.courseInfo.title : ''
+							});
+						}
+						this.getHeight()
+						this.getDescHeight()
+					},
+					rej => {
+						this.loading = false
+					}
+				).catch(() => {
+					this.loading = false
+				})
+			},
+			getH5CourseVideoDetails(type) {
+				uni.showLoading({
+					title: '加载中'
+				})
+				console.log(this.userInfo)
+				const data={
+					videoId:this.videoId,
+					fsUserId:this.userInfo.userId,
+					courseId:this.courseId,
+					companyUserId:this.companyUserId,
+					periodId:this.periodId,
+					id:this.timeid
+				}
+				getH5CourseVideoDetails(data).then(res => {
+						if (res.code == 200) {
+							this.config = res.data.courseConfig || {}
+							this.isFinish = res.data.isFinish || 0
+							this.duration = res.data.courseVideoDetails && 
+							res.data.courseVideoDetails.duration ? res.data.courseVideoDetails.duration : 0
+							this.courseLogo = this.config&&JSON.stringify(this.config)!='{}'? this.config.courseLogo : ''
+							this.playDuration = res.data.playDuration || 0
+							this.playDurationSeek = res.data.playDuration || 0
+							// this.tipsTime =  38
+							this.tipsTime = res.data.tipsTime || 0
+							this.tipsTime2 = res.data.tipsTime2 || 0
+							let lineList = []
+							// if (res.course && res.course.lineOne) {
+							// 	lineList.push(res.course.lineOne)
+							// }
+							// if (res.course && res.course.lineTwo) {
+							// 	lineList.push(res.course.lineTwo)
+							// }
+							// if (res.course && res.course.lineThree) {
+							// 	lineList.push(res.course.lineThree)
+							// }
+							this.lineList = lineList
+							if (!this.player || type == 'error') {
+								uni.hideLoading();
+								this.lineIndex = this.config.defaultLine
+								this.videoUrl = res.data.courseVideoDetails.videoUrl
+								this.poster= res.data.courseVideoDetails && 
+								res.data.courseVideoDetails.thumbnail ? res.data.courseVideoDetails.thumbnail : ''
+								this.videocont=res.data
+								// this.options.sources = [{
+								// 	src: this.videoUrl
+								// }]
+								// this.options.poster = res.course && res.course.imgUrl ? res.course.imgUrl : ''
+								// this.initVideo()
+								this.playTime = this.playDuration >= this.duration ? 0 : this.playDuration
+								if(this.videocont.rang){
+									setTimeout(()=>{
+										this.player = uni.createVideoContext('video-content-box');
+										this.player.seek(this.playTime)
+										this.player.play();
+									},500);
+									this.timepop=false
+								}else{
+									this.timepop=true
+								}
+								
+							} else {
+								// let div = document.querySelector(".vjs-progress-control");
+								// if(div) {
+								// 	if (this.isFinish == 1 || this.isEnded || this.linkType == 1) {
+								// 		div.style.pointerEvents = "auto";
+								// 	} else {
+								// 		div.style.pointerEvents = "none"; //禁止所有事件
+								// 	}
+								// }
+								this.playTime = this.playTime > this.playDuration ? this.playTime : this.playDuration >= this.duration ? 0 : this.playDuration
+								this.player.seek(this.playTime)
+								this.player.play();
+							}
+							this.updateTime();
+							if(res.data.courseVideoDetails.questionBankList.length==0){
+								this.isquestion=true
+							}else{
+								this.isquestion=false
+							}
+							console.log('题目',res.data.courseVideoDetails.questionBankList)
+							this.quesList = res.data.courseVideoDetails.questionBankList
+							 && res.data.courseVideoDetails.questionBankList.length > 0 ? res.data.courseVideoDetails.questionBankList : [],
+								this.quesList = this.quesList.map(item => ({
+									...item,
+									questionOption: JSON.parse(item.question),
+									answer: ''
+								}))
+						}
+						this.getHeight()
+						this.getDescHeight()
+					},
+					rej => {}
+				)
+			},
+			handleAnswer(item, option, idx) {
+				let time = this.playTime
+				if(this.isEnded || this.isFinish==1) {
+					time = this.duration
+				} else {
+					if(time < this.playDuration&&this.isFinish!=1) {
+						// 没完课且小于续播的时间
+						time = this.playDuration
+					}
+				}
+				if(Number(this.duration || 0) == 0 || time < this.duration - 60) {
+					uni.showToast({
+						title: "请先观看完整课程再答题哦～",
+						icon: "none"
+					})
+					return
+				}
+
+				if (item.type == 1) {
+					// 单选option
+					item.answer = option.name
+				} else if (item.type == 2) {
+					// 多选
+					let answer = item.answer ? item.answer.split(',') : []
+					if (answer.indexOf(option.name) === -1) {
+						answer.push(option.name)
+						item.answer = answer.join(',')
+					} else {
+						answer.splice(answer.indexOf(option.name), 1)
+						item.answer = answer.join(',')
+					}
+				}
+			},
+			submit() {
+				if(this.isExpire){
+					uni.showToast({
+						title: '课程已过期或链接无效',
+						icon: 'none'
+					});
+					return
+				}
+				// 登录
+				this.$isLoginCourse().then(
+					res => {
+						console.log(res)
+						if(res){
+							console.log(res)
+							if (this.isAddKf == 1) {
+								// 答题
+								// 您已提交过答案，请领取红包
+								console.log(1223)
+								this.courseAnswer()
+							} else {
+								// 添加客服
+								if (this.videoId&&this.isLogin) {
+									console.log(12223131)
+									this.getIsAddKf()
+								} else if(this.iskftype==1){
+									
+									uni.showToast({
+										title: this.iskftypemsg,
+										icon: 'none'
+									})
+								}
+								else {
+									// this.kfPopup=true
+									uni.removeStorageSync('TOKEN_WEXIN')
+									uni.showToast({
+										title: '已清除缓存，请重新进入页面！',
+										icon: 'none'
+									})
+								}
+							} 
+						} else{
+							this.goLogin()
+						}
+					},
+					rej => {}
+				);
+					
+			},
+			// 答题
+			courseAnswer() {
+				let time = this.playTime
+				if (this.isEnded||this.isFinish==1) {
+					time = this.duration
+				} else {
+					if (time < this.playDuration && this.isFinish != 1) {
+						// 没完课且小于续播的时间
+						time = this.playDuration
+					}
+				}
+				if (Number(this.duration || 0) == 0 || time < this.duration - 60) {
+					uni.showToast({
+						title: "请先观看完整课程再答题哦～",
+						icon: "none"
+					})
+					return
+				}
+				if (this.quesList.some(item => !item.answer)) {
+					uni.showToast({
+						title: "请确认是否答完所有题目",
+						icon: "none"
+					})
+					return
+				}
+				const questions = this.quesList.map(obj => {
+					const {
+						questionOption,
+						...rest
+					} = obj;
+					return rest;
+				});
+				const param = {
+					...this.urlOption,
+					userId:this.userInfo.userId,
+					questions: questions,
+					videoId: this.videoId,
+					duration: this.playTime,
+				}
+				this.errTitle = ""
+				this.errDesc = ""
+				this.errQues = []
+				courseAnswer(param).then(res => {
+						if (res.code == 200) {
+							if (res.incorrectQuestions) {
+								// 答题失败
+								if (res.incorrectQuestions.length > 0) {
+									this.errQues = res.incorrectQuestions
+								}
+								this.remain = res.remain || 0
+								if (res.remain > 0) {
+									this.answerPopup=true
+									this.errTitle = "很遗憾答错了"
+									this.errDesc = `<span style="color:#FF5C03">还有${res.remain}次机会，继续加油</span>`
+									// this.$refs.answerPopup.open("center")
+									this.answerPopup=true
+								}
+							} else {
+								// 答题成功
+								this.errTitle = "恭喜你，回答正确"
+								// this.errDesc = `请选择奖励`
+								// this.$refs.answerPopup.open("center")
+								// this.answerPopup=true
+								if(res.msg=='答题成功'){
+									uni.login({
+										provider: 'weixin',
+										success: async loginRes => {
+											console.log(loginRes)
+											var code=loginRes
+											this.closeAnswerPopup(loginRes.code)
+										}
+									})
+								}
+							}
+						} else {
+							if (res.msg == "该课题到达答错次数限制") {
+								this.errTitle = "答题次数超过限制"
+								this.errDesc = "以后的课程要认真学习哦"
+								// this.$refs.answerPopup.open("center")
+								this.answerPopup=true
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: "none"
+								})
+							}
+						}
+					},
+					rej => {}
+				)
+			},
+			// 选择
+			rewardChange(e) {
+				this.currentReward = e.detail.value
+			},
+			closeAnswerPopup() {
+				// this.$refs.answerPopup.close()
+				uni.showLoading({
+					title: "加载中..."
+				})
+				if (this.errTitle == '恭喜你，回答正确') {
+					const param = {
+						...this.urlOption,
+						userId:this.userInfo.userId,
+						// rewardType: Number(this.currentReward),
+						source: 2, // 小程序
+						appId: this.appid
+					}
+					sendReward(param).then(res => {
+						if(res.code == 200) {
+							uni.hideLoading()
+							this.answerPopup=false
+							console.log('红包',res)
+							if(res.isNew&&res.isNew==1) {
+								console.log('红包配置',res)
+								const packageInfo = res.data.packageInfo || ''
+								if(packageInfo) {
+									uni.setStorageSync('receive_package',packageInfo)
+									uni.setStorageSync('mchId',res.mchId)
+									uni.navigateTo({
+										url: '/pages_course/reward'
+									})
+								}
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none'
+								})
+							}
+						}else {
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							})
+						}
+						// if(res.code == 200) {
+						// 	//重构 发红包，后台通过OPENID发零钱到 账
+						// 	//this.initWXConfig(res.package)
+						// }else {
+						// 	uni.showToast({
+						// 		title: res.msg,
+						// 		icon: 'none'
+						// 	})
+						// }
+					})
+				}else{
+					uni.hideLoading()
+					this.answerPopup=!this.answerPopup
+				}
+			},
+			// 线路
+			openPop() {
+				this.$refs.popup.open('bottom')
+			},
+			close() {
+				this.$refs.popup.close()
+			},
+			handleLine(index) {
+				var that=this;
+				if (this.lineIndex == index && this.videoUrl == this.lineList[index]) {
+					this.close()
+					return
+				} else {
+					// let div = document.querySelector(".vjs-progress-control");
+					// if(div) {
+					// 	if (this.isFinish == 1 || this.isEnded || this.linkType == 1) {
+					// 		div.style.pointerEvents = "auto";
+					// 	} else {
+					// 		div.style.pointerEvents = "none"; //禁止所有事件
+					// 	}
+					// }
+					this.lineIndex = index
+					this.videoUrl = this.lineList[index]
+					this.tipsOpen = false
+					this.playDurationSeek = this.playTime || 0
+					this.player = uni.createVideoContext('video-content-box');
+					setTimeout(function(){
+						that.player.seek(that.playDurationSeek)
+						that.player.play();
+					},500);
+					// this.player.src(this.lineList[index])
+					// this.player.one('loadedmetadata', () => {
+					// 	this.player.currentTime(this.playDurationSeek);
+					// 	this.player.play();
+					// });
+					this.close()
+				}
+
+			},
+			// 温馨提示
+			openTipsPop() {
+				// this.$refs.tipsPopup.open()
+				this.tipsPopup=true
+				// 暂停视频
+				        this.videoContext.pause()
+				// this.tipsOpen = true
+				// this.pause()
+			},
+			closeTipsPop() {
+				// this.$refs.tipsPopup.close()
+				this.videoContext.play()
+				this.tipsPopup=!this.tipsPopup
+			},
+			// 客服
+			getIsAddKf() {
+				this.qrcode = ''
+				this.qrcodeMsg = ''
+				this.isAddKf = 0
+				const data = {
+					videoId:this.videoId,
+					userId:this.userInfo.userId,
+					companyUserId:this.companyUserId,
+					companyId:this.companyId,
+					courseId:this.courseId,
+					periodId:this.periodId,
+					projectId:this.projectId
+				}
+				// {videoId: this.videoId,qwUserId: this.qwUserId,corpId: this.corpId}
+				getIsAddKf(data).then(res => {
+						if (res.code == 200) {
+							this.isLogin = true
+							if(res.data){
+								this.isAddKf = 1
+								if(this.userInfo.userId){
+									this.getH5CourseVideoDetails()
+									console.log(123223)
+								}
+								
+							}
+							// else{
+							// 	uni.showToast({
+							// 		title: '请联系管理员，注册为会员！',
+							// 		icon: 'none'
+							// 	});
+							// }
+						}else if(res.code==1002){
+							this.isAddKf = 0
+							this.qrcode=res.ext
+							this.kfPopup=true
+							uni.showToast({
+								title: "请添加管理员微信，成为会员！",
+								icon: 'none'
+							});
+						}else if(res.code==505){
+							this.isAddKf = 0
+							this.qrcode=res.ext
+							this.kfPopup=true
+							uni.showToast({
+								title: "管理员开启了会员审核，请等待审核!",
+								icon: 'none'
+							});
+						}else if(res.code==406){
+							uni.hideLoading();
+							this.iskftypemsg=res.msg
+							uni.showToast({
+								icon:'none',
+								title: '该用户已成为其他销售会员',
+							});
+						}else if(res.code==504){
+							this.isAddKf = 0
+							this.iskftype=1
+							this.iskftypemsg=res.msg
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							});
+						}else {
+							this.isAddKf = 0
+							this.iskftypemsg=res.msg
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							});
+						}
+					},
+					err => {}
+				);
+			},
+			closeKFPop() {
+				// this.$refs.kfPopup.close()
+				// this.kfPopup=!this.kfPopup
+			},
+			getFinishCourseVideo() {
+				if (!this.playTime) return
+				// {videoId: this.videoId,duration:this.playTime}
+				const param = {
+					duration: this.playTime,
+					videoId:this.videoId,
+					userId:this.userInfo.userId,
+					companyUserId:this.companyUserId
+				}
+				getFinishCourseVideo(param)
+			},
+			// 每十分钟获得积分
+			getIntegralByH5Video() {
+				const param = {
+					duration: this.playTime,
+					...this.urlOption
+				}
+				getIntegralByH5Video(param).then(res => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: "积分+10",
+							icon: "none"
+						})
+					}
+				})
+			},
+			progressChange(e) {
+				this.bufferRate = Math.ceil(e.detail.buffered)
+				// console.log('缓冲结果',this.bufferRate)
+				// console.log('缓冲',this.playTime,this.duration)
+			},
+			// 缓冲
+			getInternetTraffic() {
+				const playVideoTime = Math.ceil(this.playTime / this.duration * 100) // 播放百分比
+				// console.log('播放百分比',playVideoTime)
+				if(this.bufferRate == 0 || this.bufferRate < playVideoTime) {
+					this.bufferRate = playVideoTime
+					console.log(this.bufferRate)
+				}
+				if(this.bufferRate == 0 || Number(this.bufferRate.toFixed(2)) == 0) return
+				const param = {
+					uuId: dayjs().format('YYYYMMDD') + this.uuId,
+					duration: this.playTime,
+					bufferRate: Number(this.bufferRate.toFixed(2)),
+					userId:this.userId,
+					periodId:this.periodId,
+					...this.urlOption
+				}
+				getInternetTraffic(param)
+			},
+			getErrMsg(err) {
+				let msgerr = {
+					videoUrl: this.videoUrl,
+					lineIndex: this.lineIndex,
+					errTime: new Date(),
+					// ip: this.ip,
+					errMsg: err
+				}
+				getErrMsg({
+					msg: JSON.stringify(msgerr)
+				})
+			},
+			getLink() {
+				this.goLogin()
+				return
+				let that = this;
+				this.msg = ''
+				getRealLink({sortLink:this.sortLink}).then(res=>{
+					if(res.code == 200) {
+						this.isExpire = false
+						// 如果响应中包含真实链接，则跳转到真实链接
+						// window.location.href = res.realLink +"&sortLink="+this.sortLink+"&code="+this.code+"&time="+new Date().getTime()
+						if (this.isLogin && this.isAddKf == 1) {
+							this.getH5CourseVideoDetails()
+						}
+						if (this.videoId && this.isAddKf != 1) {
+							this.$isLoginCourse().then(
+								isLogin => {
+									this.isLogin = isLogin
+									if(isLogin){
+										this.getIsAddKf() 
+									} else {
+										this.goLogin()
+									}
+								},
+								rej => {}
+							);
+						}
+					} else {
+						this.isExpire = true
+						this.msg = '课程已过期或链接无效'
+						uni.showToast({
+							title: '课程已过期或链接无效',
+							icon: 'none'
+						});
+					}
+				}).catch(err=>{
+					this.isExpire = true
+					this.msg = '发生错误，请稍后再试'
+					uni.showToast({
+						title: '发生错误，请稍后再试',
+						icon: 'none'
+					});
+				})
+			},
+			/**
+			 * 节流原理：在一定时间内，只能触发一次
+			 *
+			 * @param {Function} func 要执行的回调函数
+			 * @param {Number} wait 延时的时间
+			 * @param {Boolean} immediate 是否立即执行
+			 * @return null
+			 */
+			throttle(func, wait = 500, immediate = true) {
+			    if (immediate) {
+			        if (!this.flag) {
+			            this.flag = true
+			            // 如果是立即执行，则在wait毫秒内开始时执行
+			            typeof func === 'function' && func()
+			            this.timer = setTimeout(() => {
+			                this.flag = false
+			            }, wait)
+			        }
+			    } else if (!this.flag) {
+			        this.flag = true
+			        // 如果是非立即执行，则在wait毫秒内的结束处执行
+			        this.timer = setTimeout(() => {
+			            this.flag = false
+			            typeof func === 'function' && func()
+			        }, wait)
+			    }
+			}
+		}
+	}
+</script>
+
+<style scoped>
+.full-width-popup {
+  width: 100%;
+}
+</style>
+<style lang="scss" scoped>
+	.subname{
+		background-color: #00aa00;
+		color: #fff;
+	}
+	.subavt{
+		background-color: #fff;
+		border: 2rpx #0a0 solid;
+		color: #00aa00;
+	}
+	.boxweixin{
+		width: 44rpx;
+		height: 44rpx;
+		border-radius: 50%;
+		text-align: center;
+		line-height: 34rpx;
+		color: #0a0;
+	}
+	.boxnosel{
+		border: #757575 4rpx solid;
+	}
+	.boxsel{
+		border: #0a0 4rpx solid;
+	}
+	.button-container {
+	  position: relative;
+	  width: 240rpx;
+	}
+	.hidden-input {
+	  position: absolute;
+	  top: 0;
+	  left: 0;
+	  width: 100%;
+	  height: 100%;
+	  opacity: 0;
+	  z-index: 2;
+	}
+	.custom-button {
+	  position: relative;
+	  z-index: 1;
+	  /* 其他样式 */
+	  width:100%;
+	  margin: 0 auto;
+	  height: 80rpx;
+	  line-height: 60rpx;
+	  font-size: 28rpx;
+	  padding: 10rpx 20rpx;
+	}
+	.submitname{
+		width: 90%;
+		
+		margin: 0 auto;
+		text-align: center;
+		padding: 30rpx;
+		margin-top: 40rpx;
+	}
+	.sub{
+		background-color: #f0f0f0;
+		color: #0a0;
+	}
+	.subact{
+		background-color: #0a0;
+		color: #fff;
+	}
+	.userlogo{
+		height: 760rpx;
+	}
+	.getlogo{
+		width:240rpx;
+		background-color: #fff;
+		// padding: 10rpx 20rpx;
+	}
+	@mixin u-flex($flexD, $alignI, $justifyC) {
+		display: flex;
+		flex-direction: $flexD;
+		align-items: $alignI;
+		justify-content: $justifyC;
+	}
+	.footer-tips {
+			position: fixed;
+			width: 100%;
+			bottom: 144rpx;
+			text-align: center;
+			font-family: PingFang SC,PingFang SC;
+			font-weight: 500;
+			font-size: 12px;
+			color: #bbb;
+			transform: scale(0.8); 
+		}
+	.btns{
+		position: relative;
+		width: 100%;
+		height: 80rpx;
+		.author-btn{				
+			z-index:100;
+			position: absolute;
+			width: 100%;
+			height: 80rpx;
+			background: #ff5c03;
+			border-radius: 40rpx;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			text-align: center;
+			line-height: 80rpx;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+	.textOne {
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	.textTwo {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+	.header-nav {
+		height: 88rpx;
+		@include u-flex(row, center, flex-start);
+		overflow: hidden;
+		background-color: #fff;
+		box-sizing: border-box;
+		.header-title {
+			text-align: center;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			padding: 0 10rpx 0 100rpx;
+			font-family: PingFang SC,PingFang SC;
+			font-weight: 500;
+			font-size: 15px;
+			color: #000;
+			box-sizing: border-box;
+		}
+	}
+	.reward-list {
+		width: 100%;
+		margin-top: 20rpx;
+		margin-bottom: -40rpx;
+
+		&-group {
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			font-size: 14px;
+			color: #222222;
+			@include u-flex(row, center, center);
+		}
+
+		&-option {
+			@include u-flex(row, center, flex-start);
+
+			&:first-child {
+				margin-right: 40rpx;
+			}
+		}
+	}
+
+	.err {
+		color: #f56c6c !important;
+	}
+
+	.kfqrcode-box {
+		background-color: #fff;
+		border-radius: 16rpx;
+		max-width: 560rpx;
+		padding: 60rpx 40rpx;
+		margin-top: -100rpx;
+		box-sizing: border-box;
+		@include u-flex(column, center, flex-start);
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 400;
+		font-size: 34rpx;
+		color: #222;
+		position: relative;
+		text-align: center;
+
+		.kfqrcode {
+			// height: 460rpx;
+			width: 460rpx;
+		}
+	}
+
+	.kfqrcode-close {
+		width: 64rpx;
+		height: 64rpx;
+		position: absolute;
+		bottom: -100rpx;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+
+	.tipsPopup-mask {
+		position: relative;
+		width: 560rpx;
+		background-color: transparent;
+
+		.red_envelope_top {
+			width: 480rpx;
+			height: 360rpx;
+			margin: 0 auto;
+			display: inherit;
+		}
+	}
+
+	.tipsPopup-btn-box {
+		width: 456rpx;
+		height: 104rpx;
+		padding: 4rpx;
+		box-sizing: border-box;
+		background: linear-gradient(180deg, rgba(252, 209, 94, 1), rgba(254, 253, 251, 1));
+		border-radius: 52rpx;
+	}
+
+	.tipsPopup-btn {
+		width: 100%;
+		height: 100%;
+		background: linear-gradient(180deg, #FF9F22 0%, #FA1E05 100%);
+		border-radius: 52rpx 52rpx 52rpx 52rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 500;
+		font-size: 36rpx;
+		color: #FFFFFF;
+		line-height: 96rpx;
+		text-align: center;
+	}
+
+	.tipsPopup {
+		width: 560rpx;
+		padding: 12rpx;
+		margin-top: -72rpx;
+		box-sizing: border-box;
+		background: linear-gradient(180deg, #FFFBEF 0%, #FFFFF5 43%, #F5EAC2 100%);
+		border-radius: 32rpx 32rpx 32rpx 32rpx;
+		position: relative;
+
+		&-close {
+			width: 64rpx;
+			height: 64rpx;
+			position: absolute;
+			right: 0;
+			top: -188rpx;
+		}
+
+		&-line {
+			padding: 3rpx;
+			box-sizing: border-box;
+			background: linear-gradient(180deg, rgba(247, 245, 220, 1), rgba(250, 220, 157, 1));
+			border-radius: 24rpx;
+		}
+
+		&-box {
+			padding: 0 40rpx 40rpx 40rpx;
+			box-sizing: border-box;
+			background: linear-gradient(180deg, #FFFBEF 0%, #FFFFF5 43%, #F5EAC2 100%);
+			border-radius: 24rpx;
+			@include u-flex(column, center, flex-start);
+		}
+
+		&-head {
+			@include u-flex(row, center, center);
+
+			&-title {
+				width: 364rpx;
+				height: auto;
+				margin-top: -22rpx;
+			}
+		}
+
+		&-content {
+			margin: 48rpx 0;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #222222;
+			text-align: center;
+
+			&-title {
+				margin-bottom: 26rpx;
+				font-weight: 600;
+				font-size: 40rpx;
+				color: #FF5C03;
+			}
+		}
+	}
+
+	.video-controls-box {
+		width: 100%;
+		height: 420rpx;
+		overflow: hidden;
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		z-index: 2;
+		background: rgba(0, 0, 0, 0.2);
+
+		.video-play {
+			height: 72rpx;
+			width: 72rpx;
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+		}
+	}
+
+	.video-controls {
+		width: 100%;
+		height: 80rpx;
+		padding: 0 28rpx;
+		box-sizing: border-box;
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		background: linear-gradient(to top, #222 0%, transparent 80%);
+
+		.video-icon {
+			height: 44rpx;
+			width: 44rpx;
+		}
+	}
+
+	.errQuesbox {
+		width: 100%;
+		max-height: 260rpx;
+		overflow-y: auto;
+		margin-top: 24rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 500;
+		font-size: 30rpx;
+		color: #222222;
+
+		&-item {
+			width: 100%;
+			height: 128rpx;
+			line-height: 128rpx;
+			margin-bottom: 24rpx;
+			padding: 0 30rpx;
+			box-sizing: border-box;
+			overflow: hidden;
+			background: #fff;
+			border-radius: 16rpx 16rpx 16rpx 16rpx;
+			position: relative;
+
+			&::after {
+				content: "题目";
+				min-width: 64rpx;
+				height: 36rpx;
+				padding: 0 12rpx;
+				line-height: 36rpx;
+				background: #FF5C03;
+				box-sizing: border-box;
+				border-radius: 0rpx 0rpx 16rpx 0rpx;
+				text-align: center;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				font-size: 20rpx;
+				color: #fff;
+				position: absolute;
+				left: 0;
+				top: 0;
+			}
+		}
+	}
+
+	.bg {
+		background: #fff !important;
+	}
+	.timepopbox{
+		width: 560rpx;
+		padding: 32rpx;
+		box-sizing: border-box;
+	}
+	.answerPopup {
+		&-box {
+			width: 560rpx;
+			background: linear-gradient(180deg, #FFFAF6 0%, #FEECD8 100%);
+			border-radius: 32rpx 32rpx 32rpx 32rpx;
+			background-color: #fff;
+			font-weight: 400;
+			padding: 32rpx;
+			box-sizing: border-box;
+			position: relative;
+			@include u-flex(column, center, flex-start);
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+
+			.tipimg {
+				width: 206rpx;
+				height: 206rpx;
+				margin-bottom: 16rpx;
+			}
+		}
+
+		&-title {
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #222222;
+		}
+
+		&-desc {
+			margin-top: 10rpx;
+			font-size: 28rpx;
+			color: #757575;
+		}
+
+		&-btn {
+			width: 464rpx;
+			height: 84rpx;
+			margin-top: 54rpx;
+			margin-bottom: 16rpx;
+			background: #FF5C03;
+			border-radius: 42rpx;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #FFFFFF;
+			text-align: center;
+			line-height: 84rpx;
+		}
+	}
+
+	.popupbox {
+		width: 100%;
+		background-color: #fff;
+		border-radius: 16rpx 16rpx 0 0;
+		padding: 24rpx 32rpx;
+		position: relative;
+
+		&-head {
+			height: 60rpx;
+			margin-bottom: 30rpx;
+			text-align: center;
+			overflow-y: auto;
+			color: #414858;
+			font-size: 32rpx;
+			font-weight: bold;
+			position: relative;
+
+			.close-icon {
+				position: absolute;
+				right: 0;
+				top: 0;
+				height: 40rpx;
+				width: 40rpx;
+			}
+		}
+
+		&-content {
+			height: 20vh;
+			overflow-y: auto;
+			display: flex;
+			align-items: flex-start;
+			flex-wrap: wrap;
+			gap: 32rpx;
+
+			.line-item {
+				display: inline-block;
+				min-width: 200rpx;
+				min-height: 60rpx;
+				padding: 0 20rpx;
+				box-sizing: border-box;
+				border-radius: 50rpx;
+				overflow: hidden;
+				background-color: #f7f7f7;
+				text-align: center;
+				color: #414858;
+				font-size: 28rpx;
+				line-height: 60rpx;
+			}
+
+			.line-active {
+				color: #f56c6c !important;
+				background-color: #fef0f0 !important;
+			}
+		}
+	}
+
+	.content {
+		padding-bottom: calc(var(--window-bottom) + 100rpx);
+		.video-box {
+			width: 100%;
+			height: 420rpx;
+			overflow: hidden;
+			position: relative;
+
+			#myVideo {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.video-poster {
+			width: 100%;
+			height: 420rpx;
+		}
+
+		.miantitlebox {
+			padding: 30rpx 0;
+			border-bottom: 2rpx solid #F5F7FA;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			font-size: 40rpx;
+			color: #222222;
+		}
+
+		.subtitlebox {
+			padding: 30rpx 0;
+			border-bottom: 2rpx solid #F5F7FA;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			font-size: 40rpx;
+			color: #222222;
+		}
+
+		.title-content {
+			padding: 0 32rpx;
+			background-color: #fff;
+			font-size: 28rpx;
+			line-height: 1.6;
+
+			.title {
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #414858;
+			}
+
+			.time-or-subtitle {
+				margin-top: 12rpx;
+				color: #666666;
+			}
+		}
+
+		.descbox {
+			padding: 36rpx 32rpx;
+			margin-bottom: 20rpx;
+			background-color: #fff;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #222222;
+			line-height: 42rpx;
+			word-break: break-word;
+
+			&-title {
+				margin-bottom: 24rpx;
+				font-weight: 500;
+				font-size: 32rpx;
+			}
+
+			&-info {
+				margin-bottom: 24rpx;
+				@include u-flex(row, center, space-between);
+				font-size: 26rpx;
+				color: #757575;
+
+				&-l {
+					flex: 1;
+					@include u-flex(row, center, flex-start);
+				}
+
+				&-time {
+					margin-left: 18rpx;
+					padding-left: 18rpx;
+					position: relative;
+
+					&::after {
+						content: "";
+						width: 4rpx;
+						height: 4rpx;
+						background: #999999;
+						border-radius: 50%;
+						position: absolute;
+						left: 0;
+						top: 50%;
+						transform: translateY(-50%);
+					}
+				}
+
+				&-r {
+					background: transparent;
+				}
+			}
+
+			&-desc {
+				overflow: hidden;
+				position: relative;
+			}
+		}
+
+		.expand {
+			flex-shrink: 0;
+			@include u-flex(row, center, flex-end);
+			color: #FF5C03;
+			font-weight: 400;
+			font-size: 24rpx;
+
+			image {
+				width: 32rpx;
+				height: 32rpx;
+			}
+		}
+
+		.expand-ab {
+			position: absolute;
+			top: 0;
+			right: 0;
+			box-shadow: -50rpx 0 20rpx 8rpx #FFFFFF;
+			background-color: #fff;
+		}
+
+		.ques-content {
+			background-color: #fff;
+			padding: 40rpx 32rpx;
+			box-sizing: border-box;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #222222;
+		}
+
+		.ques-content-tit {
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #222222;
+		}
+
+		.ques-title {
+			margin: 48rpx 0 34rpx 0;
+			font-weight: 500;
+			font-size: 32rpx;
+			white-space: normal;
+		}
+
+		.ques-type {
+			flex-shrink: 0;
+			min-width: 72rpx;
+			min-height: 40rpx;
+			padding: 0 12rpx;
+			margin: 0 12rpx;
+			box-sizing: border-box;
+			background: #FF5C03;
+			border-radius: 8rpx 8rpx 8rpx 8rpx;
+			line-height: 40rpx;
+			text-align: center;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #FFFFFF;
+			display: inline-block;
+		}
+
+		.ques-option {
+			min-height: 88rpx;
+			padding: 24rpx 32rpx;
+			box-sizing: border-box;
+			margin-bottom: 24rpx;
+			background: #F5F7FA;
+			border-radius: 16rpx 16rpx 16rpx 16rpx;
+			display: flex;
+			align-items: center;
+
+			&-active {
+				color: #FF5C03 !important;
+				background: #FCF0E7 !important;
+			}
+		}
+
+		.video-line {
+			min-width: 140rpx;
+			max-width: 200rpx;
+			height: 60rpx;
+			padding: 0 20rpx;
+			box-sizing: border-box;
+			border-radius: 50rpx 0 0 50rpx;
+			overflow: hidden;
+			background-color: #fff;
+			text-align: center;
+			color: #888;
+			font-size: 28rpx;
+			line-height: 60rpx;
+			display: inline-flex;
+			align-items: center;
+			justify-content: center;
+			position: fixed;
+			right: 0;
+			z-index: 9;
+			bottom: calc(var(--window-bottom) + 280rpx);
+			box-shadow: 0 4rpx 10rpx rgba(0, 0, 0, .12);
+
+			image {
+				flex-shrink: 0;
+				height: 30rpx;
+				width: 30rpx;
+				margin-right: 6rpx;
+			}
+		}
+
+		.footer {
+			border-top: 1rpx solid #ededef;
+			background: #fff;
+			width: 100%;
+			position: fixed;
+			bottom: 0;
+			padding: 32rpx;
+			// padding-bottom: calc(var(--window-bottom) + 14rpx);
+			box-sizing: border-box;
+			z-index: 0;
+
+			&-btn {
+				width: 100%;
+				height: 98rpx;
+				background: #FF5C03;
+				border-radius: 49rpx 49rpx 49rpx 49rpx;
+				line-height: 98rpx;
+				text-align: center;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 600;
+				font-size: 32rpx;
+				color: #FFFFFF;
+				@include u-flex(row, center, center);
+
+				&-img {
+					flex-shrink: 0;
+					width: 144rpx;
+					height: 144rpx;
+					margin-right: 8rpx;
+					margin-top: -24rpx;
+				}
+			}
+
+			&-btn-border {
+				position: relative;
+
+				&::after {
+					content: "";
+					background: linear-gradient(180deg, rgba(255, 255, 255, 0), rgba(255, 255, 255, 1));
+					position: absolute;
+					top: -2rpx;
+					left: 0;
+					height: 103rpx;
+					width: 100%;
+					z-index: -1;
+					border-radius: 49rpx 49rpx 49rpx 49rpx;
+					box-shadow: 0rpx 8rpx 11rpx 0rpx rgba(255, 92, 3, 0.3);
+					overflow: hidden;
+				}
+			}
+		}
+	}
+
+	.agreement {
+		display: inline-flex;
+		margin-top: 16rpx;
+		font-size: 24rpx;
+		color: #525252;
+		align-items: center;
+		justify-content: center;
+	}
+	 
+	.nocourse {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding-bottom: 88rpx;
+		justify-content: center;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 400;
+		font-size: 32rpx;
+		color: #757575;
+		line-height: 48rpx;
+		text-align: center;
+		
+		image {
+			width: 328rpx;
+			height: auto;
+			margin-bottom: 30rpx;
+		}
+	}
+	 .logo {
+	 	display: inline-block;
+	 	width: 30px;
+	 	height: auto;
+	 	margin: 20px 0 0 10px;
+	 	pointer-events: none;
+	 	object-fit: cover;
+	 }
+	 .logo-full {
+	 	display: inline-block;
+	 	width: 40px;
+	 	height: auto;
+	 	margin: 50px 0 0 30px;
+	 	pointer-events: none;
+	 	object-fit: cover;
+	 }
+</style>

pages_course/webview.vue

@@ -31,6 +31,7 @@ export default {
   },
   onLoad(options) {
 	  console.log(this.webviewUrl)
+	  console.log(options.code)
 	  if(options.code){
 		  // uni.$emit('us ercode', {  code: options.code });
 		  this.loginweixin(options.code)
@@ -49,7 +50,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

pages_doctor/doctorDetail.vue

@@ -2,12 +2,12 @@
 	<view>
 		<view class="top-cont">
 			<!-- 背景图片 -->
-			<image class="bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/doctordetail_top_bg.png" mode=""></image>
+			<image class="bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/doctordetail_top_bg.png" mode=""></image>
 			<view class="top-inner">			
 				<!-- 这里是状态栏 -->
 				<view class="status_bar" :style="{height: statusBarHeight}"></view>
 				<view class="back-box" @click="back">
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/back.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/back.png" mode=""></image>
 				</view>
 				<!-- 医生信息 -->
 				<view class="doctor-info">
@@ -62,22 +62,22 @@
 				<view class="content">
 					<!-- 擅长 -->
 					<view class="expertise">
-						<image class="label-img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/sc_word.png" mode=""></image>
+						<image class="label-img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/sc_word.png" mode=""></image>
 						<text :class="showExpert?'text':'text ellipsis3'" id="expert">{{doctor.doctorDesc}}</text>
 						<!-- 查看更多按钮 -->
 						<view v-if="!showExpert" class="show-more" @click="showMoreExpert">
-							<image class="mask" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/mask.png" mode=""></image>
+							<image class="mask" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/mask.png" mode=""></image>
 							<view class="inner">
 								<text class="btn">查看全部</text>
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/arrow3.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/arrow3.png" mode=""></image>
 							</view>
 						</view>
 					</view>
 					<!-- 问诊方式 -->
 					<view class="mode-box">
 						<view v-for="(price,index) in prices" :class="price.priceId == priceId?'item active':'item'" @click="choseMode(price)">
-							<image v-if="price.priceType==1" class="img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/picture_ask.png" mode=""></image>
-							<image v-if="price.priceType==2" class="img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/phone_ask.png" mode=""></image>
+							<image v-if="price.priceType==1" class="img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/picture_ask.png" mode=""></image>
+							<image v-if="price.priceType==2" class="img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/phone_ask.png" mode=""></image>
 							<view class="info">
 								<text v-if="price.priceType==1" class="label">图文问诊</text>
 								<text v-if="price.priceType==2" class="label">电话问诊</text>
@@ -93,7 +93,7 @@
 								</view>
 							</view>
 							<!-- 选中的角标 -->
-							<image v-if="price.priceId == priceId" class="active-img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/sel_right50.png" mode=""></image>
+							<image v-if="price.priceId == priceId" class="active-img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/sel_right50.png" mode=""></image>
 						</view>
 						 
 					</view>
@@ -107,12 +107,12 @@
 		<view class="btn-foot">
 			<view class="menu-box">
 				<view class="item" @click="goHome">
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/back_home.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/back_home.png" mode=""></image>
 					<text>首页</text>
 				</view>
 				<view class="item" @click="changeFollow">
-					<image v-if="!isFollow" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/focus.png" mode=""></image>
-					<image v-show="isFollow" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/focus_sel.png" mode=""></image>
+					<image v-if="!isFollow" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/focus.png" mode=""></image>
+					<image v-show="isFollow" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/focus_sel.png" mode=""></image>
 					<text>关注</text>
 				</view>
 			</view>
@@ -342,7 +342,7 @@
 							font-family: PingFang SC;
 							font-weight: 500;
 							color: #FFFFFF;
-							background: #2BC7B9;
+							background: #C39A58;
 							border-radius: 10upx 4upx 10upx 4upx;
 							margin-right: 12upx;
 						}
@@ -444,7 +444,7 @@
 					font-size: 28upx;
 					font-family: PingFang SC;
 					font-weight: 500;
-					color: #2BC7B9;
+					color: #C39A58;
 				}
 				image{
 					width: 14upx;
@@ -485,7 +485,7 @@
 			}
 			&.active{
 				position: relative;
-				border: 2upx solid #2BC7B9;
+				border: 2upx solid #C39A58;
 				.active-img{
 					display: block;
 				}
@@ -507,7 +507,7 @@
 				.price{
 					display: flex;
 					align-items: flex-end;
-					color: #2BC7B9;
+					color: #C39A58;
 					.num{
 						font-size: 30upx;
 						font-weight: bold;
@@ -575,7 +575,7 @@
 			font-family: PingFang SC;
 			font-weight: bold;
 			color: #FFFFFF;
-			background: #2BC7B9;
+			background: #C39A58;
 			border-radius: 44upx;
 			text-align: center;
 		}

pages_doctor/doctorIm.vue

@@ -55,7 +55,7 @@
 						</view>
 					</view>
 					<view class="img-box">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/head.jpg" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/head.jpg" mode=""></image>
 					</view>
 				</view>
 			</view> -->
@@ -77,20 +77,20 @@
 					 v-model="sendText"
 					@input="textInput" 
 				/>
-				<image v-if="!hasSendValue" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/add26.png" mode="" @click="showMoreMenu"></image>
+				<image v-if="!hasSendValue" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/add26.png" mode="" @click="showMoreMenu"></image>
 				<view v-if="hasSendValue" class="send-btn" @click="sendMsg">发送</view>
 			</view>
 			<!-- 功能按钮 -->
 			<view :class="showBottomMenu?'bottom-menu show':'bottom-menu'">
 				<view class="item">
 					<view class="img-box">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/health.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/health.png" mode=""></image>
 					</view>
 					<text class="text">投诉反馈</text>
 				</view>
 				<view class="item">
 					<view class="img-box">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/health.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/health.png" mode=""></image>
 					</view>
 					<text class="text">常见问题</text>
 				</view>
@@ -385,7 +385,7 @@
 								text-align: right;
 							}
 							.words{
-								background: #2BC7B9;
+								background: #C39A58;
 								color: #FFFFFF;
 								border-radius: 20upx 0 20upx 20upx;
 							}
@@ -453,7 +453,7 @@
 					height: 64upx;
 					line-height: 64upx;
 					border-radius: 32upx;
-					background: #2BC7B9;
+					background: #C39A58;
 					font-size: 28upx;
 					font-family: PingFang SC;
 					font-weight: 500;

pages_doctor/doctorList.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 					<input type="text" v-model="searchVal" placeholder="输入医生姓名搜索" confirm-type="搜索" @confirm="goSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -19,7 +19,7 @@
 					>
 						<view class="text">
 							{{ item.departmentName }}
-							<image v-show="deptId == item.departmentId" class="tab-bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/tab_bg.png" mode=""></image>
+							<image v-show="deptId == item.departmentId" class="tab-bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/tab_bg.png" mode=""></image>
 						</view>
 					</view>
 				</view>
@@ -56,7 +56,7 @@
 						<!-- 评分 -->
 						<!-- <view class="rate-box">
 							<view class="star">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/star.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/star.png" mode=""></image>
 								<text>{{ item.pings }}</text>
 							</view>
 							<view class="line"></view>
@@ -107,7 +107,7 @@
 					},
 					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						icon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no_data.png',
+						icon:'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no_data.png',
 						tip: '暂无数据'
 					}
 				},
@@ -333,7 +333,7 @@
 						font-family: PingFang SC;
 						font-weight: 500;
 						color: #FFFFFF;
-						background: #2BC7B9;
+						background: #C39A58;
 						border-radius: 10upx 4upx 10upx 4upx;
 						margin-right: 12upx;
 					}
@@ -418,13 +418,13 @@
 						.label{
 							font-size: 26upx;
 							font-weight: 500;
-							color: #2BC7B9;
+							color: #C39A58;
 							margin-right: 5upx;
 						}
 						.num{
 							font-size: 28upx;
 							font-weight: bold;
-							color: #2BC7B9;
+							color: #C39A58;
 						}
 					}
 				}

pages_doctor/doctorQr.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="item">
-			<image style="width: 222rpx;height: 144rpx;" mode="aspectFit" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/no_data.png"></image>
+			<image style="width: 222rpx;height: 144rpx;" mode="aspectFit" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/no_data.png"></image>
 			<view>暂无咨询</view>
 			<!-- <image mode="aspectFit" :show-menu-by-longpress="true" :src="urls[0]"  ></image> -->
 			<!-- <view class="btn" @click="savePhoto()">

pages_doctor/index.vue

@@ -7,7 +7,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 					<input type="text" :value="searchValue" placeholder="输入关键字" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -15,19 +15,19 @@
 		<!-- 快速问诊、找医生 -->
 		<view class="online-inquiry" :style="{marginTop:top}">
 			<view class="item" @click="navTo('./postConsult')">
-				<image class="bg-img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/online_treat.png" mode=""></image>
+				<image class="bg-img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/online_treat.png" mode=""></image>
 				<view class="inner">
 					<text class="title">快速问诊</text>
 					<text class="sub-title">智能科室 快速匹配</text>
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/fast_ask.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/fast_ask.png" mode=""></image>
 				</view>
 			</view>
 			<view class="item" @click="navTo('./doctorList')">
-				<image class="bg-img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/chu_query.png" mode=""></image>
+				<image class="bg-img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/chu_query.png" mode=""></image>
 				<view class="inner">
 					<text class="title">找医生</text>
 					<text class="sub-title">全国60万医生任你选</text>
-					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/doctor_blue.png" mode=""></image>
+					<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/doctor_blue.png" mode=""></image>
 				</view>
 			</view>
 		</view>
@@ -49,7 +49,7 @@
 							>
 								<view class="text">
 									{{ item.name }}
-									<image v-show="item.id ==  param.orderType" class="tab-bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/tab_bg.png" mode=""></image>
+									<image v-show="item.id ==  param.orderType" class="tab-bg" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/tab_bg.png" mode=""></image>
 								</view>
 							</view>
 						</view>
@@ -84,16 +84,16 @@
 								<!-- 语音回答 -->
 								<view class="voice-inner" v-if="item.orderType == '2'">
 									<free-audio 
-										startPic='https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/play.png' 
-										endPic='https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/pause.png'
-										activeColor="#2BC7B9"
+										startPic='https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/play.png' 
+										endPic='https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/pause.png'
+										activeColor="#C39A58"
 										:audioId="'audio'+index"
 										:url='item.replyAudioUrl'
 									></free-audio>
 								</view>
 							</view>
 							<view class="read-box">
-								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/eye.png" mode=""></image>
+								<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/eye.png" mode=""></image>
 								<text class="text">{{item.views}}人看过</text>
 							</view>
 						</view>
@@ -109,7 +109,7 @@
 <script>
 	import {getDepartmentList,getDoctorCase} from '@/api/doctorOrder.js'
 	import Loading from "@/components/Loading";
-	// import tabBg from "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/tab_bg.png"
+	// import tabBg from "https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/tab_bg.png"
 	import freeAudio from '@/components/chengpeng-audio/free-audio.vue'
 	export default {
 		components: {freeAudio,Loading},
@@ -121,7 +121,7 @@
 				// 状态栏的高度
 				statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
 				searchValue: '',
-				tabBg: 'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/tab_bg.png', // tab切换背景
+				tabBg: 'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/tab_bg.png', // tab切换背景
 				current: 0,
 				param: {
 				  orderType:0,

pages_doctor/paymentOrder.vue

@@ -14,7 +14,7 @@
 				<view class="title">支付方式</view>
 				<view class="item">
 					<view class="left">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/wecha_pay.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/wecha_pay.png" mode=""></image>
 						<text class="text">微信支付</text>
 					</view>
 					<label>
@@ -308,7 +308,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #2BC7B9;
+				background: #C39A58;
 				border-radius: 44upx;
 			}
 		}

pages_doctor/submitOrder.vue

@@ -6,7 +6,7 @@
 				<view class="title-box">
 					<text class="title">选择问诊人</text>
 					<view class="add-box">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/add26.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/add26.png" mode=""></image>
 						<text @click="addPeople">添加</text>
 					</view>
 				</view>
@@ -19,7 +19,7 @@
 							<text class="ege">{{utils.getAge(item.birthday)}}岁</text>
 						</view>
 						<!-- 选中的对号角标 -->
-						<image v-if="patientId == item.patientId" class="active-img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/sel_right50.png" mode=""></image>
+						<image v-if="patientId == item.patientId" class="active-img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/sel_right50.png" mode=""></image>
 					</view>
 				</view>
 			</view>
@@ -46,11 +46,11 @@
 					<!-- 上传的图片列表 -->
 					<view class="img-item" v-for="(item,index) in imgList" :key="index" @tap="viewImage" :data-url="imgList[index]">
 						<image class="img" :src="item" mode="aspectFill"></image>
-						<image class="close-img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/close32.png" mode="" @tap.stop="delImg" :data-index="index"></image>
+						<image class="close-img" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/close32.png" mode="" @tap.stop="delImg" :data-index="index"></image>
 					</view>
 					<!-- 上传图片按钮 -->
 					<view class="uoload-btn" @tap="chooseImage" v-if="imgList.length<3">
-						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/photo.png" mode=""></image>
+						<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/photo.png" mode=""></image>
 						<text>上传照片</text>
 					</view>
 				</view>
@@ -299,7 +299,7 @@
 						}
 						&.active{
 							background: rgba(230, 250, 247, 0);
-							border: 2upx solid #2BC7B9;
+							border: 2upx solid #C39A58;
 							position: relative;
 						}
 						.active-img{
@@ -444,7 +444,7 @@
 				font-weight: bold;
 				color: #FFFFFF;
 				text-align: center;
-				background: #2BC7B9;
+				background: #C39A58;
 				border-radius: 44upx;
 			}
 		}

pages_index/index/articleDetails.vue

@@ -15,7 +15,7 @@
 		<!-- 咨询按钮 -->
 		<view class="inquiry">
 			<view class="content">
-				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/consult.png" mode=""></image>
+				<image src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/consult.png" mode=""></image>
 				<text class="text">咨询</text>
 				<button class="contact-btn" open-type="contact"></button>
 			</view>
@@ -173,7 +173,7 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #FFFFFF;
-			background: #2BC7B9;
+			background: #C39A58;
 			border-radius: 40upx;
 			display: flex;
 			align-items: center;
@@ -218,7 +218,7 @@
 				font-size: 22upx;
 				font-family: PingFang SC;
 				font-weight: bold;
-				color: #2BC7B9;
+				color: #C39A58;
 				line-height: 1;
 			}
 			 

pages_index/index/articleList.vue

@@ -4,7 +4,7 @@
 			<!-- 搜索框 -->
 			<view class="search-cont">
 				<view class="inner">
-					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/search.png" mode=""></image>
+					<image class="icon-search" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/search.png" mode=""></image>
 					<input type="text" v-model="keyword" placeholder="输入关键字搜索" confirm-type="search" @confirm="doSearch" placeholder-style="font-size:28rpx;color:#BBBBBB;font-family: PingFang SC;" />
 				</view>
 			</view>
@@ -27,7 +27,7 @@
 						<view class="info-box">
 							<view class="readers">
 								<view class="readings">
-									<image class="eye" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop/images/eye.png" ></image>
+									<image class="eye" src="https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/shop04/eye.png" ></image>
 									<text class="num">{{item.views}}</text>
 								</view>
 							</view>
@@ -211,15 +211,15 @@
 			font-size: 28upx;
 			font-family: PingFang SC;
 			font-weight: 500;
-			color: #2BC7B9;
+			color: #C39A58;
 			background: #ffffff;
-			border: 1px solid #2BC7B9;
+			border: 1px solid #C39A58;
 			border-radius: 32upx;
 			margin: 0 20upx 20upx 0;
 			&.active{
 				color: #FFFFFF;
-				background: #2BC7B9;
-				border: 1px solid #2BC7B9;
+				background: #C39A58;
+				border: 1px solid #C39A58;
 			}
 		}
 	}

pages_index/index/chineseMedicineDetails.vue

@@ -123,7 +123,7 @@
 					border-radius: 5rpx;
 					width: 8rpx;
 					height:30rpx;
-					background-color: #2BC7B9;
+					background-color: #C39A58;
 				}
 				.title{
 					margin-left: 15rpx;
@@ -155,7 +155,7 @@
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				// border: 1rpx solid #2BC7B9;
+				// border: 1rpx solid #C39A58;
 				border-radius: 30rpx;
 				line-height: 60rpx;
 				.tab1{
@@ -207,7 +207,7 @@
 					font-family: PingFang SC;
 				}
 				.active{
-					background-color: #2BC7B9;
+					background-color: #C39A58;
 					color: #fff;
 				}