From b13ad6cbcd5ba78a6f9ab303d4216cdb3d259150 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 26 Feb 2021 11:23:31 +0800
Subject: [PATCH] no message
---
pages/home/index/index.wxml | 9 ++++-----
pages/htmls/auths/index.wxml | 4 ++--
pages/htmls/auths/index.wxss | 6 +++++-
pages/process/check-list/index.js | 2 ++
pages/process/index/index.wxml | 17 +++--------------
pages/process/order-list/index.js | 2 ++
pages/process/payment/index.js | 2 +-
project.config.json | 2 +-
8 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index 4a6e461..e2ead08 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -29,7 +29,7 @@
-
+
@@ -60,16 +60,15 @@
-
客户管理
-
+
diff --git a/pages/htmls/auths/index.wxml b/pages/htmls/auths/index.wxml
index 11701ef..efa7c1f 100644
--- a/pages/htmls/auths/index.wxml
+++ b/pages/htmls/auths/index.wxml
@@ -43,7 +43,7 @@
-
-
+
\ No newline at end of file
diff --git a/pages/htmls/auths/index.wxss b/pages/htmls/auths/index.wxss
index 93aa562..42103d6 100644
--- a/pages/htmls/auths/index.wxss
+++ b/pages/htmls/auths/index.wxss
@@ -19,4 +19,8 @@
position: absolute;
left: 0rpx;
top: 0rpx;
-}
\ No newline at end of file
+}
+
+.dialog-input {
+ padding:0rpx 16rpx;border:1rpx solid #eee;height:80rpx;margin:64rpx
+}
diff --git a/pages/process/check-list/index.js b/pages/process/check-list/index.js
index c278217..4e23a33 100644
--- a/pages/process/check-list/index.js
+++ b/pages/process/check-list/index.js
@@ -34,6 +34,8 @@ Page({
this.data.title = '待付款订单'
} else if(this.data.form.funcType == 4){
this.data.title = '已完成订单'
+ this.data.form.funcType = 6
+ this.data.form.status = 5
} else if(this.data.form.funcType == 5){
this.data.title = '已关闭订单'
}
diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml
index b60581f..81e12ed 100644
--- a/pages/process/index/index.wxml
+++ b/pages/process/index/index.wxml
@@ -79,20 +79,9 @@
-
-
-
-
- 收货订单
-
-
-
-
-
-
-->
-
+
-
+
\ No newline at end of file
diff --git a/pages/process/order-list/index.js b/pages/process/order-list/index.js
index c278217..4e23a33 100644
--- a/pages/process/order-list/index.js
+++ b/pages/process/order-list/index.js
@@ -34,6 +34,8 @@ Page({
this.data.title = '待付款订单'
} else if(this.data.form.funcType == 4){
this.data.title = '已完成订单'
+ this.data.form.funcType = 6
+ this.data.form.status = 5
} else if(this.data.form.funcType == 5){
this.data.title = '已关闭订单'
}
diff --git a/pages/process/payment/index.js b/pages/process/payment/index.js
index 57826e2..08fbae8 100644
--- a/pages/process/payment/index.js
+++ b/pages/process/payment/index.js
@@ -82,7 +82,7 @@ Page({
paymentOrder(this.data.params).then(result => {
wx.hideLoading()
util.showBackToast('订单已经付款')
- event.emit('OrderMessage', { what: 12, desc: 'cancelOrder' })
+ event.emit('OrderMessage', { what: 12, desc: 'PaymentOrder' })
}).catch(err => {
wx.hideLoading()
this.data.requesting = false
diff --git a/project.config.json b/project.config.json
index 66fa7bd..3742f21 100644
--- a/project.config.json
+++ b/project.config.json
@@ -12,7 +12,7 @@
"minified": true,
"newFeature": false,
"coverView": true,
- "nodeModules": false,
+ "nodeModules": true,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,