diff --git a/assets/image/tabBj.png b/assets/image/tabBj.png
deleted file mode 100644
index 1ab6798..0000000
Binary files a/assets/image/tabBj.png and /dev/null differ
diff --git a/assets/info/noData.png b/assets/info/noData.png
deleted file mode 100644
index cf61c71..0000000
Binary files a/assets/info/noData.png and /dev/null differ
diff --git a/pages/agent/address/index.wxml b/pages/agent/address/index.wxml
index 8f5e0a8..aecc877 100644
--- a/pages/agent/address/index.wxml
+++ b/pages/agent/address/index.wxml
@@ -8,7 +8,7 @@
请补充
您的工厂发货信息
-
+
工厂全称：
diff --git a/pages/agent/focus-fragment/index.wxml b/pages/agent/focus-fragment/index.wxml
index 5cb4f3b..03fb71f 100644
--- a/pages/agent/focus-fragment/index.wxml
+++ b/pages/agent/focus-fragment/index.wxml
@@ -7,7 +7,7 @@
-
+
暂无关注
diff --git a/pages/agent/fragment/index.js b/pages/agent/fragment/index.js
index 7f95b42..92f26d8 100644
--- a/pages/agent/fragment/index.js
+++ b/pages/agent/fragment/index.js
@@ -76,7 +76,6 @@ Component({
},
fetchRegionList: function () {
getFactoryCity().then(result => {
- //成功回调
this.data.cateList = [{ cityId: '', cityName: '全部' }].concat(result.data)
for (let index = 0; index < this.data.cateList.length; index++) {
this.data.tabList.push(this.data.cateList[index].cityName)
diff --git a/pages/agent/index/index.json b/pages/agent/index/index.json
index 663430c..92d5216 100644
--- a/pages/agent/index/index.json
+++ b/pages/agent/index/index.json
@@ -1,6 +1,6 @@
{
"usingComponents": {
"focus": "/pages/purchase/fragment/index",
- "factory": "/pages/goods/fragment/index"
+ "factory": "/pages/goods/ablility/index"
}
}
\ No newline at end of file
diff --git a/pages/article/newInfo/index.wxml b/pages/article/newInfo/index.wxml
index 5c17508..94ac096 100644
--- a/pages/article/newInfo/index.wxml
+++ b/pages/article/newInfo/index.wxml
@@ -46,7 +46,7 @@
-
+
{{loading? '正在加载' : '暂无关注'}}
diff --git a/pages/goods/ablility/index.js b/pages/goods/ablility/index.js
index 1e8e417..bf94b6d 100644
--- a/pages/goods/ablility/index.js
+++ b/pages/goods/ablility/index.js
@@ -3,7 +3,11 @@ import { paperCategoryList, getMiniProxyList } from "../../api/ztb"
const app = getApp()
const statusList = [1, 2]
-Page({
+Component({
+ options: {
+ addGlobalClass: true,
+ multipleSlots: true
+ },
/**
* 页面的初始数据
*/
@@ -22,121 +26,117 @@ Page({
orderList: [],
form: {
firstCategoryId: '',
- bidType: statusList[1],
+ bidType: statusList[0],
pageNum: 1,
pageSize:15
},
},
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- this.setData({
- height: app.globalData.fragmentHeight - 210,
- kg: app.globalData.kg,
- CustomBar: app.globalData.CustomBar,
- ['form.bidType']: options.type ? Number(options.type) : statusList[1]
- })
- this.fetchCateList()
- this.fetchGoodsList()
- },
- fetchCateList: function(){
- paperCategoryList({ type: 1 }).then(result => {
- var tabList = ['全部']
- var size = 0
- for (let index = 0; index < result.data.length; index++) {
- tabList.push(result.data[index].name)
- size += result.data[index].name.length
+ methods: {
+ onRestart: function(){
+ if (!this.data.firstShow) {
+ this.setData({ height: app.globalData.fragmentHeight - 210, kg: app.globalData.kg })
+ this.fetchCateList()
+ this.fetchGoodsList()
}
- this.data.cateList = result.data
- this.setData({ tabiList: tabList, cateScroll: size > 14 })
- })
- },
- onCategoryChange: function ({detail}) {
- if(this.data.pageIndex == Number(detail.index)){
- return
- }
- this.data.pageIndex = Number(detail.index)
- if(this.data.pageIndex == 0){
- this.data.form.firstCategoryId = ''
- } else {
- this.data.form.firstCategoryId = this.data.cateList[this.data.pageIndex - 1].id
- }
- this.onRefreshList()
- },
- onTabChange: function (e) {
- if (this.data.form.bidType == Number(e.currentTarget.dataset.index)) {
- return
- }
- var tabIndex = Number(e.currentTarget.dataset.index)
- // this.data.form.bidType = statusList[this.data.tabIndex]
- this.data.form.firstCategoryId = ''
- this.setData({ pageIndex: 0, ['form.bidType']: tabIndex })
- this.onRefreshList()
- },
- // 下拉刷新...
- onRefreshList: function () {
- if (this.data.requesting) {
- return
- }
- this.setData({
- orderList: [],
- ['form.pageNum']: 1,
- loading: true,
- finished: false
- })
- this.fetchGoodsList()
- },
- // 获取特价列表
- fetchGoodsList: function () {
- if (this.data.requesting || this.data.finished) {
- return
- }
- if (this.data.loading) {
- this.data.requesting = true
- } else {
- this.setData({ requesting: true })
- }
- getMiniProxyList(this.data.form).then(result => {
- if (result.data.records.length) {
- var respList = result.data.records
- let nowList = `orderList[${this.data.orderList.length}]`
- var num = result.data.current
- var finished = result.data.current >= result.data.pages
- if(this.data.form.pageNum == 1){
- this.setData({
- [nowList]: respList,
- total: result.data.total,
- ['form.pageNum']: (num + 1),
- top: 0,
- finished,
- requesting: false,
- loading: false
- })
- } else {
- this.setData({
- [nowList]: respList,
- total: result.data.total,
- ['form.pageNum']: (num + 1),
- finished,
- requesting: false,
- loading: false
- })
+ this.data.firstShow = true
+ },
+ fetchCateList: function(){
+ paperCategoryList({ type: 1 }).then(result => {
+ var tabList = ['全部']
+ var size = 0
+ for (let index = 0; index < result.data.length; index++) {
+ tabList.push(result.data[index].name)
+ size += result.data[index].name.length
}
+ this.data.cateList = result.data
+ this.setData({ tabiList: tabList, cateScroll: size > 14 })
+ })
+ },
+ onCategoryChange: function ({detail}) {
+ if(this.data.pageIndex == Number(detail.index)){
+ return
+ }
+ this.data.pageIndex = Number(detail.index)
+ if(this.data.pageIndex == 0){
+ this.data.form.firstCategoryId = ''
} else {
- this.setData({ finished: true, requesting: false, loading: false })
+ this.data.form.firstCategoryId = this.data.cateList[this.data.pageIndex - 1].id
}
- }).catch(err => {
- this.setData({ requesting: false, finished: true, loading: false })
- })
- },
- lookItem: function (e) {
- var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
- wx.navigateTo({ url: '/pages/mall/detail/index?id=' + item.id })
- },
- offerGood: function(e){
- var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
- wx.navigateTo({ url: '/pages/mall/detail/index?id=' + item.id })
+ this.onRefreshList()
+ },
+ onTabChange: function (e) {
+ if (this.data.form.bidType == Number(e.currentTarget.dataset.index)) {
+ return
+ }
+ var tabIndex = Number(e.currentTarget.dataset.index)
+ // this.data.form.bidType = statusList[this.data.tabIndex]
+ this.data.form.firstCategoryId = ''
+ this.setData({ pageIndex: 0, ['form.bidType']: tabIndex })
+ this.onRefreshList()
+ },
+ // 下拉刷新...
+ onRefreshList: function () {
+ if (this.data.requesting) {
+ return
+ }
+ this.setData({
+ orderList: [],
+ ['form.pageNum']: 1,
+ loading: true,
+ finished: false
+ })
+ this.fetchGoodsList()
+ },
+ // 获取特价列表
+ fetchGoodsList: function () {
+ if (this.data.requesting || this.data.finished) {
+ return
+ }
+ if (this.data.loading) {
+ this.data.requesting = true
+ } else {
+ this.setData({ requesting: true })
+ }
+ getMiniProxyList(this.data.form).then(result => {
+ if (result.data.records.length) {
+ var respList = result.data.records
+ let nowList = `orderList[${this.data.orderList.length}]`
+ var num = result.data.current
+ var finished = result.data.current >= result.data.pages
+ if(this.data.form.pageNum == 1){
+ this.setData({
+ [nowList]: respList,
+ total: result.data.total,
+ ['form.pageNum']: (num + 1),
+ top: 0,
+ finished,
+ requesting: false,
+ loading: false
+ })
+ } else {
+ this.setData({
+ [nowList]: respList,
+ total: result.data.total,
+ ['form.pageNum']: (num + 1),
+ finished,
+ requesting: false,
+ loading: false
+ })
+ }
+ } else {
+ this.setData({ finished: true, requesting: false, loading: false })
+ }
+ }).catch(err => {
+ this.setData({ requesting: false, finished: true, loading: false })
+ })
+ },
+ lookItem: function (e) {
+ var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
+ wx.navigateTo({ url: '/pages/mall/detail/index?id=' + item.id })
+ },
+ offerGood: function(e){
+ var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
+ wx.navigateTo({ url: '/pages/mall/detail/index?id=' + item.id })
+ }
}
-
})
\ No newline at end of file
diff --git a/pages/goods/ablility/index.wxml b/pages/goods/ablility/index.wxml
index b0be089..0732709 100644
--- a/pages/goods/ablility/index.wxml
+++ b/pages/goods/ablility/index.wxml
@@ -1,27 +1,21 @@
-
- 供应商品
-
-
-
-
- 一口价专区
- 担保交易 支持退货
-
-
-
- 特价专区
- 稀有资源 限时特价
-
-
+
+
+ 一口价专区
+ 担保交易 支持退货
+
-
-
-
+
+ 特价专区
+ 稀有资源 限时特价
+
+
+
+
+
-
diff --git a/pages/home/attentionPaperList/index.wxml b/pages/home/attentionPaperList/index.wxml
index edc7917..051b6cf 100644
--- a/pages/home/attentionPaperList/index.wxml
+++ b/pages/home/attentionPaperList/index.wxml
@@ -12,7 +12,7 @@
HI,\n欢迎使用纸通宝\n开启一站式废纸交易
-
+
diff --git a/pages/home/businessLicense/index.wxml b/pages/home/businessLicense/index.wxml
index 42daa46..8788420 100644
--- a/pages/home/businessLicense/index.wxml
+++ b/pages/home/businessLicense/index.wxml
@@ -12,7 +12,7 @@
HI,\n欢迎使用纸通宝\n开启一站式废纸交易
-
+
diff --git a/pages/home/tab1/index.wxml b/pages/home/tab1/index.wxml
index 8c1b567..97c4453 100644
--- a/pages/home/tab1/index.wxml
+++ b/pages/home/tab1/index.wxml
@@ -13,7 +13,7 @@
HI,\n欢迎使用纸通宝\n开启一站式废纸交易
-
+
diff --git a/pages/home/tab2/index.wxml b/pages/home/tab2/index.wxml
index 32f02ef..fbaf47b 100644
--- a/pages/home/tab2/index.wxml
+++ b/pages/home/tab2/index.wxml
@@ -13,7 +13,7 @@
HI,\n欢迎使用纸通宝\n开启一站式废纸交易
-
+
diff --git a/pages/home/tab3/index.wxml b/pages/home/tab3/index.wxml
index b34b479..98a39c5 100644
--- a/pages/home/tab3/index.wxml
+++ b/pages/home/tab3/index.wxml
@@ -13,7 +13,7 @@
HI,\n欢迎使用纸通宝\n开启一站式废纸交易
-
+
diff --git a/pages/home/tab4/index.wxml b/pages/home/tab4/index.wxml
index 57dbc1c..63b3bd6 100644
--- a/pages/home/tab4/index.wxml
+++ b/pages/home/tab4/index.wxml
@@ -12,7 +12,7 @@
HI,\n欢迎使用纸通宝\n开启一站式废纸交易
-
+
diff --git a/pages/home/tab5/index.wxml b/pages/home/tab5/index.wxml
index fc21f92..01ea548 100644
--- a/pages/home/tab5/index.wxml
+++ b/pages/home/tab5/index.wxml
@@ -12,7 +12,7 @@
HI,\n欢迎使用纸通宝\n开启一站式废纸交易
-
+
diff --git a/pages/home/tab6/index.wxml b/pages/home/tab6/index.wxml
index 1ad44b4..498b321 100644
--- a/pages/home/tab6/index.wxml
+++ b/pages/home/tab6/index.wxml
@@ -12,7 +12,7 @@
HI,\n欢迎使用纸通宝\n开启一站式废纸交易
-
+
diff --git a/pages/purchase/fragment/index.js b/pages/purchase/fragment/index.js
index 2621d79..b3802af 100644
--- a/pages/purchase/fragment/index.js
+++ b/pages/purchase/fragment/index.js
@@ -12,12 +12,14 @@ Component({
* 页面的初始数据
*/
data: {
- height: app.globalData.fragmentHeight,
+ height: app.globalData.fragmentHeight - 90,
kg: app.globalData.kg,
loading: true,
requesting: false,
finished: false,
cateList: [],
+ tabList: [],
+ tabIndex: 0,
cateScroll: false,
top: 0,
orderList: [],
@@ -39,7 +41,7 @@ Component({
methods: {
onRestart: function(){
if (!this.data.firstShow) {
- this.setData({ height: app.globalData.fragmentHeight, kg: app.globalData.kg })
+ this.setData({ height: app.globalData.fragmentHeight - 90, kg: app.globalData.kg })
this.fetchCateList()
this.fetchGoodsList()
}
@@ -47,15 +49,26 @@ Component({
},
fetchCateList: function(){
paperCategoryList({ type: 1 }).then(result => {
- var cateList = [{id: '', name: '全部'}].concat(result.data)
- this.setData({ cateList: cateList, cateScroll: cateList.length >= 5 })
+ var tabList = ['全部']
+ var size = 0
+ for (let index = 0; index < result.data.length; index++) {
+ tabList.push(result.data[index].name)
+ size += result.data[index].name.length
+ }
+ this.data.cateList = result.data
+ this.setData({ tabList: tabList, cateScroll: size > 14 })
})
},
- onCategoryChange: function (e) {
- if (this.data.form.firstCategoryId == e.detail.key) {
+ onCategoryChange: function ({detail}) {
+ if(this.data.tabIndex == Number(detail.index)){
return
}
- this.setData({ ['form.firstCategoryId']: e.detail.key })
+ this.data.tabIndex = Number(detail.index)
+ if(this.data.tabIndex == 0){
+ this.data.form.firstCategoryId = ''
+ } else {
+ this.data.form.firstCategoryId = this.data.cateList[this.data.tabIndex - 1].id
+ }
this.onRefreshList()
},
// 下拉刷新...
diff --git a/pages/purchase/fragment/index.json b/pages/purchase/fragment/index.json
index 6e23f0d..d0dc6f8 100644
--- a/pages/purchase/fragment/index.json
+++ b/pages/purchase/fragment/index.json
@@ -3,6 +3,7 @@
"wux-skeleton": "/components/skeleton/index",
"wux-skeleton-avatar": "/components/skeleton-avatar/index",
"wux-skeleton-paragraph": "/components/skeleton-paragraph/index",
+ "wux-tabi": "/components/tabi/index",
"refresh-view": "/components/refresher/index",
"wux-image": "/components/image/index",
"wux-divider": "/components/divider/index",
diff --git a/pages/purchase/fragment/index.wxml b/pages/purchase/fragment/index.wxml
index 438317d..d7aa3ef 100644
--- a/pages/purchase/fragment/index.wxml
+++ b/pages/purchase/fragment/index.wxml
@@ -1,5 +1,8 @@
+
+
+
diff --git a/pakageInfo/pages/article/allNewInfo/index.wxml b/pakageInfo/pages/article/allNewInfo/index.wxml
index 8609ad2..94124e3 100644
--- a/pakageInfo/pages/article/allNewInfo/index.wxml
+++ b/pakageInfo/pages/article/allNewInfo/index.wxml
@@ -16,7 +16,7 @@
-
+
{{loading? '正在加载' : '暂无关注'}}
diff --git a/pakageInfo/pages/article/attentionPaperFactory/index.wxml b/pakageInfo/pages/article/attentionPaperFactory/index.wxml
index 69cbae0..6dad90e 100644
--- a/pakageInfo/pages/article/attentionPaperFactory/index.wxml
+++ b/pakageInfo/pages/article/attentionPaperFactory/index.wxml
@@ -9,7 +9,7 @@
HI,\n欢迎使用纸通宝\n开启一站式废纸交易
-
+
diff --git a/project.config.json b/project.config.json
index 8a7c46d..472050a 100644
--- a/project.config.json
+++ b/project.config.json
@@ -4,7 +4,7 @@
"ignore": []
},
"setting": {
- "urlCheck": false,
+ "urlCheck": true,
"es6": true,
"enhance": true,
"postcss": true,
@@ -35,10 +35,12 @@
"packNpmManually": false,
"packNpmRelationList": [],
"minifyWXSS": true,
- "showES6CompileOption": false
+ "disableUseStrict": false,
+ "showES6CompileOption": false,
+ "useCompilerPlugins": false
},
"compileType": "miniprogram",
- "libVersion": "2.18.1",
+ "libVersion": "2.19.4",
"appid": "wx7a4a8415e6821108",
"projectname": "zhitongbao-mini",
"debugOptions": {