Merge branch 'feature/wechat-required' into 'gray'

Feature/wechat required



See merge request !1513

@@ -31,10 +31,11 @@ class HaveGain {
         let uid = req.user.uid;
         let uid = req.user.uid;
         let socialMediaList = [
         let socialMediaList = [
             {
             {
-                name: '微信',
+                name: '微信（必填）',
                 icon: 'img/activity/have-gain/weixin@2x.png',
                 icon: 'img/activity/have-gain/weixin@2x.png',
                 type: 1,
                 type: 1,
                 account: '',
                 account: '',
+                required: true,
                 fans: 0
                 fans: 0
             },
             },
             {
             {

@@ -17,7 +17,7 @@ module.exports = class extends global.yoho.BaseModel {
             let gainList = [
             let gainList = [
                 {
                 {
                     url: _.get(res[1], 'data.checkUrl', ''),
                     url: _.get(res[1], 'data.checkUrl', ''),
-                    img: '//img11.static.yhbimg.com/yhb-img01/2018/08/06/11/01b915610bd29715162266f17cdc93451d.jpg?imageView2/{mode}/w/{width}/h/{height}', // eslint-disable-line
+                    img: '//img10.static.yhbimg.com/yhb-img01/2018/08/15/11/016160c8074cae1bca29ee257673d9540d.jpeg?imageView2/{mode}/w/{width}/h/{height}', // eslint-disable-line
                     isShow: false
                     isShow: false
                 },
                 },
                 {
                 {

@@ -15,7 +15,7 @@
                     <img class="public-icon" src="{{imgSrc icon}}" />
                     <img class="public-icon" src="{{imgSrc icon}}" />
                     <div class="personal">
                     <div class="personal">
                         <div class="public-name">{{name}}</div>
                         <div class="public-name">{{name}}</div>
-                        <div class="account-name" data-type="{{type}}">
+                        <div class="account-name {{#if required}}required{{/if}}" data-type="{{type}}">
                             {{#if account}}
                             {{#if account}}
                                 账号：<em>{{account}}</em>&nbsp;&nbsp;
                                 账号：<em>{{account}}</em>&nbsp;&nbsp;
                                 粉丝：<em data-fans="{{fans}}">{{fans}}</em>
                                 粉丝：<em data-fans="{{fans}}">{{fans}}</em>

@@ -35,7 +35,7 @@ class HaveGainApplyPage extends Page {
         this.jumpVerify();
         this.jumpVerify();
         this.selector.$nameInput.on('input', this.changeBtnStatus.bind(this));
         this.selector.$nameInput.on('input', this.changeBtnStatus.bind(this));
         this.selector.$mobileInput.on('input', this.changeBtnStatus.bind(this));
         this.selector.$mobileInput.on('input', this.changeBtnStatus.bind(this));
-        this.selector.$fillIn.on('click', that.tapFillIn);
+        this.selector.$fillIn.on('click', that.tapFillIn.bind(this));
         this.selector.$agreement.on('click', that.tapAgreement);
         this.selector.$agreement.on('click', that.tapAgreement);
         this.selector.$applyBtn.on('click', this.apply.bind(this));
         this.selector.$applyBtn.on('click', this.apply.bind(this));
     }
     }
@@ -81,6 +81,7 @@ class HaveGainApplyPage extends Page {
         let errStatus = 0;
         let errStatus = 0;
         let name = $.trim(this.selector.$nameInput.val());
         let name = $.trim(this.selector.$nameInput.val());
         let mobile = $.trim(this.selector.$mobileInput.val());
         let mobile = $.trim(this.selector.$mobileInput.val());
+        let wxInput = $('.account-name.required').find('em').length > 0;
 
 
         if (name === '') {
         if (name === '') {
             errStatus = 1;
             errStatus = 1;
@@ -88,6 +89,8 @@ class HaveGainApplyPage extends Page {
             errStatus = 2;
             errStatus = 2;
         } else if (!/^1[0-9]{10}$/.test(mobile)) {
         } else if (!/^1[0-9]{10}$/.test(mobile)) {
             errStatus = 21;
             errStatus = 21;
+        } else if (!wxInput) {
+            errStatus = 3;
         }
         }
 
 
         if (errStatus) {
         if (errStatus) {
@@ -101,6 +104,7 @@ class HaveGainApplyPage extends Page {
     }
     }
 
 
     tapFillIn(event) {
     tapFillIn(event) {
+        let _this = this;
         let $event = $(event.target);
         let $event = $(event.target);
 
 
         if ($event.hasClass('disable')) {
         if ($event.hasClass('disable')) {
@@ -137,6 +141,7 @@ class HaveGainApplyPage extends Page {
 
 
             $accountName.html(`账号：<em>${account}</em>&nbsp;&nbsp;粉丝：<em data-fans="${fans}">${fansFix}</em>`); // eslint-disable-line
             $accountName.html(`账号：<em>${account}</em>&nbsp;&nbsp;粉丝：<em data-fans="${fans}">${fansFix}</em>`); // eslint-disable-line
             dialog.hideDialog();
             dialog.hideDialog();
+            _this.changeBtnStatus();
             $event.text('已填写').addClass('disable');
             $event.text('已填写').addClass('disable');
         });
         });
     }
     }
@@ -183,6 +188,8 @@ class HaveGainApplyPage extends Page {
             tip.show('请输入手机号');
             tip.show('请输入手机号');
         } else if (errStatus === 21) {
         } else if (errStatus === 21) {
             tip.show('请输入正确的手机号');
             tip.show('请输入正确的手机号');
+        } else if (errStatus === 3) {
+            tip.show('请填写微信账号');
         }
         }
 
 
         if (errStatus) {
         if (errStatus) {