submodel

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,

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"
       ]
     }
   ],

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')

pages/agent/order/index.wxml

@@ -1,4 +1,3 @@
-<!--pages/bidding/index/index.wxml-->
 <cu-custom bgColor="bg-white" isBack="{{true}}">
 	<view slot="content">代卖订单</view>
 </cu-custom>

pages/agent/order/index.wxss

@@ -1,3 +1 @@
-/* pages/bidding/index/index.wxss */
-
  

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' })
       }
-    },
+    }
   }
 })

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) {

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)

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

pages/morder/index/index.js

@@ -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()
-  }
-})

pages/morder/index/index.wxml

@@ -1,168 +0,0 @@
-<!--pages/bidding/index/index.wxml-->
-<wxs module="order" src="../../morder/order.wxs"></wxs>
-<wxs module="formate" src="../../../pages/formate.wxs"></wxs>
-<cu-custom bgColor="bg-white" isBack="{{true}}">
-	<view slot="content">我的订单</view>
-</cu-custom>
-<!-- <view class="cu-custom" style="height:{{CustomBar}}px;z-index: 99;">
-	<view class="cu-bar fixed" style="height:{{CustomBar}}px;padding-top:{{StatusBar}}rpx;{{shadow?'box-shadow: none': ''}};{{shadow?'border-bottom: none': ''}};background-color:white">
-		<view class="action" bindtap="backspace" wx:if="true">
-			<text class="weui_goback"></text>
-			<slot name="backText"></slot>
-		</view>
-		<view class="" style="top:{{StatusBar}}rpx;color:black;font-size:32rpx">
-			<view style="width:260rpx">
-				<view data-index="1"  style="width:128rpx;color:{{bidType == 1 ? '#008AFF' : '#333'}};z-index: 100;float:left" bindtap="onTabChangeTop"><text>交易订单</text></view>
-				<view data-index="2"  style="width:128rpx;color:{{bidType == 2 ? '#008AFF' : '#333'}};z-index: 100;float:right" bindtap="onTabChangeTop"><text>代卖订单</text></view>
-			</view>
-		</view>
-	</view>
-</view> -->
-
-<view wx:if="{{bidType == 1}}" class="nav bg-white fixed" style="top:{{CustomBar}}px;">
-	<wux-tabi tab-data="{{tabList}}" tab-index="{{tabIndex}}" scroll="{{true}}" bind:change="onTabChange"></wux-tabi>
-</view>
-<view wx:if="{{bidType == 1}}" style="height:90rpx;width:100%"></view>
-
-<refresh-view wx:if="{{bidType == 1}}" bind:refresh="onRefreshList" height="{{height}}" triggered="{{requesting}}" scrollTop="{{top}}" bind:scrolltolower="fetchOrderList">
-	<view wx:if="{{!orderList.length}}">
-		<view class="list-empty" style="height:{{height}}rpx">
-			<view class="load-spinner text-gray" style="margin-bottom:24px" wx:if="{{loading}}" />
-			<image class="img-empty" src="/assets/image/list_empty.png" wx:else></image>
-			<view class="text-empty">{{loading? '正在加载' : '暂无数据'}}</view>
-		</view>
-	</view>
-	<view wx:else>
-		<view wx:for-item="pageItem" wx:for-index="pageIndex" wx:for="{{orderList}}" wx:key="pageIndex">
-			<view wx:for="{{pageItem}}" wx:key="index">
-				<view style="height:16rpx" wx:if="{{pageIndex != 0 || index != 0 }}"></view>
-				<view data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem">
-					<view class="flex flex-justify item-content">
-						<view>
-							<view class="page-name">
-								<text>{{item.bidType == 1 ? '一口价' : '竞拍订单'}}</text>
-								<text style="margin-left:6rpx;font-size:28rpx">({{item.storeName}})</text>
-							</view>
-							<view class="page-num">单号：{{item.orderId}}</view>
-						</view>
-						<view class="page-name">{{order.orderStatus(item.status)}}</view>
-					</view>
-					<wux-divider show-text="{{ false }}" dashed></wux-divider>
-					<view class="flex item-content">
-						<wux-image width="{{80}}" height="{{80}}" shape="rounded" lazyLoad="true" src="{{item.coverImgUrl}}" mode="aspectFill">
-							<image class="image-load" slot="loading" src="/assets/image/def_image.png"></image>
-						</wux-image>
-						<view style="flex:1;padding-left:20rpx;padding-top:8rpx;height:80px">
-							<view class="flex flex-justify" style="height:20px;">
-								<view class="page-name">{{item.secondCategoryName}}</view>
-								<view class="page-num">单价：{{formate.formatePrice2(item.unitPrice, kg)}}</view>
-							</view>
-							<view style="height:50px">
-								<view class="page-outline">{{item.description}}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!--加载更多的UI-->
-		<view wx:if="{{form.pageNum>1}}" style="padding:20rpx">
-			<wux-divider>
-				<view class="loadmore">
-					<text class="icon--refresher" wx:if="{{!finished}}"></text>
-					<text class="text-sm" style="margin-left:8rpx">{{finished?'到底啦～':'加载中...'}}</text>
-				</view>
-			</wux-divider>
-		</view>
-	</view>
-</refresh-view>
-
-<!-- 代卖订单-->
-
-<!-- <view wx:if="{{bidType == 2}}" class="nav bg-white fixed" style="top:{{CustomBar}}px;">
-	<wux-tabi tab-data="{{tabList2}}" tab-index="{{tabIndex2}}" bind:change="onTabTopChange2"></wux-tabi>
-</view>
-<view style="height:90rpx;width:100%"></view>
-
-<refresh-view wx:if="{{bidType == 2}}" bind:refresh="onRefreshList2" height="{{height2}}" triggered="{{requesting2}}" scrollTop="{{top2}}" bind:scrolltolower="fetchOrderList2">
-	<view wx:if="{{!orderList2.length}}">
-		<view class="list-empty" style="height:{{height2}}rpx">
-			<view class="load-spinner text-gray" style="margin-bottom:24px" wx:if="{{loading2}}" />
-			<image class="img-empty" src="/assets/image/list_empty.png" wx:else></image>
-			<view class="text-empty">{{loading? '正在加载' : '暂无数据'}}</view>
-		</view>
-	</view>
-	<view wx:else>
-		<view wx:for-item="pageItem" wx:for-index="pageIndex" wx:for="{{orderList2}}" wx:key="pageIndex">
-			<view wx:for="{{pageItem}}" wx:key="index">
-				<view data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem2">
-					<view style="height:20rpx" wx:if="{{pageIndex != 0 || index != 0 }}"></view>
-					<view class="flex flex-justify item-content">
-						<view class="flex flex-center">
-							<wux-image width="{{20}}" height="{{20}}" shape="circle" src="{{item.logoImg}}" mode="aspectFill">
-								<image class="image-load" slot="loading" src="/assets/image/def_image.png"></image>
-								<image class="image-load" slot="error" src="/assets/image/def_image.png"></image>
-							</wux-image>
-							<text class="text-sg" style="margin-left:8rpx">{{item.paperMillName}}</text>
-						</view>
-						<view class="page-name" style="color:{{statusColor(item.status)}}">{{agent.orderStatus(item.status)}}</view>
-					</view>
-					<view class="item-content" style="border-top:2rpx solid #f3f3f3">
-						<view class="flex flex-justify text-df">
-							<text class="text-black">订单编号</text>
-							<text class="text-gray">{{item.orderId}}</text>
-						</view>
-						<view class="flex flex-justify text-df" style="margin-top:8rpx">
-							<text class="text-black">纸品分类：</text>
-							<text class="text-gray">{{item.paperCategoryName}}</text>
-						</view>
-						<view class="flex flex-justify text-df" style="margin-top:8rpx">
-							<text class="text-black">预估重量：</text>
-							<text class="text-gray">{{formate.formateWeight(item.totalEstimatedWeight)}}</text>
-						</view>
-						<view class="flex flex-justify text-df" style="margin-top:8rpx">
-							<text class="text-black">货车数量：</text>
-							<text class="text-gray">{{item.carNum}}辆</text>
-						</view>
-						<view class="flex flex-justify text-df" style="margin-top:8rpx">
-							<text class="text-black">货到时间：</text>
-							<text class="text-gray">{{item.deliveryTime}}</text>
-						</view>
-						<view class="flex flex-justify text-df" style="margin-top:8rpx" wx:if="{{item.orderItems}}" wx:for="{{item.orderItems}}" wx:for-item="cell" wx:key="index">
-							<text class="text-black">货车车牌{{index+1}}：{{cell.logisticcsInfo.plateNumber}}</text>
-							<text class="text-gray"  >{{cell.status==50?'待预约':(cell.status==51?'待送货':(cell.status==52?'结算中':(cell.status==53?'已完成':(cell.status==54?'已关闭':'---'))))}}</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view wx:if="{{form2.pageNum>1}}" style="padding:20rpx">
-			<wux-divider>
-				<view class="loadmore">
-					<text class="icon--refresher" wx:if="{{!finished2}}"></text>
-					<text class="text-sm" style="margin-left:8rpx">{{finished2?'到底啦～':'加载中...'}}</text>
-				</view>
-			</wux-divider>
-		</view>
-	</view>
-</refresh-view> -->
-
-<wxs module="statusColor">
-	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
-</wxs>

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) {

pages/shop/bidding/index.wxml

@@ -1,4 +1,3 @@
-<!--pages/bidding/index/index.wxml-->
 <wxs module="shop" src="../../shop/shop.wxs"></wxs>
 <wxs module="formate" src="../../../pages/formate.wxs"></wxs>
 <cu-custom bgColor="bg-white" isBack="{{true}}">

pages/shop/bidding/index.wxss

@@ -1,4 +1,3 @@
-/* pages/bidding/index/index.wxss */
 .item-content {
   background-color: white;
   padding: 24rpx 32rpx;

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) {

pages/shop/order/index.wxml

@@ -1,4 +1,3 @@
-<!--pages/morder/index/index.wxml-->
 <wxs module="shop" src="../../shop/shop.wxs"></wxs>
 <wxs module="formate" src="../../../pages/formate.wxs"></wxs>
 <cu-custom bgColor="bg-white" isBack="{{true}}">

pages/shop/order/index.wxss

@@ -1,4 +1,3 @@
-/* pages/morder/index/index.wxss */
 .item-content {
   background-color: white;
   padding: 24rpx 32rpx;

pages/bidding/detail/index.js → 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 })

pages/bidding/detail/index.wxml → submodel/pages/bidding/detail/index.wxml

@@ -1,13 +1,12 @@
-<!--pages/bidding/detail/index.wxml-->
 <wxs module="bidding" src="../../bidding/bidding.wxs"></wxs>
-<wxs module="formate" src="../../../pages/formate.wxs"></wxs>
+<wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
 <cu-custom bgColor="bg-white" isBack="{{true}}">
 	<view slot="content">竞价详情</view>
 </cu-custom>
 
 <view wx:if="{{biddingInfo}}">
 	<view wx:if="{{biddingInfo.status==1}}" class="flex flex-justify bg-white slowChange" style="width:100%;padding: 24rpx 24rpx 24rpx 24rpx">
-		<view class="page-tietl-message"><image src="/assets/image/icon-jjsuccess.png" class="imgicon"></image><text style="margin-left:20rpx">竞价成功！(商家已经确认您的竞价，请尽快下单！)</text></view>
+		<view class="page-tietl-message"><image src="/submodel/images/icon-jjsuccess.png" class="imgicon"></image><text style="margin-left:20rpx">竞价成功！(商家已经确认您的竞价，请尽快下单！)</text></view>
 	</view>
 	<view class="flex flex-justify bg-white" style="width:100%;padding: 24rpx 24rpx 0rpx 24rpx">
 		<view class="page-name">单号：{{biddingInfo.id}}</view>
@@ -78,22 +77,12 @@
 			<view class="text-black" style="font-size:32rpx">商品详情</view>
 			<view class="text-gray" style="font-size:28rpx;margin-top:32rpx">{{biddingInfo.description}}</view>
 		</view>
-
-		<!-- <view class="bg-white" style="padding:32rpx;margin-top:18rpx">
-	  <view class="text-black" style="font-size:32rpx">竞价规则</view>
-	  <view class="text-gray" style="font-size:28rpx;margin-top:32rpx">1、退货时间，什么情况下允许退货等信息描述
-  2、物流费用说明
-  3、其他说明</view>
-  </view> -->
-
 	</view>
 
 	<view style="height:{{136 + safeBottom}}rpx" wx:if="{{type == 0 && (biddingInfo.status == 0 || biddingInfo.status == 1)}}"></view>
 	<view class="cu-bar bg-white tabbar foot flex" style="height:{{120 + safeBottom}}rpx;padding: 32rpx 32rpx {{safeBottom + 32}}rpx 16rpx;" wx:if="{{type == 0 && (biddingInfo.status == 0 || biddingInfo.status == 1)}}">
 		<view class="action" style="width: 100rpx" bindtap="toShopInfo">
-			<view class="cuIcon-shop"></view>
-			店铺
-		</view>
+			<view class="cuIcon-shop"></view>店铺</view>
 		<view style="width:100%">
 			<wux-button block type="assertive" bind:click="showBiddingDialog" wx:if="{{biddingInfo.status == 0}}">修改报价</wux-button>
 			<wux-button block type="positive" bind:click="offerOrder" wx:if="{{biddingInfo.status == 1}}">立即下单</wux-button>

pages/bidding/detail/index.wxss → submodel/pages/bidding/detail/index.wxss

@@ -1,4 +1,3 @@
-/* pages/bidding/detail/index.wxss */
 .item-content {
   background-color: white;
   padding: 0rpx 32rpx;

pages/bidding/index/index.js → 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) {

pages/bidding/index/index.wxml → submodel/pages/bidding/index/index.wxml

@@ -1,6 +1,5 @@
-<!--pages/morder/index/index.wxml-->
 <wxs module="bidding" src="../../bidding/bidding.wxs"></wxs>
-<wxs module="formate" src="../../../pages/formate.wxs"></wxs>
+<wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
 <cu-custom bgColor="bg-white" isBack="{{true}}">
 	<view slot="content">我的报价</view>
 </cu-custom>

pages/bidding/index/index.wxss → 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;

pages/morder/create/index.js → 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)

pages/morder/create/index.wxml → submodel/pages/morder/create/index.wxml

@@ -1,5 +1,4 @@
-<!--pages/bidding/details/index.wxml-->
-<wxs module="formate" src="../../../pages/formate.wxs"></wxs>
+<wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
 <cu-custom bgColor="bg-white" isBack="{{true}}">
 	<view slot="content">下单</view>
 </cu-custom>

pages/morder/create/index.wxss → 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);

