Merge branch 'master' of http://git.liuniu946.com/xuhaolan/xhlred

pages/applic/science.vue

@@ -72,7 +72,7 @@
 				let obj = this;
 				getArticList({ifyid:1}).then(({ data }) => {
 					console.log(data,123456);
-					obj.science = obj.science.concat(data);
+					obj.science = obj.science.concat(data.list);
 					console.log(obj.science,'999999999999999999')
 				});
 			},

pages/cart/group.vue

@@ -145,7 +145,8 @@ export default {
 		}
 	},
 	computed: {
-		...mapState('user', ['hasLogin', 'userInfo'])
+		...mapState('user', ['hasLogin', 'userInfo']),
+		...mapState(['weichatObj']),
 		// startDate() {
 		// 	return this.getDate('start');
 		// },