1

pages.json

@@ -112,7 +112,7 @@
 		{
 			"path": "pages/payment/get_payment",
 			"style": {
-				"navigationBarTitleText": "面对面收款",
+				"navigationBarTitleText": "提货付款",
 				"navigationStyle": "custom"
 			}
 		},

pages/cloud_warehouse/small_classification/index.vue

@@ -40,8 +40,8 @@
 						<image src="../../../static/cloud_warehouse/dkbl.png" />
 						<block v-for="(item,indx) in propotionData" :key="indx">
 							<view class="con-right-proportion-item"
-								:class="{'active':storeParam.deduction_rate == item.product_label_id}"
+								:class="{'active':storeParam.deduction_rate == item.value}"
-								@click="handleChooseProp(item.product_label_id)">
+								@click="handleChooseProp(item.value)">
 								{{item.label_name}}
 							</view>
 						</block>
@@ -66,7 +66,7 @@
 										<u-loading-icon color="#999"></u-loading-icon>
 									</template>
 								</u-image>
-								<view class="short_item_right">1
+								<view class="short_item_right">
 									<view class="r_name">{{item.product.store_name}}</view>
 									<view class="r_type">
 										<view v-if="item.product.store_info">{{item.product.store_info}}</view>
@@ -527,6 +527,11 @@
 					mer_id: ENV == 'prod' ? '259' : '244'
 				}).then(res => {
 					this.propotionData = res.data;
+					this.propotionData.unshift({
+						product_label_id: '',
+						value: '',
+						label_name: '全部'
+					})
 				})
 			},
 

pages/payment/get_payment.vue

@@ -1,14 +1,14 @@
 <template>
 	<view class="container">
 		<view class="v-navbar">
-    	<u-navbar title="面对面收款" :safeAreaInsetTop="false" :fixed="false" @leftClick="leftClick" bgColor="transparent"
+			<u-navbar title="提货付款" :safeAreaInsetTop="false" :fixed="false" @leftClick="leftClick" bgColor="transparent"
 				leftIconColor="#fff" :titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}">
 			</u-navbar>
 		</view>
 		<view v-if="merchantInfo && !isEmpty">
 			<view class="v-desc">
 				<view>
-					<view class="v-desc-main">付款给商家</view>
+					<view class="v-desc-main">确认提货付款</view>
 					<view class="v-desc-sub">{{merchantInfo.merchant.mer_name}}</view>
 				</view>
 				<u-image :showLoading="true" :src="merchantInfo.merchant.mer_avatar" width="182rpx" height="182rpx"
@@ -20,8 +20,9 @@
 				<view class="v-con-text">付款金额</view>
 				<view class="v-con-input" style="margin-right: 10px;">
 					<text style="color: #303133;font-size:46rpx;">￥</text>
-					<u--input type="digit" maxlength="5" fontSize="23" v-model="cartForm.total_amount"
+					<u--input type="digit" maxlength="7" fontSize="23" v-model="cartForm.total_amount"
-						placeholder="请输入金额" border="none" placeholderStyle="color:#999;font-size:30rpx">
+						placeholder="请输入金额" border="none" placeholderStyle="color:#999;font-size:30rpx"
+						@input="validateDecimal">
 					</u--input>
 				</view>
 
@@ -51,7 +52,8 @@
 			<image src="/static/images/no_thing.png"></image>
 			<text style="margin-top: 60rpx;">{{tips}}</text>
 			<!-- 登陆 -->
-			<authorize :isAuto="isAuto" :isGoIndex="false" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun">
+			<authorize :isAuto="isAuto" :isGoIndex="false" :isShowAuth="isShowAuth" @authColse="authColse"
+				@onLoadFun="onLoadFun">
 			</authorize>
 		</view>
 	</view>
@@ -118,7 +120,12 @@
 			}
 		},
 		methods: {
-      leftClick(e){
+			validateDecimal(event) {
+				console.log(event);
+				this.checkForm.total_amount = event.match(/^\d*(\.?\d{0,2})/g)[0]
+			},
+
+			leftClick(e) {
 				uni.switchTab({
 					url: '/pages/index/index'
 				})
@@ -178,7 +185,7 @@
 						title: err.message || err.msg || err
 					})
 					// #ifdef APP
-					setTimeout(()=>{
+					setTimeout(() => {
 						uni.navigateBack({
 							delta: 1
 						})
@@ -324,7 +331,9 @@
 			}
 
 			.v-wrap {
-				position: relative;
+				display: flex;
+				align-items: center;
+				padding-left: 20rpx;
 				width: 666rpx;
 				height: 210rpx;
 				background-image: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/def/2f9c2202402291652415355.webp");
@@ -332,28 +341,24 @@
 				background-repeat: no-repeat;
 
 				.v-wrap-money {
-					position: absolute;
+					display: flex;
-					top: 70rpx;
+					align-items: center;
-					left: 36rpx;
 					color: #FF5E0C;
+					margin-right: 30rpx;
 
 					.icon {
-						font-size: 28rpx;
+						font-size: 34rpx;
 					}
 
 					.num {
 						font-size: 46rpx;
 						display: inline-block;
 						overflow: auto;
-						width: 160rpx;
+						width: 180rpx;
 					}
 				}
 
 				.v-wrap-desc {
-					position: absolute;
-					top: 67rpx;
-					left: 230rpx;
-
 					.v-wrap-desc-main {
 						margin-bottom: 16rpx;
 						font-weight: 600;