bingyi/shopxo
1
0
Fork 0
mirror of https://gitee.com/zongzhige/shopxo.git synced 2026-07-08 22:40:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

细节优化

Browse Source
This commit is contained in:
devil
2020-10-06 22:24:35 +08:00
parent ea445d3873
commit f7cc2803ea
33 changed files with 370 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/admin/controller/Articlecategory.php
View File

@ -71,7 +71,7 @@ class ArticleCategory extends Common
}
// 开始操作
return ArticleService::ArticleCategoryNodeSon(input());
return ArticleService::ArticleCategoryNodeSon($this->data_request);
}
/**
@ -90,7 +90,7 @@ class ArticleCategory extends Common
}
// 开始操作
return ArticleService::ArticleCategorySave(input());
return ArticleService::ArticleCategorySave($this->data_request);
}
/**
@ -109,7 +109,7 @@ class ArticleCategory extends Common
}
// 开始操作
$params = input('post.');
$params = $this->data_post;
$params['admin'] = $this->admin;
return ArticleService::ArticleCategoryDelete($params);
}

2
application/admin/controller/Email.php
View File

@ -95,7 +95,7 @@ class Email extends Common
$obj = new \base\Email($verify_param);
$email_param = array(
'email' => input('email'),
'email' => isset($this->data_request['email']) ? $this->data_request['email'] : '',
'content' => '邮件配置-发送测试内容',
'title' => MyC('home_site_name').' - '.'测试',
);

6
application/admin/controller/Express.php
View File

@ -74,7 +74,7 @@ class Express extends Common
}
// 开始操作
return ExpressService::ExpressNodeSon(input());
return ExpressService::ExpressNodeSon($this->data_request);
}
/**
@ -93,7 +93,7 @@ class Express extends Common
}
// 开始操作
return ExpressService::ExpressSave(input());
return ExpressService::ExpressSave($this->data_request);
}
/**
@ -112,7 +112,7 @@ class Express extends Common
}
// 开始操作
$params = input('post.');
$params = $this->data_post;
$params['admin'] = $this->admin;
return ExpressService::ExpressDelete($params);
}

6
application/admin/controller/Goodscategory.php
View File

@ -80,7 +80,7 @@ class GoodsCategory extends Common
}
// 开始操作
return GoodsService::GoodsCategoryNodeSon(input());
return GoodsService::GoodsCategoryNodeSon($this->data_request);
}
@ -100,7 +100,7 @@ class GoodsCategory extends Common
}
// 开始操作
return GoodsService::GoodsCategorySave(input());
return GoodsService::GoodsCategorySave($this->data_request);
}
/**
@ -119,7 +119,7 @@ class GoodsCategory extends Common
}
// 开始操作
$params = input('post.');
$params = $this->data_post;
$params['admin'] = $this->admin;
return GoodsService::GoodsCategoryDelete($params);
}

10
application/admin/controller/Goodscomments.php
View File

@ -119,7 +119,7 @@ class Goodscomments extends Common
public function SaveInfo()
{
// 参数
$params = input();
$params = $this->data_request;
// 数据
$data = [];
@ -166,7 +166,7 @@ class Goodscomments extends Common
}
// 开始处理
$params = input();
$params = $this->data_request;
return GoodsCommentsService::GoodsCommentsSave($params);
}
@ -186,7 +186,7 @@ class Goodscomments extends Common
}
// 开始处理
$params = input();
$params = $this->data_request;
return GoodsCommentsService::GoodsCommentsDelete($params);
}
@ -206,7 +206,7 @@ class Goodscomments extends Common
}
// 开始处理
$params = input();
$params = $this->data_request;
return GoodsCommentsService::GoodsCommentsReply($params);
}
@ -226,7 +226,7 @@ class Goodscomments extends Common
}
// 开始处理
$params = input();
$params = $this->data_request;
return GoodsCommentsService::GoodsCommentsStatusUpdate($params);
}
}

18
application/admin/controller/Pluginsadmin.php
View File

@ -57,7 +57,7 @@ class Pluginsadmin extends Common
$this->assign('view_type', $this->view_type);
// 参数
$params = input();
$params = $this->data_request;
// 应用商店地址
$this->assign('store_url', StoreService::StoreUrl());
@ -83,7 +83,7 @@ class Pluginsadmin extends Common
public function SaveInfo()
{
// 参数
$params = input();
$params = $this->data_request;
// 参数
$this->assign('params', $params);
@ -143,7 +143,7 @@ class Pluginsadmin extends Common
}
// 开始处理
return PluginsAdminService::PluginsSave(input('post.'));
return PluginsAdminService::PluginsSave($this->data_post);
}
/**
@ -162,7 +162,7 @@ class Pluginsadmin extends Common
}
// 开始处理
return PluginsAdminService::PluginsDelete(input('post.'));
return PluginsAdminService::PluginsDelete($this->data_post);
}
/**
@ -181,7 +181,7 @@ class Pluginsadmin extends Common
}
// 开始处理
return PluginsAdminService::PluginsStatusUpdate(input('post.'));
return PluginsAdminService::PluginsStatusUpdate($this->data_post);
}
/**
@ -200,7 +200,7 @@ class Pluginsadmin extends Common
}
// 开始处理
return PluginsAdminService::PluginsUpload(input());
return PluginsAdminService::PluginsUpload($this->data_request);
}
/**
@ -214,7 +214,7 @@ class Pluginsadmin extends Common
public function Download()
{
// 开始处理
$ret = PluginsAdminService::PluginsDownload(input());
$ret = PluginsAdminService::PluginsDownload($this->data_request);
if(isset($ret['code']) && $ret['code'] != 0)
{
$this->assign('msg', $ret['msg']);
@ -241,7 +241,7 @@ class Pluginsadmin extends Common
}
// 开始操作
return PluginsAdminService::PluginsInstall(input());
return PluginsAdminService::PluginsInstall($this->data_request);
}
/**
@ -261,7 +261,7 @@ class Pluginsadmin extends Common
}
// 开始操作
return PluginsAdminService::PluginsUninstall(input());
return PluginsAdminService::PluginsUninstall($this->data_request);
}
}
?>

8
application/admin/controller/Region.php
View File

@ -74,7 +74,7 @@ class Region extends Common
}
// 开始操作
return RegionService::RegionNodeSon(input());
return RegionService::RegionNodeSon($this->data_request);
}
/**
@ -96,7 +96,7 @@ class Region extends Common
}
// 开始操作
return RegionService::RegionSave(input());
return RegionService::RegionSave($this->data_request);
}
/**
@ -118,7 +118,7 @@ class Region extends Common
}
// 开始操作
$params = input('post.');
$params = $this->data_post;
$params['admin'] = $this->admin;
return RegionService::RegionDelete($params);
}
@ -142,7 +142,7 @@ class Region extends Common
// 获取地区
$params = [
'where' => [
'pid' => intval(input('pid', 0)),
'pid' => isset($this->data_request['pid']) ? intval($this->data_request['pid']) : 0,
],
];
$data = RegionService::RegionNode($params);

6
application/admin/controller/Screeningprice.php
View File

@ -71,7 +71,7 @@ class ScreeningPrice extends Common
}
// 开始操作
return ScreeningPriceService::ScreeningPriceNodeSon(input());
return ScreeningPriceService::ScreeningPriceNodeSon($this->data_request);
}
/**
@ -90,7 +90,7 @@ class ScreeningPrice extends Common
}
// 开始操作
return ScreeningPriceService::ScreeningPriceSave(input());
return ScreeningPriceService::ScreeningPriceSave($this->data_request);
}
/**
@ -109,7 +109,7 @@ class ScreeningPrice extends Common
}
// 开始操作
$params = input('post.');
$params = $this->data_post;
$params['admin'] = $this->admin;
return ScreeningPriceService::ScreeningPriceDelete($params);
}

2
application/admin/controller/Seo.php
View File

@ -73,7 +73,7 @@ class Seo extends Common
*/
public function Save()
{
return ConfigService::ConfigSave(input());
return ConfigService::ConfigSave($this->data_request);
}
}
?>

