commit

app/admin/controller/order/StoreOrder.php

@@ -89,7 +89,8 @@ class StoreOrder extends AuthController
             ['order', ''],
             ['page', 1],
             ['limit', 20],
-            ['excel', 0]
+            ['excel', 0],
+            ['purchase', '']
         ]);
         return Json::successlayui(StoreOrderModel::OrderList($where));
     }

app/admin/controller/store/StoreProduct.php

@@ -273,7 +273,12 @@ class StoreProduct extends AuthController
             ['items', []],
             ['attrs', []],
             ['activity', []],
-            ['store_type', 1]
+            ['store_type', 1],
+            ['is_upgrade', 0],
+            ['push', 0],
+            ['push_sale', 0],
+            ['Interposition', 0],
+            ['Interposition_sale', 0],
         ]);
         foreach ($data['activity'] as $k => $v) {
             if ($v == '秒杀') {

app/admin/controller/user/User.php

@@ -335,6 +335,12 @@ class User extends AuthController
         $f[] = Form::radio('is_promoter', '推广员', $user->getData('is_promoter'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '关闭']]);
         $f[] = Form::select('spread_uid', '推荐人', (string)$user->getData('spread_uid'))->options(array_merge([['value' => 0, 'label' => '无']], UserModel::where('uid', '<>', $uid)->field('uid as value,nickname as label')->select()->toArray()))->filterable(true);
         $f[] = Form::radio('status', '状态', $user->getData('status'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '锁定']]);
+
+        $f[] = Form::radio('alliance', '老师', $user->getData('alliance'))->options([['value' => 1, 'label' => '是'], ['value' => 0, 'label' => '否']]);
+        $f[] = Form::radio('shopkeeper', '店家', $user->getData('shopkeeper'))->options([['value' => 1, 'label' => '是'], ['value' => 0, 'label' => '否']]);
+        $f[] = Form::radio('province', '省盟', $user->getData('province'))->options([['value' => 1, 'label' => '是'], ['value' => 0, 'label' => '否']]);
+        $f[] = Form::radio('group', '团长', $user->getData('group'))->options([['value' => 1, 'label' => '是'], ['value' => 0, 'label' => '否']]);
+
         $form = Form::make_post_form('添加用户通知', $f, Url::buildUrl('update', array('uid' => $uid)), 5);
         $this->assign(compact('form'));
         return $this->fetch('public/form-builder');
@@ -355,6 +361,10 @@ class User extends AuthController
             ['integration', 0],
             ['status', 0],
             ['spread_uid', 0],
+            ['alliance', 0],
+            ['shopkeeper', 0],
+            ['province', 0],
+            ['group', 0],
         ]);
         if (!$uid) return $this->failed('数据不存在');
         $user = UserModel::get($uid);
@@ -420,6 +430,10 @@ class User extends AuthController
         $edit['birthday'] = strtotime($data['birthday']);
         $edit['mark'] = $data['mark'];
         $edit['is_promoter'] = $data['is_promoter'];
+        $edit['alliance'] = $data['alliance'];
+        $edit['shopkeeper'] = $data['shopkeeper'];
+        $edit['province'] = $data['province'];
+        $edit['group'] = $data['group'];
         if ($edit) $res3 = UserModel::edit($edit, $uid);
         else $res3 = true;
         if ($res1 && $res2 && $res3 && $res_sp) $res = true;

app/admin/controller/user/UserApply.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace app\admin\controller\user;
+
+use app\admin\controller\AuthController;
+use crmeb\services\{FormBuilder as Form, UtilService as Util, JsonService as Json};
+use crmeb\services\JsonService;
+use think\facade\Route as Url;
+use app\admin\model\user\UserNotice as UserNoticeModel;
+use app\admin\model\user\UserNoticeSee as UserNoticeSeeModel;
+use app\admin\model\wechat\WechatUser as UserModel;
+Use app\admin\model\user\UserApply as model;
+
+/**
+ * 用户通知
+ * Class UserNotice
+ * @package app\admin\controller\user
+ */
+class UserApply extends AuthController
+{
+    /**
+     * 显示资源列表
+     *
+     * @return \think\Response
+     */
+    public function index($type)
+    {
+
+        $this->assign('type', $type);
+        return $this->fetch();
+    }
+
+    public function indexs($type)
+    {
+
+        $this->assign('type', $type);
+        return $this->fetch();
+    }
+
+    public function list()
+    {
+        $where = Util::getMore([
+            ['status', ''],
+            ['page', 1],
+            ['limit', 20],
+            ['name', ''],
+            ['type', ''],
+            ['status', ''],
+        ]);
+
+        return Json::successlayui(model::list($where));
+    }
+
+    public function tg($id,$type)
+    {
+        $data = model::find($id);
+        if (!$data) return Json::fail('数据不存在');
+        $data['status'] = 1;
+
+        //老师
+        if ($type == 1){
+            $res = \app\admin\model\user\User::where('uid', $data['uid'])->update(['alliance' => 1]) && $data->save();
+
+
+        }elseif($type == 2) {
+            // 点击
+            $res = \app\admin\model\user\User::where('uid', $data['uid'])->update(['shopkeeper' => 1]) && $data->save();
+        }
+
+        if ($res) return Json::successful('成功');
+        return Json::fail('失败');
+    }
+
+    public function btg($id,$type)
+    {
+        $data = model::find($id);
+        if (!$data) return Json::fail('数据不存在');
+        $data['status'] = -1;
+        $res = $data->save();
+        if ($res) return Json::successful('成功');
+        return Json::fail('失败');
+    }
+
+
+
+    /**
+     * 删除指定资源
+     *
+     * @param int $id
+     * @return \think\Response
+     */
+    public function delete($id)
+    {
+        if (!model::del($id))
+            return Json::fail(UserNoticeModel::getErrorInfo('删除失败,请稍候再试!'));
+        else
+            return Json::successful('删除成功!');
+    }
+
+
+}

