修改

app/system/controller/v1/Admin.php → app/system/controller/Admin.php

@@ -1,7 +1,7 @@
 <?php
 declare (strict_types = 1);
 
-namespace app\system\controller\v1;
+namespace app\system\controller;
 use app\model\system\AdminMenu;
 use app\model\system\AdminRole;
 use app\model\system\Admin as AdminModel;

app/system/controller/v1/Index.php → app/system/controller/Index.php

@@ -9,7 +9,7 @@
 // | Date: 2020-08-31 20:43
 // +----------------------------------------------------------------------
 
-namespace app\system\controller\v1;
+namespace app\system\controller;
 
 
 use app\BaseController;

app/system/controller/v1/Pub.php → app/system/controller/Pub.php

@@ -9,7 +9,7 @@
 // | Date: 2020-08-31 20:43
 // +----------------------------------------------------------------------
 
-namespace app\system\controller\v1;
+namespace app\system\controller;
 
 
 use app\BaseController;

app/system/controller/v1/Role.php → app/system/controller/Role.php

@@ -9,7 +9,7 @@
 // | Date: 2020-08-31 20:43
 // +----------------------------------------------------------------------
 
-namespace app\system\controller\v1;
+namespace app\system\controller;
 
 
 use app\BaseController;

app/system/controller/v1/RolePath.php → app/system/controller/RolePath.php

@@ -9,7 +9,7 @@
 // | Date: 2020-08-31 20:43
 // +----------------------------------------------------------------------
 
-namespace app\system\controller\v1;
+namespace app\system\controller;
 
 
 use app\BaseController;

app/system/controller/v1/Sys.php → app/system/controller/Sys.php

@@ -9,7 +9,7 @@
 // | Date: 2020-08-31 20:43
 // +----------------------------------------------------------------------
 
-namespace app\system\controller\v1;
+namespace app\system\controller;
 
 
 use app\BaseController;
@@ -50,17 +50,17 @@ class Sys extends BaseController
             ['system_url', ''],
             ['tag', ''],
             ['custom_tel', ''],
-            ['ip_income_per',0,'empty','IP商品收益百分比大于0'],
-            ['tree_income_per',0],
-            ['tree_income_per_two',0],
-            ['money_to_score_per',0,'empty','消费转积分百分比大于0'],
-            ['tx_limit_money',0],
-            ['tx_process_per',0],
-            ['tx_process_max',0],
+//            ['ip_income_per',0,'empty','IP商品收益百分比大于0'],
+//            ['tree_income_per',0],
+//            ['tree_income_per_two',0],
+//            ['money_to_score_per',0,'empty','消费转积分百分比大于0'],
+//            ['tx_limit_money',0],
+//            ['tx_process_per',0],
+//            ['tx_process_max',0],
         ], $request);
-        $post["tx_limit_money"] = (int)$post["tx_limit_money"];
-        $post["tx_process_per"] = (int)$post["tx_process_per"];
-        $post["tx_process_max"] = (int)$post["tx_process_max"];
+//        $post["tx_limit_money"] = (int)$post["tx_limit_money"];
+//        $post["tx_process_per"] = (int)$post["tx_process_per"];
+//        $post["tx_process_max"] = (int)$post["tx_process_max"];
         if(!empty($post["custom_tel"])){
             $post["custom_tel"] = str_replace("，", ",", $post["custom_tel"]);
         }

app/system/controller/v1/SysMenu.php → app/system/controller/SysMenu.php

@@ -9,7 +9,7 @@
 // | Date: 2020-08-31 20:43
 // +----------------------------------------------------------------------
 
-namespace app\system\controller\v1;
+namespace app\system\controller;
 
 
 use app\BaseController;

app/system/controller/v1/Upload.php → app/system/controller/Upload.php

@@ -1,6 +1,6 @@
 <?php
 declare (strict_types=1);
-namespace app\system\controller\v1;
+namespace app\system\controller;
 // +----------------------------------------------------------------------
 // | [ WE CAN DO IT MORE SIMPLE  ]
 // +----------------------------------------------------------------------

app/system/route/activity.php

