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/index.less

@@ -366,4 +366,108 @@
       }
     }
   }
-}
+}
\ No newline at end of file
+.wx-share-result{
+  width: 375px;
+  height: 601.5px;
+  section{
+    width: 375px;
+    height: 601.5px;
+    padding-top: 40px;
+    .res-wrap{
+      img{
+        width: 70px;
+        height: 60px;
+        display: block;
+        margin: 0 auto;
+      }
+      h1{
+        font-size:20px;
+        font-weight:700;
+        color:rgba(55,56,57,1);
+        line-height:20px;
+        margin: 20px 0;
+        text-align: center;
+      }
+      h3{
+        font-size:13px;
+        line-height:13px;
+        text-align: center;
+        margin-bottom: 30px;
+        color:rgba(151,152,153,1);
+      }
+    }
+    .btn-app{
+      width: 335px;
+      height: 40px;
+      line-height:40px;
+      border-radius:22.5px;
+      font-size:16px;
+      font-weight:700;
+      text-align: center;
+      margin: 0 auto;
+    }
+    .down-app{
+      background:linear-gradient(270deg,rgba(255,88,36,1) 0%,rgba(254,163,86,1) 100%);
+      color:rgba(255,255,255,1);
+    }
+    .has-app{
+      margin-top: 12px;
+      margin-bottom: 40px;
+      border:1px solid rgba(151,152,153,1);
+      color:rgba(103,104,105,1);
+    }
+    .line{
+      width: 375px;
+      height: 5px;
+      background:rgba(248,249,250,1);
+    }
+    .more-course{
+      padding: 30px 15px;
+      header{
+        font-size:18px;
+        font-weight:700;
+        color:rgba(51,51,51,1);
+        line-height:18px;
+      }
+      .course-list{
+        width: 345px;
+        .course-item{
+          width: 345px;
+          margin-top: 20px;
+          display: flex;
+          justify-content: space-between;
+          div{
+            h1{
+              font-size:16px;
+              font-weight:700;
+              color:rgba(55,56,57,1);
+              line-height:16px;
+            }
+            h3{
+              font-size:13px;
+              color:rgba(151,152,153,1);
+              line-height:13px;
+            }
+          }
+          .course-txt{
+            width: 240px;
+            border-bottom: .5px solid rgba(240,241,242,1);
+            h3{
+              margin-top: 12px;
+            }
+          }
+          .course-img{
+            width: 90px;
+            height: 60px;
+            img{
+              width: 90px;
+              height: 60px;
+              display: block;
+            }
+          }
+        }
+      }
+    }
+  }
+}

pages/shareResult.vue

 <template>
-	<div>
-		<h1>result-share</h1>
+	<div class="wx-share-result">
+		<section>
+			<div class="res-wrap">
+				<img src="../assets/img/resimg0.png">
+				<h1>{{statusTxt}}</h1>
+				<h3>登录云鹊医APP立即开始学习</h3>
+			</div>
+			
+			<div class="btn-app down-app" @click="downApp">下载APP</div>
+			<div class="btn-app has-app" @click="downApp">已有APP</div>
+
+			<div class="line"></div>
+			
+			<div class="more-course">
+				<header>更多精彩好课推荐</header>
+				<div class="course-list">
+					<div class="course-item">
+						<div class="course-txt">
+							<h1>高血压系列课程</h1>
+							<h3>《高血压的发病机制》等总计4门课程</h3>
+						</div>
+						<div class="course-img"><img src="../assets/img/resimg1.png"></div>
+					</div>
+
+					<div class="course-item">
+						<div class="course-txt">
+							<h1>糖尿病系列课程</h1>
+							<h3>《胰岛素的选择和管理》等总计4门课程</h3>
+						</div>
+						<div class="course-img"><img src="../assets/img/resimg2.png"></div>
+					</div>
+
+					<div class="course-item">
+						<div class="course-txt">
+							<h1>中医系列课程</h1>
+							<h3>《慢性胃炎的中医治疗》等总计3门课程</h3>
+						</div>
+						<div class="course-img"><img src="../assets/img/resimg3.png"></div>
+					</div>
+
+					<div class="course-item">
+						<div class="course-txt">
+							<h1>全科系列课程</h1>
+							<h3>《胸痛原因待查》等总计3门课程</h3>
+						</div>
+						<div class="course-img"><img src="../assets/img/resimg4.png"></div>
+					</div>
+				</div>
+			</div>
+		</section>
 	</div>
 </template>
 
 <script>
 	export default {
 		asyncData({ query }){
-			console.log(query)
 			const { status } = query; // 上个页面传递过来领取结果， false 为已领取， true 为领取成功
+			const statusTxt = (status=='true') ? '领取成功' : '您已领取';
+			return {
+				statusTxt
+			}
+		},
+		methods: {
+			downApp(){
+				window.location.href = 'https://android.myapp.com/myapp/detail.htm?apkName=com.picahealth.yunque&ADTAG=mobile';
+			}
 		}
 	}
-</script>
+</script>
\ No newline at end of file
+
+<style lang="less" scoped>
+@import '../assets/style/index.less';
+</style>
+<style lang="less">
+@import '../assets/style/revant.less';
+</style>
\ No newline at end of file

service/index.js

@@ -90,3 +90,5 @@ export const getAuthCode = ({ mobilePhone, flag, captchaToken, captchaAnswer })
     },
   })
 }
+
+