productDev/dingyuannongji.git

			@@ -3,35 +3,40 @@
			<view class="data">
			<view class="hezi">
			<view class="hezi-a">
			<text>账户余额(元)</text>
			<u-icon name="eye" color="#ffffff" size="16"></u-icon>
			<text style="margin-right: 10rpx; ">账户余额(元)</text>
			<u-icon v-if="showMoney" name="eye" color="#ffffff" size="18" @click="showMoney = !showMoney"></u-icon>
			<u-icon v-if="!showMoney" name="eye-off" color="#eeeeee" size="18" @click="showMoney = !showMoney"></u-icon>
			</view>
			<view class="hezi-b">
			<view class="hezi-b-price">
			<text>{{(countData.surplusIntegral \|\| 0).toFixed(2)}}</text>
			<text></text>
			<text v-if="showMoney">{{(countData.surplusIntegral \|\| 0).toFixed(2)}}</text>
			<text v-if="showMoney"></text>
			<text v-if="!showMoney">****</text>
			</view>
			<view class="hezi-b-btn">提现</view>
			<view class="hezi-b-btn" @click="jumpWithdraw">提现</view>
			</view>
			<view class="hezi-c">
			<view class="hezi-c-item">
			<text class="hezi-c-item-title">待结算(元)</text>
			<view class="hezi-c-item-price">
			<text>{{(countData.waitPayAmount \|\| 0).toFixed(2)}}</text>
			<text></text>
			<text v-if="showMoney">{{(countData.waitPayAmount \|\| 0).toFixed(2)}}</text>
			<text v-if="showMoney"></text>
			<text v-if="!showMoney">****</text>
			</view>
			</view>
			<view class="hezi-c-item">
			<text class="hezi-c-item-title">累计提现(元)</text>
			<view class="hezi-c-item-price">
			<text>{{(countData.withdrawAmount \|\| 0).toFixed(2)}}</text>
			<text></text>
			<text v-if="showMoney">{{(countData.withdrawAmount \|\| 0).toFixed(2)}}</text>
			<text v-if="showMoney"></text>
			<text v-if="!showMoney">****</text>
			</view>
			</view>
			</view>
			</view>
			<view class="tx">
			提现中：¥{{(countData.withdrawIngAmount \|\| 0).toFixed(2)}}
			<text v-if="showMoney">提现中：¥{{(countData.withdrawIngAmount \|\| 0).toFixed(2)}}</text>
			<text v-if="!showMoney">提现中：****</text>
			</view>
			</view>
			<view class="sele" :style="'width:'+wordsWidth+'rpx;'" @click="openShow()">
			@@ -60,7 +65,7 @@
			</view>
			</view>
			<view class="item-list">
			<view class="item-list-item" v-for="(item, index) in dataList" :key="index">
			<view class="item-list-item" v-for="(item, index) in dataList" :key="index" @click="jumpDetail(item)">
			<view class="image">
			<image v-if="item.objType === 16" src="/pagesA/static/ic_shouru@2x.png" mode="widthFix"></image>
			<image v-if="item.objType === 17" src="/pagesA/static/ic_tixian@2x.png" mode="widthFix"></image>
			@@ -69,7 +74,13 @@
			<view class="info">
			<view class="info">
			<view class="info-a">
			<view class="info-a-label">{{item.title \|\| 0}}</view>
			<view class="info-a-label">{{item.title \|\| ''}}
			<template v-if="item.objType === 17 ">
			<text style="color: #999999;" v-if="item.withdrawStatus == 2">未通过</text>
			<text style="color: #004096;" v-else-if="item.withdrawStatus == 1">已通过</text>
			<text style="color: red;" v-else>审批中</text>
			</template>
			</view>
			<view class="info-a-price">
			<text>{{item.type==1?'-':'+'}}{{(item.num \|\|0).toFixed(2)}}</text>
			<text></text>
			@@ -79,9 +90,7 @@
			<text v-if="item.objType === 16 \|\|item.objType === 25 ">订单号：{{item.orderCode \|\| ''}}</text>
			<text v-if="item.objType === 17 \|\|item.objType === 19 ">提现流水号：{{item.orderCode \|\| ''}}</text>
			<template v-if="item.objType === 17 ">
			<text style="color: #999999;" v-if="item.withdrawStatus == 2">未通过</text>
			<text style="color: #004096;" v-else-if="item.withdrawStatus == 1">已通过</text>
			<text style="color: red;" v-else>审批中</text>
			<text style="color: #004096;font-size: 24rpx;" >查看</text>
			</template>
			</view>
			<view class="info-b">
			@@ -175,7 +184,7 @@
			</template>

			<script>
			import { mapState } from 'vuex'
			import { mapState } from 'vuex'
			export default {
			computed: {
			...mapState(['navHeight', 'statusbarHeight','shopInfo', 'shopToken'])
			@@ -198,6 +207,7 @@
			endDate:null,
			tempStartDate:null,
			tempEndDate:null,
			showMoney:false,
			countData:{},
			countDataList:{},
			hasNext:true,
			@@ -218,7 +228,7 @@
			onReachBottom(){
			this.getDataList( );
			},
			onShow() {
			onLoad() {
			this.shop ={}
			this.active=0
			this.wordsWidth=250
			@@ -397,7 +407,7 @@
			startDate:sDate,
			endDate:eDate,
			type: this.active === 1?0:(this.active===2?1:''),
			objType: this.type === 1?16:( this.type === 2?17:( this.type === 3?25: (this.type === 4?19: ''))),
			objType: this.type === 1?16:( this.type === 2?17:( this.type === 3?25: (this.type === 4?1: ''))),
			userType: 2
			},
			page:this.currentPage
			@@ -431,6 +441,18 @@
			jumpBack(){
			uni.navigateBack({ delta: 1 });
			},
			jumpWithdraw(){
			uni.navigateTo({
			url: '/pagesA/pages/withdraw/withdraw'
			})
			},
			jumpDetail(item){
			if(item.objType == 17 ){
			uni.navigateTo({
			url: '/pagesA/pages/withdrawal-details/withdrawal-details?id='+item.objId
			})
			}
			}
			}
			}
			</script>
			@@ -563,6 +585,7 @@
			.box-list {
			width: 100%;
			display: flex;
			padding-bottom: 30rpx;
			flex-direction: column;
			.item {
			width: 100%;
			@@ -641,6 +664,13 @@
			font-weight: 500;
			font-size: 30rpx;
			color: #222222;
			display: flex;
			text {
			font-weight: 400;
			font-size: 24rpx;
			color: #999999;
			margin-left: 20rpx;
			}
			}
			.info-a-price {
			display: flex;