Merge branch 'feature/union-apply' into 'release/6.7.9'

Feature/union apply



See merge request !1567

@@ -101,15 +101,22 @@ module.exports = class extends global.yoho.BaseModel {
      */
     submitApply(params) {
         let uid = params.uid;
+        let unionType = params.union_type;
+        let union = {};
+
+        if (unionType) {
+            union.union_type = unionType;
+        }
 
         delete params.uid;
+        delete params.union_type;
 
         return this.get({
-            data: {
+            data: Object.assign({
                 method: 'app.union.shareOrder.userApply',
                 uid: uid,
                 parameters: JSON.stringify(params)
-            }
+            }, union)
         });
     }
 

@@ -7,7 +7,7 @@
             <li><span>手机号码</span><input type="number" class="mobile" placeholder="请输入手机号码" /></li>
             <li><span>微信号</span><input type="text" class="wechat" placeholder="请输入微信号（选填）" /></li>
         </ul>
-        <p class="other">提供微信号，方便邀您加入达人微信群，赚钱秘籍、特殊福利享不停！添加关注公众号“有货有赚”，申请状态、高佣活动早知道。<em class="added">点击添加</em></p>
+        <p class="other">提供微信号，方便邀您加入达人微信群，赚钱秘籍、特殊福利享不停！<br/>添加关注公众号“有货有赚”，申请状态、高佣活动早知道。<em class="added">点击添加</em></p>
     </div>
     <div class="agreement-section">
         <div class="agreement">

@@ -15,27 +15,39 @@ body {
         .apply-title {
             font-family: PingFang-SC-Medium, sans-serif;
             color: #444;
-            font-size: 40px;
-            padding: 30px 0;
+            font-size: 48px;
+            padding: 60px 0 40px 0;
         }
 
         li {
             display: flex;
             flex-direction: row;
             align-items: center;
-            padding: 30px 0;
+            height: 120px;
             border-bottom: 1px solid #e0e0e0;
             color: #444;
             font-size: 28px;
+            line-height: 120px;
 
             input {
                 border: none;
+                color: #444;
+                margin-left: 20px;
+                font-size: 28px;
+                line-height: 120px;
+                background-color: transparent;
+            }
+
+            input::-webkit-input-placeholder {
                 color: #b0b0b0;
             }
 
             span {
                 display: inline-block;
                 width: 130px;
+                font-size: 32px;
+                color: #444;
+                letter-spacing: 0;
             }
         }
 
@@ -100,7 +112,7 @@ body {
         }
 
         .other {
-            padding: 30px 0;
+            padding: 20px 0;
             font-family: PingFang-SC-Regular, sans-serif;
             font-size: 24px;
             color: #b0b0b0;