修改

App.vue

@@ -2,17 +2,53 @@
 	export default {
 		onLaunch: function() {
 			// console.log('App Launch')
+			this.checkUpdate()
 		},
 		onShow: function() {
 			// console.log('App Show')
 		},
 		onHide: function() {
 			// console.log('App Hide')
+		},
+		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
+					});
+				});
+			},
 		}
 	}
 </script>
 <style lang="less">
 	@import '@/assets/css/common.less';
+	@import './assets/css/tool.css';
 </style>
 <style lang="scss">
 	@import "@/uni_modules/uview-ui/index.scss";

api/class.js

@@ -9,4 +9,8 @@ let request = new Request().http
  }
  export function courseListB() {
  	 return request('/course_auto/app/course/getPrivateCourse',null,'GET');
- }
+ }
+ //获取销售管理按钮是否显示的状态
+  export function queryIsTownOn(data) {
+  	 return request('/app/index/queryIsTownOn',data,'GET');
+  }

api/manageCompany.js

@@ -249,4 +249,12 @@ 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');
+}
+//更改课程时间
+export function updataTime(data){
+	return request('/companyapp/app/fs/course/setWatchTime',data, 'POST', 'application/json;charset=UTF-8');
 }

api/test.js

@@ -20,5 +20,29 @@ let request = new Request().http
  export function doReport(data) {
   	return request('/app/test/doReport',data,'POST','application/json;charset=UTF-8');
  }
-  
+ 
+  //语音接口
+  export function addVoicePrintUrl(data) {
+  	 return request('/companyapp/app/companyUser/addVoicePrintUrl',data,'POST','application/json;charset=UTF-8');
+  }
+  //  模板语音上传接口
+  export function companyUserVoiceNew(data) {
+  	 return request('/companyapp/app/companyUser/companyUserVoiceNew',data,'GET','application/json;charset=UTF-8');
+  }
+  // 模板语音上传接口
+  export function companyUserVoice(data) {
+  	 return request('/companyapp/app/companyUser/companyUserVoice',data,'GET','application/json;charset=UTF-8');
+  }
+  // 获取语音列表
+  export function querySopVoiceList(data) {
+  	 return request('/companyapp/app/companyUser/querySopVoiceList',data,'GET','application/json;charset=UTF-8');
+  }
+  // 获取语音详情
+  export function queryDetail(id) {
+  	 return request('/companyapp/app/companyUser/query/'+id,null,'GET','application/json;charset=UTF-8');
+  }
+   
+  export function createUserAllVoice(id) {
+  	 return request('/companyapp/app/companyUser/createUserAllVoice',null,'GET','application/json;charset=UTF-8');
+  }
   

assets/css/common.less

@@ -3,7 +3,7 @@ page {
   background: #f5f5f5;
   height: 100%;
 }