4
application/admin/controller/Site.php
View File

@ -86,8 +86,8 @@ class Site extends Common
$this->assign('common_deduction_inventory_rules_list', lang('common_deduction_inventory_rules_list'));
// 首页商品排序规则
$this->assign('home_floor_goods_order_by_type_list', lang('home_floor_goods_order_by_type_list'));
$this->assign('home_floor_goods_order_by_rule_list', lang('home_floor_goods_order_by_rule_list'));
$this->assign('goods_order_by_type_list', lang('goods_order_by_type_list'));
$this->assign('goods_order_by_rule_list', lang('goods_order_by_rule_list'));
// 配置信息
$data = ConfigService::ConfigList();

2
application/admin/controller/Sqlconsole.php
View File

@ -68,7 +68,7 @@ class Sqlconsole extends Common
}
// 开始处理
return SqlconsoleService::Implement(input());
return SqlconsoleService::Implement($this->data_request);
}
}
?>

8
application/admin/controller/Theme.php
View File

@ -81,7 +81,7 @@ class Theme extends Common
*/
public function Save()
{
return ConfigService::ConfigSave(input());
return ConfigService::ConfigSave($this->data_request);
}
/**
@ -100,7 +100,7 @@ class Theme extends Common
}
// 开始处理
return ThemeService::ThemeDelete(input());
return ThemeService::ThemeDelete($this->data_request);
}
/**
@ -119,7 +119,7 @@ class Theme extends Common
}
// 开始处理
return ThemeService::ThemeUpload(input());
return ThemeService::ThemeUpload($this->data_request);
}
/**
@ -133,7 +133,7 @@ class Theme extends Common
public function Download()
{
// 开始处理
$ret = ThemeService::ThemeDownload(input());
$ret = ThemeService::ThemeDownload($this->data_request);
if(isset($ret['code']) && $ret['code'] != 0)
{
$this->assign('msg', $ret['msg']);

2
application/admin/controller/Ueditor.php
View File

@ -48,7 +48,7 @@ class Ueditor extends Common
*/
public function Index()
{
return json(UeditorService::Run(input()));
return json(UeditorService::Run($this->data_request));
}
}
?>

