1

app/admin/controller/store/StoreProduct.php

@@ -296,7 +296,7 @@ class StoreProduct extends AuthController
         $attr = $data['items'];
         unset($data['items'], $data['video'], $data['attrs']);
         if (count($data['cate_id']) < 1) return Json::fail('请选择产品分类');
-        if (!in_array($data['store_type'], [1, 2,3])) return Json::fail('请选择正确的商品类型');
+        if (!in_array($data['store_type'], [1, 2])) return Json::fail('请选择正确的商品类型');
         $cate_id = $data['cate_id'];
         $data['cate_id'] = implode(',', $data['cate_id']);
         if (!$data['store_name']) return Json::fail('请输入产品名称');
@@ -435,6 +435,7 @@ class StoreProduct extends AuthController
             Form::radio('is_new', '首发新品', $product->getData('is_new'))->options([['label' => '是', 'value' => 1], ['label' => '否', 'value' => 0]])->col(8),
             Form::radio('is_postage', '是否包邮', $product->getData('is_postage'))->options([['label' => '是', 'value' => 1], ['label' => '否', 'value' => 0]])->col(8),
             Form::radio('is_good', '是否优品推荐', $product->getData('is_good'))->options([['label' => '是', 'value' => 1], ['label' => '否', 'value' => 0]])->col(8),
+            Form::radio('is_wholesale', '是否批发商品', $product->getData('is_wholesale'))->options([['label' => '是', 'value' => 1], ['label' => '否', 'value' => 0]])->col(8),
         ];
         $form = Form::make_post_form('编辑产品', $field, Url::buildUrl('update', array('id' => $id)), 2);
         $this->assign(compact('form'));
@@ -475,6 +476,7 @@ class StoreProduct extends AuthController
             ['mer_use', 0],
             ['is_postage', 0],
             ['is_good', 0],
+            ['is_wholesale',0]
         ]);
         if (count($data['cate_id']) < 1) return Json::fail('请选择产品分类');
         $cate_id = $data['cate_id'];

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

@@ -312,9 +312,6 @@
                                                     <input type="radio" name="store_type" lay-filter="store_type"
                                                            value="2" title="虚拟商品"
                                                            :checked="formData.store_type == 2 ? true : false">
-                                                    <input type="radio" name="store_type" lay-filter="store_type"
-                                                           value="3" title="批发商品"
-                                                           :checked="formData.store_type == 3 ? true : false">
                                                 </div>
                                             </div>
                                         </div>
@@ -919,6 +916,21 @@
                                             </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_wholesale" lay-filter="is_wholesale" value="1"
+                                                           title="开启"
+                                                           :checked="formData.is_wholesale == 1 ? true : false">
+                                                    <input type="radio" name="is_wholesale" lay-filter="is_wholesale" value="0"
+                                                           title="关闭"
+                                                           :checked="formData.is_wholesale == 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">-->
@@ -1030,6 +1042,7 @@
                 is_benefit: 0,
                 is_best: 0,
                 is_new: 0,
+                is_wholesale: 0,
                 is_good: 0,
                 store_type: 1,
                 is_sub: 0,
@@ -1070,7 +1083,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','is_wholesale', 'spec_type'],//radio 当选规则
             rule: { //多图选择规则
                 slider_image: {
                     maxLength: 5

app/api/controller/store/StoreProductController.php

@@ -46,7 +46,8 @@ class StoreProductController
             ['news', 0],
             ['page', 0],
             ['limit', 0],
-            ['type', 0]
+            ['type', 0],
+            ['store_type',0]
         ], $request);
         return app('json')->successful(StoreProduct::getProductList($data, $request->uid()));
     }

app/api/controller/user/UserLevelController.php

@@ -72,9 +72,12 @@ class UserLevelController
         $uid = $request->uid();
 //        if (StoreOrder::be(['order_id|unique' => $key, 'uid' => $uid, 'is_del' => 0]))
 //            return app('json')->status('extend_order', '订单已生成', ['orderId' => $key, 'key' => $key]);
-        list($addressId, $couponId, $payType, $useIntegral, $mark, $combinationId, $pinkId, $seckill_id, $formId, $bargainId, $from, $shipping_type, $real_name, $phone, $storeId) = UtilService::postMore([
-            'addressId', 'couponId', 'payType', ['useIntegral', 0], 'mark', ['combinationId', 0], ['pinkId', 0], ['seckill_id', 0], ['formId', ''], ['bargainId', ''], ['from', 'weixin'],
-            ['shipping_type', 1], ['real_name', ''], ['phone', ''], ['store_id', 0]
+//        list($addressId, $couponId, $payType, $useIntegral, $mark, $combinationId, $pinkId, $seckill_id, $formId, $bargainId, $from, $shipping_type, $real_name, $phone, $storeId) = UtilService::postMore([
+//            'addressId', 'couponId', 'payType', ['useIntegral', 0], 'mark', ['combinationId', 0], ['pinkId', 0], ['seckill_id', 0], ['formId', ''], ['bargainId', ''], ['from', 'weixin'],
+//            ['shipping_type', 1], ['real_name', ''], ['phone', ''], ['store_id', 0]
+//        ], $request, true);
+        list($payType,$formId,$from,$level_id) = UtilService::postMore([
+             'payType', ['formId', ''], ['from', 'weixin'], ['level', 0]
         ], $request, true);
         $payType = strtolower($payType);
 
@@ -85,7 +88,7 @@ class UserLevelController
             $isChannel = 2;
 
 
-        $order = UserLevelOrder::CreateOrder($request->uid(), $addressId, $payType);
+        $order = UserLevelOrder::CreateOrder($request->uid(), $level_id, $payType);
         if ($order === false) return app('json')->fail(UserLevelOrder::getErrorInfo('订单生成失败'));
         $orderId = $order['order_id'];
 //        $info = compact('orderId', 'key');

route/api/route.php

@@ -163,6 +163,7 @@ Route::group(function () {
     Route::get('user/level/detection', 'user.UserLevelController/detection')->name('userLevelDetection');//检测用户是否可以成为会员
     Route::get('user/level/grade', 'user.UserLevelController/grade')->name('userLevelGrade');//会员等级列表
     Route::get('user/level/task/:id', 'user.UserLevelController/task')->name('userLevelTask');//获取等级任务
+    Route::post('user/level/create', 'user.UserLevelController/create')->name('userLevelOrderCreate'); //订单创建
     //首页获取未支付订单
     Route::get('order/nopay', 'order.StoreOrderController/get_noPay')->name('getNoPay');//获取未支付订单
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, true);