@dongkboy 11 сар өмнө
parent
commit
a47b12ced9

+ 2 - 2
config/baseUrl.js

@@ -3,12 +3,12 @@ let h5BaseUrl = "";
 let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
-	baseUrl = "http://192.168.0.103:8080"; //屈晨
+	// baseUrl = "http://192.168.0.103:8080"; //屈晨
 	// baseUrl = "https://test.baoxianzhanggui.com/web-api"; //测试
 	// h5BaseUrl = "https://test.baoxianzhanggui.com/h5";
 	// baseUrl = "https://pre.baoxianzhanggui.com/web-api"; //预生产
 	// h5BaseUrl = "https://pre.baoxianzhanggui.com/h5";
-	// baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
+	baseUrl = "https://sxzgkj.baoxianzhanggui.com/web-api"; //生产
 	h5BaseUrl = "https://sxzgkj.baoxianzhanggui.com/h5";
 	socketUrl = "";
 } else if (process.env.NODE_ENV === 'production') {

+ 2 - 2
manifest.json

@@ -7,8 +7,8 @@
 		"sizes": "分辨率,192x192",
 		"src": "图片路径"
 	}],
-	"versionName": "2.1.8",
-	"versionCode": 218,
+	"versionName": "2.1.9",
+	"versionCode": 219,
 	"app-plus": {
 		"error": {
 			"url": "hybrid/html/error.html"

+ 25 - 0
pages/wallet/billInfo.vue

@@ -15,6 +15,7 @@
 					<text>{{promotionData.amount}}</text>
 				</view>
 			</view>
+
 			<view class="assets dis f-c j-s" v-if="detailsType==3">
 				<view class="dis f-c j-s a-c">
 					<text>业务收入提现到银行卡</text>
@@ -27,6 +28,12 @@
 					</u-steps>
 				</view>
 			</view>
+			<view class="assets dis f-c j-s" v-if="detailsType==4">
+				<view class="dis f-c j-s a-c" style="border: none;">
+					<text>退款金额</text>
+					<text>{{refundData.refundAmount}}</text>
+				</view>
+			</view>
 			<view class="assets1 dis f-c j-s">
 				<template v-if="detailsType==2">
 					<view class="dis j-s a-c" v-if="promotionData.subOrderId">
@@ -88,6 +95,17 @@
 						<text>{{MoneyData.bankAccount}}</text>
 					</view>
 				</template>
+				<template v-if="detailsType==4">
+					<view class="dis j-s a-c" v-if="refundData.transactionNumber">
+						<text>交易编号:</text>
+						<text>{{refundData.transactionNumber}}</text>
+					</view>
+					<view class="dis j-s a-c" v-if="refundData.refundTime">
+						<text>退款时间:</text>
+						<text>{{refundData.refundTime}}</text>
+					</view>
+
+				</template>
 			</view>
 		</view>
 	</view>
@@ -103,6 +121,7 @@
 				numList: [],
 				MoneyData: {},
 				promotionData: {},
+				refundData: {},
 				trajectoryLength: 0,
 				detailsType: "",
 			}
@@ -138,6 +157,12 @@
 							1;;
 						this.trajectoryLength = filteredArray;
 						break;
+					case '4':
+						let audit = await this.$http.get('/sysUserAccount/findRefundDetailById?id=' + params.id);
+						if (audit.code == '200') {
+							this.refundData = audit.data;
+						}
+						break;
 					default:
 				}
 

+ 16 - 4
pages/wallet/transactionDetails.vue

@@ -100,14 +100,19 @@
 							</image>
 							<text style="margin-left: 5px;font-size: 14px;color: #333;">提现</text>
 						</view>
+						<view class="dis a-c" v-if="item.transactionType==4">
+							<image src="/static/image/wallet/tuikuan.png" mode="">
+							</image>
+							<text style="margin-left: 5px;font-size: 14px;color: #333;">退款</text>
+						</view>
 						<text style="font-size: 14px;font-weight: bold;"
 							:style="{ color: item.transactionType == 3 ? '#333' : '#FF5600' }">{{item.transactionType==3?'-':'+'}}{{item.amount}}</text>
 					</view>
-					<text v-if="item.transactionType !== 3">订单号:{{item.subOrderNo}}</text>
-					<text>交易号:{{item.id}}</text>
+					<text v-if="!['3','4'].includes(item.transactionType)">订单号:{{item.subOrderNo}}</text>
+					<text v-if="['3','4'].includes(item.transactionType)">交易号:{{item.auditiingId}}</text>
 					<view class="dis a-c j-s">
-						<text>{{item.signingTime}}</text>
-						<text v-if="item.transactionType!=3">车牌号:{{item.licenseNo}}</text>
+						<text>{{item.createTime}}</text>
+						<text v-if="!['3','4'].includes(item.transactionType)">车牌号:{{item.licenseNo}}</text>
 					</view>
 				</view>
 			</view>
@@ -222,6 +227,7 @@
 						break;
 					case '2':
 					case '3':
+					case '4':
 						this.navigate({
 								url: "/pages/wallet/billInfo?type=" + item.transactionType + '&id=' + item.id +
 									'&subOrderNo=' + item.subOrderNo + '&amount=' + item.amount,
@@ -279,6 +285,7 @@
 					}
 				}
 
+
 			},
 			//查询事件
 			querysearch() {
@@ -297,6 +304,11 @@
 					this.dataList = res.data.data.content;
 					this.sumAmountSR = res.data.sumAmountSR;
 					this.sumAmountZC = res.data.sumAmountZC;
+				} else {
+					uni.showToast({
+						title: data.msg,
+						icon: 'none',
+					});
 				}
 			},
 			searchPopup() {

BIN
static/image/wallet/tuikuan.png