small-program/App.vue
@@ -5,10 +5,6 @@ ...mapState(['userInfo','openid']) }, onLaunch: function() { <<<<<<< HEAD ======= // console.log(ua) >>>>>>> 71a103d6f5c55136f40535bccf23bc6129e342f7 var that = this; if (!this.openid || this.openid =='') { uni.login({