Merge remote-tracking branch 'origin/master'

doum

7 小时以前 074d1e64936f8af0f51e3a305878ed63a4b96a98

 mini-program/App.vue

@@ -108,7 +108,7 @@
                     locParam,
                     success: function(res) {
                        console.log(res, '==================获取地址');
                        that.$store.commit('setPosition', )
                        that.$store.commit('setPosition', res)
                        that.$isResolve()
                     },
                     fail: (err) => {