7
application/admin/view/default/appcenternav/save_info.html
View File

@ -38,12 +38,7 @@
<div class="am-form-group">
<label>事件值</label>
<input type="text" name="event_value" placeholder="事件值" data-validation-message="事件值最多 255 个字符" class="am-radius" {{if !empty($data)}} value="{{$data.event_value}}"{{/if}} />
<div class="am-alert am-alert-warning am-radius" data-am-alert>
<button type="button" class="am-close">&times;</button>
<p class="am-text-xs">
WEB页面<br />&nbsp&nbsp&nbsp;1.以http开头<br />&nbsp&nbsp&nbsp;2.并在小程序后台加入白名单<br /><br /> 内部页面(小程序/APP内部地址)<br />&nbsp&nbsp&nbsp;1.小程序或APP内部地址<br />&nbsp&nbsp&nbsp;2.小程序以/pages开始<br />&nbsp&nbsp&nbsp;3.例如：/pages/user/user<br />&nbsp&nbsp&nbsp;4.支持带参数 ?x=xx<br /><br /> 跳转原生地图查看指定位置<br />&nbsp&nbsp&nbsp;1.以 | 竖线分割，分别顺序 名称|地址|经度|纬度<br />&nbsp&nbsp&nbsp;2.例如：ShopXO|上海浦东新区张江高科技园区XXX号|121.626444|31.20843
</p>
</div>
{{include file="public/event_value_tips" /}}
</div>
<div class="am-form-group">

