diff --git a/app.json b/app.json
index c418ea9..ae83de2 100644
--- a/app.json
+++ b/app.json
@@ -79,7 +79,13 @@
"pages/bidding/index/index",
"pages/bidding/detail/index",
"pages/paper/price-index/index",
- "pages/paper/cate-list/index"
+ "pages/paper/cate-list/index",
+ "pages/shop/index/index",
+ "pages/shop/create/index",
+ "pages/shop/detail/index",
+ "pages/shop/order/index",
+ "pages/shop/bidding/index",
+ "pages/shop/bill/index"
]
}
],
diff --git a/pages/goods/product-item/index.wxml b/pages/goods/product-item/index.wxml
index 44967de..d87f630 100644
--- a/pages/goods/product-item/index.wxml
+++ b/pages/goods/product-item/index.wxml
@@ -1,4 +1,3 @@
-
diff --git a/pages/mall/search-list/index.js b/pages/mall/search-list/index.js
index a851e3f..88ba2e6 100644
--- a/pages/mall/search-list/index.js
+++ b/pages/mall/search-list/index.js
@@ -70,7 +70,7 @@ Page({
this.onSearchList({ detail:{value: this.data.form.searchKey} })
},
onSearchList: function({detail}){
- if (!app.globalData.userInfo && this.data.tabIndex == 3) {
+ if (!app.globalData.userInfo && this.data.tabIndex == 2) {
wx.navigateTo({ url: '/pages/login/index' })
return
}
diff --git a/submodel/pages/shop/bidding/index.js b/submodel/pages/shop/bidding/index.js
index 4126653..65b0d33 100644
--- a/submodel/pages/shop/bidding/index.js
+++ b/submodel/pages/shop/bidding/index.js
@@ -1,6 +1,6 @@
-import { getBiddingActivityList } from "../../../api/ztb"
-const util = require('../../../utils/util')
-const event = require('../../../utils/event.js')
+import { getBiddingActivityList } from "../../../../api/ztb"
+const util = require('../../../../utils/util')
+const event = require('../../../../utils/event.js')
const app = getApp()
const status = ['', 0 ,1, 2, -1]
diff --git a/submodel/pages/shop/bidding/index.wxml b/submodel/pages/shop/bidding/index.wxml
index 0546db5..1a2ee94 100644
--- a/submodel/pages/shop/bidding/index.wxml
+++ b/submodel/pages/shop/bidding/index.wxml
@@ -1,5 +1,5 @@
-
+
竞价管理
diff --git a/submodel/pages/shop/bill/index.js b/submodel/pages/shop/bill/index.js
index 1beec6b..3f7abf6 100644
--- a/submodel/pages/shop/bill/index.js
+++ b/submodel/pages/shop/bill/index.js
@@ -1,5 +1,5 @@
-import { getStoreWater } from "../../../api/ztb"
-const util = require('../../../utils/util')
+import { getStoreWater } from "../../../../api/ztb"
+const util = require('../../../../utils/util')
const app = getApp()
Page({
@@ -18,27 +18,18 @@ Page({
pageSize:15
}
},
-
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- // wx.navigateTo({ url: options.url + '?' + options.key + '=' + options.value })
- this.setData({
- height: app.globalData.fragmentHeight
- })
+ this.setData({ height: app.globalData.fragmentHeight })
this.fetchBillList()
},
onRefreshList: function () {
if (this.data.requesting) {
return
}
- this.setData({
- orderList: [],
- ['form.pageNum']: 1,
- loading: true,
- finished: false
- })
+ this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false })
this.fetchBillList()
},
fetchBillList: function () {
@@ -57,43 +48,22 @@ Page({
var num = this.data.form.pageNum
var finished = this.data.form.pageNum >= result.data.pages
if(this.data.form.pageNum == 1){
- this.setData({
- [nowList]: respList,
- ['form.pageNum']: (num + 1),
- top: 0,
- finished,
- requesting: false,
- loading: false
- })
+ this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), top: 0, finished, requesting: false, loading: false })
} else {
- this.setData({
- [nowList]: respList,
- ['form.pageNum']: (num + 1),
- finished,
- requesting: false,
- loading: false
- })
+ this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false })
}
} else {
- this.setData({
- finished: true,
- requesting: false,
- loading: false
- })
+ this.setData({ finished: true, requesting: false, loading: false })
}
}).catch(err => {
- //异常回调
- this.setData({
- requesting: false,
- loading: false
- })
+ this.setData({ requesting: false, loading: false })
util.showToast(err)
})
},
lookItem: function (e) {
// var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
// wx.navigateTo({
- // url: '/submodelpages/home/bill-detail/index?id=' + item.id
+ // url: '/submodel/pages/home/bill-detail/index?id=' + item.id
// })
}
})
\ No newline at end of file
diff --git a/submodel/pages/shop/create/index.js b/submodel/pages/shop/create/index.js
index afe520a..365ae56 100644
--- a/submodel/pages/shop/create/index.js
+++ b/submodel/pages/shop/create/index.js
@@ -1,7 +1,7 @@
// pages/shop/apply/index.js
-import { updateStore, getStoreInfo, editStore } from "../../../api/ztb"
-const util = require('../../../utils/util')
-import regions from '../../../const/region'
+import { updateStore, getStoreInfo, editStore } from "../../../../api/ztb"
+const util = require('../../../../utils/util')
+import regions from '../../../../const/region'
Page({
/**
diff --git a/submodel/pages/shop/create/index.wxml b/submodel/pages/shop/create/index.wxml
index 1998ab9..f4bdd7b 100644
--- a/submodel/pages/shop/create/index.wxml
+++ b/submodel/pages/shop/create/index.wxml
@@ -1,4 +1,3 @@
-
完善店铺