Merge commit 'c969a4647fe3cc2c08adf577e2033a1da1c45300'

sleep/api/device_member_bind.js

@@ -11,3 +11,21 @@ export function getDeviceByDtypeAndMemberId(params){
         params
     })
 }
+
+// 根据设备类型绑定的设备
+export function bindDeviceByDtype(params){
+    return request({
+        url: `care/care_device_member_bind/bind_device_by_dtype`,
+        config: {method: Method.POST, needToken: true, loading: false},
+        params
+    })
+}
+
+// 解除绑定睡眠床垫
+export function delSleepMattress(params){
+    return request({
+        url: `care/care_device_member_bind/del_sleep_mattress`,
+        config: {method: Method.POST, needToken: true, loading: false},
+        params
+    })
+}

sleep/api/doctor_advert.js

@@ -0,0 +1,23 @@
+import request, { Method } from '@/utils/request'
+
+/**
+ * 获取健康宣教列表
+ * @param params
+ * @returns {Promise<any>}
+ */
+export function getDoctorAdvertList(params) {
+  return request({
+    url: 'care/care_device_member_bind/pageList', // 先写死
+    config: {method: Method.POST, needToken: true, loading: true},
+    params
+  })
+}
+
+/** 查询单个健康宣教 列表编辑按钮进入编辑页面时调用 */
+export function getDoctorAdvert(id, params) {
+  return request({
+    url: `care/health_advert/${id}`,
+    config: {method: Method.GET, needToken: true, loading: true},
+    params
+  })
+}

sleep/api/sleep_report.js

@@ -38,3 +38,12 @@ export function getWarnResult(imei){
         config: {method: Method.GET, needToken: true, loading: true}
     })
 }
+
+// 根据imei与用户unionId获取最新报告
+export function getNewReportBySn(params){
+    return request({
+        url: `xiaomian/get_new_report_by_sn`,
+        config: {method: Method.GET, needToken: true, loading: true},
+        params
+    })
+}

sleep/colorui/main.css

@@ -1,9 +1,9 @@
 /*
   ColorUi for uniApp  v2.1.6 | by 文晓港 2019-05-31 10:44:24
-  仅供学习交流，如作它用所承受的法律责任一概与作者无关  
-  
-  *使用ColorUi开发扩展与插件时，请注明基于ColorUi开发 
-  
+  仅供学习交流，如作它用所承受的法律责任一概与作者无关
+
+  *使用ColorUi开发扩展与插件时，请注明基于ColorUi开发
+
   （QQ交流群：240787041）
 */
 

sleep/common/App.scss

@@ -150,4 +150,4 @@ text {
 
 .relative {
   position: relative;
-}
+}

sleep/manifest.json

