Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jamesyang1999
ShopXO
提交
7a5985cc
ShopXO
项目概览
jamesyang1999
/
ShopXO
与 Fork 源项目一致
Fork自
纵之格 / ShopXO
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7a5985cc
编写于
7月 04, 2019
作者:
G
gongfuxiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
小程序开发
上级
55ff3b8d
变更
21
展开全部
隐藏空白更改
内联
并排
Showing
21 changed file
with
85 addition
and
30 deletion
+85
-30
application/admin/view/default/appconfig/app.html
application/admin/view/default/appconfig/app.html
+9
-0
application/api/controller/Goods.php
application/api/controller/Goods.php
+4
-3
application/api/controller/Index.php
application/api/controller/Index.php
+1
-0
application/api/controller/User.php
application/api/controller/User.php
+1
-0
config/shopxo.sql
config/shopxo.sql
+8
-10
public/appmini/old/alipay/images/customer-service.png
public/appmini/old/alipay/images/customer-service.png
+0
-0
public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
...c/appmini/old/alipay/pages/goods-detail/goods-detail.axml
+2
-2
public/appmini/old/alipay/pages/goods-detail/goods-detail.js
public/appmini/old/alipay/pages/goods-detail/goods-detail.js
+2
-2
public/appmini/old/alipay/pages/user/user.acss
public/appmini/old/alipay/pages/user/user.acss
+3
-3
public/appmini/old/weixin/app.wxss
public/appmini/old/weixin/app.wxss
+18
-0
public/appmini/old/weixin/images/customer-service.png
public/appmini/old/weixin/images/customer-service.png
+0
-0
public/appmini/old/weixin/images/default-online-service-icon.png
...appmini/old/weixin/images/default-online-service-icon.png
+0
-0
public/appmini/old/weixin/pages/common/customer_service.wxml
public/appmini/old/weixin/pages/common/customer_service.wxml
+0
-4
public/appmini/old/weixin/pages/common/online_service.wxml
public/appmini/old/weixin/pages/common/online_service.wxml
+5
-0
public/appmini/old/weixin/pages/goods-detail/goods-detail.js
public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+5
-2
public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
...c/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
+8
-2
public/appmini/old/weixin/pages/index/index.js
public/appmini/old/weixin/pages/index/index.js
+2
-0
public/appmini/old/weixin/pages/index/index.wxml
public/appmini/old/weixin/pages/index/index.wxml
+6
-0
public/appmini/old/weixin/pages/user/user.js
public/appmini/old/weixin/pages/user/user.js
+3
-0
public/appmini/old/weixin/pages/user/user.wxml
public/appmini/old/weixin/pages/user/user.wxml
+6
-0
public/appmini/old/weixin/pages/user/user.wxss
public/appmini/old/weixin/pages/user/user.wxss
+2
-2
未找到文件。
application/admin/view/default/appconfig/app.html
浏览文件 @
7a5985cc
...
@@ -69,6 +69,15 @@
...
@@ -69,6 +69,15 @@
</select>
</select>
</div>
</div>
<div
class=
"am-form-group"
>
<label>
{{$data.common_app_is_online_service.name}}
<span
class=
"am-form-group-label-tips"
>
{{$data.common_app_is_online_service.describe}}
</span></label>
<select
name=
"{{$data.common_app_is_online_service.only_tag}}"
class=
"am-radius chosen-select c-p"
data-validation-message=
"{{$data.common_app_is_online_service.error_tips}}"
required
>
{{foreach $common_is_text_list as $v}}
<option
value=
"{{$v.id}}"
{{
if
isset
($
data
['
common_app_is_online_service
']['
value
'])
and
$
data
['
common_app_is_online_service
']['
value
']
eq
$
v
['
id
']}}
selected
{{/
if
}}
>
{{$v.name}}
</option>
{{/foreach}}
</select>
</div>
<div
class=
"am-form-group am-form-group-refreshing"
>
<div
class=
"am-form-group am-form-group-refreshing"
>
<input
type=
"hidden"
name=
"nav_type"
value=
"{{$nav_type}}"
/>
<input
type=
"hidden"
name=
"nav_type"
value=
"{{$nav_type}}"
/>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block"
data-am-loading=
"{loadingText:'处理中...'}"
>
保存
</button>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block"
data-am-loading=
"{loadingText:'处理中...'}"
>
保存
</button>
...
...
application/api/controller/Goods.php
浏览文件 @
7a5985cc
...
@@ -105,9 +105,10 @@ class Goods extends Common
...
@@ -105,9 +105,10 @@ class Goods extends Common
// 数据返回
// 数据返回
$result
=
[
$result
=
[
'goods'
=>
$ret
[
'data'
][
0
],
'goods'
=>
$ret
[
'data'
][
0
],
'common_order_is_booking'
=>
(
int
)
MyC
(
'common_order_is_booking'
,
0
),
'common_order_is_booking'
=>
(
int
)
MyC
(
'common_order_is_booking'
,
0
),
'is_use_mobile_detail'
=>
$is_use_mobile_detail
,
'common_app_is_use_mobile_detail'
=>
$is_use_mobile_detail
,
'common_app_is_online_service'
=>
(
int
)
MyC
(
'common_app_is_online_service'
,
0
),
];
];
return
DataReturn
(
'success'
,
0
,
$result
);
return
DataReturn
(
'success'
,
0
,
$result
);
}
}
...
...
application/api/controller/Index.php
浏览文件 @
7a5985cc
...
@@ -53,6 +53,7 @@ class Index extends Common
...
@@ -53,6 +53,7 @@ class Index extends Common
'common_app_is_enable_search'
=>
(
int
)
MyC
(
'common_app_is_enable_search'
,
1
),
'common_app_is_enable_search'
=>
(
int
)
MyC
(
'common_app_is_enable_search'
,
1
),
'common_app_is_enable_answer'
=>
(
int
)
MyC
(
'common_app_is_enable_answer'
,
1
),
'common_app_is_enable_answer'
=>
(
int
)
MyC
(
'common_app_is_enable_answer'
,
1
),
'common_app_is_header_nav_fixed'
=>
(
int
)
MyC
(
'common_app_is_header_nav_fixed'
,
0
),
'common_app_is_header_nav_fixed'
=>
(
int
)
MyC
(
'common_app_is_header_nav_fixed'
,
0
),
'common_app_is_online_service'
=>
(
int
)
MyC
(
'common_app_is_online_service'
,
0
),
];
];
// 返回数据
// 返回数据
...
...
application/api/controller/User.php
浏览文件 @
7a5985cc
...
@@ -284,6 +284,7 @@ class User extends Common
...
@@ -284,6 +284,7 @@ class User extends Common
'user_goods_browse_count'
=>
$user_goods_browse_count
,
'user_goods_browse_count'
=>
$user_goods_browse_count
,
'common_message_total'
=>
$common_message_total
,
'common_message_total'
=>
$common_message_total
,
'navigation'
=>
AppCenterNavService
::
AppCenterNav
(),
'navigation'
=>
AppCenterNavService
::
AppCenterNav
(),
'common_app_is_online_service'
=>
(
int
)
MyC
(
'common_app_is_online_service'
,
0
),
);
);
// 返回数据
// 返回数据
...
...
config/shopxo.sql
浏览文件 @
7a5985cc
此差异已折叠。
点击以展开。
public/appmini/old/alipay/images/customer-service.png
已删除
100755 → 0
浏览文件 @
55ff3b8d
1.9 KB
public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
浏览文件 @
7a5985cc
...
@@ -50,11 +50,11 @@
...
@@ -50,11 +50,11 @@
<text class="text-wrapper">详情</text>
<text class="text-wrapper">详情</text>
</view>
</view>
<!-- web详情 -->
<!-- web详情 -->
<view a:if="{{is_use_mobile_detail == 0}}" class="bg-white">
<view a:if="{{
common_app_
is_use_mobile_detail == 0}}" class="bg-white">
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
</view>
</view>
<!-- 手机独立详情 -->
<!-- 手机独立详情 -->
<block a:if="{{is_use_mobile_detail == 1 && goods_content_app.length > 0}}">
<block a:if="{{
common_app_
is_use_mobile_detail == 1 && goods_content_app.length > 0}}">
<view a:for="{{goods_content_app}}" class="goods-detail-app bg-white">
<view a:for="{{goods_content_app}}" class="goods-detail-app bg-white">
<image a:if="{{(item.images || null) != null}}" onTap="goods_detail_images_view_event" data-value="{{item.images}}" class="wh-auto dis-block" src="{{item.images}}" mode="widthFix" />
<image a:if="{{(item.images || null) != null}}" onTap="goods_detail_images_view_event" data-value="{{item.images}}" class="wh-auto dis-block" src="{{item.images}}" mode="widthFix" />
<view a:if="{{(item.content || null) != null}}" class="content-items">
<view a:if="{{(item.content || null) != null}}" class="content-items">
...
...
public/appmini/old/alipay/pages/goods-detail/goods-detail.js
浏览文件 @
7a5985cc
...
@@ -31,7 +31,7 @@ Page({
...
@@ -31,7 +31,7 @@ Page({
goods_spec_base_images
:
''
,
goods_spec_base_images
:
''
,
show_field_price_text
:
null
,
show_field_price_text
:
null
,
is_use_mobile_detail
:
1
,
common_app_
is_use_mobile_detail
:
1
,
},
},
onLoad
(
params
)
{
onLoad
(
params
)
{
...
@@ -101,7 +101,7 @@ Page({
...
@@ -101,7 +101,7 @@ Page({
goods_spec_base_images
:
data
.
goods
.
images
,
goods_spec_base_images
:
data
.
goods
.
images
,
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
),
is_use_mobile_detail
:
data
.
is_use_mobile_detail
||
0
,
common_app_is_use_mobile_detail
:
data
.
common_app_
is_use_mobile_detail
||
0
,
});
});
// 标题
// 标题
...
...
public/appmini/old/alipay/pages/user/user.acss
浏览文件 @
7a5985cc
...
@@ -49,12 +49,12 @@
...
@@ -49,12 +49,12 @@
}
}
/* 导航列表 */
/* 导航列表 */
.nav-box .nav-item{
.nav-box .nav-item
{
height: 100rpx;
height: 100rpx;
box-sizing: border-box;
box-sizing: border-box;
padding: 30rpx 20rpx;
padding: 30rpx 20rpx;
}
}
.nav-box .nav-item .item-icon{
.nav-box .nav-item .item-icon
{
width: 40rpx;
width: 40rpx;
height: 40rpx;
height: 40rpx;
vertical-align: middle;
vertical-align: middle;
...
@@ -89,5 +89,5 @@
...
@@ -89,5 +89,5 @@
left: calc(50% + 30rpx);
left: calc(50% + 30rpx);
}
}
/* 通知 */
.user-notice { margin-top: 20rpx; padding: 0 10rpx 20rpx 10rpx; }
.user-notice { margin-top: 20rpx; padding: 0 10rpx 20rpx 10rpx; }
\ No newline at end of file
public/appmini/old/weixin/app.wxss
浏览文件 @
7a5985cc
...
@@ -316,4 +316,22 @@ button[disabled].bg-primary {
...
@@ -316,4 +316,22 @@ button[disabled].bg-primary {
.share-popup-content .share-items .single-text {
.share-popup-content .share-items .single-text {
width: calc(100% - 100rpx);
width: calc(100% - 100rpx);
line-height: 85rpx;
line-height: 85rpx;
}
/*
在线客服
*/
.common-online-service {
border: 0;
padding: 15rpx;
background: rgba(0, 0, 0, 0.6);
position: fixed;
right: 10rpx;
bottom: 35%;
line-height: 30rpx;
border-radius: 50%;
}
.common-online-service image {
width: 60rpx;
height: 60rpx;
}
}
\ No newline at end of file
public/appmini/old/weixin/images/customer-service.png
已删除
100755 → 0
浏览文件 @
55ff3b8d
1.9 KB
public/appmini/old/weixin/images/default-online-service-icon.png
0 → 100644
浏览文件 @
7a5985cc
1.8 KB
public/appmini/old/weixin/pages/common/customer_service.wxml
已删除
100644 → 0
浏览文件 @
55ff3b8d
<button open-type="contact" class="common-customer-service">
<image src="/images/user-nav-customer-service-icon.png"></image>
<text>在线客服</text>
</button>
\ No newline at end of file
public/appmini/old/weixin/pages/common/online_service.wxml
0 → 100644
浏览文件 @
7a5985cc
<template name="online_service">
<button open-type="contact" class="common-online-service">
<image src="/images/default-online-service-icon.png"></image>
</button>
</template>
\ No newline at end of file
public/appmini/old/weixin/pages/goods-detail/goods-detail.js
浏览文件 @
7a5985cc
...
@@ -32,9 +32,11 @@ Page({
...
@@ -32,9 +32,11 @@ Page({
show_field_price_text
:
null
,
show_field_price_text
:
null
,
goods_video_is_autoplay
:
false
,
goods_video_is_autoplay
:
false
,
is_use_mobile_detail
:
1
,
common_app_
is_use_mobile_detail
:
1
,
popup_share_status
:
false
,
popup_share_status
:
false
,
common_app_is_online_service
:
0
,
},
},
onLoad
(
params
)
{
onLoad
(
params
)
{
...
@@ -103,7 +105,8 @@ Page({
...
@@ -103,7 +105,8 @@ Page({
goods_spec_base_images
:
data
.
goods
.
images
,
goods_spec_base_images
:
data
.
goods
.
images
,
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
),
is_use_mobile_detail
:
data
.
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
,
});
});
// 标题
// 标题
...
...
public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
浏览文件 @
7a5985cc
...
@@ -59,11 +59,11 @@
...
@@ -59,11 +59,11 @@
<text class="text-wrapper">详情</text>
<text class="text-wrapper">详情</text>
</view>
</view>
<!-- web详情 -->
<!-- web详情 -->
<view wx:if="{{is_use_mobile_detail == 0}}" class="bg-white">
<view wx:if="{{
common_app_
is_use_mobile_detail == 0}}" class="bg-white">
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
</view>
</view>
<!-- 手机独立详情 -->
<!-- 手机独立详情 -->
<block wx:if="{{is_use_mobile_detail == 1 && goods_content_app.length > 0}}">
<block wx:if="{{
common_app_
is_use_mobile_detail == 1 && goods_content_app.length > 0}}">
<view wx:for="{{goods_content_app}}" wx:key="key" class="goods-detail-app bg-white">
<view wx:for="{{goods_content_app}}" wx:key="key" class="goods-detail-app bg-white">
<image wx:if="{{(item.images || null) != null}}" bindtap="goods_detail_images_view_event" data-value="{{item.images}}" class="wh-auto dis-block" src="{{item.images}}" mode="widthFix" />
<image wx:if="{{(item.images || null) != null}}" bindtap="goods_detail_images_view_event" data-value="{{item.images}}" class="wh-auto dis-block" src="{{item.images}}" mode="widthFix" />
<view wx:if="{{(item.content || null) != null}}" class="content-items">
<view wx:if="{{(item.content || null) != null}}" class="content-items">
...
@@ -178,4 +178,10 @@
...
@@ -178,4 +178,10 @@
<view wx:if="{{goods == null}}">
<view wx:if="{{goods == null}}">
<import src="/pages/common/nodata.wxml" />
<import src="/pages/common/nodata.wxml" />
<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 wx:if="{{common_app_is_online_service == 1}}">
<import src="/pages/common/online_service.wxml" />
<template is="online_service"></template>
</view>
</view>
\ No newline at end of file
public/appmini/old/weixin/pages/index/index.js
浏览文件 @
7a5985cc
...
@@ -10,6 +10,7 @@ Page({
...
@@ -10,6 +10,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
,
load_status
:
0
,
load_status
:
0
,
},
},
...
@@ -47,6 +48,7 @@ Page({
...
@@ -47,6 +48,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
,
data_bottom_line_status
:
true
,
data_bottom_line_status
:
true
,
});
});
}
else
{
}
else
{
...
...
public/appmini/old/weixin/pages/index/index.wxml
浏览文件 @
7a5985cc
...
@@ -69,6 +69,12 @@
...
@@ -69,6 +69,12 @@
<import src="/pages/common/bottom_line.wxml" />
<import src="/pages/common/bottom_line.wxml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
<!-- 在线客服 -->
<view wx:if="{{common_app_is_online_service == 1}}">
<import src="/pages/common/online_service.wxml" />
<template is="online_service"></template>
</view>
<!-- 版权 -->
<!-- 版权 -->
<view wx:if="{{load_status == 1}}">
<view wx:if="{{load_status == 1}}">
<import src="/pages/common/copyright.wxml" />
<import src="/pages/common/copyright.wxml" />
...
...
public/appmini/old/weixin/pages/user/user.js
浏览文件 @
7a5985cc
...
@@ -28,6 +28,8 @@ Page({
...
@@ -28,6 +28,8 @@ Page({
// 远程自定义导航
// 远程自定义导航
navigation
:
[],
navigation
:
[],
common_app_is_online_service
:
0
,
},
},
onShow
()
{
onShow
()
{
...
@@ -106,6 +108,7 @@ Page({
...
@@ -106,6 +108,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
);
...
...
public/appmini/old/weixin/pages/user/user.wxml
浏览文件 @
7a5985cc
...
@@ -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 wx:if="{{common_app_is_online_service == 1}}">
<import src="/pages/common/online_service.wxml" />
<template is="online_service"></template>
</view>
<!-- 版权 -->
<!-- 版权 -->
<import src="/pages/common/copyright.wxml" />
<import src="/pages/common/copyright.wxml" />
<template is="copyright"></template>
<template is="copyright"></template>
public/appmini/old/weixin/pages/user/user.wxss
浏览文件 @
7a5985cc
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
}
}
/* 导航列表 */
/* 导航列表 */
.nav-box .nav-item{
.nav-box .nav-item
{
height: 100rpx;
height: 100rpx;
box-sizing: border-box;
box-sizing: border-box;
padding: 30rpx 20rpx;
padding: 30rpx 20rpx;
...
@@ -90,5 +90,5 @@
...
@@ -90,5 +90,5 @@
left: calc(50% + 35rpx);
left: calc(50% + 35rpx);
}
}
/* 通知 */
.user-notice { margin-top: 20rpx; padding: 0 10rpx 20rpx 10rpx; }
.user-notice { margin-top: 20rpx; padding: 0 10rpx 20rpx 10rpx; }
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录