From 3545b6dc3fd36bdefd6489e466aa0620c8df850e Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Sat, 31 Jul 2021 14:32:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7=E5=88=97?=
=?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.json | 2 -
pages/home/customer-list/index.js | 166 +++++++++++++++++++++++---
pages/home/customer-list/index.wxml | 92 ++++++++++----
pages/home/customer-list/index.wxss | 31 +++++
pages/process/check-list/index.js | 139 ---------------------
pages/process/check-list/index.json | 14 ---
pages/process/check-list/index.wxml | 79 ------------
pages/process/check-list/index.wxss | 6 -
pages/process/payment-list/index.js | 123 -------------------
pages/process/payment-list/index.json | 12 --
pages/process/payment-list/index.wxml | 76 ------------
pages/process/payment-list/index.wxss | 6 -
12 files changed, 250 insertions(+), 496 deletions(-)
delete mode 100644 pages/process/check-list/index.js
delete mode 100644 pages/process/check-list/index.json
delete mode 100644 pages/process/check-list/index.wxml
delete mode 100644 pages/process/check-list/index.wxss
delete mode 100644 pages/process/payment-list/index.js
delete mode 100644 pages/process/payment-list/index.json
delete mode 100644 pages/process/payment-list/index.wxml
delete mode 100644 pages/process/payment-list/index.wxss
diff --git a/app.json b/app.json
index 78a9aff..472d67a 100644
--- a/app.json
+++ b/app.json
@@ -13,12 +13,10 @@
"pages/ztbvip/member/index",
"pages/ztbvip/payment/index",
"pages/process/agent-list/index",
- "pages/process/check-list/index",
"pages/process/order-list/index",
"pages/process/order-price/index",
"pages/process/order-check/index",
"pages/process/order-info/index",
- "pages/process/payment-list/index",
"pages/process/payment/index",
"pages/process/outside-list/index",
"pages/process/outside-add/index",
diff --git a/pages/home/customer-list/index.js b/pages/home/customer-list/index.js
index 6499c3c..0c6063e 100644
--- a/pages/home/customer-list/index.js
+++ b/pages/home/customer-list/index.js
@@ -3,6 +3,7 @@ import Scene from '../../index/scene'
import { getCustomerList } from "../../../api/saas"
const util = require('../../../utils/util')
const event = require('../../../utils/event')
+const pinyin = require('../../../utils/pinyin.js')
const app = getApp()
Scene({
@@ -15,14 +16,22 @@ Scene({
loading: true,
requesting: false,
finished: false,
+ searchList: [],
orderList: [],
form: {
name: '',
pageNum: 1,
- pageSize: 15
+ pageSize: 1500
},
+ total: 0,
page: 0,
index: 0,
+ titleHeight: 240,
+ indexHeight: 0,
+ itemHeight: 0,
+ scrollViewId: '', // scroll-view滚动到的子元素的id 锚点
+ touchmove: false, // 是否在索引表上滑动
+ touchmoveIndex: -1
},
/**
* 生命周期函数--监听页面加载
@@ -31,7 +40,15 @@ Scene({
if(options.type){
this.data.type = Number(options.type)
}
- this.setData({ height: app.globalData.fragmentHeight - 100 })
+ var height = app.globalData.fragmentHeight - 100
+ if(height > 1024){
+ this.data.indexHeight = 1024
+ } else {
+ this.data.indexHeight = height
+ }
+ var titleHeight = this.px2rpx(app.globalData.CustomBar) + 116
+ var itemHeight = parseInt(this.data.indexHeight / 25)
+ this.setData({ height, itemHeight, indexHeight: this.data.indexHeight, titleHeight })
event.on('EventMessage', this, this.onEvent)
this.fetchCustomerList()
},
@@ -39,14 +56,15 @@ Scene({
if (message.what == 101) {
this.onRefreshList()
} else if (message.what == 102) {
- this.setData({ [`orderList[${this.data.page}][${this.data.index}]`]: message.detail })
+ // this.setData({ [`orderList[${this.data.page}][${this.data.index}]`]: message.detail })
+ this.onRefreshList()
}
},
onRefreshList: function () {
if (this.data.requesting) {
return
}
- this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false })
+ this.setData({ orderList: [], searchList: [], ['form.pageNum']: 1, ['form.name']: '', loading: true, finished: false })
this.fetchCustomerList()
},
fetchCustomerList: function () {
@@ -60,32 +78,114 @@ Scene({
}
getCustomerList(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 = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total
- this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false })
+ // var respList = result.data.records
+ // let nowList = `orderList[${this.data.orderList.length}]`
+ // var num = this.data.form.pageNum
+ // var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total
+ // this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false })
+ this.data.total = result.data.total
+ this.initList(result.data.records)
} else {
this.setData({ finished: true, requesting: false, loading: false })
}
}).catch(err => {
+ console.log(err)
this.setData({ requesting: false, loading: false })
util.showToast(err)
}).then(() => {
- this.refresh = this.refresh || this.selectComponent('#refresh')
- this.refresh.setRefresh(false)
+ // this.refresh = this.refresh || this.selectComponent('#refresh')
+ // this.refresh.setRefresh(false)
+ })
+ },
+ initList: function(records){
+ let orderList = this.data.orderList
+ let i = 0
+ /**
+ * 1、调用外部js的方法ChineseToPinYin对数据进行分组
+ * 2、分组的结果存在排序有误的情况,例如I组,V组等没有汉字的分组
+ */
+ records.forEach(item => {
+ let bool = orderList.some(element => {
+ return element.sign == pinyin.ChineseToPinYin(item.name).substr(0, 1)
+ })
+ if (orderList.length == 0 || !bool) {
+ orderList.push({ id: i, sign: pinyin.ChineseToPinYin(item.name).substr(0, 1), data: [item] })
+ i++
+ } else if (bool) {
+ let a = pinyin.ChineseToPinYin(item.name).substr(0, 1)
+ for (let s in orderList) {
+ if (a == orderList[s].sign) {
+ orderList[s].data.push(item)
+ }
+ }
+ }
})
+ /**
+ * 3、对分组好的数据进行排序
+ * 4、根据标志sign的ASCII码进行初次排序筛选
+ * 5、如果标志sign不在A到Z之间,则添加到#分组中
+ */
+ orderList.forEach((item, index) => {
+ if ((item.sign.charCodeAt() < 65 || item.sign.charCodeAt() > 90) && item.sign.charCodeAt() != 35) {
+ orderList.splice(index, 1, "")
+ // 注:此处为防止splice分割后,数组索引index发生变化,故将需要剔除的元素替换为“”,后再将其剔除
+ let i = this.data.orderList.findIndex(item => {
+ return item.sign == '#'
+ })
+ if (i != -1) {
+ item.data.forEach(element => { orderList[i].data.push(element) })
+ } else {
+ orderList.push({ id: 99, sign: '#', data: item.data })
+ }
+ }
+ })
+ // 利用filter方法,剔除之前存在的空元素
+ orderList = orderList.filter(function (item) {
+ return item != ''; // 注：IE9(不包含IE9)以下的版本没有trim()方法
+ })
+ // 利用sort方法进行排序
+ orderList.sort(this.listSort('sign'))
+ // 一般情况下#分组在最下面,在此做以处理
+ if (orderList[0].sign == '#') {
+ orderList.splice(0, 1).forEach(item => {
+ orderList.push(item)
+ })
+ }
+ this.setData({ orderList, requesting: false, loading: false, total: this.data.total })
+ },
+ // 排序
+ listSort(sign) {
+ return function (a, b) {
+ var value1 = a[sign].charCodeAt();
+ var value2 = b[sign].charCodeAt();
+ return value1 - value2
+ }
},
onChange: function({detail}) {
- this.data.form.name = detail
+ this.setData({ ['form.name']: detail })
+ let result = []
+ this.data.orderList.forEach(item => {
+ item.data.forEach(element => {
+ if (element.name.indexOf(detail.toLocaleUpperCase()) !== -1 || element.mobile.indexOf(detail.toLocaleUpperCase()) !== -1) {
+ result.push(element)
+ }
+ })
+ })
+ this.setData({ searchList: result })
},
onSearch: function(){
this.onRefreshList()
},
customerInfo: function(e){
- this.data.page = e.currentTarget.dataset.page
- this.data.index = e.currentTarget.dataset.index
- var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
+ var item = null
+ if(util.isEmpty(this.data.form.name)){
+ this.data.page = e.currentTarget.dataset.page
+ this.data.index = e.currentTarget.dataset.index
+ item = this.data.orderList[e.currentTarget.dataset.page].data[e.currentTarget.dataset.index]
+ } else {
+ this.data.index = e.currentTarget.dataset.index
+ item = this.data.searchList[e.currentTarget.dataset.index]
+ }
if(this.data.type){
const channel = this.getOpenerEventChannel()
channel.emit('onCallback', { what: 130, detail: item })
@@ -99,12 +199,46 @@ Scene({
}
},
bindCustomer: function(e){
- var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
+ var item = null
+ if(util.isEmpty(this.data.form.name)){
+ this.data.page = e.currentTarget.dataset.page
+ this.data.index = e.currentTarget.dataset.index
+ item = this.data.orderList[e.currentTarget.dataset.page].data[e.currentTarget.dataset.index]
+ } else {
+ this.data.index = e.currentTarget.dataset.index
+ item = this.data.searchList[e.currentTarget.dataset.index]
+ }
wx.navigateTo({ url: `/pages/home/registe/index?id=${item.id}` })
},
addCustomer: function(){
wx.navigateTo({ url: `/pages/home/customer-info/index?` })
},
+ rpx2px: function(rpx) {
+ return rpx / 750 * app.globalData.windowWidth;
+ },
+ px2rpx: function(px) {
+ return px * 750 / app.globalData.windowWidth;
+ },
+ touchStart: function(e) {
+ this.setData({ touchmove: true })
+ let pageY = this.px2rpx(e.touches[0].pageY)
+ let index = Math.floor((pageY - this.data.titleHeight) / this.data.itemHeight)
+ let item = this.data.orderList[index]
+ if (item) {
+ this.setData({ scrollViewId: item.sign == '#' ? 'E_' : item.sign, touchmoveIndex: index })
+ }
+ },
+ touchMove: function(e) {
+ let pageY = this.px2rpx(e.touches[0].pageY)
+ let index = Math.floor((pageY - this.data.titleHeight) / this.data.itemHeight)
+ let item = this.data.orderList[index]
+ if (item) {
+ this.setData({ scrollViewId: item.sign == '#' ? 'E_' : item.sign, touchmoveIndex: index })
+ }
+ },
+ touchEnd: function() {
+ this.setData({ touchmove: false, touchmoveIndex: -1 })
+ },
onUnload: function(){
event.remove('EventMessage', this)
}
diff --git a/pages/home/customer-list/index.wxml b/pages/home/customer-list/index.wxml
index 8b3109a..094efef 100644
--- a/pages/home/customer-list/index.wxml
+++ b/pages/home/customer-list/index.wxml
@@ -3,10 +3,10 @@
客户列表
-
+
+
{{finished?'到底啦～':'加载中...'}}
-
+ -->
+
+
+ 添加客户
+
+
+
+
+
+
+
+ {{loading? '正在加载' : '暂无数据'}}
+
+
+
+
+
+
+
+ {{item.name || ''}}
+
+ {{'电话号码：' + item.mobile}}
+ {{'卡号：' + item.cardNo}}
+
+
+ 注册纸通宝
+
+
+
+
+
+
+
+ {{pageItem.sign}}
+
+
+
+
+
+ {{item.name || ''}}
+
+ {{'电话号码：' + item.mobile}}
+ {{'卡号：' + item.cardNo}}
+
+
+ 注册纸通宝
+
+
+
+
+ 共计{{total}}个客户
+
+
+
-
-
+
+
+
+
+
+ {{item.sign}}
-
\ No newline at end of file
+
+ {{orderList[touchmoveIndex].sign}}
+
\ No newline at end of file
diff --git a/pages/home/customer-list/index.wxss b/pages/home/customer-list/index.wxss
index 0bf8566..a538c5b 100644
--- a/pages/home/customer-list/index.wxss
+++ b/pages/home/customer-list/index.wxss
@@ -5,4 +5,35 @@
justify-content: center;
height: 100%;
padding: 0px 15%;
+}
+
+/* 右侧定位 */
+.list-bar{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: flex-start;
+ z-index: 19;
+ position: absolute;
+ right: 0;
+ width: 60rpx;
+}
+.list-text{
+ font-size: 22rpx;
+}
+.list-alert{
+ position: absolute;
+ z-index: 20;
+ width: 160rpx;
+ height: 160rpx;
+ left: 50%;
+ top: 50%;
+ margin-left: -80rpx;
+ margin-top: -80rpx;
+ border-radius: 80rpx;
+ text-align: center;
+ line-height: 160rpx;
+ font-size: 70rpx;
+ color: #fff;
+ background-color: rgba(0, 0, 0, 0.5);
}
\ No newline at end of file
diff --git a/pages/process/check-list/index.js b/pages/process/check-list/index.js
deleted file mode 100644
index 141b321..0000000
--- a/pages/process/check-list/index.js
+++ /dev/null
@@ -1,139 +0,0 @@
-// pages/process/order-list/index.js
-import Scene from '../../index/scene'
-import Dialog from '../../../components/dialog/dialog'
-import { getFactoryOrderList, cancelOrder } from "../../../api/saas"
-const event = require('../../../utils/event')
-const util = require('../../../utils/util')
-const app = getApp()
-
-Scene({
- // * 页面的初始数据
- data: {
- height: app.globalData.fragmentHeight,
- loading: true,
- requesting: false,
- finished: false,
- top: 0,
- orderList: [],
- form: {
- status: '',
- pageNum: 1,
- pageSize: 15
- },
- title: '全部',
- lastTime: null
- },
- // * 生命周期函数--1-定价 2-待过皮重 3-待过榜审核 4-待付款 41-代付中 42-待结算 5-已完成 6-已关闭
- onLoad: function (options) {
- if(options.status){
- this.data.form.status = Number(options.status)
- if(this.data.form.status == 1){
- this.data.title = '待定价订单'
- } else if(this.data.form.status == 2){
- this.data.title = '待过皮重'
- } else if(this.data.form.status == 3){
- this.data.title = '待付款订单'
- } else if(this.data.form.status == 4){
- this.data.title = '已完成订单'
- } else if(this.data.form.status == 5){
- this.data.title = '已关闭订单'
- }
- }
- event.on('OrderMessage', this, this.onEvent)
- this.setData({ height: app.globalData.fragmentHeight, title: this.data.title })
- this.fetchOrderList()
- },
- onEvent: function(message){
- if (message.what == 12) {
- this.onRefreshList()
- }
- },
- onRefreshList: function () {
- if (this.data.requesting) {
- return
- }
- this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false })
- this.data.lastTime = null
- this.fetchOrderList()
- },
- //1：待定价，2：待过皮重，3：待过磅审核，4：待付款，5：已完成
- fetchOrderList: function () {
- if (this.data.requesting || this.data.finished) {
- return
- }
- this.data.requesting = true
- getFactoryOrderList(this.data.form).then(result => {
- this.handResult(result)
- }).catch(err => {
- this.setData({ requesting: false, loading: false })
- util.showToast(err)
- }).then(() => {
- this.refresh = this.refresh || this.selectComponent('#refresh')
- this.refresh.setRefresh(false)
- })
- },
- handResult: function(result){
- if (result.data && result.data.records && result.data.records.length) {
- var respList = result.data.records
- // 对返回的消息列表进行处理，将同一天的消息显示在一起
- for (let i = 0; i < respList.length; i++) {
- if (util.isEmpty(this.data.lastTime)) {
- this.data.lastTime = respList[i].createTime
- if (this.data.lastTime.length > 10) {
- this.data.lastTime = this.data.lastTime.substring(0, 10)
- }
- respList[i].tipsTime = this.data.lastTime
- } else {
- var itemTime = respList[i].createTime
- if (itemTime.length > 10) {
- itemTime = itemTime.substring(0, 10)
- }
- if (this.data.lastTime !== itemTime) {
- respList[i].tipsTime = itemTime
- }
- this.data.lastTime = itemTime
- }
- }
- let nowList = `orderList[${this.data.orderList.length}]`
- var num = this.data.form.pageNum
- var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total
- this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false })
- } else {
- this.setData({ finished: true, requesting: false, loading: false })
- }
- },
- cancelOrder: function(e){
- Dialog.confirm({ title: '温馨提示', message: '确定取消该订单？' }).then(() => {
- wx.showLoading({ title: '正在获取', mask: true })
- cancelOrder(e.currentTarget.dataset.id).then(result => {
- wx.hideLoading()
- util.showToast('订单已经取消')
- this.onRefreshList()
- }).catch(err => {
- wx.hideLoading()
- util.showToast(err)
- })
- })
- },
- lookItem: function (e) {
- var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
- if(item.status == 2 || item.status == 3 || item.status == 4 || item.status == 5){
- wx.navigateTo({ url: '/pages/process/order-info/index?id=' + item.id })
- } else if(item.status == 1){
- wx.navigateTo({ url: `/pages/process/order-price/index?id=${item.id}` })
- }
- },
- priceOrder: function(e){
- wx.navigateTo({ url: '/pages/process/order-price/index?id=' + e.currentTarget.dataset.id })
- },
- repriceOrder: function(e){
- wx.navigateTo({ url: `/pages/process/order-check/index?id=${e.currentTarget.dataset.id}` })
- },
- checkOrder: function(e){
- wx.navigateTo({ url: '/pages/process/order-info/index?id=' + e.currentTarget.dataset.id })
- },
- onUnload: function(){
- event.remove('OrderMessage', this)
- }
-
-})
\ No newline at end of file
diff --git a/pages/process/check-list/index.json b/pages/process/check-list/index.json
deleted file mode 100644
index 14c4a6e..0000000
--- a/pages/process/check-list/index.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "usingComponents": {
- "refresh-view": "/components/refresh-view/index",
- "van-button": "/components/button/index",
- "van-icon": "/components/icon/index",
- "van-index-bar": "/components/index-bar/index",
- "van-index-anchor": "/components/index-anchor/index",
- "van-cell": "/components/cell/index",
- "van-divider": "/components/divider/index",
- "van-loading": "/components/loading/index",
- "van-dialog": "/components/dialog/index",
- "notification": "/pages/message/notification/index"
- }
-}
\ No newline at end of file
diff --git a/pages/process/check-list/index.wxml b/pages/process/check-list/index.wxml
deleted file mode 100644
index 2ea26c1..0000000
--- a/pages/process/check-list/index.wxml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
- {{title}}
-
-
-
-
-
-
-
-
- {{loading? '正在加载' : '暂无数据'}}
-
-
-
-
- {{item.tipsTime}}
-
-
-
-
-
-
-
- {{item.factoryCustomerName}}
- -{{item.factoryCustomerMobile}}
-
-
- 待定价
- 待过皮重
- 待审核
- 待付款
- 代付中
- 待结算
- 已完成
- 已关闭
-
-
- 品类：
- {{item.productName}}
-
-
- 毛重(公斤)：
- {{item.totalWeight || '- -'}}
-
-
- 结算重量(公斤)：
- {{item.settleWeight || '- -'}}
-
-
- 单价(元/公斤)：
- {{item.unitPrice || '- -'}}
-
-
- 结算金额(元)：
- {{item.settlePrice || '- -'}}
-
-
- 取消订单
- 定价
- 重新定价
- 审核
-
-
-
-
-
-
-
- {{finished?'到底啦～':'加载中...'}}
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/process/check-list/index.wxss b/pages/process/check-list/index.wxss
deleted file mode 100644
index 42787bf..0000000
--- a/pages/process/check-list/index.wxss
+++ /dev/null
@@ -1,6 +0,0 @@
-/* pages/process/order-list/index.wxss */
-.item-content{
- padding: 20rpx 32rpx 20rpx 0rpx;
- margin-left:32rpx;
- align-items: flex-start;
-}
\ No newline at end of file
diff --git a/pages/process/payment-list/index.js b/pages/process/payment-list/index.js
deleted file mode 100644
index 5f7aa80..0000000
--- a/pages/process/payment-list/index.js
+++ /dev/null
@@ -1,123 +0,0 @@
-// pages/process/order-list/index.js
-import Scene from '../../index/scene'
-import Dialog from '../../../components/dialog/dialog'
-import { getFactoryOrderList, cancelOrder } from "../../../api/saas"
-const util = require('../../../utils/util')
-const app = getApp()
-
-Scene({
- // * 页面的初始数据
- data: {
- height: app.globalData.fragmentHeight,
- loading: true,
- requesting: false,
- finished: false,
- top: 0,
- orderList: [],
- form: {
- status: 4,
- funcType: 0,
- isSameCustomer: 0,
- pageNum: 1,
- pageSize: 15
- },
- lastTime: null
- },
- // * 生命周期函数--监听页面加载
- onLoad: function (options) {
- this.setData({ height: app.globalData.fragmentHeight, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0 })
- this.fetchOrderList()
- },
- checkSame: function(){
- this.onRefreshList(this.data.form.isSameCustomer ? 0 : 1)
- },
- onRefreshList: function (isame) {
- if (this.data.requesting) {
- return
- }
- this.setData({ orderList: [], ['form.pageNum']: 1, ['form.isSameCustomer']: isame == 1 ? 1 : 0, loading: true, finished: false })
- this.data.lastTime = null
- this.fetchOrderList()
- },
- //1：待定价，2：待过皮重，3：待过磅审核，4：待付款，5：已完成
- fetchOrderList: function () {
- if (this.data.requesting || this.data.finished) {
- return
- }
- this.data.requesting = true
- getFactoryOrderList(this.data.form).then(result => {
- if (result.data && result.data.records && result.data.records.length) {
- var respList = result.data.records
- // 对返回的消息列表进行处理，将同一天的消息显示在一起
- for (let i = 0; i < respList.length; i++) {
- if (util.isEmpty(this.data.lastTime)) {
- this.data.lastTime = respList[i].createTime
- if (this.data.lastTime.length > 10) {
- this.data.lastTime = this.data.lastTime.substring(0, 10)
- }
- if(this.data.form.pageNum == 1 && i == 0){
- respList[i].vcheck = true
- }
- respList[i].tipsTime = this.data.lastTime
- } else {
- var itemTime = respList[i].createTime
- if (itemTime.length > 10) {
- itemTime = itemTime.substring(0, 10)
- }
- if (this.data.lastTime !== itemTime) {
- respList[i].tipsTime = itemTime
- }
- this.data.lastTime = itemTime
- }
- }
- let nowList = `orderList[${this.data.orderList.length}]`
- var num = this.data.form.pageNum
- var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total
- 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)
- }).then(() => {
- this.refresh = this.refresh || this.selectComponent('#refresh')
- this.refresh.setRefresh(false)
- })
- },
- cancelOrder: function(e){
- Dialog.confirm({ title: '温馨提示', message: '确定取消该订单？' }).then(() => {
- wx.showLoading({ title: '正在获取', mask: true })
- cancelOrder(e.currentTarget.dataset.id).then(result => {
- wx.hideLoading()
- util.showToast('订单已经取消')
- this.onRefreshList()
- }).catch(err => {
- wx.hideLoading()
- util.showToast(err)
- })
- })
- },
- lookItem: function (e) {
- var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
- if(!this.data.admin) {
- wx.navigateTo({ url: `/pages/process/order-info/index?id=${item.id}` })
- return
- }
- const that = this
- wx.navigateTo({
- url: `/pages/process/payment/index?channel=1`,
- events: {
- onOrderChange: (data) => {
- if (data.what == 12) {
- that.onRefreshList(that.data.form.isSameCustomer)
- }
- }
- },
- success: function(res) {
- res.eventChannel.emit('onParam', item)
- }
- })
- }
-
-})
\ No newline at end of file
diff --git a/pages/process/payment-list/index.json b/pages/process/payment-list/index.json
deleted file mode 100644
index 9acc31f..0000000
--- a/pages/process/payment-list/index.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "usingComponents": {
- "refresh-view": "/components/refresh-view/index",
- "van-cell": "/components/cell/index",
- "van-button": "/components/button/index",
- "van-icon": "/components/icon/index",
- "van-divider": "/components/divider/index",
- "van-loading": "/components/loading/index",
- "van-dialog": "/components/dialog/index",
- "notification": "/pages/message/notification/index"
- }
-}
\ No newline at end of file
diff --git a/pages/process/payment-list/index.wxml b/pages/process/payment-list/index.wxml
deleted file mode 100644
index e124926..0000000
--- a/pages/process/payment-list/index.wxml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
- 待付款订单
-
-
-
-
-
-
-
-
- {{loading? '正在加载' : '暂无数据'}}
-
-
-
-
- {{item.tipsTime}}
-
-
-
-
-
-
-
- {{item.factoryCustomerName}}
- -{{item.factoryCustomerMobile}}
-
-
- 待定价
- 待过皮重
- 待审核
- 待付款
- 代付中
- 待结算
- 已完成
- 已关闭
-
-
- 品类：
- {{item.productName}}
-
-
-
- 结算重量(公斤)：
- {{item.settleWeight || '- -'}}
-
-
- 单价(元/公斤)：
- {{item.unitPrice || '- -'}}
-
-
- 结算金额(元)：
- {{item.settlePrice || '- -'}}
-
-
- 取消订单
- 去支付
-
-
-
-
-
-
-
- {{finished?'到底啦～':'加载中...'}}
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/process/payment-list/index.wxss b/pages/process/payment-list/index.wxss
deleted file mode 100644
index 42787bf..0000000
--- a/pages/process/payment-list/index.wxss
+++ /dev/null
@@ -1,6 +0,0 @@
-/* pages/process/order-list/index.wxss */
-.item-content{
- padding: 20rpx 32rpx 20rpx 0rpx;
- margin-left:32rpx;
- align-items: flex-start;
-}
\ No newline at end of file