sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

细节优化

feat/task1-c-wallet
Devil 2021-07-28 00:55:51 +08:00
parent c03c337f8a
commit 399e54495c
11 changed files with 57 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/controller/Common.php
View File

@ -223,6 +223,10 @@ class Common extends BaseController
}
MyViewAssign('site_store_info', $site_store_info);
// 更多链接地址
$site_store_links = empty($site_store_info['links']) ? [] : $site_store_info['links'];
MyViewAssign('site_store_links', $site_store_links);
// 系统基础信息
$is_system_show_base = (empty($site_store_info) || empty($site_store_info['vip']) || !isset($site_store_info['vip']['status']) || $site_store_info['vip']['status'] == 0 || ($site_store_info['vip']['status'] == 1 && (AdminIsPower('index', 'storeaccountsbind') || AdminIsPower('index', 'inspectupgrade')))) ? 1 : 0;
MyViewAssign('is_system_show_base', $is_system_show_base);

2
app/admin/view/default/config/index.html
View File

@ -86,7 +86,7 @@
<label>{{$data.common_baidu_map_ak.name}}<span class="am-form-group-label-tips">{{$data.common_baidu_map_ak.describe}}</span></label>
<input type="text" name="{{$data.common_baidu_map_ak.only_tag}}" placeholder="{{$data.common_baidu_map_ak.describe}}" data-validation-message="{{$data.common_baidu_map_ak.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_baidu_map_ak.value}}"{{/if}} />
<div class="am-alert am-alert-warning" data-am-alert>
请到百度地图开放平台申请，<a href="https://ask.shopxo.net/article/142" target="_blank">查看配置教程 <i class="am-icon-external-link"></i></a>
请到百度地图开放平台申请 {{if !empty($site_store_links) and !empty($site_store_links['baidu_map_course'])}}<a href="{{$site_store_links.baidu_map_course}}" target="_blank" class="am-margin-left-sm">查看配置教程 <i class="am-icon-external-link"></i></a>{{/if}}
</div>
</div>
</div>

2
app/admin/view/default/email/nav.html
View File

@ -9,5 +9,5 @@
<div class="am-alert am-alert-warning am-radius am-margin-bottom-0" data-am-alert>
<button type="button" class="am-close">&times;</button>
<p class="am-text-xs">参考相关邮箱配置教程 <a href="https://ask.shopxo.net/article/41" class="am-margin-left-sm" target="_blank">点击去看教程 <i class="am-icon-external-link"></i></a> </p>
<p class="am-text-xs">由于不同邮箱平台存在一些差异、配置也有所不同、具体以邮箱平台配置教程为准 {{if !empty($site_store_links) and !empty($site_store_links['email_set_course'])}}<a href="{{$site_store_links.email_set_course}}" class="am-margin-left-sm" target="_blank">查看配置教程 <i class="am-icon-external-link"></i></a>{{/if}}</p>
</div>

26
app/admin/view/default/index/init.html
View File