@@ -13,9 +13,9 @@ use think\facade\Route;
 //@活动管理
 Route::group('activity', function () {
     //@活动列表
-    Route::rule('list', 'v1.activity/list');
+    Route::rule('list', 'activity/list');
     //@添加编辑活动
-    Route::rule('add', 'v1.activity/add');
+    Route::rule('add', 'activity/add');
     
 })->middleware([
     \app\system\middleware\AllowOriginMiddleware::class,

app/system/route/admin.php

@@ -14,21 +14,21 @@ use think\facade\Route;
 //@管理员
 Route::group('admin', function () {
     //@退出管理系统
-    Route::rule('logout', 'v1.admin/logout');
+    Route::rule('logout', 'admin/logout');
     //@获取管理信息[当前登录用户]
-    Route::post('info','v1.admin/info');
+    Route::post('info','admin/info');
     //@修改管理信息[当前登录用户]
-    Route::post('edit','v1.admin/edit');
+    Route::post('edit','admin/edit');
     //@修改管理密码[当前登录用户]
-    Route::post('password','v1.admin/password');
+    Route::post('password','admin/password');
     //@获取列表
-    Route::post('list','v1.admin/list');
+    Route::post('list','admin/list');
     //@修改信息
-    Route::post('save','v1.admin/save');
+    Route::post('save','admin/save');
     //@删除信息
-    Route::post('del','v1.admin/del');
+    Route::post('del','admin/del');
     //@获取详情信息
-    Route::post('getInfo','v1.admin/getInfo');
+    Route::post('getInfo','admin/getInfo');
 })->middleware([
     \app\system\middleware\AllowOriginMiddleware::class,
     \app\system\middleware\AdminAuthTokenMiddleware::class,

app/system/route/adver.php

@@ -13,24 +13,24 @@ use think\facade\Route;
 //@广告栏目
 Route::group('adver', function () {
     //@获取广告栏目
-    Route::rule('page', 'v1.adver/page');
+    Route::rule('page', 'adver/page');
     //@获取广告分类tree
-    Route::post('page_tree','v1.adver/page_tree');
+    Route::post('page_tree','adver/page_tree');
     //@删除广告分类
-    Route::post('page_del','v1.adver/page_del');
+    Route::post('page_del','adver/page_del');
     //@修改广告分类数据
-    Route::post('page_save','v1.adver/page_save');
+    Route::post('page_save','adver/page_save');
     //@广告分类详情
-    Route::post('page_info','v1.adver/page_info');
+    Route::post('page_info','adver/page_info');
 
     //@广告列表
-    Route::post('list','v1.adver/list');
+    Route::post('list','adver/list');
     //@删除广告
-    Route::post('del','v1.adver/del');
+    Route::post('del','adver/del');
     //@修改广告数据
-    Route::post('save','v1.adver/save');
+    Route::post('save','adver/save');
     //@广告详情
-    Route::post('info','v1.adver/info');
+    Route::post('info','adver/info');
 
 
 })->middleware([

app/system/route/circle.php

@@ -13,9 +13,9 @@ use think\facade\Route;
 //@圈子管理
 Route::group('circle', function () {
     //@动态列表
-    Route::rule('list', 'v1.circle/list');
+    Route::rule('list', 'circle/list');
     //@审核动态
-    Route::rule('editStatus', 'v1.circle/editStatus');
+    Route::rule('editStatus', 'circle/editStatus');
     
 })->middleware([
     \app\system\middleware\AllowOriginMiddleware::class,

app/system/route/goods.php

@@ -14,27 +14,27 @@ use think\facade\Route;
 Route::group('goods', function () {
     
     //@商品列表
-    Route::rule('list', 'v1.goods/list');
+    Route::rule('list', 'goods/list');
     //@添加编辑商品
-    Route::rule('add', 'v1.goods/add');
+    Route::rule('add', 'goods/add');
     //@删除商品
-    Route::rule('del', 'v1.goods/del');
+    Route::rule('del', 'goods/del');
     
     //@优惠券列表
-    Route::rule('coupon', 'v1.goods/coupon');
+    Route::rule('coupon', 'goods/coupon');
     //@添加编辑优惠券
-    Route::rule('couponAdd', 'v1.goods/couponAdd');
+    Route::rule('couponAdd', 'goods/couponAdd');
     //@删除优惠券
-    Route::rule('couponDel', 'v1.goods/couponDel');
+    Route::rule('couponDel', 'goods/couponDel');
     
     
     
     //@商品分类
-    Route::rule('cate', 'v1.goods/cate');
+    Route::rule('cate', 'goods/cate');
     //@添加商品分类
-    Route::rule('cateAdd', 'v1.goods/cateAdd');
+    Route::rule('cateAdd', 'goods/cateAdd');
     //@删除商品分类
-    Route::rule('cateDel', 'v1.goods/cateDel');
+    Route::rule('cateDel', 'goods/cateDel');
 })->middleware([
     \app\system\middleware\AllowOriginMiddleware::class,
     \app\system\middleware\AdminAuthTokenMiddleware::class,

app/system/route/goods_1.php

@@ -14,27 +14,27 @@ use think\facade\Route;
 Route::group('goods', function () {
     
     //@商品列表
-    Route::rule('list', 'v1.goods/list');
+    Route::rule('list', 'goods/list');
     //@添加编辑商品
-    Route::rule('add', 'v1.goods/add');
+    Route::rule('add', 'goods/add');
     //@删除商品
-    Route::rule('del', 'v1.goods/del');
+    Route::rule('del', 'goods/del');
     
     //@优惠券列表
-    Route::rule('coupon', 'v1.goods/coupon');
+    Route::rule('coupon', 'goods/coupon');
     //@添加编辑优惠券
-    Route::rule('couponAdd', 'v1.goods/couponAdd');
+    Route::rule('couponAdd', 'goods/couponAdd');
     //@删除优惠券
-    Route::rule('couponDel', 'v1.goods/couponDel');
+    Route::rule('couponDel', 'goods/couponDel');
     
     
     
     //@商品分类
-    Route::rule('cate', 'v1.goods/cate');
+    Route::rule('cate', 'goods/cate');
     //@添加商品分类
-    Route::rule('cateAdd', 'v1.goods/cateAdd');
+    Route::rule('cateAdd', 'goods/cateAdd');
     //@删除商品分类
-    Route::rule('cateDel', 'v1.goods/cateDel');
+    Route::rule('cateDel', 'goods/cateDel');
 })->middleware([
     \app\system\middleware\AllowOriginMiddleware::class,
     \app\system\middleware\AdminAuthTokenMiddleware::class,

app/system/route/index.php

@@ -14,17 +14,17 @@ use think\facade\Route;
 //@基础数据
 Route::group('index', function () {
     //@获取初始数据
-    Route::rule('init', 'v1.Index/init');
+    Route::rule('init', 'Index/init');
     //@获取地区
-    Route::rule('getArea','v1.Index/getArea');
+    Route::rule('getArea','Index/getArea');
     //@获取快单礼包
-    Route::rule('express','v1.Index/express');
+    Route::rule('express','Index/express');
     //@首页基础数据
-    Route::rule('getIndex', 'v1.Index/getIndex');
+    Route::rule('getIndex', 'Index/getIndex');
     //@订单统计
-    Route::rule('getOrderTotal','v1.Index/getOrderTotal');
+    Route::rule('getOrderTotal','Index/getOrderTotal');
     //@获取提现方式
-    Route::rule('getTxType', 'v1.Index/getTxType');
+    Route::rule('getTxType', 'Index/getTxType');
 
 
 })->middleware([

app/system/route/label.php

@@ -13,11 +13,11 @@ use think\facade\Route;
 //@标签管理
 Route::group('label', function () {
     //@标签列表
-    Route::rule('list', 'v1.label/list');
+    Route::rule('list', 'label/list');
     //@标签添加编辑
-    Route::rule('add', 'v1.label/add');
+    Route::rule('add', 'label/add');
     //@标签删除
-    Route::rule('del', 'v1.label/del');
+    Route::rule('del', 'label/del');
 })->middleware([
     \app\system\middleware\AllowOriginMiddleware::class,
     \app\system\middleware\AdminAuthTokenMiddleware::class,

app/system/route/log.php

@@ -13,15 +13,15 @@ use think\facade\Route;
 //@操作日志
 Route::group('log', function () {
     //@日志列表
-    Route::rule('list', 'v1.log/list');
+    Route::rule('list', 'log/list');
     //@删除日志
-    Route::post('del','v1.log/del');
+    Route::post('del','log/del');
     //@删除一个月之前
-    Route::post('delMonth','v1.log/delMonth');
+    Route::post('delMonth','log/delMonth');
     //@登录日志列表
-    Route::rule('listLoginLog', 'v1.log/listLoginLog');
+    Route::rule('listLoginLog', 'log/listLoginLog');
     //@删除一个月之前登录日志
-    Route::post('delMonthLoginLog','v1.log/delMonthLoginLog');
+    Route::post('delMonthLoginLog','log/delMonthLoginLog');
 
 })->middleware([
     \app\system\middleware\AllowOriginMiddleware::class,

app/system/route/member.php

@@ -15,28 +15,28 @@ use think\facade\Route;
 Route::group('member', function () {
     
     //@门店列表
-    Route::rule('shopList', 'v1.Member/shopList');
+    Route::rule('shopList', 'Member/shopList');
     //@门店编辑
-    Route::rule('shopSave', 'v1.Member/shopSave');
+    Route::rule('shopSave', 'Member/shopSave');
     
     //@列表
-    Route::rule('list', 'v1.Member/list'); 
+    Route::rule('list', 'Member/list'); 
     //添加编辑
-    Route::rule('save', 'v1.Member/save'); 
+    Route::rule('save', 'Member/save'); 
     //余额明细
-    Route::rule('moneyDetail', 'v1.Member/moneyDetail'); 
+    Route::rule('moneyDetail', 'Member/moneyDetail'); 
     //余额补扣
-    Route::rule('moneyDetailSave', 'v1.Member/moneyDetailSave'); 
+    Route::rule('moneyDetailSave', 'Member/moneyDetailSave'); 
     //积分明细
-    Route::rule('scoreDetail', 'v1.Member/scoreDetail'); 
+    Route::rule('scoreDetail', 'Member/scoreDetail'); 
     //积分补扣
-    Route::rule('scoreDetailSave', 'v1.Member/scoreDetailSave'); 
+    Route::rule('scoreDetailSave', 'Member/scoreDetailSave'); 
     //用户详情
-    Route::rule('item', 'v1.Member/getItem');
+    Route::rule('item', 'Member/getItem');
     //交易列表
-    Route::rule('payTradeList', 'v1.Member/payTradeList');
+    Route::rule('payTradeList', 'Member/payTradeList');
     //支付查询
-    Route::rule('searchPayTrade', 'v1.Member/searchPayTrade');
+    Route::rule('searchPayTrade', 'Member/searchPayTrade');
     
     
     

app/system/route/news.php

@@ -13,11 +13,11 @@ use think\facade\Route;
 //@展示信息管理
 Route::group('news', function () {
     //@公告列表
-    Route::post('list','v1.news/list');
+    Route::post('list','news/list');
     //@公告添加
-    Route::post('add','v1.news/add');
+    Route::post('add','news/add');
     //@公告删除
-    Route::post('del','v1.news/del');
+    Route::post('del','news/del');
 })->middleware([
     \app\system\middleware\AllowOriginMiddleware::class,
     \app\system\middleware\AdminAuthTokenMiddleware::class,

app/system/route/order.php

@@ -13,27 +13,27 @@ use think\facade\Route;
 //@订单管理
 Route::group('order', function () {
     //@订单统计
-    Route::rule('total',"v1.Order/total");
+    Route::rule('total',"Order/total");
     //@订单列表
-    Route::rule('list','v1.Order/list');
+    Route::rule('list','Order/list');
     //@订单详情
-    Route::rule('info','v1.Order/info');
+    Route::rule('info','Order/info');
     //@订单记录
-    Route::rule('log','v1.Order/log');
+    Route::rule('log','Order/log');
     //@添加备注
-    Route::rule('mono','v1.Order/mono');
+    Route::rule('mono','Order/mono');
     //@订单发货
-    Route::rule('fahuo','v1.Order/fahuo');
+    Route::rule('fahuo','Order/fahuo');
     //@活动订单统计
-    Route::rule('activityTotal',"v1.Order/activityTotal");
+    Route::rule('activityTotal',"Order/activityTotal");
     //@活动订单列表
-    Route::rule('activityList','v1.Order/activityList');
+    Route::rule('activityList','Order/activityList');
     //@活动订单详情
-    Route::rule('activityInfo','v1.Order/activityInfo');
+    Route::rule('activityInfo','Order/activityInfo');
     //@活动订单记录
-    Route::rule('activityLog','v1.Order/activityLog');
+    Route::rule('activityLog','Order/activityLog');
     //@活动订单添加备注
-    Route::rule('activityMono','v1.Order/activityMono');
+    Route::rule('activityMono','Order/activityMono');
 
 })->middleware([
     \app\system\middleware\AllowOriginMiddleware::class,

app/system/route/role.php

@@ -14,15 +14,15 @@ use think\facade\Route;
 //@权限设置
 Route::group('role', function () {
     //@角色列表
-    Route::rule('list', 'v1.role/list');
+    Route::rule('list', 'role/list');
     //@修改角色
-    Route::post('save','v1.role/save');
+    Route::post('save','role/save');
     //@删除角色
-    Route::post('del','v1.role/del');
+    Route::post('del','role/del');
     //@权利配置
-    Route::rule('setingList','v1.role/setingList');
+    Route::rule('setingList','role/setingList');
     //@角色权限
-    Route::rule('setingSave','v1.role/setingSave');
+    Route::rule('setingSave','role/setingSave');
 
 })->middleware([
     \app\system\middleware\AllowOriginMiddleware::class,

app/system/route/rolepath.php

@@ -13,17 +13,17 @@ use think\facade\Route;
 //@权限组合
 Route::group('rolepath', function () {
     //@权限列表
-    Route::rule('list', 'v1.RolePath/list');
+    Route::rule('list', 'RolePath/list');
     //@权限树结构
-    Route::rule('tree','v1.RolePath/treeList');
+    Route::rule('tree','RolePath/treeList');
     //@设置权限开关
-    Route::post('status','v1.RolePath/status');
+    Route::post('status','RolePath/status');
     //@获取组合
-    Route::rule('info','v1.RolePath/info');
+    Route::rule('info','RolePath/info');
     //@保存组合
-    Route::rule('save','v1.RolePath/save');
+    Route::rule('save','RolePath/save');
     //@删除组合
-    Route::rule('del','v1.RolePath/del');
+    Route::rule('del','RolePath/del');
 })->middleware([
     \app\system\middleware\AllowOriginMiddleware::class,
     \app\system\middleware\AdminAuthTokenMiddleware::class,

app/system/route/route.php

@@ -20,7 +20,7 @@ Route::group(function () {
     //
     Route::rule('index', 'Index/index');
     //获取area
-    Route::rule('pub/getArea', 'v1.pub/getArea');
+    Route::rule('pub/getArea', 'pub/getArea');
 
 
 

app/system/route/sys.php

@@ -13,18 +13,18 @@ use think\facade\Route;
 //@基本设置
 Route::group('sys', function () {
     //@切换基本设置
-    Route::rule('index', 'v1.sys/index');
+    Route::rule('index', 'sys/index');
     //@保存基本设置
-    Route::rule('save','v1.sys/save');
+    Route::rule('save','sys/save');
     //@保存用户条款
-    Route::rule('agreeSave','v1.sys/agreeSave');
+    Route::rule('agreeSave','sys/agreeSave');
     
     //@提现方式列表
-    Route::rule('bankList','v1.sys/bankList');
+    Route::rule('bankList','sys/bankList');
     //@添加编辑提现方式
-    Route::rule('bankSave','v1.sys/bankSave');
+    Route::rule('bankSave','sys/bankSave');
     //@删除提现方式
-    Route::rule('bankDel','v1.sys/bankDel');
+    Route::rule('bankDel','sys/bankDel');
     
     
 })->middleware([

app/system/route/sysmenu.php

@@ -14,17 +14,17 @@ use think\facade\Route;
 //@菜单栏目
 Route::group('sysmenu', function () {
     //@列表
-    Route::rule('list', 'v1.sysMenu/list');
+    Route::rule('list', 'sysMenu/list');
     //@树结构列表
-    Route::rule('tree','v1.sysMenu/treeList');
+    Route::rule('tree','sysMenu/treeList');
     //@设置菜单显示/隐藏
-    Route::post('status','v1.sysMenu/status');
+    Route::post('status','sysMenu/status');
     //@获取详情信息
-    Route::rule('info','v1.sysMenu/info');
+    Route::rule('info','sysMenu/info');
     //@保存设置
-    Route::rule('save','v1.sysMenu/save');
+    Route::rule('save','sysMenu/save');
     //@删除
-    Route::rule('del','v1.sysMenu/del');
+    Route::rule('del','sysMenu/del');
 })->middleware([
     \app\system\middleware\AllowOriginMiddleware::class,
     \app\system\middleware\AdminAuthTokenMiddleware::class,

app/system/route/tx.php

@@ -13,13 +13,13 @@ use think\facade\Route;
 //@提现列表
 Route::group('tx', function () {
     //@提现列表初始化
-    Route::rule('init','v1.tx/init');
+    Route::rule('init','tx/init');
     //@列表
-    Route::rule('list', 'v1.tx/list');
+    Route::rule('list', 'tx/list');
     //@提现处理
-    Route::rule('dealSub','v1.tx/dealSub');
+    Route::rule('dealSub','tx/dealSub');
     //@提现下载
-    Route::rule('down','v1.tx/down');
+    Route::rule('down','tx/down');
 
 })->middleware([
     \app\system\middleware\AllowOriginMiddleware::class,

app/system/route/upload.php

@@ -13,11 +13,11 @@ use think\facade\Route;
 //@上传
 Route::group('upload', function () {
     //@图片文件
-    Route::post('index','v1.upload/index');
+    Route::post('index','upload/index');
     //@上传视频
-    Route::post('mp4','v1.upload/mp4');
+    Route::post('mp4','upload/mp4');
     //@文件上传
-    Route::post('uploadFile','v1.upload/uploadFile');
+    Route::post('uploadFile','upload/uploadFile');
 })->middleware([
     \app\system\middleware\AllowOriginMiddleware::class,
     \app\system\middleware\AdminAuthTokenMiddleware::class