bug修改

component/payTypeModel/payTypeModel.vue

@@ -42,7 +42,7 @@
 				</view> -->
 			</view>
 			<view class="over-btn-view">
-				<view class="over-btn flex-row" @tap="toPayOrFreeExchange">立即支付</view>
+				<view class="over-btn flex-row" @tap="toPayOrFreeExchange">{{$t('立即支付')}}</view>
 			</view>
 		</view>
 	</view>

component/scanCabBtn/scanBtn.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container-view">
 		<view style="height: 160rpx;"></view>
-		<view @tap="sacnBtn" class="refund-btn"><text>扫码换电</text></view>
+		<view @tap="sacnBtn" class="refund-btn"><text>换电</text></view>
 		<view v-if="isModelCenter" class="model_center">
 			<image class="pack_model" src="https://zxappfile.bms16.com/zx_client/buy_pack_model.png" />
 			<view v-if="packType==0" class="pack_model_text">您还未购买换电套餐，需先完成购买后再扫码领取电池</view>
@@ -246,16 +246,17 @@
 				uni.showLoading({
 					title:' 加载中...'
 				})
-				uni.hideLoading()
-				let res = await uni.scanCode({
-					onlyFromCamera: true,
-					scanType: ['qrCode'],
-				});
+				this.loadNowCabinetDetail(this.dev_id)
+				// return
+				// let res = await uni.scanCode({
+				// 	onlyFromCamera: true,
+				// 	scanType: ['qrCode'],
+				// });
 				
-				var cabinet_dev_id = '';
-				if(res[0]) return
-				res = res[1]
-				this.loadGeneralQRData(res)
+				// var cabinet_dev_id = '';
+				// if(res[0]) return
+				// res = res[1]
+				// this.loadGeneralQRData(res)
 				
 				// if ('path' in res && res.path) {
 				// 	if (res.path.split('%26devid%3D').length > 1) {
@@ -427,6 +428,7 @@
 					pay_type:0,
 					battery_sn_list,
 				})
