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

.env.development

@@ -14,6 +14,7 @@ VITE_APP_AMAP_KEY = '017ac002b4b1a16ec87b2182b17bbed9'
 # 高德地图密钥
 VITE_APP_AMAP_SECURITY = '0f17176ade9bdeee2ed7b9990e6423bd'
 
+VUE_APP_ZL_HEALTH='/zhylsia'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
 # It only does one thing by converting all import() to require().

src/utils/zprequest.js

@@ -27,6 +27,10 @@ service.interceptors.request.use(
             config.baseURL = process.env.VUE_APP_ZL_WSS_ZP_BT;
             // config.headers['Content-Type'] = 'application/x-www-form-urlencoded'
         }
+        if (config.requestBase == 'VUE_APP_ZL_HEALTH') {
+            config.headers['authToken'] = 'y2pCZGibj836GTdEYnScWiH2Ed8yEeRy23e8127b-7119-49dc-bc10-1c94ce29a99d'
+            config.baseURL = process.env.VUE_APP_ZL_HEALTH;
+        }
         if (config.type === 'change') {
             config.headers['Content-Type'] = 'application/x-www-form-urlencoded'
         } else if (config.type === 'formData') {
@@ -63,7 +67,7 @@ service.interceptors.response.use(
             });
             return res
         }
