Merge branch 'feature/6月迭代-抖音' into test

src/components/allCustomers/customerDetail.vue

@@ -162,10 +162,10 @@
                     <div class="info-content">{{ member.memberMainStoreArea||'--' }}</div>
                   </el-col>
                   <el-col span="7">
-                    <span class="info-lebel">关注来源:</span>
-                    <div class="info-content">{{ member.attentionChannelDict||'--' }}</div>
-                    <!-- <span class="info-lebel">客户来源:</span>
-                    <div class="info-content">{{ member.firstMemberSource ? member.firstMemberSource.sourceName || '--' : '--' }}</div> -->
+                    <!-- <span class="info-lebel">关注来源:</span>
+                    <div class="info-content">{{ member.attentionChannelDict||'--' }}</div> -->
+                    <span class="info-lebel">客户来源:</span>
+                    <div class="info-content">{{ member.firstMemberSource ? member.firstMemberSource.sourceName || '--' : '--' }}</div>
                   </el-col>
                 </el-row>
                 <el-row class="member-info-row">
@@ -348,7 +348,8 @@
                 {{ memberInfo.authTime|formatTime }}
               </el-descriptions-item>
               <el-descriptions-item label="开卡渠道:">
-                {{ memberInfo.openCardChannelDict||'--' }}
+                <!-- {{ memberInfo.openCardChannelDict||'--' }} -->
+                {{ memberInfo.newOpenCardChannelDict||'--' }}
               </el-descriptions-item>
               <el-descriptions-item label="开卡时间:">
                 {{ memberInfo.cardGivingTime|formatTime }}

src/components/allCustomers/order-list/order-table.vue

@@ -116,7 +116,7 @@
             <!-- 购买单、退换单显示优惠 -->
             <div class="order-descript-item gray" v-if="el.promotionAmount > 0">
               <div class="order-descript-label">
-                <div class="order-descript-label-text">优惠</div>：
+                <div class="order-descript-label-text">支付优惠</div>：
               </div>
               <div class="order-descript-content">{{ el.promotionAmount | fomatFloat }}</div>
             </div>