Merge branch 'release' into dev-stage3-20191212

components/h5header/index.less

@@ -30,4 +30,7 @@ header{
 	.bgfff{
 		background: #fff;
 	}
+	.bg5c5c5c{
+		background: #5C5C5C;
+	}
 }
\ No newline at end of file

components/h5header/index.vue

 <template>
 	<header>
-		<div class="status" :class="{'bgfff': isScroll}" :style="{height: statusBarHeight + 'Px', background: bgColor}"></div>
+		<div class="status" :class="[barClass]" :style="{height: statusBarHeight + 'Px'}"></div>
 		<!-- <div class="head-wrap" :class="{'bgfff': isScroll}" :style="{height: titleHeight + 'px'}"> -->
     <div class="head-wrap" :class="{'bgfff': isScroll}">
 			<img @click="goBack" :src="leftIcon">
@@ -59,7 +59,8 @@
     },
     data(){
     	return {
-    		bgColor: '',
+        barClass: '',
+    		// bgColor: '',
     		leftIcon: leftimg1,
     		rightIcon: rightimg1,
     		isScroll: false,
@@ -82,6 +83,9 @@
         if(val){
           this.leftIcon = leftimg2;
           this.rightIcon = rightimg2;
+          this.barClass = this.$rocNative.isIOS ? 'bgfff' : 'bg5c5c5c';
+        }else{
+          this.barClass = this.isOpacity ? '' : 'bg5c5c5c';
         }
       }
     },
@@ -90,14 +94,7 @@
     	setHeaderHeight(){
     		this.$rocNative.getStatusBarHeight().then(res=>{
 	  			const dpr = window.devicePixelRatio;
-	    		if(this.$rocNative.isIOS){
-	          // this.statusBarHeight = res.statusBarHeight * dpr;
-	          // this.titleHeight = this.titleHeight * dpr;
-            this.statusBarHeight = res.statusBarHeight;
-	        }else{
-	        	this.bgColor = '#ccc';
-	          this.statusBarHeight = res.statusBarHeight / dpr;
-	        }
+          this.statusBarHeight = this.$rocNative.isIOS ? res.statusBarHeight: res.statusBarHeight / dpr;
           this.$emit('getHeaderHeight', this.statusBarHeight + 44);
 	    	})
     	},

package-lock.json

@@ -2818,6 +2818,11 @@
         "schema-utils": "^1.0.0"
       }
     },
+    "callapp-lib": {
+      "version": "2.1.8",
+      "resolved": "http://192.168.110.93:4873/callapp-lib/-/callapp-lib-2.1.8.tgz",
+      "integrity": "sha512-9FUmTz0LCCF43LhiMEN3CJ4RuLGppu8hOn0u9UzUFyd7TU7AXW82Zc9qTq4Mfes36yOGqNYO1v8DJdkQY7+7rA=="
+    },
     "caller-callsite": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
