Merge remote-tracking branch 'origin/master'

rk

2026-04-20 5df967309636f69cc71b34944a37d88827fe28e1

 small-program/unpackage/dist/dev/mp-weixin/common/main.js

@@ -299,8 +299,6 @@
              return success;
            }(),
            fail: function fail(err) {
              console.error('获取位置失败===========', err);
              that.$store.commit('setPosition', locParam);
              that.$isResolve();
            }
          });