1

pages/cash-detail/cash-detail.vue

@@ -29,8 +29,12 @@
 												<Text :style="{'color':mainColor}">{{item.AuditStatusName}}</Text>
 											</view>
 										</view>
-										<Text class='text_s'>提现账户：{{item.AccountName}}</Text>
-										<Text class='text_s'>提现时间：{{item.AuditDate}}</Text>
+										<Text class='text_s' v-if='item.WithdrawalWay==1'>提现方式：自动打款</Text>
+										<Text class='text_s' v-if='item.WithdrawalWay==2'>提现方式：微信线下转账</Text>
+										<Text class='text_s' v-if='item.WithdrawalWay==3'>提现方式：支付宝线下转账</Text>
+										<Text class='text_s' v-if='item.WithdrawalWay==4'>提现方式：银行卡线下转账</Text>
+										<Text class='text_s' v-if='item.WithdrawalWay==5'>提现方式：余额提现</Text>
+										<Text class='text_s'>提现时间：{{item.RemitDate}}</Text>
 									</view>
 									<view class="box_b_l" style="align-items: flex-end;">
 										<Text style='font-size: 18px;'>{{item.AppliedMoney}}</Text>

pages/share-money/share-money.vue

@@ -29,7 +29,7 @@
 				<!-- <Text>用户须知</Text> -->
 				<u-collapse style='width: 100%;'>
 						<u-collapse-item :title="money.CustomModel.UserNotesName" >
-							<!-- TODO无数据 -->
+							<Text style='margin-bottom: 10px;'>{{money.CustomModel.UserNotes}} </Text>
 						</u-collapse-item>
 				</u-collapse>
 			</view>

pages/share-qrcode/share-qrcode.vue

@@ -25,16 +25,7 @@
 			 this.init()
 		},
 		mounted() {
-			let currentPages = getCurrentPages();
-			 let u = "/" + currentPages[currentPages.length-1].route;
-			 let pages = wx.getStorageSync("basedata")
-			   ? wx.getStorageSync("basedata").bar_title
-			   : [];
-			 pages.forEach((x) => {
-			   if (x.value == u) {
-			     this.pageTitle = x.new_name ? x.new_name : x.name;
-			   }
-			 });
+			
 			 uni.setNavigationBarTitle({
 			   title: this.pageTitle,
 			 });
@@ -44,15 +35,11 @@
 				uni.showNavigationBarLoading();
 				let h = this.apiheader();
 				
-				this.request(
-				  {
-					url: "",
-				  header:h,
-				data: {
-				  r: "api/qrcode/share",
-				},
-							  
-			  },
+				this.request2(
+				 {
+					url: '/api/AppletOrder/SetAppletOrderSendGoods',
+					data: that.forms
+				 },
 							
 			  (res) => {
 				uni.hideNavigationBarLoading()

pages/share/cash/cash.vue

@@ -3,7 +3,7 @@
 		<view class="cashBox">
 			<view class="cashBox_top">
 				<Text style='font-size: 18px;margin-top: 10px;'>账户剩余余额：{{cash.CommissionWithdrawal}}元</Text>
-				<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>今日剩余提现金额次数:{{cash.CanRemitMoney}}次</Text>
+				<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>今日剩余提现金额:{{cash.CanRemitMoney}}元</Text>
 				<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>最少提现额度:{{cash.MinimumWithdrawalLimit}}元</Text>
 				<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>手续费 百分比:{{cash.WithdrawFee}}%</Text>
 				<!-- <view style="display: flex;flex-direction: row;align-items: center;margin-top: 10px;">
@@ -249,7 +249,8 @@
 					});
 					return false
 				}
-				this.msg.Fee = this.cash.Fee;
+				this.msg.Fee = this.cash.WithdrawFee*0.01*this.msg.AppliedMoney;
+				
 				uni.showNavigationBarLoading();
 				this.request2(
 					{
@@ -265,6 +266,9 @@
 						icon: "none"
 					});
 					this.init()
+					uni.navigateTo({
+						url: '/pages/cash-detail/cash-detail'
+					});
 				  }
 				);
 			}