7
application/admin/view/default/apphomenav/save_info.html
View File

@ -38,12 +38,7 @@
<div class="am-form-group">
<label>事件值</label>
<input type="text" name="event_value" placeholder="事件值" data-validation-message="事件值最多 255 个字符" class="am-radius" {{if !empty($data)}} value="{{$data.event_value}}"{{/if}} />
<div class="am-alert am-alert-warning am-radius" data-am-alert>
<button type="button" class="am-close">&times;</button>
<p class="am-text-xs">
WEB页面<br />&nbsp&nbsp&nbsp;1.以http开头<br />&nbsp&nbsp&nbsp;2.并在小程序后台加入白名单<br /><br /> 内部页面(小程序/APP内部地址)<br />&nbsp&nbsp&nbsp;1.小程序或APP内部地址<br />&nbsp&nbsp&nbsp;2.小程序以/pages开始<br />&nbsp&nbsp&nbsp;3.例如：/pages/user/user<br />&nbsp&nbsp&nbsp;4.支持带参数 ?x=xx<br /><br /> 跳转原生地图查看指定位置<br />&nbsp&nbsp&nbsp;1.以 | 竖线分割，分别顺序 名称|地址|经度|纬度<br />&nbsp&nbsp&nbsp;2.例如：ShopXO|上海浦东新区张江高科技园区XXX号|121.626444|31.20843
</p>
</div>
{{include file="public/event_value_tips" /}}
</div>
<div class="am-form-group am-form-file">

4
application/admin/view/default/articlecategory/index.html
View File

@ -40,8 +40,8 @@
<!-- save win end -->
<!-- list start -->
<div id="tree" class="m-t-15">
<div class="m-t-30 t-c">
<div id="tree" class="am-margin-top-sm">
<div class="am-margin-top-lg am-text-center">
<img src="{{$attachment_host}}/static/common/images/loading.gif" />
<p>处理中...</p>
</div>

4
application/admin/view/default/express/index.html
View File

@ -51,8 +51,8 @@
<!-- save win end -->
<!-- list start -->
<div id="tree" class="m-t-15" data-additional='[{"field":"icon", "value":"", "type":"input"}, {"field":"icon_url", "value":"{{$attachment_host}}/static/admin/default/images/default-images.jpg", "type":"attr", "tag":"ul.express-icon-images-view li img", "style":"src"}]'>
<div class="m-t-30 t-c">
<div id="tree" class="am-margin-top-sm" data-additional='[{"field":"icon", "value":"", "type":"input"}, {"field":"icon_url", "value":"{{$attachment_host}}/static/admin/default/images/default-images.jpg", "type":"attr", "tag":"ul.express-icon-images-view li img", "style":"src"}]'>
<div class="am-margin-top-lg am-text-center">
<img src="{{$attachment_host}}/static/common/images/loading.gif" />
<p>处理中...</p>
</div>

4
application/admin/view/default/goodscategory/index.html
View File