+				uni.hideLoading()
 				if(data.code == 200){
 					uni.navigateTo({
 						url:`/pages/openCabinet/openCabinet?order_sn=${data.data.order_sn}`

locale/en.json

@@ -847,5 +847,6 @@
 	"完成弹窗": "Completion Popup",
 	"祝您骑行愉快": "Enjoy Your Ride!",
 	"车辆已被租售！": "Vehicle Rented or Sold!",
-	"全部": "All"
+	"全部": "All",
+	"立即支付": "Pay Now"
 }

locale/zh.json

@@ -847,5 +847,6 @@
 	"完成弹窗": "完成弹窗",
 	"祝您骑行愉快": "祝您骑行愉快",
 	"车辆已被租售！": "车辆已被租售！",
-	"全部": "全部"
+	"全部": "全部",
+	"立即支付": "立即支付"
 }

pages/carDetail/carDetail.vue

@@ -131,7 +131,6 @@
 				this.locationFn()
 			}
 			if (options.shop_type) {
-				console.log(options.shop_type,99999999)
 				this.shop_type = options.shop_type
 				const d = {
 					hire_duration_unit:options.shop_type,

pages/loginRegister/login.vue

@@ -2,7 +2,7 @@
     <view class="zx-page-linear login-page">
 		<navBar type="login" left="0" bgColor="transparent"></navBar>
       <view class="title-wrap">
-        <view class="title">{{ $t('欢迎来到') }}FRANCO MORINI</view>
+        <view class="title">{{ $t('欢迎来到') }} <br> FRANCO MORINI</view>
         <view class="sub-title">{{ $t('邮箱密码登录') }}</view>
       </view>
       <view class="main">
@@ -17,6 +17,7 @@
             :isPassword="form.passwd"
         />
         <view 
+			v-if="Language == 'zh'"
           :class="['agreement-row', checkShakeObj.agreemen && 'shake']" 
           @tap="isCheckAgreement = !isCheckAgreement"
         >
@@ -37,7 +38,7 @@
           </view>
           <view class="split-line"/>
           <view class="register" @tap="routerLink('/pages/loginRegister/register')">
-            {{ $t('没有账号') + ' ' + $t('立即注册') }}
+            {{ $t('立即注册') }}
           </view>
         </view>
 <!--        <view class="other-type-login">
@@ -57,10 +58,14 @@
 	const http = require('@/common/http.js');
   const common = require('@/common/common.js');
 	const storage = require('@/common/storage.js');
+	import {
+		Language
+	} from '@/utils/util.js'
   export default {
     data() {
       return {
         QINIU_URL,
+		Language:Language,
         isCheckAgreement: false,
         checkShakeObj: {
           email: false,
@@ -101,7 +106,7 @@
         uni.showToast({ title: message, icon: 'none' })
       },
       loginHandle() {
-        if (!this.isCheckAgreement) {
+        if (!this.isCheckAgreement && this.Language == 'zh') {
           this._applyCheck('agreemen', this.$t('请勾选用户协议和隐私政策'))
           return
         }
@@ -140,7 +145,7 @@
             font-weight: 800;
             font-size: 56rpx;
             color: #060809;
-            line-height: 56rpx;
+            line-height: 76rpx;
             text-align: left;
             font-style: normal;
             margin-bottom: 24rpx;
@@ -196,7 +201,7 @@
         }
   
         .register-row {
-            margin: 32rpx 80rpx 0;
+            margin: 32rpx 70rpx 0;
             font-family: PingFangSC, PingFang SC;
             font-weight: bold;
             font-size: 28rpx;

pages/loginRegister/register.vue

@@ -17,6 +17,7 @@
             isPassword
         />
         <view 
+			v-if="Language == 'zh'"
           :class="['agreement-row', checkShakeObj.agreemen && 'shake']" 
           @tap="isCheckAgreement = !isCheckAgreement"
         >
@@ -46,6 +47,9 @@ import NoticeDialog from '@/component/comPopup/Notice.vue'
 import ZxInput from './components/ZxInput.vue'
 const config = require('@/common/config.js');
 const http = require('@/common/http.js');
+	import {
+		Language
+	} from '@/utils/util.js'
 export default {
     components: {
         NoticeDialog,
@@ -53,6 +57,7 @@ export default {
     },
     data() {
         return {
+			Language:Language,
             isCheckAgreement: false,
             isSendSucceed: false,
             form: {},
@@ -92,7 +97,7 @@ export default {
 		    return regex.test(password);
 		},
         submit() {
-            if (!this.isCheckAgreement) {
+            if (!this.isCheckAgreement && this.Language == 'zh') {
                 this._applyCheck('agreemen', this.$t('请勾选用户协议和隐私政策'))
                 return
             }

pages/my/set.vue

@@ -21,7 +21,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="zx-form-btn fix-bottom-btn logout-btn" @tap="handleQuit">{{ $t('退出登录') }}</view>
+		<view v-if='userInfo.user_name' class="zx-form-btn fix-bottom-btn logout-btn" @tap="handleQuit">{{ $t('退出登录') }}</view>
 	</view>
 </template>
 
@@ -62,7 +62,6 @@
 						title: this.$t('关于我们'),
 						url: '/pages/aboutMy/aboutMy',
 						textProp: 'version',
-						hideArrow: true
 					},
 					{
 						title: this.$t('隐私协议'),

utils/util.js

@@ -2,12 +2,8 @@ import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'
 dayjs.extend(duration);
 const systemInfo = uni.getSystemInfoSync();
-<<<<<<< HEAD
- const Language = (systemInfo.language == 'zh-CN' || systemInfo.language == 'zh_CN') ? 'zh' : 'en' // 'zh' | 'en'
-=======
-// const Language = systemInfo.language == 'zh_CN' ? 'zh' : 'en' // 'zh' | 'en'
-const Language = 'en' // 'zh' | 'en'
->>>>>>> xxq_test
+ // const Language = (systemInfo.language == 'zh-CN' || systemInfo.language == 'zh_CN') ? 'zh' : 'en' // 'zh' | 'en'
+ const Language = 'en'
 const formatTime = (date) => {
 	const year = date.getFullYear();
 	const month = date.getMonth() + 1;