-.container{
+.containers{
   height: 100%;
 }
 rich-text {

common/request.js

@@ -5,14 +5,26 @@ export default class Request {
 	http(router, data = {}, method,contentType) {
 		let that = this;
 		let type = 0;
-		let path = 'https://userappkyt.ylrzcloud.com'//宽益堂
+		// let path = 'https://user.test.ylrztop.com/api'//云联融智
+		// let path = 'https://userappkyt.ylrzcloud.com'//宽益堂
+		// let path = 'https://usercourse.beliyostore.com'//倍力优
 		// let path = 'https://app.bainian1000y.cn/prod-api'//百年康成
+		// let path = 'http://a9e258d6.natappfree.cc'//百年康成本地
 		// let path = 'https://userapp.zkhj6.com'//中康
+		// let path = 'http://192.168.10.158:8007'//中康
 		// let path = 'https://userapp.myks8.com' //恒春来
-		// let path = 'https://userapp.xdtongshuntang.top'//四级理养
-		// let path = 'https://userapp.bjyjbao.com/prod-api'//医建宝
-		// let path = 'https://userapp.whhmdyf.cn/prod-api'//惠名大讲堂
-		
+		// let path = 'https://userapp.jiuzhouzaixian.com'//九州
+		let path = 'https://userapp.bjyjbao.com'//医健宝
+		// let path = 'https://userapp.yytcdta.com'//晚景如春
+		// let path = 'https://userapp.yixingjian.top'//宏医堂
+		// let path = 'https://userapp.cqsft.vip'//四福堂
+		// let path = 'https://userappjnlzjk.ylrztop.com/prod-api'//济南联志健康
+		// let path = 'https://yjb.mynatapp.cc'//本地
+		// let path = 'https://hatuserapp.ylrzfs.com'//恒安图
+		// let path = 'https://ddgyuserapp.ylrzfs.com'//叮当国医
+		// let path = 'https://userapp.cykbja.cn/prod-api'//纯正堂
+		// let path = 'https://userapp.moonxiang.com/prod-api'//存在文化
+		// let path = 'https://jnsyjauth.ylrztop.com'//顺亿京
 		
 		uni.setStorageSync('requestPath',path)
 		// uni.showLoading({
@@ -22,7 +34,7 @@ export default class Request {
 		if(router.indexOf("/companyapp")!=-1){
 			type = 1;
 			// router =router.replace('/companyapp','')
-			 // path = 'http://192.168.10.158:7015'//
+			 // path = 'https://userapp.cykbja.cn'//纯正堂
 			 token = uni.getStorageSync('ManageToken');
 		}
 		if(router.indexOf("/course_uniapp")!=-1){
@@ -34,8 +46,7 @@ export default class Request {
 		if(router.indexOf("/course_auto")!=-1){
 			type = 3;
 			router =router.replace('/course_auto','')
-			// path = 'https://userapp.gjh2024.com/apis'//金康键
-			// path = 'https://userapp.moonxiang.com/prod-api'//青岛市德瑞康
+			// path = 'http://a9e258d6.natappfree.cc'//百年康成本地
 			token =uni.getStorageSync(TOKEN_KEYAuto)
 		}
 		return new Promise((resolve, reject) => {

manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx776911549d9b5545",
+        "appid" : "wx2cb27a0b8d154dc9",
         "setting" : {
             "urlCheck" : false,
             "minified" : true

pages.json

@@ -1,19 +1,19 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		// {
+		// 	"path": "pages/index/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "首页"
+		// 	}
+		// },
 		{
 			"path" : "pages/about/index",
 			"style" : 
 			{
-				"navigationBarTitleText" : "企业理念"
+				"navigationBarTitleText" : "工具",
+				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "首页"
-			}
-		},
-		
 		{
 			"path" : "pages/user/index",
 			"style" : 
@@ -39,7 +39,7 @@
 			"path" : "pages/healthTest/healthTest",
 			"style" : 
 			{
-				"navigationBarTitleText" : "测一测"
+				"navigationBarTitleText" : "关于"
 			}
 		},
 		{
@@ -88,6 +88,41 @@
 						"navigationBarTitleText": "新增就诊人",
 						"enablePullDownRefresh": false
 					}
+				},{
+					"path": "voice",
+					"style": {
+						"navigationBarTitleText": "声音采集",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#ffffff",
+						"navigationBarTextStyle": "black",
+						"app-plus": {
+							"bounce": "none" // 页面回弹
+						}
+					}
+				},{
+					"path" : "voiceItem",
+					"style" : 
+					{
+						"navigationBarTitleText" : "声音录制",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor":"#ffffff",
+						"navigationBarTextStyle":"black",
+						"app-plus": {
+							"bounce": "none" // 页面回弹
+						}
+					}
+				},{
+					"path" : "voiceList",
+					"style" : 
+					{
+						"navigationBarTitleText" : "声音录制",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor":"#ffffff",
+						"navigationBarTextStyle":"black",
+						"app-plus": {
+							"bounce": "none" // 页面回弹
+						}
+					}
 				}
 			]
 		},
@@ -292,6 +327,195 @@
 					
 				}
 			]
+		},
+		{
+			"root": "pages_tool",
+			"pages": [
+				
+				{
+					"path": "pages/historyToday/historyToday",
+					"style": {
+						"navigationBarBackgroundColor": "#3677f0",
+						"navigationBarTextStyle": "white",
+						"navigationBarTitleText": "历史今天",
+						"backgroundColor": "#eeeeee",
+						"backgroundTextStyle": "light",
+						"usingComponents": {}
+					}
+				},
+				{
+					"path": "pages/historyToday/details",
+					"style": {
+						"navigationBarBackgroundColor": "#3677f0",
+						"navigationBarTextStyle": "white",
+						"navigationBarTitleText": "详细信息",
+						"backgroundColor": "#eeeeee",
+						"backgroundTextStyle": "light",
+						"usingComponents": {}
+					}
+				},
+				// {
+				// 	"path": "pages/weather/weather",
+				// 	"style": {
+				// 		"navigationBarBackgroundColor": "#fff",
+				// 		"navigationBarTextStyle": "black",
+				// 		"navigationBarTitleText": "天气",
+				// 		"backgroundColor": "#eeeeee",
+				// 		"backgroundTextStyle": "light",
+				// 		"usingComponents": {}
+				// 	}
+				// },
+				{
+					"path": "pages/pinyin/index",
+					"style": {
+						"navigationBarBackgroundColor": "#3677f0",
+						"navigationBarTextStyle": "white",
+						"navigationBarTitleText": "查拼音",
+						"backgroundColor": "#eeeeee",
+						"backgroundTextStyle": "light",
+						"usingComponents": {}
+					}
+				},
+				{
+					"path": "pages/christmasHat/index/index",
+					"style": {
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"navigationBarTitleText": "圣诞帽",
+						"backgroundColor": "#eeeeee",
+						"backgroundTextStyle": "light",
+						"usingComponents": {}
+					}
+				},
+				{
+					"path": "pages/gojuuonn/gojuuonn",
+					"style": {
+						"navigationBarBackgroundColor": "#e4bfb6",
+						"navigationBarTextStyle": "white",
+						"navigationBarTitleText": "五十音图",
+						"backgroundColor": "#eeeeee",
+						"backgroundTextStyle": "light",
+						"usingComponents": {}
+					}
+				},
+				
+				{
+					"path": "pages/figure/figure",
+					"style": {
+						"navigationBarBackgroundColor": "#3677f0",
+						"navigationBarTextStyle": "white",
+						"navigationBarTitleText": "身材计算",
+						"backgroundColor": "#eeeeee",
+						"backgroundTextStyle": "light",
+						"usingComponents": {}
+					}
+				},
+				{
+					"path": "pages/cand/index",
+					"style": {
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"navigationBarTitleText": "程序员黄历",
+						"backgroundColor": "#eeeeee",
+						"backgroundTextStyle": "light",
+						"usingComponents": {}
+					}
+				},
+				{
+					"path": "pages/game/game",
+					"style": {
+						"navigationBarBackgroundColor": "#1e6d04",
+						"navigationBarTextStyle": "white",
+						"navigationBarTitleText": "摇骰子",
+						"backgroundColor": "#eeeeee",
+						"backgroundTextStyle": "light",
+						"usingComponents": {}
+					}
+				},
+				{
+					"path": "pages/support/support",
+					"style": {
+						"navigationBarTitleText": "关于",
+						"navigationBarBackgroundColor": "#FFF",
+						"navigationBarTextStyle": "black",
+						"backgroundColor": "#fff",
+						"backgroundTextStyle": "dark",
+						"usingComponents": {}
+					}
+				},
+				{
+					"path": "pages/christmasHat/combine/combine",
+					"style": {
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"navigationBarTitleText": "圣诞帽",
+						"backgroundColor": "#eeeeee",
+						"backgroundTextStyle": "light",
+						"usingComponents": {}
+					}
+				},
+				{
+					"path": "pages/christmasHat/imageeditor/imageeditor",
+					"style": {
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"navigationBarTitleText": "圣诞帽",
+						"backgroundColor": "#eeeeee",
+						"backgroundTextStyle": "light",
+						"usingComponents": {}
+					}
+				},
+				{
+					"path": "pages/qrcode/index",
+					"style": {
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"navigationBarTitleText": "二维码生成器",
+						"backgroundColor": "#eeeeee",
+						"backgroundTextStyle": "light",
+						"usingComponents": {}
+					}
+				},
+				{
+					"path": "pages/IP/IP",
+					"style": {
+						"navigationBarBackgroundColor": "#3677f0",
+						"navigationBarTextStyle": "white",
+						"navigationBarTitleText": "IP地址查询",
+						"backgroundColor": "#eeeeee",
+						"backgroundTextStyle": "light",
+						"usingComponents": {}
+					}
+				},
+				{
+					"path": "pages/MobileHome/MobileHome",
+					"style": {
+						"navigationBarBackgroundColor": "#3677f0",
+						"navigationBarTextStyle": "white",
+						"navigationBarTitleText": "手机归属地",
+						"backgroundColor": "#eeeeee",
+						"backgroundTextStyle": "light",
+						"usingComponents": {}
+					}
+				},
+				{
+					"path": "pages/codePars/codePars",
+					"style": {
+						"navigationBarBackgroundColor": "#3677f0",
+						"navigationBarTextStyle": "white",
+						"navigationBarTitleText": "标准电码查询",
+						"backgroundColor": "#eeeeee",
+						"backgroundTextStyle": "light",
+						"usingComponents": {}
+					}
+				}
+				//,{
+				// 	"path": "pages/calc/index",
+				// 	"style": {
+				// 		"usingComponents": {}
+				// 	}
+				// }
+			]
 		}
 	],
 	"globalStyle": {
@@ -321,15 +545,15 @@
 			// 	"pagePath": "pages/healthTest/healthTest",
 			// 	"iconPath": "/static/tabbar/inquiry.png",
 			// 	"selectedIconPath": "/static/tabbar/inquiry_select.png",
-			// 	"text": "测一测"
+			// 	"text": "关于"
 			// },
 			{
 				"pagePath": "pages/about/index",
 				"iconPath": "/static/tabbar/health.png",
 				"selectedIconPath": "/static/tabbar/health_sel.png",
-				"text": "企业理念"
-			}
-			,{
+				"text": "工具"
+			},
+			{
 				"pagePath": "pages/user/index",
 				"iconPath": "/static/tabbar/my.png",
 				"selectedIconPath": "/static/tabbar/my_sel.png",

pages/about/index.vue

@@ -1,15 +1,21 @@
 <template>
 	<view class="column scrolly hb">
-		<scroll-view :scroll-y="true" class="hb">
+		<!-- <scroll-view :scroll-y="true" class="hb">
 			<image :src="enterpriseimg"
 			 mode="widthFix" style="width: 100vw; " class="scrolly flex-1"></image>
-		</scroll-view>
+		</scroll-view> -->
+		<tools></tools>
 	</view>
 </template>
 
 <script>
 	import{getenterprise} from '@/api/index.js'
+	import tools from '@/components/tools.vue'
+	// import tools from '@/components/tools1.vue'
 	export default {
+		components: {
+			tools,
+		},
 		data() {
 			return {
 				enterpriseimg:''

pages/healthTest/healthTest.vue

@@ -1,216 +1,59 @@
 <template>
-	<view class="content">
-		<view class="bg">
-			<!-- <image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/8e52ab17eabc4534b3ce56026fd5c624.jpg"></image> -->
+	<view class="column" style="height: 100%;position: relative;">
+		<!-- <view class="top-content ">
+			<view class="status_bar" :style="{height: statusBarHeight+'px'}"></view>
+			<view class="top-title">关于</view>
+		</view> -->
+		<view>
+			<image :src="enterpriseimg" mode="widthFix" class="pb20" style="width: 100%;"></image>
 		</view>
-		<mescroll-body  top="0rpx"  ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
-			<view class="test-list">
-				<view class="item" v-for="(item,index) in dataList" :key="index" @click="showDetail(item)">
-					<view class="left">
-						<view class="title ellipsis2">{{ item.name }}</view>
-						<view class="subtitle ellipsis2">{{ item.title }}</view>
-						<view class="info-box">
-							<view class="people-num"><text class="num">{{item.peopleNum}}W</text>人测过</view>  
-							<view class="time">{{item.num}}题 | {{item.time}}分钟</view>
-						</view>
-					</view>
-					<view class="right">
-						<image :src="item.img" mode="aspectFill"></image>
-					</view>
-				</view>
-			</view>
-		</mescroll-body>
 	</view>
 </template>
 
 <script>
-	import {getTestList,getTestDetails} from '@/api/test.js'
-	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	import{getenterprise} from '@/api/index.js'
 	export default {
-		mixins: [MescrollMixin], 
+		// name:"enterpriseimg",
 		data() {
 			return {
-				mescroll:null,
-				downOption: {   //下拉刷新
-				 	use:true,
-					auto: false // 不自动加载 (mixin已处理第一个tab触发downCallback)
-				},
-				upOption: {
-					onScroll:false,
-					use: true, // 是否启用上拉加载; 默认true
-					page: {
-						pae: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
-						size: 10 // 每页数据的数量,默认10
-					},
-					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
-					textNoMore:"已经到底了",
-					empty: {
-						icon:this.$store.state.imgpath+'/app/commonCourse/null-data.png',
-						tip: '暂无数据'
-					}
-				},
-				dataList: []
+				statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
+				enterpriseimg:'',
 			};
 		},
-		onShow() {
-		 
+		mounted() {
+			console.log(this.$store.state.imgpath)
+			const imgs = []
+			this.getenterprise()
 		},
-		//发送给朋友
-		onShareAppMessage(res) {
-			if(this.$isLogin()){
-				return {
-					title: "健康自测",
-					path: '/pages_index/testList',
-					imageUrl:this.$store.state.imgpath+'/app/image/logoshare.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
-				}
-			}
-			
-		},
-		//分享到朋友圈
-		onShareTimeline(res) {
-			if(this.utils.isLogin()){
-				return {
-					title: "健康自测",
-					imageUrl: this.$store.state.imgpath+'/app/image/logoshare.png'  //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
-				}
-			}
-			
-		},
-		computed: {
-			imgPath() {
-			  return this.$store.state.imgpath
-			},
-		},
-		methods:{
-			  
-			mescrollInit(mescroll) {
-				this.mescroll = mescroll;
-			},
-			/*下拉刷新的回调 */
-			downCallback(mescroll) {
-				mescroll.resetUpScroll()
-			},
-			upCallback(page) {
-				//联网加载数据
-				var that = this;
-				var data = {
-					pageNum: page.num,
-					pageSize: page.size
-				};
-				getTestList(data).then(res => {
-					if(res.code==200){
-						//设置列表数据
-						if (page.num == 1) {
-							that.dataList = res.data.list; 
-							
-						} else {
-							that.dataList = that.dataList.concat(res.data.list);
-							 
-						}
-						that.mescroll.endBySize(res.data.list.length, res.data.total);
-						
-					}else{
-						uni.showToast({
-							icon:'none',
-							title: "请求失败",
-						});
-						that.dataList = null;
-						that.mescroll.endErr();
-					}
-				});
-			},
-			// 查看详情
-			showDetail(item) {
-				uni.navigateTo({
-					url: '/pages_index/testDetails?tempId=' + item.tempId
+		methods: {
+			getenterprise(){
+				getenterprise().then(res=>{
+					this.enterpriseimg=res.data.images
+					console.log(res)
 				})
-			}
+			},
 		}
+		
 	}
 </script>
 
-<style lang="scss">
-	 
-	.content{
-		position: relative;
-		.bg{
-			position: absolute;
-			width: 100%;
-			height: 100%;
-			image{
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-	.test-list{
-		margin-top: 20upx;
-		padding: 0 20upx;
-		.item{
-			width: 100%;
-			box-sizing: border-box;
-			height: 271upx;
-			background: #FFFFFF;
-			border: 2px solid rgba(195,154,88,0.35);
-			box-shadow: -1px 4px 5px 0px rgba(153,102,51,0.25);
-			border-radius: 12px;
-			padding: 40upx 30upx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			margin-bottom: 20upx;
-			.left{
-				flex: 1;
-				padding-right: 40upx;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-				.title{
-					font-size: 40rpx;
-					font-family: PingFang SC;
-					line-height: 48upx;
-					font-weight: bold;
-					color: #814E1B;
-				}
-				.subtitle{
-					color: #814E1B;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					margin: 10rpx 0rpx;
-				}
-				.info-box{
-					width: 100%;
-					display: flex;
-					align-items: center;
-					justify-content: flex-start;
-					.people-num{
-						font-size: 24upx;
-						font-family: PingFang SC;
-						color: #C39A58;
-						.num{
-							font-weight: bold;
-							color: #814E1B;
-						}
-					}
-					.time{
-						margin-left: 25upx;
-						font-size: 24upx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #C39A58;
-					}
-				}
-			}
-			.right{
-				width: 250upx;
-				height: 190upx;
-				border-radius: 8upx;
-				overflow: hidden;
-				image{
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
+<style lang="scss" scoped>
+.top-content {
+	width: 100%;
+	z-index: 10;
+	position: fixed;
+	top: 0;
+	left: 0;
+	background-color: #FFFFFF;
+	.top-title {
+		height: 88rpx;
+		line-height: 88rpx;
+		font-size: 42rpx;
+		font-family: Source Han Sans CN;
+		font-weight: bold;
+		color: #222222;
+		padding-left: 41rpx;
+		background-color: #FFFFFF;
 	}
-</style>
+}
+</style>

pages/index/index.vue

@@ -7,6 +7,7 @@
 				indicator
 				indicatorMode="line"
 				circular
+				height='166'
 				@click="handleAdvClick"
 			></u-swiper>
 		</view>
@@ -102,7 +103,7 @@
 	width: calc(100% - 40rpx);
 	.banner{
 		width: 100%;
-		height: 236upx;
+		height: 300upx;
 		border-radius: 10upx;
 	}
 	.yangshengbox{

pages/user/index.vue

@@ -14,42 +14,118 @@
 			<view class="right">
 			</view>
 		</view>
-		<view class="p20">
-			<view class="used-tools">
-				<view class="title">常用工具</view>
-				<view class="tools-list">
-					<!-- <view class="item no-marin-bottom" @click="openH5('/web/userAgreement')">
-						<u-icon name="order" size="28"></u-icon>
-						<text class="text">用户协议</text>
-					</view>
-					<view class="item no-marin-bottom align-top"  @click="openH5('/web/privacyPolicy')">
-						<u-icon name="lock-open" size="28"></u-icon>
-						<text class="text">隐私保护</text>
-					</view> -->
-					<view class="item no-marin-bottom align-top"  @click="nato('')">
-						<u-icon name="account" size="28"></u-icon>
-						<text class="text">销售管理</text>
+		<view class="p20" style="margin-top: 40rpx" v-if="isOpen">
+		<!-- <view class="p20" style="margin-top: 40rpx"> -->
+			<view class="menu-box" style="margin-top: -40rpx">
+				<view class="title-box">
+					<image class="icon" :src="imgPath + '/app/manergevip/chang.png'"></image>
+					<view class="title">常用功能</view>
+				</view>
+				<view class="line"></view>
+				<view class="menus">
+					<view class="menu-item" @click="navTo()">
+						<image :src="imgPath + '/app/manergevip/chang.png'"></image>
+						<view class="m-name">管理工具</view>
 					</view>
 				</view>
 			</view>
 		</view>
+		<view class="func-box" style="margin-top: 20rpx;">
+			<view class="func-left-box btn-w">
+				<button plain class="btn-ww" openType="share">
+					<image src="/static/images/share.png"></image>
+					<text>我要分享</text>
+				</button>
+			</view>
+			<view class="rightArrow-box">
+				<text></text>
+				<image src="/static/images/rightArrow.png"></image>
+			</view>
+		</view>
+		<view @tap="clearCache" class="func-box">
+			<view class="func-left-box">
+				<image src="/static/images/delete.png"></image>
+				<text>清除缓存</text>
+			</view>
+			<view class="rightArrow-box">
+				<image src="/static/images/rightArrow.png"></image>
+			</view>
+		</view>
+		
+		<view class="func-box bs" data-url="support">
+			<view class="func-left-box">
+				<image src="/static/images/about.png"></image>
+				<text>关于</text>
+			</view>
+			<view class="rightArrow-box">
+				<text>版本号 v{{ version }}</text>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
+	import {queryIsTownOn} from "@/api/class.js";
 	export default {
 		data() {
 			return {
-				avatar:''
+				avatar:'',
+				show:false,
+				title:'提示',
+				content:'确认退出吗？',
+				usertoken:'',
+				version:"1.0",
+				isOpen:false
 			}
 		},
+		computed: {
+		    imgPath() {
+		      return this.$store.state.imgpath
+		    }
+		},
+		mounted() {
+		   this.getCheckAppId();
+		},
+		onLoad() {
+			const accountInfo = wx.getAccountInfoSync();
+			this.version = accountInfo.miniProgram.version ;
+		},
 		methods: {
 			openH5(type){
 				uni.navigateTo({
 					url:"/pages/user/userAgreement?type="+type
 				})
 			},
-			nato(urls){
+			clearCache: function () {
+			    uni.clearStorage();
+			    uni.showToast({
+			        title: '清理成功',
+			        icon: 'none',
+			        duration: 2000
+			    });
+			},
+			getCheckAppId() {
+				console.error('获取AppID', uni.getAccountInfoSync());
+			      try {
+			        const accountInfo = uni.getAccountInfoSync();
+			        if(accountInfo && accountInfo.miniProgram) {
+					   let appId=accountInfo.miniProgram.appId;
+					   this.queryIsTownOn(appId)
+			        }
+			      } catch(e) {
+			          console.error('获取AppID失败', e);
+			      }
+			},
+			queryIsTownOn(appId){
+				queryIsTownOn({"appId":appId}).then(res=>{
+					if(res.date=="001"){
+						this.isOpen=true;
+					}else{
+						this.isOpen=false;
+					}
+				});
+			},
+			navTo(urls){
 				if(!uni.getStorageSync('ManageToken')){
 					uni.navigateTo({
 						url:'/pages_manage/login'
@@ -59,13 +135,66 @@
 						url:'/pages_manage/index'
 					})
 				}
-				
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.menu-box {
+		box-shadow: 0px 0px 5px 2px rgba(0, 0, 0, 0.05);
+		width: 100%;
+		margin-top: 30rpx;
+		padding: 30rpx;
+		background-color: #fff;
+		border-radius: 15rpx;
+		.title-box {
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+			.icon {
+				width: 40rpx;
+				height: 40rpx;
+			}
+			.title {
+				margin-left: 10rpx;
+				font-size: 28rpx;
+				font-family: PingFang SC;
+				color: #111;
+			}
+		}
+		.line {
+			margin-top: 15rpx;
+			height: 0.5rpx;
+			width: 100%;
+			background-color: #efefef;
+		}
+		.menus {
+			margin-top: 30rpx;
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+			flex-wrap: wrap;
+		}
+		.menu-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			width: 25%;
+			margin-bottom: 20rpx;
+			image {
+				width: 60rpx;
+				height: 60rpx;
+			}
+			.m-name {
+				margin-top: 10rpx;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				color: #111;
+			}
+		}
+	}
 .user-info{
 	padding: 40upx 30upx 0 30upx;
 	display: flex;
@@ -182,4 +311,128 @@
 			}
 		}
 	}
+	.func-box {
+		box-sizing: border-box;
+		width: 100%;
+		padding: 30rpx 25rpx;
+		background-color: #fff;
+	}
+	
+	.func-box,
+	.rightArrow-box {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+	
+	.rightArrow-box image {
+		width: 35rpx;
+		height: 35rpx;
+	}
+	
+	.rightArrow-box text {
+		font-size: 26rpx;
+		color: #5f5f5f;
+		margin-right: 10rpx;
+	}
+	
+	.func-left-box {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0rpx;
+		margin: 0rpx;
+		height: 40rpx;
+	}
+	
+	.func-left-box image {
+		width: 35rpx;
+		height: 35rpx;
+	}
+	
+	.func-left-box text {
+		font-size: 30rpx;
+		color: #1b1b1b;
+		margin-left: 20rpx;
+	}
+	
+	.func-left-box button {
+		border: none;
+		background-color: #fff;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 0rpx;
+		margin: 0rpx;
+	}
+	
+	.btn-w {
+		width: 80vw;
+	}
+	
+	.btn-ww {
+		width: 100%;
+		text-align: left;
+		display: flex !important;
+		justify-content: flex-start !important;
+	}
+	
+	.admin {
+		background-color: #fff;
+		box-shadow: 0rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.05);
+	}
+	
+	.welcome {
+		padding: 20rpx 25rpx;
+		font-size: 26rpx;
+		color: #1b1b1b;
+		border-bottom: 1rpx solid #d6eaf7;
+	}
+	
+	.func,
+	.welcome {
+		width: 100%;
+		box-sizing: border-box;
+	}
+	
+	.func {
+		padding: 25rpx;
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+	}
+	
+	.func-item {
+		width: 25%;
+		box-sizing: border-box;
+	}
+	
+	.num {
+		font-size: 40rpx;
+		font-weight: 700;
+		color: #3452e5;
+	}
+	
+	.name,
+	.num {
+		width: 100%;
+		text-align: center;
+	}
+	
+	.name {
+		margin-top: 10rpx;
+		font-size: 26rpx;
+	}
+	
+	.line {
+		width: 100%;
+		height: 20rpx;
+		background-color: #f3f4f6;
+	}
+	
+	.bs {
+		box-shadow: 0rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.05);
+	}
 </style>

pages_course/becomeVIP.vue

@@ -71,7 +71,7 @@
 			</view>
 		</u-popup>
 		<!--#endif-->
-		<view class="footer-tips">重庆云联融智提供技术支持</view>
+		<!-- <view class="footer-tips">重庆云联融智提供技术支持</view> -->
 	</view>
 </template>
 

pages_course/learn.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container">
+	<view class="containers">
 		<view class="top">
 			<image class="bg " style="height: 600rpx;" :src="learncourse.imgUrl" mode="scaleToFill"></image>
 			<view class="top-box">
@@ -144,7 +144,7 @@ import {
 </script>
 
 <style lang="scss" scoped>
-	.container {
+	.containers {
 		padding: 0 0 30rpx;
 		background-color: #f0f4f7;
 

pages_course/reward.vue

@@ -21,6 +21,12 @@
 				sid:''
 			}
 		},
+		onLoad(option) {
+			if(option.packageInfo&&option.mchId){
+				uni.setStorageSync('mchId',option.mchId) 
+				uni.setStorageSync('receive_package',option.packageInfo)
+			}
+		},
 		mounted() {
 			this.sid=wx.getAccountInfoSync().miniProgram.appId
 		},

pages_course/teacherClassroom.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container">
+	<view class="containers">
 		<view class="top">
 			<text class="title">
 			  <text class="title-brown-group">
@@ -104,7 +104,7 @@
 </script>
 
 <style lang="scss" scoped>
-	.container {
+	.containers {
 		background-color: #f6e5db;
 		min-height: 100vh;
 

pages_course/video.vue

@@ -249,7 +249,6 @@
 				<view>阅读并同意<text style="color: #ff5c03;" @click.stop="goWeb(0)">《用户协议》</text>和<text
 						style="color: #ff5c03;" @click.stop="goWeb(1)">《隐私协议》</text></view>
 			</view> -->
-			<!-- <view class="footer-tips">重庆云联融智提供技术支持</view> -->
 		</view>
 		<view v-show="currentTab==2">
 			<view class="chatinput" :style="{bottom:danmuboxHeight>0?danmuboxHeight+'px':'calc(var(--window-bottom) + 24rpx)'}">
@@ -514,10 +513,6 @@
 			if (this.player) {
 				this.player.pause()
 			}
-			// if (this.interval != null) {
-			// 	clearInterval(this.interval)
-			// 	this.interval = null
-			// }
 		},
 		onUnload() {
 			uni.$off('usercode')
@@ -762,11 +757,6 @@
 								this.lineIndex = this.config.defaultLine
 								this.videoUrl = lineList[this.lineIndex]
 								this.poster= res.course && res.course.imgUrl ? res.course.imgUrl : ''
-								// 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
 								this.playDurationSeek = this.playTime
 								setTimeout(()=>{
@@ -775,14 +765,6 @@
 									this.player.play();
 								},500);
 							} else {
-								// let div = document.querySelector(".vjs-progress-control");
-								// if(div) {
-								// 	if (this.isFinish == 1 || this.isEnded || this.videolinkType == 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.playDurationSeek = this.playTime
 								this.player.seek(this.playTime)
@@ -870,8 +852,7 @@
 					res => {
 						if(res){
 							if (this.isAddKf == 1) {
-								// 答题
-								// 您已提交过答案，请领取红包
+								//答题  您已提交过答案，请领取红包
 								this.courseAnswer()
 							} else {
 								// 添加客服
@@ -1045,14 +1026,6 @@
 					this.close()
 					return
 				} else {
-					// let div = document.querySelector(".vjs-progress-control");
-					// if(div) {
-					// 	if (this.isFinish == 1 || this.isEnded || this.videolinkType == 1) {
-					// 		div.style.pointerEvents = "auto";
-					// 	} else {
-					// 		div.style.pointerEvents = "none"; //禁止所有事件
-					// 	}
-					// }
 					this.lineIndex = index
 					this.videoUrl = this.lineList[index]
 					this.tipsOpen = false
@@ -1062,11 +1035,6 @@
 						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()
 				}
 
@@ -1085,7 +1053,6 @@
 				this.qrcode = ''
 				this.qrcodeMsg = ''
 				this.isAddKf = 0
-				// {videoId: this.videoId,qwUserId: this.qwUserId,corpId: this.corpId}
 				getIsAddKf(this.urlOption).then(res => {
 						if (res.code == 200) {
 							this.isAddKf = 1
@@ -1128,7 +1095,6 @@
 			},
 			getFinishCourseVideo() {
 				if (!this.playTime || this.isAddKf!=1 ||!this.isLogin) return
-				// {videoId: this.videoId,duration:this.playTime}
 				const param = {
 					duration: this.playTime,
 					...this.urlOption

pages_course/videovip.vue

@@ -252,7 +252,7 @@
 				<view class="submitname" @click="confimrname" :class="nameuser&&avataruser?'subact':'sub'">确定</view>
 			</view>
 		</u-popup>
-		<view class="footer-tips">重庆云联融智提供技术支持</view>
+		<!-- <view class="footer-tips">重庆云联融智提供技术支持</view> -->
 		<!-- footer -->
 		<view class="footer" v-if="videoId">
 			<view class="btns"  >
@@ -410,6 +410,7 @@
 				appToken:'',
 				kfPopup:false,
 				iskftype:0,
+				iskftypemsg:'',
 				courseLogo: '',
 				isquestion:false,
 				tipsPopup:false,
@@ -1031,7 +1032,7 @@
 									this.getIsAddKf()
 								} else if(this.iskftype==1){
 									uni.showToast({
-										title: '已看过其他销售分享的此课程，不能重复观看',
+										title: this.iskftypemsg,
 										icon: 'none'
 									})
 								}
@@ -1303,6 +1304,7 @@
 						}else if(res.code==504){
 							this.isAddKf = 0
 							this.iskftype=1
+							this.iskftypemsg=res.msg
 							uni.showToast({
 								title: res.msg,
 								icon: 'none'

pages_manage/components/UrgeIndex.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container column hb hidden">
+	<view class="containers column hb hidden">
 		<view class="p20 bgf" style="z-index: 999;">
 			<u-subsection class="subsection" :list="list" :current="current" bgColor="#e7f1fe" activeColor="#1677ff"
 				:fontSize="15" :bold="false" @change="sectionChange"></u-subsection>
@@ -276,7 +276,7 @@
 </script>
 
 <style scoped lang="scss">
-	.container {
+	.containers {
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 400;
 		font-size: 14px;

pages_manage/components/courseIndex.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container">
+	<view class="containers">
 		<view class="headbox">
 			<dropdownPanel :filterData='filterData' @onChange="onChange" @confirm="confirm" @reset="reset"
 			@onClick="selindex">
@@ -99,21 +99,6 @@
 					use: true,
 					auto: false
 				},
-				upOption: {
-					onScroll: false,
-					use: true, // 是否启用上拉加载; 默认true
-					auto: true,
-					page: {
-						pae: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
-						size: 10 // 每页数据的数量,默认10
-					},
-					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
-					textNoMore: "已经到底了",
-					empty: {
-						icon: 'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
-						tip: '暂无数据'
-					}
-				},
 				dataList: [],
 				params: {
 					pageNum: 1,
@@ -162,19 +147,26 @@
 				this.keywordlist=''
 				this.params.pageNum=1
 				this.dataList=[]
-				this.gettodaylist()
+				this.gettodaylist('refresh')
 				this.getFsCourseList('refresh')
 			},
-			gettodaylist(){
+			gettodaylist(type){
 				const data={
 					pageNum:this.params.pageNum,
 					pageSize:this.params.pageSize,
+					keyword:this.keywordlist,
 				}
 				getTodayCourse(data).then(res=>{
 					console.log(res)
 					if(res.code==200){
 						this.viewload=false
-						this.dataList=res.data.list
+						const list=res.data.list
+						// this.dataList=res.data.list
+						if (type == 'refresh') {
+							this.dataList = list
+						} else {
+							this.dataList = [...this.dataList, ...list]
+						}
 						if ( res.data.isLastPage) {
 							this.loadStatus = 'nomore'
 						} else {
@@ -192,7 +184,7 @@
 				this.seltoday=e.value
 				if(e.value==0){
 					this.params.pageNum = 1
-					this.gettodaylist()
+					this.gettodaylist('refresh')
 				}else{
 					this.params.pageNum = 1
 					this.keywordlist=''
@@ -251,7 +243,13 @@
 			searchKeywordlist(value){
 				this.dataList = []
 				this.keywordlist = value
-				this.getListData()
+				this.params.pageNum=1
+				if(this.seltoday==0){
+					this.gettodaylist()
+				}else{
+					this.getListData()
+				}
+				// this.getListData()
 			},
 			pullDownRefreshs() {
 				// 下拉
@@ -372,7 +370,12 @@
 					uni.showNavigationBarLoading()
 					setTimeout(() => {
 						this.params.pageNum += 1;
-						this.getListData('more')
+						if(this.seltoday==0){
+							this.gettodaylist('more')
+						}else{
+							this.getListData('more')
+						}
+						// this.getListData('more')
 						uni.hideNavigationBarLoading()
 					}, 500);
 				}
@@ -387,7 +390,7 @@
 					uni.stopPullDownRefresh()
 					this.params.pageNum = 1;
 					if(this.seltoday==0){
-						this.gettodaylist()
+						this.gettodaylist('refresh')
 					}else{
 						this.getListData('refresh')
 					}
@@ -398,7 +401,7 @@
 </script>
 
 <style lang="scss">
-	.container {
+	.containers {
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 400;
 		font-size: 14px;

pages_manage/components/courseItem.vue

@@ -146,12 +146,12 @@
 </template>
 
 <script>
-	// import {
-	// 	sharecourselink,
-	// 	buildCode,
-	// 	getSDK,
-	// 	updataTime
-	// } from '@/api/courseManage'
+	import {
+		sharecourselink,
+		buildCode,
+		// getSDK,
+		updataTime
+	} from '@/api/manageCompany'
 	export default {
 		props: {
 			activeTab: {
@@ -247,6 +247,7 @@
 					endDateTime: this.info.endDateTime.substring(0, 10) + ' ' + this.endTimevalue + ":59"
 				}
 				updataTime([data]).then(res => {
+					// console.log([data])
 					if (res.code == 200) {
 						uni.showToast({
 							title: '完成看课时间调整!',

pages_manage/components/dataIndex.vue

@@ -621,7 +621,7 @@
 		white-space: nowrap;
 	}
 
-	.container {
+	.containers {
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 400;
 		font-size: 14px;

pages_manage/components/manageIndex.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="content container">
+	<view class="content containers" style="height: 100%;">
 		<view class="bg" v-if="!viewload"></view>
 		<view class="cont-box" v-if="!viewload">
 			<view class="user-cont" @click="navTo('/pages_managedata/userInfo')">
@@ -42,7 +42,7 @@
 				<view class="fs24">红包剩余金额</view>
 				<view class="fs40 bold">{{balance.toFixed(2)}}</view>
 			</view>
-			<view class="menu-box" style="margin-top: -20rpx;">
+			<view class="menu-box" >
 				<view class="title-box">
 					<image class="icon" :src="imgPath+'/app/manergevip/chang.png'"></image>
 					<view class="title">常用功能</view>
@@ -74,6 +74,16 @@
 				</view>
 				<view class="line"></view>
 				<view class="menus">
+					<view class="menu-item" @click="navTo('/pages_index/voice')">
+						<!-- <image :src="imgPath+'/app/manergevip/about.png'"></image> -->
+						<u-icon name="mic"  size="28"></u-icon>
+						<view class="m-name">声音录制</view>
+					</view>
+					<view class="menu-item" @click="navTo('/pages_index/voiceList')">
+						<!-- <image :src="imgPath+'/app/manergevip/about.png'"></image> -->
+						<u-icon name="mic"  size="28"></u-icon>
+						<view class="m-name">声音采集</view>
+					</view>
 					<view class="menu-item" @click="navTo('/pages_managedata/about')">
 						<image :src="imgPath+'/app/manergevip/about.png'"></image>
 						<view class="m-name">关于我们</view>
@@ -224,7 +234,7 @@
 				const Path = fullUrl.split('/#')[0] || '';
 				setTimeout(() => {
 					uni.setClipboardData({
-						data: Path + '/#/pages_course/course/becomeSale?id=' + this.user.companyId+this.user.userId,
+						data: Path + '/#/pages_course/course/becomeSale?id=' + this.user.companyId+'&companyUserId='+this.user.userId,
 						success: () => {
 							uni.showToast({
 								title: '邀请链接已复制',
@@ -459,7 +469,7 @@
 		opacity: 0;
 	}
 
-	.container {
+	.containers {
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 400;
 		font-size: 14px;
@@ -509,9 +519,8 @@
 
 	.content {
 		position: relative;
-		height: 100%;
+		height: 100vh;
 		width: 100%;
-
 		.bg {
 			width: 100%;
 			height: 550upx;
@@ -528,10 +537,11 @@
 			position: relative;
 			z-index: 2;
 			padding: 30rpx 30rpx 200rpx;
+			padding-bottom:400rpx;
 
 			.user-cont {
 				// box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.05);
-				padding: 30rpx;
+				// padding: 30rpx;
 				// background-color: #fff;
 				border-radius: 15rpx;
 
@@ -610,7 +620,7 @@
 
 			.menu-box {
 				box-shadow: 0px 0px 5px 2px rgba(0, 0, 0, 0.05);
-				width: 100%;
+				// width: 100%;
 				margin-top: 30rpx;
 				padding: 30rpx;
 				background-color: #fff;

pages_manage/components/memberIndex.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container column hb flex-1 hidden">
+	<view class="containers column hb flex-1 hidden">
 		<view class="headbox">
 			<view style="padding: 10px 10px 0 10px;" class="mb20">
 				<view>
@@ -255,11 +255,17 @@
 										<image :src="imgPath+'/app/images/card_icon.png'" mode="aspectFill"
 											style="width: 80rpx; height: 80rpx;margin-top: 20rpx;">
 										</image>
-										<view style="font-weight: bold;margin-bottom: 4px;">生成卡片</view>
-										<view style="font-size: 12px;color: #888;">指导分享轻松转发</view>
+										<view style="font-weight: bold;margin-bottom: 4px;" 
+										v-if="imgname=='医建宝'">生成卡片</view>
+										<view style="font-size: 12px;color: #888;" 
+										v-if="imgname=='医建宝'">指导分享轻松转发</view>
 										<!-- #ifdef MP-WEIXIN -->
-										<button open-type="share" class="share">分享卡片</button>
+										<button open-type="share" class="share" v-if="imgname=='医建宝'">分享卡片</button>
 										<!-- #endif -->
+										<!-- <view class='u-border radius100 plr20 ptb10' @click="copyPageLink"
+										v-if="imgname!=='医建宝'">复制页面地址</view> -->
+										<!-- <view class='u-border radius100 plr20 ptb10' @click="copyPageLink"
+										>复制页面地址</view> -->
 									</view>
 									<!--#ifdef H5-->
 									<view class="sharePop-item y-f " @click="buildimg" style="text-align: center;">
@@ -339,7 +345,9 @@
 		getusersales,
 		removebalcklist,
 		getallTags,
-		getprojectlist
+		getprojectlist,
+		copyuniLink,
+		getlinkCode
 	} from "@/api/manageCompany.js";
 	import vipUserItem from "../components/vipUserItem.vue"
 	import dropdownPanel from "../components/dropdownPanel.vue"
@@ -560,7 +568,8 @@
 				vipInviteshow: false,
 				projectbox:false,
 				projectList:{},
-				projectId:''
+				projectId:'',
+				projectCode:''
 			}
 		},
 		// onLoad() {
@@ -600,9 +609,74 @@
 			},
 			imgPath() {
 				return this.$store.state.imgpath
-			}
+			},
+			imgname() {
+				return this.$store.state.logoname
+			},
 		},
 		methods: {
+			getlinkCodes(){
+				getlinkCode().then(res=>{
+					if(res.code){
+						this.projectCode=res.code
+						console.log(this.projectCode)
+						setTimeout(()=>{
+							this.setlnk()
+						},100)
+					}
+				})
+			},
+			setlnk(){
+				let params={
+					companyId: this.user.companyId,
+					companyUserId: this.user.userId,
+					tagids: this.sharetaglist,
+					projectCode: this.projectCode,
+					projectId: this.projectId,
+				}
+				const pages = '/pages_course/becomeVIP?becomeVip='+JSON.stringify(params)
+				console.log(pages)
+				const data={
+					// appid:'wx503cf8ab31f83dd4',
+					appid:this.appid,//医健宝
+					linkStr:pages
+				}
+				copyuniLink(data).then(res=>{
+					if(res.code==200){
+						uni.hideLoading();
+						setTimeout(() => {
+							uni.setClipboardData({
+								data:res.data,
+								success: () => {
+									uni.showToast({
+										title: '链接已复制',
+										icon: 'none',
+										duration: 2000
+									});
+								},
+								fail: () => {
+									uni.showToast({
+										title: '复制失败',
+										icon: 'none'
+									});
+								}
+							});
+						}, 200)
+					}else{
+						uni.hideLoading();
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+					}
+				})
+			},
+			copyPageLink(){
+				uni.showLoading({
+					title: "处理中..."
+				});
+				this.getlinkCodes()
+			},
 			submitPro() {
 				if (this.projectId == '') {
 					uni.showToast({
@@ -1662,7 +1736,7 @@
 		}
 	}
 
-	.container {
+	.containers {
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 400;
 		font-size: 14px;

pages_manage/dataDetails.vue

@@ -3,19 +3,20 @@
 		<view>
 			<dropdownPanel :filterData='filterData' @onChange="onChange" @confirm="confirm" @reset="reset">
 				<view class="column flex-1 hb hidden">
-					<view v-if="searchbarNav == 0">
+					<view v-if="searchbarNav == 0" class="p20 fs28 column flex-1 hidden">
 						<scroll-view scroll-y="true" class="hb" :refresher-enabled="isEnableds"
 							:refresher-triggered="triggereds" refresher-background="rgba(0,0,0,0)"
 							@refresherrefresh="pullDownRefreshs" @refresherrestore="triggereds = false"
 							:upper-threshold="100" :lower-threshold="100" @refresherabort="triggereds = false"
 							@scrolltolower="reachBottoms">
-							<view class="p20 fs28 column flex-1 scrolly">
+							<!-- <view class="p20 fs28 column flex-1 scrolly"> -->
 								<view v-for="(items,index) in courseOne" :key="items" :class="courseid==items.periodId?'actNav':''" 
 									 class="m10 p10 center" style="border-bottom: 2rpx solid #eee;" @click="getCourseOne(items.periodId)">
 										{{items.periodName}}
 								</view>
-							</view>
+							<!-- </view> -->
 							<u-loadmore :status="statusA" />
+							<view class="ptb40"></view>
 						</scroll-view>
 					</view>
 					<view v-else class="p20 fs28 column flex-1 hidden">
@@ -153,13 +154,7 @@
 							</view>
 						</view>
 					</u-collapse-item>
-					<!-- #ifdef MP-WEIXIN -->
-					<u-collapse-item name="funnel" title="转化漏斗图" v-if="!ratelistState">
-					<!-- #endif -->
-						<!-- #ifndef MP-WEIXIN -->
-						<u-collapse-item name="funnel" v-if="!ratelistState">
-							<text slot="title" class="bold fs32">转化漏斗图</text>
-							<!-- #endif -->
+					<!-- <u-collapse-item name="funnel" title="转化漏斗图" v-if="!ratelistState">
 						<text slot="value" class="base-color fs24">{{collapseValue.includes('funnel')?'收回':'展开'}}</text>
 						<view slot="right-icon">
 							<u-icon name="arrow-right" color="#1677ff" size="12"></u-icon>
@@ -168,7 +163,7 @@
 							<funnelChart :getratelist="getrateimg" />
 						</view>
 						<view v-show="ratelistState" class="center">暂无数据</view>
-					</u-collapse-item>
+					</u-collapse-item> -->
 					<!-- #ifdef MP-WEIXIN -->
 					<u-collapse-item name="rank" title="排行榜">
 					<!-- #endif -->
@@ -493,7 +488,7 @@
 				this.courseids = id
 			},
 			getCourseList(type) {
-				this.courseOne=[]
+				// this.courseOne=[]
 				const param = {
 					pageNum: this.pageNums,
 					pageSize: this.pageSizes,

pages_manage/index.vue

@@ -17,12 +17,11 @@
 					<!--#ifdef MP-WEIXIN-->
 					<view class="sharePop-item y-f card-share">
 						<image :src="imgPath+'/app/images/card_icon.png'"
-							mode="aspectFill" style="width: 80rpx; height: 80rpx;margin-top: 20rpx;"></image>
-						<view style="font-weight: bold;margin-bottom: 4px;">生成卡片</view>
-						<view style="font-size: 12px;color: #888;">指导分享轻松转发</view>
-						<button open-type="share" class="share">分享课程</button>
-						<view  @click="copy" v-if="imgname!='乐氏本源'"
-						class="base-color-6 u-border ptb10 plr30 radius50 mt20">复制页面地址</view>
+							mode="aspectFill" style="width: 80rpx; height: 80rpx;margin-top: 20rpx;" ></image>
+						<view style="font-weight: bold;margin-bottom: 4px;" v-if="imgname=='医建宝'">生成卡片</view>
+						<view style="font-size: 12px;color: #888;" v-if="imgname=='医建宝'">指导分享轻松转发</view>
+						<button open-type="share" class="share" v-if="imgname=='医建宝'">分享课程</button>
+						<view  @click="copy" class="base-color-6 u-border ptb10 plr30 radius50 mt20">复制页面地址</view>
 					</view>
 					<!--#endif-->
 				</view>
@@ -37,7 +36,7 @@
 	import memberIndex from './components/memberIndex.vue'
 	import UrgeIndex from './components/UrgeIndex.vue'
 	import manageIndex from './components/manageIndex.vue'
-	import {copyuniLink} from "@/api/manageCompany.js"
+	import {copyuniLink,getlinkCode} from "@/api/manageCompany.js"
 	export default{
 		components:{
 			dataIndex,
@@ -53,6 +52,7 @@
 				childdata:[],
 				vipPages:'',
 				salsepages:'',
+				projectCode:'',
 				// appid:this.$store.state.appid
 				listtab:[
 					{
@@ -95,7 +95,10 @@
 			},
 		    imgPath() {
 		      return this.$store.state.imgpath
-		    }
+		    },
+			imgname() {
+			  return this.$store.state.logoname
+			}
 		},
 		onShareAppMessage() {
 			if(this.tabact==1){
@@ -136,9 +139,15 @@
 				uni.showLoading({
 					title: "处理中..."
 				});
+				this.getlinkCodes()
+			},
+			setlnk(){
+				const path ='/pages_course/videovip'//医健宝
+				// const path ='/pages_course/courseCover'
 				const data={
-					appid:this.appid,
-					linkStr:this.childdata.path + "?course=" + JSON.stringify(this.childdata.params)
+					// appid:'wx503cf8ab31f83dd4',
+					appid:this.appid,//医健宝
+					linkStr:path + "?course=" + JSON.stringify(this.childdata.params)
 				}
 				copyuniLink(data).then(res=>{
 					if(res.code==200){
@@ -146,7 +155,7 @@
 						setTimeout(() => {
 							uni.setClipboardData({
 								data:res.data,
-								// data:  this.childdata.path + "?course=" + JSON.stringify(this.childdata.params),
+								// data:path + "?course=" + JSON.stringify(this.childdata.params),
 								success: () => {
 									uni.showToast({
 										title: '链接已复制',
@@ -170,7 +179,16 @@
 						});
 					}
 				})
-				
+			},
+			getlinkCodes(){
+				getlinkCode().then(res=>{
+					if(res.code){
+						this.childdata.params.projectCode=res.code
+						this.projectCode=res.data
+						this.setlnk()
+						console.log(this.childdata.params)
+					}
+				})
 			},
 			chlidpages(e){
 				this.vipPages=e
@@ -218,6 +236,7 @@
 		justify-content: space-around;
 		padding-bottom: 40rpx ;
 		padding-top: 20rpx;
+		z-index: 999;
 	}
 	.card-share{
 		position: relative;
@@ -238,10 +257,8 @@
 		/* #ifdef MP-WEIXIN */
 		/* #endif */
 	
-		/* #ifdef H5 */
-		padding-bottom: 60px;
+		padding-bottom: 50px;
 	
-		/* #endif */
 		&-item {
 			padding: 0 10px;
 			box-sizing: border-box;

pages_manage/login.vue

@@ -28,7 +28,7 @@
 				</view>
 			 </view>
 		 </view>
-		 <view class="footer-tips">重庆云联融智提供技术支持</view>
+		 <!-- <view class="footer-tips">重庆云联融智提供技术支持</view> -->
 	</view>
 </template>
 

pages_manage/statistic.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container">
+	<view class="containers">
 		<image class="topbg" :src="info.thumbnail" mode="aspectFill"></image>
 		<view class="container-body">
 			<view class="coursebox">
@@ -360,7 +360,8 @@
 			getrateList(){
 				//获取漏斗图
 				const params={
-					videoId:this.info.courseId,
+					videoId:this.info.courseId,	
+					periodId:this.info.periodId
 				}
 				getcourseRates(params).then(res=>{
 					if(res.code==200){
@@ -479,7 +480,8 @@
 					type: this.list2[this.currentType].value, // 0:答题正确 1:未完播 2:已完播 3:未播放
 					pageNum: page.num,
 					pageSize: page.size,
-					keyword:this.keyword
+					keyword:this.keyword,
+					periodId:this.info.periodId
 				};
 				uni.showLoading({
 					title: "加载中..."
@@ -604,7 +606,7 @@
 		text-align: center;
 		line-height: 80rpx;
 	}
-	.container {
+	.containers {
 		position: relative;
 		z-index: 2;
 		font-family: PingFang SC, PingFang SC;

store/index.js

@@ -10,31 +10,27 @@ import {
 export default new Vuex.Store({
 	state: {
 		webviewUrl: '',
-		wsDanmuUrl: 'wss://userappkyt.ylrzcloud.com', // 弹幕评论接口地址
+		wsDanmuUrl: 'wss://userapp.zkhj6.com', // 弹幕评论接口地址
 		//红包领取规则:
 		answerType: 1, //红包领取规则 0：完课且最后一分钟（第二次无需最后一分钟）， 1:按完课百分比答题领红包
 		isSpare:1, // 0，主要小程序，1：备选
-		uploadFile: 'https://userappkyt.ylrzcloud.com',
+		uploadFile: 'https://userapp.zkhj6.com',
 		// imgpath: 'https://hylj-1323137866.cos.ap-chongqing.myqcloud.com',//云联融智图片请求地址
 		// logoname:'云联融智优选',
 		// appid:'wxd70f99287830cb51',
-		// imgpath: 'https://fbylive.obs.cn-southwest-2.myhuaweicloud.com',//福本源图片请求地址
-		// logoname:'乐氏本源',
-		// appid:'wxb9b453d37c5fad45',
 		// imgpath: 'https://zkzh-2025.oss-cn-beijing.aliyuncs.com',//中康未来智慧药房图片请求地址
 		// //https://zkzh-2025.oss-cn-beijing.aliyuncs.com/shop  中康商城图片链接
 		// logoname:'中康未来智慧',
-		// appid:'wxedde588767b358b1',//中康未来智慧药房
-		// imgpath: 'https://zkzh-2025.oss-cn-beijing.aliyuncs.com',//新中康图片请求地址
-		// logoname:'中康未来智慧店',
-		// // appid:'wxd8a19174bfd936fe',//洪恬百货店
-		// appid:'wx83024d042825b5d4',
-		// imgpath: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com',//医健宝图片请求地址
-		// logoname:'医建宝',
-		// appid:'wx9e61312fe7ac85c4',//福康瑞祥广告传媒
-		// appid:'wxb20b7f91a35859e5',//欣能开发
-		// appid:'wx2df3bca30e7dba75',//欣能用品
-		// appid:'wx664a3b14808e010b',//上雅工具
+		// appid:'wx57c60ac633b47bb0',//中康未来智慧炮灰
+		imgpath: 'https://bjyjb-1362704775.cos.ap-chongqing.myqcloud.com',//医健宝图片请求地址
+		logoname:'医建宝',
+		appid:'wx2cb27a0b8d154dc9',
+		// imgpath: 'https://cdhyt-1323137866.cos.ap-chongqing.myqcloud.com',//鹤颜堂图片请求地址
+		// logoname:'鹤颜堂',
+		// appid:'wx0447a16ef6199f03',
+		// imgpath: 'https://sft-1361917636.cos.ap-chongqing.myqcloud.com',//四福堂图片请求地址
+		// logoname:'四福堂',
+		// appid:'wxb3841ced43815810',
 		// imgpath: 'https://whhm-1361716159.cos.ap-chongqing.myqcloud.com',//惠名大药房图片请求地址
 		// logoname:'惠名大药房',
 		// appid:'wxc9553ad82d0d61b8'//h5,
@@ -46,27 +42,41 @@ export default new Vuex.Store({
 		// appid:'wx301ab2fad04c658a',
 		// imgpath: 'https://bnkc-1323137866.cos.ap-chongqing.myqcloud.com',//百年康城图片请求地址
 		// logoname:'百年康成',
-		// appid:'wx65e5d520e35bf3f5'//,
+		// appid:'wx36b87a0820734de8'//,
 		// imgpath: 'https://drk-1363981074.cos.ap-chongqing.myqcloud.com',//德瑞康图片请求地址
 		// logoname:'青岛市德瑞康',
 		// appid:'wx29d26f63f836be7f',
 		// imgpath: 'https://bjczwh.oss-cn-beijing.aliyuncs.com',//北京存在文化
 		// logoname:'食养生活',
 		// appid:'wx94951f52d3ac5e25',
-		imgpath: 'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com', //宽益堂
-		logoname: '宽益堂',
-		appid: 'wx776911549d9b5545',
-		// appid:'wx0fee9948ae1f0cb1', // 涵翡阅读社
-		// appid:'wxe71231197bc54634', // 伴慧阅读社
-		// appid:'wxf9d43e667e4a80e3', // 梦婵阅读社
-		// appid:'wxb37b9255f770fd9a', // 雪菲阅读社
-		// appid:'wx2e637d61b84080c0', // 芮矜阅读社
+		// imgpath: 'https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com', //宽益堂
+		// logoname: '宽益堂',
+		// appid: 'wxd8d7a47f158f9e77',
 		// imgpath: 'https://hcl-1b2b.obs.cn-south-1.myhuaweicloud.com',//恒春来
 		// logoname:'恒春来',
 		// appid:'', //空入尚服装铺
-		// imgpath: 'https://qdtst-1360717104.cos.ap-nanjing.myqcloud.com', //四季智慧理养
-		// logoname: '四季智慧理养',
-		// appid: 'wx4c7d16230312168f',
+		// imgpath: 'https://obs.yixingjian.top',//宏医堂
+		// logoname:'宏医堂工具',
+		// appid:'wx61494812051353e1',
+		// imgpath: 'https://jnlzjk-1323137866.cos.ap-chongqing.myqcloud.com',//济南联志健康
+		// logoname:'济南联志健康',
+		// appid:'wx7475907b6c94cf35',
+		// imgpath: 'https://hat-1323137866.cos.ap-chongqing.myqcloud.com',//恒安图
+		// logoname:'恒安图',
+		// appid:'wx5b0e5a71c77b08b1',
+		// imgpath: 'https://ddgy-1323137866.cos.ap-chongqing.myqcloud.com',//叮当国医
+		// logoname:'叮当国医',
+		// appid:'wxd6187d7eb382af09',
+		// imgpath: 'https://bjczwh.oss-cn-beijing.aliyuncs.com',//北京存在文化
+		// logoname:'食养生活',
+		// appid:'wxf1329423778b0cff',//家常食养记
+		// imgpath: 'https://czt-1323137866.cos.ap-chongqing.myqcloud.com',//纯正堂商城图片请求地址
+		// // https://czt-1323137866.cos.ap-chongqing.myqcloud.com/shop  纯正堂商城图片链接
+		// logoname:'纯正堂',
+		// appid:'wx6688e6b9b6fb8700',//纯正堂
+		// imgpath: 'https://fs-1382281328.cos.ap-guangzhou.myqcloud.com',//顺亿京图片请求地址
+		// logoname:'顺亿京',
+		// appid:'wx2fee9f83e200140f',//顺亿京
 	},
 	mutations: {
 		setCount(state, value) {

unpackage/dist/dev/.sourcemap/mp-weixin/pages/course.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":"uIAAA,MAGA,aACA,YAFAA,EAAGC,kCAAoCC,EAGvCC,EAAWC,a","file":"pages/course.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/course.vue'\ncreatePage(Page)"],"sourceRoot":""}

unpackage/dist/dev/mp-weixin/app.json

@@ -1,7 +1,6 @@
 {
   "pages": [
     "pages/about/index",
-    "pages/index/index",
     "pages/user/index",
     "pages/user/userAgreement",
     "pages/course/videovip",
@@ -16,7 +15,10 @@
         "test",
         "patient",
         "addEditPatient",
-        "testResult"
+        "testResult",
+        "voice",
+        "voiceItem",
+        "voiceList"
       ]
     },
     {
@@ -59,6 +61,26 @@
         "teacherClassroom",
         "feedback"
       ]
+    },
+    {
+      "root": "pages_tool",
+      "pages": [
+        "pages/historyToday/historyToday",
+        "pages/historyToday/details",
+        "pages/pinyin/index",
+        "pages/christmasHat/index/index",
+        "pages/gojuuonn/gojuuonn",
+        "pages/figure/figure",
+        "pages/cand/index",
+        "pages/game/game",
+        "pages/support/support",
+        "pages/christmasHat/combine/combine",
+        "pages/christmasHat/imageeditor/imageeditor",
+        "pages/qrcode/index",
+        "pages/IP/IP",
+        "pages/MobileHome/MobileHome",
+        "pages/codePars/codePars"
+      ]
     }
   ],
   "window": {
@@ -81,7 +103,7 @@
         "pagePath": "pages/about/index",
         "iconPath": "/static/tabbar/health.png",
         "selectedIconPath": "/static/tabbar/health_sel.png",
-        "text": "企业理念"
+        "text": "工具"
       },
       {
         "pagePath": "pages/user/index",

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -1,8 +1,153 @@
+.container {
+    padding: 200rpx 0;
+}
+.cHcontainer,
+.container {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: space-between;
+    box-sizing: border-box;
+}
+.fs20 {
+    font-size: 20rpx;
+}
+.fs22 {
+    font-size: 22rpx;
+}
+.fs24 {
+    font-size: 24rpx;
+}
+.fs26 {
+    font-size: 26rpx;
+}
+.fs28 {
+    font-size: 28rpx;
+}
+.fs30 {
+    font-size: 30rpx;
+}
+.fs32 {
+    font-size: 32rpx;
+}
+.fs34 {
+    font-size: 34rpx;
+}
+.fs36 {
+    font-size: 36rpx;
+}
+.fc99 {
+    color: #999;
+}
+.fcff {
+    color: #fff;
+}
+.fc3d {
+    color: #3d3d3d;
+}
+.fc52 {
+    color: #525252;
+}
+.pages-box {
+    padding: 30rpx;
+    background-color: #fff;
+    border-radius: 10rpx;
+    box-shadow: 0rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.05);
+}
+.inp-box,
+.pages-box {
+    box-sizing: border-box;
+}
+.inp-box {
+    padding-top: 30rpx;
+    position: relative;
+}
+.inp {
+    border: 3rpx solid #3677f0;
+    height: 80rpx;
+    border-radius: 10rpx;
+    line-height: 80rpx;
+    box-sizing: border-box;
+    padding-left: 130rpx;
+}
+.inpimg {
+    width: 120rpx;
+    height: 74rpx;
+    background-color: #f1f2f6;
+    border-top-left-radius: 10rpx;
+    border-bottom-left-radius: 10rpx;
+    position: absolute;
+    top: 33rpx;
+    left: 3rpx;
+}
+.pagesimg {
+    width: 40rpx;
+    height: 40rpx;
+    margin-top: 17rpx;
+    margin-left: 38rpx;
+}
+.btn-box {
+    margin-top: 30rpx;
+    margin-bottom: 30rpx;
+}
+.btn,
+.btn-box {
+    text-align: center;
+}
+.btn {
+    width: 200rpx;
+    background-color: #3677f0;
+    color: #fff;
+}
+.det-box {
+    margin-top: 20rpx;
+    box-sizing: border-box;
+    padding: 0rpx 30rpx;
+    background-color: #fff;
+    border-radius: 10rpx;
+    box-shadow: 0rpx 2rpx 4rpx 0rpx rgba(0, 0, 0, 0.05);
+}
+.pg-t,
+.pglist {
+    padding: 20rpx 0rpx;
+    border-bottom: 1rpx solid #f0f0f0;
+}
+.pglist {
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+}
+.pg-l {
+    width: 30%;
+}
+.pg-l,
+.pg-r {
+    display: inline-block;
+}
+.pg-r {
+    width: 70%;
+}
+.dp-n {
+    display: none;
+}
+.clear {
+    clear: both;
+}
+.dp-ib {
+    display: inline-block;
+}
+.ta-c {
+    text-align: center;
+}
+.bd-n {
+    border: none;
+}
 page {
   background: #f5f5f5;
   height: 100%;
 }
-.container {
+.containers {
   height: 100%;
 }
 rich-text {
@@ -14,6 +159,7 @@ rich-text image {
   display: block;
   width: 100%;
 }
+
 /*单行文本溢出省略号*/
 .one-t {
   overflow: hidden;
@@ -21,6 +167,7 @@ rich-text image {
   text-overflow: ellipsis;
   transition: all linear 0.2s;
 }
+
 /*多行文本溢出省略号*/
 .more-t {
   overflow: hidden;
@@ -30,54 +177,64 @@ rich-text image {
   -webkit-box-orient: vertical;
   transition: all linear 0.2s;
 }
+
 /* ==================
           flex布局(colorui里面也有相关基础样式)
  ==================== */
+
 /* x水平排列*/
 .x-f {
   display: flex;
   align-items: center;
 }
+
 /*x两端且水平居中*/
 .x-bc {
   display: flex;
   justify-content: space-between;
   align-items: center;
 }
+
 /*x平分且水平居中*/
 .x-ac {
   display: flex;
   justify-content: space-around;
   align-items: center;
 }
+
 /*x水平靠上对齐*/
 .x-start {
   display: flex;
   align-items: flex-start;
 }
+
 /*x水平靠下对齐*/
 .x-end {
   display: flex;
   align-items: flex-end;
 }
+
 /*上下左右居中*/
 .x-c {
   display: flex;
   justify-content: center;
   align-items: center;
 }
+
 /*y竖直靠左*/
 .y-start {
   display: flex;
   flex-direction: column;
   align-items: flex-start;
 }
+
 /*y竖直靠右*/
 .y-end {
   display: flex;
   flex-direction: column;
   align-items: flex-end;
 }
+
 /*y竖直居中*/
 .y-f {
   display: flex;
@@ -89,6 +246,7 @@ rich-text image {
   flex-direction: column;
   justify-content: space-between;
 }
+
 /*y竖直两端居中*/
 .y-bc {
   display: flex;
@@ -96,6 +254,7 @@ rich-text image {
   align-items: center;
   justify-content: space-between;
 }
+
 /* layout */
 .acea-row {
   display: flex;
@@ -137,16 +296,19 @@ rich-text image {
   flex-direction: column;
   justify-content: space-between;
 }
+
 /* 上下左右垂直居中 */
 .acea-row.row-center-wrapper {
   align-items: center;
   justify-content: center;
 }
+
 /* 上下两边居中对齐 */
 .acea-row.row-between-wrapper {
   align-items: center;
   justify-content: space-between;
 }
+
 /*每个页面公共css */
 .ellipsis {
   overflow: hidden;
@@ -165,11 +327,13 @@ radio .wx-radio-input {
   height: 36rpx;
   border: 1px solid #CCCCCC;
 }
+
 /* 选中后的 背景样式  */
 radio .wx-radio-input.wx-radio-input-checked {
   background: linear-gradient(135deg, #66b2ef 0%, #2BC7B9 100%);
   border: 1px solid #2BC7B9;
 }
+
 /* 选中后的 对勾样式 （白色对勾） */
 radio .wx-radio-input.wx-radio-input-checked::before {
   color: #ffffff;
@@ -193,6 +357,7 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
   height: 0;
   color: transparent;
 }
+
 /* 暂无数据 */
 .no-data-box {
   padding: 100rpx 50rpx;
@@ -218,6 +383,7 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
   height: 32rpx;
   line-height: 32rpx;
 }
+
 /*加载动画*/
 @-webkit-keyframes load {
 from {

unpackage/dist/dev/mp-weixin/pages/about/index.json

@@ -1,4 +1,7 @@
 {
-  "navigationBarTitleText": "企业理念",
-  "usingComponents": {}
+  "navigationBarTitleText": "工具",
+  "navigationStyle": "custom",
+  "usingComponents": {
+    "tools": "/components/tools"
+  }
 }

unpackage/dist/dev/mp-weixin/pages/about/index.wxml

@@ -1 +1 @@
-<view class="column scrolly hb"><scroll-view class="hb" scroll-y="{{true}}"><image class="scrolly flex-1" style="width:100vw;" src="{{enterpriseimg}}" mode="widthFix"></image></scroll-view></view>
+<view class="column scrolly hb"><tools vue-id="17a41c02-1" bind:__l="__l"></tools></view>

unpackage/dist/dev/mp-weixin/pages/healthTest/healthTest.json

@@ -1,6 +1,4 @@
 {
-  "navigationBarTitleText": "测一测",
-  "usingComponents": {
-    "mescroll-body": "/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body"
-  }
+  "navigationBarTitleText": "关于",
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/healthTest/healthTest.wxml

@@ -1 +1 @@
-<view class="content"><view class="bg"></view><mescroll-body class="vue-ref" vue-id="6f20d180-1" top="0rpx" down="{{downOption}}" up="{{upOption}}" data-ref="mescrollRef" data-event-opts="{{[['^init',[['mescrollInit']]],['^down',[['downCallback']]],['^up',[['upCallback']]]]}}" bind:init="__e" bind:down="__e" bind:up="__e" bind:__l="__l" vue-slots="{{['default']}}"><view class="test-list"><block wx:for="{{dataList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['showDetail',['$0'],[[['dataList','',index]]]]]]]}}" class="item" bindtap="__e"><view class="left"><view class="title ellipsis2">{{item.name}}</view><view class="subtitle ellipsis2">{{item.title}}</view><view class="info-box"><view class="people-num"><text class="num">{{item.peopleNum+"W"}}</text>人测过</view><view class="time">{{item.num+"题 | "+item.time+"分钟"}}</view></view></view><view class="right"><image src="{{item.img}}" mode="aspectFill"></image></view></view></block></view></mescroll-body></view>
+<view class="column data-v-eacf8af4" style="height:100%;position:relative;"><view class="data-v-eacf8af4"><image class="pb20 data-v-eacf8af4" style="width:100%;" src="{{enterpriseimg}}" mode="widthFix"></image></view></view>