提交 7681fcb1 编写于 作者: D devil_gong

细节优化

上级 faa91502
...@@ -161,8 +161,14 @@ function MiniAppEnv() ...@@ -161,8 +161,14 @@ function MiniAppEnv()
if(!empty($_SERVER['HTTP_USER_AGENT'])) if(!empty($_SERVER['HTTP_USER_AGENT']))
{ {
// 微信小程序 miniProgram // 微信小程序 miniProgram
// QQ小程序 miniProgram
if(stripos($_SERVER['HTTP_USER_AGENT'], 'miniProgram') !== false) if(stripos($_SERVER['HTTP_USER_AGENT'], 'miniProgram') !== false)
{ {
// 是否QQ小程序
if(stripos($_SERVER['HTTP_USER_AGENT'], 'QQ') !== false)
{
return 'qq';
}
return 'weixin'; return 'weixin';
} }
......
...@@ -72,6 +72,6 @@ return [ ...@@ -72,6 +72,6 @@ return [
'under_line_list' => ['CashPayment', 'DeliveryPayment'], '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
...@@ -61,8 +61,8 @@ App({ ...@@ -61,8 +61,8 @@ App({
// 请求地址 // 请求地址
request_url: "{{request_url}}", request_url: "{{request_url}}",
request_url: 'http://tp5-dev.com/', // request_url: 'http://tp5-dev.com/',
request_url: 'https://test.shopxo.net/', // request_url: 'https://test.shopxo.net/',
// 基础信息 // 基础信息
application_title: "{{application_title}}", application_title: "{{application_title}}",
......
...@@ -34,6 +34,8 @@ Page({ ...@@ -34,6 +34,8 @@ Page({
goods_video_is_autoplay: false, goods_video_is_autoplay: false,
common_app_is_use_mobile_detail: 1, common_app_is_use_mobile_detail: 1,
common_app_is_online_service: 0,
// 限时秒杀插件 // 限时秒杀插件
common_app_is_limitedtimediscount: 0, common_app_is_limitedtimediscount: 0,
plugins_limitedtimediscount_data: null, plugins_limitedtimediscount_data: null,
...@@ -116,6 +118,7 @@ Page({ ...@@ -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, 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_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, common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0,
plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null, plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
......
...@@ -190,6 +190,12 @@ ...@@ -190,6 +190,12 @@
<template is="nodata" data="{{{status: data_list_loding_status, msg: data_list_loding_msg}}}"></template> <template is="nodata" data="{{{status: data_list_loding_status, msg: data_list_loding_msg}}}"></template>
</view> </view>
<!-- 在线客服 -->
<view s-if="common_app_is_online_service == 1">
<import src="/pages/lib/online-service/content.swan" />
<template is="online_service"></template>
</view>
<!-- 购物车 --> <!-- 购物车 -->
<navigator url="/pages/cart/cart" open-type="switchTab" hover-class="none"> <navigator url="/pages/cart/cart" open-type="switchTab" hover-class="none">
<view class="common-quick-nav quick-nav-cart"> <view class="common-quick-nav quick-nav-cart">
......
...@@ -11,6 +11,7 @@ Page({ ...@@ -11,6 +11,7 @@ Page({
common_app_is_enable_search: 1, common_app_is_enable_search: 1,
common_app_is_enable_answer: 1, common_app_is_enable_answer: 1,
common_app_is_header_nav_fixed: 0, common_app_is_header_nav_fixed: 0,
common_app_is_online_service: 0,
// 限时秒杀插件 // 限时秒杀插件
common_app_is_limitedtimediscount: 0, common_app_is_limitedtimediscount: 0,
...@@ -55,6 +56,7 @@ Page({ ...@@ -55,6 +56,7 @@ Page({
common_app_is_enable_answer: data.common_app_is_enable_answer, common_app_is_enable_answer: data.common_app_is_enable_answer,
common_app_is_header_nav_fixed: data.common_app_is_header_nav_fixed, common_app_is_header_nav_fixed: data.common_app_is_header_nav_fixed,
data_list_loding_status: data.data_list.length == 0 ? 0 : 3, 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, common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0,
plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null
}); });
......
...@@ -75,6 +75,12 @@ ...@@ -75,6 +75,12 @@
<import src="/pages/common/bottom_line.swan" /> <import src="/pages/common/bottom_line.swan" />
<template is="bottom_line" data="{{{status: data_bottom_line_status}}}"></template> <template is="bottom_line" data="{{{status: data_bottom_line_status}}}"></template>
<!-- 在线客服 -->
<view s-if="common_app_is_online_service == 1">
<import src="/pages/lib/online-service/content.swan" />
<template is="online_service"></template>
</view>
<!-- 版权 --> <!-- 版权 -->
<view s-if="load_status == 1"> <view s-if="load_status == 1">
<import src="/pages/common/copyright.swan" /> <import src="/pages/common/copyright.swan" />
......
...@@ -27,6 +27,8 @@ Page({ ...@@ -27,6 +27,8 @@ Page({
// 远程自定义导航 // 远程自定义导航
navigation: [], navigation: [],
common_app_is_online_service: 0,
}, },
onShow() { onShow() {
...@@ -105,6 +107,7 @@ Page({ ...@@ -105,6 +107,7 @@ Page({
message_total: (data.common_message_total || 0) == 0 ? 0 : data.common_message_total, message_total: (data.common_message_total || 0) == 0 ? 0 : data.common_message_total,
head_nav_list: temp_head_nav_list, head_nav_list: temp_head_nav_list,
navigation: data.navigation || [], navigation: data.navigation || [],
common_app_is_online_service: data.common_app_is_online_service || 0,
}); });
} else { } else {
app.showToast(res.data.msg); app.showToast(res.data.msg);
......
...@@ -77,6 +77,12 @@ ...@@ -77,6 +77,12 @@
<view class="tips">{{common_user_center_notice}}</view> <view class="tips">{{common_user_center_notice}}</view>
</view> </view>
<!-- 在线客服 -->
<view s-if="common_app_is_online_service == 1">
<import src="/pages/lib/online-service/content.swan" />
<template is="online_service"></template>
</view>
<!-- 版权 --> <!-- 版权 -->
<import src="/pages/common/copyright.swan" /> <import src="/pages/common/copyright.swan" />
<template is="copyright"></template> <template is="copyright"></template>
...@@ -66,7 +66,7 @@ App({ ...@@ -66,7 +66,7 @@ App({
// 请求地址 // 请求地址
request_url: "{{request_url}}", request_url: "{{request_url}}",
request_url: 'http://tp5-dev.com/', // request_url: 'http://tp5-dev.com/',
request_url: 'https://test.shopxo.net/', request_url: 'https://test.shopxo.net/',
// 基础信息 // 基础信息
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
"pages/user-coupon/user-coupon" "pages/user-coupon/user-coupon"
], ],
"window": { "window": {
"navigationBarTitleText": "{{application_title}}", "navigationBarTitleText": "ShopXO",
"navigationBarBackgroundColor": "#d2364c" "navigationBarBackgroundColor": "#d2364c"
}, },
"tabBar": { "tabBar": {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册