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

v2.1.0

feat/task1-c-wallet
Devil 2021-07-11 23:50:11 +08:00
parent 902bfffaf8
commit 4814c2fadc
13 changed files with 92 additions and 558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
application/admin/view/default/appmini/config.html
View File

@ -77,7 +77,7 @@
<div class="am-form-group">
<label>{{$data.common_app_weixin_liveplayer_ver.name}}</label>
<div class="am-alert am-alert-warning">
<p>1. 获取最新组件版本号，默认[ 1.2.10 ]</p>
<p>1. 获取最新组件版本号，默认[ 1.3.0 ]</p>
<p>2. 登录微信小程序平台，左侧导航[ 直播 ]，申请直播权限后等待审核通过方可使用</p>
<p>3. 点击左侧导航[ 小程序直播->接入说明 ]，找到[ 使用方法说明->1. 【直播组件】如何引入 ]，json 代码串[ plugins->live-player-plugin ]参数下的[ version ]的值填入</p>
<a href="https://developers.weixin.qq.com/miniprogram/dev/framework/liveplayer/live-player-plugin.html" target="_blank">去获取组件版本号 <i class="am-icon-external-link"></i></a>
@ -189,31 +189,6 @@
<label>{{$data.common_app_mini_toutiao_appsecret.name}}<span class="am-form-group-label-tips">{{$data.common_app_mini_toutiao_appsecret.describe}}</span></label>
<input type="text" name="{{$data.common_app_mini_toutiao_appsecret.only_tag}}" placeholder="{{$data.common_app_mini_toutiao_appsecret.name}}" data-validation-message="{{$data.common_app_mini_toutiao_appsecret.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_app_mini_toutiao_appsecret.value}}"{{/if}} />
</div>
</div>
</div>
<div class="am-panel am-panel-default">
<div class="am-panel-hd">
<h3 class="am-panel-title">支付配置</h3>
</div>
<div class="am-panel-bd">
<div class="am-alert am-alert-warning am-margin-bottom-0">
<p>1. 字节跳动小程序支持支付宝和微信支付</p>
<p>2. 支付宝需要申请APP支付权限</p>
<p>3. 微信需要申请H5支付权限</p>
<a href="https://microapp.bytedance.com/docs/zh-CN/mini-app/develop/api/open-interface/payment/mini-app-pay-plugin-reference/application-for-payment/" target="_blank">支付申请与配置 <i class="am-icon-external-link"></i></a>
</div>
<div class="am-form-group">
<label>{{$data.common_app_mini_toutiao_pay_merchant_id.name}}<span class="am-form-group-label-tips">{{$data.common_app_mini_toutiao_pay_merchant_id.describe}}</span></label>
<input type="text" name="{{$data.common_app_mini_toutiao_pay_merchant_id.only_tag}}" placeholder="{{$data.common_app_mini_toutiao_pay_merchant_id.name}}" data-validation-message="{{$data.common_app_mini_toutiao_pay_merchant_id.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_app_mini_toutiao_pay_merchant_id.value}}"{{/if}} />
</div>
<div class="am-form-group">
<label>{{$data.common_app_mini_toutiao_pay_appid.name}}<span class="am-form-group-label-tips">{{$data.common_app_mini_toutiao_pay_appid.describe}}</span></label>
<input type="text" name="{{$data.common_app_mini_toutiao_pay_appid.only_tag}}" placeholder="{{$data.common_app_mini_toutiao_pay_appid.name}}" data-validation-message="{{$data.common_app_mini_toutiao_pay_appid.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_app_mini_toutiao_pay_appid.value}}"{{/if}} />
</div>
<div class="am-form-group">
<label>{{$data.common_app_mini_toutiao_pay_secret.name}}<span class="am-form-group-label-tips">{{$data.common_app_mini_toutiao_pay_secret.describe}}</span></label>
<input type="text" name="{{$data.common_app_mini_toutiao_pay_secret.only_tag}}" placeholder="{{$data.common_app_mini_toutiao_pay_secret.name}}" data-validation-message="{{$data.common_app_mini_toutiao_pay_secret.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_app_mini_toutiao_pay_secret.value}}"{{/if}} />
</div>
<div class="am-form-group">
<label>{{$data.common_app_mini_toutiao_title.name}}</label>
<input type="text" name="{{$data.common_app_mini_toutiao_title.only_tag}}" placeholder="{{$data.common_app_mini_toutiao_title.name}}" data-validation-message="{{$data.common_app_mini_toutiao_title.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_app_mini_toutiao_title.value}}"{{/if}} />

