v1.0.0版本更新

src/components/sales-card-list.vue

@@ -7,7 +7,7 @@
           <div class="label">下单编号：<span>{{info.cmReportingClub.shopOrderNo}}</span></div>
           <div class="label">佣金：<span>{{info.splitCommission.toFixed(2)}}</span></div>
           <div class="label">下单时间：<span>{{info.createTime}}</span></div>
-          <div class="label" v-if="isSettle">结算时间：<span>{{info.settleTime}}</span></div>
+          <div class="label" v-if="isSettle">结算时间：<span>{{info.splitSettleTime}}</span></div>
         </div>
       </div>
     </van-checkbox-group>
@@ -53,7 +53,7 @@ export default {
     },
     result (val) {
       if (val) {
-        this.allSelect = this.getInclude3(this.tabListInfo.map(e => e.id), val)
+        this.allSelect = this.getInclude3(this.tabListInfo.map(e => e.cmReportingClub.id), val)
       }
     }
   },
@@ -67,7 +67,6 @@ export default {
       return !!temp.length
     },
     handlerSelect () {
-      console.log(this.result)
       this.$emit('handlerSelect', this.result)
     }
   }

src/views/ins-intention-report/components/report-select-popup.vue

@@ -19,7 +19,7 @@ export default {
       showPopup: false,
       radio: '',
       formData: {
-        pageSize: 10,
+        pageSize: 30,
         pageNum: 1,
         id: this.$store.getters.isManage ? this.$store.getters.userInfo.id : this.$store.getters.userInfo.parentId,
         name: ''

src/views/order-list/components/order-btn-type.vue

@@ -37,6 +37,7 @@ import orderIndex from '../mixins/order-index'
 import { confirmOrder, cancelOrder, shareOrderCode } from '@/api/institutionApi/order'
 import { getOrderMobile, orderConfirmFormat } from '@/api/institutionApi/login'
 import { Toast } from 'vant'
+import { getToken } from '@/util/auth'
 export default {
   mixins: [orderIndex],
   props: {
@@ -176,6 +177,9 @@ export default {
       if (!$event.label) return this.handlerCheckFlag()
       for (let i = 0; i < this.orderBtnPermissions.length; i++) {
         if (this.orderBtnPermissions[i].label === $event.label) {
+          if ($event.id === 1 && !getToken()) {
+            return false
+          }
           return this.orderBtnPermissions[i].val.some(e => e === this.status)
         }
       }

src/views/order-list/index.vue

@@ -124,7 +124,7 @@ export default {
       activeBtn: 2,
       active: 0,
       formData: {
-        pageSize: 20,
+        pageSize: 30,
         pageNum: 1,
         groupServiceId: 0,
         listType: this.$route.query.active * 1 || 0,

src/views/order-sales/detail.vue

@@ -43,7 +43,7 @@
       <div class="line"></div>
     </div>
     <div style="padding-bottom: 20vw;">
-      <sales-card-list :isChecked="isChecked" :isSettle="isSettle" :tabListInfo="dataList" @handlerSelect="handlerSelect"/>
+      <sales-card-list ref="sales-card" :isChecked="isChecked" :isSettle="isSettle" :tabListInfo="dataList" @handlerSelect="handlerSelect"/>
     </div>
     <van-popup v-model="showStartPicker" position="bottom">
       <van-datetime-picker
@@ -137,9 +137,10 @@ export default {
       this.dataList = data.paginationVo.results
     },
     async handlerSelect ($event) {
-      const data = $event.trim()
+      const data = $event.length > 1 ? $event.join(',') : $event[0]
       try {
         await orderSaleSettle({ ids: data })
+        this.$refs['sales-card'].allSelect = false
         this.orderSaleDetail()
       } catch (error) {
         console.log(error)