diff --git a/app.json b/app.json index 2b5ccd7..33076f0 100644 --- a/app.json +++ b/app.json @@ -14,10 +14,6 @@ "pages/home/tab4/index", "pages/home/tab5/index", "pages/home/tab6/index", - "pages/shop/detail/index", - "pages/shop/order/index", - "pages/shop/bidding/index", - "pages/shop/bill/index", "pages/goods/index/index", "pages/goods/detail/index", "pages/goods/create/index", diff --git a/pages/html/message/index.js b/pages/html/message/index.js index 0435b90..a1a4663 100644 --- a/pages/html/message/index.js +++ b/pages/html/message/index.js @@ -150,7 +150,7 @@ Page({ } else if(redirect.targetView == 'sellerOrderDetail'){// 卖家订单的详情页 sellerOrderDetail wx.navigateTo({ url: '/submodel/pages/morder/detail/index?type=1&orderId=' + redirect.params.id }) } else if(redirect.targetView == 'storeIndex'){// 店铺首页 storeIndex - wx.navigateTo({ url: '/pages/shop/detail/index?storeId=' + redirect.params.id }) + wx.navigateTo({ url: '/submodel/pages/shop/detail/index?storeId=' + redirect.params.id }) } else if(redirect.targetView == 'personalBillDetail'){// 账单详情页 personalBillDetail wx.navigateTo({ url: '/submodel/pages/home/bill-detail/index?id=' + redirect.params.id }) } else if(redirect.targetView == 'member'){// 会员页 member diff --git a/pages/mall/detail/index.js b/pages/mall/detail/index.js index bbfb95f..70e711b 100644 --- a/pages/mall/detail/index.js +++ b/pages/mall/detail/index.js @@ -342,12 +342,10 @@ Page({ return } if (!app.globalData.userInfo) { - wx.navigateTo({ - url: '/pages/login/index' - }) + wx.navigateTo({ url: '/pages/login/index' }) return } - util.navigateTo('/pages/shop/detail/index?storeId=' + this.data.orderInfo.storeId) + util.navigateTo('/submodel/pages/shop/detail/index?storeId=' + this.data.orderInfo.storeId) }, biddingPrice: function (price) { if (util.isEmpty(price)) { diff --git a/pages/shop/bidding/index.js b/pages/shop/bidding/index.js deleted file mode 100644 index 4126653..0000000 --- a/pages/shop/bidding/index.js +++ /dev/null @@ -1,123 +0,0 @@ -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] - -Page({ - /** - * 页面的初始数据 - */ - data: { - height: app.globalData.fragmentHeight, - kg: app.globalData.kg, - loading: true, - requesting: false, - finished: false, - tabList: ['全部', '竞价中', '待下单', '已结束', '已流拍' ], - tabIndex: 0, - top: 0, - orderList: [], - form: { - status: '', - pageNum: 1, - pageSize:15 - } - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - this.setData({ - height: app.globalData.fragmentHeight - 90, - kg: app.globalData.kg, - CustomBar: app.globalData.CustomBar - }) - event.on('EventMessage', this, this.onEvent) - this.fetchBiddingList() - }, - onEvent: function (message) { - if (message.what == 301 || message.what == 102) { - this.onRefreshList() - } - }, - onRefreshList: function () { - if (this.data.requesting) { - return - } - this.setData({ - orderList: [], - ['form.status']: this.data.form.status, - ['form.pageNum']: 1, - loading: true, - finished: false - }) - this.fetchBiddingList() - }, - fetchBiddingList: function () { - if (this.data.requesting || this.data.finished) { - return - } - if (this.data.loading) { - this.data.requesting = true - } else { - this.setData({ requesting: true }) - } - getBiddingActivityList(this.data.form).then(result => { - if (result.data.records.length) { - var respList = result.data.records - let nowList = `orderList[${this.data.orderList.length}]` - 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, - 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, - loading: false - }) - util.showToast(err) - }) - }, - lookItem: function (e) { - var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index] - wx.navigateTo({ url: '/submodel/pages/bidding/detail/index?type=1&id=' + item.id }) - }, - onTabChange: function ({detail}) { - if (this.data.tabIndex == detail.index) { - return - } - this.data.tabIndex = detail.index - this.data.form.status = status[detail.index] - this.onRefreshList() - }, - onUnload: function(){ - event.remove('EventMessage', this) - } -}) \ No newline at end of file diff --git a/pages/shop/bidding/index.json b/pages/shop/bidding/index.json deleted file mode 100644 index ee41d37..0000000 --- a/pages/shop/bidding/index.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "usingComponents": { - "refresh-view": "/components/refresher/index", - "wux-tabi": "/components/tabi/index", - "wux-image": "/components/image/index", - "wux-divider": "/components/divider/index" - } -} \ No newline at end of file diff --git a/pages/shop/bidding/index.wxml b/pages/shop/bidding/index.wxml deleted file mode 100644 index 0546db5..0000000 --- a/pages/shop/bidding/index.wxml +++ /dev/null @@ -1,65 +0,0 @@ - - - - 竞价管理 - - - - - - - - - - - - - - - - - - - - - 竞拍订单 - 起拍价：{{formate.formatePrice(item.initialUnitPrice,kg)}} - - 单号：{{item.id}} - - {{shop.orderBidding(item.status)}} - - - - - - - - - {{item.productSecondCategoryName}} - - - 库存：{{formate.formateWeight(item.stock, kg)}} - - - {{item.productSummary}} - - - - - - - - - - - - {{finished?'到底啦～':'加载中...'}} - - - - - \ No newline at end of file diff --git a/pages/shop/bidding/index.wxss b/pages/shop/bidding/index.wxss deleted file mode 100644 index 6885eb0..0000000 --- a/pages/shop/bidding/index.wxss +++ /dev/null @@ -1,42 +0,0 @@ -.item-content { - background-color: white; - padding: 24rpx 32rpx; -} - -.page-name { - font-size: 32rpx; - font-family: PingFang-SC-Medium, PingFang-SC; - font-weight: 500; - color: rgba(51, 51, 51, 1); - line-height: 22px; -} - -.page-num { - font-size: 24rpx; - font-family: PingFang-SC-Regular, PingFang-SC; - font-weight: 400; - color: rgba(153, 153, 153, 1); -} - -.image-load { - width: 80px; - height: 80px; - display: flex; - align-items: center; - justify-content: center; -} - -.page-outline { - padding-top: 8rpx; - font-size: 26rpx; - font-family: PingFang-SC-Regular, PingFang-SC; - font-weight: 400; - color: rgba(51, 51, 51, 1); - display: -webkit-box; - overflow: hidden; - text-overflow: ellipsis; - word-wrap: break-word; - white-space: normal !important; - -webkit-line-clamp: 3; - -webkit-box-orient: vertical; -} \ No newline at end of file diff --git a/pages/shop/bill/index.js b/pages/shop/bill/index.js deleted file mode 100644 index 1beec6b..0000000 --- a/pages/shop/bill/index.js +++ /dev/null @@ -1,99 +0,0 @@ -import { getStoreWater } from "../../../api/ztb" -const util = require('../../../utils/util') -const app = getApp() - -Page({ - /** - * 页面的初始数据 - */ - data: { - height: app.globalData.fragmentHeight, - loading: true, - requesting: false, - finished: false, - top: 0, - orderList: [], - form: { - pageNum: 1, - pageSize:15 - } - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - // wx.navigateTo({ url: options.url + '?' + options.key + '=' + options.value }) - 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.fetchBillList() - }, - fetchBillList: function () { - if (this.data.requesting || this.data.finished) { - return - } - if (this.data.loading) { - this.data.requesting = true - } else { - this.setData({ requesting: true }) - } - getStoreWater(this.data.form).then(result => { - if (result.data && result.data.records && result.data.records.length) { - var respList = result.data.records - let nowList = `orderList[${this.data.orderList.length}]` - 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 - }) - } else { - this.setData({ - [nowList]: respList, - ['form.pageNum']: (num + 1), - finished, - requesting: false, - loading: false - }) - } - } else { - this.setData({ - finished: true, - requesting: false, - loading: false - }) - } - }).catch(err => { - //异常回调 - 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 - // }) - } -}) \ No newline at end of file diff --git a/pages/shop/bill/index.json b/pages/shop/bill/index.json deleted file mode 100644 index 0832291..0000000 --- a/pages/shop/bill/index.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "usingComponents": { - "refresh-view": "/components/refresher/index", - "wux-divider": "/components/divider/index" - } -} \ No newline at end of file diff --git a/pages/shop/bill/index.wxml b/pages/shop/bill/index.wxml deleted file mode 100644 index 207bfab..0000000 --- a/pages/shop/bill/index.wxml +++ /dev/null @@ -1,40 +0,0 @@ - - - 店铺收入 - - - - - - - - - - - - - - {{item.type == 1 ? '一口价订单' : '竞价订单'}} - {{bill.billStatus(item.status)}} - - - 订单编号：{{item.orderNo}} - {{item.price}} - - - - - - - - - - {{finished?'到底啦～':'加载中...'}} - - - - - \ No newline at end of file diff --git a/pages/shop/bill/index.wxs b/pages/shop/bill/index.wxs deleted file mode 100644 index c27b858..0000000 --- a/pages/shop/bill/index.wxs +++ /dev/null @@ -1,14 +0,0 @@ -function billStatus(status) { - if (status == 1) { - return '待结算' - } else if (status == 2) { - return '已结算' - } else if (status == 3) { - return '取消' - } - return '' -} - -module.exports = { - billStatus: billStatus -} \ No newline at end of file diff --git a/pages/shop/bill/index.wxss b/pages/shop/bill/index.wxss deleted file mode 100644 index e0ecedb..0000000 --- a/pages/shop/bill/index.wxss +++ /dev/null @@ -1,11 +0,0 @@ -.item-content { - background-color: white; - padding: 18rpx 24rpx; -} - -.page-num { - font-size: 24rpx; - font-family: PingFang-SC-Regular, PingFang-SC; - font-weight: 400; - color: rgba(153, 153, 153, 1); -} \ No newline at end of file diff --git a/pages/shop/detail/index.js b/pages/shop/detail/index.js deleted file mode 100644 index bcd7541..0000000 --- a/pages/shop/detail/index.js +++ /dev/null @@ -1,150 +0,0 @@ -// pages/shop/detail/index.js -import { getStoreInfo, getProductList, getStoreProductList } from "../../../api/ztb" -const math = require('../../../utils/math') -const util = require('../../../utils/util') -const app = getApp() - -Page({ - /** - * 页面的初始数据 - */ - data: { - height: app.globalData.fragmentHeight, - kg: app.globalData.kg, - imageHeight: 0, - imgList: [], - detail: null, - tabList: [ '供应', '采购', '联系'], - tabIndex: 0, - orderList: [], - loading: true, - requesting: false, - finished: false, - form: { - storeId: null, - pageNum: 1, - pageSize:15 - } - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - this.data.form.storeId = options.storeId - wx.showLoading({ title: '加载中', mask: true }) - getStoreInfo(options.storeId).then(result => { - this.setData({ - detail: result.data, - imgList: result.data.coverImgUrlList, - imageHeight: math.divide(math.times(750, 9), 16), - height: app.globalData.fragmentHeight, - kg: app.globalData.kg, - }) - wx.hideLoading() - }).catch(err => { - //异常回调 - wx.hideLoading() - }) - this.fetchGoodList() - }, - viewImage: function(event){ - wx.previewImage({ urls: this.data.imgList, current: event.currentTarget.dataset.url }) - }, - onTabChange: function({detail}){ - if (this.data.tabIndex == Number(detail.index)) { - return - } - this.data.tabIndex = Number(detail.index) - if(this.data.tabIndex != 2){ - this.onRefreshList() - } else { - this.setData({ tabIndex: this.data.tabIndex }) - } - }, - onRefreshList: function () { - if(this.data.tabIndex == 2){ - this.setData({ requesting: false }) - return - } - if (this.data.requesting) { - return - } - this.setData({ - orderList: [], - tabIndex: this.data.tabIndex, - ['form.pageNum']: 1, - loading: true, - finished: false - }) - this.fetchGoodList() - }, - fetchGoodList: function () { - if (this.data.requesting || this.data.finished) { - return - } - if (this.data.loading) { - this.data.requesting = true - } else { - this.setData({ requesting: true }) - } - if(this.data.tabIndex == 0){ - getStoreProductList(this.data.form).then(result => { - this.doResult(result) - }).catch(err => { - this.setData({ requesting: false, loading: false }) - util.showToast(err) - }) - } else if(this.data.tabIndex == 1){ - getProductList(this.data.form).then(result => { - this.doResult(result) - }).catch(err => { - this.setData({ requesting: false, loading: false }) - util.showToast(err) - }) - } - }, - doResult: function(result){ - if (result.data.records.length) { - var respList = result.data.records - let nowList = `orderList[${this.data.orderList.length}]` - 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, - 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 - }) - } - }, - lookItem: function(event){ - var item = this.data.orderList[event.currentTarget.dataset.page][event.currentTarget.dataset.index] - if(item.bidType == 3){ - wx.navigateTo({ url: '/submodel/pages/purchase/detail/index?id=' + item.id }) - } else { - wx.navigateTo({ url: '/pages/mall/detail/index?id=' + item.id }) - } - } - -}) \ No newline at end of file diff --git a/pages/shop/detail/index.json b/pages/shop/detail/index.json deleted file mode 100644 index ee41d37..0000000 --- a/pages/shop/detail/index.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "usingComponents": { - "refresh-view": "/components/refresher/index", - "wux-tabi": "/components/tabi/index", - "wux-image": "/components/image/index", - "wux-divider": "/components/divider/index" - } -} \ No newline at end of file diff --git a/pages/shop/detail/index.wxml b/pages/shop/detail/index.wxml deleted file mode 100644 index 53cc44d..0000000 --- a/pages/shop/detail/index.wxml +++ /dev/null @@ -1,81 +0,0 @@ - - - - 店铺详情 - - - - - - - - - - - - - - - - - - - - {{detail.name}} - - - - {{detail.locProvinceName}} {{detail.locCityName}} - - - - 店主昵称：{{detail.contacts}} - 店铺地址：{{detail.locDetails}} - 联系方式：{{detail.contactPhoneNo}} - - - - - - - - - - - - - - - - - - - - {{item.secondCategoryName}} - - - - {{item.description || ''}} - - - {{item.unitPrice ? '￥' + formate.formatePrice(item.unitPrice, kg) : '价格面议'}} - 库存：{{formate.formateWeight(item.stock, kg)}} - - - - - - - - - - - {{finished?'到底啦～':'加载中...'}} - - - - - \ No newline at end of file diff --git a/pages/shop/detail/index.wxss b/pages/shop/detail/index.wxss deleted file mode 100644 index 8fc546c..0000000 --- a/pages/shop/detail/index.wxss +++ /dev/null @@ -1,75 +0,0 @@ -/* pages/shop/detail/index.wxss */ -.margin-top { - margin-top: 18rpx; -} - -.detail-layout { - min-height: 90rpx; - font-size: 30rpx; - align-items: center; -} - -.info-layout { - position: absolute; - bottom: 0; - width: 100%; - background-color: rgba(0, 0, 0, 0.3); - padding: 18rpx 30rpx; -} - -.item-content { - height: 120px; - background: rgba(255, 255, 255, 1); - padding: 20rpx -} - -.page-name { - font-size: 32rpx; - font-family: PingFang-SC-Medium, PingFang-SC; - font-weight: 500; - color: rgba(51, 51, 51, 1); - line-height: 22px; -} - -.page-num { - font-size: 24rpx; - font-family: PingFang-SC-Regular, PingFang-SC; - font-weight: 400; - color: rgba(153, 153, 153, 1); -} - -.page-outline { - margin-top: 8rpx; - font-size: 28rpx; - font-family: PingFang-SC-Regular, PingFang-SC; - font-weight: 400; - color: rgba(51, 51, 51, 1); - display: -webkit-box; - overflow: hidden; - text-overflow: ellipsis; - word-wrap: break-word; - white-space: normal !important; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; -} - -.page-price { - line-height: 30rpx; - font-size: 32rpx; - font-family: DINAlternate-Bold, DINAlternate; - font-weight: bold; - color: rgba(255, 66, 43, 1); -} - -.image-load { - width: 100px; - height: 100px; - display: flex; - align-items: center; - justify-content: center; -} - -.tag { - height: 40rpx; - padding: 2rpx 18rpx 4rpx 18rpx; -} \ No newline at end of file diff --git a/pages/shop/order/index.js b/pages/shop/order/index.js deleted file mode 100644 index 865a359..0000000 --- a/pages/shop/order/index.js +++ /dev/null @@ -1,118 +0,0 @@ -import { getStoreTradeList } from "../../../api/ztb" -const util = require('../../../utils/util') -const event = require('../../../utils/event.js') -const app = getApp() -const status = ['', 1, 2, 3, 4, 5, 6, 7, 8, 9] - -Page({ - - /** - * 页面的初始数据 - */ - data: { - height: app.globalData.fragmentHeight, - kg: app.globalData.kg, - loading: true, - requesting: false, - finished: false, - tabList: [ '全部', '待付诚意金', '待上传资料', '待上传资料确认', '待支付尾款', '待收货', '待扣点确认', '待退货确认', '已完成', '已关闭' ], - tabIndex: 0, - top: 0, - orderList: [], - form: { - storeId: '', - status: '', - pageNum: 1, - pageSize:15 - } - }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - this.setData({ - ['form.storeId']: options.storeId, - height: app.globalData.fragmentHeight - 90, - kg: app.globalData.kg, - CustomBar: app.globalData.CustomBar - }) - event.on('EventMessage', this, this.onEvent) - this.fetchOrderList() - }, - onEvent: function (message) { - if (message.what == 320) { - this.onRefreshList() - } - }, - onRefreshList: function () { - if (this.data.requesting) { - return - } - this.setData({ - orderList: [], - ['form.status']: this.data.form.status, - ['form.pageNum']: 1, - loading: true, - finished: false - }) - this.fetchOrderList() - }, - fetchOrderList: function () { - if (this.data.requesting || this.data.finished) { - return - } - if (this.data.loading) { - this.data.requesting = true - } else { - this.setData({ requesting: true }) - } - getStoreTradeList(this.data.form).then(result => { - if (result.data.records.length) { - var respList = result.data.records - let nowList = `orderList[${this.data.orderList.length}]` - 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, - 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, loading: false }) - util.showToast(err) - }) - }, - lookItem: function (e) { - var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index] - wx.navigateTo({ url: '/submodel/pages/morder/detail/index?type=1&orderId=' + item.orderId }) - }, - onTabChange: function ({detail}) { - if (this.data.tabIndex == detail.index) { - return - } - this.data.tabIndex = detail.index - this.data.form.status = status[this.data.tabIndex] - this.onRefreshList() - }, - onUnload: function(){ - event.remove('EventMessage', this) - } -}) \ No newline at end of file diff --git a/pages/shop/order/index.json b/pages/shop/order/index.json deleted file mode 100644 index ee41d37..0000000 --- a/pages/shop/order/index.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "usingComponents": { - "refresh-view": "/components/refresher/index", - "wux-tabi": "/components/tabi/index", - "wux-image": "/components/image/index", - "wux-divider": "/components/divider/index" - } -} \ No newline at end of file diff --git a/pages/shop/order/index.wxml b/pages/shop/order/index.wxml deleted file mode 100644 index b8ea019..0000000 --- a/pages/shop/order/index.wxml +++ /dev/null @@ -1,67 +0,0 @@ - - - - 订单管理 - - - - - - - - - - - - - - - - - - - - - {{item.orderPlacerName}} - {{item.phone}} - - - - - - {{item.bidType == 1 ? '一口价' : '竞拍订单'}} - 单号：{{item.orderId}} - - {{shop.orderStatus(item.status)}} - - - - - - - - {{item.secondCategoryName}} - 单价：{{formate.formatePrice2(item.unitPrice, kg)}} - - - {{item.description}} - - - - - - - - - - - - {{finished?'到底啦～':'加载中...'}} - - - - - \ No newline at end of file diff --git a/pages/shop/order/index.wxss b/pages/shop/order/index.wxss deleted file mode 100644 index e73febb..0000000 --- a/pages/shop/order/index.wxss +++ /dev/null @@ -1,50 +0,0 @@ -.item-content { - background-color: white; - padding: 24rpx 32rpx; -} - -.page-name { - font-size: 32rpx; - font-family: PingFang-SC-Medium, PingFang-SC; - font-weight: 500; - color: rgba(51, 51, 51, 1); - line-height: 22px; -} - -.page-num { - font-size: 24rpx; - font-family: PingFang-SC-Regular, PingFang-SC; - font-weight: 400; - color: rgba(153, 153, 153, 1); -} - -.image-load { - width: 80px; - height: 80px; - display: flex; - align-items: center; - justify-content: center; -} - -.page-outline { - padding-top: 8rpx; - font-size: 26rpx; - font-family: PingFang-SC-Regular, PingFang-SC; - font-weight: 400; - color: rgba(51, 51, 51, 1); - display: -webkit-box; - overflow: hidden; - text-overflow: ellipsis; - word-wrap: break-word; - white-space: normal !important; - -webkit-line-clamp: 3; - -webkit-box-orient: vertical; -} - -.image-load { - width: 100px; - height: 100px; - display: flex; - align-items: center; - justify-content: center; -} diff --git a/pages/shop/shop.wxs b/pages/shop/shop.wxs deleted file mode 100644 index 663ac97..0000000 --- a/pages/shop/shop.wxs +++ /dev/null @@ -1,40 +0,0 @@ -function orderBidding(status) { - if (status == -1) { - return '已流拍' - } else if (status == 0) { - return '竞价中' - } else if (status == 1) { - return '待下单' - } else if (status == 2) { - return '已结束' - } - return '' -} - -function orderStatus(status) { - if (status == 1) { - return '待付诚意金' - } else if (status == 2) { - return '待上传资料' - } else if (status == 3) { - return '待上传资料确认' - } else if (status == 4) { - return '待支付尾款' - } else if (status == 5) { - return '待收货' - } else if (status == 6) { - return '待扣点确认' - } else if (status == 7) { - return '待退货确认' - } else if (status == 8) { - return '已完成' - } else if (status == 9) { - return '已关闭' - } - return '' -} - -module.exports = { - orderBidding: orderBidding, - orderStatus: orderStatus -} \ No newline at end of file diff --git a/submodel/pages/bidding/detail/index.js b/submodel/pages/bidding/detail/index.js index 72d22e3..73e0bba 100644 --- a/submodel/pages/bidding/detail/index.js +++ b/submodel/pages/bidding/detail/index.js @@ -124,7 +124,7 @@ Page({ wx.navigateTo({ url: '/pages/login/index'}) return } - wx.navigateTo({ url: '/pages/shop/detail/index?storeId=' + this.data.biddingInfo.biddingActivity.storeId }) + wx.navigateTo({ url: '/submodel/pages/shop/detail/index?storeId=' + this.data.biddingInfo.biddingActivity.storeId }) }, formatePrice: function (value, kg) { if (value || value == 0) { diff --git a/submodel/pages/morder/detail/index.js b/submodel/pages/morder/detail/index.js index 8ea20b2..be78a88 100644 --- a/submodel/pages/morder/detail/index.js +++ b/submodel/pages/morder/detail/index.js @@ -195,7 +195,7 @@ Page({ wx.navigateTo({ url: '/pages/login/index'}) return } - wx.navigateTo({ url: '/pages/shop/detail/index?storeId=' + this.data.orderInfo.storeId }) + wx.navigateTo({ url: '/submodel/pages/shop/detail/index?storeId=' + this.data.orderInfo.storeId }) }, bindInput: function(e){ if(e.target.id == 'grossWeight'){ diff --git a/submodel/pages/purchase/detail/index.js b/submodel/pages/purchase/detail/index.js index 795eddb..e677efa 100644 --- a/submodel/pages/purchase/detail/index.js +++ b/submodel/pages/purchase/detail/index.js @@ -85,28 +85,20 @@ Page({ return } if (!app.globalData.userInfo) { - wx.navigateTo({ - url: '/pages/login/index' - }) + wx.navigateTo({ url: '/pages/login/index' }) return } if (this.check()) { - wx.navigateTo({ - url: '/pages/shop/detail/index?storeId=' + this.data.orderInfo.storeId - }) + wx.navigateTo({ url: '/submodel/pages/shop/detail/index?storeId=' + this.data.orderInfo.storeId }) } }, phoneShopInfo: function () { if (!app.globalData.userInfo) { - wx.navigateTo({ - url: '/pages/login/index' - }) + wx.navigateTo({ url: '/pages/login/index' }) return } if (this.check()) { - wx.makePhoneCall({ - phoneNumber: this.data.orderInfo.ownerPhone - }) + wx.makePhoneCall({ phoneNumber: this.data.orderInfo.ownerPhone }) } }, onShareAppMessage: function () { diff --git a/submodel/pages/shop/detail/index.wxml b/submodel/pages/shop/detail/index.wxml index 2790f7a..97e305c 100644 --- a/submodel/pages/shop/detail/index.wxml +++ b/submodel/pages/shop/detail/index.wxml @@ -1,4 +1,3 @@ - 店铺详情 diff --git a/submodel/pages/shop/index/index.js b/submodel/pages/shop/index/index.js index 3c03172..2212433 100644 --- a/submodel/pages/shop/index/index.js +++ b/submodel/pages/shop/index/index.js @@ -119,7 +119,7 @@ Page({ } } else if(this.data.form.storeId){ if(this.data.form.status == 2){ - wx.navigateTo({ url: '/pages/shop/detail/index?storeId=' + this.data.form.storeId }) + wx.navigateTo({ url: '/submodel/pages/shop/detail/index?storeId=' + this.data.form.storeId }) } else { wx.navigateTo({ url: '/submodel/pages/shop/create/index' }) } @@ -151,15 +151,15 @@ Page({ } else if (index === 1) { wx.navigateTo({ url: '/pages/goods/create/index?type=2' }) } else if (index === 2) { - wx.navigateTo({ url: '/pages/shop/bidding/index' }) + wx.navigateTo({ url: '/submodel/pages/shop/bidding/index' }) } else if (index === 3) { wx.navigateTo({ url: '/pages/goods/index/index' }) } else if (index === 4) { - wx.navigateTo({ url: '/pages/shop/order/index?storeId=' + this.data.form.storeId }) + wx.navigateTo({ url: '/submodel/pages/shop/order/index?storeId=' + this.data.form.storeId }) } else if (index === 5) { wx.navigateTo({ url: '/submodel/pages/shop/create/index?storeId=' + this.data.form.storeId }) } else if (index === 6) { - wx.navigateTo({ url: '/pages/shop/bill/index' }) + wx.navigateTo({ url: '/submodel/pages/shop/bill/index' }) } else if (index === 7) { wx.navigateTo({ url: '/submodel/pages/purchase/create/index' }) } else if (index === 8) { diff --git a/utils/util.js b/utils/util.js index 89911c2..8e47e7b 100644 --- a/utils/util.js +++ b/utils/util.js @@ -177,7 +177,7 @@ const tokenList = [ '/pages/withdrawal/balance/index', '/pages/agent/order/index', '/pages/home/idcard/index', - '/pages/shop/detail/index', + '/submodel/pages/shop/detail/index', '/pages/article/publish/index', '/pages/article/feedback/index', 'pages/agent/edit/index',