修改样式，修复已知bug

qingyiay

2023-04-24 bb52e0d4baffe8e0486c951e525b6614bd4aaa28

 pages/customer-page/customer-index/customer-index.vue

@@ -9,8 +9,8 @@
                  张
               </view>
               <view class="card-left__utils">
                  <u-button @tap.stop="receiveClick(item)" text="领取" type="primary" v-if="item.cars2 != item.carNum" shape="circle"></u-button>
                  <u-button text="转发" type="primary" @tap.stop="forwardClick(item)" shape="circle" v-if="item.carNum != item.carNumSurplus1"></u-button>
                  <u-button @tap.stop="receiveClick(item)" text="领取" type="primary" v-if="item.carNum - item.cars2 != 0" shape="circle"></u-button>
                  <u-button text="转发" type="primary" @tap.stop="forwardClick(item)" shape="circle"></u-button>
               </view>
            </template>
            <template v-slot:right-top>
@@ -34,7 +34,7 @@
                        <text class="lingqu" @tap.stop="numInput(item.id)">{{ item.receiveNum || '_______' }}</text>
                        张
                     </view> -->
                     <view v-if="item.cars == item.cars2 ? false : true">剩余{{ item.carNum - item.cars2 }}张</view>
                     <view v-if="item.carNum == item.cars2 ? false : true">剩余{{ item.carNum - item.cars2 }}张</view>
                     <view v-else>已领完</view>
                  </view>
               </view>
@@ -48,29 +48,42 @@
      </view>
      <view class="history-numbers">
         <combined-title title="历史提煤单"></combined-title>
         <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y">
            <uni-table border stripe emptyText="暂无更多数据" :loading="loading">
               <uni-tr>
                  <uni-th width="100" align="center">发运日期</uni-th>
                  <uni-th width="100" align="center">所属单位</uni-th>
                  <uni-th align="center" width="150">煤场名称</uni-th>
                  <uni-th align="center" width="100">煤种名称</uni-th>
                  <uni-th align="center" width="150">订单编号</uni-th>
                  <uni-th align="center" width="100">订单剩余量</uni-th>
                  <uni-th align="center" width="80">提煤单个数</uni-th>
               </uni-tr>
               <uni-tr v-for="(item, index) in historyCoalData" :key="index">
                  <uni-td align="center">{{ item.sendDate }}</uni-td>
                  <uni-td align="left">{{ item.deptName }}</uni-td>
                  <uni-td align="center">{{ item.filedName }}</uni-td>
                  <uni-td align="center">{{ item.coalName }}</uni-td>
                  <uni-td align="center">{{ item.orderCode }}</uni-td>
                  <uni-td align="center">{{ item.carNumSurplus }}</uni-td>
                  <uni-td align="center">{{ item.tmCount }}</uni-td>
               </uni-tr>
            </uni-table>
         <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltolower="historyScrolltolower">
            <view class="history-information" v-for="(item, index) in historyCoalData" :key="index" @click="faYundetail(item)">
               <view class="history-sendate">
                  <text>发运日期 {{ item.sendDate || '' }}</text>
                  <view class="view-more">
                     <text style="color: #449cfc;">详情</text>
                     <view class="arrow-right"><u-icon name="arrow-right" size="40" color="#449cfc"></u-icon></view>
                  </view>
               </view>
               <view class="history-main">
                  <view class="main-left">
                     <view class="history-body">
                        <text>所属单位 {{ item.deptName || '' }}</text>
                     </view>
                     <view class="history-body">
                        <text>煤场名称 {{ item.filedName || '' }}</text>
                     </view>
                     <view class="history-body">
                        <text>煤种名称 {{ item.coalName || '' }}</text>
                     </view>
                  </view>
                  <view class="main-right">
                     <view class="history-body">
                        <text style="word-break: break-all;">订单编号 {{ item.orderCode || '' }}</text>
                     </view>
                     <view class="history-body">
                        <text>订单剩余量 {{ item.carNumSurplus || '' }}</text>
                     </view>
                     <view class="history-body">
                        <text>提煤单个数 {{ item.tmCount || '' }}</text>
                     </view>
                  </view>
               </view>
            </view>
            <view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">没有数据了...</view>
         </scroll-view>
         <view class="uni-pagination-box"><uni-pagination show-icon :page-size="pageSize" :current="pageCurrent" :total="total" @change="change2" /></view>
      </view>
      <!-- 领取弹出框 -->
      <u-popup :show="show" @close="close" @open="open" mode="center" round="10">
