diff --git a/App.vue b/App.vue
index 8fdec6ba..6148979c 100644
--- a/App.vue
+++ b/App.vue
@@ -1515,7 +1515,14 @@
// 是否为page页面地址
is_page(value) {
var arr = ['/pages', 'pages/'];
- return arr.indexOf(value.substr(0, 6)) != -1;
+ var status = arr.indexOf(value.substr(0, 6)) != -1;
+ if(!status) {
+ // 是否打开插件地址
+ if(arr.indexOf(value.substr(0, 15) == 'plugin-private:')) {
+ status = true;
+ }
+ }
+ return status;
},
// url打开
@@ -1573,7 +1580,7 @@
}
}
} else {
- this.showToast(i18n.t('shopxo-uniapp.app.1244fe') + value + ')');
+ this.showToast(i18n.t('shopxo-uniapp.app.1244fe') + '('+value + ')');
}
}
}
@@ -2728,6 +2735,7 @@
'pages/plugins/coupon/index/index',
'pages/plugins/signin/detail/detail',
'pages/plugins/membershiplevelvip/index/index',
+ 'pages/plugins/ask/index/index',
];
// 当前tab页面
if(this.data.tabbar_pages.indexOf('/'+url) != -1 || pages_always.indexOf(url) != -1) {
diff --git a/common/css/page.css b/common/css/page.css
index e3a65ab1..51583011 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -1394,6 +1394,9 @@ button[disabled].bg-grey {
*/
.top-search-width {
width: calc(100% - 250rpx) !important;
+ /* #ifdef MP-ALIPAY */
+ width: calc(100% - 290rpx) !important;
+ /* #endif */
}
/**
diff --git a/components/nav-back/nav-back.vue b/components/nav-back/nav-back.vue
index 9824678c..83f65aa6 100644
--- a/components/nav-back/nav-back.vue
+++ b/components/nav-back/nav-back.vue
@@ -4,9 +4,7 @@
{{ propName }}
-
-
-
+
@@ -68,6 +66,7 @@
data() {
return {
theme_view: app.globalData.get_theme_value_view(),
+ client_value: app.globalData.application_client_type(),
status_bar_height: 0,
// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || MP-ALIPAY || H5 || APP
status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0, true)),
diff --git a/lang/en.json b/lang/en.json
index 09bb3efb..d7191e3d 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1726,7 +1726,7 @@
"iq66pg": "Please copy the address to the webpage map for viewing!",
"v2j475": "Incorrect coordinates",
"3m1gbe": "Uuid cache failed",
- "1244fe": "Unknown data(",
+ "1244fe": "Unknown data",
"r5ts62": "Copy successful",
"r539kf": "Copy content is empty",
"qm8548": "The image address is empty",
diff --git a/lang/zh.json b/lang/zh.json
index bf2defef..4e92c859 100644
--- a/lang/zh.json
+++ b/lang/zh.json
@@ -1711,7 +1711,7 @@
"iq66pg": "请复制地址到网页地图中查看!",
"v2j475": "坐标有误",
"3m1gbe": "uuid缓存失败",
- "1244fe": "未知数据(",
+ "1244fe": "未知数据",
"r5ts62": "复制成功",
"r539kf": "复制内容为空",
"qm8548": "图片地址为空",
diff --git a/pages/plugins/activity/detail/detail.vue b/pages/plugins/activity/detail/detail.vue
index ba3209d0..cc8b487b 100644
--- a/pages/plugins/activity/detail/detail.vue
+++ b/pages/plugins/activity/detail/detail.vue
@@ -23,7 +23,7 @@
{{$t('detail.detail.b4f3nw')}}
{{ data.vice_title }}
- {{$t('detail.detail.ans2p4')}}
+ {{$t('detail.detail.ans2p4')}}
diff --git a/pages/plugins/ask/index/index.vue b/pages/plugins/ask/index/index.vue
index 4e5387d0..9c43f59d 100644
--- a/pages/plugins/ask/index/index.vue
+++ b/pages/plugins/ask/index/index.vue
@@ -67,7 +67,7 @@
return {
theme_view: app.globalData.get_theme_value_view(),
is_mp_env: false,
- // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU
+ // #ifdef MP-WEIXIN || MP-BAIDU || MP-ALIPAY || MP-QQ || MP-KUAISHOU
is_mp_env: true,
// #endif
data_base: {},
diff --git a/pages/plugins/realstore/detail/detail.css b/pages/plugins/realstore/detail/detail.css
index 222cc4f3..fc713548 100644
--- a/pages/plugins/realstore/detail/detail.css
+++ b/pages/plugins/realstore/detail/detail.css
@@ -5,16 +5,8 @@ page {
/**
* 头部内容
*/
-.top-nav-search {
- /* #ifdef MP-ALIPAY */
- padding-left: 60rpx;
- /* #endif */
-}
.header-content {
margin-top: 20rpx;
- /* #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU */
- margin-top: 20rpx;
- /* #endif */
box-shadow: 0 0 8px rgb(0 0 0 / 6%);
min-height: 242rpx;
}
@@ -107,15 +99,15 @@ page {
top: 0;
right: 0;
z-index: 3;
-}
-.nav-sort-content .sort-item {
- height: 80rpx;
- line-height: 80rpx;
- width: 20%;
-}
-.nav-sort-content .sort-item .sort-icon {
- width: 26rpx;
- height: 26rpx !important;
+}
+.nav-sort-content .sort-item {
+ height: 80rpx;
+ line-height: 80rpx;
+ width: 20%;
+}
+.nav-sort-content .sort-item .sort-icon {
+ width: 26rpx;
+ height: 26rpx !important;
}
.goods-list .goods-img {
width: 160rpx;
diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue
index 499e709a..2a3a07e1 100644
--- a/pages/plugins/realstore/detail/detail.vue
+++ b/pages/plugins/realstore/detail/detail.vue
@@ -294,7 +294,7 @@
client_type: app.globalData.application_client_type(),
currency_symbol: app.globalData.currency_symbol(),
is_top_search_width: false,
- // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+ // #ifdef MP-WEIXIN || MP-QQ || MP-ALIPAY || MP-BAIDU || MP-KUAISHOU || APP
is_top_search_width: true,
// #endif
content_style: '',