Merge branch 'feature/act-code' of http://git.gicdev.com/office/haoban-3 into feature/act-code

src/views/salesleads/actCodeManage/staffActCode/actCodeRecord.vue

@@ -11,12 +11,23 @@
             <div class="flex">
               <img v-if="scope.row.memberImage" class="image-40" :src="scope.row.memberImage" />
               <img v-if="!scope.row.memberImage" class="image-40" src="@/assets/user-default.svg" />
-              <div class="p-l-10 line-20" style="width: calc(100% - 50px);">
+
+              <div v-if="!scope.row.memberName && !scope.row.memberNick && !scope.row.memberPhone" class="p-l-10" style="width: calc(100% - 50px);line-height: 40px;">--</div>
+              <div v-if="(scope.row.memberName || scope.row.memberNick) && scope.row.memberPhone" class="p-l-10 line-20" style="width: calc(100% - 50px);">
                 <div class="flex text-ellipsis">
-                  <span class="text-ellipsis">{{ scope.row.memberName || '--' }}</span>
-                  <span class="color-909399 text-ellipsis"> （{{ scope.row.memberNick || '--' }}）</span>
+                  <span class="text-ellipsis">{{ scope.row.memberName }}</span>
+                  <span :class="scope.row.memberName ? 'color-909399 text-ellipsis' : 'text-ellipsis'" v-if="scope.row.memberNick"> {{ !scope.row.memberName ? scope.row.memberNick : '（' + scope.row.memberNick + ')' }}</span>
+                </div>
+                <p class="font-12">{{ scope.row.memberPhone }}</p>
+              </div>
+              <div v-else>
+                <div v-if="scope.row.memberName && scope.row.memberNick && !scope.row.memberPhone" class="p-l-10" style="line-height: 40px;">
+                  <div class="flex text-ellipsis">
+                    <span class="text-ellipsis">{{ scope.row.memberName }}</span>
+                    <span class="color-909399 text-ellipsis"> （{{ scope.row.memberNick }})</span>
+                  </div>
                 </div>
-                <p class="font-12">{{ scope.row.memberPhone || '--' }}</p>
+                <div v-else class="p-l-10" style="width: calc(100% - 50px);line-height: 40px;">{{ scope.row.memberName || scope.row.memberNick || scope.row.memberPhone }}</div>
               </div>
             </div>
           </template>
@@ -86,9 +97,9 @@ export default {
   data() {
     return {
       loading: false,
+      tableData: [],
       // searchInputStore: '',
       // searchInputGuide: '',
-      tableData: [{ addChannel: 2, hmName: '好多好多活码呢', linkName: '没什么的链接', storeName: '实话实说mendian', storeCode: '0928338', staffName: '是共商国是', memberLabelName: '和大哥大哥大哥的话打电话', clerkCode: '99000', clerkName: '常常常常', createTime: 1891282736363, memberImage: '@/assets/user-default.svg', memberName: '溜溜里', memberNick: 'kiu今生', memberPhone: '15757906438', memberCardNo: '92838383838', memberGradeName: '高级卡' }],
       // 分页参数
       currentPage: 1,
       pageSize: 20,
@@ -154,6 +165,7 @@ export default {
         clerkId,
         startTime,
         endTime,
+        // addChannel: 1,
         addChannel: linkId ? 1 : hmId ? 2 : 0, // 不具备传0
         createTimeOrder: that.sortType || ''
       };
@@ -163,6 +175,9 @@ export default {
           that.loading = false;
           if (resData.code == 0) {
             that.tableData = resData.result.result || [];
+            // that.tableData[0].memberPhone = '';
+            // that.tableData[0].memberNick = '';
+            // that.tableData[0].memberName = '';
             that.total = resData.result.totalCount || 0;
             return;
           }