sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

地址选择错误修复+地理位置适配

master
gongfuxiang 2021-12-10 00:26:53 +08:00
parent 05dded8694
commit ce60ef8ef9
5 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
App.vue
View File

@ -1148,7 +1148,13 @@
// 获取当前页面地址、不含?后面的参数
get_page_url(is_whole) {
// #ifdef MP || APP
var pages = getCurrentPages();
var url = pages[pages.length-1].$page.fullPath;
// #endif
// #ifdef H5
var url = window.location.href;
// #endif
if(is_whole == false) {
var temp = url.split('?');
url = temp[0];
@ -1222,7 +1228,10 @@
query: this.share_query_handle(data.query || ''),
img: data.img || share_config.pic || this.get_config('config.home_site_logo_square')
};
result['url'] = this.get_page_url().split('#')[0] + '#' + ((result.path.substr(0 ,1) == '/') ? '' : '/') + result.path + result.query;
result['url'] = this.get_page_url();
// #ifdef H5
result['url'] = result.url.split('#')[0] + '#' + ((result.path.substr(0 ,1) == '/') ? '' : '/') + result.path + result.query;
// #endif
return result;
},

14
changelog.md
View File

@ -14,4 +14,16 @@
* 分销、会员等级增强版、钱包全面支持小程序
* 用户授权获取用户信息API
* 可视化索引读取错误修复
* 支持菜鸟物流查询
* 支持菜鸟物流查询
## v2.2.3（xxx）
* 整体适配H5端
* 订单、钱包、会员等级支付优化适配
* 支持（账号、手机、邮箱）登录注册方式
* 分享逻辑优化全局处理
* 分销新增上级用户、阶梯返佣提示
* 新增独立新增错误页面
* 适配第三方登录插件
* 支持线下支付自定义信息展示
* 规格切换购买数量错误修复

9
pages/common/open-setting-location/open-setting-location.vue
View File

@ -37,7 +37,8 @@
},
methods: {
// 获取权限
init() {
init() {
// #ifdef MP
var self = this;
uni.getSetting({
success(res) {
@ -60,7 +61,11 @@
fail: res => {
app.globalData.showToast("请先获取授权");
}
});
});
// #endif
// #ifdef H5 || APP
this.choose_location();
// #endif
},
// 位置服务回调方法

16
pages/plugins/distribution/extraction-apply/extraction-apply.vue
View File

@ -37,18 +37,18 @@
<view class="select-address oh">
<view class="section fl">
<picker name="province" @change="select_province_event" :value="province_value" :range="province_list" range-key="name">
<view :class="'name ' + ((province_value == null) ? 'cr-grey' : 'cr-base' )">{{province_list[province_value].name || default_province}}</view>
<view :class="'name ' + ((province_value == null) ? 'cr-grey' : 'cr-base' )">{{((province_list[province_value] || null) == null) ? default_province : province_list[province_value]['name']}}</view>
</picker>
</view>
<view class="section fl">
<picker v-if="(province_id || null) != null" name="city" @change="select_city_event" :value="city_value" :range="city_list" range-key="name">
<view :class="'name ' + ((city_value == null) ? 'cr-grey' : 'cr-base' )">{{city_list[city_value].name || default_city}}</view>
<view :class="'name ' + ((city_value == null) ? 'cr-grey' : 'cr-base' )">{{((city_list[city_value] || null) == null) ? default_city : city_list[city_value]['name']}}</view>
</picker>
<text v-else class="cr-grey" @tap="region_select_error_event" data-value="请先选择省份">请先选择省份</text>
</view>
<view class="section fl">
<picker v-if="(city_id || null) != null" name="county" @change="select_county_event" :value="county_value" :range="county_list" range-key="name">
<view :class="'name ' + ((county_value == null) ? 'cr-grey' : 'cr-base' )">{{county_list[county_value].name || default_county}}</view>
<view :class="'name ' + ((county_value == null) ? 'cr-grey' : 'cr-base' )">{{((county_list[county_value] || null) == null) ? default_county : county_list[county_value]['name']}}</view>
</picker>
<text v-else class="cr-grey" @tap="region_select_error_event" data-value="请先选择城市">请先选择城市</text>
</view>
@ -89,7 +89,7 @@
params: null,
data_list_loding_status: 1,
data_list_loding_msg: '',
extraction_data: null,
extraction_data: {},
province_list: [],
city_list: [],
county_list: [],
@ -127,9 +127,9 @@
},
onShow() {
this.user_location_init();
// 显示分享菜单
this.user_location_init();
// 显示分享菜单
app.globalData.show_share_menu();
},
@ -172,7 +172,7 @@
var data = res.data.data;
var extraction_data = data.extraction_data || null;
self.setData({
extraction_data: extraction_data || null,
extraction_data: extraction_data || {},
editor_path_type: data.editor_path_type || ''
});

4
pages/user-address-save/user-address-save.vue
View File

@ -22,7 +22,7 @@
<view class="select-address oh">
<view class="section fl">
<picker name="province" @change="select_province_event" :value="province_value" :range="province_list" range-key="name">
<view :class="'name ' + ((province_value == null) ? 'cr-grey' : 'cr-base' )">{{((province_list[city_value] || null) == null) ? default_province : province_list[city_value]['name']}}</view>
<view :class="'name ' + ((province_value == null) ? 'cr-grey' : 'cr-base' )">{{((province_list[province_value] || null) == null) ? default_province : province_list[province_value]['name']}}</view>
</picker>
</view>
<view class="section fl">
@ -33,7 +33,7 @@
</view>
<view class="section fl">
<picker v-if="(city_id || null) != null" name="county" @change="select_county_event" :value="county_value" :range="county_list" range-key="name">
<view :class="'name ' + ((county_value == null) ? 'cr-grey' : 'cr-base' )">{{((county_list[city_value] || null) == null) ? default_county : county_list[city_value]['name']}}</view>
<view :class="'name ' + ((county_value == null) ? 'cr-grey' : 'cr-base' )">{{((county_list[county_value] || null) == null) ? default_county : county_list[county_value]['name']}}</view>
</picker>
<text v-else class="cr-grey" @tap="region_select_error_event" data-value="请先选择城市">请先选择城市</text>
</view>