Merge branch 'feature/7月迭代-会员' into test

src/components/allCustomers/customerDetail.vue

@@ -763,10 +763,12 @@
         </div>
         
       </div>
-      <dm-sub-title text="客户日志" type="fill" style="margin-bottom: 20px;font-size:14px;">
-        客户日志
-        <span style="margin-left: 10px; color: #909399;font-size:12px">(展示近一年的日志)</span>
-      </dm-sub-title>
+      <div class="info-item-header" style="margin-bottom: 20px;">
+          <h2 class="item-title">
+            <i class="vertical-line" /><span>客户日志</span>
+            <span style="margin-left: 10px; color: #909399;font-size:12px">(展示近一年的日志)</span>
+          </h2>
+        </div>
       <customer-log style="padding:0" :memberId="memberId"></customer-log>
     </div>
     <!-- 基本信息修改弹窗 -->

src/components/allCustomers/index.js

@@ -475,7 +475,7 @@ export default {
     successImport(taskId, isImport) {
       // 不是批量导入，而且只选了一条数据时，不跳转到任务中心——炎羽
       if (!isImport && this.multipleList.length == 1) {
-        this.$message.success('修改完成');
+        // this.$message.success('修改完成');
         this.batchRefresh()
         return
       }

src/components/wechatmembers/integralDataPage.vue

@@ -419,7 +419,7 @@ export default {
 };
 </script>
 
-<style lang="stylus">
+<style lang="scss" scoped>
 .w160 {
   width: 160px;
 }