@@ -1,7 +1,7 @@
 {
     "name" : "sleep",
     "appid" : "__UNI__42E80AD",
-    "description" : "爱上听音乐",
+    "description" : "UU睡眠",
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,

sleep/pages.json

@@ -106,15 +106,7 @@
             {
                 "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
-            }  
-        }
-        ,{
-            "path" : "pages/detail/detail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-			}
+            }
         }
     ],
 	"globalStyle": {

sleep/pages/detail/detail.nvue

@@ -1,385 +0,0 @@
-<template>
-	<view class="tabs">
-		<scroll-view ref="tabbar1" id="tab-bar" class="tab-bar" :scroll="false" :scroll-x="true" :show-scrollbar="false"
-			:scroll-into-view="scrollInto">
-			<view style="flex-direction: column;">
-				<view style="flex-direction: row;">
-					<view class="uni-tab-item" v-for="(tab,index) in tabList" :key="tab.id" :id="tab.id"
-						:ref="'tabitem'+index" :data-id="index" :data-current="index" @click="ontabtap">
-						<text class="uni-tab-item-title"
-							:class="tabIndex==index ? 'uni-tab-item-title-active' : ''">{{tab.name}}</text>
-					</view>
-				</view>
-				<view class="scroll-view-indicator">
-					<view ref="underline" class="scroll-view-underline" :class="isTap ? 'scroll-view-animation':''"
-						:style="{left: indicatorLineLeft + 'px', width: indicatorLineWidth + 'px'}"></view>
-				</view>
-			</view>
-		</scroll-view>
-		<view class="tab-bar-line"></view>
-		<swiper class="tab-view" ref="swiper1" id="tab-bar-view" :current="tabIndex" :duration="300"
-			@change="onswiperchange" @transition="onswiperscroll" @animationfinish="animationfinish"
-			@onAnimationEnd="animationfinish">
-			<swiper-item class="swiper-item" v-for="(page, index) in tabList" :key="index">
-				<swiper-page class="swiper-page" :pid="page.pageid" ref="page"></swiper-page>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-	// #ifdef APP-PLUS
-	const dom = weex.requireModule('dom');
-	// #endif
-
-	// 缓存每页最多
-	const MAX_CACHE_DATA = 100;
-
-	// 缓存页签数量
-	const MAX_CACHE_PAGE = 3;
-	const TAB_PRELOAD_OFFSET = 1;
-
-	import swiperPage from './nvue-swiper-page.nvue';
-
-	export default {
-		components: {
-			swiperPage
-		},
-		data() {
-			return {
-				tabList: [],
-				tabIndex: 0,
-				cacheTab: [],
-				scrollInto: "",
-				indicatorLineLeft: 0,
-				indicatorLineWidth: 0,
-				isTap: false,
-				showTitleView: true,
-				pageId: "page",
-				refreshing: false,
-				refreshText: "",
-				refreshFlag: false
-			}
-		},
-		onLoad() {
-			for (var i = 0; i < 6; i++) {
-				this.tabList.push({
-					id: "tab" + i,
-					name: 'Tab ' + (i + 1),
-					pageid: i + 1
-				})
-			}
-		},
-		onReady() {
-			this._lastTabIndex = 0;
-			this.swiperWidth = 0;
-			this.tabbarWidth = 0;
-			this.tabListSize = {};
-			this._touchTabIndex = 0;
-
-			this.pageList = this.$refs.page;
-			this.selectorQuery();
-		},
-		methods: {
-			ontabtap(e) {
-				let index = e.target.dataset.current || e.currentTarget.dataset.current;
-				//let offsetIndex = this._touchTabIndex = Math.abs(index - this._lastTabIndex) > 1;
-
-				// #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-QQ
-				this.isTap = true;
-				var currentSize = this.tabListSize[index];
-				this.updateIndicator(currentSize.left, currentSize.width);
-				this._touchTabIndex = index;
-				// #endif
-
-				this.switchTab(index);
-			},
-			onswiperchange(e) {
-				// 注意：百度小程序会触发2次
-
-				// #ifndef APP-PLUS || H5 || MP-WEIXIN || MP-QQ
-				let index = e.target.current || e.detail.current;
-				this.switchTab(index);
-				// #endif
-			},
-			onswiperscroll(e) {
-				if (this.isTap) {
-					return;
-				}
-
-				var offsetX = e.detail.dx;
-				var preloadIndex = this._lastTabIndex;
-				if (offsetX > TAB_PRELOAD_OFFSET) {
-					preloadIndex++;
-				} else if (offsetX < -TAB_PRELOAD_OFFSET) {
-					preloadIndex--;
-				}
-				if (preloadIndex === this._lastTabIndex || preloadIndex < 0 || preloadIndex > this.pageList.length - 1) {
-					return;
-				}
-				if (this.pageList[preloadIndex].dataList.length === 0) {
-					this.loadTabData(preloadIndex);
-				}
-
-				// #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-QQ
-				var percentage = Math.abs(this.swiperWidth / offsetX);
-				var currentSize = this.tabListSize[this._lastTabIndex];
-				var preloadSize = this.tabListSize[preloadIndex];
-				var lineL = currentSize.left + (preloadSize.left - currentSize.left) / percentage;
-				var lineW = currentSize.width + (preloadSize.width - currentSize.width) / percentage;
-				this.updateIndicator(lineL, lineW);
-				// #endif
-			},
-			animationfinish(e) {
-				// #ifdef APP-PLUS || H5 || MP-WEIXIN || MP-QQ
-				let index = e.detail.current;
-				if (this._touchTabIndex === index) {
-					this.isTap = false;
-				}
-				this._lastTabIndex = index;
-				this.switchTab(index);
-				this.updateIndicator(this.tabListSize[index].left, this.tabListSize[index].width);
-				// #endif
-			},
-			selectorQuery() {
-				// #ifdef APP-NVUE
-				// 查询 tabbar 宽度
-				uni.createSelectorQuery().in(this).select('#tab-bar').boundingClientRect().exec(rect => {
-					this.tabbarWidth = rect[0].width;
-				});
-				// 查询 tabview 宽度
-				uni.createSelectorQuery().in(this).select('#tab-bar-view').boundingClientRect().exec(rect => {
-					this.swiperWidth = rect[0].width;
-				});
-
-				// 因 nvue 暂不支持 class 查询
-				var queryTabSize = uni.createSelectorQuery().in(this);
-				for (var i = 0; i < this.tabList.length; i++) {
-					queryTabSize.select('#' + this.tabList[i].id).boundingClientRect();
-				}
-				queryTabSize.exec(rects => {
-					rects.forEach((rect) => {
-						this.tabListSize[rect.dataset.id] = rect;
-					})
-					this.updateIndicator(this.tabListSize[this.tabIndex].left, this.tabListSize[this.tabIndex]
-						.width);
-					this.switchTab(this.tabIndex);
-				});
-				// #endif
-
-				// #ifdef MP-WEIXIN || H5 || MP-QQ
-				uni.createSelectorQuery().in(this).select('.tab-view').fields({
-					dataset: true,
-					size: true,
-				}, (res) => {
-					this.swiperWidth = res.width;
-				}).exec();
-				uni.createSelectorQuery().in(this).selectAll('.uni-tab-item').boundingClientRect((rects) => {
-					rects.forEach((rect) => {
-						this.tabListSize[rect.dataset.id] = rect;
-					})
-					this.updateIndicator(this.tabListSize[this.tabIndex].left, this.tabListSize[this.tabIndex]
-						.width);
-				}).exec();
-				// #endif
-			},
-			updateIndicator(left, width) {
-				this.indicatorLineLeft = left;
-				this.indicatorLineWidth = width;
-			},
-			switchTab(index) {
-				if (this.pageList[index].dataList.length === 0) {
-					this.loadTabData(index);
-				}
-
-				if (this.tabIndex === index) {
-					return;
-				}
-
-				// 缓存 tabId
-				if (this.pageList[this.tabIndex].dataList.length > MAX_CACHE_DATA) {
-					let isExist = this.cacheTab.indexOf(this.tabIndex);
-					if (isExist < 0) {
-						this.cacheTab.push(this.tabIndex);
-					}
-				}
-
-				this.tabIndex = index;
-
-				// #ifdef APP-NVUE
-				this.scrollTabTo(index);
-				// #endif
-				// #ifndef APP-NVUE
-				this.scrollInto = this.tabList[index].id;
-				// #endif
-
-				// 释放 tabId
-				if (this.cacheTab.length > MAX_CACHE_PAGE) {
-					let cacheIndex = this.cacheTab[0];
-					this.clearTabData(cacheIndex);
-					this.cacheTab.splice(0, 1);
-				}
-			},
-			scrollTabTo(index) {
-				const el = this.$refs['tabitem' + index][0];
-				let offset = 0;
-				// TODO fix ios offset
-				if (index > 0) {
-					offset = this.tabbarWidth / 2 - this.tabListSize[index].width / 2;
-					if (this.tabListSize[index].right < this.tabbarWidth / 2) {
-						offset = this.tabListSize[0].width;
-					}
-				}
-				dom.scrollToElement(el, {
-					offset: -offset
-				});
-			},
-			loadTabData(index) {
-				this.pageList[index].loadData();
-			},
-			clearTabData(index) {
-				this.pageList[index].clear();
-			},
-			onrefresh(e) {
-				this.refreshing = true;
-				this.refreshText = "刷新中...";
-				setTimeout(() => {
-					this.refreshing = false;
-					this.refreshFlag = false;
-					this.refreshText = "已刷新";
-				}, 2000)
-			},
-			onpullingdown(e) {
-				if (this.refreshing) {
-					return;
-				}
-
-				this.pulling = false;
-				if (Math.abs(e.pullingDistance) > Math.abs(e.viewHeight)) {
-					this.refreshFlag = true;
-					this.refreshText = "释放立即刷新";
-				} else {
-					this.refreshFlag = false;
-					this.refreshText = "下拉可以刷新";
-				}
-			}
-		}
-	}
-</script>
-
-<style>
-	/* #ifndef APP-PLUS */
-	page {
-		width: 100%;
-		min-height: 100%;
-		display: flex;
-	}
-
-	/* #endif */
-
-	.page {
-		flex: 1;
-	}
-
-	.flexible-view {
-		background-color: #f823ff;
-	}
-
-	.tabs {
-		flex: 1;
-		flex-direction: column;
-		overflow: hidden;
-		background-color: #ffffff;
-		/* #ifdef MP-ALIPAY || MP-BAIDU */
-		height: 100vh;
-		/* #endif */
-	}
-
-	.tab-bar {
-		width: 750upx;
-		height: 84upx;
-		flex-direction: row;
-		/* #ifndef APP-PLUS */
-		white-space: nowrap;
-		/* #endif */
-	}
-
-	/* #ifndef APP-NVUE */
-	.tab-bar ::-webkit-scrollbar {
-		display: none;
-		width: 0 !important;
-		height: 0 !important;
-		-webkit-appearance: none;
-		background: transparent;
-	}
-
-	/* #endif */
-
-	.scroll-view-indicator {
-		position: relative;
-		height: 2px;
-		background-color: transparent;
-	}
-
-	.scroll-view-underline {
-		position: absolute;
-		top: 0;
-		bottom: 0;
-		width: 0;
-		background-color: #007AFF;
-	}
-
-	.scroll-view-animation {
-		transition-duration: 0.2s;
-		transition-property: left;
-	}
-
-	.tab-bar-line {
-		height: 1upx;
-		background-color: #cccccc;
-	}
-
-	.tab-view {
-		flex: 1;
-	}
-
-	.uni-tab-item {
-		/* #ifndef APP-PLUS */
-		display: inline-block;
-		/* #endif */
-		flex-wrap: nowrap;
-		padding-left: 25px;
-		padding-right: 25px;
-	}
-
-	.uni-tab-item-title {
-		color: #555;
-		font-size: 30upx;
-		height: 80upx;
-		line-height: 80upx;
-		flex-wrap: nowrap;
-		/* #ifndef APP-PLUS */
-		white-space: nowrap;
-		/* #endif */
-	}
-
-	.uni-tab-item-title-active {
-		color: #007AFF;
-	}
-
-	.swiper-item {
-		flex: 1;
-		flex-direction: column;
-	}
-
-	.swiper-page {
-		flex: 1;
-		flex-direction: column;
-		position: absolute;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-	}
-
-</style>

sleep/pages/detail/detail.vue

@@ -1,22 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>

sleep/pages/detail/nvue-swiper-page.nvue

@@ -1,106 +0,0 @@
-<template>
-	<list class="list" :offset-accuracy="5" :bounce="false" isSwiperList="true">
-		<refresh class="refresh" @refresh="onrefresh" @pullingdown="onpullingdown"
-			:display="refreshing ? 'show' : 'hide'">
-			<div class="refresh-view">
-				<text class="loading-text">{{refreshText}}</text>
-			</div>
-		</refresh>
-		<cell v-for="(item, index) in dataList" :key="item.id" @click="onclick">
-			<view class="list-item">
-				<text>{{item.name}}</text>
-			</view>
-		</cell>
-	</list>
-</template>
-
-<script>
-	export default {
-		props: {
-			pid: {
-				type: [Number, String],
-				default: ''
-			},
-			parentId: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				scrollable: true,
-				dataList: [],
-				refreshing: false,
-				refreshText: "",
-				refreshFlag: false
-			}
-		},
-		created() {
-			for (var i = 1; i < 32; i++) {
-				this.dataList.push({
-					id: i,
-					name: i
-				});
-			}
-		},
-		methods: {
-			onclick(e) {
-				console.log("onclick");
-			},
-			loadData() {
-				// 首次激活时被调用
-			},
-			clear() {
-				// 释放数据时被调用，参考 swiper-list 缓存配置
-				this.dataList.length = 0;
-			},
-			onrefresh(e) {
-				this.refreshing = true;
-				this.refreshText = "刷新中...";
-				setTimeout(() => {
-					this.refreshing = false;
-					this.refreshFlag = false;
-					this.refreshText = "已刷新";
-				}, 2000)
-			},
-			onpullingdown(e) {
-				if (this.refreshing) {
-					return;
-				}
-
-				this.pulling = false;
-				if (Math.abs(e.pullingDistance) > Math.abs(e.viewHeight)) {
-					this.refreshFlag = true;
-					this.refreshText = "释放立即刷新";
-				} else {
-					this.refreshFlag = false;
-					this.refreshText = "下拉可以刷新";
-				}
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.refresh-view {
-		width: 750rpx;
-		height: 80px;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.list {
-		flex: 1;
-		background-color: #ebebeb;
-	}
-
-	.list-item {
-		margin-left: 12px;
-		margin-right: 12px;
-		margin-top: 12px;
-		padding: 20px;
-		background-color: #fff;
-		border-radius: 5px;
-	}
-</style>

sleep/pages/home/index.vue

@@ -216,7 +216,7 @@
 			</view>
 		  </view>
 		</view>
-		
+
 		<view class="flex-row home-data space-x-6">
 		  <view class="flex-col flex-auto home-data-left">
 		    <view class="flex-row space-x-4 home-data-left-title">
@@ -231,11 +231,11 @@
 		  </view>
 		  <view class="flex-col justify-start shrink-0 relative home-data-chart content">
 			<view class="echarts-wrap">
-			  <mpvue-echarts class="ec-canvas" canvasId="canvasChart-1" ref="xinlvRefChart" @onInit="onInit2"></mpvue-echarts>
+			  <mpvue-echarts class="ec-canvas" canvasId="canvasChart-2" ref="huxiRefChart" @onInit="onInit2"></mpvue-echarts>
 			</view>
 		  </view>
 		</view>
-		
+
         <!-- <view class="cu-card article">
           <view class="cu-item shadow chartsBgColor">
             <view class="title"><view class="text-cut text-lg text-gray">心率 <text class="text-green margin-left">{{ pjxl }} 分钟/次</text></view></view>
@@ -368,6 +368,12 @@ export default {
       clearInterval(this.timer)
     })
   },
+  onShow() {
+    const imei = Storage.getItem('nowChangeDevice')
+    if (imei) {
+      this.homeFrom.nowDevice = imei
+    }
+  },
 	methods: {
 		handleShareClick() {
 			uni.navigateTo({
@@ -389,6 +395,7 @@ export default {
           _this.deviceList = res
           _this.homeFrom.nowDevice = res[0].imei
           Storage.setItem("nowChangeDevice", _this.homeFrom.nowDevice)
+          Storage.setItem("myBindDevices", res)
           _this.init()
         }
       })
@@ -598,7 +605,7 @@ export default {
       } else {
         for (let i = 0; i < 5; i++) {
           this.myCount1 ++;
-          value = 410 + parseInt(Math.random() * 10 - 5)
+          value = 410 + parseInt(Math.random() * 50 - 30)
           this.myData1.push([this.myCount1, value])
         }
       }
@@ -661,7 +668,7 @@ export default {
 <style lang="scss" scoped>
 .echarts-wrap {
   width: 100%;
-  height: 100px;
+  height: 80px;
   /*padding: 10upx;*/
   margin-bottom: 0.3rem
 }

sleep/pages/index/index.vue

@@ -3,220 +3,81 @@
 		<view class="bg-black">
 			<cu-custom bgColor="#000000"><view slot="content" style="color: #ffffff">UU睡眠</view></cu-custom>
 		</view>
-		<scroll-view :style="{ height: height }" class="main-container" scroll-y>
+<!--		<scroll-view :style="{ height: height }" class="main-container" scroll-y>-->
+
+<!--			<view class="bg-black">-->
+<!--				<view class="banner-wrapper">-->
+<!--					<swiper class="screen-swiper square-dot" style="min-height: 317upx;" :indicator-dots="true" :circular="true" :autoplay="true" interval="5000" duration="500">-->
+<!--						<swiper-item v-for="item in swiperList" :key="item.bannerId">-->
+<!--							<image :src="item.pic || item.imageUrl" mode="scaleToFill" class="banner-img"></image>-->
+<!--						</swiper-item>-->
+<!--					</swiper>-->
+<!--				</view>-->
+<!--			</view>-->
+
+<!--			<view class="music-wrapper" v-if="recommendList.length > 0">-->
+<!--				<box-title title="UU推荐" buttonName="更多" iconName="right" @handlePlay="handleNative('../songList/index')"></box-title>-->
+<!--				<song-list :currentList="recommendList"></song-list>-->
+<!--			</view>-->
+
+
+<!--			<view class="music-wrapper" v-if="dayRecommendList.length > 0">-->
+<!--				<box-title title="睡眠音乐" buttonName="更多" iconName="kaishi2" @handlePlay="handlePlay('dayRecommendList')"></box-title>-->
+<!--				<music-list :currentList="dayRecommendList"></music-list>-->
+<!--			</view>-->
+
+
+<!--		</scroll-view>-->
+
+<!--		<music-control />-->
+
+    <view class="main-container">
+      <view class="music-wrapper" v-if="healthAdvertList.length > 0">
+        <box-title title="睡眠小知识" buttonName="更多" iconName="kaishi2" @handlePlay="handlePlay('dayRecommendList')"></box-title>
+
+        <view class="flex-col justify-start knowledge-list">
+          <view v-for="(item, index) in healthAdvertList" :key="index" class="flex-row items-center space-x-14 knowledge-item">
+            <view class="flex-col flex-auto space-y-8">
+              <text class="self-start font_4 knowledge-item-title">{{item.title}}</text>
+              <text v-if="item.summary.length>25" class="knowledge-item-desc">
+                {{item.summary.substring(0,22)}}...
+              </text>
+              <text v-else class="knowledge-item-desc">
+                {{item.summary.substring(0,22)}}...
+              </text>
+            </view>
+            <image
+                class="shrink-0 image_12"
+                src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/649415135a7e3f0310661c1e/649415b654fe0000116ae544/16874496879438729687.png"
+            />
+          </view>
+
+        </view>
+      </view>
+    </view>
 
-			<view class="bg-black">
-				<view class="banner-wrapper">
-					<swiper class="screen-swiper square-dot" style="min-height: 317upx;" :indicator-dots="true" :circular="true" :autoplay="true" interval="5000" duration="500">
-						<swiper-item v-for="item in swiperList" :key="item.bannerId">
-							<image :src="item.pic || item.imageUrl" mode="scaleToFill" class="banner-img"></image>
-						</swiper-item>
-					</swiper>
-				</view>
-			</view>
-
-			<view class="music-wrapper" v-if="recommendList.length > 0">
-				<box-title title="UU推荐" buttonName="更多" iconName="right" @handlePlay="handleNative('../songList/index')"></box-title>
-				<song-list :currentList="recommendList"></song-list>
-			</view>
-
-
-			<view class="music-wrapper" v-if="dayRecommendList.length > 0">
-				<box-title title="睡眠音乐" buttonName="更多" iconName="kaishi2" @handlePlay="handlePlay('dayRecommendList')"></box-title>
-				<music-list :currentList="dayRecommendList"></music-list>
-			</view>
-
-			<view class="music-wrapper" v-if="dayRecommendList.length > 0">
-				<box-title title="睡眠小知识" buttonName="更多" iconName="kaishi2" @handlePlay="handlePlay('dayRecommendList')"></box-title>
-
-				<view class="flex-col justify-start knowledge-list">
-				  <view class="flex-row items-center space-x-14 knowledge-item">
-				    <view class="flex-col flex-auto space-y-8">
-				      <text class="self-start font_4 knowledge-item-title">睡眠科普：你真的了解睡眠吗？</text>
-				      <text class="knowledge-item-desc">
-				        套用模型省时省力，不用冥思苦想，但是，每一个需要设计的内容和体系应该是迥然不同的，所以每一个设计方案也…
-				      </text>
-				    </view>
-				    <image
-				      class="shrink-0 image_12"
-				      src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/649415135a7e3f0310661c1e/649415b654fe0000116ae544/16874496879438729687.png"
-				    />
-				  </view>
-
-				  <view class="flex-row items-center space-x-14 knowledge-item">
-				    <view class="flex-col flex-auto space-y-8">
-				      <text class="self-start font_4 knowledge-item-title">睡眠科普：你真的了解睡眠吗？</text>
-				      <text class="knowledge-item-desc">
-				        套用模型省时省力，不用冥思苦想，但是，每一个需要设计的内容和体系应该是迥然不同的，所以每一个设计方案也…
-				      </text>
-				    </view>
-				    <image
-				      class="shrink-0 image_12"
-				      src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/649415135a7e3f0310661c1e/649415b654fe0000116ae544/16874496879438729687.png"
-				    />
-				  </view>
-
-				  <view class="flex-row items-center space-x-14 knowledge-item">
-				    <view class="flex-col flex-auto space-y-8">
-				      <text class="self-start font_4 knowledge-item-title">睡眠科普：你真的了解睡眠吗？</text>
-				      <text class="knowledge-item-desc">
-				        套用模型省时省力，不用冥思苦想，但是，每一个需要设计的内容和体系应该是迥然不同的，所以每一个设计方案也…
-				      </text>
-				    </view>
-				    <image
-				      class="shrink-0 image_12"
-				      src="https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/649415135a7e3f0310661c1e/649415b654fe0000116ae544/16874496879438729687.png"
-				    />
-				  </view>
-				</view>
-			</view>
-
-		</scroll-view>
-
-		<music-control />
 
 		<!-- <tab-bar currentPage="index" /> -->
 	</view>
 </template>
 
 <script>
-import songList from './components/songList.vue';
-import musicList from './components/musicList.vue';
-import { getImage, getName } from '@/utils/index.js';
+// import songList from './components/songList.vue';
+// import musicList from './components/musicList.vue';
+// import { getImage, getName } from '@/utils/index.js';
+import * as API_doctorAdvert from '@/api/doctor_advert'
 export default {
+  // components: {
+  //   songList,
+  //   musicList
+  // },
 	data() {
 		return {
-			//轮播图
-			swiperList: [
-				{
-					"pic": "http://p1.music.126.net/ZuDmYz9gKTes67weCA6roQ==/109951168702825545.jpg",
-					"bannerId": "1687869567089252"
-				},
-				{
-					"pic": "http://p1.music.126.net/vrPXmAQsg-aW5I3EEFcKcw==/109951168702819867.jpg",
-					"bannerId": "1687869640017460"
-				},
-				{
-					"pic": "http://p1.music.126.net/xK69a1N5DCqNQXts64y3xA==/109951168703821815.jpg",
-					"bannerId": "1687869708598159"
-				}
-			],
-			recommendList: [
-				{
-				    "id": 331841455,
-				    "type": 0,
-				    "name": "深度睡眠 |重度失眠者专用歌单",
-				    "copywriter": "",
-				    "picUrl": "https://p2.music.126.net/g2_Gv0dtAicJ3ChTYu28_g==/1393081239628722.jpg",
-				    "canDislike": true,
-				    "trackNumberUpdateTime": 1552746520361,
-				    "playCount": 72862600,
-				    "trackCount": 32,
-				    "highQuality": true,
-				    "alg": "alg_high_quality"
-				},
-				{
-				    "id": 5338700800,
-			        "type": 0,
-				    "name": "一个双子座的听歌列表",
-				    "copywriter": "",
-				    "picUrl": "https://p2.music.126.net/SATl5PH1NpEPHsYaB24t5A==/109951166269856073.jpg",
-				    "canDislike": true,
-				    "trackNumberUpdateTime": 1685028754372,
-				    "playCount": 29329484,
-				    "trackCount": 361,
-				    "highQuality": false,
-				    "alg": "alg_high_quality"
-				},
-				{
-				    "id": 2042205655,
-				    "type": 0,
-				    "name": "愿还会有人，做个傻子陪你浪费一生",
-				    "copywriter": "",
-				    "picUrl": "https://p2.music.126.net/AWcDI5wc9fkS2bZt6wIm-Q==/109951163212638897.jpg",
-				    "canDislike": true,
-				    "trackNumberUpdateTime": 1679320967844,
-				    "playCount": 25818546,
-				    "trackCount": 41,
-				    "highQuality": false,
-				    "alg": "alg_high_quality"
-				},
-				{
-				    "id": 2139324915,
-				    "type": 0,
-				    "name": "歌词唱透了心声，回忆模糊了眼眸",
-				    "copywriter": "",
-				    "picUrl": "https://p2.music.126.net/pa1t9G_Mt2xJm_xqUUjvIw==/109951163676905233.jpg",
-				    "canDislike": true,
-				    "trackNumberUpdateTime": 1687945378874,
-				    "playCount": 69736672,
-				    "trackCount": 514,
-				    "highQuality": false,
-				    "alg": "alg_high_quality"
-				}
-			],
-			dayRecommendList: [
-				{
-					"id": 159400773,
-					"name": "JJ的咖啡调调, Vol. 2",
-					"picUrl": "http://p2.music.126.net/4x-65bnidSKyEMDBmGtn8g==/109951168466764238.jpg"
-				},
-				{
-					"id": 160760191,
-					"name": "我们的歌",
-					"picUrl": "http://p2.music.126.net/Gm2v1KrDe2TwplzxcmTxYg==/109951168428025131.jpg"
-				},
-				{
-					"id": 78938226,
-					"name": "听闻余生",
-					"picUrl": "http://p2.music.126.net/DK1_4sP_339o5rowMdPXdw==/109951164071024476.jpg"
-				},
-				{
-					"id": 129849508,
-					"name": "时光背面的我",
-					"picUrl": "http://p2.music.126.net/VOcPF6uCGAlwESFyyGqHrg==/109951166141514551.jpg"
-				},
-				{
-					"id": 160760191,
-					"name": "我们的歌",
-					"picUrl": "http://p2.music.126.net/Gm2v1KrDe2TwplzxcmTxYg==/109951168428025131.jpg"
-				},
-				{
-					"id": 78938226,
-					"name": "听闻余生",
-					"picUrl": "http://p2.music.126.net/DK1_4sP_339o5rowMdPXdw==/109951164071024476.jpg"
-				},
-				{
-					"id": 129849508,
-					"name": "时光背面的我",
-					"picUrl": "http://p2.music.126.net/VOcPF6uCGAlwESFyyGqHrg==/109951166141514551.jpg"
-				}
-			],
-			dayRecommendMusicList: [],
-			newSongList: [],
-			hotSingerList: [],
-			selectData: [],
+      healthAdvertList: [],
 		};
 	},
-	components: {
-		songList,
-		musicList
-	},
-	computed: {
-		cookie() {
-			return this.$store.state.cookie;
-		},
-		height() {
-			let height = this.CustomBar / (uni.upx2px(this.CustomBar) / this.CustomBar) + 220;
-			return `calc(100%  - ${height}rpx)`;
-		}
-	},
-	onShow() {
-		// this.getDayRecommendData();
-		// this.getDayRecommendMusicData();
-	},
-	created() {
-		// this.getData();
+	onLoad() {
+		this.getCareHealthAdvert()
 	},
 	onPullDownRefresh() {
 		// this.getData();
@@ -225,26 +86,37 @@ export default {
 		}, 1000);
 	},
 	methods: {
-
+    // 获取健康宣讲
+    getCareHealthAdvert() {
+      const data = {
+        pageNo: 1,
+        pageSize: 10,
+        shopId: 486, // 先写死
+        title: ''
+      }
+      API_doctorAdvert.getDoctorAdvertList(data).then(res => {
+        this.healthAdvertList = res.data
+      })
+    },
 		//播放全部 猜你喜欢
-		handlePlay(key) {
-			const list = this[key].map(item => {
-				return {
-					src: '',
-					title: item.name,
-					singer: getName(item),
-					coverImgUrl: getImage(item),
-					id: item.id
-				};
-			});
-			this.$store.dispatch('playAllMUsic', list);
-		},
-
-		handleNative(val) {
-			uni.navigateTo({
-				url: val
-			});
-		},
+		// handlePlay(key) {
+		// 	const list = this[key].map(item => {
+		// 		return {
+		// 			src: '',
+		// 			title: item.name,
+		// 			singer: getName(item),
+		// 			coverImgUrl: getImage(item),
+		// 			id: item.id
+		// 		};
+		// 	});
+		// 	this.$store.dispatch('playAllMUsic', list);
+		// },
+    //
+		// handleNative(val) {
+		// 	uni.navigateTo({
+		// 		url: val
+		// 	});
+		// },
 
 
 		toSearch() {

sleep/pages/report/report.vue

@@ -497,7 +497,7 @@
 			}
 		},
     mounted() {
-      this.params.unionId = '6291d3bde21b840008ae7842'
+      this.params.unionId = '6291d3bde21b840008ae7842' // 先写死
       this.getNewSleepReport()
     },
     methods: {

sleep/ui-utils/Foundation.js

@@ -69,3 +69,23 @@ export function countTimeDown(seconds) {
     seconds: leftTime(parseInt(seconds % 60, 10))
   }
 }
+
+/**
+ * 根据url获取参数
+ * @param url 链接地址
+ * @returns {{obj}}
+ */
+export function getQueryObject(url) {
+  url = url == null ? window.location.href : url
+  const search = url.substring(url.lastIndexOf('?') + 1)
+  const obj = {}
+  const reg = /([^?&=]+)=([^?&=]*)/g
+  search.replace(reg, (rs, $1, $2) => {
+    const name = decodeURIComponent($1)
+    let val = decodeURIComponent($2)
+    val = String(val)
+    obj[name] = val
+    return rs
+  })
+  return obj
+}

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

@@ -17,8 +17,7 @@
     "pages/index/index",
     "pages/shareUser/shareUser",
     "pages/singerPlayList/index",
-    "pages/auth/auth",
-    "pages/detail/detail"
+    "pages/auth/auth"
   ],
   "subPackages": [],
   "window": {

sleep/unpackage/dist/dev/mp-weixin/pages/alertSetting/alertSetting.json

@@ -1,6 +1,4 @@
 {
   "enablePullDownRefresh": true,
-  "usingComponents": {
-    "time-slot": "/components/wanghexu-timeslot/wanghexu-timeslot"
-  }
+  "usingComponents": {}
 }

sleep/unpackage/dist/dev/mp-weixin/pages/alertSetting/alertSetting.wxss

@@ -209,7 +209,7 @@
 .page .section .section_2 .group_5 .font_5.data-v-0fb9c086 {
   font-size: 0.63rem;
   font-family: PingFangSC;
-  color: #120399;
+  color: red;
 }
 .page .section .section_2 .group_5 .space-x-8 > view.data-v-0fb9c086:not(:first-child),
 .page .section .section_2 .group_5 .space-x-8 > text.data-v-0fb9c086:not(:first-child),

sleep/unpackage/dist/dev/mp-weixin/pages/report/report.json

@@ -1,6 +1,7 @@
 {
   "enablePullDownRefresh": true,
   "usingComponents": {
-    "time-slot": "/components/wanghexu-timeslot/wanghexu-timeslot"
+    "uni-calendar": "/components/uni-calendar/uni-calendar",
+    "mpvue-echarts": "/components/mpvue-echarts/src/echarts"
   }
 }