diff --git a/app.js b/app.js
index 3a28896..1b6f647 100644
--- a/app.js
+++ b/app.js
@@ -2,7 +2,7 @@
const tdsdk = require('./libs/tdweapp.js')
App({
//----------------------------------------------globalData--------------------------------------
- evn: 0,//0:开发环境，1：测试环境，2：生产环境
+ evn: 1,//0:开发环境，1：测试环境，2：生产环境
tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'],
version: 152,
diff --git a/app.json b/app.json
index 17b16dd..9beff96 100644
--- a/app.json
+++ b/app.json
@@ -28,7 +28,6 @@
"pages/goods/index/index",
"pages/goods/detail/index",
"pages/goods/create/index",
- "pages/bidding/index/index",
"pages/bidding/detail/index",
"pages/article/publish/index",
"pages/article/detail/index",
@@ -41,9 +40,6 @@
"pages/mall/price-index/index",
"pages/mall/detail/index",
"pages/mall/search-list/index",
- "pages/morder/index/index",
- "pages/morder/create/index",
- "pages/morder/detail/index",
"pages/agent/ability/index",
"pages/agent/factory/index",
"pages/agent/edit/index",
@@ -82,7 +78,12 @@
"pages/html/logistics/index",
"pages/html/service/index",
"pages/address/list/index",
- "pages/address/create/index"
+ "pages/address/create/index",
+ "pages/morder/index/index",
+ "pages/morder/create/index",
+ "pages/morder/detail/index",
+ "pages/bidding/index/index",
+ "pages/bidding/detail/index"
]
}
],
diff --git a/pages/agent/order/index.js b/pages/agent/order/index.js
index 9b61c10..ad37f7d 100644
--- a/pages/agent/order/index.js
+++ b/pages/agent/order/index.js
@@ -1,4 +1,3 @@
-// pages/bidding/index/index.js
import { getProxyOrderList } from "../../../api/ztb"
const util = require('../../../utils/util')
const event = require('../../../utils/event.js')
diff --git a/pages/agent/order/index.wxml b/pages/agent/order/index.wxml
index 0dac6ce..6553b64 100644
--- a/pages/agent/order/index.wxml
+++ b/pages/agent/order/index.wxml
@@ -1,4 +1,3 @@
-
代卖订单
diff --git a/pages/agent/order/index.wxss b/pages/agent/order/index.wxss
index ef93514..0519ecb 100644
--- a/pages/agent/order/index.wxss
+++ b/pages/agent/order/index.wxss
@@ -1,3 +1 @@
-/* pages/bidding/index/index.wxss */
-
\ No newline at end of file
diff --git a/pages/home/index/index.js b/pages/home/index/index.js
index 939cd6a..485f041 100644
--- a/pages/home/index/index.js
+++ b/pages/home/index/index.js
@@ -1,4 +1,3 @@
-// pages/stock/index.js
import { getBaseInfo, getMessageNumber } from "../../../api/ztb"
import { getBalanceInfo } from "../../../api/payment"
const util = require('../../../utils/util')
@@ -42,13 +41,7 @@ Component({
},
onEvent: function (message) {
if (message.what == 888) {
- this.setData({
- userInfo: app.globalData.userInfo,
- accountMoney: 0,
- frozenMoney: 0,
- messageNumber: 0,
- avatarUrl: '/assets/myinfo/user-icon.png'
- })
+ this.setData({ userInfo: app.globalData.userInfo, accountMoney: 0, frozenMoney: 0, messageNumber: 0, avatarUrl: '/assets/myinfo/user-icon.png'})
this.fetchUserInfo()
}
},
@@ -63,9 +56,7 @@ Component({
})
})
getMessageNumber().then(result => {
- this.setData({
- messageNumber: result.data.messageNumber + result.data.notificationNumber
- })
+ this.setData({ messageNumber: result.data.messageNumber + result.data.notificationNumber })
})
},
handUserInfo: function(){
@@ -87,9 +78,7 @@ Component({
if(app.globalData.userInfo.isVIP == 1 && app.globalData.userInfo.memberExpiredAt){
app.globalData.userInfo.memberExpiredAt = util.formatDate(new Date(app.globalData.userInfo.memberExpiredAt.replace(/\-/g, "/")), 'Y-M-D')
app.globalData.userInfo.memberExpiredAt = app.globalData.userInfo.memberExpiredAt.substring(0, 10)
- console.log(app.globalData.userInfo)
}
- // console.log(app.globalData.userInfo)
this.setData({ CustomBar: app.globalData.CustomBar, avatarUrl: app.globalData.userInfo.avatarUrl, userInfo: app.globalData.userInfo })
},
fetchUserInfo: function () {
@@ -103,11 +92,11 @@ Component({
},
toPage: function (e) {
if (e.currentTarget.id == 'bidding') {
- util.navigateTo('/pages/bidding/index/index')
+ util.navigateTo('/submodel/pages/bidding/index/index')
} else if (e.currentTarget.id == 'shop') {
util.navigateTo('/pages/shop/index/index')
} else if (e.currentTarget.id == 'ordering') {
- util.navigateTo('/pages/morder/index/index')
+ util.navigateTo('/submodel/pages/morder/index/index')
} else if (e.currentTarget.id == 'agent') {
util.navigateTo('/pages/agent/order/index')
} else if (e.currentTarget.id == 'message') {
@@ -159,54 +148,10 @@ Component({
},
toAuthor: function () {
if (app.globalData.userInfo.isAuth != 1) {
- wx.navigateTo({
- url: '/pages/home/idcard/index'
- })
+ wx.navigateTo({ url: '/pages/home/idcard/index' })
} else {
- wx.navigateTo({
- url: '/pages/home/info/index'
- })
- }
- },
- clickGrid: function (e) {
- if (parseInt(e.currentTarget.id) == 1) {
- wx.navigateTo({
- url: '/pages/bidding/index/index'
- })
- } else if (parseInt(e.currentTarget.id) == 2) {
- wx.navigateTo({
- url: '/pages/morder/index/index'
- })
- } else if (parseInt(e.currentTarget.id) == 3) {
- wx.navigateTo({
- url: '/pages/message/index/index'
- })
- } else if (parseInt(e.currentTarget.id) == 4) {
- wx.navigateTo({
- url: '/pages/agent/order/index'
- })
- } else if (parseInt(e.currentTarget.id) == 5) {
- wx.navigateTo({
- url: '/pages/html/integral/index'
- })
- } else if (parseInt(e.currentTarget.id) == 6) {
- wx.navigateTo({ url: '/pages/article/list/index' })
- } else if (parseInt(e.currentTarget.id) == 7) {
- wx.navigateTo({ url: '/submodel/pages/address/list/index' })
- }
- },
- onShareAppMessage: function () {
- return {
- title: '纸通宝--废纸交易、最新情报、最优资讯',
- path: '/pages/index/index'
- }
- },
- // 分享至朋友圈
- onShareTimeline() {
- return {
- title: '纸通宝--废纸交易、最新情报、最优资讯',
- path: '/pages/index/index'
+ wx.navigateTo({ url: '/pages/home/info/index' })
}
- },
+ }
}
})
\ No newline at end of file
diff --git a/pages/login/index.js b/pages/login/index.js
index d0aeda1..f28ad27 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -57,27 +57,16 @@ Page({
return
}
app.globalData.token = authorization
- config.header = {
- 'Authorization': 'QNT ' + authorization
- }
- loginToken({
- loginToken: app.globalData.token
- }).then(result => {
- zconfig.header = {
- 'Authorization': 'QNT ' + result.data.token
- }
- pconfig.header = {
- 'Authorization': 'QNT ' + result.data.token
- }
- mconfig.header = {
- 'Authorization': 'QNT ' + result.data.token
- }
+ config.header = { 'Authorization': 'QNT ' + authorization }
+ loginToken({ loginToken: app.globalData.token }).then(result => {
+ zconfig.header = { 'Authorization': 'QNT ' + result.data.token }
+ pconfig.header = { 'Authorization': 'QNT ' + result.data.token }
+ mconfig.header = { 'Authorization': 'QNT ' + result.data.token }
// 登录流程完成；
if(!util.isEmpty(result.data.userToken)){
this.handleUserToken(result.data.userToken)
} else {
this.setData({ loging: false})
- wx.hideLoading()
event.emit('EventMessage', { what: 888, desc: 'Logined' })
getBaseInfo().then(result => {
app.globalData.userInfo = result.data
@@ -100,9 +89,7 @@ Page({
app.globalData.token = null
storage.remove('Authorization')
config.header = null
- this.setData({
- loging: false
- })
+ this.setData({ loging: false })
})
},
handleUserToken: function (userToken) {
diff --git a/pages/mall/detail/index.js b/pages/mall/detail/index.js
index 7e4d7ab..bbfb95f 100644
--- a/pages/mall/detail/index.js
+++ b/pages/mall/detail/index.js
@@ -244,9 +244,7 @@ Page({
return
}
if (this.data.orderInfo.bidType == 1) {
- wx.navigateTo({
- url: '/pages/morder/create/index?productId=' + this.data.orderInfo.productId
- })
+ wx.navigateTo({ url: '/submodel/pages/morder/create/index?productId=' + this.data.orderInfo.productId })
} else {
var that = this
// this.biddingDialog.showBidding(this.data.orderInfo)
diff --git a/pages/message/index/index.js b/pages/message/index/index.js
index 922a39c..957b2b3 100644
--- a/pages/message/index/index.js
+++ b/pages/message/index/index.js
@@ -1,4 +1,3 @@
-// pages/bidding/index/index.js
import { getMessageList, getNotificationList, readMessage, getMessageNumber } from "../../../api/ztb"
const util = require('../../../utils/util')
const event = require('../../../utils/event.js')
@@ -145,11 +144,11 @@ Page({
return
}
if(redirect.targetView == 'biddingDetail'){// 买家竞价的详情页
- wx.navigateTo({ url: '/pages/bidding/detail/index?id=' + redirect.params.id })
+ wx.navigateTo({ url: '/submodel/pages/bidding/detail/index?id=' + redirect.params.id })
} else if(redirect.targetView == 'buyerOrderDetail'){// 买家订单的详情页
- wx.navigateTo({ url: '/pages/morder/detail/index?orderId=' + redirect.params.id })
+ wx.navigateTo({ url: '/submodel/pages/morder/detail/index?orderId=' + redirect.params.id })
} else if(redirect.targetView == 'sellerOrderDetail'){// 卖家订单的详情页 sellerOrderDetail
- wx.navigateTo({ url: '/pages/morder/detail/index?type=1&orderId=' + redirect.params.id })
+ 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 })
} else if(redirect.targetView == 'personalBillDetail'){// 账单详情页 personalBillDetail
diff --git a/pages/morder/index/index.js b/pages/morder/index/index.js
deleted file mode 100644
index 9d667ed..0000000
--- a/pages/morder/index/index.js
+++ /dev/null
@@ -1,240 +0,0 @@
-// pages/bidding/index/index.js
-import { getUserOrderList,getProxyOrderList } from "../../../api/ztb"
-const util = require('../../../utils/util')
-const event = require('../../../utils/event.js')
-const tdsdk = require('../../../libs/tdweapp')
-const app = getApp()
-const status = ['', 1, 2, 3, 4, 5, 6, 7, 8, 9]
-
-Page({
- data: {
- height: app.globalData.fragmentHeight,
- kg: app.globalData.kg,
- StatusBar: app.globalData.StatusBar || 40,
- CustomBar: app.globalData.CustomBar || (app.globalData.isIos ? 64 : 80),
- Custom: app.globalData.Custom,
- loading: true,
- requesting: false,
- finished: false,
- tabList: [ '全部', '待付诚意金', '待上传资料', '待上传资料确认', '待支付尾款', '待收货', '待扣点确认', '待退货确认', '已完成', '已关闭' ],
- tabIndex: 0,
- top: 0,
- orderList: [],
- form: {
- status: '',
- pageNum: 1,
- pageSize:15
- },
- bidType: 1,
-
- height2: app.globalData.fragmentHeight,
- loading2: true,
- requesting2: false,
- finished2: false,
- tabList2: ['全部', '待预约', '待送货', '结算中', '已完成', '已关闭' ],
- tabIndex2: 0,
- top2: 0,
- orderList2: [],
- form2: {
- status: '',
- pageNum: 1,
- pageSize:15
- }
- },
- onLoad: function (options) {
- this.setData({
- height: app.globalData.fragmentHeight - 90,
- kg: app.globalData.kg,
- CustomBar: app.globalData.CustomBar,
- ['form.status']: options.status ? statusList[parseInt(options.status)] : '',
- tabIndex: options.status ? parseInt(options.status) : 0
- })
- 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 })
- }
- getUserOrderList(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: '/pages/morder/detail/index?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)
- },
- backspace() {
- wx.navigateBack()
- },
- onTabChangeTop: function (e) {
- if (this.data.bidType == Number(e.currentTarget.dataset.index)) {
- return
- }
- var tabIndex = Number(e.currentTarget.dataset.index)
- this.setData({
- ['bidType']: tabIndex
- })
- if(this.data.bidType==1){
- this.onRefreshList()
- }
- if(this.data.bidType==2){
- this.onRefreshList2()
- }
- },
- onTabTopChange2: function ({detail}) {
- if (this.data.tabIndex2 == detail.index) {
- return
- }
- this.data.tabIndex2 = detail.index
- this.data.form2.status = status2[this.data.tabIndex2]
- this.onRefreshList2()
- },
- onRefreshList2: function () {
- this.setData({
- orderList2: [],
- ['form2.status']: this.data.form2.status,
- ['form2.pageNum']: 1,
- loading2: true,
- finished2: false
- })
- this.fetchOrderList2()
- },
- fetchOrderList2: function () {
- if (this.data.requesting2 || this.data.finished2) {
- return
- }
- if (this.data.loading2) {
- this.data.requesting2 = true
- } else {
- this.setData({ requesting2: true })
- }
- getProxyOrderList(this.data.form2).then(result => {
- if (result.data.records.length) {
- var respList = result.data.records
- let nowList2 = `orderList2[${this.data.orderList2.length}]`
- var num = this.data.form2.pageNum
- var finished = this.data.form2.pageNum >= result.data.pages
- if(this.data.form2.pageNum == 1){
- this.setData({
- [nowList2]: respList,
- total2: result.data.total,
- ['form.pageNum']: (num + 1),
- top: 0,
- finished2,
- requesting2: false,
- loading2: false
- })
- } else {
- this.setData({
- [nowList2]: respList,
- total2: result.data.total,
- ['form2.pageNum']: (num + 1),
- finished2,
- requesting2: false,
- loading2: false
- })
- }
- } else {
- this.setData({
- finished2: true,
- requesting2: false,
- loading2: false
- })
- }
- }).catch(err => {
- //异常回调
- this.setData({
- requesting2: false,
- loading2: false
- })
- util.showToast(err)
- })
- },
- lookItem2: function (e) {
- var item = this.data.orderList2[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
- wx.navigateTo({ url: '/pages/agent/detail/index?id=' + item.orderId })
- },
- onShow: function () {
- tdsdk.Page.onShow()
- },
- onHide: function(){
- tdsdk.Page.onHide()
- },
- onUnload: function () {
- tdsdk.Page.onUnload()
- }
-})
\ No newline at end of file
diff --git a/pages/morder/index/index.wxml b/pages/morder/index/index.wxml
deleted file mode 100644
index 0d428ef..0000000
--- a/pages/morder/index/index.wxml
+++ /dev/null
@@ -1,168 +0,0 @@
-
-
-
-
- 我的订单
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{loading? '正在加载' : '暂无数据'}}
-
-
-
-
-
-
-
-
-
-
- {{item.bidType == 1 ? '一口价' : '竞拍订单'}}
- ({{item.storeName}})
-
- 单号：{{item.orderId}}
-
- {{order.orderStatus(item.status)}}
-
-
-
-
-
-
-
-
- {{item.secondCategoryName}}
- 单价：{{formate.formatePrice2(item.unitPrice, kg)}}
-
-
- {{item.description}}
-
-
-
-
-
-
-
-
-
-
-
- {{finished?'到底啦～':'加载中...'}}
-
-
-
-
-
-
-
-
-
-
-
- function statusColor(status) {
- if (status == 50) {
- return '#F12C20'
- } else if (status == 51) {
- return '#F12C20'
- } else if (status == 52) {
- return '#F12C20'
- } else if (status == 53) {
- return '#008AFF'
- } else if (status == 54) {
- return '#09BB07'
- } else if (status == 55) {
- return '#888888'
- }
- return ''
- }
- module.exports = statusColor
-
\ No newline at end of file
diff --git a/pages/shop/bidding/index.js b/pages/shop/bidding/index.js
index 8560a3d..4126653 100644
--- a/pages/shop/bidding/index.js
+++ b/pages/shop/bidding/index.js
@@ -1,4 +1,3 @@
-// pages/bidding/index/index.js
import { getBiddingActivityList } from "../../../api/ztb"
const util = require('../../../utils/util')
const event = require('../../../utils/event.js')
@@ -108,9 +107,7 @@ Page({
},
lookItem: function (e) {
var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
- wx.navigateTo({
- url: '/pages/bidding/detail/index?type=1&id=' + item.id
- })
+ wx.navigateTo({ url: '/submodel/pages/bidding/detail/index?type=1&id=' + item.id })
},
onTabChange: function ({detail}) {
if (this.data.tabIndex == detail.index) {
diff --git a/pages/shop/bidding/index.wxml b/pages/shop/bidding/index.wxml
index ba815de..0546db5 100644
--- a/pages/shop/bidding/index.wxml
+++ b/pages/shop/bidding/index.wxml
@@ -1,4 +1,3 @@
-
diff --git a/pages/shop/bidding/index.wxss b/pages/shop/bidding/index.wxss
index 332804f..6885eb0 100644
--- a/pages/shop/bidding/index.wxss
+++ b/pages/shop/bidding/index.wxss
@@ -1,4 +1,3 @@
-/* pages/bidding/index/index.wxss */
.item-content {
background-color: white;
padding: 24rpx 32rpx;
diff --git a/pages/shop/order/index.js b/pages/shop/order/index.js
index ed6312d..865a359 100644
--- a/pages/shop/order/index.js
+++ b/pages/shop/order/index.js
@@ -1,4 +1,3 @@
-// pages/morder/index/index.js
import { getStoreTradeList } from "../../../api/ztb"
const util = require('../../../utils/util')
const event = require('../../../utils/event.js')
@@ -103,7 +102,7 @@ Page({
},
lookItem: function (e) {
var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
- wx.navigateTo({ url: '/pages/morder/detail/index?type=1&orderId=' + item.orderId })
+ wx.navigateTo({ url: '/submodel/pages/morder/detail/index?type=1&orderId=' + item.orderId })
},
onTabChange: function ({detail}) {
if (this.data.tabIndex == detail.index) {
diff --git a/pages/shop/order/index.wxml b/pages/shop/order/index.wxml
index f58ab96..b8ea019 100644
--- a/pages/shop/order/index.wxml
+++ b/pages/shop/order/index.wxml
@@ -1,4 +1,3 @@
-
diff --git a/pages/shop/order/index.wxss b/pages/shop/order/index.wxss
index 5f49c40..e73febb 100644
--- a/pages/shop/order/index.wxss
+++ b/pages/shop/order/index.wxss
@@ -1,4 +1,3 @@
-/* pages/morder/index/index.wxss */
.item-content {
background-color: white;
padding: 24rpx 32rpx;
diff --git a/assets/image/icon-jjsuccess.png b/submodel/images/icon-jjsuccess.png
similarity index 100%
rename from assets/image/icon-jjsuccess.png
rename to submodel/images/icon-jjsuccess.png
diff --git a/pages/bidding/bidding.wxs b/submodel/pages/bidding/bidding.wxs
similarity index 100%
rename from pages/bidding/bidding.wxs
rename to submodel/pages/bidding/bidding.wxs
diff --git a/pages/bidding/detail/index.js b/submodel/pages/bidding/detail/index.js
similarity index 95%
rename from pages/bidding/detail/index.js
rename to submodel/pages/bidding/detail/index.js
index 09462c5..72d22e3 100644
--- a/pages/bidding/detail/index.js
+++ b/submodel/pages/bidding/detail/index.js
@@ -1,9 +1,8 @@
-// pages/bidding/detail/index.js
-import { getBiddingDetail, getBiddingActivity, getBiddingList, biddingActivity, confirmBidding, cancelBidding, getMyBidding } from "../../../api/ztb"
-const util = require('../../../utils/util')
-const math = require('../../../utils/math')
-const event = require('../../../utils/event')
-import { $wuxCountDown } from '../../../components/index'
+import { getBiddingDetail, getBiddingActivity, getBiddingList, biddingActivity, confirmBidding, cancelBidding, getMyBidding } from "../../../../api/ztb"
+const util = require('../../../../utils/util')
+const math = require('../../../../utils/math')
+const event = require('../../../../utils/event')
+import { $wuxCountDown } from '../../../../components/index'
const app = getApp()
Page({
@@ -240,7 +239,7 @@ Page({
},
offerOrder: function(){
var productId = this.data.biddingInfo.biddingActivity.productId
- wx.navigateTo({ url: '/pages/morder/create/index?productId=' + productId + '&price=' + this.data.biddingInfo.unitPrice })
+ wx.navigateTo({ url: '/submodel/pages/morder/create/index?productId=' + productId + '&price=' + this.data.biddingInfo.unitPrice })
},
restartActivity: function(){
wx.redirectTo({ url: '/pages/goods/create/index?id=' + this.data.biddingInfo.productId })
diff --git a/pages/bidding/detail/index.json b/submodel/pages/bidding/detail/index.json
similarity index 100%
rename from pages/bidding/detail/index.json
rename to submodel/pages/bidding/detail/index.json
diff --git a/pages/bidding/detail/index.wxml b/submodel/pages/bidding/detail/index.wxml
similarity index 89%
rename from pages/bidding/detail/index.wxml
rename to submodel/pages/bidding/detail/index.wxml
index b577aef..c1b34aa 100644
--- a/pages/bidding/detail/index.wxml
+++ b/submodel/pages/bidding/detail/index.wxml
@@ -1,13 +1,12 @@
-
-
+
竞价详情
- 竞价成功！(商家已经确认您的竞价，请尽快下单！)
+ 竞价成功！(商家已经确认您的竞价，请尽快下单！)
单号：{{biddingInfo.id}}
@@ -78,22 +77,12 @@
商品详情
{{biddingInfo.description}}
-
-
-
修改报价
立即下单
diff --git a/pages/bidding/detail/index.wxss b/submodel/pages/bidding/detail/index.wxss
similarity index 97%
rename from pages/bidding/detail/index.wxss
rename to submodel/pages/bidding/detail/index.wxss
index bdb8980..493e7b5 100644
--- a/pages/bidding/detail/index.wxss
+++ b/submodel/pages/bidding/detail/index.wxss
@@ -1,4 +1,3 @@
-/* pages/bidding/detail/index.wxss */
.item-content {
background-color: white;
padding: 0rpx 32rpx;
diff --git a/pages/bidding/index/index.js b/submodel/pages/bidding/index/index.js
similarity index 91%
rename from pages/bidding/index/index.js
rename to submodel/pages/bidding/index/index.js
index f9f58e2..d218583 100644
--- a/pages/bidding/index/index.js
+++ b/submodel/pages/bidding/index/index.js
@@ -1,7 +1,6 @@
-// pages/morder/index/index.js
-import { getMyBiddingList } from "../../../api/ztb"
-const util = require('../../../utils/util')
-const event = require('../../../utils/event.js')
+import { getMyBiddingList } from "../../../../api/ztb"
+const util = require('../../../../utils/util')
+const event = require('../../../../utils/event.js')
const app = getApp()
const status = ['', 0 ,1, 2, -1]
@@ -102,9 +101,7 @@ Page({
},
lookItem: function (e) {
var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
- wx.navigateTo({
- url: '/pages/bidding/detail/index?id=' + item.id
- })
+ wx.navigateTo({ url: '/submodel/pages/bidding/detail/index?id=' + item.id })
},
onTabChange: function ({detail}) {
if (this.data.tabIndex == detail.index) {
diff --git a/pages/bidding/index/index.json b/submodel/pages/bidding/index/index.json
similarity index 100%
rename from pages/bidding/index/index.json
rename to submodel/pages/bidding/index/index.json
diff --git a/pages/bidding/index/index.wxml b/submodel/pages/bidding/index/index.wxml
similarity index 96%
rename from pages/bidding/index/index.wxml
rename to submodel/pages/bidding/index/index.wxml
index a80d00f..b1cc4b8 100644
--- a/pages/bidding/index/index.wxml
+++ b/submodel/pages/bidding/index/index.wxml
@@ -1,6 +1,5 @@
-
-
+
我的报价
diff --git a/pages/bidding/index/index.wxss b/submodel/pages/bidding/index/index.wxss
similarity index 95%
rename from pages/bidding/index/index.wxss
rename to submodel/pages/bidding/index/index.wxss
index 24fa2a7..ad73524 100644
--- a/pages/bidding/index/index.wxss
+++ b/submodel/pages/bidding/index/index.wxss
@@ -1,4 +1,3 @@
-/* pages/morder/index/index.wxss */
.item-status {
font-size: 30rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
diff --git a/pages/morder/create/index.js b/submodel/pages/morder/create/index.js
similarity index 93%
rename from pages/morder/create/index.js
rename to submodel/pages/morder/create/index.js
index 773f00f..d9f7cf5 100644
--- a/pages/morder/create/index.js
+++ b/submodel/pages/morder/create/index.js
@@ -1,9 +1,8 @@
-// pages/bidding/create/index.js
-import { createTradeOrder, getUserProduct, getAddressList } from "../../../api/ztb"
-const event = require('../../../utils/event')
-const util = require('../../../utils/util')
-const math = require('../../../utils/math')
-const tdsdk = require('../../../libs/tdweapp')
+import { createTradeOrder, getUserProduct, getAddressList } from "../../../../api/ztb"
+const event = require('../../../../utils/event')
+const util = require('../../../../utils/util')
+const math = require('../../../../utils/math')
+const tdsdk = require('../../../../libs/tdweapp')
const app = getApp()
Page({
@@ -169,7 +168,7 @@ Page({
createTradeOrder(model).then(result => {
wx.hideLoading()
event.emit('EventMessage', { what: 112, desc: 'OrderCreate' })
- wx.redirectTo({ url: '/pages/morder/detail/index?orderId=' + result.data.orderId })
+ wx.redirectTo({ url: '/submodel/pages/morder/detail/index?orderId=' + result.data.orderId })
}).catch(err => {
wx.hideLoading()
util.showToast(err)
diff --git a/pages/morder/create/index.json b/submodel/pages/morder/create/index.json
similarity index 100%
rename from pages/morder/create/index.json
rename to submodel/pages/morder/create/index.json
diff --git a/pages/morder/create/index.wxml b/submodel/pages/morder/create/index.wxml
similarity index 95%
rename from pages/morder/create/index.wxml
rename to submodel/pages/morder/create/index.wxml
index c64c982..0673ab1 100644
--- a/pages/morder/create/index.wxml
+++ b/submodel/pages/morder/create/index.wxml
@@ -1,5 +1,4 @@
-
-
+
下单
diff --git a/pages/morder/create/index.wxss b/submodel/pages/morder/create/index.wxss
similarity index 87%
rename from pages/morder/create/index.wxss
rename to submodel/pages/morder/create/index.wxss
index 037a076..ae89514 100644
--- a/pages/morder/create/index.wxss
+++ b/submodel/pages/morder/create/index.wxss
@@ -1,4 +1,3 @@
-/* pages/bidding/create/index.wxss */
.page-btn {
height: 27px;
background: rgba(255, 66, 43, 1);
diff --git a/pages/morder/detail/index.js b/submodel/pages/morder/detail/index.js
similarity index 99%
rename from pages/morder/detail/index.js
rename to submodel/pages/morder/detail/index.js
index 16ae687..8ea20b2 100644
--- a/pages/morder/detail/index.js
+++ b/submodel/pages/morder/detail/index.js
@@ -1,9 +1,8 @@
-// pages/morder/detail/index.js
-import { zconfig, getStoreOrderInfo, getUserOrderInfo, uploadStoreOrder, payOffline, getCancelUserOrder, returnOrderTrade, confirmUserOrder, confirmStorerOrder, confirmOrderTrade, applyUserOrder } from "../../../api/ztb"
-const util = require('../../../utils/util')
-const math = require('../../../utils/math')
-const event = require('../../../utils/event')
-const tdsdk = require('../../../libs/tdweapp')
+import { zconfig, getStoreOrderInfo, getUserOrderInfo, uploadStoreOrder, payOffline, getCancelUserOrder, returnOrderTrade, confirmUserOrder, confirmStorerOrder, confirmOrderTrade, applyUserOrder } from "../../../../api/ztb"
+const util = require('../../../../utils/util')
+const math = require('../../../../utils/math')
+const event = require('../../../../utils/event')
+const tdsdk = require('../../../../libs/tdweapp')
const app = getApp()
Page({
diff --git a/pages/morder/detail/index.json b/submodel/pages/morder/detail/index.json
similarity index 100%
rename from pages/morder/detail/index.json
rename to submodel/pages/morder/detail/index.json
diff --git a/pages/morder/detail/index.wxml b/submodel/pages/morder/detail/index.wxml
similarity index 99%
rename from pages/morder/detail/index.wxml
rename to submodel/pages/morder/detail/index.wxml
index c4b2984..8506796 100644
--- a/pages/morder/detail/index.wxml
+++ b/submodel/pages/morder/detail/index.wxml
@@ -1,6 +1,5 @@
-
-
+
订单详情
diff --git a/pages/morder/detail/index.wxss b/submodel/pages/morder/detail/index.wxss
similarity index 98%
rename from pages/morder/detail/index.wxss
rename to submodel/pages/morder/detail/index.wxss
index 9dd3460..dc6ce20 100644
--- a/pages/morder/detail/index.wxss
+++ b/submodel/pages/morder/detail/index.wxss
@@ -1,4 +1,3 @@
-/* pages/morder/detail/index.wxss */
.item-content {
background-color: white;
padding: 0rpx 32rpx;
diff --git a/submodel/pages/morder/index/index.js b/submodel/pages/morder/index/index.js
new file mode 100644
index 0000000..214b869
--- /dev/null
+++ b/submodel/pages/morder/index/index.js
@@ -0,0 +1,127 @@
+import { getUserOrderList } from "../../../../api/ztb"
+const util = require('../../../../utils/util')
+const event = require('../../../../utils/event.js')
+const tdsdk = require('../../../../libs/tdweapp')
+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: {
+ status: '',
+ pageNum: 1,
+ pageSize:15
+ }
+ },
+ onLoad: function (options) {
+ this.setData({
+ height: app.globalData.fragmentHeight - 90,
+ kg: app.globalData.kg,
+ ['form.status']: options.status ? statusList[parseInt(options.status)] : '',
+ tabIndex: options.status ? parseInt(options.status) : 0
+ })
+ 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 })
+ }
+ getUserOrderList(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?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)
+ },
+ onShow: function () {
+ tdsdk.Page.onShow()
+ },
+ onHide: function(){
+ tdsdk.Page.onHide()
+ },
+ onUnload: function () {
+ tdsdk.Page.onUnload()
+ }
+})
\ No newline at end of file
diff --git a/pages/morder/index/index.json b/submodel/pages/morder/index/index.json
similarity index 100%
rename from pages/morder/index/index.json
rename to submodel/pages/morder/index/index.json
diff --git a/submodel/pages/morder/index/index.wxml b/submodel/pages/morder/index/index.wxml
new file mode 100644
index 0000000..23b1dcb
--- /dev/null
+++ b/submodel/pages/morder/index/index.wxml
@@ -0,0 +1,62 @@
+
+
+
+ 交易订单
+
+
+
+
+
+
+
+
+
+
+
+ {{loading? '正在加载' : '暂无数据'}}
+
+
+
+
+
+
+
+
+
+
+ {{item.bidType == 1 ? '一口价' : '竞拍订单'}}
+ ({{item.storeName}})
+
+ 单号：{{item.orderId}}
+
+ {{order.orderStatus(item.status)}}
+
+
+
+
+
+
+
+
+ {{item.secondCategoryName}}
+ 单价：{{formate.formatePrice2(item.unitPrice, kg)}}
+
+
+ {{item.description}}
+
+
+
+
+
+
+
+
+
+
+
+ {{finished?'到底啦～':'加载中...'}}
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/morder/index/index.wxss b/submodel/pages/morder/index/index.wxss
similarity index 95%
rename from pages/morder/index/index.wxss
rename to submodel/pages/morder/index/index.wxss
index 332804f..6885eb0 100644
--- a/pages/morder/index/index.wxss
+++ b/submodel/pages/morder/index/index.wxss
@@ -1,4 +1,3 @@
-/* pages/bidding/index/index.wxss */
.item-content {
background-color: white;
padding: 24rpx 32rpx;
diff --git a/pages/morder/order.wxs b/submodel/pages/morder/order.wxs
similarity index 100%
rename from pages/morder/order.wxs
rename to submodel/pages/morder/order.wxs
diff --git a/utils/util.js b/utils/util.js
index 5df4539..d9e681d 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -167,8 +167,8 @@ function checkId(id) {
const tokenList = [
'pages/mall/price-index/index',
'/pages/shop/index/index',
- '/pages/bidding/index/index',
- '/pages/morder/index/index',
+ '/submodel/pages/bidding/index/index',
+ '/submodel/pages/morder/index/index',
'/pages/message/index/index',
'/pages/home/setting/index',
'/submodel/pages/address/list/index',
@@ -243,11 +243,11 @@ function navigateTarget(redirectInfo){
} else if(redirectInfo.targetView == 'myProxyList'){
navigateTo('/pages/agent/order/index')
} else if(redirectInfo.targetView == 'myBidList'){
- navigateTo('/pages/bidding/index/index')
+ navigateTo('/submodel/pages/bidding/index/index')
} else if(redirectInfo.targetView == 'myShop'){
navigateTo('/pages/shop/index/index')
} else if(redirectInfo.targetView == 'buyerOrderList'){
- navigateTo('/pages/morder/index/index')
+ navigateTo('/submodel/pages/morder/index/index')
} else if(redirectInfo.targetView == 'createArticle'){
navigateTo('/pages/article/publish/index')
} else if(redirectInfo.targetView == 'proxySellActivity'){