no message

src/packageMaterial/pages/apply/pay.vue

@@ -99,6 +99,11 @@ export default {
       })
       .then(res => {
         this.payNoList = res.data
+        res.data.map(item => {
+          if (!this.payNo) {
+            this.payNo = item.id
+          }
+        })
       })
   },
 

src/packageMaterial/pages/sale/orderList.vue

@@ -4,26 +4,28 @@
     :isScroll="true"
     :refresherTriggered="refresherTriggered"
     @refresherrefresh="refresherrefresh"
-    @scrolltolower="scrolltolower">
+    @scrolltolower="scrolltolower"
+  >
     <template slot="header">
       <view class="tab-container">
-      	<u-tabs
-      		:scrollable="false"
-      		:list="tabList"
-      		:current="tabCurrent"
-      		@click="changeTab"
-      		lineColor="#3D8FFD"
-      		:activeStyle="{
-      			color: '#3D8FFD'
-      		}"
-      		:inactiveStyle="{
-      			color: '#666666'
-      		}"
-      		itemStyle="padding-left: 0; padding-right: 0; height: 88rpx;">
-      	</u-tabs>
+        <u-tabs
+          :scrollable="false"
+          :list="tabList"
+          :current="tabCurrent"
+          @click="changeTab"
+          lineColor="#3D8FFD"
+          :activeStyle="{
+            color: '#3D8FFD'
+          }"
+          :inactiveStyle="{
+            color: '#666666'
+          }"
+          itemStyle="padding-left: 0; padding-right: 0; height: 88rpx;"
+        >
+        </u-tabs>
       </view>
       <view class="screen-container">
-      	<u-tabs
+        <!-- <u-tabs
       		:scrollable="true"
       		:list="salesTypeList"
       		:current="salesTypeCurrent"
@@ -36,9 +38,10 @@
       			color: '#666666'
       		}"
       		itemStyle="height: 88rpx;">
-      	</u-tabs>
+      	</u-tabs> -->
+        <view></view>
         <view class="date" @tap="isShowDatePicker = true">
-          <view class="text">{{date || '请选择月份'}}</view>
+          <view class="text">{{ date || '请选择月份' }}</view>
           <u-icon name="arrow-down" size="12"></u-icon>
         </view>
       </view>
@@ -48,34 +51,34 @@
       <view class="item" v-for="(item, index) in dataList" :key="index" @tap="toDetail(item)">
         <view class="row top">
           <view class="label">制单时间</view>
-          <view class="value">{{item.createTime}}</view>
+          <view class="value">{{ item.createTime }}</view>
           <view class="status" v-if="item.refundStatus == 'YES'">已退款</view>
-          <view class="status" v-else>{{item.payStatus | statusFilter}}</view>
+          <view class="status" v-else>{{ item.payStatus | statusFilter }}</view>
         </view>
         <view class="row">
           <view class="label">订单单号</view>
-          <view class="value">{{item.orderId}}</view>
-          <view class="tag">{{item.goodsType == 'M' ? '辅材' : '配件'}}</view>
+          <view class="value">{{ item.orderId }}</view>
+          <view class="tag">{{ item.goodsType == 'M' ? '辅材' : '配件' }}</view>
         </view>
         <view class="row">
           <view class="label">关联工单</view>
-          <view class="value">{{item.workerOrderId}}</view>
+          <view class="value">{{ item.workerOrderId }}</view>
         </view>
         <view class="row">
           <view class="label">客户电话</view>
-          <view class="value">{{item.userMobile}}</view>
+          <view class="value">{{ item.userMobile }}</view>
         </view>
-        <view class="row">
+        <!-- <view class="row">
           <view class="label">销售方式</view>
-          <view class="value">{{item.settlementType | salesTypeFilter}}</view>
-        </view>
+          <view class="value">{{ item.settlementType | salesTypeFilter }}</view>
+        </view> -->
         <view class="row">
           <view class="label">产品数量</view>
-          <view class="value">{{item.num}}</view>
+          <view class="value">{{ item.num }}</view>
         </view>
         <view class="row">
           <view class="label">订单金额</view>
-          <view class="value price">{{item.totalAmount | priceFilter}}元</view>
+          <view class="value price">{{ item.totalAmount | priceFilter }}元</view>
         </view>
         <view class="btns" v-if="item.payStatus == 'WAIT'" @tap.stop>
           <u-button text="取消订单" @click="cancelOrder(item)"></u-button>
@@ -94,199 +97,201 @@
       @close="isShowDatePicker = false"
       @confirm="confirmDate"
     ></u-datetime-picker>
-
   </zj-page-layout>
   <!-- #endif -->
 
   <!-- #ifndef H5 -->
