diff --git a/pages/process/payment/index.js b/pages/process/payment/index.js
index ebd954c..af6d0e5 100644
--- a/pages/process/payment/index.js
+++ b/pages/process/payment/index.js
@@ -114,6 +114,9 @@ Scene({
if(settleType){
this.data.settleType = String(settleType)
}
+ if(this.data.orderStatus == 42 && this.data.settleType == '3'){
+ this.data.settleType = '1'
+ }
this.data.orderStatus = orderList[0].status
this.setData({
height: app.globalData.fragmentHeight,
@@ -163,9 +166,16 @@ Scene({
var form_data = 'params.' + e.currentTarget.id
this.setData({ [form_data]: e.detail })
},
+ fileChange: function({detail}){
+ this.data.imageList = []
+ for (let index = 0; index < detail.fileList.length; index++) {
+ this.data.imageList.push(detail.fileList[index].url)
+ }
+ },
agentPayment: function(settleType){
wx.showLoading({ title: '正在处理', mask: true })
this.data.requesting = true
+
this.data.params.settleType = Number(settleType)
paymentOrder(this.data.params).then(result => {
wx.hideLoading()
diff --git a/pages/process/payment/index.json b/pages/process/payment/index.json
index 78ea120..e135511 100644
--- a/pages/process/payment/index.json
+++ b/pages/process/payment/index.json
@@ -10,6 +10,7 @@
"van-dialog": "/components/dialog/index",
"submit-layout": "/components/submit-layout/index",
"vip-dialog": "/pages/message/vip-dialog/index",
+ "van-uploader": "/components/uploader/index",
"notification": "/pages/message/notification/index"
}
}
\ No newline at end of file
diff --git a/pages/process/payment/index.wxml b/pages/process/payment/index.wxml
index dddddd5..95a827d 100644
--- a/pages/process/payment/index.wxml
+++ b/pages/process/payment/index.wxml
@@ -66,6 +66,13 @@
+
+
+ 支付凭证
+ 6张以内,每张图片大小限制5M
+
+
+
diff --git a/pages/setting/paper-detial/index.wxml b/pages/setting/paper-detial/index.wxml
index b491be7..c9f1fd1 100644
--- a/pages/setting/paper-detial/index.wxml
+++ b/pages/setting/paper-detial/index.wxml
@@ -8,7 +8,7 @@
bindtap="chooseMethod" placeholder="请选择品类"/>
-
diff --git a/pages/setting/paper-select/index.js b/pages/setting/paper-select/index.js
new file mode 100644
index 0000000..423e05c
--- /dev/null
+++ b/pages/setting/paper-select/index.js
@@ -0,0 +1,31 @@
+Component({
+ options: {
+ addGlobalClass: true,
+ multipleSlots: true
+ },
+ properties: {
+ visible: { type: Boolean, value: false },
+ cIndex: { type: Number, value: -1 },
+ paperList: { type: Array, value: [] }
+ },
+ data: {
+ activeIndex: 0,
+ cIndex: -1
+ },
+ methods: {
+ onClickNav: function({detail}){
+ console.log(detail)
+ },
+ onConfirm: function(e){
+ this.data.cIndex = e.currentTarget.dataset.index
+ var item = this.data.paperList[this.data.cIndex]
+ wx.nextTick(() => {
+ this.setData({ visible: false })
+ this.triggerEvent('select', {index: this.data.cIndex, item })
+ })
+ },
+ onHide: function(){
+ this.setData({ visible: false })
+ }
+ }
+})
\ No newline at end of file
diff --git a/pages/setting/paper-select/index.json b/pages/setting/paper-select/index.json
new file mode 100644
index 0000000..c2794df
--- /dev/null
+++ b/pages/setting/paper-select/index.json
@@ -0,0 +1,12 @@
+{
+ "component": true,
+ "usingComponents": {
+ "van-popup": "/components/popup/index",
+ "van-icon": "/components/icon/index",
+ "van-grid": "/components/grid/index",
+ "van-grid-item": "/components/grid-item/index",
+ "van-button": "/components/button/index",
+ "van-sidebar": "/components/sidebar/index",
+ "van-sidebar-item": "/components/sidebar-item/index"
+ }
+}
diff --git a/pages/setting/paper-select/index.wxml b/pages/setting/paper-select/index.wxml
new file mode 100644
index 0000000..fd3d746
--- /dev/null
+++ b/pages/setting/paper-select/index.wxml
@@ -0,0 +1,23 @@
+
+
+
+ 选择纸品
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.categoryName}}
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/setting/paper-select/index.wxss b/pages/setting/paper-select/index.wxss
new file mode 100644
index 0000000..9615958
--- /dev/null
+++ b/pages/setting/paper-select/index.wxss
@@ -0,0 +1 @@
+.van-tree-select__nav__inner{width:100%!important;height:100%}
\ No newline at end of file