diff --git a/application/common.php b/application/common.php
index 4f98bb3c86604fd8696d6fd518470b8700aab8ec..95c4beba59d4008e4af148006d426332f21a6569 100755
--- a/application/common.php
+++ b/application/common.php
@@ -161,8 +161,14 @@ function MiniAppEnv()
if(!empty($_SERVER['HTTP_USER_AGENT']))
{
// 微信小程序 miniProgram
+ // QQ小程序 miniProgram
if(stripos($_SERVER['HTTP_USER_AGENT'], 'miniProgram') !== false)
{
+ // 是否QQ小程序
+ if(stripos($_SERVER['HTTP_USER_AGENT'], 'QQ') !== false)
+ {
+ return 'qq';
+ }
return 'weixin';
}
diff --git a/config/shopxo.php b/config/shopxo.php
index d9b9ba6b1adc7a1a179058f1ae6efe918d1c2fa2..c7111a6b072d29914e4f9dce97e1371749cba815 100755
--- a/config/shopxo.php
+++ b/config/shopxo.php
@@ -72,6 +72,6 @@ return [
'under_line_list' => ['CashPayment', 'DeliveryPayment'],
// 小程序平台
- 'mini_app_type_list' => ['weixin', 'alipay', 'baidu', 'toutiao'],
+ 'mini_app_type_list' => ['weixin', 'alipay', 'baidu', 'toutiao', 'qq'],
];
?>
\ No newline at end of file
diff --git a/public/appmini/old/baidu/app.js b/public/appmini/old/baidu/app.js
index 0cae405a06350e0244469cedb2b3c1be8e3abbbb..0aadab483659ca4b9c5e0be9474a959eb98e75d2 100755
--- a/public/appmini/old/baidu/app.js
+++ b/public/appmini/old/baidu/app.js
@@ -61,8 +61,8 @@ App({
// 请求地址
request_url: "{{request_url}}",
- request_url: 'http://tp5-dev.com/',
- request_url: 'https://test.shopxo.net/',
+ // request_url: 'http://tp5-dev.com/',
+ // request_url: 'https://test.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",
diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js
index da0a05c3752d7c2b4031e411eebd0e30e81ca7b4..eca492777f41a88da0c80e7f8429ff45e4f02c9c 100755
--- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js
@@ -34,6 +34,8 @@ Page({
goods_video_is_autoplay: false,
common_app_is_use_mobile_detail: 1,
+ common_app_is_online_service: 0,
+
// 限时秒杀插件
common_app_is_limitedtimediscount: 0,
plugins_limitedtimediscount_data: null,
@@ -116,6 +118,7 @@ Page({
show_field_price_text: data.goods.show_field_price_text == '销售价' ? null : data.goods.show_field_price_text.replace(/<[^>]+>/g, "") || null,
common_app_is_use_mobile_detail: data.common_app_is_use_mobile_detail || 0,
+ common_app_is_online_service: data.common_app_is_online_service || 0,
common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0,
plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan b/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
index b820cb4c78d11c7dd557ba759b3660b8732d335b..8c51a0c352088c93f2cc63e967ade4d5e75317e0 100755
--- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
+++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
@@ -190,6 +190,12 @@
+
+
+
+
+
+
diff --git a/public/appmini/old/baidu/pages/index/index.js b/public/appmini/old/baidu/pages/index/index.js
index 0a895d3faef7e6b0abbf4a4671d74e6bf3dfd263..ba1a564d81d523263ba6980c45c32b09cf620da6 100755
--- a/public/appmini/old/baidu/pages/index/index.js
+++ b/public/appmini/old/baidu/pages/index/index.js
@@ -11,6 +11,7 @@ Page({
common_app_is_enable_search: 1,
common_app_is_enable_answer: 1,
common_app_is_header_nav_fixed: 0,
+ common_app_is_online_service: 0,
// 限时秒杀插件
common_app_is_limitedtimediscount: 0,
@@ -55,6 +56,7 @@ Page({
common_app_is_enable_answer: data.common_app_is_enable_answer,
common_app_is_header_nav_fixed: data.common_app_is_header_nav_fixed,
data_list_loding_status: data.data_list.length == 0 ? 0 : 3,
+ common_app_is_online_service: data.common_app_is_online_service || 0,
common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0,
plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null
});
diff --git a/public/appmini/old/baidu/pages/index/index.swan b/public/appmini/old/baidu/pages/index/index.swan
index 6b9e817868ec42b9b61a67d548371763ff868cbf..1e58ce7949b63ebfc309d8962b42008ef911dfec 100755
--- a/public/appmini/old/baidu/pages/index/index.swan
+++ b/public/appmini/old/baidu/pages/index/index.swan
@@ -75,6 +75,12 @@
+
+
+
+
+
+
diff --git a/public/appmini/old/baidu/pages/user/user.js b/public/appmini/old/baidu/pages/user/user.js
index 273b5264d658a4e454e6637e65276d853fbfaa13..461dc77b0f1c595ac18161a31665f8c0fb3ac9e1 100755
--- a/public/appmini/old/baidu/pages/user/user.js
+++ b/public/appmini/old/baidu/pages/user/user.js
@@ -27,6 +27,8 @@ Page({
// 远程自定义导航
navigation: [],
+
+ common_app_is_online_service: 0,
},
onShow() {
@@ -105,6 +107,7 @@ Page({
message_total: (data.common_message_total || 0) == 0 ? 0 : data.common_message_total,
head_nav_list: temp_head_nav_list,
navigation: data.navigation || [],
+ common_app_is_online_service: data.common_app_is_online_service || 0,
});
} else {
app.showToast(res.data.msg);
diff --git a/public/appmini/old/baidu/pages/user/user.swan b/public/appmini/old/baidu/pages/user/user.swan
index ae229dcced976559b5f2683ce053b4561f6e3922..ac209174da8f4f8d3669cf4d3a5ce4866cf0f5fa 100755
--- a/public/appmini/old/baidu/pages/user/user.swan
+++ b/public/appmini/old/baidu/pages/user/user.swan
@@ -77,6 +77,12 @@
{{common_user_center_notice}}
+
+
+
+
+
+
diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js
index b88af12f932fe9b5c16bfce80fd11c66acec1cb7..756e14a8c6ff831d62bb92a6ed4d9d2054af603a 100755
--- a/public/appmini/old/weixin/app.js
+++ b/public/appmini/old/weixin/app.js
@@ -66,7 +66,7 @@ App({
// 请求地址
request_url: "{{request_url}}",
- request_url: 'http://tp5-dev.com/',
+ // request_url: 'http://tp5-dev.com/',
request_url: 'https://test.shopxo.net/',
// 基础信息
diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json
index a48234485b02dcfed88a9bda55131cebb3080f31..e9abf6d6421f172ed240782c61f641d86c40bcac 100755
--- a/public/appmini/old/weixin/app.json
+++ b/public/appmini/old/weixin/app.json
@@ -30,7 +30,7 @@
"pages/user-coupon/user-coupon"
],
"window": {
- "navigationBarTitleText": "{{application_title}}",
+ "navigationBarTitleText": "ShopXO",
"navigationBarBackgroundColor": "#d2364c"
},
"tabBar": {