diff --git a/locale/en.json b/locale/en.json
index 308ac15e..7cf68d9e 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -828,12 +828,10 @@
"865029": "Abnormal cause",
"jhgfd1": "Shipping info",
"hbvwq4": "Receipt info",
- "ygvc34": "Merchant name",
"71n22h": "Single ID",
"232ygr": "Order number",
"7dxbm5": "Phone",
"ra8222": "Address",
- "26yki1": "No address info available",
"75ie9c": "details",
"021438": "Start delivery",
"ip4xo5": "Redelivery",
@@ -874,6 +872,7 @@
"order-detail": {
"9er1pc": "Basic info",
"36op8f": "Order number",
+ "ygvc34": "Merchant name",
"x3ge6c": "Order amount",
"v52n5r": "refund amount",
"8n1f72": "Product quantity",
diff --git a/locale/zh.json b/locale/zh.json
index 5fc67445..445d00bf 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -822,12 +822,10 @@
"865029": "异常原因",
"jhgfd1": "发货信息",
"hbvwq4": "收货信息",
- "ygvc34": "商户名称",
"71n22h": "单ID",
"232ygr": "单号",
"7dxbm5": "电话",
"ra8222": "地址",
- "26yki1": "没有地址信息",
"75ie9c": "详情",
"021438": "开始配送",
"ip4xo5": "再次配送",
@@ -868,6 +866,7 @@
"order-detail": {
"9er1pc": "基础信息",
"36op8f": "订单号",
+ "ygvc34": "商户名称",
"x3ge6c": "订单金额",
"v52n5r": "退款金额",
"8n1f72": "商品数量",
diff --git a/pages/goods-search/goods-search.vue b/pages/goods-search/goods-search.vue
index 7422ca4c..0762e4e5 100644
--- a/pages/goods-search/goods-search.vue
+++ b/pages/goods-search/goods-search.vue
@@ -392,20 +392,6 @@
});
app.globalData.is_login_check(res.data, this, 'get_data');
}
-
- // 基础自定义分享
- var category_id = this.params.category_id || 0;
- var brand = this.params.brand || 0;
- var keywords = this.params.keywords || '';
- this.setData({
- share_info: {
- path: '/pages/goods-search/goods-search',
- query: 'category_id=' + category_id + '&brand=' + brand + '&keywords=' + keywords
- }
- });
-
- // 分享菜单处理
- app.globalData.page_share_handle(this.share_info);
},
fail: () => {
uni.stopPullDownRefresh();
@@ -427,6 +413,9 @@
}
}
+ // 基础自定义分享
+ this.share_info_handle();
+
// 是否加载中
if (this.data_is_loading == 1) {
return false;
@@ -565,6 +554,22 @@
return post_data;
},
+ // 分享设置处理
+ share_info_handle() {
+ var category_id = this.params.category_id || 0;
+ var brand = this.params.brand || 0;
+ var keywords = this.post_data.wd || '';
+ this.setData({
+ share_info: {
+ path: '/pages/goods-search/goods-search',
+ query: 'category_id=' + category_id + '&brand=' + brand + '&keywords=' + keywords
+ }
+ });
+
+ // 分享菜单处理
+ app.globalData.page_share_handle(this.share_info);
+ },
+
// 滚动加载
scroll_lower(e) {
this.get_data_list();
diff --git a/pages/plugins/blog/search/search.vue b/pages/plugins/blog/search/search.vue
index a7951169..7df21766 100644
--- a/pages/plugins/blog/search/search.vue
+++ b/pages/plugins/blog/search/search.vue
@@ -138,25 +138,6 @@
});
uni.setNavigationBarTitle({ title: blog_main_name + this.$t('common.search') });
- // 基础自定义分享
- var info = this.data_base;
- if ((this.nav_active_value || 0) != 0 && this.category.length > 0) {
- for (var i in this.category) {
- if (this.nav_active_value == this.category[i]['id']) {
- info = this.category[i];
- break;
- }
- }
- }
- this.setData({
- share_info: {
- title: info.seo_title || this.data_base.application_name,
- desc: info.seo_desc,
- path: '/pages/plugins/blog/search/search',
- query: 'id=' + this.nav_active_value + '&keywords=' + this.search_keywords_value,
- },
- });
-
// 获取列表数据
this.get_data_list(1);
} else {
@@ -166,9 +147,6 @@
});
app.globalData.showToast(res.data.msg);
}
-
- // 分享菜单处理
- app.globalData.page_share_handle(this.share_info);
},
fail: () => {
uni.stopPullDownRefresh();
@@ -190,6 +168,9 @@
}
}
+ // 基础自定义分享
+ this.share_info_handle();
+
// 是否加载中
if (this.data_is_loading == 1) {
return false;
@@ -279,6 +260,31 @@
});
},
+ // 分享设置处理
+ share_info_handle() {
+ // 基础自定义分享
+ var info = this.data_base || {};
+ if ((this.nav_active_value || 0) != 0 && this.category.length > 0) {
+ for (var i in this.category) {
+ if (this.nav_active_value == this.category[i]['id']) {
+ info = this.category[i];
+ break;
+ }
+ }
+ }
+ this.setData({
+ share_info: {
+ title: info.seo_title || this.data_base.application_name,
+ desc: info.seo_desc,
+ path: '/pages/plugins/blog/search/search',
+ query: 'id=' + this.nav_active_value + '&keywords=' + this.search_keywords_value,
+ },
+ });
+
+ // 分享菜单处理
+ app.globalData.page_share_handle(this.share_info);
+ },
+
// 滚动加载
scroll_lower(e) {
this.get_data_list();
diff --git a/pages/plugins/delivery/logistics/logistics.vue b/pages/plugins/delivery/logistics/logistics.vue
index 88cebf3a..3fe78e56 100644
--- a/pages/plugins/delivery/logistics/logistics.vue
+++ b/pages/plugins/delivery/logistics/logistics.vue
@@ -113,9 +113,7 @@
uni.request({
url: app.globalData.get_request_url("logistics", "order", "delivery"),
method: "POST",
- data: {
- id: this.params.id || 0
- },
+ data: this.params,
dataType: "json",
success: (res) => {
if (res.data.code == 0) {
diff --git a/pages/plugins/delivery/order/order.vue b/pages/plugins/delivery/order/order.vue
index 956d2206..2fae65d5 100644
--- a/pages/plugins/delivery/order/order.vue
+++ b/pages/plugins/delivery/order/order.vue
@@ -93,10 +93,6 @@
-
- {{$t('order.order.ra8222')}}
- {{$t('order.order.26yki1')}}
-
{{ item.describe }}
{{$t('extraction-address.extraction-address.42v8tv')}}{{ item.distance }}
diff --git a/pages/plugins/realstore/search/search.vue b/pages/plugins/realstore/search/search.vue
index 54d0bc2b..0beff1c6 100644
--- a/pages/plugins/realstore/search/search.vue
+++ b/pages/plugins/realstore/search/search.vue
@@ -148,18 +148,6 @@ export default {
favor_user: data.favor_user || [],
});
- if ((this.data_base || null) != null) {
- // 基础自定义分享
- this.setData({
- share_info: {
- title: this.search_keywords_value || this.data_base.seo_title || this.data_base.application_name,
- desc: this.data_base.seo_desc,
- path: "/pages/plugins/realstore/search/search",
- query: "category_id=" + this.nav_active_value + "&keywords=" + this.search_keywords_value+"&goods_id="+(this.params.goods_id || 0),
- },
- });
- }
-
// 获取列表数据
this.get_data_list(1);
} else {
@@ -169,9 +157,6 @@ export default {
});
app.globalData.showToast(res.data.msg);
}
-
- // 分享菜单处理
- app.globalData.page_share_handle(this.share_info);
},
fail: () => {
uni.stopPullDownRefresh();
@@ -193,6 +178,9 @@ export default {
}
}
+ // 基础自定义分享
+ this.share_info_handle();
+
// 是否加载中
if (this.data_is_loading == 1) {
return false;
@@ -292,6 +280,24 @@ export default {
});
},
+ // 分享设置处理
+ share_info_handle() {
+ if ((this.data_base || null) != null) {
+ // 基础自定义分享
+ this.setData({
+ share_info: {
+ title: this.search_keywords_value || this.data_base.seo_title || this.data_base.application_name,
+ desc: this.data_base.seo_desc,
+ path: "/pages/plugins/realstore/search/search",
+ query: "category_id=" + this.nav_active_value + "&keywords=" + this.search_keywords_value+"&goods_id="+(this.params.goods_id || 0),
+ },
+ });
+ }
+
+ // 分享菜单处理
+ app.globalData.page_share_handle(this.share_info);
+ },
+
// 滚动加载
scroll_lower(e) {
this.get_data_list();
diff --git a/pages/plugins/shop/search/search.vue b/pages/plugins/shop/search/search.vue
index 6c086b70..c6b462d2 100644
--- a/pages/plugins/shop/search/search.vue
+++ b/pages/plugins/shop/search/search.vue
@@ -195,20 +195,6 @@
});
if((this.shop || null) != null) {
- // 基础自定义分享
- var shop_id = this.shop.id;
- var category_id = this.params.category_id || 0;
- var keywords = this.params.keywords || '';
- this.setData({
- share_info: {
- title: this.shop.seo_title || this.shop.name,
- desc: this.shop.seo_desc || this.shop.describe,
- path: '/pages/plugins/shop/search/search',
- query: 'shop_id='+shop_id+'&category_id='+category_id+'&keywords='+keywords,
- img: this.shop.logo
- }
- });
-
// 获取列表数据
this.get_data_list(1);
} else {
@@ -223,9 +209,6 @@
});
app.globalData.showToast(res.data.msg);
}
-
- // 分享菜单处理
- app.globalData.page_share_handle(this.share_info);
},
fail: () => {
uni.stopPullDownRefresh();
@@ -246,6 +229,9 @@
return false;
}
}
+
+ // 基础自定义分享
+ this.share_info_handle();
// 是否加载中
if(this.data_is_loading == 1) {
@@ -365,6 +351,28 @@
return post_data;
},
+ // 分享设置处理
+ share_info_handle() {
+ if((this.shop || null) != null) {
+ // 基础自定义分享
+ var shop_id = this.shop.id;
+ var category_id = this.params.category_id || 0;
+ var keywords = this.post_data.wd || '';
+ this.setData({
+ share_info: {
+ title: this.shop.seo_title || this.shop.name,
+ desc: this.shop.seo_desc || this.shop.describe,
+ path: '/pages/plugins/shop/search/search',
+ query: 'shop_id='+shop_id+'&category_id='+category_id+'&keywords='+keywords,
+ img: this.shop.logo
+ }
+ });
+ }
+
+ // 分享菜单处理
+ app.globalData.page_share_handle(this.share_info);
+ },
+
// 滚动加载
scroll_lower(e) {
this.get_data_list();
diff --git a/pages/user-order/user-order.vue b/pages/user-order/user-order.vue
index 8cb67c8f..19053ab3 100644
--- a/pages/user-order/user-order.vue
+++ b/pages/user-order/user-order.vue
@@ -72,7 +72,7 @@
-
+