Merge remote-tracking branch 'remotes/origin/dev/1.0' into dev/1.0

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) {