Merge remote-tracking branch 'origin/yijia' into yijia

addons/unishop/uniapp/uni-shop/main.js

@@ -75,22 +75,26 @@ const prePage = () => {
 const checkLogin = () => {
 	return new Promise(resolve => {
 		if (Vue.prototype.$store.state.hasLogin == false) {
-			uni.showModal({
-				cancelText:'Cancel',
-				confirmText:'OK',
-				title: '温馨提示',
-				content: '你还没登录，请先登录',
-				success(res) {
-					if (res.confirm) {
-						// 账户秘密登录
-						let url = '/pages/public/login';
-						uni.navigateTo({
-							url: url
-						});
-					}
-					resolve(false);
-				}
-			})
+			let url = '/pages/public/login';
+			uni.navigateTo({
+				url: url
+			});
+			// uni.showModal({
+			// 	cancelText:'Cancel',
+			// 	confirmText:'OK',
+			// 	title: '温馨提示',
+			// 	content: '你还没登录，请先登录',
+			// 	success(res) {
+			// 		if (res.confirm) {
+			// 			// 账户秘密登录
+			// 			let url = '/pages/public/login';
+			// 			uni.navigateTo({
+			// 				url: url
+			// 			});
+			// 		}
+			// 		resolve(false);
+			// 	}
+			// })
 		} else {
 			resolve(true);
 		}

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

@@ -183,7 +183,7 @@
         ,{
             "path" : "pages/category/category",
             "style" : {
-				"navigationBarTitleText": "Classification",
+				"navigationBarTitleText": "Catagory",
 				"enablePullDownRefresh": true,
 				"app-plus": {
 					"bounce": "none"
@@ -201,7 +201,7 @@
 		    "path" : "pages/flash/list",
 		    "style" : {
 				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "限时活动"
+				"navigationBarTitleText": "Promotion"
 			}
 		},
 		{
@@ -268,7 +268,7 @@
 				"pagePath": "pages/category/category",
 				"iconPath": "static/tab-cate.png",
 				"selectedIconPath": "static/tab-cate-current.png",
-				"text": "Classification"
+				"text": "Catagory"
 			},
 			// {
 			// 	"pagePath": "pages/cart/cart",

addons/unishop/uniapp/uni-shop/pages/flash/list.vue

@@ -170,7 +170,7 @@
 			// 设置导航栏名称
 			setNavigationBarTitle(title) {
 				uni.setNavigationBarTitle({
-					title: '限时活动|' + title
+					title: 'Promotion|' + title
 				});
 			}
 

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

@@ -33,7 +33,7 @@
 		<!-- 秒杀楼层 -->
 		<view class="seckill-section m-t" v-if="flashSale && flashSale.product.length > 0">
 			<view class="s-header" @click="navTo('/pages/flash/list')">
-				<text class="miaosha">限时活动</text>
+				<text class="miaosha">Promotion</text>
 				<!-- <text class="tip">{{(new Date(flashSale.starttime*1000)).getHours()}}点场</text> -->
 				<text class="tip" v-if="flashSale.countdown">下一场倒计时</text>
 				<text class="tip" v-else>{{flashSale.title}}</text>

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

@@ -7,17 +7,17 @@
 		<view class="wrapper">
 			<view class="left-top-sign">LOGIN</view>
 			<view class="welcome">
-				欢迎回来！
+				Welcome Back ！
 			</view>
 
 			<view class="input-content">
 				<view class="input-item">
-					<text class="tit">工号</text>
-					<input type="text" :value="mobile" placeholder="请输入工号" data-key="mobile" @input="inputChange" />
+					<text class="tit">Account</text>
+					<input type="text" :value="mobile" placeholder="" data-key="mobile" @input="inputChange" />
 				</view>
 				<view class="input-item">
-					<text class="tit">密码</text>
-					<input type="mobile" value="" placeholder="6-18位不含特殊字符的数字、字母组合" placeholder-class="input-empty" maxlength="20"
+					<text class="tit">Password</text>
+					<input type="mobile" value="" placeholder="" placeholder-class="input-empty" maxlength="20"
 					 password data-key="password" @input="inputChange" @confirm="toLogin" />
 				</view>
 			</view>

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

@@ -40,7 +40,7 @@
 			<!-- 订单 -->
 			<view class="order-header">
 				<view class="title">My Order</view>
-				<view class="item" @click="$api.navTo('/pages/order/order?state=0')" >Check All Order
+				<view class="item" @click="$api.navTo('/pages/order/order?state=0')" >All
 				<text class="yticon right icon-you"></text>
 			</view>
 			</view>

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.f0933e79.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.d65d8a38.js></script></body></html>

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-paySuccess.1cdd9437.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-money-paySuccess"],{"0325":function(t,e,n){var i=n("21d3");"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var a=n("4f06").default;a("bc923186",i,!0,{sourceMap:!1,shadowMode:!1})},"1bae":function(t,e,n){"use strict";var i=n("0325"),a=n.n(i);a.a},"21d3":function(t,e,n){var i=n("24fb");e=i(!1),e.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 背景颜色*/.content[data-v-7d8e42c9]{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.success-icon[data-v-7d8e42c9]{font-size:%?160?%;color:#fa436a;margin-top:%?100?%}.tit[data-v-7d8e42c9]{font-size:%?38?%;color:#303133}.btn-group[data-v-7d8e42c9]{padding-top:%?100?%}.mix-btn[data-v-7d8e42c9]{margin-top:%?30?%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;width:%?600?%;height:%?80?%;font-size:%?32?%;color:#fff;background-color:#fa436a;-webkit-border-radius:%?10?%;border-radius:%?10?%}.mix-btn.hollow[data-v-7d8e42c9]{background:#fff;color:#303133;border:1px solid #ccc}',""]),t.exports=e},"4c94":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i={data:function(){return{}},methods:{}};e.default=i},"7f51":function(t,e,n){"use strict";n.r(e);var i=n("4c94"),a=n.n(i);for(var c in i)"default"!==c&&function(t){n.d(e,t,(function(){return i[t]}))}(c);e["default"]=a.a},8209:function(t,e,n){"use strict";var i;n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return c})),n.d(e,"a",(function(){return i}));var a=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("v-uni-view",{staticClass:"content"},[n("v-uni-text",{staticClass:"success-icon yticon icon-xuanzhong"}),n("v-uni-text",{staticClass:"tit"},[t._v("支付成功")]),n("v-uni-view",{staticClass:"btn-group"},[n("v-uni-navigator",{staticClass:"mix-btn",attrs:{url:"/pages/order/order?state=0","open-type":"redirect"}},[t._v("查看订单")]),n("v-uni-navigator",{staticClass:"mix-btn hollow",attrs:{url:"/pages/index/index","open-type":"switchTab"}},[t._v("返回首页")])],1)],1)},c=[]},af82:function(t,e,n){"use strict";n.r(e);var i=n("8209"),a=n("7f51");for(var c in a)"default"!==c&&function(t){n.d(e,t,(function(){return a[t]}))}(c);n("1bae");var o,r=n("f0c5"),s=Object(r["a"])(a["default"],i["b"],i["c"],!1,null,"7d8e42c9",null,!1,i["a"],o);e["default"]=s.exports}}]);

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-money-paySuccess.bda41083.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-money-paySuccess"],{"0325":function(t,e,n){var i=n("21d3");"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var a=n("4f06").default;a("bc923186",i,!0,{sourceMap:!1,shadowMode:!1})},"1bae":function(t,e,n){"use strict";var i=n("0325"),a=n.n(i);a.a},"21d3":function(t,e,n){var i=n("24fb");e=i(!1),e.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 背景颜色*/.content[data-v-7d8e42c9]{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.success-icon[data-v-7d8e42c9]{font-size:%?160?%;color:#fa436a;margin-top:%?100?%}.tit[data-v-7d8e42c9]{font-size:%?38?%;color:#303133}.btn-group[data-v-7d8e42c9]{padding-top:%?100?%}.mix-btn[data-v-7d8e42c9]{margin-top:%?30?%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;width:%?600?%;height:%?80?%;font-size:%?32?%;color:#fff;background-color:#fa436a;border-radius:%?10?%}.mix-btn.hollow[data-v-7d8e42c9]{background:#fff;color:#303133;border:1px solid #ccc}',""]),t.exports=e},"4c94":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i={data:function(){return{}},methods:{}};e.default=i},"7f51":function(t,e,n){"use strict";n.r(e);var i=n("4c94"),a=n.n(i);for(var c in i)"default"!==c&&function(t){n.d(e,t,(function(){return i[t]}))}(c);e["default"]=a.a},8209:function(t,e,n){"use strict";var i;n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return c})),n.d(e,"a",(function(){return i}));var a=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("v-uni-view",{staticClass:"content"},[n("v-uni-text",{staticClass:"success-icon yticon icon-xuanzhong"}),n("v-uni-text",{staticClass:"tit"},[t._v("支付成功")]),n("v-uni-view",{staticClass:"btn-group"},[n("v-uni-navigator",{staticClass:"mix-btn",attrs:{url:"/pages/order/order?state=0","open-type":"redirect"}},[t._v("查看订单")]),n("v-uni-navigator",{staticClass:"mix-btn hollow",attrs:{url:"/pages/index/index","open-type":"switchTab"}},[t._v("返回首页")])],1)],1)},c=[]},af82:function(t,e,n){"use strict";n.r(e);var i=n("8209"),a=n("7f51");for(var c in a)"default"!==c&&function(t){n.d(e,t,(function(){return a[t]}))}(c);n("1bae");var o,r=n("f0c5"),s=Object(r["a"])(a["default"],i["b"],i["c"],!1,null,"7d8e42c9",null,!1,i["a"],o);e["default"]=s.exports}}]);

addons/unishop/uniapp/uni-shop/unpackage/dist/build/h5/static/js/pages-order-evaluate.915bc79d.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-order-evaluate"],{"4cda":function(t,a,e){"use strict";var i=e("4ea4");Object.defineProperty(a,"__esModule",{value:!0}),a.default=void 0,e("96cf");var n=i(e("1da1")),r=i(e("42d0")),o={computed:{},components:{uniRate:r.default},data:function(){return{order_id:0,product_id:0,title:"",image:"",spec:"",rate:5,radio:!0,textarea:""}},onLoad:function(t){this.title=t.title,this.image=t.image,this.spec=t.spec,this.order_id=t.order_id,this.product_id=t.product_id},methods:{start:function(t){switch(this.rate=t.value,this.rate){case 3:this.radio=!1;break;case 5:this.radio=!0;break}},clickRadio:function(t){this.radio=!this.radio},input:function(t){this.textarea=t.detail.value},submit:function(){var t=this;return(0,n.default)(regeneratorRuntime.mark((function a(){var e,i;return regeneratorRuntime.wrap((function(a){while(1)switch(a.prev=a.next){case 0:e=t.$api.request("/order/comment","POST",{order_id:t.order_id,product_id:t.product_id,rate:t.rate,anonymous:t.radio?0:1,comment:t.textarea}),e&&(i=t.$api.prePage(),i.tabCurrentIndex&&(i.tabCurrentIndex=0),t,setTimeout((function(){i.pullDownRefresh(),uni.navigateBack()}),2e3));case 2:case"end":return a.stop()}}),a)})))()}}};a.default=o},"92d3":function(t,a,e){var i=e("24fb");a=i(!1),a.push([t.i,'@charset "UTF-8";\n/* 页面左右间距 */\n/* 文字尺寸 */\n/*文字颜色*/\n/* 边框颜色 */\n/* 图片加载中颜色 */\n/* 行为相关颜色 */\n/* 背景颜色*/uni-page-body[data-v-30a8e1e2]{background:#f5f5f5}.bg[data-v-30a8e1e2]{margin:%?20?%;border-radius:%?20?%;background-color:#fff;padding-bottom:%?10?%}.header[data-v-30a8e1e2]{padding:%?20?%}.header .image[data-v-30a8e1e2]{width:%?120?%;height:%?120?%}.header .right[data-v-30a8e1e2]{display:inline-block;line-height:%?45?%;vertical-align:text-bottom;padding-bottom:%?10?%;width:%?550?%;padding-left:%?20?%}.header .right .title[data-v-30a8e1e2]{color:#707277;font-size:%?33?%;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.header .right .spec[data-v-30a8e1e2]{color:#91949a;font-size:%?30?%}.rate[data-v-30a8e1e2]{padding:0 %?20?% %?20?%}.rate .dec[data-v-30a8e1e2]{display:inline-block;color:#707277}.rate .start[data-v-30a8e1e2]{width:%?400?%;display:inline-block}.comment[data-v-30a8e1e2]{padding:%?20?%}.comment uni-textarea[data-v-30a8e1e2]{padding:%?30?%;background-color:#f5f5f5;width:100%}.bottom[data-v-30a8e1e2]{padding:%?20?% %?20?% %?40?%}.bottom .radio[data-v-30a8e1e2]{vertical-align:bottom;float:left}.bottom .dec[data-v-30a8e1e2]{color:#91949a;float:right}.button[data-v-30a8e1e2]{margin:%?20?%}body.?%PAGE?%[data-v-30a8e1e2]{background:#f5f5f5}',""]),t.exports=a},a3b2:function(t,a,e){"use strict";e.r(a);var i=e("4cda"),n=e.n(i);for(var r in i)"default"!==r&&function(t){e.d(a,t,(function(){return i[t]}))}(r);a["default"]=n.a},a6aa:function(t,a,e){var i=e("92d3");"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var n=e("4f06").default;n("74849024",i,!0,{sourceMap:!1,shadowMode:!1})},afbc:function(t,a,e){"use strict";e.r(a);var i=e("ce43"),n=e("a3b2");for(var r in n)"default"!==r&&function(t){e.d(a,t,(function(){return n[t]}))}(r);e("ce7c");var o,d=e("f0c5"),c=Object(d["a"])(n["default"],i["b"],i["c"],!1,null,"30a8e1e2",null,!1,i["a"],o);a["default"]=c.exports},ce43:function(t,a,e){"use strict";e.d(a,"b",(function(){return n})),e.d(a,"c",(function(){return r})),e.d(a,"a",(function(){return i}));var i={uniRate:e("42d0").default},n=function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("v-uni-view",{staticClass:"bg"},[e("v-uni-view",{staticClass:"header"},[e("v-uni-image",{staticClass:"image",attrs:{src:t.image}}),e("v-uni-view",{staticClass:"right"},[e("v-uni-view",{staticClass:"title"},[t._v(t._s(t.title))]),e("v-uni-view",{staticClass:"spec"},[t._v(t._s(t.spec))])],1)],1),e("v-uni-view",{staticClass:"rate"},[e("v-uni-view",{staticClass:"dec"},[t._v("描述相符")]),e("uni-rate",{staticClass:"start",attrs:{"active-color":"#e64340",margin:"10",size:"30",value:t.rate},on:{change:function(a){arguments[0]=a=t.$handleEvent(a),t.start.apply(void 0,arguments)}}})],1),e("v-uni-view",{staticClass:"comment"},[e("v-uni-textarea",{attrs:{maxlength:"300",placeholder:"写满20字,有机会被选为优质评价被更多人看到哦~","placeholder-class":"placeholder"},on:{input:function(a){arguments[0]=a=t.$handleEvent(a),t.input.apply(void 0,arguments)}}})],1),e("v-uni-view",{staticClass:"bottom"},[e("v-uni-radio",{staticClass:"radio",attrs:{color:"#e64340",checked:t.radio},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.clickRadio.apply(void 0,arguments)}}}),t._v("公开"),e("v-uni-view",{staticClass:"dec"},[t._v("公开头像昵称,大家可以看到我")])],1),e("v-uni-button",{staticClass:"button",attrs:{type:"warn"},on:{click:function(a){arguments[0]=a=t.$handleEvent(a),t.submit.apply(void 0,arguments)}}},[t._v("Submit")])],1)},r=[]},ce7c:function(t,a,e){"use strict";var i=e("a6aa"),n=e.n(i);n.a}}]);