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

@@ -216,18 +216,24 @@
 
     // 未登录
     .not-login-wrap{
+      position: relative;
       width: 325px; height: 50px; margin: 0 auto;
       padding: 20px 15px;
-      overflow: hidden;
       border-radius: 13px;
       background: #FFF;
+      .gold-coin{
+        position: absolute; right: -20px; top: -32px;
+        width: 63px; height: 65px; border:0; display: block;
+      }
       .head-icon{
         width: 50px; height: 50px; display: block; border: 0;
         float: left;
       }
       .content-info{
-        width: 202px; height: 50px; overflow: hidden;
-        padding-left: 15px;
+        float: left;
+        width: 177px; height: 50px; overflow: hidden;
+        margin-left: 15px;
+        
         .not-login-text{
           width: 202px; height: 28px; 
           color: #373839; font-size: 18px; line-height: 28px; font-weight: 700;
@@ -237,6 +243,22 @@
           color: #676869; font-size: 14px; line-height: 18px;
         }
       }
+      .go-login{
+        position: relative;
+        float: left;
+        width: 56px; height: 25px; margin: 14px 0 0 24px;
+        border: 1px solid #FD5A2F;
+        border-radius: 25px; font-size: 12px; line-height: 25px; text-indent: 8px;
+        color: #FD5A2F; font-weight: 700;
+        &.login-but-nojoin{
+          width: 70px; height: 25px; 
+          margin: 14px 0 0 10px;
+        }
+        img{ 
+          position: absolute; right: 5px; top: 50%; margin-top:-5px;
+          width: 6px; height: 11px; 
+        }
+      }
     }
 
   }
@@ -298,7 +320,7 @@
       }
       .text{
         position: absolute; left: 0; top: 0;
-        width: 331px; height: 45px;
+        width: 331px; height: 50px;
         color: #B42F00; font-size: 22px; line-height: 45px; 
         text-align: center; font-weight: 700; letter-spacing: 1px;
       }

service/activityMainpage.js

+// 年终活动第二期 主页面请求
+
+import request from './api';
+
+// 获取已邀请的医生列表
+
+export const getInviteList = (token) => {
+	return request({
+    url: `campaign/inviteDetail/oneList?pageNo=1&pageSize=10`,
+    method: 'get',
+    headers: {
+      token: token
+    }
+  })
+}
\ No newline at end of file

utils/jsbridge.js

@@ -16,7 +16,7 @@ export const JsBridgeOptions = {
   GLOBAL_NAME: 'rocNative',
   NATIVE_IOS_NAME: 'rociOS',
   NATIVE_ANDROID_NAME: '__rocAndroid',
-  initMethodsWithCallBack: ['getToken', 'getUserInfo','addEnclosure', 'getStatusBarHeight','getAppVersionCode'], // value is string
+  initMethodsWithCallBack: ['getToken', 'getUserInfo','addEnclosure', 'getStatusBarHeight','getAppVersionCode','getLocalData'], // value is string
   initMethodsWithoutCallBack: [
   'appInit', 
   'goBack',
@@ -33,8 +33,7 @@ export const JsBridgeOptions = {
   'setNeedClearUrl', 
   'dispatchEventByModuleCode',
   'sendBuriedPoint',
-  'openErrorDebug',
-  'getLocalData'
+  'openErrorDebug'
   ] // value is string
 }