中英文修改

common/storage.js

@@ -53,7 +53,7 @@ const activeTabs = [
 		iconUrl: `${QINIU_URL}FppwhbFzrEmDeJQgZJtDTu6WOoMZ`
 	},
 	{
-		name: i18n.t('打开尾箱锁'),
+		name: i18n.t('打开尾箱'),
 		type:'openTailBox',
 		iconUrl: `${QINIU_URL}Fv3KLuYWEeV5IM4_2sMbmur7yZtz`
 	},

component/customSwitch.vue

@@ -158,7 +158,8 @@
 
 	.switch_text_on {
 		position: relative;
-		width: 158rpx;
+		width: 200rpx;
+		text-align: center;
 		height: 80rpx;
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 500;
@@ -167,7 +168,7 @@
 		line-height: 80rpx;
 		text-align: left;
 		font-style: normal;
-		margin-left: 200rpx;
+		margin-left: 170rpx;
 	}
 
 	.switch_text_off {

component/useGuidance/useGuidance.vue

@@ -25,15 +25,15 @@
 		<view class="step-tip-view flex-row  align-center">
 			<view class="step-tip-text">
 				<image class="step-num-1" src="https://qiniu.bms16.com/Fm4gMRmW6UOwLcU-eW8LDLNfiUJe" mode='aspectFill'>
-				</image>线上选择用车方案生成待支付订单
+				</image>{{$t('线上选择用车方案生成待支付订单')}}
 			</view>
 			<view class="step-tip-text">
 				<image class="step-num-2" src="https://qiniu.bms16.com/FvYN7SxOYIhXEqSAJZrQIBQuTx79" mode='aspectFill'>
-				</image>导航到店向商家支付订单金额
+				</image>{{$t('导航到店向商家支付订单金额')}}
 			</view>
 			<view class="step-tip-text">
 				<image class="step-num-3" src="https://qiniu.bms16.com/FhZ7w0X8iVuxFPdetEF9C3YYkJ7Z" mode='aspectFill'>
-				</image>支付完成后直接现场取车
+				</image>{{$t('支付完成后直接现场取车')}}
 			</view>
 		</view>
 	</view>

locale/en.json

@@ -35,7 +35,7 @@
 	"该用户不存在！": "User Not Found!",
 	"免费": "Free",
 	"次": "Times",
-	"车辆换电": "Swap Battery",
+	"车辆换电": "Swap",
 	"响铃找车": "Find Vehicle",
 	"开座桶锁": "Open Seat Lock",
 	"关闭头盔锁": "Close Helmet Lock",
@@ -94,10 +94,10 @@
 	"车辆已开始鸣笛": "Car honking",
 	"您确定打开座桶锁？": "Open seat box lock?",
 	"打开座桶": "Open Seat",
-	"滑动开机": "Slide to Power On",
+	"滑动开机": "Slide On",
 	"开机中": "Powering On",
 	"关机中": "Powering Off",
-	"滑动关机": "Slide to Power Off",
+	"滑动关机": "Slide Off",
 	"座桶锁已打开": "Seat box unlocked",
 	"您确定给车辆上锁？": "Lock the vehicle?",
 	"正在上锁": "Locking",
@@ -228,10 +228,10 @@
 	"无可用电池": "No available batteries",
 	"营业中": "Open",
 	"已休息": "Resting",
-	"直线距您": "Straight-line Distance",
+	"直线距您": " ",
 	"千米": "km",
 	"米": "m",
-	"导航": "Navigation",
+	"导航": "Nav",
 	"格口详情": "Box Detail",
 	"电柜编号：": "Cabinet ID:",
 	"已预约": "Reserved",
@@ -263,7 +263,7 @@
 	"仓体": "Cabinet Body",
 	"月租": "Monthly",
 	"年租": "Yearly",
-	"分租": "Sub-lease",
+	"分租": "Minute",
 	"季租": "Quarterly",
 	"购买": "Buy",
 	"免费换电次数": "Free Swap Count",
@@ -272,7 +272,7 @@
 	"我要用车": "I want to use the vehicle",
 	"获取直线距离": "Get Straight-line Distance",
 	"您是否要拨打电话": "Do you want to call?",
-	"更多功能": "More Features",
+	"更多功能": "More",
 	"固定导航栏": "Fixed Navigation Bar",
 	"其他功能": "Other Features",
 	"长按拖动可调整顺序，可增减固定导航栏内容": "Long press to adjust order, add or remove items from fixed navigation bar",
@@ -292,7 +292,7 @@
 	"返回首页": "Return to Home",
 	"解绑成功！": "Unbind Successful!",
 	"请选择设备": "Select Device",
-	"当前选择": "Current Selection",
+	"当前选择": "CurSel",
 	"租赁设备": "Leased Device",
 	"绑定设备": "Bind Device",
 	"是否确定": "Are you sure?",
@@ -303,8 +303,8 @@
 	"气泡内容": "Bubble content",
 	"已驻车": "Parked",
 	"分钟": "Minutes",
-	"更新于": "Updated at",
-	"闪灯鸣笛": "Flash light & Horn",
+	"更新于": "Updated",
+	"闪灯鸣笛": "Horn Boost",
 	"使用": "Use",
 	"点击事件": "Click Event",
 	"需要填写": "Required",
@@ -353,7 +353,7 @@
 	"为保证": "To ensure",
 	"感应解锁": "Sensor Unlock",
 	"闪电鸣笛": "Flash Horn",
-	"打开尾箱锁": "Open trunk lock",
+	"打开尾箱": "Open trunk",
 	"请先链接蓝牙": "Connect Bluetooth First",
 	"的正常使用，请依次开以下权限，开启后可以显著提高解锁成功率，且不会明显增加手机电量消耗": "For normal use, please enable the following permissions to improve unlock success rate without significant battery drain",
 	"授权引导": "Authorization Guide",
@@ -423,8 +423,8 @@
 	"您已逾期": "You are Overdue",
 	"请及时续费或归还车辆": "Please Extend Rental or Return the Vehicle",
 	"去续费": "Go to Extend Rental",
-	"车辆已开机": "Vehicle Powered On",
-	"车辆已关机": "Vehicle Powered Off",
+	"车辆已开机": "Powered On",
+	"车辆已关机": "Powered Off",
 	"最近骑行": "Recent Rides",
 	"总里程": "Total Mileage",
 	"蓝牙配对成功": "Bluetooth Pairing Successful",
@@ -594,18 +594,18 @@
 	"待激活": "Pending Activation",
 	"使用中": "In Use",
 	"已逾期": "Overdue",
-	"还车申请中": "Return Application Pending",
+	"还车申请中": "Return Pending",
 	"还车中": "Returning Vehicle",
 	"车辆已归还": "Vehicle Returned",
 	"订单已支付": "Order Paid",
 	"订单未支付": "Order Not Paid",
 	"已完结": "Finished",
 	"支付中": "Paying",
-	"支付成功": "Payment Successful",
+	"支付成功": "Payment Success",
 	"支付失败": "Payment Failed",
 	"支付取消": "Payment Cancelled",
-	"线下待审核": "Offline Pending Review",
-	"线下审核拒绝": "Offline Review Rejected",
+	"线下待审核": "Offline Pending",
+	"线下审核拒绝": "Offline Rejected",
 	"下单时间": "Order Time",
 	"有效期至": "Valid Until",
 	"有效时长": "Valid Duration",
@@ -619,15 +619,15 @@
 	"已退款": "Refunded",
 	"套餐金额": "Plan Amount",
 	"订单金额": "Order Amount",
-	"租车购车": "Rent or Purchase",
+	"租车购车": "Rent/Sell",
 	"请于": "By",
 	"到门店取车": "Pick up at the store",
 	"请上传车辆图片激活车辆": "Please upload vehicle picture to activate vehicle",
 	"待门店确认": "Pending Store Confirm",
 	"等待门店取车": "Waiting store pick up vehicle",
 	"已完成": "Completed",
-	"租期剩余": "Remaining Rental Period",
-	"逾期时长": "Overdue Duration",
+	"租期剩余": "Lease Left",
+	"逾期时长": "Overdue",
 	"租借周期": "Rental Period",
 	"逾期金额": "Overdue Amount",
 	"收起": "Collapse",
@@ -644,7 +644,7 @@
 	"租车金额": "Rental Amount",
 	"租车押金": "Rental Deposit",
 	"订单结束后随时退": "Return anytime after order ends",
-	"自行去门店取还": "Pick up and return at the store",
+	"自行去门店取还": "Pickup Store",
 	"未知地址": "Unknown Address",
 	"重量": "Weight",
 	"换电信息": "Battery Swap Information",
@@ -656,7 +656,7 @@
 	"次免费换电，": "free battery swap,",
 	"当前免费换电剩余": "Remaining free swaps",
 	"次，超出后需要单独支付换电费用": "times, extra swaps will incur a charge",
-	"取还时间": "Pickup and Return Time",
+	"取还时间": "Rental Time",
 	"逾期规则": "Late Policy",
 	"逾期后还可用车吗": "Can I still use the vehicle after overdue?",
 	"如果逾期将触发智能锁车逻辑，可能导致您无法正常用车，请及时续费或联系商家处理。": "If overdue, the smart lock will be triggered, and you may not be able to use the vehicle. Please renew or contact the merchant.",
@@ -746,8 +746,8 @@
 	"车辆押金": "Vehicle Deposit",
 	"需要支付": "Amount to Pay",
 	"元押金，诺无车损、违章及逾期，还车后可退": "Deposit, refundable upon return if no damage, violations, or overdue.",
-	"前往门店取还": "Go to Store to Pick Up/Return",
-	"门店距您": "Store is X km away",
+	"前往门店取还": "Pickup/Return Shop",
+	"门店距您": " ",
 	"确认下单": "Confirm Order",
 	"价格明细": "Price Breakdown",
 	"车辆租金": "Vehicle Rental Fee",
@@ -773,7 +773,7 @@
 	"您的手机未授权定位权限，请前往手机设置开启权限": "Your phone has not authorized location services, please enable it in settings.",
 	"车牌": "License Plate",
 	"读取图片数据": "Reading Image Data",
-	"款车型": "Model Type",
+	"款车型": "Models",
 	"城市代码": "City Code",
 	"我的位置": "My Location",
 	"取车时间": "Pickup Time",
@@ -797,8 +797,8 @@
 	"请输入搜索内容": "Please enter search content",
 	"清空": "Clear",
 	"搜索": "Search",
-	"门店": "Pickup Store",
-	"换电柜": "Swap Cabinet",
+	"门店": "Shop",
+	"换电柜": "Cabinet",
 	"筛选": "Filter",
 	"上下文": "Context",
 	"是否处于搜索状态": "Is search active?",

locale/zh.json

@@ -353,7 +353,7 @@
 	"为保证": "为保证",
 	"感应解锁": "感应解锁",
 	"闪电鸣笛": "闪电鸣笛",
-	"打开尾箱锁": "打开尾箱锁",
+	"打开尾箱": "打开尾箱",
 	"请先链接蓝牙": "请先链接蓝牙",
 	"的正常使用，请依次开以下权限，开启后可以显著提高解锁成功率，且不会明显增加手机电量消耗": "的正常使用，请依次开以下权限，开启后可以显著提高解锁成功率，且不会明显增加手机电量消耗",
 	"授权引导": "授权引导",

pages/order/order.vue

@@ -19,7 +19,7 @@
 		</view> -->
 		<view  class="order-type-view flex-row flex-between">
 			<view style="justify-content: space-around;width: 100%;" class="order-package-type-view flex-row">
-				<view style="width: 128rpx;" v-for="(type, index) in orderTypes" :key="index" @tap="checkOrderType" :data-type="type.value"
+				<view v-for="(type, index) in orderTypes" :key="index" @tap="checkOrderType" :data-type="type.value"
 					:class="['package-type-list', 'flex-row', {'package-type-list-i': selectOrderType === type.value}]"
 					>
 					<view class="package-type-text">{{ type.text }}</view>

pages/service/service.css

@@ -16,6 +16,7 @@
 }
 .store-type{
 	margin-right: 20rpx;
+	width: 200rpx;
 }
 .store-type,
 .cabinet-type{

pages/service/service.vue

@@ -58,7 +58,7 @@
 				</view>
 				<view class="config-view flex-row">
 					<view @click='openSelectType' class="flex-row selectFlex">
-						<text v-if="selectType === 'store'" class="text">{{leaseUnitsResult}}{{isBuy ? $t('购买') : ''}}</text>
+						<text v-if="selectType === 'store'" class="text">{{leaseUnitsResult}}{{isBuy ? '+' + $t('购买') : ''}}</text>
 						<text v-if="selectType === 'cabinet'" class="text">{{cabinetType ? cabinetType : $t('全部')}}</text>
 						<u-icon v-if="showLeaseType" name="arrow-down" color="#9FA7B7" size="26"></u-icon>
 						<u-icon v-else name="arrow-up" color="#9FA7B7" size="26"></u-icon>

pages/storeDetails/storeDetails.css

@@ -51,8 +51,9 @@
 	font-weight: 600;
 	font-size: 24rpx;
 	color: #0A59F7;
-	width: 88rpx;
 	margin-right: 12rpx;
+	margin-bottom: 10rpx;
+	padding: 0 14rpx;
 }
 .store-num-type{
 	border-radius: 8rpx;
@@ -149,9 +150,13 @@
 	color: #2A3A5A;
 	line-height: 32rpx;
 	font-style: normal;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	width: 240rpx;
 }
 .cab_address {
-	width: 280rpx;
+	width: 240rpx;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -167,6 +172,8 @@
 .icon_grid_1 {
 	width: 48rpx;
 	height: 48rpx;
+	display: block;
+	margin: auto;
 }
 
 .grid_nav {

pages/storeDetails/storeDetails.vue

@@ -19,11 +19,13 @@
 			<view class="store-info-view">
 				<view class="store-name">{{storeInfo.shop_name}}</view>
 				<view class="flex-row align-center" style="margin-bottom: 24rpx;">
-					<view v-for="(item,index) of storeInfo.service_type_list" :key="index" class="store-type">
-						{{item.title}}
-					</view>
-					<view class="store-num-type"> <text class="store-num">{{storeInfo.model_list.length || 0}}</text>
-						{{ $t('款车型') }}
+					<view style="width: 600rpx;display: flex;flex-wrap: wrap;">
+						<view v-for="(item,index) of storeInfo.service_type_list" :key="index" class="store-type">
+							{{item.title}}
+						</view>
+						<view class="store-num-type"> <text class="store-num">{{storeInfo.model_list.length || 0}}</text>
+							{{ $t('款车型') }}
+						</view>
 					</view>
 					<view class="store-phone" @tap="tapPhone"><img style="width: 84rpx;height: 64rpx;"
 							src="https://qiniu.bms16.com/Ft0YA1JYmq66hdoeEN-PgBHy5vLa" alt=""></view>