commit

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

@@ -197,19 +197,19 @@
                                             </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 style="width: 40%" type="text" name="keyword"-->
-<!--                                                           lay-verify="title" autocomplete="off"-->
-<!--                                                           placeholder="请输入商品关键字" class="layui-input"-->
-<!--                                                           v-model="formData.keyword">-->
-<!--                                                </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 style="width: 40%" type="text" name="keyword"
+                                                           lay-verify="title" autocomplete="off"
+                                                           placeholder="请输入商品关键字" class="layui-input"
+                                                           v-model="formData.keyword">
+                                                </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">-->
@@ -290,26 +290,26 @@
                                             </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">商品轮播图<i class="red">*</i></label>-->
-<!--                                                <div class="pictrueBox pictrue"-->
-<!--                                                     v-for="(item,index) in formData.slider_image">-->
-<!--                                                    <img :src="item">-->
-<!--                                                    <i class="layui-icon closes"-->
-<!--                                                       @click="deleteImage('slider_image',index)">&#x1007</i>-->
-<!--                                                </div>-->
-<!--                                                <div class="pictrueBox">-->
-<!--                                                    <div class="upLoad" @click="uploadImage('slider_image')"-->
-<!--                                                         v-if="formData.slider_image.length <= rule.slider_image.maxLength">-->
-<!--                                                        <i class="layui-icon layui-icon-camera" class="iconfont"-->
-<!--                                                           style="font-size: 26px;"></i>-->
-<!--                                                    </div>-->
-<!--                                                </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">商品轮播图<i class="red">*</i></label>
+                                                <div class="pictrueBox pictrue"
+                                                     v-for="(item,index) in formData.slider_image">
+                                                    <img :src="item">
+                                                    <i class="layui-icon closes"
+                                                       @click="deleteImage('slider_image',index)">&#x1007</i>
+                                                </div>
+                                                <div class="pictrueBox">
+                                                    <div class="upLoad" @click="uploadImage('slider_image')"
+                                                         v-if="formData.slider_image.length <= rule.slider_image.maxLength">
+                                                        <i class="layui-icon layui-icon-camera" class="iconfont"
+                                                           style="font-size: 26px;"></i>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
 <!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md12">-->
 <!--                                        <div class="grid-demo grid-demo-bg1">-->
 <!--                                            <div class="layui-form-item">-->

app/api/controller/PublicController.php

@@ -4,6 +4,7 @@ namespace app\api\controller;
 
 use app\admin\model\system\SystemAttachment;
 use app\models\store\StoreCategory;
+use app\models\store\StoreCoupon;
 use app\models\store\StoreCouponIssue;
 use app\models\store\StoreOrder;
 use app\models\store\StoreOrderCartInfo;
@@ -301,10 +302,11 @@ class PublicController
             $list = [];
         } else{
             foreach ($list as &$item) {
-                $item['coupon'] = StoreProduct::field('id,store_name,price,ot_price')->where('coupon', $item['id'])->where('id', '>', 2)->select();
+                $coupon = StoreCoupon::where('store_id', $item['id'])->column('id');
+                $item['coupon'] = StoreProduct::field('id,store_name,price,ot_price')->where('coupon', 'in',$coupon)->where('id', '>', 2)->select();
                 $id = StoreProduct::where('coupon', $item['id'])->where('id', '>', 2)->column('id');
                 $orderId = StoreOrderCartInfo::where('product_id', 'in',$id)->column('oid');
-                $item['count'] = count($orderId) > 0?StoreOrder::where('id', $orderId)->where('status', '>', 2)->count():0;
+                $item['count'] = count($orderId) > 0?StoreOrder::where('id', 'in',$orderId)->where('status', '>', 2)->count():0;
             }
         }
         $data['list'] = $list;
@@ -357,7 +359,8 @@ class PublicController
         $data = empty($data) ? [] : $data->toArray();
         $data['slider_image'] = json_decode($data['slider_image']);
         $data['images'] = json_decode($data['gatehead']);
-        $data['coupon'] = StoreProduct::field('id,store_name,price,ot_price,image')->where('coupon', $data['id'])->where('id', '>', 2)->select();
+        $coupon = StoreCoupon::where('store_id', $data['id'])->column('id');
+        $data['coupon'] = StoreProduct::field('id,store_name,price,ot_price,image')->where('coupon', 'in',$coupon)->where('id', '>', 2)->select();
         return app('json')->successful($data);
     }
 

app/api/controller/user/UserController.php

@@ -706,4 +706,15 @@ class UserController
         if ($res) return app('json')->success('领取成功');
         return app('json')->fail('领取失败');
     }
+
+    public function coupon_datalis(Request $request)
+    {
+        $data = UtilService::postMore([
+            ['code', ''],
+        ], $request);
+        $coupon = StoreCouponUser::where('code', $data['code'])->find();
+        if (!$coupon) return app('json')->fail('优惠券不存在');
+
+        return app('json')->success($coupon->toArray());
+    }
 }

route/api/route.php

@@ -168,6 +168,7 @@ Route::group(function () {
     Route::get('write_off', 'user.UserController/write_off')->name('write_off');//核销记录
     Route::get('coupon_user', 'user.UserController/coupon_user')->name('coupon_user');//用户优惠券
     Route::post('share', 'user.UserController/share')->name('share');//分享领取优惠券
+    Route::get('coupon_datalis', 'user.UserController/coupon_datalis')->name('coupon_datalis');//优惠券详情
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, true);
 //未授权接口
 Route::group(function () {