英文化

addons/unishop/uniapp/uni-shop/pages.json

@@ -262,13 +262,13 @@
 				"pagePath": "pages/index/index",
 				"iconPath": "static/tab-home.png",
 				"selectedIconPath": "static/tab-home-current.png",
-				"text": "首页"
+				"text": "Home"
 			},
 			{
 				"pagePath": "pages/category/category",
 				"iconPath": "static/tab-cate.png",
 				"selectedIconPath": "static/tab-cate-current.png",
-				"text": "分类"
+				"text": "Classification"
 			},
 			// {
 			// 	"pagePath": "pages/cart/cart",
@@ -280,7 +280,7 @@
 				"pagePath": "pages/user/user",
 				"iconPath": "static/tab-my.png",
 				"selectedIconPath": "static/tab-my-current.png",
-				"text": "我的"
+				"text": "My"
 			}
 		]
 	},

addons/unishop/uniapp/uni-shop/pages/address/address.vue

@@ -16,7 +16,7 @@
 			<text class="yticon icon-lajitong" @click.stop="deleteAddress(item.id,index)"></text>
 		</view>
 
-		<button class="add-btn" @click="addAddress('add')">新增地址</button>
+		<button class="add-btn" @click="addAddress('add')">Add New Address</button>
 	</view>
 </template>
 

addons/unishop/uniapp/uni-shop/pages/address/addressManage.vue

@@ -23,7 +23,7 @@
 			<text class="tit">设为默认</text>
 			<switch :checked="addressData.is_default" color="#fa436a" @change="switchChange" />
 		</view>
-		<button class="add-btn" @click="confirm">提交</button>
+		<button class="add-btn" @click="confirm">Submit</button>
 		
 		<mpvue-city-picker @onChange="onChange" @onCancel="onCancel"
 		 @onConfirm="onConfirm" ref="mpvueCityPicker" ></mpvue-city-picker>

addons/unishop/uniapp/uni-shop/pages/cart/cart.vue

@@ -47,7 +47,7 @@
 				<view class="total-box">
 					<text class="price">¥{{total}}</text>
 				</view>
-				<button type="primary" class="no-border confirm-btn" @click="createOrder">去结算</button>
+				<button type="primary" class="no-border confirm-btn" @click="createOrder">To Settle</button>
 			</view>
 		</view>
 	</view>

addons/unishop/uniapp/uni-shop/pages/money/pay.vue

@@ -38,7 +38,7 @@
 			</view> -->
 		</view>
 
-		<text class="mix-btn" @click="confirm">确认支付</text>
+		<text class="mix-btn" @click="confirm">Confirm Pay</text>
 	</view>
 </template>
 

addons/unishop/uniapp/uni-shop/pages/order/createOrder.vue

@@ -111,7 +111,7 @@
 				<text class="price-tip">￥</text>
 				<text class="price">{{total}}</text>
 			</view>
-			<text class="submit" @click="submit">提交订单</text>
+			<text class="submit" @click="submit">Submit Order</text>
 		</view>
 
 		<!-- 优惠券面板 -->

addons/unishop/uniapp/uni-shop/pages/order/evaluate.vue

@@ -19,7 +19,7 @@
 			<radio class="radio" color="#e64340" :checked='radio' @click="clickRadio" />公开</radio>
 			<view class="dec">公开头像昵称,大家可以看到我</view>
 		</view>
-		<button class="button" @click="submit" type="warn">提交</button>
+		<button class="button" @click="submit" type="warn">Submit</button>
 	</view>
 </template>
 

addons/unishop/uniapp/uni-shop/pages/order/order.vue

@@ -43,9 +43,9 @@
 							<!-- <text v-if="item.delivery_price > 0">(含运费￥{{item.delivery_price}})</text> -->
 						</view>
 						<view class="action-box b-t" v-if="item.state != 9">
