shish 4 лет назад
Родитель
Сommit
04761a1fb5
2 измененных файлов с 18 добавлено и 6 удалено
  1. 17 5
      ghsApp/src/admin/home/member.vue
  2. 1 1
      ghsApp/src/pagesOrder/detail.vue

+ 17 - 5
ghsApp/src/admin/home/member.vue

@@ -13,8 +13,8 @@
       :currentTab="tabIndex"
       :height="100"
       @change="change"
-      itemWidth="50%"
-      :isAdd="true"
+      itemWidth="33%"
+      :isAdd="false"
     />
     <block v-if="!$util.isEmpty(list.data)">
       <block v-for="(item, index) in list.data" :key="index">
@@ -27,7 +27,13 @@
               </div>
               <div class="tui-msg-content">
                 <span>{{ item.visitTime }}</span>
-                <span v-if="item.debtAmount > 0" class="debt-amount">欠款:<span class="amount_num">{{item.debtAmount}}</span></span>
+                <span style="margin-left:50rpx;width:70rpx;color:red;font-weight:600"><text v-if="item.discount>=1"></text><text v-else>{{ item.discount*100 }}折</text></span>
+
+                <span v-if="tabIndex == 2" class="debt-amount">总消费:<span class="amount_num">{{item.buyAmount}}</span></span>
+                <span v-else>
+                  <span v-if="item.debtAmount > 0" class="debt-amount">欠款:<span class="amount_num">{{item.debtAmount}}</span></span>
+                </span>
+
               </div>
             </div>
           </div>
@@ -81,6 +87,10 @@ export default {
         {
           name: "欠款",
           value: 1
+        },
+        {
+          name: "排行",
+          value: 2
         }
       ]
     };
@@ -128,6 +138,7 @@ export default {
           }
           this.tabs[0].value = res.data.totalUser;
           this.tabs[1].value = res.data.mayGatheringNum;
+          this.tabs[2].value = res.data.totalUser;
         });
     },
     change(e) {
@@ -247,7 +258,8 @@ export default {
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
-      width: 260rpx;
+      width: 300rpx;
+      font-weight:550;
     }
   }
 
@@ -259,7 +271,7 @@ export default {
     line-height: 1;
     color: #9397a4;
     .debt-amount{
-      margin-left:40rpx;
+      margin-left:45rpx;
       .amount_num{
         color:red;
       }

+ 1 - 1
ghsApp/src/pagesOrder/detail.vue

@@ -155,7 +155,7 @@
 			</view>
 			<view class="content-box price-detail">
 				<div class="module-com input-line-wrap">
-					<tui-list-cell class="line-cell" :hover="false">
+					<tui-list-cell class="line-cell" v-if="detailInfo.sendCost > 0" :hover="false">
 						<div class="tui-title">运费</div>
 						<div class="detail-price_box" style="font-size: 28rpx">¥{{ detailInfo.sendCost }}</div>
 					</tui-list-cell>