odjbin/city-store-transfer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dj' (#94) from dj into master

Browse Source 
Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/94
This commit is contained in:
odjbin
2023-11-20 06:15:34 +00:00
parent 54f62175a4 33f2943eef
commit 770fc4137a
7 changed files with 274 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pages.json
View File

@@ -127,7 +127,7 @@
"navigationBarTitleText": "转让信息",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#339967",
"enablePullDownRefresh": false
"enablePullDownRefresh": true
}
},
{
@@ -136,7 +136,7 @@
"navigationBarTitleText": "找店信息",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#339967",
"enablePullDownRefresh": false
"enablePullDownRefresh": true
}
},
{
@@ -145,7 +145,7 @@
"navigationBarTitleText": "出租信息",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#339967",
"enablePullDownRefresh": false
"enablePullDownRefresh": true
}
},
{
@@ -154,7 +154,7 @@
"navigationBarTitleText": "项目招商",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#339967",
"enablePullDownRefresh": false
"enablePullDownRefresh": true
}
},
{

58
pages/index/NavBarPages/czxx/czxx.vue
View File

@@ -17,6 +17,10 @@
<view class="marginLR10">
<ShowShopList :showStyle="2" :adlinkPath="adlinkPath" :listType="3" :shopInfoList="shopInfoList" />
</view>
<view v-if="showNull" class="showNull">
<text>没有符合条件的数据, 请下拉刷新重置数据~
</text>
</view>
</view>
</template>
@@ -34,25 +38,63 @@
pageNum: 1,
customQuery: {},
shopListLength: '',
showNull: false,
refresh: false
}
},
onPullDownRefresh() {
this.refresh = true
// if (this.showNull = true) {
const q = this.$u.queryParams({
type: 3,
pageSize: this.pageSize,
pageNum: 1,
})
// if(this.showNull=true){
// this.pageNum=1
// }
this.getShopList(q, "refresh")
// }
},
onReachBottom() {
if (this.shopInfoList.length !== 0) {
if (this.shopListLength !== 0) {
this.pageNum++
this.getShopList()
console.log("触底加载");
}else if (this.shopListLength == 0) {
this.pageNum = 1
}
},
onLoad() {
this.getShopList()
},
methods: {
getShopList(q) {
let query = this.getQueryInfo(q)
getShopList(q, type) {
let query = {}
if (type == "refresh") {
query = q
} else {
query = this.getQueryInfo(q)
}
console.log("listquery", query);
this.$api.getShopList(query).then(res => {
this.shopListLength = res.data.data.length
this.shopInfoList = [...this.shopInfoList, ...res.data.data]
if (query.includes('business') || query.includes('areatype') || query.includes('sortType') || query
.includes('region') || this.refresh) {
console.log('筛选');
// this.resetQuery(q)
this.shopInfoList = res.data.data
this.refresh = false
if (res.data.data.length == 0) {
this.showNull = true
} else {
this.showNull = false
}
} else {
console.log('查询');
this.shopInfoList = [...this.shopInfoList, ...res.data.data]
}
console.log(this.shopInfoList);
})
},
@@ -75,7 +117,13 @@
page {
background-color: #F8F8F8;
}
.showNull {
display: flex;
align-items: center;
justify-content: center;
height: 100rpx;
color: darkgray;
}
.marginLR10 {
margin: 0 10px;
}

58
pages/index/NavBarPages/xmzs/xmzs.vue
View File

@@ -17,6 +17,10 @@
<view class="marginLR10">
<ShowShopList :showStyle="2" :adlinkPath="adlinkPath" :listType="4" :shopInfoList="shopInfoList" />
</view>
<view v-if="showNull" class="showNull">
<text>没有符合条件的数据, 请下拉刷新重置数据~
</text>
</view>
</view>
</template>
@@ -34,25 +38,63 @@
pageNum: 1,
customQuery: {},
shopListLength: '',
showNull: false,
refresh: false
}
},
onPullDownRefresh() {
this.refresh = true
// if (this.showNull = true) {
const q = this.$u.queryParams({
type: 4,
pageSize: this.pageSize,
pageNum: 1,
})
// if(this.showNull=true){
// this.pageNum=1
// }
this.getShopList(q, "refresh")
// }
},
onReachBottom() {
if (this.shopInfoList.length !== 0) {
if (!this.refresh && this.shopListLength !== 0) {
this.pageNum++
this.getShopList()
console.log("触底加载");
} else if (this.searchListLength == 0) {
this.pageNum = 1
}
},
onLoad() {
this.getShopList()
},
methods: {
getShopList(q) {
let query = this.getQueryInfo(q)
getShopList(q, type) {
let query = {}
if (type == "refresh") {
query = q
} else {
query = this.getQueryInfo(q)
}
console.log("listquery", query);
this.$api.getShopList(query).then(res => {
this.shopListLength = res.data.data.length
this.shopInfoList = [...this.shopInfoList, ...res.data.data]
if (query.includes('business') || query.includes('areatype') || query.includes('sortType') || query
.includes('region') || this.refresh) {
console.log('筛选');
// this.resetQuery(q)
this.shopInfoList = res.data.data
this.refresh = false
if (res.data.data.length == 0) {
this.showNull = true
} else {
this.showNull = false
}
} else {
console.log('查询');
this.shopInfoList = [...this.shopInfoList, ...res.data.data]
}
console.log(this.shopInfoList);
})
},
@@ -76,6 +118,14 @@
background-color: #F8F8F8;
}
.showNull {
display: flex;
align-items: center;
justify-content: center;
height: 100rpx;
color: darkgray;
}
.marginLR10 {
margin: 0 10px;
}

58
pages/index/NavBarPages/zdxx/zdxx.vue
View File

@@ -17,6 +17,10 @@
<view class="marginLR10">
<SearchShopList :showStyle="1" :searchInfoList="searchInfoList" />
</view>
<view v-if="showNull" class="showNull">
<text>没有符合条件的数据, 请下拉刷新重置数据~
</text>
</view>
</view>
</template>
@@ -33,25 +37,63 @@
searchInfoList: [],
customQuery: {},
searchListLength: '',
showNull: false,
refresh: false
}
},
onPullDownRefresh() {
this.refresh = true
// if (this.showNull = true) {
const q = this.$u.queryParams({
type: 2,
pageSize: this.pageSize,
pageNum: 1,
})
// if(this.showNull=true){
// this.pageNum=1
// }
this.getShopList(q, "refresh")
// }
},
onReachBottom() {
if (this.searchListLength !== 0) {
if (!this.refresh && this.searchListLength !== 0) {
this.pageNum++
this.getShopList()
console.log("触底加载");
} else if (this.searchListLength == 0) {
this.pageNum = 1
}
},
created() {
this.getShopList()
},
methods: {
getShopList(q) {
let query = this.getQueryInfo(q)
getShopList(q, type) {
let query = {}
if (type == "refresh") {
query = q
} else {
query = this.getQueryInfo(q)
}
console.log("listquery", query);
this.$api.getShopList(query).then(res => {
this.searchListLength = res.data.data.length
this.searchInfoList = [...this.searchInfoList, ...res.data.data]
if (query.includes('business') || query.includes('areatype') || query.includes('sortType') || query
.includes('region') || this.refresh) {
console.log('筛选');
// this.resetQuery(q)
this.searchInfoList = res.data.data
this.refresh = false
if (res.data.data.length == 0) {
this.showNull = true
} else {
this.showNull = false
}
} else {
console.log('查询');
this.searchInfoList = [...this.searchInfoList, ...res.data.data]
}
console.log(this.searchInfoList);
})
},
@@ -75,6 +117,14 @@
background-color: #F8F8F8;
}
.showNull {
display: flex;
align-items: center;
justify-content: center;
height: 100rpx;
color: darkgray;
}
.marginLR10 {
margin: 0 10px;
}

59
pages/index/NavBarPages/zrxx/zrxx.vue
View File

@@ -17,6 +17,10 @@
<view class="marginLR10">
<ShowShopList :showStyle="1" :shopInfoList="shopInfoList" />
</view>
<view v-if="showNull" class="showNull">
<text>没有符合条件的数据, 请下拉刷新重置数据~
</text>
</view>
</view>
</template>
@@ -33,26 +37,63 @@
pageNum: 1,
customQuery: {},
shopListLength: '',
showNull: false,
refresh: false
}
},
onPullDownRefresh() {
this.refresh=true
// if (this.showNull = true) {
const q = this.$u.queryParams({
type: 1,
pageSize: this.pageSize,
pageNum: 1,
})
// if(this.showNull=true){
// this.pageNum=1
// }
this.getShopList(q, "refresh")
// }
},
onReachBottom() {
if (this.shopInfoList.length !== 0) {
if (!this.refresh&&this.shopListLength !== 0) {
this.pageNum++
this.getShopList()
console.log("触底加载");
}else if(this.shopListLength == 0){
this.pageNum=1
}
},
onLoad() {
this.getShopList()
},
methods: {
getShopList(q) {
let query = this.getQueryInfo(q)
getShopList(q, type) {
let query = {}
if (type == "refresh") {
query = q
} else {
query = this.getQueryInfo(q)
}
console.log("listquery", query);
this.$api.getShopList(query).then(res => {
this.shopListLength = res.data.data.length
this.shopInfoList = [...this.shopInfoList, ...res.data.data]
if (query.includes('business') || query.includes('areatype') || query.includes('sortType') || query
.includes('region')||this.refresh) {
console.log('筛选');
// this.resetQuery(q)
this.shopInfoList = res.data.data
this.refresh=false
if (res.data.data.length == 0) {
this.showNull = true
} else {
this.showNull = false
}
} else {
console.log('查询');
this.shopInfoList = [...this.shopInfoList, ...res.data.data]
}
console.log(this.shopInfoList);
})
},
@@ -75,7 +116,13 @@
page {
background-color: #F8F8F8;
}
.showNull {
display: flex;
align-items: center;
justify-content: center;
height: 100rpx;
color: darkgray;
}
.marginLR10 {
margin: 0 10px;
}

63
pages/shopAddress/shopAddress.vue
View File

@@ -13,7 +13,10 @@
<SearchShopList :showStyle="1" :searchInfoList="searchInfoList"/>
</view>
</view>
<view v-if="showNull" class="showNull">
<text>没有符合条件的数据, 请下拉刷新重置数据~
</text>
</view>
<TabBar :current-page="3"></TabBar>
</view>
</template>
@@ -26,27 +29,65 @@
},
data() {
return {
pageSize: 5,
pageSize: 3,
pageNum: 1,
searchInfoList: [],
customQuery: {},
searchListLength: '',
showNull: false,
refresh: false
}
},
onPullDownRefresh() {
this.refresh=true
// if (this.showNull = true) {
const q = this.$u.queryParams({
type: 2,
pageSize: this.pageSize,
pageNum: 1,
})
// if(this.showNull=true){
// this.pageNum=1
// }
this.getShopList(q, "refresh")
// }
},
onReachBottom() {
if (this.searchListLength !== 0) {
if (!this.refresh&&this.searchListLength !== 0) {
this.pageNum++
this.getShopList()
console.log("触底加载");
}else if(this.searchListLength == 0){
this.pageNum=1
}
},
methods: {
getShopList(q){
let query = this.getQueryInfo(q)
getShopList(q, type){
let query = {}
if (type == "refresh") {
query = q
} else {
query = this.getQueryInfo(q)
}
console.log("listquery",query);
this.$api.getShopList(query).then(res => {
this.searchListLength = res.data.data.length
this.searchInfoList = [...this.searchInfoList, ...res.data.data]
if (query.includes('business') || query.includes('areatype') || query.includes('sortType') || query
.includes('region')||this.refresh) {
console.log('筛选');
// this.resetQuery(q)
this.searchInfoList = res.data.data
this.refresh=false
if (res.data.data.length == 0) {
this.showNull = true
} else {
this.showNull = false
}
} else {
console.log('查询');
this.searchInfoList = [...this.searchInfoList, ...res.data.data]
}
console.log(this.searchInfoList);
})
},
@@ -58,9 +99,8 @@
pageNum: this.pageNum,
...query
})
this.customQuery = q
return q
},
}
},
created() {
this.getShopList()
@@ -69,6 +109,13 @@
</script>
<style lang="scss" scoped>
.showNull {
display: flex;
align-items: center;
justify-content: center;
height: 100rpx;
color: darkgray;
}
page {
background-color: $uni-bg-color-grey;
}

12
pages/shopTransfer/shopTransfer.vue
View File

@@ -93,7 +93,6 @@
})
},
getQueryInfo(query) {
console.log('this.',this.refresh);
const q = this.$u.queryParams({
type: 1,
pageSize: this.pageSize,
@@ -101,16 +100,7 @@
...query
})
return q
},
// resetQuery(query){
// console.log('ddd',query);
// const q = this.$u.queryParams({
// type: 1,
// pageSize: 5,
// pageNum: 1,
// ...query
// })
// }
}
},
created() {
this.getShopList()