zhengkaixin há 2 anos atrás
pai
commit
ffec4d40ad

+ 7 - 2
pagesFinance/user/applicationForWithdrawal.vue

@@ -371,7 +371,8 @@
 	export default {
 		data() {
 			return {
-				id:'',
+				id:'',
+				uuid:'',
 				isPt: false,
 				detailList:[],
 				info: {
@@ -437,6 +438,7 @@
 			if(op.id){
 				this.id=op.id
 			}
+			this.uuid=op.uuid;
 		},
 		onShow() {
 
@@ -458,7 +460,7 @@
 						var itemAmount=obj.itemAmount?obj.itemAmount:0
 						applicationAmount+=parseFloat(itemAmount)
 					}
-					console.log(applicationAmount)
+
 					if(applicationAmount){
 						return applicationAmount
 					}else {
@@ -611,6 +613,9 @@
 				
 				}).then((res) => {
 					
+					this.carhelp.set("withdrawRecord",{
+						uuid:this.uuid,
+					})
 					this.id=res.data;
 					uni.hideLoading()
 					if(status==-1){

+ 3 - 3
pagesFinance/user/applyResult.vue

@@ -9,15 +9,15 @@
 		<view class="applySpeed">
 			<view class="applySpeed-item">
 				<u-icon name="time-line" custom-prefix="custom-icon" color="#185AC6" size="48"></u-icon>
-				<p>预计3个工作日内确认提现金额</p>
+				<p>等待财务确认提现金额并打款</p>
 			</view>
 			<view class="applySpeed-item">
 				<u-icon name="money-cny-circle-line" custom-prefix="custom-icon" color="#185AC6" size="48"></u-icon>
-				<p>预计2个工作日内金额到账</p>
+				<p>等待银行清算后金额到账</p>
 			</view>
 		</view>
 		<view class="applyBtn">
-			<u-button class="applyBtn-btn" type="primary" @click="back">完成</u-button>
+			<u-button class="applyBtn-btn" type="primary" @click="back">查看申请记录</u-button>
 		</view>
 	</view>
 </template>

+ 15 - 3
pagesFinance/user/withdrawRecord.vue

@@ -27,7 +27,7 @@
 						<p>{{item.stationName}}</p>
 					</view>
 					<view class="detailed-item-num">
-						<h2>{{item.applicationAmount.toFixed(2)}}元</h2>
+						<h2>{{item.applicationAmount?item.applicationAmount.toFixed(2):'0'}}元</h2>
 						
 						<p>{{showTime2(info.createTime)}}</p>
 					</view>
@@ -39,7 +39,7 @@
 		 
 		</view>
 		
-		<u-button  v-if="info.status" @click="gotoUrl('pagesFinance/user/applicationForWithdrawal')" >创建提现单</u-button>
+		<u-button  v-if="info.status" @click="uuid=new Date().getTime(),gotoUrl('pagesFinance/user/applicationForWithdrawal?uuid='+uuid)" >创建提现单</u-button>
 	</view>
 </template>
 
@@ -49,6 +49,7 @@
 	export default {
 		data() {
 			return {
+				
 				pageIndex: 1,
 				recordsTotal: 0,
 				list: [],
@@ -58,6 +59,7 @@
 					intro: '',
 				},
 				showMap:null,
+				uuid:""
 			 
 			}
 		},
@@ -74,6 +76,15 @@
 				this.myLoadmore();
 			}
 		},
+		onShow(){
+			var obj=this.carhelp.get("withdrawRecord")
+			if(obj&&obj.uuid==this.uuid){
+				
+				this.list=[];
+				this.pageIndex = 1;
+				this.getList()
+			}
+		},
 		methods: {
 			showTime(name){
 				if(!name){
@@ -88,8 +99,9 @@
 				return name.substring(5);
 			},
 			gotoItem(item){
+				this.uuid=new Date().getTime()
 				if(item.status=='-1'){
-					this.gotoUrl('pagesFinance/user/applicationForWithdrawal?id='+item.id)
+					this.gotoUrl('pagesFinance/user/applicationForWithdrawal?id='+item.id+"&uuid="+this.uuid)
 				}else{
 					this.gotoUrl('pagesFinance/user/applicationDetails?id='+item.id)
 				}