pages/morder/detail/index.js → 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({

pages/morder/detail/index.wxml → submodel/pages/morder/detail/index.wxml

@@ -1,6 +1,5 @@
-<!--pages/morder/detail/index.wxml-->
 <wxs module="order" src="../../morder/order.wxs"></wxs>
-<wxs module="formate" src="../../../pages/formate.wxs"></wxs>
+<wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
 <cu-custom bgColor="bg-white" isBack="{{true}}">
 	<view slot="content">订单详情</view>
 </cu-custom>

pages/morder/detail/index.wxss → submodel/pages/morder/detail/index.wxss

@@ -1,4 +1,3 @@
-/* pages/morder/detail/index.wxss */
 .item-content {
   background-color: white;
   padding: 0rpx 32rpx;

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()
+  }
+})

submodel/pages/morder/index/index.wxml

@@ -0,0 +1,62 @@
+<wxs module="order" src="../../morder/order.wxs"></wxs>
+<wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
+<cu-custom bgColor="bg-white" isBack="{{true}}">
+	<view slot="content">交易订单</view>
+</cu-custom>
+
+<view class="bg-white" style="height:90rpx;width:100%;border-bottom: 1rpx solid #f3f3f3;">
+	<wux-tabi tab-data="{{tabList}}" tab-index="{{tabIndex}}" scroll="{{true}}" bind:change="onTabChange"></wux-tabi>
+</view>
+
+<refresh-view bind:refresh="onRefreshList" height="{{height}}" triggered="{{requesting}}" scrollTop="{{top}}" bind:scrolltolower="fetchOrderList">
+	<view wx:if="{{!orderList.length}}">
+		<view class="list-empty" style="height:{{height}}rpx">
+			<view class="load-spinner text-gray" style="margin-bottom:24px" wx:if="{{loading}}" />
+			<image class="img-empty" src="/assets/image/list_empty.png" wx:else></image>
+			<view class="text-empty">{{loading? '正在加载' : '暂无数据'}}</view>
+		</view>
+	</view>
+	<view wx:else>
+		<view wx:for-item="pageItem" wx:for-index="pageIndex" wx:for="{{orderList}}" wx:key="pageIndex">
+			<view wx:for="{{pageItem}}" wx:key="index">
+				<view style="height:16rpx" wx:if="{{pageIndex != 0 || index != 0 }}"></view>
+				<view data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem">
+					<view class="flex flex-justify item-content">
+						<view>
+							<view class="page-name">
+								<text>{{item.bidType == 1 ? '一口价' : '竞拍订单'}}</text>
+								<text style="margin-left:6rpx;font-size:28rpx">({{item.storeName}})</text>
+							</view>
+							<view class="page-num">单号：{{item.orderId}}</view>
+						</view>
+						<view class="page-name">{{order.orderStatus(item.status)}}</view>
+					</view>
+					<wux-divider show-text="{{ false }}" dashed></wux-divider>
+					<view class="flex item-content">
+						<wux-image width="{{80}}" height="{{80}}" shape="rounded" lazyLoad="true" src="{{item.coverImgUrl}}" mode="aspectFill">
+							<image class="image-load" slot="loading" src="/assets/image/def_image.png"></image>
+						</wux-image>
+						<view style="flex:1;padding-left:20rpx;padding-top:8rpx;height:80px">
+							<view class="flex flex-justify" style="height:20px;">
+								<view class="page-name">{{item.secondCategoryName}}</view>
+								<view class="page-num">单价：{{formate.formatePrice2(item.unitPrice, kg)}}</view>
+							</view>
+							<view style="height:50px">
+								<view class="page-outline">{{item.description}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!--加载更多的UI-->
+		<view wx:if="{{form.pageNum>1}}" style="padding:20rpx">
+			<wux-divider>
+				<view class="loadmore">
+					<text class="icon--refresher" wx:if="{{!finished}}"></text>
+					<text class="text-sm" style="margin-left:8rpx">{{finished?'到底啦～':'加载中...'}}</text>
+				</view>
+			</wux-divider>
+		</view>
+	</view>
+</refresh-view>

pages/morder/index/index.wxss → submodel/pages/morder/index/index.wxss

@@ -1,4 +1,3 @@
-/* pages/bidding/index/index.wxss */
 .item-content {
   background-color: white;
   padding: 24rpx 32rpx;

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'){