Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub

zxl

2025-07-29 66c550a7021c5685e8b7dde4a92e6efd3625689f

 pages/mine/address/add.vue

@@ -3,9 +3,9 @@
    <div class="uForm">
      <u-form :border-bottom="false" :model="form" ref="uForm" :error-type="['toast']" :rule="rules">
            <!-- #ifndef H5 -->
        <view class="selectAddress" @click="clickUniMap">
<!--        <view class="selectAddress" @click="clickUniMap">
          选择收货地址
        </view>
        </view> -->
            <!-- #endif -->
        <u-form-item class="border" label="收货人" label-width="130" prop="name">
          <u-input v-model="form.name" clearable placeholder="请输入收货人姓名" />
@@ -35,28 +35,21 @@
      <m-city :provinceData="list" headTitle="区域选择" ref="cityPicker" @funcValue="getpickerParentValue" pickerSize="4">
      </m-city>

      <uniMap v-if="mapFlag" @close="closeMap" @callback="callBackAddress" />
      <!-- <uniMap v-if="mapFlag" @close="closeMap" @callback="callBackAddress" /> -->
    </div>
  </view>
</template>
<script>
import UForm from '@/uview-components/uview-ui/components/u-form/u-form.vue';
import UFormItem from '@/uview-components/uview-ui/components/u-form-item/u-form-item.vue';
import UInput from '@/uview-components/uview-ui/components/u-input/u-input.vue';
import UCheckboxGroup from '@/uview-components/uview-ui/components/u-checkbox-group/u-checkbox-group.vue';
import UCheckbox from '@/uview-components/uview-ui/components/u-checkbox/u-checkbox.vue';
import UIcon from '@/uview-components/uview-ui/components/u-icon/u-icon.vue';
import UActionSheet from '@/uview-components/uview-ui/components/u-action-sheet/u-action-sheet.vue';
import '@/components/uview-components/uview-ui';

import { addAddress, editAddress, getAddressDetail } from "@/api/address.js";
import city from "@/components/m-city/m-city.vue";
import uniMap from "@/components/uniMap";
import city from "@/pages/mine/m-city/m-city.vue";
import uniMap from "@/pages/mine/uniMap.vue";
import permision from "@/js_sdk/wa-permission/permission.js";
export default {
  components: {
    "m-city": city,
    uniMap,
   UForm,UFormItem,UInput,UCheckboxGroup,UCheckbox,UIcon,UActionSheet
    uniMap
  },
  onShow() {
    // 判断当前系统权限定位是否开启
@@ -132,7 +125,6 @@

    // 选择地址后数据的回调
    callBackAddress(val) {
      console.log(val)
      uni.showLoading({
        title: "加载中",
      });