[更新]同步framework代码

application/store/command/AutoRun.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\command;

application/store/controller/Config.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\controller;
@@ -35,10 +35,11 @@ class Config extends Controller
         $this->title = '商城参数配置';
         if ($this->request->isGet()) {
             $this->query = Extend::querySmsBalance();
-            return $this->fetch();
+            $this->fetch();
+        } else {
+            foreach ($this->request->post() as $k => $v) sysconf($k, $v);
+            $this->success('商城参数配置保存成功！');
         }
-        foreach ($this->request->post() as $k => $v) sysconf($k, $v);
-        $this->success('商城参数配置保存成功！');
     }
 
 }

application/store/controller/Express.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\controller;
@@ -31,6 +31,7 @@ class Express extends Controller
     protected $table = 'StoreExpress';
 
     /**
+     * 快递公司管理
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException

application/store/controller/Goods.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\controller;
@@ -19,7 +19,7 @@ use library\tools\Data;
 use think\Db;
 
 /**
- * 商城商品管理
+ * 商品信息管理
  * Class Goods
  * @package app\store\controller
  */
@@ -32,7 +32,7 @@ class Goods extends Controller
     protected $table = 'StoreGoods';
 
     /**
-     * 商品列表
+     * 商品信息管理
      * @return mixed
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
@@ -42,8 +42,8 @@ class Goods extends Controller
      */
     public function index()
     {
-        $this->title = '商品管理';
+        $this->title = '商城商品管理';
-        $this->_query($this->table)->equal('status,vip_mod,cate_id')->like('title')->where(['is_deleted' => '0'])->order('sort asc,id desc')->page();
+        $this->_query($this->table)->equal('status,cate_id')->like('title')->where(['is_deleted' => '0'])->order('sort asc,id desc')->page();
     }
 
     /**
@@ -163,7 +163,7 @@ class Goods extends Controller
     }
 
     /**
-     * 商品禁用
+     * 禁用商品信息
      */
     public function forbid()
     {
@@ -171,7 +171,7 @@ class Goods extends Controller
     }
 
     /**
-     * 商品禁用
+     * 启用商品信息
      */
     public function resume()
     {
@@ -179,7 +179,7 @@ class Goods extends Controller
     }
 
     /**
-     * 删除商品
+     * 删除商品信息
      */
     public function del()
     {

application/store/controller/GoodsCate.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\controller;
@@ -17,6 +17,7 @@ namespace app\store\controller;
 use library\Controller;
 
 /**
+ * 商品分类管理
  * Class GoodsCate
  * @package app\store\controller
  */
@@ -29,7 +30,7 @@ class GoodsCate extends Controller
     protected $table = 'StoreGoodsCate';
 
     /**
-     * @return mixed
+     * 商品分类管理
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
@@ -39,11 +40,11 @@ class GoodsCate extends Controller
     public function index()
     {
         $this->title = '商品分类管理';
-        return $this->_query($this->table)->like('title')->equal('status')->order('sort asc,id desc')->page();
+        $this->_query($this->table)->like('title')->equal('status')->order('sort asc,id desc')->page();
     }
 
     /**
-     * 添加商品分类信息
+     * 添加商品分类
      * @return mixed
      */
     public function add()
@@ -53,7 +54,7 @@ class GoodsCate extends Controller
     }
 
     /**
-     * 编辑商品分类信息
+     * 编辑添加商品分类
      * @return mixed
      */
     public function edit()
