调整筛选组件

pages/account/cash.vue

@@ -7,6 +7,7 @@
 			</view>
 		</u-sticky>
 		<!-- 账户余额 -->
+		<oct-calendar-picker ref="CalendarPicker" @change="onDay" />
 		<view class="total" :style="'background-image: url(' + require('@/static/imgs/cash_back.png') + ');'">
 			<view class="total-value nowrap">{{count}}</view>
 			<view class="total-text">{{type == 'self' ? '个人总业绩': '团队总业绩'}}</view>
@@ -16,7 +17,7 @@
 		<view class="logs">
 			<view class="log-item">
 				<view class="log-header">
-					<view class="log-header-data" @click="dayShow = true">
+					<view class="log-header-data" @click="onPickeShow()">
 						<label>筛选：</label>
 						<view class="log-header-data-q">
 							<view :class="{'show': dayTime.start_at != ''}">{{dayTime.start_at || "开始日期"}}</view>
@@ -26,7 +27,6 @@
 					</view>
 					<view class="log-header-title" @click="onDefaultLog">默认</view>
 				</view>
-				<!--  -->
 				<block v-if="list.length > 0">
 					<view class="log-flex" v-for="(item, index) in list" :key="index">
 						<view class="log-flex-item">
@@ -65,7 +65,8 @@
 			<u-loadmore v-if="pagesShow" :status="status" />
 		</view>
 		<!-- 筛选时间 -->
-		<u-calendar
+		<!-- <button @click="">打开弹窗</button> -->
+		<!-- <u-calendar
 			v-if="maxDate != ''"
 			:show="dayShow"
 			mode="range"
@@ -74,11 +75,9 @@
 			:maxDate="maxDate"
 			monthNum="36"
 			title="选择筛选区间"
-			maxRange="90"
-			rangePrompt="最大筛选天数不能超过90天"
 			@close="dayShow = false"
 			@confirm="onDay"
-		></u-calendar>
+		></u-calendar> -->
 	</view>
 </template>
 
@@ -116,6 +115,11 @@
 			this.maxDate = year + '-' + month + '-' + day
 		},
 		methods: {
+			// 打开时间筛选
+			onPickeShow(){
+				this.$refs.CalendarPicker.open()
+			},
+			// 筛选tab
 			onTabs(e){
 				if(this.type === e) return
 				this.type = e
@@ -134,8 +138,8 @@
 			// 选择日期
 			onDay(e){
 				this.dayTime = {
-					start_at: e[0],
-					end_at  : e[e.length - 1]
+					start_at: e.startDate,
+					end_at  : e.endDate
 				}
 				this.dayShow = false
 				this.page.current = 1

pages/pay/pay.vue

@@ -195,13 +195,13 @@ import mixin from 'uview-ui/libs/mixin/mixin';
 						})
 						break;
 					case 'wx':
-						if(this.payType == 'price') this.onUmsPay('app')
-						if(this.payType == 'diff') this.onDiffUmsPay('app')
+						if(this.payType == 'price') this.onUmsPay('mp')
+						if(this.payType == 'diff') this.onDiffUmsPay('mp')
 						if(this.payType == 'free') this.onFreePay('mp')
 						break;
 					case 'ali':
-						if(this.payType == 'price') this.onUmsPay('app_alipay')
-						if(this.payType == 'diff') this.onDiffUmsPay('app_alipay')
+						if(this.payType == 'price') this.onUmsPay('mp_alipay')
+						if(this.payType == 'diff') this.onDiffUmsPay('mp_alipay')
 						if(this.payType == 'free') this.onFreePay('mp_alipay')
 						break;
 				}
@@ -223,10 +223,10 @@ import mixin from 'uview-ui/libs/mixin/mixin';
 					this.getState = true
 					this.trade_id = res.trade_id
 					switch (type){
-						case 'app':
+						case 'mp':
 							this.onMiniWx()
 							break;
-						case 'app_alipay':
+						case 'mp_alipay':
 							plus.runtime.openURL(res.alipay)
 							break;
 					}
@@ -252,10 +252,10 @@ import mixin from 'uview-ui/libs/mixin/mixin';
 					this.getState = true
 					this.trade_id = res.trade_id
 					switch (type){
-						case 'app':
+						case 'mp':
 							this.onMiniWx()
 							break;
-						case 'app_alipay':
+						case 'mp_alipay':
 							plus.runtime.openURL(res.alipay)
 							break;
 					}
@@ -277,10 +277,10 @@ import mixin from 'uview-ui/libs/mixin/mixin';
 					this.getState = true
 					this.trade_id = res.trade_id
 					switch (type){
-						case 'app':
+						case 'mp':
 							this.onMiniWx()
 							break;
-						case 'app_alipay':
+						case 'mp_alipay':
 							plus.runtime.openURL(res.alipay)
 							break;
 					}