Browse Source

添加地磁支付字段

空白格 3 years ago
parent
commit
94b0d4b321

+ 3 - 3
pages/chargeStandard/chargeStandard.scss

@@ -62,9 +62,9 @@
 			font-size: 24rpx;
 			line-height: 40rpx;
 			color: #999999;
-			view:first-child {
-				margin-right: 40rpx;
-			}
+			// view:first-child {
+			// 	margin-right: 40rpx;
+			// }
 			text {
 				color: #008CFF;
 				margin-left: 10rpx;

+ 2 - 2
pages/chargeStandard/chargeStandard.vue

@@ -24,8 +24,8 @@
 					</view>
 					<view class="charge-time">
 						<view>免费时长<text>{{item.freeTime}}分钟内</text></view>
-						<view v-if="item.topAmt">封顶金额<text>{{item.topAmt}}元</text></view>
-						<view v-else>无封顶金额</view>
+						<!-- <view v-if="item.topAmt">封顶金额<text>{{item.topAmt}}元</text></view>
+						<view v-else>无封顶金额</view> -->
 					</view>
 				</view>
 				<view class="charge-rules" v-for="(type, tIndex) in item.list" :key="tIndex">

+ 3 - 1
pages/geomagnetismLock/geomagnetismLock.vue

@@ -61,7 +61,7 @@
 		</template>
 		<!-- 支付方式 -->
 		<PaymentMethod :payWayPop="payWayPop" :curOrderList="[orderId]" :jumpUrl="jumpUrl" :payeeId="payeeId"
-			:payeeName="payeeName" @closePaymentMethod="closePaymentMethod"></PaymentMethod>
+			:payeeName="payeeName" :pursueType="pursueType" @closePaymentMethod="closePaymentMethod"></PaymentMethod>
 		<u-popup v-model="show" mode="center" border-radius="14" width="200rpx" height="200rpx">
 			<view class="loadingSelect">订单查询中...</view>
 			<view class="spinner">
@@ -108,6 +108,7 @@
 				spaceId: '',
 				payeeId: '',
 				payeeName: '',
+				pursueType: '',
 				is_pay: false
 			}
 		},
@@ -117,6 +118,7 @@
 				this.spaceId = page?.orderId
 				this.payeeId = page?.payeeId
 				this.polyOrderId = page?.polyOrderId
+				this.pursueType = page?.pursueType
 				this.isBack = page?.isBack
 			} else {
 				this.tipsMsg = page.msg || '参数丢失!';

+ 9 - 2
pages/paymentMethod/paymentMethod.vue

@@ -70,6 +70,11 @@
 				type: String,
 				default: undefined
 			},
+			// 追缴类型
+			pursueType: {
+				type: String,
+				default: undefined
+			},
 			// 跳转页面
 			jumpUrl: {
 				type: String,
@@ -99,7 +104,8 @@
 					deviceNo: this.deviceNo,
 					jumpUrl: this.jumpUrl,
 					payeeId: this.payeeId,
-					payeeName: this.payeeName
+					payeeName: this.payeeName,
+					pursueType: this.pursueType
 				};
 				if (this.exportFlag) {
 					this.$u.api.quickPayExportApi(params).then(res=>{
@@ -207,7 +213,8 @@
 					jumpUrl: this.jumpUrl,
 					deviceNo: deviceNo ? deviceNo : null,
 					payeeId: this.payeeId,
-					payeeName: this.payeeName
+					payeeName: this.payeeName,
+					pursueType: this.pursueType
 				};
 				if (this.exportFlag) {
 					this.$u.api.polyPayExportApi(params)