Merge branch 'gyq_test' of http://git.bms16.com/liuwei/zx_flk_app into gyq_test

component/allPrice/allPrice.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container flex-row">
-		<view>￥</view>
+		<view>{{$(￥)}}</view>
 		<view class="integer-part">{{integerPart}}</view>
 		<view style="font-size: 32rpx;">{{decimalPart}}</view>
 	</view>

locale/en.json

@@ -857,5 +857,6 @@
 	"时长": "Rental Duration",
 	"系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。": "The system will determine whether you have arrived at the return location based on your positioning. If you have already arrived at the store, please click the 'I have arrived at the store' button. After the store confirms the return, the car return process will be successfully completed",
 	"购买时间":"Buy Time",
+	"￥": "$",
 	"当前电池存在未知型号，请联系门店处理！":"The current battery is of an unknown model. Please contact the store for assistance!"
 }

locale/zh.json

@@ -857,5 +857,6 @@
 	"时长": "时长",
 	"系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。": "系统会根据您的定位判断您是否已到还车位置，如您已经到达门店，请点击「我已到店」按钮，待门店确认还车后，即可还车成功。",
 	"购买时间":"购买时间",
+	"￥": "￥",
 	"当前电池存在未知型号，请联系门店处理！":"当前电池存在未知型号，请联系门店处理！"
 }

pages/battery/battery.vue

@@ -128,21 +128,21 @@
 								:class="isSelectStatus == 0?'ptyped-item':'ptype-item'">
 								<view class="ptype-title">{{ $t('时租') }}</view>
 								<view :class="isSelectStatus == 0?'ptyped-text':'ptype-text'">
-									￥<text>8</text>
+									{{$(￥)}}<text>8</text>
 								</view>
 							</view>
 							<view @tap="bindChangeStatus" data-status="1"
 								:class="isSelectStatus == 1?'ptyped-item':'ptype-item'">
 								<view class="ptype-title">{{ $t('日租') }}</view>
 								<view :class="isSelectStatus == 1?'ptyped-text':'ptype-text'">
-									￥<text>48</text>
+									{{$(￥)}}<text>48</text>
 								</view>
 							</view>
 							<view @tap="bindChangeStatus" data-status="2"
 								:class="isSelectStatus == 2?'ptyped-item':'ptype-item'">
 								<view class="ptype-title">{{ $t('周租') }}</view>
 								<view :class="isSelectStatus == 2?'ptyped-text':'ptype-text'">
-									￥<text>208</text>
+									{{$(￥)}}<text>208</text>
 								</view>
 							</view>
 						</view>
@@ -215,7 +215,7 @@
 						</view>
 						<view class="payment-bottom flex-row flex-between">
 							<view class="bottom-left flex-row">
-								<view>￥92.23</view>
+								<view>{{$(￥)}}92.23</view>
 								<view>{{ $t('明细') }}<img src="https://qiniu.bms16.com/FmEDQp82D5k9lkHMEcCoCeLO8ZQL" /></view>
 							</view>
 							<view @tap="navToPage" data-url="/pages/orderStatus/orderStatus">{{ $t('支付') }}·{{ $t('授权免押') }}</view>

pages/purchaseOrder/purchaseOrder.vue

@@ -90,13 +90,13 @@
 						<view>{{ $t('车辆租金') }}</view>
 						<view>
 							<!-- ￥{{(leaseTime * price_list[0].hire_price) /100}} -->
-							￥{{price+'x'+modelInfo.count}}
+							{{$(￥)}}{{price+'x'+modelInfo.count}}
 							<text>{{leaseUnits}}</text>
 						</view>
 					</view>
 					<view class="flex-row flex-between" style="margin-bottom: 44rpx;">
 						<view>{{ $t('车辆押金') }}</view>
-						<view>￥{{modelInfo.deposit /100}}</view>
+						<view>{{$(￥)}}{{modelInfo.deposit /100}}</view>
 					</view>
 
 					<view class="detail-money flex-row" style="padding-bottom: 44rpx;">

pages/service/components/carRentalList/carRentalList.vue

@@ -36,7 +36,7 @@
 								<view class="flex-row flex-between">
 									<view class="bottom-text">
 										{{ leaseUnitsResult }} <text
-											style="margin-left: 10rpx;">￥</text><text>{{(item.model_list[0].hire_price / 100).toFixed(2)}}</text>
+											style="margin-left: 10rpx;">{{$(￥)}}</text><text>{{(item.model_list[0].hire_price / 100).toFixed(2)}}</text>
 									</view>
 								</view>
 							</view>
@@ -63,11 +63,11 @@
 								<view class="flex-row flex-between">
 									<view class="bottom-text">
 										{{ leaseUnitsResult }}<text
-											style="margin-left: 10rpx;">￥</text><text>{{(items.hire_price /100).toFixed(2)}}</text>
+											style="margin-left: 10rpx;">{{$(￥)}}</text><text>{{(items.hire_price /100).toFixed(2)}}</text>
 									</view>
 									<view v-if="items.sell_price && isBuy" class="bottom-text">
 										{{ $t('购买') }}<text
-											style="margin-left: 10rpx;">￥</text><text>{{(items.sell_price /100).toFixed(2)}}</text>
+											style="margin-left: 10rpx;">{{$(￥)}}</text><text>{{(items.sell_price /100).toFixed(2)}}</text>
 									</view>
 								</view>
 							</view>