@ -53,7 +53,7 @@
<div class="plug-file-upload-submit" data-view-tag="ul.goods-category-icon-images-view">+上传图片</div>
</div>
<div class="am-form-group am-form-file">
<label class="block">大图片</label>
<label class="block">大图片<span class="am-form-group-label-tips">建议大小360x360像素</span></label>
<ul class="plug-file-upload-view goods-category-big_images-images-view" data-form-name="big_images" data-max-number="1" data-dialog-type="images">
<li>
<input type="hidden" name="big_images" value="" />
@ -112,7 +112,7 @@
<!-- save win end -->
<!-- list start -->
<div id="tree" class="am-margin-top-sm" data-rank="3" data-additional='[{"field":"bg_color", "value":"", "type":"input"}, {"field":"bg_color", "value":"", "type":"css", "tag":"button.colorpicker-submit", "style":"background-color"}, {"field":"icon", "value":"", "type":"input"}, {"field":"icon_url", "value":"{{$attachment_host}}/static/admin/default/images/default-images.jpg", "type":"attr", "tag":"ul.goods-category-icon-images-view li img", "style":"src"}, {"field":"big_images", "value":"", "type":"input"}, {"field":"big_images_url", "value":"{{$attachment_host}}/static/admin/default/images/default-images.jpg", "type":"attr", "tag":"ul.goods-category-big_images-images-view li img", "style":"src"}, {"field":"vice_name", "value":"", "type":"input"}, {"field":"describe", "value":"", "type":"textarea"}, {"field":"is_home_recommended", "value":"0", "type":"input"}, {"field":"seo_title", "value":"", "type":"input"}, {"field":"seo_keywords", "value":"", "type":"input"}, {"field":"seo_desc", "value":"", "type":"textarea"}]'>
<div id="tree" class="am-margin-top-sm" data-rank="3" data-additional='[{"field":"bg_color", "value":"", "type":"input"}, {"field":"bg_color", "value":"", "type":"css", "tag":"button.colorpicker-submit", "style":"background-color"}, {"field":"icon", "value":"", "type":"input"}, {"field":"icon_url", "value":"{{$attachment_host}}/static/admin/default/images/default-images.jpg", "type":"attr", "tag":"ul.goods-category-icon-images-view li img", "style":"src"}, {"field":"big_images", "value":"", "type":"input"}, {"field":"big_images_url", "value":"{{$attachment_host}}/static/admin/default/images/default-images.jpg", "type":"attr", "tag":"ul.goods-category-big_images-images-view li img", "style":"src"}]'>
<div class="am-margin-top-lg am-text-center">
<img src="{{$attachment_host}}/static/common/images/loading.gif" />
<p>处理中...</p>

29
application/admin/view/default/public/event_value_tips.html Normal file
View File

@ -0,0 +1,29 @@
<div class="am-alert am-alert-warning am-radius am-text-xs" data-am-alert>
<button type="button" class="am-close">&times;</button>
<div>
<p><strong>WEB页面</strong></p>
<div class="am-padding-left-lg">
<p>1. 以http开头</p>
<p>2. 并在小程序后台加入白名单</p>
</div>
</div>
<div class="am-margin-top-xs">
<p><strong>内部页面(小程序/APP内部地址)</strong></p>
<div class="am-padding-left-lg">
<p>1. 小程序或APP内部地址</p>
<p>2. 小程序以/pages开始</p>
<p>3. 例如：/pages/user/user</p>
<p>4. 支持带参数 ?x=xx</p>
<p>
<a href="https://ask.shopxo.net/article/106" target="_blank">小程序页面地址配置说明 <i class="am-icon-external-link"></i></a>
</p>
</div>
</div>
<div class="am-margin-top-xs">
<p><strong>跳转原生地图查看指定位置</strong></p>
<div class="am-padding-left-lg">
<p>1. 以 | 竖线分割，分别顺序 名称|地址|经度|纬度</p>
<p>2. 例如：ShopXO|上海浦东新区张江高科技园区XXX号|121.626444|31.20843</p>
</div>
</div>
</div>

7
application/admin/view/default/quicknav/save_info.html
View File

