Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
starsw001
ShopXO
提交
0bd206bb
ShopXO
项目概览
starsw001
/
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,发现更多精彩内容 >>
提交
0bd206bb
编写于
7月 17, 2019
作者:
D
devil_gong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
baidu
上级
e2559041
变更
18
显示空白变更内容
内联
并排
Showing
18 changed file
with
48 addition
and
101 deletion
+48
-101
application/admin/view/default/appconfig/app.html
application/admin/view/default/appconfig/app.html
+0
-9
application/admin/view/default/appconfig/weixinmini.html
application/admin/view/default/appconfig/weixinmini.html
+9
-0
config/shopxo.sql
config/shopxo.sql
+9
-9
public/appmini/old/baidu/app.js
public/appmini/old/baidu/app.js
+1
-1
public/appmini/old/baidu/components/badge/badge.js
public/appmini/old/baidu/components/badge/badge.js
+3
-2
public/appmini/old/baidu/components/badge/badge.swan
public/appmini/old/baidu/components/badge/badge.swan
+3
-3
public/appmini/old/baidu/components/icon-nav/icon-nav.js
public/appmini/old/baidu/components/icon-nav/icon-nav.js
+3
-2
public/appmini/old/baidu/components/icon-nav/icon-nav.swan
public/appmini/old/baidu/components/icon-nav/icon-nav.swan
+2
-2
public/appmini/old/baidu/components/popup/popup.js
public/appmini/old/baidu/components/popup/popup.js
+4
-3
public/appmini/old/baidu/components/popup/popup.swan
public/appmini/old/baidu/components/popup/popup.swan
+2
-2
public/appmini/old/baidu/components/slider/slider.js
public/appmini/old/baidu/components/slider/slider.js
+3
-4
public/appmini/old/baidu/components/slider/slider.swan
public/appmini/old/baidu/components/slider/slider.swan
+2
-2
public/appmini/old/baidu/pages/goods-detail/goods-detail.js
public/appmini/old/baidu/pages/goods-detail/goods-detail.js
+0
-11
public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
...ic/appmini/old/baidu/pages/goods-detail/goods-detail.swan
+2
-34
public/appmini/old/baidu/pages/goods-search/goods-search.swan
...ic/appmini/old/baidu/pages/goods-search/goods-search.swan
+1
-1
public/appmini/old/baidu/pages/index/index.swan
public/appmini/old/baidu/pages/index/index.swan
+2
-8
public/appmini/old/baidu/pages/user/user.swan
public/appmini/old/baidu/pages/user/user.swan
+1
-7
public/appmini/old/weixin/app.js
public/appmini/old/weixin/app.js
+1
-1
未找到文件。
application/admin/view/default/appconfig/app.html
浏览文件 @
0bd206bb
...
...
@@ -69,15 +69,6 @@
</select>
</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"
>
<label>
{{$data.common_app_is_limitedtimediscount.name}}
<span
class=
"am-form-group-label-tips"
>
{{$data.common_app_is_limitedtimediscount.describe}}
</span></label>
<select
name=
"{{$data.common_app_is_limitedtimediscount.only_tag}}"
class=
"am-radius chosen-select c-p"
data-validation-message=
"{{$data.common_app_is_limitedtimediscount.error_tips}}"
required
>
...
...
application/admin/view/default/appconfig/weixinmini.html
浏览文件 @
0bd206bb
...
...
@@ -9,6 +9,15 @@
<!-- form start -->
<form
class=
"am-form form-validation view-save"
action=
"{{:MyUrl('admin/appconfig/save')}}"
method=
"POST"
request-type=
"ajax-url"
request-value=
"{{:MyUrl('admin/appconfig/index', ['nav_type'=>'weixinmini'])}}"
enctype=
"multipart/form-data"
>
<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"
>
<label>
{{$data.common_app_is_good_thing.name}}
<span
class=
"am-form-group-label-tips"
>
{{$data.common_app_is_good_thing.describe}}
</span></label>
<select
name=
"{{$data.common_app_is_good_thing.only_tag}}"
class=
"am-radius chosen-select c-p"
data-validation-message=
"{{$data.common_app_is_good_thing.error_tips}}"
required
>
...
...
config/shopxo.sql
浏览文件 @
0bd206bb
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
public/appmini/old/baidu/app.js
浏览文件 @
0bd206bb
...
...
@@ -57,7 +57,7 @@ App({
// 请求地址
// request_url: "{{request_url}}",
request_url
:
'
http://tp5-dev.com/
'
,
//
request_url: 'https://test.shopxo.net/',
request_url
:
'
https://test.shopxo.net/
'
,
// 基础信息
application_title
:
"
{{application_title}}
"
,
...
...
public/appmini/old/baidu/components/badge/badge.js
浏览文件 @
0bd206bb
...
...
@@ -4,13 +4,14 @@ Component({
* 组件的属性列表
*/
properties
:
{
propNumber
:
Number
},
/**
* 组件的初始数据
*/
data
:
{},
data
:
{
number
:
0
,
},
/**
* 组件的方法列表
...
...
public/appmini/old/baidu/components/badge/badge.swan
浏览文件 @
0bd206bb
<view s-if="
propN
umber > 0" class="am-badge">
<view class="am-badge-text {{(
propN
umber > 99) ? 'am-badge-text-max' : ''}}">
<text>{{(
propNumber > 99) ? '99+' : propN
umber}}</text>
<view s-if="
n
umber > 0" class="am-badge">
<view class="am-badge-text {{(
n
umber > 99) ? 'am-badge-text-max' : ''}}">
<text>{{(
number > 99) ? '99+' : n
umber}}</text>
</view>
</view>
\ No newline at end of file
public/appmini/old/baidu/components/icon-nav/icon-nav.js
浏览文件 @
0bd206bb
const
app
=
getApp
();
Component
({
data
:
{},
data
:
{
navigation
:
[],
},
properties
:
{
propData
:
Array
},
methods
:
{
navigation_event
(
e
)
{
...
...
public/appmini/old/baidu/components/icon-nav/icon-nav.swan
浏览文件 @
0bd206bb
<view s-if="
propData
.length > 0">
<view s-if="
navigation
.length > 0">
<view class="data-list">
<view class="items" s-for="item, index in
propData
" s-key="key">
<view class="items" s-for="item, index in
navigation
" s-key="key">
<view class="items-content" data-value="{{item.event_value}}" data-type="{{item.event_type}}" bindtap="navigation_event" style="background-color:{{item.bg_color}}">
<image src="{{item.images_url}}" mode="aspectFit" />
</view>
...
...
public/appmini/old/baidu/components/popup/popup.js
浏览文件 @
0bd206bb
...
...
@@ -5,8 +5,6 @@ Component({
*/
properties
:
{
propClassname
:
String
,
propShow
:
Boolean
,
propPosition
:
String
,
propMask
:
Boolean
,
propAnimation
:
Boolean
,
propDisablescroll
:
Boolean
...
...
@@ -15,7 +13,10 @@ Component({
/**
* 组件的初始数据
*/
data
:
{},
data
:
{
status
:
false
,
position
:
'
bottom
'
,
},
/**
* 组件的方法列表
...
...
public/appmini/old/baidu/components/popup/popup.swan
浏览文件 @
0bd206bb
<view class="am-popup {{propClassname || ''}} {{(
propShow
|| false) ? 'am-popup-show' : ''}} {{ (propAnimation || true) ? 'animation': '' }}" disable-scroll="{{propDisablescroll || true}}">
<view class="am-popup {{propClassname || ''}} {{(
status
|| false) ? 'am-popup-show' : ''}} {{ (propAnimation || true) ? 'animation': '' }}" disable-scroll="{{propDisablescroll || true}}">
<view class="am-popup-mask" s-if="propMask || true" bindtap="onMaskTap"></view>
<view class="am-popup-content am-popup-{{p
ropP
osition || 'bottom'}}">
<view class="am-popup-content am-popup-{{position || 'bottom'}}">
<slot></slot>
</view>
</view>
\ No newline at end of file
public/appmini/old/baidu/components/slider/slider.js
浏览文件 @
0bd206bb
...
...
@@ -5,11 +5,10 @@ Component({
indicator_color
:
'
rgba(0, 0, 0, .3)
'
,
indicator_active_color
:
'
#e31c55
'
,
autoplay
:
true
,
circular
:
true
},
properties
:
{
propData
:
Array
circular
:
true
,
banner
:
[],
},
properties
:
{},
methods
:
{
banner_event
(
e
)
{
app
.
operation_event
(
e
);
...
...
public/appmini/old/baidu/components/slider/slider.swan
浏览文件 @
0bd206bb
<swiper indicator-dots="{{
propData.length > 0}}" indicator-color="{{indicator_color}}" indicator-active-color="{{indicator_active_color}}" autoplay="{{propData.length > 0}}" circular="{{circular}}" class="banner" s-if="propData
.length > 0">
<block s-for="item, index in
propData
" s-key="key">
<swiper indicator-dots="{{
banner.length > 0}}" indicator-color="{{indicator_color}}" indicator-active-color="{{indicator_active_color}}" autoplay="{{banner.length > 0}}" circular="{{circular}}" class="banner" s-if="banner
.length > 0">
<block s-for="item, index in
banner
" s-key="key">
<swiper-item>
<image src="{{item.images_url}}" mode="widthFix" data-value="{{item.event_value}}" data-type="{{item.event_type}}" bindtap="banner_event" />
</swiper-item>
...
...
public/appmini/old/baidu/pages/goods-detail/goods-detail.js
浏览文件 @
0bd206bb
...
...
@@ -34,7 +34,6 @@ Page({
goods_video_is_autoplay
:
false
,
common_app_is_use_mobile_detail
:
1
,
popup_share_status
:
false
,
common_app_is_online_service
:
0
,
// 限时秒杀插件
...
...
@@ -583,16 +582,6 @@ Page({
this
.
setData
({
goods_video_is_autoplay
:
false
});
},
// 分享开启弹层
popup_share_event
(
e
)
{
this
.
setData
({
popup_share_status
:
true
});
},
// 分享弹层关闭
popup_share_close_event
(
e
)
{
this
.
setData
({
popup_share_status
:
false
});
},
// 显示秒杀插件-倒计时
plugins_limitedtimediscount_countdown
()
{
var
hours
=
this
.
data
.
plugins_limitedtimediscount_data
.
time
.
hours
||
0
;
...
...
public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
浏览文件 @
0bd206bb
...
...
@@ -32,6 +32,7 @@
<view class="goods-base bg-white">
<view class="goods-price single-text">
<view class="goods-share tc" bindtap="popup_share_event">
<button class="goods-share tc" type="default" size="mini" open-type="share" hover-class="none">
<image src="/images/goods-detail-share-icon.png" mode="scaleToFill" class="dis-block" />
<view class="cr-888">分享</view>
</view>
...
...
@@ -106,7 +107,7 @@
</view>
<!-- 购买弹层 -->
<component-popup
prop-show="{{popup_status}}" prop-
position="bottom" bindonclose="popup_close_event">
<component-popup
status="{{popup_status}}"
position="bottom" bindonclose="popup_close_event">
<view class="goods-popup bg-white">
<view class="close fr oh">
<view class="fr" catchtap="popup_close_event">
...
...
@@ -158,42 +159,9 @@
<button class="goods-popup-submit bg-main" type="default" catchtap="goods_buy_confirm_event" hover-class="none">确定</button>
</view>
</component-popup>
<!-- 分享弹层 -->
<component-popup prop-show="{{popup_share_status}}" prop-position="bottom" bindonclose="popup_share_close_event">
<view class="share-popup bg-white">
<view class="close fr oh">
<view class="fr" catchtap="popup_share_close_event">
<icon type="clear" size="20" />
</view>
</view>
<view class="share-popup-content">
<view class="share-items oh">
<image class="fl" src="/images/share-recomend-icon.png" mode="scaleToFill" />
<view class="cr-888 single-text fl">好物推荐、和大家一起分享你发现的宝贝</view>
</view>
<view class="share-items oh">
<button class="dis-block" type="default" size="mini" open-type="share" hover-class="none">
<image src="/images/share-weixin-icon.png" mode="scaleToFill" />
<text class="cr-888 single-text">一键分享给好友、群聊</text>
</button>
</view>
<view class="share-items oh">
<image src="/images/share-friend-icon.png" mode="scaleToFill" />
<text class="cr-888 single-text">生成海报,分享到朋友圈、好友及群聊</text>
</view>
</view>
</view>
</component-popup>
</view>
<view s-if="goods == null">
<import src="/pages/common/nodata.swan" />
<template is="nodata" data="{{{status: data_list_loding_status, msg: data_list_loding_msg}}}"></template>
</view>
\ No newline at end of file
<!-- 在线客服 -->
<view s-if="common_app_is_online_service == 1">
<import src="/pages/lib/online-service/content.swan" />
<template is="online_service"></template>
</view>
\ No newline at end of file
public/appmini/old/baidu/pages/goods-search/goods-search.swan
浏览文件 @
0bd206bb
...
...
@@ -37,7 +37,7 @@
</scroll-view>
<!-- 筛选条件 popup -->
<component-popup
prop-show="{{is_show_popup_form}}" prop-
position="right" bindonclose="popup_form_event_close">
<component-popup
status="{{is_show_popup_form}}"
position="right" bindonclose="popup_form_event_close">
<form bindsubmit="form_submit_event" class="popup-form oh bg-white">
<view class="item oh screening-price">
<view class="title cr-666">价格区间(元)
...
...
public/appmini/old/baidu/pages/index/index.swan
浏览文件 @
0bd206bb
...
...
@@ -13,10 +13,10 @@
</view>
<!-- 轮播 -->
<component-banner
prop-data
="{{banner_list}}"></component-banner>
<component-banner
banner
="{{banner_list}}"></component-banner>
<!-- 导航 -->
<component-icon-nav
prop-data
="{{navigation}}"></component-icon-nav>
<component-icon-nav
navigation
="{{navigation}}"></component-icon-nav>
<!-- 限时秒杀 -->
<view s-if="common_app_is_limitedtimediscount == 1">
...
...
@@ -75,12 +75,6 @@
<import src="/pages/common/bottom_line.swan" />
<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">
<import src="/pages/common/copyright.swan" />
...
...
public/appmini/old/baidu/pages/user/user.swan
浏览文件 @
0bd206bb
...
...
@@ -39,7 +39,7 @@
<navigator url="/pages/{{item.url}}/{{item.url}}?status={{items.status}}" hover-class="none">
<view class="items fl tc">
<view class="badge-icon">
<component-badge
prop-
number="{{items.count}}"></component-badge>
<component-badge number="{{items.count}}"></component-badge>
</view>
<image src="/images/user-index-nav-order-icon-{{items.status}}.png" class="items-icon" mode="aspectFill" />
<view class="items-name">{{items.name}}</view>
...
...
@@ -77,12 +77,6 @@
<view class="tips">{{common_user_center_notice}}</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" />
<template is="copyright"></template>
public/appmini/old/weixin/app.js
浏览文件 @
0bd206bb
...
...
@@ -62,7 +62,7 @@ App({
// 请求地址
// request_url: "{{request_url}}",
request_url
:
'
http://tp5-dev.com/
'
,
//
request_url: 'https://test.shopxo.net/',
request_url
:
'
https://test.shopxo.net/
'
,
// 基础信息
application_title
:
"
{{application_title}}
"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录