Merge branch 'master' of http://121.40.253.172:3000/qiuyu/brand-arrival-wechat

src/pages/my/index.vue

@@ -50,7 +50,7 @@
         </view>
       </view>
 
-      <view class="addressBox">
+     <!-- <view class="addressBox">
         <view class="title"> 附近门店 </view>
         <view>
           <view v-for="(item, index) in list2" :key="index" class="address">
@@ -66,7 +66,7 @@
             />
           </view>
         </view>
-      </view>
+      </view> -->
     </view>
 
     <user-login-popup

src/pagesOne/winner/index.vue

@@ -229,9 +229,9 @@ const handledUpload = () => {
   // }
   uni.getSetting({
     success: (res) => {
-      if (!res.authSetting["scope.address"]) {
+      if (!res.authSetting["scope.userLocation"]) {
         uni.authorize({
-          scope: "scope.address",
+          scope: "scope.userLocation",
           success() {
             // 用户同意授权
           },