@ -36,12 +36,7 @@
<div class="am-form-group">
<label>事件值</label>
<input type="text" name="event_value" placeholder="事件值" data-validation-message="事件值最多 255 个字符" class="am-radius" {{if !empty($data)}} value="{{$data.event_value}}"{{/if}} />
<div class="am-alert am-alert-warning am-radius" data-am-alert>
<button type="button" class="am-close">&times;</button>
<p class="am-text-xs">
WEB页面<br />&nbsp&nbsp&nbsp;1.以http开头<br />&nbsp&nbsp&nbsp;2.并在小程序后台加入白名单<br /><br /> 内部页面(小程序/APP内部地址)<br />&nbsp&nbsp&nbsp;1.小程序或APP内部地址<br />&nbsp&nbsp&nbsp;2.小程序以/pages开始<br />&nbsp&nbsp&nbsp;3.例如：/pages/user/user<br />&nbsp&nbsp&nbsp;4.支持带参数 ?x=xx<br /><br /> 跳转原生地图查看指定位置<br />&nbsp&nbsp&nbsp;1.以 | 竖线分割，分别顺序 名称|地址|经度|纬度<br />&nbsp&nbsp&nbsp;2.例如：ShopXO|上海浦东新区张江高科技园区XXX号|121.626444|31.20843
</p>
</div>
{{include file="public/event_value_tips" /}}
</div>
<div class="am-form-group am-form-file">

4
application/admin/view/default/site/siteset.html
View File