-							<button class="action-btn" v-if="item.state == 1" @click.stop="button('cancel',item)">取消订单</button>
-							<button class="action-btn recom" v-if="item.have_paid == 0" @click.stop="button('pay',item)">立即支付</button>
-							<button class="action-btn recom" v-if="item.state == 2" @click.stop="button('refunded',item)">退款</button>
+							<button class="action-btn" v-if="item.state == 1" @click.stop="button('cancel',item)">Cancel Order</button>
+							<button class="action-btn recom" v-if="item.have_paid == 0" @click.stop="button('pay',item)">Pay Immediately</button>
+							<button class="action-btn recom" v-if="item.state == 2" @click.stop="button('refunded',item)">Refund</button>
 							<!-- <button class="action-btn" v-if="item.have_paid != 0 && item.have_delivered == 0">提醒发货</button> -->
 							<!-- <button class="action-btn" v-if="item.have_paid != 0" @click.stop="button('delivery',item)">查看物流</button> -->
 							<!-- <button class="action-btn" v-if="item.have_paid != 0 && item.have_received == 0" @click.stop="button('recerved',item)">确认收货</button> -->
@@ -76,42 +76,42 @@
 				tabCurrentIndex: 0,
 				navList: [{
 						state: 0,
-						text: '全部',
+						text: 'all',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
 					},
 					{
 						state: 1,
-						text: '待付款',
+						text: 'Unpayment',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
 					},
 					{
 						state: 2,
-						text: '待发货',
+						text: 'Unshipped',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
 					},
 					{
 						state: 3,
-						text: '待收货',
+						text: 'shipped',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
 					},
 					{
 						state: 4,
-						text: '已完成',
+						text: 'Completed',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
 					},
 					{
 						state: 5,
-						text: '已取消',
+						text: 'Cancelled',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
@@ -344,7 +344,7 @@
 						stateTip = '待收货';
 						break;
 					case 4:
-						stateTip = '已完成';
+						stateTip = '待评价';
 						break;
 					case 5:
 						stateTip = '已取消';
@@ -405,42 +405,42 @@
 				this.navList = [];
 				this.navList = [{
 						state: 0,
-						text: '全部',
+						text: 'all',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
 					},
 					{
 						state: 1,
-						text: '待付款',
+						text: 'Unpayment',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
 					},
 					{
 						state: 2,
-						text: '待发货',
+						text: 'Unshipped',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
 					},
 					{
 						state: 3,
-						text: '待收货',
+						text: 'shipped',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
 					},
 					{
 						state: 4,
-						text: '已完成',
+						text: 'Completed',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
 					},
 					{
 						state: 5,
-						text: '已取消',
+						text: 'Cancelled',
 						loadingType: 'more',
 						orderList: [],
 						page: 1
@@ -482,7 +482,9 @@
 			justify-content: center;
 			align-items: center;
 			height: 100%;
-			font-size: 15px;
+			font-size: 12px;
+			padding: 0 2px;
+			font-weight: 600;
 			color: $font-color-dark;
 			position: relative;
 

addons/unishop/uniapp/uni-shop/pages/order/orderDetail.vue

@@ -55,9 +55,9 @@
 			<!--兼容苹果系统下margin-bottom不生效-->
 		</view>
 		<view class="bottom" v-if="order.state != 9">
-			<button class="action-btn" v-if="order.state == 1" @click.stop="button('cancel')">取消订单</button>
-			<button class="action-btn recom" v-if="order.have_paid == 0" @click.stop="button('pay')">立即支付</button>
-			<button class="action-btn recom" v-if="order.state == 2" @click.stop="button('refunded',item)">退款</button>
+			<button class="action-btn" v-if="order.state == 1" @click.stop="button('cancel')">Cancel Order</button>
+			<button class="action-btn recom" v-if="order.have_paid == 0" @click.stop="button('pay')">Pay Immediately</button>
+			<button class="action-btn recom" v-if="order.state == 2" @click.stop="button('refunded',item)">Refund</button>
 			<!-- <button class="action-btn" v-if="order.have_paid != 0" @click.stop="button('delivery')">查看物流</button> -->
 			<!-- <button class="action-btn" v-if="order.have_paid != 0 && order.have_received == 0" @click.stop="button('recerved')">确认收货</button> -->
 			<!-- <button class="action-btn" v-if="order.have_paid != 0" @click.stop="button('refund')">申请售后</button> -->

addons/unishop/uniapp/uni-shop/pages/order/refund.vue

@@ -21,7 +21,7 @@
 			<view class="cell-tit clamp">快递编号
 				<input style="max-width: 350rpx;" class="input" type="text" v-model="expressNumber" placeholder="请填写快递编号" placeholder-class="placeholder" />
 			</view>
-			<button type="warn" @click="confirmDelivery" v-if="order.refund_status == 2">确认发货</button>
+			<button type="warn" @click="confirmDelivery" v-if="order.refund_status == 2">Confirm Delivery</button>
 		</view>
 		
 		<view class="yt-list-cell">
@@ -66,7 +66,7 @@
 			</view>
 		</view>
 		
-		<button v-if="order.status == 1" class="button" @click="submit" type="warn">提交</button>
+		<button v-if="order.status == 1" class="button" @click="submit" type="warn">Submit</button>
 	</view>
 </template>
 

addons/unishop/uniapp/uni-shop/pages/product/product.vue

@@ -150,7 +150,7 @@
 			</view>
 
 			<view class="action-btn-group">
-				<button :class="{'only': flash}" type="primary" class=" action-btn no-border buy-now-btn" @click="buy">立即购买</button>
+				<button :class="{'only': flash}" type="primary" class=" action-btn no-border buy-now-btn" @click="buy">Buy Now</button>
 				<!-- <button v-if="!flash" type="primary" class=" action-btn no-border add-cart-btn" @click="addCart">加入购物车</button> -->
 			</view>
 		</view>
@@ -208,7 +208,7 @@
 						</text>
 					</view>
 				</view>
-				<button class="btn" @click="toggleSpec">完成</button>
+				<button class="btn" @click="toggleSpec">Finish</button>
 			</view>
 		</view>
 

addons/unishop/uniapp/uni-shop/pages/public/login.vue

@@ -21,7 +21,7 @@
 					 password data-key="password" @input="inputChange" @confirm="toLogin" />
 				</view>
 			</view>
-			<button class="confirm-btn" @click="toLogin" :disabled="logining">登录</button>
+			<button class="confirm-btn" @click="toLogin" :disabled="logining">Login</button>
 			<!-- #ifdef MP-WEIXIN -->
 			<!-- <button class="confirm-btn" open-type="getPhoneNumber" @getphonenumber="loginForWechatMini">授权微信绑定电话号码一键登录</button> -->
 			<!-- #endif -->

addons/unishop/uniapp/uni-shop/pages/set/set.vue

@@ -1,11 +1,11 @@
 <template>
 	<view class="container">
 		<view class="list-cell b-b m-t" @click="navTo('/pages/userinfo/userinfo')" hover-class="cell-hover" :hover-stay-time="50">
-			<text class="cell-tit">修改密码</text>
+			<text class="cell-tit">Change Password</text>
 			<text class="cell-more yticon icon-you"></text>
 		</view>
 		<view class="list-cell log-out-btn" @click="toLogout">
-			<text class="cell-tit">退出登录</text>
+			<text class="cell-tit">Sign Out</text>
 		</view>
 	</view>
 </template>

addons/unishop/uniapp/uni-shop/pages/user/user.vue

@@ -8,7 +8,7 @@
 					<image class="portrait" :src="userInfo.avatar ? userInfo.avatar : '/static/missing-face.png'"></image>
 				</view>
 				<view class="info-box">
-					<text class="username">{{userInfo.username || '游客'}}</text>
+					<text class="username">{{userInfo.username || 'Tourist'}}</text>
 				</view>
 			</view>
 			<view class="vip-card-box">
@@ -18,7 +18,7 @@
 				</view> -->
 				<view class="tit">
 					<text class="yticon icon-iLinkapp-"></text>
-					会员
+					VIP
 				</view>
 				<text class="e-m">uniShop</text>
 				<!-- <text class="e-b">开通会员开发无bug 一测就上线</text> -->
@@ -39,8 +39,8 @@
 
 			<!-- 订单 -->
 			<view class="order-header">
-				<view class="title">我的订单</view>
-				<view class="item" @click="$api.navTo('/pages/order/order?state=0')" >查看全部订单
+				<view class="title">My Order</view>
+				<view class="item" @click="$api.navTo('/pages/order/order?state=0')" >Check All Order
 				<text class="yticon right icon-you"></text>
 			</view>
 			</view>
@@ -48,27 +48,27 @@
 				<view class="order-item" @click="$api.navTo('/pages/order/order?state=1')"  hover-class="common-hover" :hover-stay-time="50">
 					<text class="yticon icon-daifukuan"></text>
 					<text class="num" v-if="orderNum.unpaid > 0">{{orderNum.unpaid}}</text>
-					<text>待付款</text>
+					<text>Unpayment</text>
 				</view>
 				<view class="order-item" @click="$api.navTo('/pages/order/order?state=2')" hover-class="common-hover"  :hover-stay-time="50">
 					<text class="yticon icon-daifahuo"></text>
 					<text class="num" v-if="orderNum.undelivered > 0">{{orderNum.undelivered}}</text>
-					<text>待发货</text>
+					<text>Unshipped</text>
 				</view>
 				<view class="order-item" @click="$api.navTo('/pages/order/order?state=3')" hover-class="common-hover"  :hover-stay-time="50">
 					<text class="yticon icon-daishouhuo"></text>
 					<text class="num" v-if="orderNum.unreceived > 0">{{orderNum.unreceived}}</text>
-					<text>待收货</text>
+					<text>shipped</text>
 				</view>
 				<view class="order-item" @click="$api.navTo('/pages/order/order?state=4')" hover-class="common-hover"  :hover-stay-time="50">
 					<text class="yticon icon-pingjia"></text>
 					<text class="num" v-if="orderNum.uncomment > 0">{{orderNum.uncomment}}</text>
-					<text>已完成</text>
+					<text>Completed</text>
 				</view>
 				<view class="order-item" @click="$api.navTo('/pages/order/order?state=5')" hover-class="common-hover"  :hover-stay-time="50">
 					<text class="yticon icon-shouhou"></text>
 					<text class="num" v-if="orderNum.refund > 0">{{orderNum.refund}}</text>
-					<text>已取消</text>
+					<text>Cancelled</text>
 				</view>
 			</view>
 			<!-- 浏览历史 -->

addons/unishop/uniapp/uni-shop/pages/userinfo/userinfo.vue

@@ -26,19 +26,19 @@
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN -->
 		<view class="yt-list-cell">
-			<view class="cell-tit clamp">用户名
+			<view class="cell-tit clamp">user
 				<input class="input" type="text" v-model="username" />
 			</view>
 		</view>
 		<view class="yt-list-cell">
-			<view class="cell-tit clamp">密码
+			<view class="cell-tit clamp">password
 				<input class="input" type="password" v-model="password" />
 			</view>
 		</view>
 		<!-- #endif -->
 
 		<view class="yt-list-cell">
-			<button type="primary" @click="submit">提交保存</button>
+			<button type="primary" @click="submit">Submit And Save</button>
 		</view>
 
 	</view>
@@ -199,7 +199,7 @@
 				display: inline-block;
 				vertical-align: middle;
 				margin-left: 20rpx;
-				width: 550rpx;
+				width: 540rpx;
 				float: right;
 				line-height: 70rpx !important;
 				height: 70rpx !important;