系统扫码默认走商品搜索,门店详情扫码无效修复
parent
a06686713f
commit
16753f8afe
4
App.vue
4
App.vue
|
|
@ -1695,7 +1695,7 @@
|
|||
var status = arr.indexOf(value.substr(0, 6)) != -1;
|
||||
if(!status) {
|
||||
// 是否打开插件地址
|
||||
if(arr.indexOf(value.substr(0, 15) == 'plugin-private:')) {
|
||||
if(value.substr(0, 17) == 'plugin-private://') {
|
||||
status = true;
|
||||
}
|
||||
}
|
||||
|
|
@ -1771,7 +1771,7 @@
|
|||
}
|
||||
}
|
||||
} else {
|
||||
this.showToast(i18n.t('shopxo-uniapp.app.1244fe') + '('+value + ')');
|
||||
this.url_open('/pages/goods-search/goods-search?keywords='+value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
<view class="flex-row align-c" :class="'cart-goods-item padding-main pr ' + (common_site_type == 1 ? 'cart-exhibition-mode-data' : '')">
|
||||
<!-- 选择 -->
|
||||
<view v-if="common_site_type != 1" @tap="selected_event" data-type="node" :data-index="index" class="cart-selected pr z-i ht-auto">
|
||||
<iconfont :name="'icon-zhifu-' + (item.selected || false ? 'yixuan' : 'weixuan')" size="34rpx" :color="item.selected || false ? theme_color : '#999'"></iconfont>
|
||||
<iconfont :name="'icon-zhifu-' + (item.selected || false ? 'yixuan' : 'weixuan')" size="40rpx" :color="item.selected || false ? theme_color : '#999'"></iconfont>
|
||||
</view>
|
||||
<view class="items oh padding-left-main flex-1 flex-row">
|
||||
<view>
|
||||
|
|
@ -155,7 +155,7 @@
|
|||
<view class="cart-nav-base single-text padding-left flex-row jc-sb align-c">
|
||||
<view class="cart-selected flex-row align-c">
|
||||
<view @tap="selected_event" data-type="all">
|
||||
<iconfont :name="'icon-zhifu-' + (is_selected_all ? 'yixuan' : 'weixuan')" size="34rpx" :color="is_selected_all ? theme_color : '#999'"></iconfont>
|
||||
<iconfont :name="'icon-zhifu-' + (is_selected_all ? 'yixuan' : 'weixuan')" size="40rpx" :color="is_selected_all ? theme_color : '#999'"></iconfont>
|
||||
</view>
|
||||
<text v-if="already_selected_status" @tap="cart_all_remove_event" class="margin-left-main cart-nav-remove-submit dis-inline-block va-m bg-white cr-red br-red round cp">{{ $t('common.del') }}</text>
|
||||
<text v-else class="va-m cr-base padding-left-main" @tap="selected_event" data-type="all">{{ $t('cart.cart.pxjwv8') }}</text>
|
||||
|
|
@ -210,7 +210,7 @@
|
|||
<view class="padding-sm pr">
|
||||
<!-- 选择 -->
|
||||
<view v-if="common_site_type != 1" @tap="selected_event" data-type="node" :data-index="index" class="cart-selected pa top-xxxl right-xxxl z-i">
|
||||
<iconfont :name="'icon-zhifu-' + (item.selected || false ? 'yixuan' : 'weixuan')" size="34rpx" :color="item.selected || false ? theme_color : '#999'"></iconfont>
|
||||
<iconfont :name="'icon-zhifu-' + (item.selected || false ? 'yixuan' : 'weixuan')" size="40rpx" :color="item.selected || false ? theme_color : '#999'"></iconfont>
|
||||
</view>
|
||||
<view>
|
||||
<view class="cp">
|
||||
|
|
@ -292,7 +292,7 @@
|
|||
<text class="cr-base">{{ item.name }}</text>
|
||||
<text v-if="(item.distance || null) != null" class="cr-grey margin-left-xs">({{ item.distance }})</text>
|
||||
<view v-if="(plugins_realstore_info || null) != null && plugins_realstore_info.id == item.id" class="fr">
|
||||
<iconfont name="icon-zhifu-yixuan" size="24rpx" propClass="lh-il cr-main"></iconfont>
|
||||
<iconfont name="icon-zhifu-yixuan" size="30rpx" propClass="lh-il cr-main"></iconfont>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -584,8 +584,8 @@
|
|||
this.setData({
|
||||
plugins_realstore_data: realstore,
|
||||
});
|
||||
// 门店为空、还没有初始门店信息,初始门店信息不在当前列表中则 赋值门店初始信息和门店购物车初始化
|
||||
if(app.globalData.data.is_cart_header_close_realstore != 1) {
|
||||
// 门店为空、还没有初始门店信息,初始门店信息不在当前列表中则 赋值门店初始信息和门店购物车初始化
|
||||
if(app.globalData.data.is_cart_header_close_realstore != 1) {
|
||||
if(
|
||||
realstore == null ||
|
||||
this.plugins_realstore_info == null ||
|
||||
|
|
@ -599,7 +599,7 @@
|
|||
plugins_realstore_info: realstore == null ? null : realstore[0],
|
||||
});
|
||||
this.realstore_cart_data_init();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 选择处理
|
||||
|
|
@ -622,9 +622,9 @@
|
|||
// 分享菜单处理、延时执行,确保基础数据已加载完成
|
||||
setTimeout(function () {
|
||||
app.globalData.page_share_handle();
|
||||
}, 3000);
|
||||
|
||||
// 页面样式处理
|
||||
}, 3000);
|
||||
|
||||
// 页面样式处理
|
||||
this.page_style_handle();
|
||||
},
|
||||
fail: () => {
|
||||
|
|
@ -633,9 +633,9 @@
|
|||
data_is_loading: 0,
|
||||
data_list_loding_status: 2,
|
||||
data_list_loding_msg: this.$t('common.internet_error_tips'),
|
||||
});
|
||||
|
||||
// 页面样式处理
|
||||
});
|
||||
|
||||
// 页面样式处理
|
||||
this.page_style_handle();
|
||||
},
|
||||
});
|
||||
|
|
@ -1080,7 +1080,7 @@
|
|||
},
|
||||
|
||||
// 猜你喜欢
|
||||
get_data_list(is_mandatory) {
|
||||
get_data_list(is_mandatory) {
|
||||
if(app.globalData.data.is_cart_bottom_guess_you_like == 1) {
|
||||
// 分页是否还有数据
|
||||
if ((is_mandatory || 0) == 0) {
|
||||
|
|
@ -1156,7 +1156,7 @@
|
|||
});
|
||||
app.globalData.showToast(this.$t('common.internet_error_tips'));
|
||||
},
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -1211,8 +1211,8 @@
|
|||
cart_type_value: e.currentTarget.dataset.type || 'shop',
|
||||
});
|
||||
// 重新加载数据
|
||||
this.get_data();
|
||||
// 页面样式处理
|
||||
this.get_data();
|
||||
// 页面样式处理
|
||||
this.page_style_handle();
|
||||
}
|
||||
},
|
||||
|
|
@ -1302,17 +1302,17 @@
|
|||
},
|
||||
|
||||
// 页面样式处理
|
||||
page_style_handle() {
|
||||
var value = 0;
|
||||
if(app.globalData.data.is_use_native_tabbar == 1) {
|
||||
// #ifdef H5
|
||||
value += (uni.getWindowInfo().windowBottom || 50)+40;
|
||||
// #endif
|
||||
} else {
|
||||
value += ((this.propCartNavBottomValue-8)*2)+20;
|
||||
page_style_handle() {
|
||||
var value = 0;
|
||||
if(app.globalData.data.is_use_native_tabbar == 1) {
|
||||
// #ifdef H5
|
||||
value += (uni.getWindowInfo().windowBottom || 50)+40;
|
||||
// #endif
|
||||
} else {
|
||||
value += ((this.propCartNavBottomValue-8)*2)+20;
|
||||
}
|
||||
this.setData({
|
||||
bottom_fixed_style: 'bottom:'+value+'rpx',
|
||||
bottom_fixed_style: 'bottom:'+value+'rpx',
|
||||
scroll_style: 'height: calc(100vh - ' + (value+(this.cart_type_value == 'realstore' ? 220 : 80)-(this.is_first == 1 ? 100 : 0))+'rpx)',
|
||||
});
|
||||
}
|
||||
|
|
@ -1325,9 +1325,9 @@
|
|||
*/
|
||||
.scroll-box {
|
||||
height: 100vh;
|
||||
}
|
||||
.scroll-box .content {
|
||||
padding-bottom: 60rpx;
|
||||
}
|
||||
.scroll-box .content {
|
||||
padding-bottom: 60rpx;
|
||||
}
|
||||
.scroll-box.cart .content {
|
||||
padding-bottom: calc(160rpx + env(safe-area-inset-bottom));
|
||||
|
|
@ -1411,7 +1411,7 @@
|
|||
.cart-nav-base {
|
||||
width: calc(75% - 20rpx);
|
||||
}
|
||||
.cart-nav-submit {
|
||||
.cart-nav-submit {
|
||||
padding-right: 16rpx;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
|
@ -1547,9 +1547,10 @@
|
|||
width: 100%;
|
||||
}
|
||||
.scroll-box-popup .cart-selected {
|
||||
background-color: #fff;
|
||||
height: 36rpx;
|
||||
border-radius: 50%;
|
||||
background-color: #fff;
|
||||
height: 46rpx;
|
||||
border-radius: 50%;
|
||||
padding: 0 4rpx;
|
||||
}
|
||||
.scroll-box-popup .alias {
|
||||
margin-left: 20rpx;
|
||||
|
|
|
|||
|
|
@ -524,7 +524,7 @@
|
|||
if(!app.globalData.is_single_page_check()) {
|
||||
return false;
|
||||
}
|
||||
var user = app.globalData.get_user_info(this);
|
||||
var user = app.globalData.get_user_info(this, 'cart_stock_event', e);
|
||||
if(user != false) {
|
||||
var index = e.currentTarget.dataset.index;
|
||||
var type = parseInt(e.currentTarget.dataset.type) || 0;
|
||||
|
|
@ -720,19 +720,19 @@
|
|||
|
||||
// 搜索icon扫码事件、扫码商品id实现加入购物车
|
||||
search_icon_handle(e) {
|
||||
var user = app.globalData.get_user_info(this, 'search_icon_handle');
|
||||
var user = app.globalData.get_user_info(this, 'search_icon_handle', e);
|
||||
if (user != false) {
|
||||
// 门店状态
|
||||
if (!this.is_status_check()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// 调用扫码
|
||||
var self = this;
|
||||
uni.scanCode({
|
||||
success: function (res) {
|
||||
uni.showLoading({
|
||||
title: this.$t('common.processing_in_text'),
|
||||
title: self.$t('common.processing_in_text'),
|
||||
mask: true,
|
||||
});
|
||||
uni.request({
|
||||
|
|
@ -756,13 +756,13 @@
|
|||
if (app.globalData.is_login_check(res.data)) {
|
||||
app.globalData.showToast(res.data.msg);
|
||||
} else {
|
||||
app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
|
||||
app.globalData.showToast(self.$t('common.sub_error_retry_tips'));
|
||||
}
|
||||
}
|
||||
},
|
||||
fail: () => {
|
||||
uni.hideLoading();
|
||||
app.globalData.showToast(this.$t('common.internet_error_tips'));
|
||||
app.globalData.showToast(self.$t('common.internet_error_tips'));
|
||||
},
|
||||
});
|
||||
},
|
||||
|
|
|
|||
|
|
@ -905,7 +905,7 @@
|
|||
|
||||
// 搜索icon扫码事件、扫码商品id实现加入购物车
|
||||
search_icon_event(e) {
|
||||
this.$refs.realstore_cart.search_icon_handle();
|
||||
this.$refs.realstore_cart.search_icon_handle(e);
|
||||
},
|
||||
|
||||
// 剪切板
|
||||
|
|
|
|||
Loading…
Reference in New Issue