@@ -63,7 +64,7 @@ class GoodsCate extends Controller
     }
 
     /**
-     * 商品分类禁用
+     * 禁用添加商品分类
      */
     public function forbid()
     {
@@ -71,7 +72,7 @@ class GoodsCate extends Controller
     }
 
     /**
-     * 商品分类禁用
+     * 启用商品分类
      */
     public function resume()
     {

application/store/controller/Member.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\controller;
@@ -30,7 +30,7 @@ class Member extends Controller
     protected $table = 'StoreMember';
 
     /**
-     * 显示会员列表
+     * 商城会员管理
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException

application/store/controller/Message.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\controller;
@@ -30,7 +30,7 @@ class Message extends Controller
     protected $table = 'StoreMemberSmsHistory';
 
     /**
-     * 短信消息列表
+     * 短信消息管理
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException

application/store/controller/Order.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\controller;
@@ -31,7 +31,7 @@ class Order extends Controller
     protected $table = 'StoreOrder';
 
     /**
-     * 商城订单列表显示
+     * 商城订单管理
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
@@ -45,13 +45,13 @@ class Order extends Controller
     }
 
     /**
-     * 商城订单列表处理
+     * 订单列表处理
      * @param array $data
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    protected function _page_filter(array &$data)
+    protected function _index_page_filter(array &$data)
     {
         $goodsList = Db::name('StoreOrderList')->whereIn('order_no', array_unique(array_column($data, 'order_no')))->select();
         $mids = array_unique(array_merge(array_column($data, 'mid'), array_column($data, 'from_mid')));
@@ -69,7 +69,7 @@ class Order extends Controller
     }
 
     /**
-     * 快递管理
+     * 修改快递管理
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException

application/store/controller/api/Express.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\controller\api;

application/store/controller/api/Goods.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\controller\api;
@@ -33,7 +33,7 @@ class Goods extends Controller
      */
     public function gets()
     {
-        $where = [['status', 'eq', '1'], ['vip_mod', 'eq', '0'], ['is_deleted', 'eq', '0']];
+        $where = [['status', 'eq', '1'], ['is_deleted', 'eq', '0']];
         $this->success('获取商品列表成功！', ['list' => $this->_getGoodsList($where)]);
     }
 
@@ -45,7 +45,7 @@ class Goods extends Controller
      */
     public function vips()
     {
-        $where = [['status', 'eq', '1'], ['vip_mod', 'neq', '0'], ['is_deleted', 'eq', '0']];
+        $where = [['status', 'eq', '1'], ['is_deleted', 'eq', '0']];
         $this->success('获取礼包列表成功！', ['list' => $this->_getGoodsList($where)]);
     }
 
@@ -65,7 +65,7 @@ class Goods extends Controller
         if ($this->request->has('cate_id', 'post', true)) {
             $where[] = ['cate_id', 'eq', $this->request->post('cate_id')];
         }
-        $field = 'id,title,logo,cate_id,image,number_sales,number_stock,vip_mod,vip_month,vip_discount,content,specs,lists';
+        $field = 'id,title,logo,cate_id,image,number_sales,number_stock,content,specs,lists';
         $list = Db::name('StoreGoods')->field($field)->where($where)->order('sort asc,id desc')->select();
         $goodsList = Db::name('StoreGoodsList')->whereIn('goods_id', array_unique(array_column($list, 'id')))->select();
         foreach ($list as &$vo) {
@@ -90,7 +90,7 @@ class Goods extends Controller
     {
         $goods_id = input('goods_id');
         $where = ['is_deleted' => '0', 'status' => '1', 'id' => $goods_id];
-        $field = 'id,title,logo,cate_id,image,number_sales,number_stock,vip_mod,vip_month,vip_discount,content,specs,lists';
+        $field = 'id,title,logo,cate_id,image,number_sales,number_stock,content,specs,lists';
         $goods = Db::name('StoreGoods')->field($field)->where($where)->find();
         if (empty($goods)) $this->error('指定商品不存在，请更换商品ID重试！');
         $goods['image'] = explode('|', $goods['image']);

application/store/controller/api/Member.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\controller\api;

application/store/controller/api/Notify.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\controller\api;

application/store/controller/api/Wechat.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\controller\api;

application/store/controller/api/member/Address.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\controller\api\member;

application/store/controller/api/member/Center.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\controller\api\member;

application/store/controller/api/member/Order.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\controller\api\member;

application/store/service/Extend.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\service;

application/store/service/Goods.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\service;

application/store/service/Order.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\store\service;

application/store/sys.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 // 注册系统指令

application/store/view/goods/index.html

@@ -51,7 +51,7 @@
         </td>
         <td class='text-left nowrap'>
             快递费用：{$vo.price_express|default='0.00'} 元<br>
-            分成比例：{$vo.price_rate|default='0.0000'} %<br>
+            分成比例：{$vo.price_rate+0} %<br>
             销售状态：{eq name='vo.status' value='0'}<span class="layui-badge">已下架</span>{else}<span class="layui-badge layui-bg-green">销售中</span>{/eq}<br>
         </td>
         <td class='text-left nowrap padding-0 relative'>

application/store/view/goods/stock.html

@@ -58,9 +58,7 @@
     <div class="layui-form-item text-center">
         <button class="layui-btn" type='submit'>确定入库</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消入库吗？" data-close>取消入库</button>
-        <!--{notempty name='vo.id'}-->
+        <!--{notempty name='vo.id'}--><input type='hidden' value='{$vo.id}' name='id'><!--{/notempty}-->
-        <input type='hidden' value='{$vo.id}' name='id'>
-        <!--{/notempty}-->
     </div>
 
 </form>