2
application/service/AppMiniService.php
View File

@ -672,7 +672,7 @@ class AppMiniService
if(is_array($config) && isset($config['plugins']))
{
$config['plugins']['live-player-plugin'] = [
'version' => MyC('common_app_weixin_liveplayer_ver', '1.2.10', true),
'version' => MyC('common_app_weixin_liveplayer_ver', '1.3.0', true),
'provider' => 'wx2b03c6e691cd7370',
];
if(file_put_contents($file, JsonFormat($config)) === false)

174
application/tags.php
View File

@ -32,179 +32,5 @@ return array (
'log_write' =>
array (
),
'plugins_admin_css' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_css' =>
array (
0 => 'app\\plugins\\shop\\Hook',
1 => 'app\\plugins\\salerecords\\Hook',
2 => 'app\\plugins\\points\\Hook',
),
'plugins_js' =>
array (
0 => 'app\\plugins\\shop\\Hook',
1 => 'app\\plugins\\salerecords\\Hook',
2 => 'app\\plugins\\points\\Hook',
),
'plugins_service_navigation_header_handle' =>
array (
0 => 'app\\plugins\\shop\\Hook',
1 => 'app\\plugins\\points\\Hook',
),
'plugins_service_users_center_left_menu_handle' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_service_header_navigation_top_right_handle' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_service_goods_save_handle' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_service_editor_path_type_admin_goods_saveinfo' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_view_goods_detail_right_content_bottom' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_view_goods_detail_base_bottom' =>
array (
0 => 'app\\plugins\\shop\\Hook',
1 => 'app\\plugins\\salerecords\\Hook',
),
'plugins_view_goods_detail_base_buy_nav_min_inside_begin' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_service_warehouse_handle_end' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_service_buy_handle' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_service_buy_order_insert_begin' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_service_buy_order_insert_end' =>
array (
0 => 'app\\plugins\\shop\\Hook',
1 => 'app\\plugins\\points\\Hook',
),
'plugins_service_order_status_change_history_success_handle' =>
array (
0 => 'app\\plugins\\shop\\Hook',
1 => 'app\\plugins\\points\\Hook',
),
'plugins_service_order_aftersale_audit_handle_end' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_view_admin_goods_save' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_service_goods_handle_end' =>
array (
0 => 'app\\plugins\\shop\\Hook',
1 => 'app\\plugins\\points\\Hook',
),
'plugins_module_form_admin_goods_index' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_module_form_admin_goods_detail' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_service_goods_buy_nav_button_handle' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_layout_service_search_goods_begin' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_layout_service_goods_data_begin' =>
array (
0 => 'app\\plugins\\shop\\Hook',
),
'plugins_service_base_data_return_api_goods_detail' =>
array (
0 => 'app\\plugins\\shop\\Hook',
1 => 'app\\plugins\\salerecords\\Hook',
),
'plugins_common_header' =>
array (
0 => 'app\\plugins\\dang100\\Hook',
),
'plugins_view_common_search_right' =>
array (
0 => 'app\\plugins\\dang100\\Hook',
),
'plugins_view_home_floor_bottom' =>
array (
0 => 'app\\plugins\\salerecords\\Hook',
),
'plugins_service_base_data_return_api_index_index' =>
array (
0 => 'app\\plugins\\salerecords\\Hook',
),
'plugins_service_quick_navigation_pc' =>
array (
0 => 'app\\plugins\\points\\Hook',
),
'plugins_service_quick_navigation_h5' =>
array (
0 => 'app\\plugins\\points\\Hook',
),
'plugins_service_quick_navigation_weixin' =>
array (
0 => 'app\\plugins\\points\\Hook',
),
'plugins_service_quick_navigation_alipay' =>
array (
0 => 'app\\plugins\\points\\Hook',
),
'plugins_service_quick_navigation_baidu' =>
array (
0 => 'app\\plugins\\points\\Hook',
),
'plugins_service_quick_navigation_qq' =>
array (
0 => 'app\\plugins\\points\\Hook',
),
'plugins_service_quick_navigation_toutiao' =>
array (
0 => 'app\\plugins\\points\\Hook',
),
'plugins_view_buy_form_inside' =>
array (
0 => 'app\\plugins\\points\\Hook',
),
'plugins_view_buy_base_confirm_top' =>
array (
0 => 'app\\plugins\\points\\Hook',
),
'plugins_service_buy_group_goods_handle' =>
array (
0 => 'app\\plugins\\points\\Hook',
),
'plugins_service_base_data_return_api_buy_index' =>
array (
0 => 'app\\plugins\\points\\Hook',
),
'plugins_service_user_register_end' =>
array (
0 => 'app\\plugins\\points\\Hook',
),
);
?>

15
changelog.txt
View File

@ -1,14 +1,13 @@
+=========================================================+
ShopXO --- http://shopxo.net
ShopXO 2.1.0 Release 20210712 http://shopxo.net
+=========================================================+
全局
1. 商城首页支持可视化拖拽设计
2. 新增可视化拖拽设计（独立页面）
3. 支持销售记录提示
4. 支持多商户首页+店铺收藏+店铺商品搜索+店铺详情+页面设计（支持可视化拖拽设计）
5. 订单售后去掉退款说明强制填写
6. 退货地址支持根据订单所属仓库自动匹配仓库地址
7. 订单商品增加销量新增订单支付规则
1. 新增可视化DIY拖拽装修（商城首页+独立页面）
2. 支持销售记录提示
3. 支持多商户首页+店铺收藏+店铺商品搜索+店铺详情+页面设计（支持可视化DIY拖拽设计）
4. 订单售后去掉退款说明强制填写
5. 退货地址支持根据订单所属仓库自动匹配仓库地址
6. 订单商品增加销量新增订单支付规则
web端
1. 商品详情小导航优化

2
config/app.php
View File

@ -19,7 +19,7 @@ return [
// 应用地址
'app_host' => '',
// 应用调试模式
'app_debug' => true,
'app_debug' => false,
// 应用Trace
'app_trace' => false,
// 是否支持多模块

410
config/shopxo.sql
View File

File diff suppressed because one or more lines are too long

2
public/static/common/lib/ueditor/dialogs/map/map.html
View File

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
<script type="text/javascript" src="../internal.js"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=XSdiGjfg3wOHiKjpYEMG6CYA"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak={{common_baidu_map_ak}}"></script>
<style type="text/css">
.content{width:530px; height: 350px;margin: 10px auto;}
.content table{width: 100%}

2
public/static/common/lib/ueditor/dialogs/map/show.html
View File

@ -14,7 +14,7 @@
overflow: hidden;
}
</style>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=XSdiGjfg3wOHiKjpYEMG6CYA"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak={{common_baidu_map_ak}}"></script>
</head>
<body onload="initMap();">

4
sourcecode/alipay/default/app.js
View File

@ -73,8 +73,8 @@ App({
// 请求地址
request_url: "{{request_url}}",
request_url: 'http://shopxo.com/',
request_url: 'https://dev.shopxo.net/',
// request_url: 'http://shopxo.com/',
// request_url: 'https://dev.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",

4
sourcecode/baidu/default/app.js
View File

@ -73,8 +73,8 @@ App({
// 请求地址
request_url: "{{request_url}}",
request_url: 'http://shopxo.com/',
request_url: 'https://dev.shopxo.net/',
// request_url: 'http://shopxo.com/',
// request_url: 'https://dev.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",

2
sourcecode/qq/default/app.js
View File

@ -74,7 +74,7 @@ App({
// 请求地址
request_url: "{{request_url}}",
// request_url: 'http://shopxo.com/',
request_url: 'https://dev.shopxo.net/',
// request_url: 'https://dev.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",

2
sourcecode/toutiao/default/app.js
View File

@ -74,7 +74,7 @@ App({
// 请求地址
request_url: "{{request_url}}",
// request_url: 'http://shopxo.com/',
request_url: 'https://dev.shopxo.net/',
// request_url: 'https://dev.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",

4
sourcecode/weixin/default/app.js
View File

@ -73,8 +73,8 @@ App({
// 请求地址
request_url: "{{request_url}}",
request_url: 'http://shopxo.com/',
request_url: 'https://dev.shopxo.net/',
// request_url: 'http://shopxo.com/',
// request_url: 'https://dev.shopxo.net/',
// 基础信息
application_title: "{{application_title}}",