From c794adcb96a6429b5b0e782aecb3154517fc8c1d Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Thu, 21 Dec 2023 11:45:29 +0800
Subject: [PATCH] 11

---
 pages/index/peopleList.vue     | 21 ++++++++++-----------
 pages/inventory/goodsList1.vue | 15 ++++++++++-----
 pages/login/login.vue          |  4 ++--
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/pages/index/peopleList.vue b/pages/index/peopleList.vue
index 784c934..dbb6fea 100644
--- a/pages/index/peopleList.vue
+++ b/pages/index/peopleList.vue
@@ -32,10 +32,12 @@
 						<text style="line-height: 75rpx;">{{item.shippingMethod}}</text>
 						<text style="line-height: 75rpx;">{{item.workerName}}</text>
 					</view>
-					<view class="phone-btn" @tap.stop="clickPhone(item.mobile)" v-if="popleType != 'kdName'">拨打电话</view>
-					<view class="standard-box" @tap.stop="toggle('center',item.remark || item.chargingStandard)">
-						收费标准<uni-icons type="info" color='#088FEB' size="16"
-							style="line-height: 75rpx;padding-right:40rpx;"></uni-icons>
+					<view class="standard-box" @tap.stop="toggle('center',item.remark || item.chargingStandard)">
+						<view class="">
+							<text style="padding-left:40rpx;">收费标准</text>
+							<uni-icons type="info" color='#088FEB' size="16" style="line-height: 75rpx;"></uni-icons>
+						</view>
+						<view class="phone-btn" @tap.stop="clickPhone(item.mobile)" v-if="popleType != 'kdName'">拨打电话</view>
 					</view>
 					<view style="position: absolute;bottom: 0;left: 40rpx;" v-if="popleType == 'fcName' || popleType == 'lbgName' || popleType == 'wlName'">
 						<text style="line-height: 45rpx;color:red;font-size: 24rpx;">本单返佣2元</text>
@@ -235,7 +237,7 @@
 	}
 
 	.name-tel {
-		width: 220rpx;
+		width: 70%;
 		height: 75rpx;
 		line-height: 75rpx;
 		padding-left: 40rpx;
@@ -249,9 +251,7 @@
 	}
 	.standard-box {
 		color: #088FEB;
-		line-height: 75rpx;
-		width: 50%;
-		text-align: right;
+		width: 30%;
 		font-size: 26rpx;
 	}
 
@@ -278,9 +278,8 @@
 
 	.phone-btn {
 		width: 150rpx;
-		height: 75rpx;
 		color: #088FEB;
-		line-height: 75rpx;
-		font-size: 26rpx;
+		font-size: 26rpx;
+		padding-left:40rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue
index 91d715a..9aa01df 100644
--- a/pages/inventory/goodsList1.vue
+++ b/pages/inventory/goodsList1.vue
@@ -171,8 +171,8 @@
 				<view class="shop-box">
 					<view class="" style="border-bottom: 1px solid #eee;">
 						<view class="list-name" style="width: 100%;">发货方式</view>
-						<view class="list-val" style="display: flex;width: 100%;padding-left:20rpx;">
-							<radio-group @change="radioChange" style="display: flex;">
+						<view class="list-val" style="width: 100%;padding-left:20rpx;height:200rpx;">
+							<radio-group @change="radioChange">
 								<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in logisticsType"
 									:key="item.value">
 									<view>
@@ -404,7 +404,11 @@
 					{
 						value: '2',
 						name: '自提'
-					},
+					},
+					{
+						value: '5',
+						name: '大巴'
+					}
 				],
 				discountType: '', //折扣类型
 				discountCurrent: '',
@@ -1533,8 +1537,9 @@
 	}
 
 	.uni-list-cell {
-		display: flex;
-		margin-right: 20rpx;
+		margin-right: 20rpx;
+		display: flex;
+		float: left;
 	}
 	.bottom-box {
 		width: 100%;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 22d3b0b..70e433e 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -70,9 +70,9 @@
 	export default {
 		data() {
 			return {
-				mobile: '15101147760',
+				mobile: '15533910775',
 				// username: '15101147760',
-				username: '15630117759',
+				username: '15533910775',
 				code: '',
 				// password: '123456',
 				password: '19950123kang',