@ -80,7 +80,7 @@
<div class="am-form-group">
<label>{{$data.home_index_floor_goods_order_by_type.name}}<span class="am-form-group-label-tips">{{$data.home_index_floor_goods_order_by_type.describe}}</span></label>
<select name="{{$data.home_index_floor_goods_order_by_type.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_index_floor_goods_order_by_type.error_tips}}">
{{foreach $home_floor_goods_order_by_type_list as $k=>$v}}
{{foreach $goods_order_by_type_list as $k=>$v}}
<option value="{{$k}}" {{if isset($data['home_index_floor_goods_order_by_type']['value']) and $data['home_index_floor_goods_order_by_type']['value'] eq $k}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
</select>
@ -92,7 +92,7 @@
<div class="am-form-group">
<label>{{$data.home_index_floor_goods_order_by_rule.name}}<span class="am-form-group-label-tips">{{$data.home_index_floor_goods_order_by_rule.describe}}</span></label>
<select name="{{$data.home_index_floor_goods_order_by_rule.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_index_floor_goods_order_by_rule.error_tips}}">
{{foreach $home_floor_goods_order_by_rule_list as $k=>$v}}
{{foreach $goods_order_by_rule_list as $k=>$v}}
<option value="{{$k}}" {{if isset($data['home_index_floor_goods_order_by_rule']['value']) and $data['home_index_floor_goods_order_by_rule']['value'] eq $k}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
</select>

7
application/admin/view/default/slide/save_info.html
View File

@ -34,16 +34,13 @@
</select>
</div>
<div class="am-form-group">
<div class="am-alert am-alert-warning am-radius" data-am-alert>
<button type="button" class="am-close">&times;</button>
<p class="am-text-xs">WEB页面<br />&nbsp&nbsp&nbsp;1.以http或https开头<br />&nbsp&nbsp&nbsp;2.并在小程序后台加入白名单<br /><br /> 内部页面(小程序/APP内部地址)<br />&nbsp&nbsp&nbsp;1.小程序或APP内部地址<br />&nbsp&nbsp&nbsp;2.小程序以/pages开始<br />&nbsp&nbsp&nbsp;3.例如：/pages/user/user<br />&nbsp&nbsp&nbsp;4.支持带参数 ?x=xx<br /><br /> 跳转原生地图查看指定位置<br />&nbsp&nbsp&nbsp;1.以 | 竖线分割，分别顺序 名称|地址|经度|纬度<br />&nbsp&nbsp&nbsp;2.例如：ShopXO|上海浦东新区张江高科技园区XXX号|121.626444|31.20843</p>
</div>
<label>事件值</label>
<input type="text" name="event_value" placeholder="事件值" data-validation-message="事件值最多 255 个字符" class="am-radius" {{if !empty($data)}} value="{{$data.event_value}}"{{/if}} />
{{include file="public/event_value_tips" /}}
</div>
<div class="am-form-group am-form-file">
<label class="block">轮播图片</label>
<label class="block">轮播图片<span class="am-form-group-label-tips">建议大小1000x360像素</span></label>
<ul class="plug-file-upload-view slide-images_url-images-view" data-form-name="images_url" data-max-number="1" data-delete="0" data-dialog-type="images">
<li>
<input type="text" name="images_url" value="{{if !empty($data['images_url'])}}{{$data.images_url}}{{/if}}" data-validation-message="请上传图片" required />

2
application/api/controller/User.php
View File

@ -634,7 +634,7 @@ class User extends Common
'province' => isset($this->data_post['province']) ? $this->data_post['province'] : '',
'city' => isset($this->data_post['city']) ? $this->data_post['city'] : '',
'gender' => isset($this->data_post['gender']) ? intval($this->data_post['gender']) : '',
'referrer' => isset($this->data_post['referrer']) ? intval($this->data_post['referrer']) : 0,
'referrer' => isset($this->data_post['referrer']) ? $this->data_post['referrer'] : 0,
'is_onekey_mobile_bind' => 1,
];
return UserService::AuthUserProgram($data, APPLICATION_CLIENT_TYPE.'_openid');

2
application/common.php
View File

@ -2024,7 +2024,7 @@ function ParamsChecked($data, $params)
{
// 是否存在
case 'isset' :
if(!isset($data[$v['key_name']]))
if(!array_key_exists($v['key_name'], $data))
{
return $v['error_msg'];
}

6
application/index/view/default/public/home_banner.html
View File

@ -9,15 +9,15 @@
{{switch banner.event_type}}
{{case 3}}
<!-- 地图 -->
<a href="javascript:;" {{if !empty($banner['event_value_data']) and !empty($banner['event_value_data'][2]) and !empty($banner['event_value_data'][3])}}class="submit-map-popup" data-lng="{{$banner['event_value_data'][2]}}" data-lat="{{$banner['event_value_data'][3]}}"{{/if}}><img src="{{$banner.images_url}}" /></a>
<a href="javascript:;" {{if !empty($banner['event_value_data']) and !empty($banner['event_value_data'][2]) and !empty($banner['event_value_data'][3])}}class="submit-map-popup" data-lng="{{$banner['event_value_data'][2]}}" data-lat="{{$banner['event_value_data'][3]}}"{{/if}}><img src="{{$banner.images_url}}" alt="{{$banner.name}}" /></a>
{{/case}}
{{case 4}}
<!-- 电话 -->
<a {{if !empty($banner['event_value'])}}href="tel:{{$banner.event_value}}"{{else /}}href="javascript:;"{{/if}}><img src="{{$banner.images_url}}" /></a>
<a {{if !empty($banner['event_value'])}}href="tel:{{$banner.event_value}}"{{else /}}href="javascript:;"{{/if}}><img src="{{$banner.images_url}}" alt="{{$banner.name}}" /></a>
{{/case}}
{{default /}}
<!-- 默认url地址 -->
<a {{if !empty($banner['event_value'])}}href="{{$banner.event_value}}" target="_blank"{{else /}}href="javascript:;"{{/if}}><img src="{{$banner.images_url}}" /></a>
<a {{if !empty($banner['event_value'])}}href="{{$banner.event_value}}" target="_blank"{{else /}}href="javascript:;"{{/if}}><img src="{{$banner.images_url}}" alt="{{$banner.name}}" /></a>
{{/switch}}
</li>
{{/if}}

8
application/lang/zh-cn.php
View File

@ -318,8 +318,8 @@ return array(
2 => array('value' => 2, 'name' => '基础'),
),
// 首页商品关联排序类型
'home_floor_goods_order_by_type_list' => array(
// 商品关联排序类型
'goods_order_by_type_list' => array(
0 => array('value' => 'g.access_count,g.sales_count,g.id', 'name' => '综合', 'checked' => true),
1 => array('value' => 'g.sales_count', 'name' => '销量'),
2 => array('value' => 'g.access_count', 'name' => '热度'),
@ -327,8 +327,8 @@ return array(
4 => array('value' => 'g.id', 'name' => '最新'),
),
// 首页商品关联排序规则
'home_floor_goods_order_by_rule_list' => array(
// 商品关联排序规则
'goods_order_by_rule_list' => array(
0 => array('value' => 'desc', 'name' => '降序(desc)', 'checked' => true),
1 => array('value' => 'asc', 'name' => '升序(asc)'),
),

4
application/service/GoodsService.php
View File

@ -188,8 +188,8 @@ class GoodsService
$goods_category_count = MyC('home_index_floor_left_goods_category_max_count', 6, true);
// 排序配置
$floor_order_by_type_list = lang('home_floor_goods_order_by_type_list');
$floor_order_by_rule_list = lang('home_floor_goods_order_by_rule_list');
$floor_order_by_type_list = lang('goods_order_by_type_list');
$floor_order_by_rule_list = lang('goods_order_by_rule_list');
$floor_order_by_type = MyC('home_index_floor_goods_order_by_type', 0, true);
$floor_order_by_rule = MyC('home_index_floor_goods_order_by_rule', 0, true);
// 排序字段名称

18
application/service/SlideService.php
View File

@ -46,24 +46,6 @@ class SlideService
$common_app_event_type = lang('common_app_event_type');
foreach($data as &$v)
{
// 是否启用
if(isset($v['is_enable']))
{
$v['is_enable_text'] = $common_is_enable_tips[$v['is_enable']]['name'];
}
// 平台类型
if(isset($v['platform']))
{
$v['platform_text'] = $common_platform_type[$v['platform']]['name'];
}
// 事件类型
if(isset($v['event_type']) && $v['event_type'] != -1)
{
$v['event_type_text'] = $common_app_event_type[$v['event_type']]['name'];
}
// 图片地址
if(isset($v['images_url']))
{

1
application/tags.php
View File

@ -150,6 +150,7 @@ return array (
'plugins_service_navigation_header_handle' =>
array (
0 => 'app\\plugins\\answers\\Hook',
1 => 'app\\plugins\\blog\\Hook',
),
);
?>

339
config/shopxo.sql
View File

File diff suppressed because one or more lines are too long

2
public/static/common/css/common.css
View File

@ -7,7 +7,7 @@ ul { list-style: none; }
.block { display:block !important; }
/* 没数据 */
.table-no {text-align:center;padding:115px 0;background:#FFF !important; color: #888; }
.table-no {text-align:center;padding:115px 0;background:#FFF !important;color: #888; }
/* 公共dl样式 */
.dl-content dt { float: left; padding-left: 5px; overflow: hidden; clear: left;

4
sourcecode/baidu/pages/login/login.js
View File

@ -194,8 +194,8 @@ Page({
var iv = e.detail.iv || null;
if(encrypted_data != null && iv != null) {
// 邀请人参数
var params = swan.getStorageSync(this.data.cache_launch_info_key) || null;
var referrer = (params == null) ? 0 : (params.referrer || 0);
var params = swan.getStorageSync(app.data.cache_launch_info_key) || null;
var referrer = (params == null) ? (this.data.user.referrer || 0) : (params.referrer || 0);
// 解密数据并绑定手机
var data = {

4
sourcecode/weixin/pages/login/login.js
View File

@ -211,8 +211,8 @@ Page({
var iv = e.detail.iv || null;
if(encrypted_data != null && iv != null) {
// 邀请人参数
var params = wx.getStorageSync(this.data.cache_launch_info_key) || null;
var referrer = (params == null) ? 0 : (params.referrer || 0);
var params = wx.getStorageSync(app.data.cache_launch_info_key) || null;
var referrer = (params == null) ? (this.data.user.referrer || 0) : (params.referrer || 0);
// 解密数据并绑定手机
var data = {