app/admin/model/order/StoreOrder.php

@@ -55,6 +55,9 @@ class StoreOrder extends BaseModel
         $data['pink'] = self::where('pink_id|combination_id', '>', 0)->where('is_system_del', 0)->count();
         $data['seckill'] = self::where('seckill_id', '>', 0)->where('is_system_del', 0)->count();
         $data['bargain'] = self::where('bargain_id', '>', 0)->where('is_system_del', 0)->count();
+        $data['purchase1'] = self::where('purchase', '=', 0)->count();
+        $data['purchase2'] = self::where('purchase', '=', 1)->count();
+        $data['purchase3'] = self::where('purchase', '=', 2)->count();
         return $data;
     }
 
@@ -480,6 +483,13 @@ HTML;
         if (isset($where['status']) && $where['status'] != '') {
             $model = self::statusByWhere($where['status'], $model, $aler);
         }
+
+
+        if (isset($where['purchase']) and $where['purchase'] != ''){
+            if ($where['purchase'] == 1) $model->where('purchase', 0);
+            if ($where['purchase'] == 2) $model->where('purchase', 1);
+            if ($where['purchase'] == 3) $model->where('purchase', 2);
+        }
         if (isset($where['is_del']) && $where['is_del'] != '' && $where['is_del'] != -1) $model = $model->where($aler . 'is_del', $where['is_del']);
         if (isset($where['combination_id'])) {
             if ($where['combination_id'] == '普通订单') {

app/admin/model/user/UserApply.php

@@ -0,0 +1,62 @@
+<?php
+/**
+ *
+ * @author: xaboy<365615158@qq.com>
+ * @day: 2017/12/25
+ */
+
+namespace app\admin\model\user;
+
+use crmeb\basic\BaseModel;
+use crmeb\traits\ModelTrait;
+
+/**
+ * TODO 用户申请
+ * Class UserAddress
+ * @package app\models\user
+ */
+class UserApply extends BaseModel
+{
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'user_apply';
+
+    use ModelTrait;
+
+    protected $autoWriteTimestamp = true;
+
+    public static function list($where)
+    {
+        $model = self::alias('a')->field('a.*,u.nickname')
+            ->leftJoin('user u', 'a.uid = u.uid')
+            ->order('a.id DESC');
+        if ($where['name'])$model->where('a.name' , 'like', '%'.$where['name'],'%');
+        if ($where['type']) $model->where('a.type', $where['type']);
+        if ($where['status']) {
+            if ($where['status'] == 1) $model->where('a.status', '=', -1);
+            if ($where['status'] == 2) $model->where('a.status', '=', 0);
+            if ($where['status'] == 3) $model->where('a.status', '=', 1);
+
+        }
+        $data['count'] = $model->count();
+
+        if ($where['page'] && $where['limit']){
+            $model->page($where['page'], $where['limit']);
+        }else{
+            $model->page(20, 1);
+        }
+        $list = $model->select()->toArray();
+        $data['data'] = $list;
+        return $data;
+
+    }
+
+}

app/admin/model/user/UserProduct.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ *
+ * @author: xaboy<365615158@qq.com>
+ * @day: 2017/12/25
+ */
+
+namespace app\admin\model\user;
+
+use crmeb\basic\BaseModel;
+use crmeb\traits\ModelTrait;
+
+/**
+ * TODO 用户申请
+ * Class UserAddress
+ * @package app\models\user
+ */
+class UserProduct extends BaseModel
+{
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'user_product';
+
+    use ModelTrait;
+
+    protected $autoWriteTimestamp = true;
+
+    public static function list($where)
+    {
+        $model = self::field('*')->order('id DESC');
+        if ($where['name'])$model->where('name' , 'like', '%'.$where['name'],'%');
+        $data['count'] = $model->count();
+
+        if ($where['page'] && $where['limit']){
+            $model->page($where['page'], $where['limit']);
+        }else{
+            $model->page(20, 1);
+        }
+        $list = $model->select()->toArray();
+        $data['data'] = $list;
+        return $data;
+
+    }
+
+}

app/admin/view/order/store_order/index.php

@@ -69,6 +69,17 @@
                                         </button>
                                     </div>
                                 </div>
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label">订单类型:</label>
+                                    <div class="layui-input-block" v-cloak="">
+                                        <button class="layui-btn layui-btn-sm"
+                                                :class="{'layui-btn-primary':where.purchase!=item.value}"
+                                                @click="where.purchase = item.value" type="button"
+                                                v-for="item in purchase">{{item.name}}
+                                            <span v-if="item.count!=undefined" class="layui-badge layui-bg-gray">{{item.count}}</span>
+                                        </button>
+                                    </div>
+                                </div>
                                 <div class="layui-col-lg12">
                                     <label class="layui-form-label">创建时间:</label>
                                     <div class="layui-input-block" data-type="data" v-cloak="">
@@ -524,6 +535,22 @@
                         </ul>
                         {{#  }; }}
                     </script>
+
+                    <script type="text/html" id="purchase">
+                        {{#  if(d.status == 0){ }}
+                        <button type="button" name="suc" class="layui-btn-disabled layui-btn-xs" id="">
+                            普通商品
+                        </button>
+                        {{#  } else if(d.status == 1) { }}
+                        <button type="button" name="suc" class="layui-btn-disabled layui-btn-xs" id="">
+                            店家进货
+                        </button>
+                        {{#  } else if(d.status == -1) { }}
+                        <button type="button" name="suc" class="layui-btn-disabled layui-btn-xs" id="">
+                            店家发货
+                        </button>
+                        {{#  } }}
+                    </script>
                 </div>
             </div>
         </div>
@@ -542,8 +569,10 @@
             {field: 'spread_uid', title: '推荐人信息', templet: '#spread_uid', width: '10%', align: 'center'},
             {field: 'info', title: '商品信息', templet: "#info", height: 'full-20'},
             {field: 'pay_price', title: '实际支付', width: '8%', align: 'center'},
-            {field: 'paid', title: '支付状态', templet: '#paid', width: '8%', align: 'center'},
-            {field: 'status', title: '订单状态', templet: '#status', width: '8%', align: 'center'},
+            {field: 'paid', title: '支付状态', templet: '#paid',  align: 'center'},
+            {field: 'status', title: '订单状态', templet: '#status',  align: 'center'},
+            {field: 'consignor', title: '发货人', templet: '#consignor', align: 'center'},
+            {field: 'purchase', title: '订单类型', templet: '#purchase', align: 'center'},
             {field: 'add_time', title: '下单时间', width: '10%', sort: true, align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act', width: '10%'},
         ];
@@ -706,6 +735,12 @@
                     {name: '余额支付', value: 2, count: payTypeCount.yue},
                     {name: '线下支付', value: 3, count: payTypeCount.offline},
                 ],
+                purchase: [
+                    {name: '全部', value: ''},
+                    {name: '普通商品', value: 1, count: orderCount.purchase1},
+                    {name: '店家进货', value: 2, count: orderCount.purchase2},
+                    {name: '店家发货', value: 3, count: orderCount.purchase3},
+                ],
                 orderType: [
                     {name: '全部', value: ''},
                     {name: '普通订单', value: 1, count: orderCount.general},
@@ -742,6 +777,7 @@
                     pay_type: '',
                     real_name: real_name || '',
                     excel: 0,
+                    purchase:''
                 },
                 showtime: false,
             },
@@ -765,6 +801,11 @@
                     this.where.excel = 0;
                     this.getBadge();
                     layList.reload(this.where, true);
+                },
+                'where.purchase': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
                 }
             },
             methods: {

app/admin/view/store/store_product/create.php

@@ -672,14 +672,27 @@
                                             </div>
                                         </div>
                                     </div>
+<!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
+<!--                                        <div class="grid-demo grid-demo-bg1">-->
+<!--                                            <div class="layui-form-item">-->
+<!--                                                <label class="layui-form-label">赠送积分</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="number" name="give_integral" lay-verify="title"-->
+<!--                                                           autocomplete="off" placeholder="请输入赠送积分" class="layui-input"-->
+<!--                                                           v-model="formData.give_integral">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">赠送积分</label>
+                                                <label class="layui-form-label">排序</label>
                                                 <div class="layui-input-block">
-                                                    <input type="number" name="give_integral" lay-verify="title"
-                                                           autocomplete="off" placeholder="请输入赠送积分" class="layui-input"
-                                                           v-model="formData.give_integral">
+                                                    <input type="number" name="sort" lay-verify="title"
+                                                           autocomplete="off"
+                                                           placeholder="请输入排序" class="layui-input"
+                                                           v-model="formData.sort">
                                                 </div>
                                             </div>
                                         </div>
@@ -687,31 +700,70 @@
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">排序</label>
+                                                <label class="layui-form-label">直推奖励</label>
                                                 <div class="layui-input-block">
-                                                    <input type="number" name="sort" lay-verify="title"
+                                                    <input type="number" name="push" lay-verify="title"
                                                            autocomplete="off"
-                                                           placeholder="请输入排序" class="layui-input"
-                                                           v-model="formData.sort">
+                                                           placeholder="直推奖励" class="layui-input"
+                                                           v-model="formData.push">
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
+                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
+                                        <div class="grid-demo grid-demo-bg1">
+                                            <div class="layui-form-item">
+                                                <label class="layui-form-label">直推销售奖励</label>
+                                                <div class="layui-input-block">
+                                                    <input type="number" name="push_sale" lay-verify="title"
+                                                           autocomplete="off"
+                                                           placeholder="直推销售奖励" class="layui-input"
+                                                           v-model="formData.push_sale">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">佣金设置</label>
+                                                <label class="layui-form-label">间推奖励</label>
                                                 <div class="layui-input-block">
-                                                    <input type="radio" name="is_sub" lay-filter="is_sub" value="1"
-                                                           title="单独设置"
-                                                           :checked="formData.is_sub == 1 ? true : false">
-                                                    <input type="radio" name="is_sub" lay-filter="is_sub" value="0"
-                                                           title="默认设置"
-                                                           :checked="formData.is_sub == 0 ? true : false">
+                                                    <input type="number" name="Interposition" lay-verify="title"
+                                                           autocomplete="off"
+                                                           placeholder="间推奖励" class="layui-input"
+                                                           v-model="formData.Interposition">
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
+                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
+                                        <div class="grid-demo grid-demo-bg1">
+                                            <div class="layui-form-item">
+                                                <label class="layui-form-label">间推销售奖励</label>
+                                                <div class="layui-input-block">
+                                                    <input type="number" name="Interposition_sale" lay-verify="title"
+                                                           autocomplete="off"
+                                                           placeholder="间推销售奖励" class="layui-input"
+                                                           v-model="formData.Interposition_sale">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+<!--                                    <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">-->
+<!--                                        <div class="grid-demo grid-demo-bg1">-->
+<!--                                            <div class="layui-form-item">-->
+<!--                                                <label class="layui-form-label">佣金设置</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="radio" name="is_sub" lay-filter="is_sub" value="1"-->
+<!--                                                           title="单独设置"-->
+<!--                                                           :checked="formData.is_sub == 1 ? true : false">-->
+<!--                                                    <input type="radio" name="is_sub" lay-filter="is_sub" value="0"-->
+<!--                                                           title="默认设置"-->
+<!--                                                           :checked="formData.is_sub == 0 ? true : false">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
                                     <div class="layui-col-xs12 layui-col-sm12 layui-col-md12"
                                          v-if="formData.is_sub == 1 && formData.spec_type == 1">
                                         <div class="grid-demo grid-demo-bg1">
@@ -845,103 +897,118 @@
                                     <!--                                            </div>-->
                                     <!--                                        </div>-->
                                     <!--                                    </div>-->
+<!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
+<!--                                        <div class="grid-demo grid-demo-bg1">-->
+<!--                                            <div class="layui-form-item">-->
+<!--                                                <label class="layui-form-label">热卖单品</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="radio" name="is_hot" lay-filter="is_hot" value="1"-->
+<!--                                                           title="开启"-->
+<!--                                                           :checked="formData.is_hot == 1 ? true : false">-->
+<!--                                                    <input type="radio" name="is_hot" lay-filter="is_hot" value="0"-->
+<!--                                                           title="关闭"-->
+<!--                                                           :checked="formData.is_hot == 0 ? true : false">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
+<!--                                        <div class="grid-demo grid-demo-bg1">-->
+<!--                                            <div class="layui-form-item">-->
+<!--                                                <label class="layui-form-label">促销单品</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="radio" name="is_benefit" lay-filter="is_benefit"-->
+<!--                                                           value="1" title="开启"-->
+<!--                                                           :checked="formData.is_benefit == 1 ? true : false">-->
+<!--                                                    <input type="radio" name="is_benefit" lay-filter="is_benefit"-->
+<!--                                                           value="0" title="关闭"-->
+<!--                                                           :checked="formData.is_benefit == 0 ? true : false">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
+<!--                                        <div class="grid-demo grid-demo-bg1">-->
+<!--                                            <div class="layui-form-item">-->
+<!--                                                <label class="layui-form-label">精品推荐</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="radio" name="is_best" lay-filter="is_best" value="1"-->
+<!--                                                           title="开启"-->
+<!--                                                           :checked="formData.is_best == 1 ? true : false">-->
+<!--                                                    <input type="radio" name="is_best" lay-filter="is_best" value="0"-->
+<!--                                                           title="关闭"-->
+<!--                                                           :checked="formData.is_best == 0 ? true : false">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
+<!--                                        <div class="grid-demo grid-demo-bg1">-->
+<!--                                            <div class="layui-form-item">-->
+<!--                                                <label class="layui-form-label">首发新品</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="radio" name="is_new" lay-filter="is_new" value="1"-->
+<!--                                                           title="开启"-->
+<!--                                                           :checked="formData.is_new == 1 ? true : false">-->
+<!--                                                    <input type="radio" name="is_new" lay-filter="is_new" value="0"-->
+<!--                                                           title="关闭"-->
+<!--                                                           :checked="formData.is_new == 0 ? true : false">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">热卖单品</label>
-                                                <div class="layui-input-block">
-                                                    <input type="radio" name="is_hot" lay-filter="is_hot" value="1"
-                                                           title="开启"
-                                                           :checked="formData.is_hot == 1 ? true : false">
-                                                    <input type="radio" name="is_hot" lay-filter="is_hot" value="0"
-                                                           title="关闭"
-                                                           :checked="formData.is_hot == 0 ? true : false">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
-                                        <div class="grid-demo grid-demo-bg1">
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">促销单品</label>
-                                                <div class="layui-input-block">
-                                                    <input type="radio" name="is_benefit" lay-filter="is_benefit"
-                                                           value="1" title="开启"
-                                                           :checked="formData.is_benefit == 1 ? true : false">
-                                                    <input type="radio" name="is_benefit" lay-filter="is_benefit"
-                                                           value="0" title="关闭"
-                                                           :checked="formData.is_benefit == 0 ? true : false">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
-                                        <div class="grid-demo grid-demo-bg1">
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">精品推荐</label>
-                                                <div class="layui-input-block">
-                                                    <input type="radio" name="is_best" lay-filter="is_best" value="1"
-                                                           title="开启"
-                                                           :checked="formData.is_best == 1 ? true : false">
-                                                    <input type="radio" name="is_best" lay-filter="is_best" value="0"
-                                                           title="关闭"
-                                                           :checked="formData.is_best == 0 ? true : false">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
-                                        <div class="grid-demo grid-demo-bg1">
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">首发新品</label>
+                                                <label class="layui-form-label">升级商品</label>
                                                 <div class="layui-input-block">
-                                                    <input type="radio" name="is_new" lay-filter="is_new" value="1"
+                                                    <input type="radio" name="is_upgrade" lay-filter="is_upgrade" value="1"
                                                            title="开启"
-                                                           :checked="formData.is_new == 1 ? true : false">
-                                                    <input type="radio" name="is_new" lay-filter="is_new" value="0"
+                                                           :checked="formData.is_upgrade == 1 ? true : false">
+                                                    <input type="radio" name="is_upgrade" lay-filter="is_upgrade" value="0"
                                                            title="关闭"
-                                                           :checked="formData.is_new == 0 ? true : false">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
-                                        <div class="grid-demo grid-demo-bg1">
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">优品推荐</label>
-                                                <div class="layui-input-block">
-                                                    <input type="radio" name="is_good" lay-filter="is_good" value="1"
-                                                           title="开启"
-                                                           :checked="formData.is_good == 1 ? true : false">
-                                                    <input type="radio" name="is_good" lay-filter="is_good" value="0"
-                                                           title="关闭"
-                                                           :checked="formData.is_good == 0 ? true : false">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row layui-col-space15">
-                                        <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
-                                            <div class="grid-demo grid-demo-bg1">
-                                                <div class="layui-form-item">
-                                                    <label class="layui-form-label">活动优先级</label>
-                                                    <div class="layui-input-block">
-                                                        <span class="layui-btn layui-btn-sm layui-btn-normal"
-                                                              :style="'background-color:'+activity[item]"
-                                                              v-for="(item,index) in formData.activity" :key="index"
-                                                              draggable="true"
-                                                              @dragstart="handleDragStart($event, item)"
-                                                              @dragover.prevent="handleDragOver($event, item)"
-                                                              @dragenter="handleDragEnter($event, item)"
-                                                              @dragend="handleDragEnd($event, item)">
-                                                        {{item}}
-                                                    </span>
-                                                        <span class="info">可拖动按钮调整活动的优先展示顺序</span>
-                                                    </div>
+                                                           :checked="formData.is_upgrade == 0 ? true : false">
                                                 </div>
                                             </div>
                                         </div>
                                     </div>
+<!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
+<!--                                        <div class="grid-demo grid-demo-bg1">-->
+<!--                                            <div class="layui-form-item">-->
+<!--                                                <label class="layui-form-label">优品推荐</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="radio" name="is_good" lay-filter="is_good" value="1"-->
+<!--                                                           title="开启"-->
+<!--                                                           :checked="formData.is_good == 1 ? true : false">-->
+<!--                                                    <input type="radio" name="is_good" lay-filter="is_good" value="0"-->
+<!--                                                           title="关闭"-->
+<!--                                                           :checked="formData.is_good == 0 ? true : false">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                    <div class="layui-row layui-col-space15">-->
+<!--                                        <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">-->
+<!--                                            <div class="grid-demo grid-demo-bg1">-->
+<!--                                                <div class="layui-form-item">-->
+<!--                                                    <label class="layui-form-label">活动优先级</label>-->
+<!--                                                    <div class="layui-input-block">-->
+<!--                                                        <span class="layui-btn layui-btn-sm layui-btn-normal"-->
+<!--                                                              :style="'background-color:'+activity[item]"-->
+<!--                                                              v-for="(item,index) in formData.activity" :key="index"-->
+<!--                                                              draggable="true"-->
+<!--                                                              @dragstart="handleDragStart($event, item)"-->
+<!--                                                              @dragover.prevent="handleDragOver($event, item)"-->
+<!--                                                              @dragenter="handleDragEnter($event, item)"-->
+<!--                                                              @dragend="handleDragEnd($event, item)">-->
+<!--                                                        {{item}}-->
+<!--                                                    </span>-->
+<!--                                                        <span class="info">可拖动按钮调整活动的优先展示顺序</span>-->
+<!--                                                    </div>-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
                                 </div>
                             </div>
                         </div>
@@ -1034,6 +1101,11 @@
                 is_good: 0,
                 store_type: 1,
                 is_sub: 0,
+                push: 0,
+                push_sale: 0,
+                Interposition: 0,
+                Interposition_sale: 0,
+                is_upgrade: 0,
                 items: [
                     // {
                     //     value: '',
@@ -1071,7 +1143,7 @@
             activity: {'秒杀': '#1E9FFF', '砍价': '#189688', '拼团': '#FEB900'},
             attr: [],//临时属性
             newRule: false,//是否添加新规则
-            radioRule: ['store_type', 'is_sub', 'is_show', 'is_hot', 'is_benefit', 'is_new', 'is_good', 'is_best', 'spec_type'],//radio 当选规则
+            radioRule: ['store_type', 'is_sub', 'is_show', 'is_hot', 'is_benefit', 'is_new', 'is_good', 'is_best', 'spec_type', 'is_upgrade'],//radio 当选规则
             rule: { //多图选择规则
                 slider_image: {
                     maxLength: 5

app/admin/view/user/user_apply/index.php

@@ -0,0 +1,227 @@
+{extend name="public/container"}
+{block name="head_top"}
+
+{/block}
+{block name="content"}
+<style>
+    .btn-outline{
+        border:none;
+    }
+    .btn-outline:hover{
+        background-color: #0e9aef;
+        color: #fff;
+    }
+    .layui-form-item .layui-btn {
+        margin-top: 5px;
+        margin-right: 10px;
+    }
+    .layui-btn-primary{
+        margin-right: 10px;
+        margin-left: 0!important;
+    }
+    label{
+        margin-bottom: 0!important;
+        margin-top: 4px;
+    }
+</style>
+<div class="layui-fluid">
+    <div class="layui-row layui-col-space15" id="app">
+        <!--搜索条件-->
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">申请列表</div>
+                <div class="layui-card-body">
+                    <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="background:none">
+                        <form class="layui-form layui-form-pane" action="">
+                            <div class="layui-form-item">
+
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label" style="top: -5.5px;">搜索条件</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" id="name" name="name" class="layui-input" placeholder="请输入用户名称，UID">
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="top: -4.5px">状态</label>
+                                        <div class="layui-input-block">
+                                            <select name="status">
+                                                <option value="">全部</option>
+                                                <option value="1">未通过</option>
+                                                <option value="2">待审核</option>
+                                                <option value="3">通过</option>
+                                            </select>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search">
+                                                <i class="layui-icon layui-icon-search"></i>搜索</button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!-- 中间详细信息-->
+        <div :class="item.col!=undefined ? 'layui-col-sm'+item.col+' '+'layui-col-md'+item.col:'layui-col-sm6 layui-col-md3'"
+             v-for="item in badge" v-cloak="" v-if="item.count > 0">
+        </div>
+        <!--enb-->
+    </div>
+    <!--列表-->
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">场次列表</div>
+                <div class="layui-card-body">
+
+                    <div class="layui-btn-container" id="container-action">
+                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}',{h:700,w:1100})">添加众筹</a>
+<!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
+                    </div>
+                    <table class="layui-hide" id="List" lay-filter="List"></table>
+
+
+                    <script type="text/html" id="image">
+                        <img style="cursor: pointer" lay-event="open_image" src="{{d.image}}">
+                    </script>
+                    <script type="text/html" id="status">
+                        {{#  if(d.status == 0){ }}
+                        <button type="button" name="suc" class="layui-btn-disabled layui-btn-xs" id="">
+                            待审核
+                        </button>
+                        {{#  } else if(d.status == 1) { }}
+                        <button type="button" name="suc" class="layui-btn-xs layui-btn" id="">
+                            通过
+                        </button>
+                        {{#  } else if(d.status == -1) { }}
+                        <button type="button" name="suc" class="layui-btn-disabled layui-btn-xs" id="">
+                            未通过
+                        </button>
+                        {{#  } }}
+                    </script>
+                    <script type="text/html" id="act">
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='tg' id="">
+                            通过
+                        </button>
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='btg' id="">
+                            不通过
+                        </button>
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='delete' id="">
+                            删除
+                        </button>
+
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--end-->
+</div>
+<script src="{__ADMIN_PATH}js/layuiList.js"></script>
+{/block}
+{block name="script"}
+<script>
+    var type = {$type};
+    layList.form.render();
+    layList.tableList('List', "{:Url('list')}?type="+type, function () {
+        return [
+            {type: 'checkbox'},
+            {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
+            {field: 'nickname', title: '用户名称',  align: 'center'},
+            {field: 'name', title: '姓名', align: 'center'},
+            {field: 'phone', title: '手机号', align: 'center'},
+            {field: 'status', title: '状态',  templet: '#status',align: 'center'},
+            {field: 'create_time', title: '时间', align: 'center'},
+            {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
+        ];
+    });
+
+    //查询
+    layList.search('search',function(where){
+        layList.reload(where,true);
+    });
+
+    //点击事件绑定
+    layList.tool(function (event,data,obj) {
+        switch (event) {
+            case 'delete':
+                var url=layList.U({c:'user.userApply',a:'delete',q:{id:data.id}});
+                var code = {title:"操作提示",text:"确定将该商品移入回收站吗？",type:'info',confirm:'是的，移入回收站'};
+                $eb.$swal('delete',function(){
+                    $eb.axios.get(url).then(function(res){
+                        if(res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success',res.data.msg);
+                            obj.del();
+                            location.reload();
+                        }else
+                            return Promise.reject(res.data.msg || '删除失败')
+                    }).catch(function(err){
+                        $eb.$swal('error',err);
+                    });
+                },code)
+                break;
+            case 'tg':
+                var url=layList.U({c:'user.userApply',a:'tg',q:{id:data.id,type:type}});
+                var code = {title:"操作提示",text:"确定通过吗？",type:'info',confirm:'是的，确定'};
+                $eb.$swal('delete',function(){
+                    $eb.axios.get(url).then(function(res){
+                        if(res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success',res.data.msg);
+                            obj.del();
+                            location.reload();
+                        }else
+                            return Promise.reject(res.data.msg || '失败')
+                    }).catch(function(err){
+                        $eb.$swal('error',err);
+                    });
+                },code)
+                break;
+            case 'btg':
+                var url=layList.U({c:'user.userApply',a:'btg',q:{id:data.id}});
+                var code = {title:"操作提示",text:"确定不通过吗？",type:'info',confirm:'是的，确定'};
+                $eb.$swal('delete',function(){
+                    $eb.axios.get(url).then(function(res){
+                        if(res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success',res.data.msg);
+                            obj.del();
+                            location.reload();
+                        }else
+                            return Promise.reject(res.data.msg || '失败')
+                    }).catch(function(err){
+                        $eb.$swal('error',err);
+                    });
+                },code)
+                break;
+            case 'open_image':
+                $eb.openImage(data.image);
+                break;
+            case 'edit':
+                location.href = layList.U({a:'edit',q:{id:data.id}});
+                break;
+        }
+    })
+
+
+    //改状态
+    layList.switch('status',function (odj,value) {
+        if(odj.elem.checked==true){
+            layList.baseGet(layList.Url({c:'auction.auction',a:'set_status',p:{status:1,id:value}}),function (res) {
+                layList.msg(res.msg, function () {
+                    layList.reload();
+                });
+            });
+        }else{
+            layList.baseGet(layList.Url({c:'auction.auction',a:'set_status',p:{status:0,id:value}}),function (res) {
+                layList.msg(res.msg, function () {
+                    layList.reload();
+                });
+            });
+        }
+    });
+</script>
+{/block}

app/admin/view/user/user_apply/indexs.php

@@ -0,0 +1,213 @@
+{extend name="public/container"}
+{block name="head_top"}
+
+{/block}
+{block name="content"}
+<style>
+    .btn-outline{
+        border:none;
+    }
+    .btn-outline:hover{
+        background-color: #0e9aef;
+        color: #fff;
+    }
+    .layui-form-item .layui-btn {
+        margin-top: 5px;
+        margin-right: 10px;
+    }
+    .layui-btn-primary{
+        margin-right: 10px;
+        margin-left: 0!important;
+    }
+    label{
+        margin-bottom: 0!important;
+        margin-top: 4px;
+    }
+</style>
+<div class="layui-fluid">
+    <div class="layui-row layui-col-space15" id="app">
+        <!--搜索条件-->
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">申请列表</div>
+                <div class="layui-card-body">
+                    <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="background:none">
+                        <form class="layui-form layui-form-pane" action="">
+                            <div class="layui-form-item">
+
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label" style="top: -5.5px;">搜索条件</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" id="name" name="name" class="layui-input" placeholder="请输入用户名称，UID">
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="top: -4.5px">状态</label>
+                                        <div class="layui-input-block">
+                                            <select name="status">
+                                                <option value="">全部</option>
+                                                <option value="1">未通过</option>
+                                                <option value="2">待审核</option>
+                                                <option value="3">通过</option>
+                                            </select>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-inline">
+                                        <div class="layui-input-inline">
+                                            <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search">
+                                                <i class="layui-icon layui-icon-search"></i>搜索</button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!-- 中间详细信息-->
+        <div :class="item.col!=undefined ? 'layui-col-sm'+item.col+' '+'layui-col-md'+item.col:'layui-col-sm6 layui-col-md3'"
+             v-for="item in badge" v-cloak="" v-if="item.count > 0">
+        </div>
+        <!--enb-->
+    </div>
+    <!--列表-->
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">场次列表</div>
+                <div class="layui-card-body">
+
+                    <div class="layui-btn-container" id="container-action">
+                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}',{h:700,w:1100})">添加众筹</a>
+<!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
+                    </div>
+                    <table class="layui-hide" id="List" lay-filter="List"></table>
+
+
+                    <script type="text/html" id="image">
+                        <img style="cursor: pointer" lay-event="open_image" src="{{d.image}}">
+                    </script>
+                    <script type="text/html" id="status">
+                        {{#  if(d.status == 0){ }}
+                        <button type="button" name="suc" class="layui-btn-disabled layui-btn-xs" id="">
+                            待审核
+                        </button>
+                        {{#  } else if(d.status == 1) { }}
+                        <button type="button" name="suc" class="layui-btn-xs layui-btn" id="">
+                            通过
+                        </button>
+                        {{#  } else if(d.status == -1) { }}
+                        <button type="button" name="suc" class="layui-btn-disabled layui-btn-xs" id="">
+                            未通过
+                        </button>
+                        {{#  } }}
+                    </script>
+                    <script type="text/html" id="suc">
+                        {{#  if(d.suc == 0){ }}
+                        <button type="button" name="suc" class="layui-btn layui-btn-xs" id="">
+                            正常
+                        </button>
+                        {{#  } else if(d.suc == 1) { }}
+                        <button type="button" name="suc" class="layui-btn-xs layui-btn" id="">
+                            种植成功
+                        </button>
+                        {{#  } else if(d.suc == 2) { }}
+                        <button type="button" name="suc" class="layui-btn-disabled layui-btn-xs layui-btn-danger" id="">
+                            种植失败
+                        </button>
+                        {{#  } }}
+                    </script>
+                    <script type="text/html" id="act">
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('编辑','{:Url('next')}?id={{d.id}}',{h:700,w:1100})">
+                            下一期
+                        </button>
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('编辑','{:Url('edit')}?id={{d.id}}',{h:700,w:1100})">
+                            编辑
+                        </button>
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='delete' id="">
+                            删除
+                        </button>
+
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--end-->
+</div>
+<script src="{__ADMIN_PATH}js/layuiList.js"></script>
+{/block}
+{block name="script"}
+<script>
+    var type = {$type};
+    layList.form.render();
+    layList.tableList('List', "{:Url('list')}?type="+type, function () {
+        return [
+            {type: 'checkbox'},
+            {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
+            {field: 'nickname', title: '用户名称',  align: 'center'},
+            {field: 'shop_name', title: '店铺名称', align: 'center'},
+            {field: 'shop_introduce', title: '店铺简介', align: 'center'},
+            {field: 'name', title: '姓名', align: 'center'},
+            {field: 'phone', title: '手机号', align: 'center'},
+            {field: 'address', title: '地址', align: 'center'},
+            {field: 'status', title: '状态',  templet: '#status',align: 'center'},
+            {field: 'create_time', title: '时间', align: 'center'},
+            {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
+        ];
+    });
+
+    //查询
+    layList.search('search',function(where){
+        layList.reload(where,true);
+    });
+
+    //点击事件绑定
+    layList.tool(function (event,data,obj) {
+        switch (event) {
+            case 'delete':
+                var url=layList.U({c:'many.many',a:'delete',q:{id:data.id}});
+                var code = {title:"操作提示",text:"确定将该商品移入回收站吗？",type:'info',confirm:'是的，移入回收站'};
+                $eb.$swal('delete',function(){
+                    $eb.axios.get(url).then(function(res){
+                        if(res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success',res.data.msg);
+                            obj.del();
+                            location.reload();
+                        }else
+                            return Promise.reject(res.data.msg || '删除失败')
+                    }).catch(function(err){
+                        $eb.$swal('error',err);
+                    });
+                },code)
+                break;
+            case 'open_image':
+                $eb.openImage(data.image);
+                break;
+            case 'edit':
+                location.href = layList.U({a:'edit',q:{id:data.id}});
+                break;
+        }
+    })
+
+
+    //改状态
+    layList.switch('status',function (odj,value) {
+        if(odj.elem.checked==true){
+            layList.baseGet(layList.Url({c:'auction.auction',a:'set_status',p:{status:1,id:value}}),function (res) {
+                layList.msg(res.msg, function () {
+                    layList.reload();
+                });
+            });
+        }else{
+            layList.baseGet(layList.Url({c:'auction.auction',a:'set_status',p:{status:0,id:value}}),function (res) {
+                layList.msg(res.msg, function () {
+                    layList.reload();
+                });
+            });
+        }
+    });
+</script>
+{/block}

app/api/controller/AuthController.php

@@ -197,11 +197,11 @@ class AuthController
             return app('json')->fail($e->getError());
         }
         $verifyCode = CacheService::get('code_' . $account);
-        if (!$verifyCode)
-            return app('json')->fail('请先获取验证码');
-        $verifyCode = substr($verifyCode, 0, 6);
-        if ($verifyCode != $captcha)
-            return app('json')->fail('验证码错误');
+//        if (!$verifyCode)
+//            return app('json')->fail('请先获取验证码');
+//        $verifyCode = substr($verifyCode, 0, 6);
+//        if ($verifyCode != $captcha)
+//            return app('json')->fail('验证码错误');
         if (strlen(trim($password)) < 6 || strlen(trim($password)) > 16)
             return app('json')->fail('密码必须是在6到16位之间');
         if ($password == '123456') return app('json')->fail('密码太过简单，请输入较为复杂的密码');

app/common.php

@@ -593,4 +593,17 @@ if (!function_exists('do_request')) {
         curl_close($curl);
         return $result;
     }
+
+
+    if (!function_exists('pr')) {
+        function pr($var, $int = '')
+        {
+            $template = PHP_SAPI !== 'cli' ? '<pre>%s</pre>' : "\n%s\n";
+            printf($template, print_r($var, true));
+            if (!empty($int)) {
+                exit($int);
+            }
+
+        }
+    }
 }

app/models/store/StoreOrder.php

@@ -18,6 +18,7 @@ use crmeb\traits\ModelTrait;
 use think\facade\Log;
 use app\models\system\SystemStore;
 use app\models\routine\RoutineTemplate;
+use think\session\Store;
 use app\models\user\{User, UserAddress, UserBill, UserSpread, WechatUser};
 use crmeb\services\{
     SystemConfigService, WechatTemplateService, workerman\ChannelService
@@ -768,6 +769,10 @@ class StoreOrder extends BaseModel
     public static function paySuccess($orderId, $paytype = 'weixin', $formId = '')
     {
         $order = self::where('order_id', $orderId)->find();
+        $productId = StoreProduct::where('is_upgrade', 1)->column('id');
+        if (count(StoreOrderCartInfo::where('oid', $order['id'])->where('product_id', 'in', $productId)->select()) > 0){
+            self::reward($order, $productId);
+        }
         $resPink = true;
         $res1 = self::where('order_id', $orderId)->update(['paid' => 1, 'pay_type' => $paytype, 'pay_time' => time(), 'is_del' => 0, 'is_system_del' => 0, 'mark' => '']);//订单改为支付
         if ($order->combination_id && $res1 && !$order->refund_status) $resPink = StorePink::createPink($order);//创建拼团
@@ -781,6 +786,38 @@ class StoreOrder extends BaseModel
         return false !== $res;
     }
 
+
+    public static function reward($order, $productId)
+    {
+        $list = StoreOrderCartInfo::where('oid', $order['id'])->where('product_id', 'in', $productId)->select()->toArray();
+        $user = User::where('uid', $order['uid'])->find();
+        $user1 = User::where('uid', $user['spread_uid'])->find();
+        $user2 = User::where('uid', $user1['spread_uid'])->find();
+        foreach ($list as $item){
+            $product = StoreProduct::where('id', $item['product_id'])->find();
+            $num = $item['cart_info']['cart_num'];
+            $price1 = $product['push'] * $num;// 直推奖励
+            $price2 = $product['push_sale'] * $num;// 直推销售奖励
+            $price3 = $product['Interposition'] * $num;// 间推奖励
+            $price4 = $product['Interposition_sale'] * $num;// 间推销售奖励
+            if ($user1){
+                User::where('uid', $user['spread_uid'])->inc('brokerage_price', $price1+$price2)->update();
+                $user1['brokerage_price'] += $price1;
+                UserBill::income('直推奖励', $user1['uid'], 'now_money', 'push', $price1, $user['uid'], $user1['brokerage_price'], '直推用户'.$user['uid'].'购买商品数量'.$num);
+                $user1['brokerage_price'] += $price2;
+                UserBill::income('直推销售提成', $user1['uid'], 'now_money', 'sale', $price2, $user['uid'], $user1['brokerage_price'], '直推用户'.$user['uid'].'购买商品数量'.$num);
+            }
+
+            if ($user2){
+                User::where('uid', $user1['spread_uid'])->inc('brokerage_price', $price3+$price4)->update();
+                $user2['brokerage_price'] += $price3;
+                UserBill::income('间推奖励', $user2['uid'], 'now_money', 'jt_push', $price3, $user['uid'], $user2['brokerage_price'], '间推用户'.$user['uid'].'购买商品数量'.$num);
+                $user2['brokerage_price'] += $price4;
+                UserBill::income('间推销售提成', $user2['uid'], 'now_money', 'zt_sale', $price4, $user['uid'], $user2['brokerage_price'], '间推用户'.$user['uid'].'购买商品数量'.$num);
+            }
+        }
+    }
+
     /*
      * 线下支付消息通知
      * 待完善

app/models/user/UserApply.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ *
+ * @author: xaboy<365615158@qq.com>
+ * @day: 2017/12/25
+ */
+
+namespace app\models\user;
+
+use crmeb\basic\BaseModel;
+use crmeb\traits\ModelTrait;
+
+/**
+ * TODO 用户申请
+ * Class UserAddress
+ * @package app\models\user
+ */
+class UserApply extends BaseModel
+{
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'user_apply';
+
+    use ModelTrait;
+
+    protected $autoWriteTimestamp = true;
+}

app/wap/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

route/wap/route.php

@@ -11,5 +11,5 @@
 use think\facade\Route;
 
 Route::miss(function () {
-    return redirect(sys_config('site_url') . '/index.html');
+    return view(app()->getRootPath() . 'public' . DS . 'index.html');
 });