From 25f5f7850bbdf013b8dd4cb88e9d485170e9e799 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期日, 02 四月 2023 18:17:54 +0800
Subject: [PATCH] #
---
pages/mat/matQuery.vue | 42 +++++++++++++++++++++++++++++++++---------
pages/pakin/pakin.vue | 4 +---
2 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/pages/mat/matQuery.vue b/pages/mat/matQuery.vue
index 1b69771..e542f37 100644
--- a/pages/mat/matQuery.vue
+++ b/pages/mat/matQuery.vue
@@ -14,7 +14,7 @@
<view class="tag-item">{{item.name}}</view>
</view>
</scroll-view>
- <scroll-view>
+ <view>
<view class="tag-list" v-for="(item,i) in matList" :key="i" @click="findBySelect(item.matnr)">
<view class="tag">
<view style="display: flex;">
@@ -25,7 +25,8 @@
<view class="tag-item">鍟嗗搧鍚嶇О锛� {{item.maktx}}</view>
<view class="tag-item">鍟嗗搧瑙勬牸锛� {{item.specs}}</view>
</view>
- </scroll-view>
+ </view>
+ <uni-load-more v-show="matList.length != 0" :status="status" :icon-size="16" :content-text="contentText" />
</view>
</template>
@@ -34,15 +35,30 @@
data() {
return {
tagList: [],
- matList: '',
+ matList: [],
+ reload: false,
+ curr:1,
tag: '鍒嗙被',
baColor: "background-color: #0081ff;",
desc: '鍟嗗搧缂栧彿:',
baseUrl: '',
- token: ''
+ token: '',
+ status: 'more',
+ contentText: {
+ contentdown: '涓婃媺鍔犺浇鏇村',
+ contentrefresh: '鍔犺浇涓�',
+ contentnomore: '娌℃湁鏇村'
+ },
+ // 褰撳墠tagId
+ tagIdNow: 1
}
},
+ onReachBottom() {
+ this.status = 'more';
+ this.showMat(this.tagIdNow);
+ },
onLoad() {
+ // 娌″暐鐢ㄤ簡
let that = this
// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
const eventChannel = this.getOpenerEventChannel();
@@ -50,7 +66,6 @@
// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
eventChannel.on('commonUrl', function(data) {
that.commonUrl = data.commonUrl
- that.showTag(1)
})
},
onShow() {
@@ -77,7 +92,7 @@
},
success(result) {
that.tagList = null
- that.matList = null
+ that.matList = []
var res = result.data
if (res.code === 200) {
if (res.data != null && res.data.length > 0) {
@@ -100,12 +115,16 @@
},
showMat(tagId) {
let that = this
+ that.tagIdNow = tagId
if (tagId == null || tagId == '' || tagId == undefined) {
return;
}
+ console.log(tagId);
uni.request({
- url: that.baseUrl + '/mat/list/pda/auth',
+ url: that.baseUrl + '/mat/list/pda/page/auth',
data: {
+ curr:that.curr,
+ limit: 100,
tagId: tagId
},
method:"GET",
@@ -116,8 +135,13 @@
that.tagList = null
var res = result.data
if (res.code === 200) {
- if (res.data != null && res.data.length > 0) {
- that.matList = res.data
+ if (res.data.records != null && res.data.records.length > 0) {
+ let list = res.data.records
+ that.matList = that.reload ? list : that.matList.concat(list);
+ that.curr = that.curr + 1
+ if (res.data.records.length == 0) {
+ that.status = 'noMore'
+ }
that.baColor = "background-color: #1cbbb4;"
}
} else if (res.code === 403 ) {
diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 61269ea..b1d1a83 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -233,12 +233,11 @@
},
selectMat() {
let that = this
- uni.vibrateShort();
uni.navigateTo({
url: "../mat/matQuery",
success: function(res) {
// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
- res.eventChannel.emit('commonUrl', {commonUrl:that.commonUrl })
+ res.eventChannel.emit('commonUrl', {commonUrl: '' })
},
events: {
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
@@ -257,7 +256,6 @@
var add = true
for (var i = 0; i < len; i++) {
if (mat.matnr == this.dataList[i].matnr) {
- console.log(typeof mat.anfme);
this.dataList[i].anfme += mat.anfme
this.$forceUpdate() // 寮哄埗鍒锋柊
add = false
--
Gitblit v1.9.1