-  <web-view :src="webViewHref(`/packageMaterial/pages/sale/orderList`, pam, crossPagePam)" @message="crossPage.$listener"></web-view>
+  <web-view
+    :src="webViewHref(`/packageMaterial/pages/sale/orderList`, pam, crossPagePam)"
+    @message="crossPage.$listener"
+  ></web-view>
   <!-- #endif -->
 </template>
 
 <script>
-  // #ifdef H5
-  export default {
-    filters: {
-      statusFilter(val) {
-        const MAP = {
-          WAIT: '待支付',
-          PAID: '已支付',
-          CANCEL: '已取消',
-        }
-        return MAP[val];
-      },
-      salesTypeFilter(val) {
-        const MAP = {
-          OWN: '自有出库',
-          OUT: '外购销售',
-        }
-        return MAP[val];
-      },
+// #ifdef H5
+export default {
+  filters: {
+    statusFilter(val) {
+      const MAP = {
+        WAIT: '待支付',
+        PAID: '已支付',
+        CANCEL: '已取消',
+      }
+      return MAP[val];
     },
-
-    data() {
-      return {
-        type: 'M',
-				dataList: [],
-				pageNum: 1,
-				loadStatus: 0,
-        refresherTriggered: false,
-        tabList: [
-          {name: '全部', value: '', badge: {value: 0}},
-          {name: '待支付', value: 'WAIT', badge: {value: 0}},
-          {name: '已支付', value: 'PAID', badge: {value: 0}},
-          {name: '已取消', value: 'CANCEL', badge: {value: 0}},
-        ],
-        tabCurrent: 0,
-        status: '',
-        salesTypeList: [
-          {name: '全部', value: ''},
-          {name: '自有仓库', value: 'OWN'},
-          {name: '外购销售', value: 'OUT'},
-        ],
-        salesTypeCurrent: 0,
-        salesType: '',
-        isShowDatePicker: false,
-        datePickerValue: Number(new Date()),
-        date: '',
+    salesTypeFilter(val) {
+      const MAP = {
+        OWN: '自有出库',
+        OUT: '外购销售',
       }
+      return MAP[val];
     },
+  },
 
-    onLoad({type}) {
-      this.type = type;
-      this.getCount();
-      this.getList();
-    },
+  data() {
+    return {
+      type: 'M',
+		dataList: [],
+		pageNum: 1,
+		loadStatus: 0,
+      refresherTriggered: false,
+      tabList: [
+        {name: '全部', value: '', badge: {value: 0}},
+        {name: '待支付', value: 'WAIT', badge: {value: 0}},
+        {name: '已支付', value: 'PAID', badge: {value: 0}},
+        {name: '已取消', value: 'CANCEL', badge: {value: 0}},
+      ],
+      tabCurrent: 0,
+      status: '',
+      salesTypeList: [
+        {name: '全部', value: ''},
+        {name: '自有仓库', value: 'OWN'},
+        {name: '外购销售', value: 'OUT'},
+      ],
+      salesTypeCurrent: 0,
+      salesType: '',
+      isShowDatePicker: false,
+      datePickerValue: Number(new Date()),
+      date: '',
+    }
+  },
 
-    methods: {
-      getCount() {
-      	this.$api.post('/pay/orderCount', {
-          goodsType: this.type,
-        }).then(res => {
-          if(!res.data) return false;
-      		this.tabList[0].badge.value = res.data.qb || 0;
-      		this.tabList[1].badge.value = res.data.dzf || 0;
-      		this.tabList[2].badge.value = res.data.yzf || 0;
-      		this.tabList[3].badge.value = res.data.yqx || 0;
-      	})
-      },
+  onLoad({type}) {
+    this.type = type;
+    this.getCount();
+    this.getList();
+  },
 
-      getList() {
-      	this.loadStatus = 1;
-      	this.$api.post('/pay/orderPage', {
-          pageNum: this.pageNum,
-          pageSize: 10,
-          payStatus: this.status,
-          yearMonth: this.date,
-          goodsType: this.type,
-          settlementType: this.salesType
-      	}).then(res => {
-      		this.loadStatus = 0;
-      		let list = res.data.records;
-      		if (list.length < 10) {
-      		  this.loadStatus = 2;
-      		}
-      		this.dataList = this.dataList.concat(list);
-      	}).catch(() => {
-      		this.loadStatus = 2;
-      	}).finally(res => {
-      		this.refresherTriggered = false;
-      	})
-      },
+  methods: {
+    getCount() {
+    	this.$api.post('/pay/orderCount', {
+        goodsType: this.type,
+      }).then(res => {
+        if(!res.data) return false;
+    		this.tabList[0].badge.value = res.data.qb || 0;
+    		this.tabList[1].badge.value = res.data.dzf || 0;
+    		this.tabList[2].badge.value = res.data.yzf || 0;
+    		this.tabList[3].badge.value = res.data.yqx || 0;
+    	})
+    },
 
-      changeTab(e) {
-      	this.tabCurrent = e.index;
-      	this.status = e.value;
-        this.refreshList();
-      },
+    getList() {
+    	this.loadStatus = 1;
+    	this.$api.post('/pay/orderPage', {
+        pageNum: this.pageNum,
+        pageSize: 10,
+        payStatus: this.status,
+        yearMonth: this.date,
+        goodsType: this.type,
+        settlementType: this.salesType
+    	}).then(res => {
+    		this.loadStatus = 0;
+    		let list = res.data.records;
+    		if (list.length < 10) {
+    		  this.loadStatus = 2;
+    		}
+    		this.dataList = this.dataList.concat(list);
+    	}).catch(() => {
+    		this.loadStatus = 2;
+    	}).finally(res => {
+    		this.refresherTriggered = false;
+    	})
+    },
 
-      changeSalesType(e) {
-        this.salesTypeCurrent = e.index;
-        this.salesType = e.value;
-        this.refreshList();
-      },
+    changeTab(e) {
+    	this.tabCurrent = e.index;
+    	this.status = e.value;
+      this.refreshList();
+    },
 
-      resetDate() {
-        this.isShowDatePicker = false;
-        this.date = '';
-        this.refreshList();
-      },
+    changeSalesType(e) {
+      this.salesTypeCurrent = e.index;
+      this.salesType = e.value;
+      this.refreshList();
+    },
 
-      confirmDate(e) {
-        this.isShowDatePicker = false;
-        let time = new Date(e.value)
-        let y = time.getFullYear();
-        let m = (time.getMonth()+1) < 10 ? '0' + (time.getMonth()+1) : time.getMonth()+1;
-        this.date = `${y}-${m}`;
-        this.refreshList();
-      },
+    resetDate() {
+      this.isShowDatePicker = false;
+      this.date = '';
+      this.refreshList();
+    },
 
-      refreshList() {
-      	this.dataList = [];
-      	this.pageNum = 1;
-      	this.getList();
-      },
+    confirmDate(e) {
+      this.isShowDatePicker = false;
+      let time = new Date(e.value)
+      let y = time.getFullYear();
+      let m = (time.getMonth()+1) < 10 ? '0' + (time.getMonth()+1) : time.getMonth()+1;
+      this.date = `${y}-${m}`;
+      this.refreshList();
+    },
 
-      // 滚动到底部
-      scrolltolower(e) {
-      	if (this.loadStatus === 0) {
-      		this.pageNum++;
-      		this.getList();
-      	}
-      },
+    refreshList() {
+    	this.dataList = [];
+    	this.pageNum = 1;
+    	this.getList();
+    },
 
-      // 触发下拉刷新
-      refresherrefresh(e) {
-      	this.refresherTriggered = true;
-        this.getCount();
-      	this.refreshList();
-      },
+    // 滚动到底部
+    scrolltolower(e) {
+    	if (this.loadStatus === 0) {
+    		this.pageNum++;
+    		this.getList();
+    	}
+    },
 
-      toDetail(item) {
-        this.$navToPage({
-          url: `/packageMaterial/pages/sale/orderDetail?id=${item.orderId}`
-        })
-      },
+    // 触发下拉刷新
+    refresherrefresh(e) {
+    	this.refresherTriggered = true;
+      this.getCount();
+    	this.refreshList();
+    },
 
-      // 取消订单
-      cancelOrder(item) {
-        this.$modal({
-          content: '确认取消订单吗？'
-        }).then(() => {
-          this.$api.post('/pay/cancel', {
-            orderId: item.orderId
-          }).then(res => {
-            this.$successToast();
-            this.getCount();
-            this.refreshList();
-          })
-        }).catch(() => {})
-      },
+    toDetail(item) {
+      this.$navToPage({
+        url: `/packageMaterial/pages/sale/orderDetail?id=${item.orderId}`
+      })
     },
-  }
 
-  // #endif
-  // #ifndef H5
-  export default {
-    data() {
-      return {
-        pam: {},
-      }
+    // 取消订单
+    cancelOrder(item) {
+      this.$modal({
+        content: '确认取消订单吗？'
+      }).then(() => {
+        this.$api.post('/pay/cancel', {
+          orderId: item.orderId
+        }).then(res => {
+          this.$successToast();
+          this.getCount();
+          this.refreshList();
+        })
+      }).catch(() => {})
     },
-    onLoad(pam) {
-      this.pam = pam;
+  },
+}
+
+// #endif
+// #ifndef H5
+export default {
+  data() {
+    return {
+      pam: {},
     }
+  },
+  onLoad(pam) {
+    this.pam = pam;
   }
-  // #endif
+}
+// #endif
 </script>
 
 <style lang="scss" scoped>
 .tab-container {
-  background: #FFFFFF;
+  background: #ffffff;
 }
 .screen-container {
   margin-top: 1px;
-  background: #FFFFFF;
+  background: #ffffff;
   display: flex;
   align-items: center;
   justify-content: space-between;