@@ -88,9 +101,24 @@
import combinedTitle from '@/components/combined-title/combined-title.vue';
import { customerId } from '@/utils/status';
export default {
   props: {
      orderPlanDataStore: {
         type: Array,
         default: []
      }
   },
   components: {
      card,
      combinedTitle
   },
   watch: {
      orderPlanDataStore: {
         handler(v) {
            this.orderPlanData = v;
         },
         deep: true,
         immediate: true
      }
   },
   data() {
      return {
@@ -106,11 +134,13 @@
         loading: false,
         scrollTop: 0,
         // 每页数据量
         pageSize: 5,
         pageSize: 10,
         // 当前页
         pageCurrent: 1,
         // 数据总量
         total: 0
         total: 0,
         // 是否显示更多数据
         showMoreData: false
      };
   },
   onLoad() {},
@@ -124,34 +154,50 @@
      },
      // 获取发运计划列表
      GetOrderPlan() {
         uni.showLoading({
            title: '加载中...'
         });
         uni.showLoading({ title: '加载中...' });
         this.$reqGet('GetOrderPlan').then(res => {
            this.orderPlanData = res.data;
            uni.hideLoading();
            if (res.data) {
               this.orderPlanData = res.data;
               uni.hideLoading();
            }
         });
      },
      // 获取历史提煤单
      getJhOrderPlanDataPage() {
         this.loading = true;
         this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => {
            this.historyCoalData = res.data.records;
            this.total = res.data.total;
            this.loading = false;
            if (res.data.records) {
               this.total = res.data.total;
               if (this.pageCurrent > 1) {
                  this.historyCoalData = this.historyCoalData.concat(res.data.records);
                  this.historyCoalData = this.ArrSet(this.historyCoalData, 'id');
                  this.loading = false;
               } else {
                  this.historyCoalData = res.data.records;
                  this.loading = false;
               }
            }
         });
      },
      change2(e) {
         console.log(e, '页码改变');
         this.pageCurrent = e.current;
      // 上拉加载
      historyScrolltolower() {
         if (this.pageCurrent * this.pageSize >= this.total) return (this.showMoreData = true);
         this.pageCurrent++;
         this.getJhOrderPlanDataPage();
      },
      //fix 点击提煤单返回会增加重复数据
      ArrSet(Arr, id) {
         var obj = {};
         const arrays = Arr.reduce((setArr, item) => {
            obj[item[id]] ? '' : (obj[item[id]] = true && setArr.push(item));
            return setArr;
         }, []);
         return arrays;
      },
      popupDetermineClick() {
         if (this.receiveNum) {
            this.getOrderNum.num = this.receiveNum;
            uni.showLoading({
               title: '加载中...'
            });
            uni.showLoading({ title: '加载中...' });
            this.$reqPost('customerGet', this.getOrderNum, 'params').then(res => {
               uni.hideLoading();
               if (res.code == 0) {
@@ -163,7 +209,7 @@
                     duration: 1000
                  });
               } else {
                  this.$u.toast(res.data ? res.data : '领取失败');
                  this.$u.toast(res.msg ? res.msg : '领取失败');
               }
            });
         } else {
@@ -192,39 +238,88 @@
      },
      // 提煤单详情
      cardBodyClick(name) {
         console.log(name, 'name');
         let code = null;
         let cars2 = null;
         this.orderPlanData.forEach(item => {
            if (item.id == name) {
               code = item.code;
               cars2 = item.cars2;
            }
         });
         uni.navigateTo({
            url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${name}&code=${code}`
         });
         uni.navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${name}&code=${code}&cars2=${cars2}` });
      },
      // 点击历史提煤单一行获取详情
      faYundetail(v) {
         uni.navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}` });
      },
      // 转发
      forwardClick(obj) {
         uni.navigateTo({
            url: `/pages/public-page/forward/forward?orderPlanId=${obj.id}&carNumSurplus1=${obj.carNumSurplus1}&carNum=${obj.carNum}&cars2=${obj.cars2}`
         });
         if (obj.cars2 == 0) return this.$u.toast('请先领取后再转发');
         uni.navigateTo({ url: `/pages/public-page/forward/forward?orderPlanId=${obj.id}&carNumSurplus1=${obj.carNumSurplus1}&carNum=${obj.carNum}&cars2=${obj.cars2}` });
      }
   }
};
</script>

<style lang="scss" scoped>
.uni-pagination-box {
   height: 60rpx;
}
.scroll-Y {
   height: 600rpx;
   height: 900rpx;
   background-color: #e2e2e2;
   border-radius: vww(10);
   .history-information {
      width: 94%;
      display: flex;
      flex-direction: column;
      border: 1px solid #e2e2e2;
      background-color: #fff;
      border-radius: vww(10);
      margin: vww(10);
      .history-sendate {
         height: vww(40);
         border-bottom: 1px solid #e2e2e2;
         line-height: vww(40);
         padding-left: vww(8);
         position: relative;
         .view-more {
            display: flex;
            width: vww(80);
            position: absolute;
            right: vww(10);
            top: vww(-1);
            .arrow-right {
               position: absolute;
               right: vww(27);
               top: vww(12);
            }
         }
      }
      .history-main {
         min-height: vww(120);
         display: flex;
         justify-content: space-between;
         .main-left,
         .main-right {
            width: 45%;
            display: flex;
            flex-direction: column;
            justify-content: space-between;
            padding: vww(4) vww(4);
         }
      }
   }
   .more_text {
      color: #333;
      font-size: 24rpx;
      text-align: center;
   }
}
::v-deep.customer-index {
   width: 94%;
   margin: 0 auto;
   // 主体
   .customer-index-body {
      margin-bottom: vww(56);
      margin-bottom: vww(10);
      .card-left__top {
         margin-top: vww(26);
         text-align: center;