张文飞 преди 3 години
родител
ревизия
bb025e25cc
променени са 3 файла, в които са добавени 236 реда и са изтрити 3 реда
  1. 166 0
      components/subComponents/dmDialog.vue
  2. 62 0
      components/subComponents/dmWithDrawalRecord.vue
  3. 8 3
      pages/reportPage/reportPage.vue

+ 166 - 0
components/subComponents/dmDialog.vue

@@ -0,0 +1,166 @@
+<template>
+	<view class="pop-view" v-if='visible'>
+		<view class="pop-maskView" :style="{
+		  'background-color': maskBgColor,
+		  zIndex: zIndex - 1
+		}" @tap.stop="handleMaskTap"
+		 @touchmove.stop.prevent="moveHandle">
+		</view>
+		
+		
+		
+		<view :class="['pop-contentView',containerVisible ? 'pop-contentView-show' : '']" :style="{zIndex: zIndex}"
+		 @touchmove.stop.prevent="moveHandle">
+			<text class="pop-title" v-if="isShowTitle">{{title}}</text>
+			<image class="pop-close" src="../../static/icons/icon_close@2x.png" v-if="isShowClose" mode="" @click="handleCancel"></image>
+			<slot></slot>
+			<text class="pop-commit" :style="{'background-color':color2}" v-if="isShowConfirm" @click="handleConfirm">确定</text>
+		</view>
+		
+		
+	</view>
+</template>
+<script>
+	export default {
+		props: {
+			title: String,
+			maskColor: {
+				type: String,
+				default: 'rgba(0, 0, 0, 0.3)'
+			},
+			zIndex: {
+				type: Number,
+				default: 999
+			},
+			maskTapHide: {
+				type: Boolean,
+				default: true
+			},
+			isShowTitle: {
+				type: Boolean,
+				default: true
+			},
+			isShowClose: {
+				type: Boolean,
+				default: true
+			},
+			isShowConfirm: {
+				type: Boolean,
+				default: true
+			},
+			isScannerOption:{
+				type:Boolean,
+				default:false
+			}
+		},
+		data() {
+			return {
+				visible: false,
+				containerVisible: false,
+				maskBgColor: '',
+				selectValue: [0],
+				selIdx: 0,
+				color2:''
+			}
+		},
+		mounted() {
+			let app = getApp();
+			this.globalData = app.globalData;
+			this.color2 = this.globalData.color2;
+		},
+		methods: {
+			show() {
+				this.visible = true
+				setTimeout(() => {
+					this.maskBgColor = this.maskColor
+					this.containerVisible = true
+				}, 20)
+			},
+			hide() {
+				this.maskBgColor = ''
+				this.containerVisible = false
+				setTimeout(() => {
+					this.visible = false
+				}, 200)
+				this.$emit('close')
+			},
+			handleCancel() {
+				this.hide()
+			},
+			handleConfirm() {
+				this.hide()
+				this.$emit('confirm')
+			},
+			handleMaskTap() {
+				if (this.maskTapHide) {
+					this.hide()
+				}
+			},
+			moveHandle() {},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.pop-view {
+		position: relative;
+
+		.pop-maskView {
+			position: fixed;
+			top: 0;
+			right: 0;
+			left: 0;
+			bottom: 0;
+		
+		}
+
+		.pop-contentView {
+			position: fixed;
+			right: 0;
+			left: 0;
+			bottom: 0;
+			overflow-y: scroll;
+			background-color: #fff;
+			border-radius: 40rpx 40rpx 0rpx 0rpx;
+			box-shadow: 0rpx 8rpx 12rpx 0rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+		
+
+			.pop-title {
+				margin-top: 60rpx;
+				font-size: 32rpx;
+				font-family: Verdana, Verdana-Bold;
+				font-weight: 700;
+				text-align: center;
+				color: #333333;
+			}
+
+			.pop-close {
+				position: absolute;
+				top: 64rpx;
+				right: 30rpx;
+				width: 40rpx;
+				height: 40rpx;
+			}
+
+			.pop-commit {
+				margin-bottom: 54rpx;
+				width: 260rpx;
+				height: 84rpx;
+				line-height: 84rpx;
+				border-radius: 42rpx;
+				font-size: 32rpx;
+				font-family: Verdana, Verdana-Regular;
+				font-weight: 400;
+				text-align: center;
+				color: #ffffff;
+			}
+		}
+
+		.pop-contentView-show {
+			
+		}
+	}
+</style>

+ 62 - 0
components/subComponents/dmWithDrawalRecord.vue

@@ -0,0 +1,62 @@
+<template>
+	<dmDialog ref='popView' :isShowTitle="true" title="提现记录" :isShowClose="true" :isShowConfirm="false" >
+		<view class="content">
+			<view class="report_title">
+				<text class="report_title_">累计提现</text>
+				<text class="report_title_money">¥23,227,00.00</text>
+			</view>
+		</view>
+		 
+	</dmDialog>
+</template>
+
+<script>
+	import dmDialog from "./dmDialog.vue"
+	export default{
+		data(){
+			return {
+				
+			}
+		},
+		methods:{
+			show() {
+				this.$refs.popView.show()
+			},
+			knowAction(){
+				this.$refs.popView.hide()
+			},
+		},
+		mounted() {
+			
+		},
+		components:{
+			dmDialog
+		}
+		
+	}
+</script>
+
+<style scoped lang="scss">
+	.content{
+		width: 100%;
+		height: 776rpx;
+	}
+	.report_title{
+		display: flex;
+		
+		.report_title_{
+			font-size: 28rpx;
+			font-family: Verdana, Verdana-Regular;
+			font-weight: 400;
+			text-align: left;
+			color: #b1b1b1;
+		}
+		.report_title_money{
+			font-size: 48rpx;
+			font-family: DIN Alternate, DIN Alternate-Bold;
+			font-weight: 700;
+			text-align: left;
+			color: #fd8f3c;
+		}
+	}
+</style>

+ 8 - 3
pages/reportPage/reportPage.vue

@@ -9,7 +9,7 @@
 					<!-- <num-run :value="700"></num-run> -->
 				</view>
 				<view class="right">
-					<view class="txRecord" :style="`color: ${color2};`">提现记录></view>
+					<view class="txRecord" :style="`color: ${color2};`" @click="txRecordList">提现记录></view>
 					<view class="txRequest" :style="`background-color: ${color1};`">提现申请</view>
 				</view>
 			</view>
@@ -92,6 +92,7 @@
 		</view>
 		
 		<dm-calendar-picker-view ref='calendarPickerView' @confirmSelDate='confirmSelDate'></dm-calendar-picker-view>
+	    <dmWithDrawalRecord ref='withDrawalRecord'></dmWithDrawalRecord>
 	</view>
 
 </template>
@@ -100,7 +101,7 @@
 	import numRun from '../../components/numRun/numRun.vue'
 	import dmCalendarPickerView from '../../components/subComponents/dmCalendarPickerView.vue'
 	import moment from '../../static/moment.min.js'
-	
+	import dmWithDrawalRecord from '../../components/subComponents/dmWithDrawalRecord.vue' 
 	let app = getApp();
 	export default {
 		data() {
@@ -268,6 +269,9 @@
 				uni.navigateBack({
 					delta: 1
 				})
+			},
+			txRecordList(){
+				this.$refs.withDrawalRecord.show();
 			}
 		},
 		
@@ -288,7 +292,8 @@
 		},
 		components: {
 			numRun,
-			dmCalendarPickerView
+			dmCalendarPickerView,
+			dmWithDrawalRecord,
 		}
 	}
 </script>