shish 1 месяц назад
Родитель
Сommit
3b71ff9b5d
2 измененных файлов с 2 добавлено и 80 удалено
  1. 1 1
      hdApp/src/admin/member/detail.vue
  2. 1 79
      hdApp/src/pagesPurchase/gathering.vue

+ 1 - 1
hdApp/src/admin/member/detail.vue

@@ -161,7 +161,7 @@
     <view class="module-com content_box user-open_bx">
       <view class="input-line-wrap">
         <tui-list-cell @click="pageTo({ url: '/admin/order/debtList?id='+data.id })" class="line-cell" :hover="false" :arrow="true" >
-            <view class="tui-title">挂账订单</view>
+            <view class="tui-title">待结订单</view>
         </tui-list-cell>
         <tui-list-cell @click="pageTo({ url: '/admin/settle/list?customId='+data.id })" class="line-cell" :hover="false" :arrow="true" >
             <view class="tui-title">结账记录</view>

+ 1 - 79
hdApp/src/pagesPurchase/gathering.vue

@@ -9,13 +9,6 @@
         </view>
         <DateSelect class="bar" top="0" @selectDateFn="selectDateFn" defaultShowName='时间' />
       </view>
-      <view v-if="hasDebtList" class="debt-summary flex-row">
-        <text class="debt-summary__label">已清</text>
-        <text class="debt-summary__amount debt-summary__amount--cleared">¥{{ debtSummary.clearedText }}</text>
-        <text class="debt-summary__split">|</text>
-        <text class="debt-summary__label">剩余待结</text>
-        <text class="debt-summary__amount debt-summary__amount--remain">¥{{ debtSummary.remainText }}</text>
-      </view>
     </view>
     <view scroll-y class="shop-list">
       <block v-if="!$util.isEmpty(detailsList)">
@@ -70,8 +63,6 @@ export default {
 			startTime:'',
 			endTime:'',
       ghsId:0,
-      summaryCleared: null,
-      summaryRemain: null,
     }
   },
   onShow () {
@@ -107,36 +98,6 @@ export default {
       }
       return amount.toFixed(2);
     },
-    hasDebtList () {
-      return this.detailsList && this.detailsList.length > 0
-    },
-    debtSummary () {
-      if (this.summaryCleared !== null && this.summaryRemain !== null) {
-        return {
-          clearedText: this.formatMoney(this.summaryCleared),
-          remainText: this.formatMoney(this.summaryRemain)
-        }
-      }
-      let cleared = 0
-      let remain = 0
-      if (this.detailsList && this.detailsList.length) {
-        this.detailsList.forEach((item) => {
-          const debtPrice = Number(item.debtPrice) || 0
-          const remainDebtPrice = Number(item.remainDebtPrice) || 0
-          remain += remainDebtPrice
-          const paid = Number(item.hasPayDebt)
-          if (!isNaN(paid) && paid > 0) {
-            cleared += paid
-          } else if (debtPrice > remainDebtPrice) {
-            cleared += debtPrice - remainDebtPrice
-          }
-        })
-      }
-      return {
-        clearedText: this.formatMoney(cleared),
-        remainText: this.formatMoney(remain)
-      }
-    }
   },
   watch: {
     selectList () {
@@ -206,13 +167,6 @@ export default {
       return purchaseDebtList({id:id,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime}).then(res => {
         const list = res.data.list || []
         this.detailsList = list.map((ele) => this.mapDebtItem(ele))
-        if (res.data && res.data.clearedAmount !== undefined) {
-          this.summaryCleared = res.data.clearedAmount
-          this.summaryRemain = res.data.remainDebtAmount
-        } else {
-          this.summaryCleared = null
-          this.summaryRemain = null
-        }
       }).catch(err => { 
 
       })
@@ -325,40 +279,8 @@ export default {
       }
     }
   }
-  .debt-summary {
-    margin-top: 16upx;
-    padding: 14upx 18upx;
-    border-radius: 10upx;
-    background: #fff7f7;
-    align-items: center;
-    flex-wrap: wrap;
-    box-sizing: border-box;
-  }
-  .debt-summary__label {
-    font-size: 24upx;
-    color: #666;
-    line-height: 32upx;
-  }
-  .debt-summary__amount {
-    margin-left: 6upx;
-    font-size: 28upx;
-    font-weight: 700;
-    line-height: 36upx;
-  }
-  .debt-summary__amount--cleared {
-    color: #07a84c;
-  }
-  .debt-summary__amount--remain {
-    color: #f50e24;
-  }
-  .debt-summary__split {
-    margin: 0 16upx;
-    font-size: 24upx;
-    color: #ddd;
-    line-height: 32upx;
-  }
   .shop-list {
-		margin-top: 168upx;
+		margin-top: 110upx;
     padding: 20upx 0;
     flex: 1;
     padding-bottom: 100upx;