@@ -6294,8 +6299,7 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -6316,14 +6320,12 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -6338,20 +6340,17 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -6468,8 +6467,7 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "ini": {
               "version": "1.3.5",
@@ -6481,7 +6479,6 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -6496,7 +6493,6 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -6504,14 +6500,12 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -6530,7 +6524,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -6611,8 +6604,7 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -6624,7 +6616,6 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -6710,8 +6701,7 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -6747,7 +6737,6 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -6767,7 +6756,6 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -6811,14 +6799,12 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },
@@ -9648,6 +9634,33 @@
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
+    "pica-call-app": {
+      "version": "1.0.42",
+      "resolved": "http://192.168.110.93:4873/pica-call-app/-/pica-call-app-1.0.42.tgz",
+      "integrity": "sha512-SV1Ipa02GU3lT1cPC1qVD1GfiqHdFvXUA2TdxdncqTVUbqfJ27FlT+Beu3eWu9GdqDI5nRnu0sGk+pwH0QcsIA==",
+      "requires": {
+        "callapp-lib": "^2.1.7",
+        "vant": "^1.4.2"
+      },
+      "dependencies": {
+        "@vant/icons": {
+          "version": "1.1.7",
+          "resolved": "http://192.168.110.93:4873/@vant%2ficons/-/icons-1.1.7.tgz",
+          "integrity": "sha1-KVYa3/+mp1DSedzNvpppt0OTTz8="
+        },
+        "vant": {
+          "version": "1.6.28",
+          "resolved": "http://192.168.110.93:4873/vant/-/vant-1.6.28.tgz",
+          "integrity": "sha512-yGiQFPA7tmvlA05ezWg2MnknDK2OKlHmJurvHm2mWt1zdjfiVDJj+XFh6xMY8jZUsBZMWqdBSc+gAKzII8fOqg==",
+          "requires": {
+            "@babel/runtime": "^7.4.3",
+            "@vant/icons": "1.1.7",
+            "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0-beta.3",
+            "vue-lazyload": "1.2.3"
+          }
+        }
+      }
+    },
     "pica-h5-login": {
       "version": "1.0.63",
       "resolved": "http://192.168.110.93:4873/pica-h5-login/-/pica-h5-login-1.0.63.tgz",
@@ -13615,7 +13628,6 @@
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
-              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -13762,15 +13774,13 @@
             "minimatch": {
               "version": "3.0.4",
               "bundled": true,
-              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
             },
             "minimist": {
               "version": "0.0.8",
-              "bundled": true,
-              "optional": true
+              "bundled": true
             },
             "minipass": {
               "version": "2.3.5",
@@ -13863,8 +13873,7 @@
             },
             "number-is-nan": {
               "version": "1.0.1",
-              "bundled": true,
-              "optional": true
+              "bundled": true
             },
             "object-assign": {
               "version": "4.1.1",

package.json

@@ -19,6 +19,7 @@
     "koa": "^2.6.2",
     "node-sass": "^4.12.0",
     "nuxt": "^2.0.0",
+    "pica-call-app": "^1.0.42",
     "pica-h5-login": "^1.0.63",
     "pica-jsbridge": "^1.0.1",
     "pica-wx-share": "^1.2.0",

pages/activityPage.vue

@@ -647,7 +647,7 @@
         vm.$sendBuriedData({
           component_tag: `302#302003`
         });
-        let url = 'https://phome.yunqueyi.com/template_v2/?id=599&token=9D4E3E66DC214776A523752AC26D4329&wx_code=7519926147';
+        let url = 'https://phome.yunqueyi.com/template_v2/?id=594&token=829DF119D16A4220BD2C0F52C913D482&wx_code=9164340046';
         // alert(url)
         let paramList = [
           {

pages/hospital-ranking/index.less

@@ -107,8 +107,13 @@
       font-size: 14px;
       padding: 0 25px 0 13px;
       margin-bottom: 3px;
+      .rank-name {
+        display: inline-block;
+        width: 56px;
+        text-align: center;
+      }
       .marginL {
-        margin-left: 11px;
+        margin-left: 7.5px;
       }
       .marginAuto {
         margin-left: auto;

pages/hospital-ranking/index.vue

@@ -29,15 +29,15 @@
       </div>
       <div class="info info-doctor" v-else>
         <img :src="contributionRanking.avatarImageUrl" alt="">
-        <div class="content" v-if="contributionRanking.score">
+        <div class="content" v-if="contributionRanking.userTotalScore">
           <div class="con details details-d">
             <p class="item">
-              <span class="label">累计排名</span>
-              <span class="value">{{contributionRanking.rank}}</span>
+              <span class="label">我的贡献排名</span>
+              <span class="value">{{contributionRanking.score?contributionRanking.rank:'-'}}</span>
             </p>
             <p class="line"></p>
             <p class="item">
-              <span class="label">累计勤奋分 </span>
+              <span class="label">我贡献的勤奋分</span>
               <span class="value">{{contributionRanking.score}}</span>
             </p>
           </div>
@@ -53,7 +53,7 @@
       <div class="description description-h" v-if="activeBtnType"><span>{{dealRankName(hospitalRanking.hospitalType)}}</span>排行实时刷新，部分原因存在几分钟延迟</div>
       <div class="description description-d" v-else>排行实时刷新，部分原因存在几分钟延迟</div>
       <div class="ranking-title">
-        <span>TOP100</span>
+        <span class="rank-name">{{activeBtnType?'TOP100':'排行'}}</span>
         <!--<span class="marginL">机构名称</span>
         <span class="marginAuto">机构勤奋分</span>-->
         <span class="marginL">{{activeBtnType?'机构名称':'机构成员'}}</span>

pages/shareResult.vue

@@ -49,17 +49,19 @@
 				</div>
 			</div>
 		</section>
-		<div v-if="showMask" @click="showMask=false" class="mask-div"><img src="../assets/img/mask.png"></div>
+		<!-- <div v-if="showMask" @click="showMask=false" class="mask-div"><img src="../assets/img/mask.png"></div> -->
 	</div>
 </template>
 
 <script>
+	import { getShareUrl } from '@/utils/index';
 	import { wxShare } from '@/configs/wxShare';
 	export default {
 		data(){
 			return {
 				statusTxt: '',
-				showMask: false,
+				// showMask: false,
+				path: getShareUrl() + 'year_end_ssr/activityPage',
 			}
 		},
 		mounted(){
@@ -105,7 +107,8 @@
 				this.$sendBuriedData({
 	        component_tag: `310#310002`
 	      });
-				this.showMask = true;
+	      this.$callApp(this.path);
+				// this.showMask = true;
 			},
 			goLink(id){
 				let link = '';

plugins/vueComponent.js

@@ -2,7 +2,9 @@ import Vue from 'vue'
 import {
 	BASE_URL
 } from '@/utils/enumerate';
+import PicaCallApp, { callApp } from 'pica-call-app';
 import PicaWxShare from 'pica-wx-share';
+Vue.prototype.$callApp = callApp;
 Vue.prototype.$picaWxShare = PicaWxShare;
 
 import PicaH5Login from 'pica-h5-login';