Merge branch 'feature/9月迭代'

src/components/wechatmembers/wechatTotalDetail.js

@@ -951,7 +951,12 @@ export default {
       })
         .then(res => {
           if (res.data.errorCode === 0) {
-            this.memberData = res.data.result.page.result;
+            this.memberData = res.data.result.page.result || [];
+            this.memberData = this.memberData.map( el => {
+              if(el.operRemark.indexOf('\n') > -1) el.operRemark = el.operRemark.replace(/\n/g," <br />");
+              return el;
+            })
+            console.log(this.memberData);
             this.page.currentPage = res.data.result.page.currentPage;
             this.page.totalCount = res.data.result.page.totalCount;
           } else {

src/components/wechatmembers/wechatTotalDetail.vue

@@ -158,6 +158,9 @@
                     <div class="wechat-carditem lheigth40">
                       <span>开卡方式</span><span class="ml15 color555">{{ memberInfo.openCardChannelDict | fomatText  }}</span>
                     </div>
+                    <div class="wechat-carditem lheigth40">
+                      <span>同意协议时间</span><span class="ml15 color555">{{ memberInfo.consentPrivacyProtocolTime | formatTime  }}</span>
+                    </div>
                 </div>
               </div>
             </div>
@@ -444,7 +447,11 @@
           <el-table-column prop="operType" label="日志类型"> </el-table-column>
           <el-table-column prop="operContent" label="日志详情"> </el-table-column>
           <el-table-column prop="operReason" label="事由"> </el-table-column>
-          <el-table-column prop="operRemark" label="备注"> </el-table-column>
+          <el-table-column prop="operRemark" label="备注">
+            <template slot-scope="{ row }">
+              <span v-html="row.operRemark"></span>
+            </template>
+          </el-table-column>
         </el-table>
         <div class="page mTop20" v-if="page.totalCount > 0">
           <dm-pagination