From f416636e752fff5266004f095d77b090abd2ab75 Mon Sep 17 00:00:00 2001
From: TM <923727421@qq.com>
Date: Tue, 15 Dec 2020 10:55:12 +0800
Subject: [PATCH] 修改bug
---
pages/businessData/businessData.axml | 2
pages/shskPage/orderInfo/orderInfo.js | 22 ++++++++++-
components/fitler/fitler.js | 15 +++++--
pages/businessData/businessData.js | 36 ++++++++++-------
pages/hbfqPage/orderInfo/orderInfo.js | 17 ++++++++
5 files changed, 68 insertions(+), 24 deletions(-)
diff --git a/components/fitler/fitler.js b/components/fitler/fitler.js
index 6d1bc26..371291a 100644
--- a/components/fitler/fitler.js
+++ b/components/fitler/fitler.js
@@ -7,8 +7,7 @@
userStyle:{},
showRightCom:false,
queryObj:{
- startDay: dateFmt(new Date(),'YYYY-MM-DD'),
- endDay:dateFmt(new Date(),'YYYY-MM-DD'),
+
},
},
// 设置默认属性
@@ -16,13 +15,18 @@
},
didMount(){
+ console.log('aaa')
this.setData({
- userStyle:app.userStyle
+ userStyle:app.userStyle,
})
},
didUpdate(){
+ console.log('a',this.data.queryObj)
+
+
},
didUnmount() {
+ console.log('b')
},
methods: {
changeData(){
@@ -96,9 +100,10 @@
}
this.setData({
queryObj:{},
- 'queryObj.startDay':dateFmt(new Date(),'YYYY-MM-DD'),
- 'queryObj.endDay':dateFmt(new Date(),'YYYY-MM-DD'),
+ // 'queryObj.startDay':'',
+ // 'queryObj.endDay':'',
})
+ this.props.onGetFilterInfo(this.data.queryObj);
},
//确定按钮
confirm(){
diff --git a/pages/businessData/businessData.axml b/pages/businessData/businessData.axml
index 9f31cbe..61716c0 100644
--- a/pages/businessData/businessData.axml
+++ b/pages/businessData/businessData.axml
@@ -125,4 +125,4 @@
</block>
</tabs>
</view>
-<my-filter showRight="{{showRight}}" onGetFilterInfo="onGetFilterInfo" onShowage="onShowage" termArr="{{activeTab2==0?termList:''}}" payTypeArr="{{activeTab2==0?prodList:''}}" orderStaArr="{{statusList}}" priceArr="{{activeTab2==0?priceArr:''}}" doPriceArr="{{activeTab2==0?'':priceArr}}" hasTime="{{true}}"></my-filter>
\ No newline at end of file
+<my-filter a:if="{{isgoOut}}" showRight="{{showRight}}" onGetFilterInfo="onGetFilterInfo" onShowage="onShowage" termArr="{{activeTab2==0?termList:''}}" payTypeArr="{{activeTab2==0?prodList:''}}" orderStaArr="{{statusList}}" priceArr="{{activeTab2==0?priceArr:''}}" doPriceArr="{{activeTab2==0?'':priceArr}}" hasTime="{{true}}"></my-filter>
\ No newline at end of file
diff --git a/pages/businessData/businessData.js b/pages/businessData/businessData.js
index dc291a4..47dec63 100644
--- a/pages/businessData/businessData.js
+++ b/pages/businessData/businessData.js
@@ -4,6 +4,7 @@
Page({
data: {
isNomore: false,
+ isgoOut:true,
amt: 0,
num: 0,
url: '/sib/xcx/order/hbListInit',//初始化接口地址为花呗
@@ -56,6 +57,9 @@
onShow() {
this.getFilter()
this.getList()
+ this.setData({
+ isgoOut: true,
+ })
},
onHide() {
// 页面被关闭
@@ -64,9 +68,11 @@
activeTab2: 0,
url: '/sib/xcx/order/hbListInit',
queryObj: { prodType: 200015 },
+ value: '',
+ isgoOut:false,
})
},
- test({ index, tabsName }){
+ test({ index, tabsName }) {
console.log(222333)
this.handleTabClick({ index, tabsName })
},
@@ -75,36 +81,36 @@
this.setData({
[tabsName]: index,
isNomore: false,
- value:''
+ value: ''
});
if (index == 0) {
this.setData({
queryObj: { prodType: 200015 },
url: '/sib/xcx/order/hbListInit',
- list:[]
+ list: []
})
} else if (index == 1) {
this.setData({
queryObj: { prodType: 200008 },
url: '/sib/xcx/order/dmfListInit',
- list:[]
+ list: []
})
}
this.getList()
this.getFilter()
},
- onhandInput(value){
+ onhandInput(value) {
this.setData({
- value:value
+ value: value
})
},
// 搜索框事件
- searchMation(value){
+ searchMation(value) {
console.log(value)
let obj = this.data.queryObj
- if(value){
+ if (value) {
obj.userName = value
- }else{
+ } else {
obj.userName = ''
delete obj.userName
}
@@ -112,7 +118,7 @@
this.setData({
list: [],
isNomore: false,
- queryObj:{
+ queryObj: {
...obj
},
})
@@ -218,11 +224,11 @@
},
// 自定义筛选事件
onGetFilterInfo(data) {
- if(this.data.value){
- var obj = { ...this.data.queryObj.prodType, ...data ,userName:this.data.value}
- }else{
- var obj = { ...this.data.queryObj.prodType, ...data }
- }
+ if (this.data.value) {
+ var obj = { prodType: this.data.queryObj.prodType, ...data, userName: this.data.value }
+ } else {
+ var obj = { prodType: this.data.queryObj.prodType, ...data }
+ }
this.setData({
list: [],
isNomore: false,
diff --git a/pages/hbfqPage/orderInfo/orderInfo.js b/pages/hbfqPage/orderInfo/orderInfo.js
index 7ef328b..7510ba0 100644
--- a/pages/hbfqPage/orderInfo/orderInfo.js
+++ b/pages/hbfqPage/orderInfo/orderInfo.js
@@ -11,6 +11,12 @@
verName: '',
info: {
prodId: '',
+ amt:'',
+ goodsName:'',
+ term:'',
+ zfbVersion:'',
+ userName:'',
+ userMblNo:''
},
amtList: [
{ name: '商家到账', number: 0 },
@@ -161,6 +167,16 @@
this.setData({
'info.payType': 2
})
+ for (let key in this.data.info) {
+ if (!this.data.info[key]) {
+ my.showToast({
+ type: 'none',
+ content: '请完整输入信息',
+ duration: 2000,
+ });
+ return
+ }
+ }
my.scan({
scanType: ['qrCode', 'barCode'],
success: (res) => {
@@ -197,7 +213,6 @@
return
}
}
- console.log(2)
let str = JSON.stringify(this.data.info)
my.navigateTo({
url: `../qrCode/qrCode?info=${str}`
diff --git a/pages/shskPage/orderInfo/orderInfo.js b/pages/shskPage/orderInfo/orderInfo.js
index cab45f3..a69e142 100644
--- a/pages/shskPage/orderInfo/orderInfo.js
+++ b/pages/shskPage/orderInfo/orderInfo.js
@@ -3,7 +3,8 @@
data: {
userStyle: {},
info: {
- payAmt: ''
+ payAmt: '',
+ goodsName:''
},
amtList: [
{ name: '商家到账', number: 0 },
@@ -29,12 +30,19 @@
} else if (code == 2) {
obj.goodsName = value
}
- console.log(obj)
this.setData({
info: { ...this.data.info,...obj }
})
if(code == 1&&this.data.info.payAmt){
this.getTaril()
+ }
+ if(code == 1&&!this.data.info.payAmt){
+ this.setData({
+ amtList:[
+ { name: '商家到账', number: 0 },
+ { name: '用户支付金额', number: 0 }
+ ]
+ })
}
},
getTaril(){
@@ -60,6 +68,16 @@
this.setData({
'info.payType': 2
})
+ for (let key in this.data.info) {
+ if (!this.data.info[key]) {
+ my.showToast({
+ type: 'none',
+ content: '请完整输入信息',
+ duration: 2000,
+ });
+ return
+ }
+ }
my.scan({
scanType: ['qrCode', 'barCode'],
success: (res) => {
--
Gitblit v1.8.0