111

page_user/khfw/khfw.vue

@@ -473,12 +473,13 @@
 				border-bottom: 2rpx solid #fff;
 			}
 			.qs_li{
-					margin-top: 10rpx;
+					// margin-top: 10rpx;
 				display: flex;
 				flex-wrap: nowrap;
 				align-items: center;
 				justify-content: space-between;
-				border-bottom: 2rpx solid #D8D8D8;
+				border-bottom: 2rpx solid #D8D8D870;
+				padding-top: 26rpx;
 				padding-bottom: 26rpx;
 				.qs_li_txt{
 				

page_user/yj.vue

@@ -174,7 +174,8 @@
 				areaInfo: "",
 				isback:false,
 				showBack:false,
-				loadingmask:false
+				loadingmask:false,
+				ispaid:false
 
 			}
 
@@ -337,64 +338,74 @@
 				});
 			},
 			sub4() {
-				let id = uni.getStorageSync('areaId');
+				if(this.ispaid==false){
-				let data = {
+					this.ispaid=true
-					userId: this.userId,
+					let id = uni.getStorageSync('areaId');
-
+					let data = {
-					// ruleId: this.freeInfo.ruleId,
+						userId: this.userId,
-					money: this.areaInfo.deposit,
+					
-					mark: "押金充值",
+						// ruleId: this.freeInfo.ruleId,
-					type: '4',
+						money: this.areaInfo.deposit,
-					areaId: id
+						mark: "押金充值",
-
+						type: '4',
-
+						areaId: id
-				}
+					
-				this.$u.post('/appVerify/pre/order', data).then((res) => {
+					
-					if (res.code === 200) {
-						// this.freList=res.rows
-						let that = this
-						uni.requestPayment({
-							provider: 'wxpay',
-							timeStamp: res.data.timeStamp,
-							nonceStr: res.data.nonceStr,
-							package: res.data.packageVal,
-							signType: res.data.signType,
-							paySign: res.data.paySign,
-							success(res) {
-								// 支付成功逻辑
-								// uni.showLoading({
-								// 	title: '加载中'
-								// })
-								that.loadingmask=true
-								setTimeout(() => {
-									
-									that.check()
-									
-								}, 2000)
-								setTimeout(() => {
-									
-									that.check()
-									
-								}, 4000)
-
-							},
-							fail(err) {
-								// 支付失败逻辑
-								uni.showToast({
-									title: '支付失败',
-									icon: 'none',
-									duration: 2000
-								});
-							}
-						});
-					} else {
-						uni.showToast({
-							title: res.data,
-							icon: 'none',
-							duration: 2000
-						});
 					}
-				})
+					let that = this
+					this.$u.post('/appVerify/pre/order', data).then((res) => {
+						if (res.code === 200) {
+							// this.freList=res.rows
+							
+							uni.requestPayment({
+								provider: 'wxpay',
+								timeStamp: res.data.timeStamp,
+								nonceStr: res.data.nonceStr,
+								package: res.data.packageVal,
+								signType: res.data.signType,
+								paySign: res.data.paySign,
+								success(res) {
+									// 支付成功逻辑
+									// uni.showLoading({
+									// 	title: '加载中'
+									// })
+									that.ispaid=false
+									that.loadingmask=true
+									setTimeout(() => {
+										
+										that.check()
+										
+									}, 2000)
+									setTimeout(() => {
+										
+										that.check()
+										
+									}, 4000)
+					
+								},
+								fail(err) {
+									that.ispaid=false
+									// 支付失败逻辑
+									uni.showToast({
+										title: '支付失败',
+										icon: 'none',
+										duration: 2000
+									});
+								}
+							});
+						} else {
+							that.ispaid=false
+							uni.showToast({
+								title: res.data,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+								
+				}
+				
+			
 			},
 		}
 	}

pages_admin/admin_index.vue

@@ -135,7 +135,7 @@
 				infonum: {},
 				rangeMin: 0,
 				rangMax: 100,
-				rangeValue: [1, 100],
+				rangeValue: [0, 100],
 				status0: [], //未上架
 				status1: [], //正常
 				status2: [], //预约中

pages_admin/worke/worke_Operation.vue

@@ -37,24 +37,36 @@
 			</view>
 			<view class="info">
 				<view class="info_li">
-					总营收
+					订单总费用：
+					<span style="color: #4C97E7;" >￥{{displayAmount(info.income.totalFee) }}</span>
+					
+				</view>
+				<view class="info_li">
+					手续费：
+					<span style="color: #4C97E7;" >￥{{displayAmount(info.income.handlingFee)}}</span>
+					
+				</view>
+			</view>
+			<view class="info">
+				<view class="info_li">
+					总营收:
 					<span style="color: #4C97E7;" v-if="info.income.totalIncome">￥{{info.income.totalIncome}}</span>
 					<span style="color: #4C97E7;" v-else>￥--</span>
 				</view>
 				<view class="info_li">
-					累计待支付
+					累计待支付:
 					<span style="color: #4C97E7;" v-if="info.income.totalUnpaid">￥{{info.income.totalUnpaid}}</span>
 					<span style="color: #4C97E7;" v-else>￥--</span>
 				</view>
 			</view>
 			<view class="info">
 				<view class="info_li">
-					已支付
+					已支付:
 					<span style="color: #3D3D3D;" v-if="info.income.totalPaid">￥{{info.income.totalPaid}}</span>
 					<span style="color: #3D3D3D;" v-else>￥--</span>
 				</view>
 				<view class="info_li">
-					已退款
+					已退款:
 					<span style="color: #3D3D3D;" v-if="info.income.totalRefund">￥{{info.income.totalRefund}}</span>
 					<span style="color: #3D3D3D;" v-else>￥--</span>
 				</view>