shish 4 лет назад
Родитель
Сommit
9f0798b75f

+ 11 - 5
ghsApp/src/admin/billing/affirm.vue

@@ -9,8 +9,13 @@
           <view class="commodity-view">
             <view class="commodity-list">
               <view class="commodity-item" v-for="(item, index) in selectList" :key="index">
-                <image class="item-icon" :src="item.cover" alt="" @click.stop="moreToDo(item)" />
-                <view class="item-info" @click="showAddModelFn(item)">
+                <!-- #ifdef APP-PLUS -->
+                <image class="item-icon" :src="item.cover" alt="" @click="moreToDo(item)" />
+                <!-- #endif -->
+                <!-- #ifdef MP-WEIXIN -->
+                <image class="item-icon" :src="item.cover" alt="" />
+                <!-- #endif -->
+                <view class="item-info">
                   <view class="info-line">
                     <text class="item-name">{{ item.itemName }}</text>
                     <text class="item-price">
@@ -21,13 +26,13 @@
 
                   <view style="text-align:right;">
                     <view class="open-bx" >
-                      <i class="iconfont iconjian" @click.stop="reduceItemFn(item)" v-if="item.bigCount > 0 || item.smallCount > 0"></i>
-                      <text class="num" >
+                      <i class="iconfont iconjian" @click="reduceItemFn(item)" v-if="item.bigCount > 0 || item.smallCount > 0"></i>
+                      <text class="num" @click="showAddModelFn(item)">
                         <text>{{ Number(item.bigCount) > 0 ? Number(item.bigCount) : 0 }}</text>
                         <text v-if="item.smallCount > 0">/</text>
                         <text v-if="item.smallCount > 0">{{ item.smallCount }}</text>
                       </text>
-                      <i class="iconfont iconzeng" @click.stop="addItemFn(item)"></i>
+                      <i class="iconfont iconzeng" @click="addItemFn(item)"></i>
                     </view>
                   </view>
 
@@ -342,6 +347,7 @@ export default {
 		},
 		addItemFn (item) {
       this.kdType = 'HIT';
+      console.log('当前',item)
 			this.replaceItemFn(item,0,'add')
 		},
     init () {

+ 4 - 4
ghsApp/src/pagesArrears/details.vue

@@ -138,14 +138,14 @@ export default {
 			this.payWay = this.payWayList[index].id
 		},
 		isModelFun(){
-			if(this.searchTime == ''){
-				this.$msg('请点右上角,选择月份,再结账')
-				return false
-			}
 			if (this.$util.isEmpty(this.selectList)) {
 				this.$msg("请选择订单");
 				return;
 			}
+			if(this.selectList.length > 100){
+				uni.showToast({title: '订单太多,点右上角选月份再结',duration: 2000,icon:"none"})
+				return false
+			}
 			this.isModel = true;
 		},
 		affirm(val) {

+ 4 - 4
hdApp/src/pagesPurchase/gathering.vue

@@ -162,15 +162,15 @@ export default {
     },
     //批量收款
     batchConfirm () {
-      if(this.searchTime == ''){
-        this.$msg('请点右上角,选择月份,再结账')
-        return false
-      }
       let arr = []
       if (this.$util.isEmpty(this.selectList)) {
         this.$msg('请选择订单')
         return false
       }
+			if(this.selectList.length > 100){
+				uni.showToast({title: '订单太多,点右上角选月份再结',duration: 2000,icon:"none"})
+				return false
+			}
       this.selectList.forEach(item => {
         arr.push(item.id)
       })