Merge branch 'dev-stage2-20191125' of...

Merge branch 'dev-stage2-20191125' of http://192.168.110.53/com.pica.cloud.foundation.frontend/year-end-activitiy into dev-stage2-20191125

assets/style/in-activity.less

@@ -46,13 +46,11 @@
       }
     }
   }
-  .big-bg-wrap{
-    width: 100%; height: auto; overflow: hidden;
-    background: url('../img/stage-two/bg-01.png') no-repeat left top;
-    background-size: 100% 100%;
-   
+  
     .award-wrap{
-      width: 100%; height: 180px; overflow: hidden; 
+      width: 100%; height: 214px; overflow: hidden; 
+      background: url('../img/stage-two/top-stage-bg.png') no-repeat left top;
+      background-size: 100% 100%;
       .stage-rule{
         width: 100%; height: 52px; overflow: hidden;
         .stage-text{
@@ -72,7 +70,7 @@
     .user-info-wrap{
       position: relative;
       width: 355px; height: 480px; 
-      margin: 2px auto 0;
+      margin: 35px auto 0;
       background: url('../img/stage-two/user-info-bg.png') no-repeat left top;
       background-size: 100% 100%;
       .gold-coin{
@@ -164,7 +162,7 @@
       .score-tips{
         width: 325px; height: 25px; overflow: hidden; margin: 0 auto;
         background:#FFF1D0; color: #FD5A2F; text-indent: 10px; font-size: 12px; line-height: 25px;
-        border-radius: 25px; margin-top: 5px;
+        border-radius: 8px; margin-top: 5px;
       }
       .bean-wrap{
         width: 325px; height: 27px; overflow: hidden;
@@ -217,7 +215,7 @@
     // 未登录
     .not-login-wrap{
       position: relative;
-      width: 325px; height: 50px; margin: 0 auto;
+      width: 325px; height: 50px; margin: 35px auto 0;
       padding: 20px 15px;
       border-radius: 13px;
       background: #FFF;
@@ -261,13 +259,12 @@
       }
     }
 
-  }
   
   // 邀请医生好友学课程
   .invite-doctor-wrap{
     position: relative;
     width: 355px; height: 242px; 
-    margin: 50px auto 0; 
+    margin: 0 auto 0; 
     background: #FFF; border-radius: 13px;
     .top-head-icon{
       position: absolute; left:50%; top:-32px; margin-left: -158px; z-index:200;
@@ -334,7 +331,7 @@
 
   // 每日任务
   .daily-task{
-    width: 325px; height: 278px; margin: 30px auto 0;
+    width: 325px; height: 278px; margin: 35px auto 0;
     background: #FFF; border-radius: 13px;
     padding: 0 15px;
     .top-center-bar{

package-lock.json

@@ -9697,9 +9697,9 @@
       "integrity": "sha512-gwtKq3QWbXMQpdHf7tFKQWYvknQBU+qJUFxLxskHL10mChguSkyl7CxFND1mafVApTH6N1qgAOKKQLILgaJhTw=="
     },
     "pica-wx-share": {
-      "version": "1.1.3",
-      "resolved": "http://192.168.110.93:4873/pica-wx-share/-/pica-wx-share-1.1.3.tgz",
-      "integrity": "sha512-iPUiTr4Gj0ndetUViqkNr9tPcJxycVFSMVlWCowQNe3mlZvfrFddKbD6AXLWB9Pc9aducYmYcTwGzX7s8PWspA==",
+      "version": "1.2.0",
+      "resolved": "http://192.168.110.93:4873/pica-wx-share/-/pica-wx-share-1.2.0.tgz",
+      "integrity": "sha512-n3eD91DADLLKzfDAncGSJ1TKZW78aVIQ7n+HivbZMrzC1bzq1+0wfkBrElcBPTCYSE62NMzBFrX6XvDme4eW+w==",
       "requires": {
         "axios": "^0.18.0",
         "weixin-js-sdk": "^1.4.0-test"

package.json

@@ -21,7 +21,7 @@
     "nuxt": "^2.0.0",
     "pica-h5-login": "^1.0.63",
     "pica-jsbridge": "^1.0.1",
-    "pica-wx-share": "^1.1.3",
+    "pica-wx-share": "^1.2.0",
     "query-string": "^6.9.0",
     "sass-loader": "^8.0.0",
     "vant": "^2.0.9",

pages/prehot.vue

@@ -69,7 +69,6 @@ import { Toast } from 'vant';
 import { remind, getRemindStatus, checkHospitalStatus, getCnt, checkToken } from '@/service';
 import h5header from '@/components/h5header';
 import shareContainer from '@/components/share-container';
-import { BASE_URL } from '@/utils/enumerate';
 
 export default {
   // head() {
@@ -152,16 +151,8 @@ export default {
     this.scrollHandle();
     // 微信分享
     this.$picaWxShare({
-      // baseUrl: BASE_URL[process.env.NUXT_ENV_APP],
-      baseUrl: 'https://test1-sc.yunqueyi.com',
-      authUrl: window.location.href,
-      isDebug: false,
-      type: 15,
-      jsApiList: [
-        'checkJsApi',
-        'onMenuShareTimeline',
-        'onMenuShareAppMessage'
-      ]
+      type: (process.env.NUXT_ENV_APP != 'prod') ? 15 : '',
+      authUrl: wxShare.shareUrl
     },(wx)=>{
       const title = this.shareObj.title1;
       const desc = this.shareObj.title2;

pages/shareActive.vue

@@ -55,7 +55,6 @@
 <script>
 	import { getInviteInfo, getCourseById, getCaptchaGet, getAuthCode } from '@/service';
 	import { wxShare } from '@/configs/wxShare';
-	import { BASE_URL } from '@/utils/enumerate';
 	import { Base64 } from 'js-base64';
 	const queryString = require('query-string');
 	const TIMEALL = 60000; // 倒计时常量 60 秒
@@ -73,7 +72,6 @@
 				time: TIMEALL,
 				btnMsg: '点击获取',
 				isReq: false,
-				shareObj: wxShare,
 			}
 		},
 		async asyncData({ query }){
@@ -104,23 +102,16 @@
   		document.querySelector('body').setAttribute('style', 'background: #FE9A51;');
   		this.checkCache();
   		// 微信分享
-	    this.shareObj.shareUrl = window.location.href;
-	    window.localStorage.setItem('shareUrl', this.shareObj.shareUrl);
+	    wxShare.shareUrl = window.location.href;
+	    window.localStorage.setItem('shareUrl', wxShare.shareUrl);
 	    this.$picaWxShare({
-	      // baseUrl: BASE_URL[process.env.NUXT_ENV_APP],
-	      baseUrl: 'https://test1-sc.yunqueyi.com',
-	      type: 15,
-	      authUrl: this.shareObj.shareUrl,
-	      isDebug: false,
-	      jsApiList: [
-	        'onMenuShareTimeline',
-	        'onMenuShareAppMessage'
-	      ]
+	      type: (process.env.NUXT_ENV_APP != 'prod') ? 15 : '',
+	      authUrl: wxShare.shareUrl,
 	    },(wx)=>{
-	      const title = this.shareObj.title1;
-	      const desc = this.shareObj.title2;
+	      const title = wxShare.title1;
+	      const desc = wxShare.title2;
 	      const link = window.localStorage.getItem('shareUrl') || window.location.href;
-	      const imgUrl = this.shareObj.shareImageUrl;
+	      const imgUrl = wxShare.shareImageUrl;
 	       // 分享给朋友
 	      wx.onMenuShareAppMessage({
 	        title,desc,link,imgUrl

pages/shareResult.vue

@@ -54,11 +54,9 @@
 
 <script>
 	import { wxShare } from '@/configs/wxShare';
-	import { BASE_URL } from '@/utils/enumerate';
 	export default {
 		data(){
 			return {
-				shareObj: wxShare,
 				statusTxt: ''
 			}
 		},
@@ -66,22 +64,15 @@
 			this.statusTxt = (this.$route.query.status.toString()=='true') ? '领取成功' : '您已领取';
   		document.querySelector('body').setAttribute('style', 'background: "";');
   		// 微信分享
-	   	this.shareObj.shareUrl = window.location.href;
+	   	wxShare.shareUrl = window.location.href;
 	    this.$picaWxShare({
-	      // baseUrl: BASE_URL[process.env.NUXT_ENV_APP],
-	      baseUrl: 'https://test1-sc.yunqueyi.com',
-	      type: 15,
-	      authUrl: this.shareObj.shareUrl,
-	      isDebug: false,
-	      jsApiList: [
-	        'onMenuShareTimeline',
-	        'onMenuShareAppMessage'
-	      ]
+	      type: (process.env.NUXT_ENV_APP != 'prod') ? 15 : '',
+	      authUrl: wxShare.shareUrl
 	    },(wx)=>{
-	      const title = this.shareObj.title1;
-	      const desc = this.shareObj.title2;
+	      const title = wxShare.title1;
+	      const desc = wxShare.title2;
 	      const link = window.localStorage.getItem('shareUrl') || window.location.href;
-	      const imgUrl = this.shareObj.shareImageUrl;
+	      const imgUrl = wxShare.shareImageUrl;
 	       // 分享给朋友
 	      wx.onMenuShareAppMessage({
 	        title,desc,link,imgUrl