shish 2 лет назад
Родитель
Сommit
46a441e751

+ 1 - 4
ghsApp/src/admin/billing/index2.vue

@@ -21,7 +21,7 @@
 				</div>
 				<view style="height: 120upx"></view>
 			</scroll-view>
-			<scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true" lower-threshold="100" @scrolltolower="scrollBottom">
+			<scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true" lower-threshold="100" @scrolltolower="globalScrollBottom">
 				<!--花材列表-->
 				<block v-if="!$util.isEmpty(globalItemData)">
 					<view class="item_list_bx selectAll">
@@ -183,9 +183,6 @@ export default {
 		}
 	},
 	methods: {
-		scrollBottom(){
-            this.getGlobalProductList()
-        },
 		changeClass(index,item){
 			this.$refs.selectFlowerNumRef.close()
 			this.globalSwitchClass(index,item)

+ 3 - 4
ghsApp/src/admin/item/list2.vue

@@ -22,7 +22,7 @@
 					</div>
 				</scroll-view>
 				<scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true"
-					@scroll="scroll_detail" lower-threshold="100" @scrolltolower="scroll_bottom">
+					lower-threshold="100" @scrolltolower="globalScrollBottom">
 					<block v-if="!$util.isEmpty(globalItemData)">
 						<view class="item_list_bx selectAll">
 							<view class="item_list_title"></view>
@@ -179,9 +179,8 @@ export default {
 		},
 		initItem(){
 			this.globalRequestType = 'itemList'
-			this.initData().then(res=>{
-				uni.hideLoading()
-			})
+			this.initData()
+			uni.hideLoading()
 		},
 		refreshItem(){
 			uni.showLoading({mask:true})

+ 3 - 0
ghsApp/src/mixins/product2.js

@@ -246,6 +246,9 @@ export default {
                 this.globalFinishGetItem = 0
                 this.getGlobalProductList()
             }
+        },
+		globalScrollBottom(){
+            this.getGlobalProductList()
         },
 		getSelectItemById(id, classId) {
 			let info = { bigCount: null, smallCount: null, autoPrice: null, itemPrice: null }