Merge branch 'dev' into 'test'

代码调整

See merge request quanshu/mp-ui-user!74

src/pages/activity/index.vue

@@ -136,10 +136,10 @@
 			changeTab(e) {
 				if (e.index == 0) {
 					this.triggerStatus = 0
-					thsi.status = 'nomore'
+					this.status = 'nomore'
 				} else if (e.index == 1) {
 					this.triggerStatus = 1
-					thsi.status = 'nomore'
+					this.status = 'nomore'
 				}
 				this.pageList()
 			},