Merge branch 'feature/10月迭代' of http://git.gicdev.com/gicmember/member into dev

src/components/wechatmembers/wechatTotalDetail.js

@@ -118,9 +118,10 @@ export default {
         numOfTel: 0,
         numOfMarket: 0
       },
-      memberRelationInfo:[
-        // {protocolType:1访问时的协议 2登录时的协议,consentPrivacyProtocolTime:时间}
-      ],
+      memberRelationInfo:{
+        visitConsentPrivacyProtocolTime:null, // 访问时间
+        loginConsentPrivacyProtocolTime:null, // 登录时间
+      },
       memberbaseinfo: {
         status: 1,
         wxStatus: 0,
@@ -821,7 +822,7 @@ export default {
           if (res.data.errorCode === 0) {
             const ret = res.data.result;
             this.memberInfo = ret.memberInfo;
-            this.memberRelationInfo = ret.memberRelationInfo?ret.memberRelationInfo.memberProtocolInfo:[];
+            this.memberRelationInfo = ret.memberRelationInfo?ret.memberRelationInfo.memberProtocolInfo: this.memberRelationInfo ;
             this.memberInfo.thirdImgUrl = ret.memberInfo.thirdImgUrl
               ? ret.memberInfo.thirdImgUrl
               : this.storeImageUrl;

src/components/wechatmembers/wechatTotalDetail.vue

@@ -168,12 +168,13 @@
               <div class="wechat-cardtitle">关联渠道</div>
               <div class="related-channel-wrap">
                 <ul class="related-channel-content">
-                  <li  class="related-channel-content-item" v-for="relationInfo in memberRelationInfo" :key="relationInfo">
+                  <li  class="related-channel-content-item">
                     <img :src="weimengLogo" alt="">
                     <div class="related-channel-content-item-info">
                       <h2>微盟同意协议时间</h2>
                       <div class="info-date">
-                        <p>{{relationInfo.protocolType===1?'访问':'登录'}}：{{relationInfo.consentPrivacyProtocolTime | formatTime}}</p>
+                        <p>访问：{{memberRelationInfo.visitConsentPrivacyProtocolTime?(memberRelationInfo.visitConsentPrivacyProtocolTime | formatTime):'--'}}</p>
+                        <p>登录：{{memberRelationInfo.loginConsentPrivacyProtocolTime?(memberRelationInfo.loginConsentPrivacyProtocolTime | formatTime):'--'}}</p>
                       </div>
                     </div>
                   </li>