@ -37,7 +37,7 @@
<!-- 右侧版本信息及更新检查 -->
<span class="right-base">
<a href="https://ask.shopxo.net/article/148" target="_blank" class="am-margin-left-xs">{{$Think.APPLICATION_VERSION}}</a>
<a {{if !empty($site_store_links) and !empty($site_store_links['system_update_log'])}}href="{{$site_store_links.system_update_log}}" target="_blank"{{else /}}href="javascript:;"{{/if}} class="am-margin-left-xs">{{$Think.APPLICATION_VERSION}}</a>
<a href="javascript:;" class="am-margin-left-sm inspect-upgrade-submit" data-url="{{:MyUrl('admin/index/inspectupgrade')}}">检查更新{{if !empty($site_store_info) and !empty($site_store_info['upgrade']) and !empty($site_store_info['upgrade']['version_old']) and $site_store_info['upgrade']['version_old'] eq $Think.APPLICATION_VERSION}}<i></i>{{/if}}</a>
</span>
</div>
@ -230,25 +230,29 @@
<a href="http://shopxo.net/" target="_blank">ShopXO企业级电商系统提供商</a>
</dd>
<dt>交流社区</dt>
<dd>
<a href="http://ask.shopxo.net/" target="_blank">ShopXO交流社区</a>
</dd>
{{if !empty($site_store_links) and !empty($site_store_links['community_website'])}}
<dt>交流社区</dt>
<dd>
<a href="{{$site_store_links.community_website}}" target="_blank">ShopXO交流社区</a>
</dd>
{{/if}}
<dt>开源协议</dt>
<dd>
<a href="http://ask.shopxo.net/article/15" target="_blank">查看开源协议</a>
<a href="{{if !empty($site_store_links) and !empty($site_store_links['source_license'])}}{{$site_store_links.source_license}}{{else /}}https://opensource.org/licenses/mit-license.php{{/if}}" target="_blank">查看开源协议</a>
</dd>
{{if !empty($site_store_links) and !empty($site_store_links['system_update_log'])}}
<dt>更新日志</dt>
<dd>
<a href="{{$site_store_links.system_update_log}}" target="_blank">查看更新日志</a>
</dd>
{{/if}}
<dt>研发成员</dt>
<dd>
<a href="http://gong.gg/" target="_blank">龚哥哥</a>
</dd>
<dt>更新日志</dt>
<dd>
<a href="http://ask.shopxo.net/article/148" target="_blank">查看更新日志</a>
</dd>
</dl>
</li>
</ul>

8
app/admin/view/default/public/event_value_tips.html
View File

@ -14,9 +14,11 @@
<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>
{{if !empty($site_store_links) and !empty($site_store_links['app_mini_pages'])}}
<p>
<a href="{{$site_store_links.app_mini_pages}}" target="_blank">小程序页面地址配置说明 <i class="am-icon-external-link"></i></a>
</p>
{{/if}}
</div>
</div>
<div class="am-margin-top-xs">

2
app/admin/view/default/public/footer.html
View File

@ -20,7 +20,7 @@
<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>
</div>
<div class="am-margin-top-xr am-text-right am-padding-right-xs">
<a href="https://store.shopxo.net/regster.html" target="_blank">未有账号，去注册</a>
<a href="{{:MyConfig('shopxo.store_regster_url')}}" target="_blank">未有账号，去注册</a>
</div>
<p class="am-text-warning am-text-center am-margin-top-sm">一个账号支持绑定多台ShopXO商城</p>
</form>

2
app/admin/view/default/seo/index.html
View File

@ -5,7 +5,7 @@
<div class="content">
<div class="am-alert am-alert-warning am-radius am-margin-bottom-0" data-am-alert>
<button type="button" class="am-close">&times;</button>
<p class="am-text-xs">参考伪静态配置教程 <a href="https://ask.shopxo.net/article/6" class="am-margin-left-sm" target="_blank">点击去看教程 <i class="am-icon-external-link"></i></a> </p>
<p class="am-text-xs">根据服务器环境[Nginx、Apache、IIS]不同配置相应的伪静态规则 {{if !empty($site_store_links) and !empty($site_store_links['htaccess_set_course'])}}<a href="{{$site_store_links.htaccess_set_course}}" class="am-margin-left-sm" target="_blank">查看配置教程 <i class="am-icon-external-link"></i></a>{{/if}}</p>
</div>
<!-- form start -->

5
app/service/PluginsUpgradeService.php
View File

