Merge branch 'master' of http://8.210.64.198:30000/sunran/asd-mobild

src/views/zhulao/components/Tabbar.vue

@@ -61,7 +61,8 @@ export default {
     beforeChange(e) {
       if (e == 3) {
         if (!sessionStorage.getItem('userInfo')) {
-          this.getUserInfo()
+          //   this.getUserInfo()
+          this.userApi()
         } else {
           return true
         }
@@ -70,12 +71,12 @@ export default {
       }
     },
     async userApi() {
-      var userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
-      //   var mobile = '13895651855'
+      //   var userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
+      var mobile = '13811330231'
       const res = await userApi({
         command: 'reguserbyweixinphone',
-        contactsPhone: userInfo.mobile,
-        // contactsPhone: mobile,
+        // contactsPhone: userInfo.mobile,
+        contactsPhone: mobile,
         terminalType: 5,
       })
       sessionStorage.setItem('healthUser', JSON.stringify(res))

src/views/zhulao/views/circle/detail.vue

@@ -2,43 +2,45 @@
   <div class="page">
     <van-nav-bar title="中心详情" @click-left="$router.back()" left-arrow fixed placeholder safe-area-inset-top />
     <div class="loop_image">
-        <van-image :src="institutionsItem.coverImgUrl" fit="fill" />
+      <van-image :src="institutionsItem.coverImgUrl"  fit="fill" />
+
     </div>
     <div class="info_top">
-        <div class="name_bg">
-            <div class="name">{{institutionsItem.name?institutionsItem.name:''}}</div>
-        </div>
-        <div class="phone_bg">
-            <div>{{institutionsItem.contact?institutionsItem.contact:''}} {{institutionsItem.phone?institutionsItem.phone:''}}</div>
-        </div>
-        <div class="address_bg">
-            <div>{{institutionsItem.detailedAddress}}</div>
-        </div>
+      <div class="name_bg">
+        <div class="name">{{institutionsItem.name?institutionsItem.name:''}}</div>
+      </div>
+      <div class="phone_bg">
+        <div>{{institutionsItem.contact?institutionsItem.contact:''}} {{institutionsItem.phone?institutionsItem.phone:''}}</div>
+      </div>
+      <div class="address_bg">
+        <div>{{institutionsItem.detailedAddress}}</div>
+      </div>
     </div>
 
     <div class="info_center">
-        <span class="title">基本信息</span>
-        <div class="content">
+      <span class="title">基本信息--</span>
+      <!-- <span>dizhi:{{institutionsItem.coverImgUrl}}</span> -->
+      <div class="content">
         <div>
-            <span>服务对象:</span>
-            <span class="label">{{institutionsItem.serviceObject?institutionsItem.serviceObject:''}}</span>
+          <span>服务对象:</span>
+          <span class="label">{{institutionsItem.serviceObject?institutionsItem.serviceObject:''}}</span>
         </div>
         <div v-if="institutionsItem.isCharge">
-            <span>收费标准:</span>
-            <span class="label">{{institutionsItem.chargingTandard?institutionsItem.chargingTandard:''}}</span>
+          <span>收费标准:</span>
+          <span class="label">{{institutionsItem.chargingTandard?institutionsItem.chargingTandard:''}}</span>
         </div>
         <div v-if="institutionsItem.isCharge">
-            <span>空闲床位数:</span>
-            <span class="label">{{institutionsItem.bedNo?institutionsItem.bedNo:''}}</span>
-        </div>
+          <span>空闲床位数:</span>
+          <span class="label">{{institutionsItem.bedNo?institutionsItem.bedNo:''}}</span>
         </div>
+      </div>
     </div>
 
     <div class="info_center">
-        <span class="title">服务项目</span>
-        <div class="content minHeight">
-            {{institutionsItem.serviceItems?institutionsItem.serviceItems:''}}
-        </div>
+      <span class="title">服务项目</span>
+      <div class="content minHeight">
+        {{institutionsItem.serviceItems?institutionsItem.serviceItems:''}}
+      </div>
     </div>
 
     <div class="info_center">
@@ -51,28 +53,27 @@
   </div>
 </template>
 <script>
-import {institutions_detail} from '../../api/index.js'
+import { institutions_detail } from '../../api/index.js'
 export default {
-    data() {
-        return {
-            institutionsId:'',
-            institutionsItem:{}
-        }
-    },
-    filters: {},
-    mounted() {
-    },
-    created() {
-        this.institutionsId = this.$route.query.institutionsId
-        this.getInstitutions_detail()
-    },
-    methods: {
-        async getInstitutions_detail() {
-            var detailData = await institutions_detail( this.institutionsId,{})
-            this.institutionsItem = detailData.data
-            console.log(this.institutionsItem)
-        },
+  data() {
+    return {
+      institutionsId: '',
+      institutionsItem: {},
     }
+  },
+  filters: {},
+  mounted() {},
+  created() {
+    this.institutionsId = this.$route.query.institutionsId
+    this.getInstitutions_detail()
+  },
+  methods: {
+    async getInstitutions_detail() {
+      var detailData = await institutions_detail(this.institutionsId, {})
+      this.institutionsItem = detailData.data
+      console.log(this.institutionsItem)
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -82,33 +83,33 @@ export default {
   height: 100%;
 }
 .loop_image {
+  width: 100%;
+  height: 320px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .van-image {
     width: 100%;
-    height: 320px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    .van-image {
-        width: 100%;
-        height: 100%;
-    }
+    height: 100%;
+  }
 }
 
 .info_top {
-    width: 100%;
-    height: auto;
-    padding: 10px;
-    box-sizing: border-box;
-    .name_bg {
-        display: flex; 
-        justify-content: space-between;
-        align-items: center;
-    }
-    .name {
-        flex: .7;
-        color: black;
-        font-weight: 600;
-        font-size: 36px;
-    }
+  width: 100%;
+  height: auto;
+  padding: 10px;
+  box-sizing: border-box;
+  .name_bg {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .name {
+    flex: 0.7;
+    color: black;
+    font-weight: 600;
+    font-size: 36px;
+  }
 }
 .phone_bg {
   margin-top: 20px;
@@ -138,24 +139,21 @@ export default {
   color: black;
 }
 .info_center .content {
-    font-size: 32px;
-    width: 100%;
-    height: auto;
-    background-color: #fff;
-    border-radius: 10px;
-    padding: 20px;
-    box-sizing: border-box;
+  font-size: 32px;
+  width: 100%;
+  height: auto;
+  background-color: #fff;
+  border-radius: 10px;
+  padding: 20px;
+  box-sizing: border-box;
 }
 .label {
-     margin-left: 10px;
+  margin-left: 10px;
 }
 .minHeight {
-    min-height: 20px;
+  min-height: 20px;
 }
 
-
-
-
 .item_bg {
   padding: 10px 15px;
   box-sizing: border-box;
@@ -174,10 +172,10 @@ export default {
   align-items: center;
 }
 .name {
-  flex: .8;
+  flex: 0.8;
 }
 .distance_bg {
-  flex: .2;
+  flex: 0.2;
 }
 .distance_icon {
   width: 30px;
@@ -217,5 +215,4 @@ export default {
   height: 30px;
   margin-right: 6px;
 }
-
 </style>

src/views/zhulao/views/healthAssessmen/index.vue

@@ -7,7 +7,7 @@
       </div>
       <div class="right">
         <div class="name">
-          <span>{{userInfo.name}}</span>
+          <!-- <span>{{userInfo.name}}</span> -->
           <!-- <div class="btn" @click="$router.push({path:'/estimate'})">健康评估</div> -->
         </div>
         <div class="testing">

src/views/zhulao/views/healthAssessmen/term.js

@@ -98,8 +98,8 @@ const healthType = [{
     },
     {
         name: '尿酸',
-        icon: require('../../assets/img/list-temp-s.png'),
-        line: require('../../assets/img/xx/temp.png'),
+        icon: require('../../assets/img/list-ua-s.png'),
+        line: require('../../assets/img/xx/ua.png'),
         termNum1: '尿酸:',
         termNum2: '测量时间:',
         unit: 'umol/L',

src/views/zhulao/views/healthAssessmen/typeDetails/typemain.vue

@@ -510,7 +510,6 @@ export default {
     this.name = this.$route.query.name
     this.unit = this.$route.query.unit
     this.command = this.$route.query.command
-    console.log(this.name)
     this.queryaction()
   },
   methods: {
@@ -546,39 +545,32 @@ export default {
       })
 
       if (this.name == '血脂' || this.name == '血红蛋白') {
-        console.log(res.data, '222')
         this.healths = res.data.list
       } else {
         this.healths = res.healths
       }
 
-      console.log(this.healths, 'this.healths')
       var times = []
       var values = []
       var allValues = []
       if (this.name == '血糖') {
         this.healths.forEach((item) => {
-          console.log(item, '1')
           var x = item.dateTime.slice(5, 10)
           times.push(x)
           values.push(item.glu)
         })
-        console.log(values)
         this.getEcharts(times, values, 'mmol/L', '血糖')
       }
       if (this.name == '尿酸') {
         this.healths.forEach((item) => {
-          console.log(item, '1')
           var x = item.dateTime.slice(5, 10)
           times.push(x)
           values.push(item.ua)
         })
-        console.log(values)
         this.getEcharts(times, values, 'umol/L', '尿酸')
       }
       if (this.name == '血氧') {
         this.healths.forEach((item) => {
-          console.log(item, '1')
           var x = item.dateTime.slice(5, 10)
           times.push(x)
           values.push(item.spo)
@@ -589,21 +581,21 @@ export default {
         this.gettrain(this.healths)
       }
       if (this.name == '血压') {
+        allValues[0] = []
+        allValues[1] = []
         this.healths.forEach((item) => {
           var x = item.dateTime.slice(5, 10)
           times.push(x)
           values.push(item.pr)
-          allValues[0] = [item.nibpSys]
-          allValues[1] = [item.nibpDia]
+
+          allValues[0].push(item.nibpSys)
+          allValues[1].push(item.nibpDia)
         })
         this.getEcharts(times, values, '次/分钟', '脉搏')
         this.getEcharts2(times, allValues, 'mmHg', ['高压', '低压'])
       }
     },
     onSerach(e) {
-      console.log(e, '搜索')
-      console.log(this.command, '搜索')
-      console.log(e.command || this.command, '搜索')
       this.command = e.command || this.command
       this.name = e.healthTypeValue || this.name
       this.selectValue = e.selectValue || this.selectValue
@@ -670,8 +662,6 @@ export default {
       echarts.setOption(option)
     },
     getEcharts2(times, values, unit, legend) {
-      console.log(values, 'values')
-      console.log(legend, 'legend')
       var option = {
         tooltip: {
           trigger: 'axis',
@@ -720,7 +710,6 @@ export default {
         command: 'getDefaultHealthRange',
         terminalType: 1,
       })
-      console.log(res, 'defaultHealthRange')
       var defaultHealthRange = res.healthRangeList
       //   this.defaultHealthRange = res.healthRangeList
       this.defaultHealthRange.normal_nibpSysMin = defaultHealthRange[1].min //收缩压
@@ -832,10 +821,6 @@ export default {
             defaultHealthRange[i].min
         }
       }
-      console.log(
-        this.defaultHealthRange,
-        'defaultHealthRange.normal_nibpSysMax'
-      )
     },
     gettrain(arr) {
       arr.forEach((item) => {

src/views/zhulao/views/home/index.vue

@@ -11,7 +11,7 @@
       <van-list v-model="loading" :immediate-check="false" :finished="finished" finished-text="没有更多了" @load="onLoad">
         <div class="videoList">
           <div v-for="(item,index) in info" @click="$router.push({path:'/newsDetails',query:{id:item.id}})" :key="index">
-            <div v-if="index == 2" class="info_bg">
+            <!-- <div v-if="index == 2" class="info_bg">
               <div class="sub_info_bg" bindtap="bedTap">
                 <div class="left">
                   <img src="../../assets/images/homePage/bed.png" style="margin-left: 5px;width: 55px;height:45px;" />
@@ -26,7 +26,7 @@
               </div>
 
               <div class='videoBg'>
-                <!-- 标题 收藏数量 -->
+           
                 <div class='videoNameBg'>
                   <div class='videoName'>{{item.title}}</div>
                   <div class='videoCollectBg'>
@@ -34,7 +34,7 @@
                   </div>
                 </div>
 
-                <!-- 图文 或视频的图片 -->
+             
                 <div class='coverImageBg' v-if='item.coverImgUrl != null'>
                   <div class="videoImageBg">
                     <van-image class='videoContent' :src='item.coverImgUrl' />
@@ -42,8 +42,8 @@
 
                 </div>
               </div>
-            </div>
-            <div class='videoBg' v-else>
+            </div> -->
+            <div class='videoBg'>
               <!-- 标题 收藏数量 -->
               <div class='videoNameBg'>
                 <div class='videoName'>{{item.title}}</div>