Merge branch 'master' of http://47.110.145.204:8085/godwithdh/wx_h5

src/libs/host.js

@@ -30,7 +30,7 @@ function urlFun(name){
 
         /**
          * 健康打卡统计
-         */
+         */ 
         health:`https://weixin.huansi.net/apiproxy/huansi/service/proxy/1225621052093239296`
         // health:`http://xuxiaoming.vaiwan.com`
     }

src/view/healthCard/statistics/chart.vue

@@ -445,7 +445,7 @@ export default {
             data:[
                 {key:'url',value:'statistical_details_data'},
                 {key:'dDate',value: this.hdr.dDate},
-                {key:'iCompanyId',value: this.hdr.iCompanyId || "1"}
+                {key:'iCompanyId',value: this.hdr.iCompanyId}
             ],
             params:{},
         },'加载中',{});
@@ -495,7 +495,7 @@ export default {
             data:[
                 {key:'url',value:'HealthLog'},
                 {key:'dDate',value: this.hdr.dDate},
-                {key:'iCompanyId',value: this.hdr.iCompanyId || "1"},
+                {key:'iCompanyId',value: this.hdr.iCompanyId},
                 {key:'iType',value:'1'}
             ],
             params:{

src/view/healthCard/statistics/index.vue

@@ -74,6 +74,15 @@
         .items:last-child{
           margin-bottom:15px;
         }
+        .img{
+            width:100%;
+            display: flex;
+            justify-content: center;
+            img{
+                width:100%;
+                height:300px;
+            }
+        }
     }
 </style>
 
@@ -104,6 +113,9 @@
         </div>
       </div>      
     </div>
+    <div class="img" v-if="list.length <= 0">
+      <img src="@/assets/noData.jpg" class="_img" alt="">
+    </div>
   </div>
 </template>
 
@@ -115,11 +127,12 @@ export default {
   name: 'healthCardStatisticsIndex',
   data () {
     return {
-      list:[]
+      list:[],
+      openId:''
     }
   },
   components:{
-
+    
   },
   computed:{
     ...mapState({
@@ -127,7 +140,7 @@ export default {
     })
   },
   async mounted(){
-
+    this.openId=this.$route.query.openId;
   },
   async activated(){
     window.d = this;
@@ -138,7 +151,7 @@ export default {
       let res = await this.request('getStatisticalDetails',{
           data:[
               {key:'url',value:'statistical_details'},
-              {key:'openid',value:'3'}
+              {key:'openid',value:this.openId}
           ],
           params:{},
       },'加载中',{});

src/view/healthCard/statistics/list.vue

@@ -150,7 +150,7 @@ export default {
             data:[
                 {key:'url',value:'HealthLog'},
                 {key:'dDate',value: this.hdr.dDate},
-                {key:'iCompanyId',value:'1'},
+                {key:'iCompanyId',value:this.hdr.iCompanyId},
                 {key:'iType',value:'1'}
             ],
             params:{
@@ -173,7 +173,7 @@ export default {
             data:[
                 {key:'url',value:'HealthLog'},
                 {key:'dDate',value:this.hdr.dDate},
-                {key:'iCompanyId',value:'1'},
+                {key:'iCompanyId',value:this.hdr.iCompanyId},
                 {key:'iType',value:'0'}
             ],
             params:{