合并

pages/markets/contractOrder.vue

@@ -2,7 +2,12 @@
 	<view class="entrustOrderList">
 		<navigation>{{ i18n.contractOrder }}</navigation>
 		<!-- 四个tab -->
+			<!-- #ifdef APP-PLUS -->
+			<view class="tab" style="margin-top: 210rpx;">
+				<!-- #endif -->
+				<!-- #ifdef H5 -->
 				<view class="tab">
+					<!-- #endif -->
 			
 			<view class="item" :class="{ select: type === 1 }" @click="onChangeType(1)">{{ i18n.Position }}
 			</view>

pages/markets/kLine.vue

@@ -74,11 +74,11 @@
 			<view class="btn">
 				<!-- open按钮 -->
 				<u-button class="button" color="#00E8A2" throttleTime="500" @click="btnClick('buy')">
-					{{ i18n.open }}
+					{{ i18n.LONG }}
 				</u-button>
 				<!-- close按钮 -->
 				<u-button class="button" color="#F4506A" throttleTime="500" @click="btnClick('sell')">
-					{{ i18n.close }}
+					{{ i18n.SHORT }}
 				</u-button>
 			</view>
 

pages/me/confirmInfo.vue

@@ -40,9 +40,9 @@
 							</u-form-item>
 						</view>
 
-						<view class="title" v-if="bankInfo.auditStatus!='agree'">{{ i18n.IDcard }}</view>
+						<view class="title" v-show="bankInfo.auditStatus!='agree'">{{ i18n.IDcard }}</view>
 
-						<u-upload  v-if="bankInfo.auditStatus!='agree'" :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple
+						<u-upload  v-show="bankInfo.auditStatus!='agree'" :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple
 							:maxCount="1">
 							
 								<image class="add" src="/static/home/id.png" mode="aspectFit" v-if="!bankInfo.certFrontImgPath"></image>

utils/language/zh_TW.js

@@ -336,7 +336,7 @@ export default {
 		EditBankInformation: '修改銀行信息',
 		AddBankInformation: '添加銀行信息',
 		FirstName: '真實姓名',
-		enterName: '請輸入你的真實姓名',
+		enterName: '請輸入您的真實姓名',
 		Account: '帳戶',
 		enterAccount: '請輸入您的賬戶',
 		enterIdNumber: '請輸入您的身份證號碼',