英文化

addons/unishop/uniapp/uni-shop/components/upload-images.vue

@@ -127,7 +127,7 @@ export default {
 			uni.showModal({
 				cancelText:'Cancel',
 				confirmText:'OK',
-				content: '确定要放弃这张图片么？',
+				content: 'Are you sure you want to give up this picture？',
 				success: (confirmRes)=> {
 					if (confirmRes.confirm) {
 						this.imageList.splice(index, 1);

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

@@ -264,12 +264,12 @@
 				"selectedIconPath": "static/tab-home-current.png",
 				"text": "Home"
 			},
-			{
-				"pagePath": "pages/category/category",
-				"iconPath": "static/tab-cate.png",
-				"selectedIconPath": "static/tab-cate-current.png",
-				"text": "Catagory"
-			},
+			// {
+			// 	"pagePath": "pages/category/category",
+			// 	"iconPath": "static/tab-cate.png",
+			// 	"selectedIconPath": "static/tab-cate-current.png",
+			// 	"text": "Catagory"
+			// },
 			// {
 			// 	"pagePath": "pages/cart/cart",
 			// 	"iconPath": "static/tab-cart.png",

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

@@ -68,7 +68,7 @@
 			},
 			async deleteAddress(id, index) {
 				let [error, res] = await uni.showModal({
-					title: '确定删除地址？',
+					title: 'Sure to delete address？',
 					cancelText:'Cancel',
 					confirmText:'OK',
 					content: this.addressList[index].address

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

@@ -203,7 +203,7 @@
 				uni.showModal({
 					cancelText:'Cancel',
 					confirmText:'OK',
-					content: '确认删除 ' + list[index].title + '？' ,
+					content: 'Confirm delete ' + list[index].title + '？' ,
 					success: async (e) => {
 						if (e.confirm) {
 							let result = await this.$api.request('/cart/delete?', 'POST', {id:id});
@@ -219,7 +219,7 @@
 			//清空
 			async clearCart() {
 				let [error, res] = await uni.showModal({
-					title: '确认清空？'
+					title: 'Confirm empty？'
 				});
 				if (res.confirm) {
 					let id = [];

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

@@ -112,10 +112,10 @@
 				
 				setTimeout(function() {
 					uni.showModal({
-						title: '提示',
-						content: '是否已支付?',
-						cancelText: '否',
-						confirmText: '是',
+						title: 'Tip',
+						content: 'Whether paid?',
+						cancelText: 'No',
+						confirmText: 'Yes',
 						success: function(res) {
 							if (res.confirm) {
 								uni.redirectTo({
@@ -182,10 +182,10 @@
 
 						setTimeout(function() {
 							uni.showModal({
-								title: '提示',
-								content: '是否已支付?',
+								title: 'Tip',
+								content: 'Whether paid?',
 								cancelText:'NO',
-								confirmText:'OK',
+								confirmText:'Yes',
 								success: function(res) {
 									if (res.confirm) {
 										uni.redirectTo({

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

@@ -77,7 +77,7 @@
 		<!-- 金额明细 -->
 		<view class="yt-list">
 			<view class="yt-list-cell b-b">
-				<view class="cell-tit clamp">总共合计</view>
+				<view class="cell-tit clamp">total</view>
 				<view class="cell-tip">￥{{price}}</view>
 			</view>
 			<view class="yt-list-cell b-b" v-if="couponList && couponList.length">
@@ -99,15 +99,15 @@
 				<view class="cell-tip">￥{{deliveryPrice}}</view>
 			</view> -->
 			<view class="yt-list-cell desc-cell">
-				<view class="cell-tit clamp">备注</view>
-				<input class="desc" type="text" v-model="remark" placeholder="请填写备注信息" placeholder-class="placeholder" />
+				<view class="cell-tit clamp">Remarks</view>
+				<input class="desc" type="text" v-model="remark" placeholder="Please fill in the remarks" placeholder-class="placeholder" />
 			</view>
 		</view>
 
 		<!-- 底部 -->
 		<view class="footer">
 			<view class="price-content">
-				<text>实付款</text>
+				<text>Real payment</text>
 				<text class="price-tip">￥</text>
 				<text class="price">{{total}}</text>
 			</view>
@@ -637,7 +637,7 @@
 
 		&.desc-cell {
 			.cell-tit {
-				max-width: 90upx;
+				max-width: 120upx;
 			}
 		}
 

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

@@ -203,7 +203,7 @@
 				let [error, res] = await uni.showModal({
 					cancelText:'Cancel',
 					confirmText:'OK',
-					title: '确认删除订单'
+					title: 'Confirm delete order'
 				});
 				if (res.confirm) { 
 					let order_id = this.navList[this.tabCurrentIndex].orderList[index].order_id;
@@ -220,8 +220,8 @@
 				let [error, res] = await uni.showModal({
 					cancelText:'Cancel',
 					confirmText:'OK',
-					title: '确认取消订单',
-					content: '取消之后不可恢复',
+					title: 'Confirm cancel order',
+					content: 'Unrecoverable after cancellation',
 				});
 				if (res.confirm) {
 					let result = await that.$api.request('/order/cancel?order_id=' + item.order_id);
@@ -257,8 +257,8 @@
 				let [error, res] = await uni.showModal({
 					cancelText:'Cancel',
 					confirmText:'OK',
-					title: '确认退款',
-					content: '退款之后不可恢复',
+					title: 'Confirm refund',
+					content: 'Unrecoverable after refund',
 				});
 				if (res.confirm) {
 					let result = await that.$api.request('/order/doRefund', 'POST', {
@@ -297,7 +297,7 @@
 				let [error, res] = await uni.showModal({
 					cancelText:'Cancel',
 					confirmText:'OK',
-					title: '确认收货'
+					title: 'Confirm receipt'
 				});
 				if (res.confirm == true) {
 					let res = await that.$api.request('/order/received', 'GET', {

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

@@ -133,7 +133,7 @@
 		<view class="page-bottom">
 			<navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
 				<text class="yticon icon-fangzi"></text>
-				<text>首页</text>
+				<text>Home</text>
 			</navigator>
 			<!-- <navigator url="/pages/cart/cart" open-type="switchTab" class="p-b-btn">
 				<text class="yticon icon-gouwuche"></text>

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

@@ -33,7 +33,7 @@
 				uni.showModal({
 					cancelText:'Cancel',
 					confirmText:'OK',
-				    content: '确定要退出登录么',
+				    content: 'Are you sure you want to log out',
 				    success: (e)=>{
 				    	if(e.confirm){
 				    		this.logout();

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

@@ -60,12 +60,12 @@
 					<text class="num" v-if="orderNum.unreceived > 0">{{orderNum.unreceived}}</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">
+				<view class="order-item" @click="$api.navTo('/pages/order/order?state=3')" 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>Completed</text>
 				</view>
-				<view class="order-item" @click="$api.navTo('/pages/order/order?state=5')" hover-class="common-hover"  :hover-stay-time="50">
+				<view class="order-item" @click="$api.navTo('/pages/order/order?state=4')" 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>Cancelled</text>

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/index.html

@@ -1,3 +1,3 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>宜家自购商城</title><script>document.addEventListener('DOMContentLoaded', function() {
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
-			})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.5ee3084d.js></script><script src=/h5/static/js/index.d65d8a38.js></script></body></html>
+			})</script><link rel=stylesheet href=/h5/static/index.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script>/*BAIDU_STAT*/</script><script src=/h5/static/js/chunk-vendors.5ee3084d.js></script><script src=/h5/static/js/index.f8f31428.js></script></body></html>

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-set-set.c39e240e.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-set-set"],{"15b8":function(t,e,a){var n=a("24fb");e=n(!1),e.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 背景颜色*/uni-page-body[data-v-3e7a92cb]{background:#f8f8f8}.list-cell[data-v-3e7a92cb]{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:baseline;-webkit-align-items:baseline;align-items:baseline;padding:%?20?% %?30?%;line-height:%?60?%;position:relative;background:#fff;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.list-cell.log-out-btn[data-v-3e7a92cb]{margin-top:%?40?%}.list-cell.log-out-btn .cell-tit[data-v-3e7a92cb]{color:#fa436a;text-align:center;margin-right:0}.list-cell.cell-hover[data-v-3e7a92cb]{background:#fafafa}.list-cell.b-b[data-v-3e7a92cb]:after{left:%?30?%}.list-cell.m-t[data-v-3e7a92cb]{margin-top:%?16?%}.list-cell .cell-more[data-v-3e7a92cb]{-webkit-align-self:baseline;align-self:baseline;font-size:%?32?%;color:#909399;margin-left:%?10?%}.list-cell .cell-tit[data-v-3e7a92cb]{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:%?30?%;color:#303133;margin-right:%?10?%}.list-cell .cell-tip[data-v-3e7a92cb]{font-size:%?28?%;color:#909399}.list-cell uni-switch[data-v-3e7a92cb]{-webkit-transform:translateX(%?16?%) scale(.84);transform:translateX(%?16?%) scale(.84)}body.?%PAGE?%[data-v-3e7a92cb]{background:#f8f8f8}',""]),t.exports=e},"587f":function(t,e,a){var n=a("15b8");"string"===typeof n&&(n=[[t.i,n,""]]),n.locals&&(t.exports=n.locals);var i=a("4f06").default;i("22f29ac7",n,!0,{sourceMap:!1,shadowMode:!1})},"5e69":function(t,e,a){"use strict";var n;a.d(e,"b",(function(){return i})),a.d(e,"c",(function(){return l})),a.d(e,"a",(function(){return n}));var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("v-uni-view",{staticClass:"container"},[a("v-uni-view",{staticClass:"list-cell b-b m-t",attrs:{"hover-class":"cell-hover","hover-stay-time":50},on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.navTo("/pages/userinfo/userinfo")}}},[a("v-uni-text",{staticClass:"cell-tit"},[t._v("Change Password")]),a("v-uni-text",{staticClass:"cell-more yticon icon-you"})],1),a("v-uni-view",{staticClass:"list-cell log-out-btn",on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.toLogout.apply(void 0,arguments)}}},[a("v-uni-text",{staticClass:"cell-tit"},[t._v("Sign Out")])],1)],1)},l=[]},"804a":function(t,e,a){"use strict";a.r(e);var n=a("9980"),i=a.n(n);for(var l in n)"default"!==l&&function(t){a.d(e,t,(function(){return n[t]}))}(l);e["default"]=i.a},9980:function(t,e,a){"use strict";var n=a("4ea4");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i=n(a("5530")),l=a("2f62"),c={data:function(){return{}},methods:(0,i.default)((0,i.default)({},(0,l.mapMutations)(["logout"])),{},{navTo:function(t){uni.navigateTo({url:t})},toLogout:function(){var t=this;uni.showModal({cancelText:"Cancel",confirmText:"OK",content:"Are you sure you want to log out",success:function(e){e.confirm&&(t.logout(),setTimeout((function(){uni.navigateBack()}),200))}})},switchChange:function(t){var e=t.detail.value?"打开":"关闭";this.$api.msg("".concat(e,"消息推送"))}})};e.default=c},a88a:function(t,e,a){"use strict";a.r(e);var n=a("5e69"),i=a("804a");for(var l in i)"default"!==l&&function(t){a.d(e,t,(function(){return i[t]}))}(l);a("d475");var c,o=a("f0c5"),s=Object(o["a"])(i["default"],n["b"],n["c"],!1,null,"3e7a92cb",null,!1,n["a"],c);e["default"]=s.exports},d475:function(t,e,a){"use strict";var n=a("587f"),i=a.n(n);i.a}}]);

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-set-set.f26c592e.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-set-set"],{"118a":function(t,a,e){"use strict";var n=e("128a"),i=e.n(n);i.a},"128a":function(t,a,e){var n=e("ccb0");"string"===typeof n&&(n=[[t.i,n,""]]),n.locals&&(t.exports=n.locals);var i=e("4f06").default;i("8c71d8e4",n,!0,{sourceMap:!1,shadowMode:!1})},"804a":function(t,a,e){"use strict";e.r(a);var n=e("9980"),i=e.n(n);for(var l in n)"default"!==l&&function(t){e.d(a,t,(function(){return n[t]}))}(l);a["default"]=i.a},9980:function(t,a,e){"use strict";var n=e("4ea4");Object.defineProperty(a,"__esModule",{value:!0}),a.default=void 0;var i=n(e("5530")),l=e("2f62"),o={data:function(){return{}},methods:(0,i.default)((0,i.default)({},(0,l.mapMutations)(["logout"])),{},{navTo:function(t){uni.navigateTo({url:t})},toLogout:function(){var t=this;uni.showModal({cancelText:"Cancel",confirmText:"OK",content:"确定要退出登录么",success:function(a){a.confirm&&(t.logout(),setTimeout((function(){uni.navigateBack()}),200))}})},switchChange:function(t){var a=t.detail.value?"打开":"关闭";this.$api.msg("".concat(a,"消息推送"))}})};a.default=o},a88a:function(t,a,e){"use strict";e.r(a);var n=e("ddc6"),i=e("804a");for(var l in i)"default"!==l&&function(t){e.d(a,t,(function(){return i[t]}))}(l);e("118a");var o,c=e("f0c5"),s=Object(c["a"])(i["default"],n["b"],n["c"],!1,null,"5354276a",null,!1,n["a"],o);a["default"]=s.exports},ccb0:function(t,a,e){var n=e("24fb");a=n(!1),a.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 背景颜色*/uni-page-body[data-v-5354276a]{background:#f8f8f8}.list-cell[data-v-5354276a]{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:baseline;-webkit-align-items:baseline;align-items:baseline;padding:%?20?% %?30?%;line-height:%?60?%;position:relative;background:#fff;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center}.list-cell.log-out-btn[data-v-5354276a]{margin-top:%?40?%}.list-cell.log-out-btn .cell-tit[data-v-5354276a]{color:#fa436a;text-align:center;margin-right:0}.list-cell.cell-hover[data-v-5354276a]{background:#fafafa}.list-cell.b-b[data-v-5354276a]:after{left:%?30?%}.list-cell.m-t[data-v-5354276a]{margin-top:%?16?%}.list-cell .cell-more[data-v-5354276a]{-webkit-align-self:baseline;align-self:baseline;font-size:%?32?%;color:#909399;margin-left:%?10?%}.list-cell .cell-tit[data-v-5354276a]{-webkit-box-flex:1;-webkit-flex:1;flex:1;font-size:%?30?%;color:#303133;margin-right:%?10?%}.list-cell .cell-tip[data-v-5354276a]{font-size:%?28?%;color:#909399}.list-cell uni-switch[data-v-5354276a]{-webkit-transform:translateX(%?16?%) scale(.84);transform:translateX(%?16?%) scale(.84)}body.?%PAGE?%[data-v-5354276a]{background:#f8f8f8}',""]),t.exports=a},ddc6:function(t,a,e){"use strict";var n;e.d(a,"b",(function(){return i})),e.d(a,"c",(function(){return l})),e.d(a,"a",(function(){return n}));var i=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("v-uni-view",{staticClass:"container"},[e("v-uni-view",{staticClass:"list-cell b-b m-t",attrs:{"hover-class":"cell-hover","hover-stay-time":50},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.navTo("/pages/userinfo/userinfo")}}},[e("v-uni-text",{staticClass:"cell-tit"},[t._v("Change Password")]),e("v-uni-text",{staticClass:"cell-more yticon icon-you"})],1),e("v-uni-view",{staticClass:"list-cell log-out-btn",on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.toLogout.apply(void 0,arguments)}}},[e("v-uni-text",{staticClass:"cell-tit"},[t._v("Sign Out")])],1)],1)},l=[]}}]);