-        if (res.code == '200' || res.statusCode == '200') {
+        if (res.code == '200' || res.statusCode == '200' || res.status == '0') {
             return res
         } else if (res.statusCode == '500' || res.statusCode == '403' || res.statusCode == '404' || res.statusCode == '221002') {
             Dialog({

src/views/weibao/router/router.js

@@ -73,6 +73,9 @@ const routes = [{
     {
         path: '/loveHelp/index',
         name: 'loveHelp',
+        meta: {
+            keepAlive: true
+        },
         component: () => import('../views/loveHelp/index.vue')
     },
     {

src/views/weibao/views/home/index.vue

@@ -88,13 +88,12 @@ export default {
     }
   },
   created() {
-    this.onLoad()
+    this.pageNotice()
     this.homeData()
   },
   methods: {
     async homeData() {
       const res = await homeData({ operatorId: 1 })
-      console.log(res)
       this.homeList = res.data
     },
     async pageNews() {
@@ -103,14 +102,13 @@ export default {
       if (this.newsform.pageNum == 1) {
         this.newsList = res.data.records
       } else {
-        console.log(this.newsList, '1')
         this.newsList = this.newsList.concat(res.data.records)
       }
-      this.newsform.pageNum = this.newsform.pageNum + 1
+
       if (this.newsList.length >= res.data.total) {
         this.finished = true
       } else {
-        this.finished = false
+        this.newsform.pageNum = this.newsform.pageNum + 1
       }
     },
     async pageNotice() {
@@ -121,11 +119,10 @@ export default {
       } else {
         this.noticeList = this.noticeList.concat(res.data.records)
       }
-      this.noticeform.pageNum = this.noticeform.pageNum + 1
       if (this.noticeList.length >= res.data.total) {
         this.finished = true
       } else {
-        this.finished = false
+        this.noticeform.pageNum = this.noticeform.pageNum + 1
       }
     },
     async pagePolicy() {
@@ -134,14 +131,12 @@ export default {
       if (this.policyform.pageNum == 1) {
         this.policyList = res.data.records
       } else {
-        console.log(this.policyList, '1')
         this.policyList = this.policyList.concat(res.data.records)
       }
-      this.policyform.pageNum = this.policyform.pageNum + 1
       if (this.policyList.length >= res.data.total) {
         this.finished = true
       } else {
-        this.finished = false
+        this.policyform.pageNum = this.policyform.pageNum + 1
       }
     },
     onLoad() {
@@ -154,6 +149,8 @@ export default {
       }
     },
     changeTab() {
+      this.loading = false
+      this.finished = false
       if (this.active == 0) {
         this.noticeform.pageNum = 1
         this.pageNotice()

src/views/weibao/views/loveHelp/index.vue

@@ -38,32 +38,30 @@ export default {
       dataList: [],
       form: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
       },
     }
   },
-  created() {
+  activated() {
     this.lovingHelpPage()
   },
   methods: {
     async lovingHelpPage() {
       const res = await lovingHelpPage(this.form)
-      this.loading = false
+      console.log(this.form.pageNum == 1, 'this.form.pageNum == 1')
       if (this.form.pageNum == 1) {
         this.dataList = res.data.records
       } else {
         this.dataList = this.dataList.concat(res.data.records)
       }
-      this.form.pageNum = this.form.pageNum + 1
       if (this.dataList.length >= res.data.total) {
         this.finished = true
       } else {
-        this.finished = false
+        this.form.pageNum = this.form.pageNum + 1
       }
+      this.loading = false
     },
     onLoad() {
-      this.loading = true
-      this.finished = false
       this.lovingHelpPage()
     },
     onSearch() {
@@ -77,7 +75,6 @@ export default {
       arr.forEach((item, index) => {
         if (item.indexOf('.jpg') || item.indexOf('.png')) {
           url = arr[index]
-          console.log(url, 'url')
           return
         }
       })

src/views/weibao/views/reporting/index.vue

@@ -4,7 +4,7 @@
     <div class="box" v-if="roleIdStr==14||roleIdStr==15">
       <van-tabs v-model="active" @change="changetabs" sticky offset-top="46">
         <van-tab title="发起报告">
-          <initiateConsultation  @changactive="changactive"></initiateConsultation>
+          <initiateConsultation @changactive="changactive"></initiateConsultation>
         </van-tab>
         <van-tab title="历史报告">
           <div class="casebox">
@@ -72,10 +72,9 @@ export default {
   },
   methods: {
     onLoad() {
-      this.historyform.pageNum++
       this.mandatoryPage()
     },
-    changactive(v) {
+    changactive() {
       this.active = 1
       this.historyform.pageNum = 1
       this.mandatoryPage()
@@ -92,7 +91,7 @@ export default {
       if (this.historyList.length >= res.data.total) {
         this.finished = true
       } else {
-        this.finished = false
+        this.historyform.pageNum++
       }
     },
     getpics(item) {

src/views/weibao/views/specialServices/index.vue

@@ -48,7 +48,9 @@ export default {
   },
   activated() {
     this.loading = true
-    this.pageAppProject()
+    if (this.roleIdStr == 21) {
+      this.pageAppProject()
+    }
     this.pageProjectHistory()
   },
   methods: {
@@ -57,16 +59,18 @@ export default {
       this.pageProjectHistory()
     },
     onLoad() {
+      if (this.roleIdStr != 21) {
+        this.active = 1
+      }
       if (this.active == 0) {
-        this.planform.pageNum = this.planform.pageNum + 1
         this.pageAppProject()
       } else if (this.active == 1) {
-        this.historyform.pageNum = this.historyform.pageNum + 1
         this.pageProjectHistory()
       }
     },
     changetabs() {
-      this.loading = true
+      this.loading = false
+      this.finished = false
       if (this.active == 0) {
         this.planform.pageNum = 1
         this.pageAppProject()
@@ -86,12 +90,11 @@ export default {
       if (this.planformList.length >= res.data.total) {
         this.finished = true
       } else {
-        this.finished = false
+        this.planform.pageNum = this.planform.pageNum + 1
       }
     },
     async pageProjectHistory() {
       const res = await pageProjectHistory(this.historyform)
-      this.loading = false
       if (this.historyform.pageNum == 1) {
         this.historyList = res.data.records
       } else {
@@ -100,13 +103,10 @@ export default {
       if (this.historyList.length >= res.data.total) {
         this.finished = true
       } else {
-        this.finished = false
+        this.historyform.pageNum = this.historyform.pageNum + 1
       }
+      this.loading = false
     },
-    // async pageAppProject() {
-    //   const res = await pageAppProject(this.planform)
-    //   this.planformList = res.data.records
-    // },
   },
 }
 </script>

src/views/zhulao/api/index.js

@@ -74,4 +74,22 @@ export function getGroupDetail(data) {
         type: 'change',
         data: qs.stringify(data)
     })
+}
+// 健康评估
+export function userApi(params) {
+    return request({
+        url: '/userApi.action',
+        method: 'get',
+        requestBase: 'VUE_APP_ZL_HEALTH',
+        params
+    })
+}
+// 健康评估
+export function queryaction(params) {
+    return request({
+        url: '/query.action',
+        method: 'get',
+        requestBase: 'VUE_APP_ZL_HEALTH',
+        params
+    })
 }

src/views/zhulao/router/router.js

@@ -44,12 +44,44 @@ const routes = [{
         component: () => import('../views/shoppingMall/details.vue')
     },
     {
-        path: '/circleHome',
-        name: 'circleHome',
+        path: '/submitOrder',
+        name: 'submitOrder',
+        meta: {
+            keepAlive: false
+        },
+        component: () => import('../views/shoppingMall/submitOrder.vue')
+    },
+    {
+        path: '/address',
+        name: 'address',
+        meta: {
+            keepAlive: false
+        },
+        component: () => import('../views/address/index.vue')
+    },
+    {
+        path: '/healthAssessmen',
+        name: 'healthAssessmen',
+        meta: {
+            keepAlive: false
+        },
+        component: () => import('../views/healthAssessmen/index.vue')
+    },
+    {
+        path: '/estimate',
+        name: 'estimate',
         meta: {
             keepAlive: true
         },
-        component: () => import('../views/circle/index.vue')
+        component: () => import('../views/healthAssessmen/estimate.vue')
+    },
+    {
+        path: '/details',
+        name: 'estimate',
+        meta: {
+            keepAlive: false
+        },
+        component: () => import('../views/healthAssessmen/details.vue')
     },
 
 

src/views/zhulao/views/address/index.vue

@@ -0,0 +1,14 @@
+<template>
+  <div>
+
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {}
+  },
+}
+</script>
+<style lang="scss" scoped>
+</style>

src/views/zhulao/views/classRoom/index.vue

@@ -72,9 +72,10 @@ export default {
       // 获取数据长度大于等于总数据长度 显示 没有更多
       if (this.info.length >= res.total) {
         this.finished = true
+      } else {
+        this.pageNum++
       }
       this.loading = false
-      this.pageNum++
     },
     onLoad() {
       this.getList('')

src/views/zhulao/views/healthAssessmen/details.vue

@@ -0,0 +1,162 @@
+<template>
+  <div style="padding: 0 15px;">
+    <van-nav-bar title="健康评估" @click-left="$router.back()" left-arrow fixed placeholder safe-area-inset-top />
+    <h6 style="text-align:center;">动脉粥样硬化性心血管疾病风险评估报告</h6>
+    <div class="img">
+      <img v-if="ascvd.estimate=='VeryHigh'" src="../../assets/img/ascvd_veryhigh.png" alt="">
+      <img v-if="ascvd.estimate=='High'" src="../../assets/img/ascvd_high.png" alt="">
+      <img v-if="ascvd.estimate=='Medium'" src="../../assets/img/ascvd_medium.png" alt="">
+      <img v-if="ascvd.estimate=='Low'" src="../../assets/img/ascvd_low.png" alt="">
+    </div>
+    <div>
+      <h6>{{estimate?estimate:""}}</h6>
+      <p>{{estimate?("您目前属于动脉粥样硬化性心血管疾病的"+estimate):""}}</p>
+      <p>动脉粥样硬化是进展性、全身性的，动脉粥样硬化性心血管疾病包括：急性冠状动脉综合征（ACS）、稳定性冠心病、缺血性心肌病、缺血性卒中、短暂性脑缺血发作（TIA）和外周动脉粥样硬化病等。</p>
+    </div>
+    <div>
+      <h6>ASCVD主要危险因素检测结果：</h6>
+      <table class="zb_table">
+        <thead>
+          <tr>
+            <th width="40%">主要危险因素</th>
+            <th width="30%">检测结果</th>
+            <th width="30%">理想目标</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>低密度脂蛋白胆固醇LDL-C</td>
+            <td name="ldlc">{{ascvd.ldlc?(ascvd.ldlc+"mmol/L"):""}}</td>
+            <td class="riskTarget">&lt;1.8mmol/L</td>
+          </tr>
+          <tr>
+            <td>血压</td>
+            <td name="nibp">{{ascvd.nibpSys?(ascvd.nibpSys+"/"+ascvd.nibpDia+"mmHg"):""}}</td>
+            <td class="riskTarget">&lt;130/80mmHg</td>
+          </tr>
+          <tr>
+            <td>空腹血糖GLU</td>
+            <td name="glu">{{ascvd.glu?(ascvd.glu+"mmol/L"):""}}</td>
+            <td class="riskTarget">4.4-7.0mmol/L</td>
+          </tr>
+          <tr>
+            <td>吸烟状况</td>
+            <td name="smoke">{{ascvd.smoke?"吸烟":""}}</td>
+            <td class="riskTarget">戒烟</td>
+          </tr>
+          <tr>
+            <td>体重指数</td>
+            <td name="bmi">{{ascvd.bmi}}</td>
+            <td class="riskTarget">20.0~23.9kg/m2</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <div>
+      <h6>超声提示：</h6>
+      <div>
+        <img class="ascvd_img" :src="ultrasonic.filePic" alt="">
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { queryaction } from '../../api/index.js'
+export default {
+  data() {
+    return {
+      ultrasonic: '',
+      estimate: '',
+      ascvd: '',
+      id: '',
+    }
+  },
+  created() {
+    this.estimate = this.$route.query.estimate
+    this.id = this.$route.query.id
+    this.queryaction()
+  },
+  methods: {
+    async queryaction() {
+      const res = await queryaction({
+        command: 'gethealthyAscvdUltrasonic',
+        uid: 2121,
+        id: this.id,
+      })
+      console.log(res, '111')
+      this.ascvd = res.ascvd
+      this.ultrasonic = res.ultrasonic
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.zb_table {
+  width: 100%;
+  border-collapse: collapse;
+  border: 3px solid #ffffff;
+}
+
+.zb_table td {
+  background-color: #e5e5e5;
+  height: 80px;
+  border: 3px solid #ffffff;
+  text-align: center;
+  vertical-align: middle;
+}
+
+.zb_table tr.zb_header td {
+  background-color: #65dfe0;
+  height: 60px;
+  text-align: center;
+  vertical-align: middle;
+}
+
+.zb_table span {
+  color: #ffffff;
+  font-size: 30px;
+}
+
+.zb_table tr th {
+  background-color: #d8f0fc;
+  height: 80px;
+  border: 3px solid #ffffff;
+  font-size: 28px;
+  vertical-align: middle;
+}
+
+.zb_table td.zb_count {
+  color: #aa0303;
+  font-weight: bold;
+}
+
+.zb_table td.zb_advice {
+  color: #4b8601;
+  text-align: left;
+  vertical-align: middle;
+  border-left: 0px;
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
+
+.zb_icon {
+  width: 72px;
+  height: 60px;
+  position: absolute;
+}
+
+.zb_table span.zb_title {
+  color: #000000;
+  text-align: center;
+  font-size: 36px;
+}
+.img {
+  padding: 0 30px;
+  img {
+    width: 100%;
+  }
+}
+.ascvd_img {
+  max-width: 90%;
+}
+</style>

src/views/zhulao/views/healthAssessmen/estimate.vue

@@ -0,0 +1,238 @@
+<template>
+  <div style="height:100%">
+    <van-nav-bar title="健康评估" @click-left="$router.back()" left-arrow fixed placeholder safe-area-inset-top />
+    <div class="main">
+      <div class="header">
+        <div>
+          <div class="selectBox">
+            <div class="content" @click="select=!select">{{selectValue}}</div>
+            <div :class="select? 'select':'select selectOut'">
+              <div @click="selectValue='近一年',select=!select">近一年</div>
+              <div @click="selectValue='近两年',select=!select">近两年</div>
+              <div @click="selectValue='近三年',select=!select">近三年</div>
+            </div>
+          </div>
+        </div>
+        <van-button class="search" :disabled="searchloading" @click="pageNum=1,queryaction()">查询</van-button>
+      </div>
+      <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+        <div class="list" v-for="item in healths" :key="item.id">
+          <div>
+            <img class="listg" :src="require('../../assets/img/listg.png')" alt="">
+          </div>
+          <div class="list_box">
+            <div>
+              <p class="time">{{item.dateTime}}</p>
+              <p class="num">健康评估：{{showEstimate(item.estimate)}}</p>
+            </div>
+            <p @click="$router.push({path:'/details',query:{estimate:showEstimate(item.estimate),id:item.id}})">
+              <van-icon name="question-o" />点击查看详情
+            </p>
+
+          </div>
+        </div>
+      </van-pull-refresh>
+    </div>
+  </div>
+</template>
+<script>
+import { queryaction } from '../../api/index.js'
+
+export default {
+  data() {
+    return {
+      searchloading: false,
+      select: true,
+      selectValue: '近一年',
+      healths: [],
+      isLoading: false,
+      loading: false,
+      finished: false,
+      pageNum: 1,
+    }
+  },
+  created() {
+    this.queryaction()
+  },
+  methods: {
+    showEstimate(estimate) {
+      if (estimate == 'VeryHigh') {
+        return '极高危人群'
+      } else if (estimate == 'High') {
+        return '高危人群'
+      } else if (estimate == 'Medium') {
+        return '中危人群'
+      } else if (estimate == 'Low') {
+        return '低危人群'
+      } else {
+        return null
+      }
+    },
+    getStartTimeStr: function (day) {
+      var today = new Date()
+      var beforMilliseconds = today.getTime() - 1000 * 3600 * 24 * day
+      var beforday = new Date()
+      beforday.setTime(beforMilliseconds)
+      var strYear = beforday.getFullYear()
+      var strDay = beforday.getDate()
+      var strMonth = beforday.getMonth() + 1
+      if (strMonth < 10) {
+        strMonth = '0' + strMonth
+      }
+      if (strDay < 10) {
+        strDay = '0' + strDay
+      }
+
+      return strYear + '-' + strMonth + '-' + strDay
+    },
+    async queryaction() {
+      this.searchloading = true
+      if (!this.searchloading) return
+      var startTime = ''
+      var endTime = this.getStartTimeStr(-1)
+      switch (this.selectValue) {
+        case '近一年': //体重
+          startTime = this.getStartTimeStr(365)
+          break
+        case '近两年': //体重
+          startTime = this.getStartTimeStr(730)
+          break
+        case '近三年': //体重
+          startTime = this.getStartTimeStr(1095)
+          break
+      }
+      const res = await queryaction({
+        command: 'gethealthsascvdchistory',
+        uid: 2121,
+        startDate: startTime,
+        endDate: endTime,
+        extra: 0,
+      })
+      this.healths = res.healths
+    },
+    onRefresh() {
+      this.pageNum = 1
+      this.queryaction()
+      this.isLoading = false
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.main {
+  width: 100%;
+  height: calc(100% - 100px);
+  overflow: hidden;
+  background-color: #fff;
+}
+.content {
+  font-size: 28px;
+  width: 240px;
+  height: 80px;
+  text-align: center;
+  color: #fff;
+  border-radius: 5px;
+  background-color: #00cccb;
+  line-height: 80px;
+}
+.selectBox {
+  position: relative;
+}
+.select {
+  position: absolute;
+  width: 100%;
+  top: 80px;
+  right: 0;
+  transition: all 0.5s;
+  height: 0;
+  overflow: hidden;
+  z-index: 900;
+  background-color: #eee;
+  //   background-color: #000;
+  font-size: 28px;
+  div {
+    height: 60px;
+    line-height: 60px;
+    text-align: center;
+  }
+}
+.selectOut {
+  height: 180px;
+}
+.header {
+  position: fixed;
+  top: 0;
+  display: flex;
+  padding: 0 30px;
+  justify-content: space-between;
+  //   border-bottom: 1px solid #ddd;
+  padding-bottom: 16px;
+  margin-top: 100px;
+  width: calc(100% - 60px);
+  background-color: #fff;
+  z-index: 9;
+}
+.search {
+  width: 120px;
+  color: #fff;
+  border-radius: 5px;
+  background-color: #ffc900;
+  line-height: 80px;
+  text-align: center;
+  font-size: 30px;
+  padding: 0;
+}
+.list {
+  height: 196px;
+
+  border-bottom: 1px solid #ddd;
+  padding-left: 30px;
+  display: flex;
+  width: 100%;
+  .list_box {
+    margin-top: 52px;
+    width: calc(100% - 100px);
+    display: flex;
+    justify-content: space-between;
+    p {
+      margin: 0;
+    }
+    > div {
+      font-size: 30px;
+      margin-left: 26px;
+      .time {
+        color: #adadad;
+      }
+      .num {
+        margin-top: 26px;
+        color: #50d4c2;
+      }
+    }
+    > p {
+      font-size: 30px;
+      color: #50d4c2;
+      height: 60px;
+      background-color: #f8f8f8;
+      padding: 0 20px;
+      line-height: 60px;
+    }
+  }
+}
+.van-pull-refresh {
+  margin-top: 116px;
+  z-index: 1;
+  height: calc(100% - 110px);
+  overflow: hidden;
+}
+/deep/.van-pull-refresh__track {
+  .list:nth-child(2) {
+    border-top: 1px solid #ddd;
+  }
+}
+.van-list {
+  height: 100%;
+}
+.listg {
+  height: 196px;
+}
+</style>

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

@@ -0,0 +1,208 @@
+<template>
+  <div>
+    <van-nav-bar title="健康管理" fixed placeholder safe-area-inset-top />
+    <div class="header">
+      <div class="left">
+        <van-image :src="require('../../assets/img/face.png')"></van-image>
+      </div>
+      <div class="right">
+        <div class="name">
+          <span>姓名</span>
+          <div class="btn" @click="$router.push({path:'/estimate'})">健康评估</div>
+        </div>
+        <div class="testing">
+          <img src="../../assets/img/zjjc.png" alt="" />
+          最近检测: 2021-09-09 20:92:30
+        </div>
+      </div>
+    </div>
+    <div class="list" v-for="item in healthType" :key="item.id">
+      <div class="icon">
+        <van-image :src="item.icon"></van-image>
+      </div>
+      <div class="term">
+        <div class="termName" :style="item">{{item.name}}</div>
+        <img :src="item.line" alt="">
+        <div class="termNum">
+          <div>{{item.termNum1}}{{item.num}}{{item.unit}}</div>
+          <div>{{item.termNum2}}{{item.dateTime}}</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { healthType } from './term.js'
+import { userApi, queryaction } from '../../api/index.js'
+export default {
+  data() {
+    return {
+      healthType: healthType,
+      healthData: '',
+    }
+  },
+  created() {
+    this.userApi()
+    this.queryaction()
+  },
+  methods: {
+    async userApi() {
+      const res = await userApi({
+        command: 'getDefaultHealthRange',
+        terminalType: 1,
+      })
+      console.log(res)
+    },
+    async queryaction() {
+      const res = await queryaction({
+        command: 'getlastheathdata',
+        uid: 2121,
+      })
+      this.healthData = res
+      this.healthType.forEach((item) => {
+        //   判断type进行赋值
+        switch (item.type) {
+          case 'weight': //体重
+            item.num = res.weight.weight
+            item.dateTime = res.weight.dateTime.slice(0, 10)
+            break
+          case 'glu': //血糖
+            item.num = res.glu.glu
+            item.dateTime = res.glu.dateTime.slice(0, 10)
+            break
+          case 'nibp': //血压
+            if (res.nibp.nibpSys) {
+              item.num = res.nibp.nibpSys + '/' + res.nibp.nibpDia
+            }
+
+            item.dateTime = res.nibp.dateTime.slice(0, 10)
+            break
+          case 'spo': //血氧
+            item.num = res.spo.spo
+            item.dateTime = res.spo.dateTime.slice(0, 10)
+            break
+          case 'chol': //血脂
+            item.num = res.chol.chol
+            item.dateTime = res.chol.dateTime.slice(0, 10)
+            break
+          case 'hb': //血红蛋白
+            item.num = res.hb.hb
+            item.dateTime = res.hb.dateTime.slice(0, 10)
+            break
+          case 'urine': //尿常规
+            item.num = res.urine.sg
+            item.dateTime = res.urine.dateTime.slice(0, 10)
+            break
+          case 'temp': //体温
+            item.num = res.temp.temp
+            item.dateTime = res.temp.dateTime.slice(0, 10)
+            break
+          case 'ua': //尿酸
+            item.num = res.ua.ua
+            item.dateTime = res.ua.dateTime.slice(0, 10)
+            break
+          case 'vc': //肺活量
+            item.num = res.vc.vc
+            item.dateTime = res.vc.dateTime.slice(0, 10)
+            break
+          case 'fat': //脂肪
+            item.num = res.fat.fat
+            item.dateTime = res.fat.dateTime.slice(0, 10)
+            break
+          case 'ultrasonic': //B超
+            item.num = ''
+            item.dateTime = res.ultrasonic.dateTime.slice(0, 10)
+            break
+          case 'ischemia': //缺血适应仪
+            item.num = ''
+            item.dateTime = res.ischemia.dateTime.slice(0, 10)
+            break
+          case 'artery': //动脉硬化检测
+            if (res.artery.avi) {
+              item.num = res.artery.avi + '/' + res.artery.api
+            }
+            item.dateTime = res.artery.dateTime.slice(0, 10)
+            break
+        }
+      })
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.header {
+  padding: 0 30px;
+  height: 200px;
+  display: flex;
+  align-items: center;
+  font-size: 30px;
+  border-bottom: 1px solid #ddd;
+  background-color: #e1faf9;
+  .left {
+    .van-image {
+      width: 180px;
+      height: 180px;
+      margin-right: 26px;
+    }
+  }
+  .right {
+    width: calc(100% - 180px);
+    .name {
+      display: flex;
+      justify-content: space-between;
+    }
+    .btn {
+      color: #fff;
+      width: 160px;
+      height: 60px;
+      border-radius: 10px;
+      background-color: #00c0bd;
+      line-height: 60px;
+      text-align: center;
+    }
+    .testing {
+      display: flex;
+      align-items: center;
+      font-size: 28px;
+      color: #9da2a1;
+      margin-top: 26px;
+      img {
+        width: 40px;
+        height: 40px;
+        margin-right: 8px;
+      }
+    }
+  }
+}
+.list {
+  display: flex;
+  border-bottom: 1px solid #ddd;
+  align-items: center;
+  padding: 0 30px;
+  height: 220px;
+  .icon {
+    .van-image {
+      width: 110px;
+      margin-right: 20px;
+    }
+  }
+  .term {
+    width: calc(100% - 110px);
+    font-size: 28px;
+    .termName {
+      line-height: 40px;
+    }
+    img {
+      width: 100%;
+      height: 1px;
+      display: block;
+      margin: 10px 0;
+    }
+    .termNum {
+      display: flex;
+      font-size: 28px;
+      justify-content: space-between;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,160 @@
+const healthType = [{
+        name: '体重',
+        line: require('../../assets/img/xx/weight.png'),
+        icon: require('../../assets/img/list-weight-s.png'),
+        termNum1: '体重值:',
+        unit: 'kg',
+        style: 'color:#f96820',
+        termNum2: '测量时间:',
+        dateTime: '',
+        id: 1,
+        type: 'weight',
+        num: ''
+    },
+    {
+        name: '血糖',
+        line: require('../../assets/img/xx/xt.png'),
+        icon: require('../../assets/img/list-xt-s.png'),
+        termNum1: '血糖值:',
+        termNum2: '测量时间:',
+        unit: 'mmol/L',
+        style: 'color:#92cdee',
+        type: 'glu',
+        id: 2
+    },
+    {
+        name: '血压',
+        line: require('../../assets/img/xx/xy.png'),
+        icon: require('../../assets/img/list-xy-s.png'),
+        termNum1: '血糖值:',
+        termNum2: '测量时间:',
+        unit: 'mmHg',
+        style: 'color:#41b98c',
+        type: 'nibp',
+        id: 3
+    },
+    {
+        name: '血氧',
+        icon: require('../../assets/img/list-xyang-s.png'),
+        line: require('../../assets/img/xx/xyang.png'),
+        termNum1: '血氧值:',
+        termNum2: '测量时间:',
+        unit: '%',
+        style: 'color:#da262c',
+        type: 'spo',
+        id: 4
+    },
+    {
+        name: '血脂',
+        icon: require('../../assets/img/list-xz-s.png'),
+        line: require('../../assets/img/xx/xz.png'),
+        termNum1: '总胆固醇:',
+        termNum2: '测量时间:',
+        unit: 'mmol/L',
+        style: 'color:#a8a0f1',
+        type: 'chol',
+        id: 5
+    },
+    {
+        name: '血红蛋白',
+        icon: require('../../assets/img/list-xhdb-s.png'),
+        line: require('../../assets/img/xx/xhdb.png'),
+        termNum1: '血红蛋白:',
+        termNum2: '测量时间:',
+        unit: 'g/L',
+        style: 'color:#f84472',
+        type: 'hb',
+        id: 6
+    },
+    {
+        name: '尿常规',
+        icon: require('../../assets/img/list-urine-s.png'),
+        line: require('../../assets/img/xx/urine.png'),
+        termNum1: '比重:',
+        termNum2: '测量时间:',
+        unit: '',
+        style: 'color:#fdcb6b',
+        type: 'urine',
+        id: 7
+    },
+    {
+        name: '体温',
+        icon: require('../../assets/img/list-temp-s.png'),
+        line: require('../../assets/img/xx/temp.png'),
+        termNum1: '体温:',
+        termNum2: '测量时间:',
+        unit: '°C',
+        style: 'color:#13b8ea',
+        type: 'temp',
+        id: 8
+    },
+    {
+        name: '尿酸',
+        icon: require('../../assets/img/list-temp-s.png'),
+        line: require('../../assets/img/xx/temp.png'),
+        termNum1: '尿酸:',
+        termNum2: '测量时间:',
+        unit: 'umol/L',
+        style: 'color:#b1e531',
+        type: 'ua',
+        id: 9
+    },
+    {
+        name: '肺活量',
+        icon: require('../../assets/img/list-vc-s.png'),
+        line: require('../../assets/img/xx/vc.png'),
+        termNum1: '肺活量:',
+        termNum2: '测量时间:',
+        unit: 'umol/L',
+        style: 'color:#fb5ea2',
+        type: 'vc',
+        id: 10
+    },
+    {
+        name: '脂肪',
+        icon: require('../../assets/img/list-fat-s.png'),
+        line: require('../../assets/img/xx/fat.png'),
+        termNum1: '脂肪率:',
+        termNum2: '测量时间:',
+        unit: '%',
+        style: 'color:#fb5ea2',
+        type: 'fat',
+        id: 11
+    },
+    {
+        name: 'B超',
+        icon: require('../../assets/img/list-ultrasonic-s.png'),
+        line: require('../../assets/img/xx/ultrasonic.png'),
+        termNum1: '',
+        termNum2: '测量时间:',
+        unit: '',
+        style: 'color:#fcd200',
+        type: 'ultrasonic',
+        id: 12
+    },
+    {
+        name: '缺血适应仪',
+        icon: require('../../assets/img/list-vc-s.png'),
+        line: require('../../assets/img/xx/vc.png'),
+        termNum1: '',
+        termNum2: '测量时间:',
+        unit: '',
+        style: 'color:#fcd200',
+        type: 'ischemia',
+        id: 13
+    },
+    {
+        name: '动脉硬化检测',
+        icon: require('../../assets/img/list-vc-s.png'),
+        line: require('../../assets/img/xx/vc.png'),
+        termNum1: 'AVI/API:',
+        termNum2: '测量时间:',
+        unit: '',
+        style: 'color:#fcd200',
+        type: 'artery',
+        id: 14
+    },
+]
+export {
+    healthType
+}

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

@@ -109,9 +109,10 @@ export default {
         }
         if (this.info.length >= res.total) {
           this.finished = true
+        } else {
+          this.pageNum++
         }
         this.loading = false
-        this.pageNum++
       }
     },
     onLoad() {

src/views/zhulao/views/shoppingMall/submitOrder.vue

@@ -0,0 +1,206 @@
+<template>
+  <div class="main">
+    <van-nav-bar title="提交订单" @click-left="$router.back()" left-arrow fixed placeholder safe-area-inset-top />
+    <!-- 收货人 -->
+    <div class='consignee_bg' @click='$router.push({path:"/address",query:{}})'>
+      <div v-if="logisticsInfoData.id != null" class='consignee_bg_left'>
+        <div class='consignee_bg_left_title consignee_bg_left_titleTop'>收货人</div>
+        <div>
+          <span class='consignee_bg_left_name'>{{logisticsInfoData.name}}</span>
+          <span class='consignee_bg_left_phone'>{{logisticsInfoData.phone}}</span>
+        </div>
+        <div class='consignee_bg_left_adress consignee_bg_left_adressBottom'>{{logisticsInfoData.fullAddress}} </div>
+      </div>
+
+      <div v-else class='consignee_bg_left'>
+        <div class='consignee_bg_left_none'>选择/新建地址</div>
+      </div>
+
+      <div class='consignee_bg_right'>
+        <van-image :src="require('../../assets/images/store-food/arrow-right.png')" />
+      </div>
+
+    </div>
+    <div style="width:100%;height:10px; background-color: #f5f5f5;"></div>
+    <!-- 商品详情 -->
+    <div class="goods_bg">
+      <!-- icon -->
+      <div class="icon_bg">
+        <van-image class="goodIcon" :src="goodsData.url?goodsData.url:require('../../assets/images/appIcon/appIcon_01.png')" />
+      </div>
+      <!-- food name -->
+      <div class="name_bg">
+        <div>{{goodsData.productName}}</div>
+      </div>
+      <!-- 价格 -->
+      <div class="price_bg">
+        <div class="price">¥ {{goodsData.price}}</div>
+        <div class="goodNum">x {{buyNumber}}</div>
+      </div>
+    </div>
+
+    <!-- 去下订单 -->
+    <div class="footer-box">
+      <div class="topay_price_bg">
+        <div class="price_tip">实付金额:</div>
+        <div class="sum_price">¥ {{goodsData.sumPrice}}</div>
+      </div>
+      <div class="toPay_bg">
+        <div class="pay">提交订单</div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      logisticsInfoData: '',
+      goodsData: '',
+      buyNumber: '',
+    }
+  },
+  created() {
+    this.goodsData = JSON.parse(decodeURI(this.$route.query.goodsData))
+    this.buyNumber = this.$route.query.buyNumber
+    this.goodsData.sumPrice = (this.buyNumber * this.goodsData.price).toFixed(2)
+    console.log(this.goodsData)
+  },
+  methods: {
+    consigneeClick() {},
+  },
+}
+</script>
+<style lang="scss" scoped>
+// .main {
+//   background-color: #f5f5f5;
+// }
+/* 收货信息 */
+.consignee_bg {
+  max-height: 200px;
+  width: 100%;
+  display: flex;
+  align-items: center;
+  background-color: #fff;
+  min-height: 100px;
+  border-top: solid 4px #f0f0f0;
+}
+
+.consignee_bg_left {
+  height: 100%;
+  flex: 0.9;
+}
+.consignee_bg_left_none {
+  line-height: 100%;
+  padding-left: 20px;
+  font-size: 30px;
+}
+.consignee_bg_left_adress,
+.consignee_bg_left_name,
+.consignee_bg_left_title {
+  font-size: 14px;
+  margin-left: 20px;
+}
+.consignee_bg_left_titleTop {
+  margin-top: 10px;
+}
+.consignee_bg_left_adressBottom {
+  margin-bottom: 10px;
+}
+.consignee_bg_left_phone {
+  color: #c0bfbf;
+  font-size: 13px;
+  margin-left: 10px;
+}
+
+.consignee_bg_right {
+  flex: 0.1;
+  height: 30px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .van-image {
+    height: 100%;
+  }
+}
+.goods_bg {
+  margin-top: 20px;
+  width: 100%;
+  height: 180px;
+  font-size: 30px;
+  color: #3d4244;
+  border-bottom: solid 1px #f0f0f0;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  background-color: white;
+}
+.icon_bg {
+  width: 250px;
+  height: 120px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.goodIcon {
+  width: 200px;
+  height: 100%;
+}
+.name_bg {
+  width: 300px;
+  height: 120px;
+}
+.price_bg {
+  width: 200px;
+  height: 120px;
+  padding-right: 30px;
+  box-sizing: border-box;
+}
+.footer-box {
+  width: 100%;
+  height: 100px;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-top: solid 10px #f0f0f0;
+  /* box-shadow:0 0 2px 0; */
+}
+.topay_price_bg {
+  flex: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #3f3f3f;
+  font-size: 30px;
+}
+.price_tip {
+  flex: 1;
+  text-align: right;
+  padding-right: 20px;
+  box-sizing: border-box;
+}
+.sum_price {
+  flex: 1;
+  color: #f63717;
+  font-size: 30px;
+  text-align: left;
+}
+.toPay_bg {
+  flex: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.pay {
+  width: 80%;
+  line-height: 80px;
+  font-size: 30px;
+  color: #fff;
+  background: linear-gradient(to bottom, #fc8253, #fc4314);
+  text-align: center;
+  border-radius: 18px;
+}
+</style>

vue.config.js

@@ -108,6 +108,15 @@ module.exports = {
                 pathRewrite: {
                     ['^' + process.env.VUE_APP_ZL_JF]: ''
                 }
+            },
+            [process.env.VUE_APP_ZL_HEALTH]: {
+                target: 'http://test.poteviohealth.com:8080/',
+                // target: 'http://localhost:12017/',
+                changeOrigin: true,
+                secure: false,
+                pathRewrite: {
+                    ['^' + process.env.VUE_APP_ZL_HEALTH]: ''
+                }
             }
         }
         // after: require('./mock/mock-server.js')