@ -29,9 +29,6 @@ class PluginsUpgradeService
// 输入参数
public static $params;
// 远程插件更新接口
public static $store_plugins_upgrade_url = 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=pluginsupgradeurl';
/**
* 更新入口
* @author Devil
@ -195,7 +192,7 @@ class PluginsUpgradeService
}
// 获取信息
$ret = StoreService::RemoteStoreData($accounts, $password, self::$store_plugins_upgrade_url, $params);
$ret = StoreService::RemoteStoreData($accounts, $password, MyConfig('shopxo.store_plugins_upgrade_url'), $params);
if(!empty($ret) && isset($ret['code']) && $ret['code'] == 0)
{
$key = md5($ret['data']);

20
app/service/StoreService.php
View File

@ -21,18 +21,6 @@ use app\service\ConfigService;
*/
class StoreService
{
// 远程信息接口
public static $store_site_info_url = 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=siteinfo';
// 远程检查更新接口
public static $store_inspect_upgrade_url = 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=inspectupgrade';
// 远程插件安全合法校验接口
public static $store_plugins_legal_check_url = 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=pluginslegalcheck';
// 远程插件更新信息接口
public static $store_plugins_upgrade_info_url = 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=pluginsupgradeinfo';
// 站点商店数据缓存key
public static $site_store_info_key = 'admin_site_store_info_data';
@ -176,7 +164,7 @@ class StoreService
}
// 获取信息
$res = self::RemoteStoreData($accounts, $password, self::$store_site_info_url);
$res = self::RemoteStoreData($accounts, $password, MyConfig('shopxo.store_site_info_url'));
if($res['code'] == 0)
{
// 存储缓存、取远程给的时间，未拿到时间则默认60分钟
@ -204,7 +192,7 @@ class StoreService
$password = MyC('common_store_password');
// 获取信息
return self::RemoteStoreData($accounts, $password, self::$store_inspect_upgrade_url);
return self::RemoteStoreData($accounts, $password, MyConfig('shopxo.store_inspect_upgrade_url'));
}
/**
@ -240,7 +228,7 @@ class StoreService
'plugins_ver' => $params['ver'],
'plugins_config' => $params['config'],
];
return self::RemoteStoreData($accounts, $password, self::$store_plugins_legal_check_url, $request_params);
return self::RemoteStoreData($accounts, $password, MyConfig('shopxo.store_plugins_legal_check_url'), $request_params);
}
/**
@ -265,7 +253,7 @@ class StoreService
}
// 获取更新信息
return self::RemoteStoreData($accounts, $password, self::$store_plugins_upgrade_info_url, $params);
return self::RemoteStoreData($accounts, $password, MyConfig('shopxo.store_plugins_upgrade_info_url'), $params);
}
return DataReturn('无插件数据', 0);

5
app/service/SystemUpgradeService.php
View File

@ -25,9 +25,6 @@ class SystemUpgradeService
// 输入参数
public static $params;
// 远程系统更新接口
public static $store_plugins_upgrade_url = 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=systemsupgradeurl';
// session key
public static $package_url_key = 'package_url_key';
public static $package_system_dir_key = 'package_system_dir_key';
@ -308,7 +305,7 @@ class SystemUpgradeService
}
// 获取信息
$ret = StoreService::RemoteStoreData($accounts, $password, self::$store_plugins_upgrade_url, $params);
$ret = StoreService::RemoteStoreData($accounts, $password, MyConfig('shopxo.store_system_upgrade_url'), $params);
if(!empty($ret) && isset($ret['code']) && $ret['code'] == 0)
{
MySession(self::$package_url_key, $ret['data']);

26
config/shopxo.php
View File

@ -99,15 +99,35 @@ return [
// css/js引入host地址、以/斜杠结尾
'public_host' => $cdn_public_host,
// 应用商店地址
// 应用商店基础地址
'website_url' => 'https://shopxo.net/',
'store_url' => 'https://store.shopxo.net/',
'store_payment_url' => 'https://store.shopxo.net/',
'store_theme_url' => 'https://store.shopxo.net/',
'store_regster_url' => 'https://store.shopxo.net/regster.html',
// 插件在线下载地址
'store_download_url' => 'https://store.shopxo.net/index.php?s=store-package-onine.html',
// 开启U带域名
'url_domain_deploy' => true,
// 远程系统更新接口
'store_system_upgrade_url' => 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=systemsupgradeurl',
// 远程插件更新接口
'store_plugins_upgrade_url' => 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=pluginsupgradeurl',
// 远程信息接口
'store_site_info_url' => 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=siteinfo',
// 远程检查更新接口
'store_inspect_upgrade_url' => 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=inspectupgrade',
// 远程插件安全合法校验接口
'store_plugins_legal_check_url' => 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=pluginslegalcheck',
// 远程插件更新信息接口
'store_plugins_upgrade_info_url' => 'https://store.shopxo.net/api.php?s=plugins/index&pluginsname=store&pluginscontrol=index&pluginsaction=pluginsupgradeinfo',
// 支付业务类型,支付插件根据业务类型自动生成支付入口文件
'payment_business_type_all' => [