diff --git a/lang/en-us/common.js b/lang/en-us/common.js
index 3302642..b92c1e6 100644
--- a/lang/en-us/common.js
+++ b/lang/en-us/common.js
@@ -19,5 +19,10 @@ export const lang = {
currencySymbol: '¥',
submit: 'Submit',
searchTip: 'Please enter search keywords'
- }
+ },
+
+ login: 'Login/Register',
+ loginTips: 'Click to login and enjoy more exciting information',
+ toLogin: 'Go to login',
+ toGoodsCategoryPage: 'Go shopping',
}
diff --git a/lang/zh-cn/common.js b/lang/zh-cn/common.js
index b54af90..f029019 100644
--- a/lang/zh-cn/common.js
+++ b/lang/zh-cn/common.js
@@ -23,6 +23,8 @@ export const lang = {
login: '登录/注册',
loginTpis: '点击登录 享受更多精彩信息',
+ toLogin: '去登录',
+ toGoodsCategoryPage: '去逛逛',
waitpay: '待付款',
waitsend: '待发货',
diff --git a/pages_goods/cart.vue b/pages_goods/cart.vue
index f72c838..58ab7c3 100644
--- a/pages_goods/cart.vue
+++ b/pages_goods/cart.vue
@@ -65,7 +65,7 @@
{{ parseFloat(item.member_price).toFixed(2).split('.')[0] }}
.{{
parseFloat(item.member_price).toFixed(2).split('.')[1]
- }}
+ }}
@@ -79,7 +79,7 @@
}}
.{{
parseFloat(item.discount_price).toFixed(2).split('.')[1]
- }}
+ }}
@@ -95,7 +95,7 @@
{{ parseFloat(item.member_price).toFixed(2).split('.')[0] }}
.{{
parseFloat(item.member_price).toFixed(2).split('.')[1]
- }}
+ }}
@@ -108,7 +108,7 @@
{{ parseFloat(item.price).toFixed(2).split('.')[0] }}
.{{
parseFloat(item.price).toFixed(2).split('.')[1]
- }}
+ }}
@@ -175,7 +175,7 @@
}}
.{{
parseFloat(goodsItem.member_price).toFixed(2).split('.')[1]
- }}
+ }}
@@ -185,7 +185,7 @@
}}
.{{
parseFloat(goodsItem.discount_price).toFixed(2).split('.')[1]
- }}
+ }}
@@ -199,9 +199,12 @@
-
-
+
+
+
@@ -316,9 +319,9 @@
{{ $lang('common.currencySymbol') }}
{{ parseFloat(discount.order_money).toFixed(2).split('.')[0]
- }}
+ }}
.{{ parseFloat(discount.order_money).toFixed(2).split('.')[1]
- }}
+ }}
{{ parseFloat(totalPrice).toFixed(2).split('.')[0] }}
diff --git a/pages_goods/public/js/cart.js b/pages_goods/public/js/cart.js
index 5c2f9ab..ba8fbc2 100644
--- a/pages_goods/public/js/cart.js
+++ b/pages_goods/public/js/cart.js
@@ -1,4 +1,7 @@
+import common from './common.js';
+
export default {
+ mixins: [common],
data() {
return {
cartData: [], // 购物车
@@ -444,9 +447,6 @@ export default {
// });
}
},
- toLogin() {
- this.$refs.login.open();
- },
// 重置编辑状态
resetEditStatus() {
if (this.cartData.length) {
diff --git a/pages_goods/public/js/common.js b/pages_goods/public/js/common.js
new file mode 100644
index 0000000..845ff77
--- /dev/null
+++ b/pages_goods/public/js/common.js
@@ -0,0 +1,8 @@
+export default {
+ methods: {
+ // 跳转至登录页
+ toLogin() {
+ this.$refs.login.open();
+ },
+ }
+}
\ No newline at end of file
diff --git a/pages_tool/member/collection.vue b/pages_tool/member/collection.vue
index 5ea24ae..a28ff1c 100644
--- a/pages_tool/member/collection.vue
+++ b/pages_tool/member/collection.vue
@@ -1,7 +1,7 @@
-
+
@@ -29,15 +29,15 @@
-
+
+ :isIndex="Boolean(storeToken)" :emptyBtn="{ text: $lang('toGoodsCategoryPage'), url: '/pages_goods/category' }">
+ @click="toLogin">{{ $lang('toLogin') }}
-
+
@@ -45,11 +45,11 @@