1

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

@@ -368,8 +368,8 @@
                                                             </td>
                                                             <td><input type="text" v-model="formData.attr.price"
                                                                        class="layui-input"></td>
-                                                            <td><input type="text" v-model="formData.attr.integral"
-                                                                       class="layui-input"></td>
+<!--                                                            <td><input type="text" v-model="formData.attr.integral"-->
+<!--                                                                       class="layui-input"></td>-->
                                                             <td><input type="text" v-model="formData.attr.cost"
                                                                        class="layui-input"></td>
                                                             <td><input type="text" v-model="formData.attr.ot_price"
@@ -514,8 +514,8 @@
                                                                 </td>
                                                                 <td><input type="text" v-model="batchAttr.price"
                                                                            class="layui-input"></td>
-                                                                <td><input type="text" v-model="batchAttr.integral"
-                                                                           class="layui-input"></td>
+<!--                                                                <td><input type="text" v-model="batchAttr.integral"-->
+<!--                                                                           class="layui-input"></td>-->
                                                                 <td><input type="text" v-model="batchAttr.cost"
                                                                            class="layui-input"></td>
                                                                 <td><input type="text" v-model="batchAttr.ot_price"
@@ -583,8 +583,8 @@
                                                                 </td>
                                                                 <td><input type="number" v-model="item.price"
                                                                            class="layui-input"></td>
-                                                                <td><input type="number" v-model="item.integral"
-                                                                           class="layui-input"></td>
+<!--                                                                <td><input type="number" v-model="item.integral"-->
+<!--                                                                           class="layui-input"></td>-->
                                                                 <td><input type="number" v-model="item.cost"
                                                                            class="layui-input"></td>
                                                                 <td><input type="number" v-model="item.ot_price"
@@ -668,18 +668,18 @@
                                             </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>-->
+<!--                                                <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">
@@ -762,7 +762,7 @@
                                                                 </div>
                                                             </td>
                                                             <td>{{formData.attr.price}}</td>
-                                                            <td>{{formData.attr.integral}}</td>
+<!--                                                            <td>{{formData.attr.integral}}</td>-->
                                                             <td>{{formData.attr.cost}}</td>
                                                             <td>{{formData.attr.ot_price}}</td>
                                                             <td>{{formData.attr.stock}}</td>
@@ -805,7 +805,7 @@
                                                                 </div>
                                                             </td>
                                                             <td>{{item.price}}</td>
-                                                            <td>{{item.integral}}</td>
+<!--                                                            <td>{{item.integral}}</td>-->
                                                             <td>{{item.cost}}</td>
                                                             <td>{{item.ot_price}}</td>
                                                             <td>{{item.stock}}</td>
@@ -1022,7 +1022,7 @@
                 attr: {
                     pic: '',
                     price: 0,
-                    integral: 0,
+                    // integral: 0,
                     cost: 0,
                     ot_price: 0,
                     stock: 0,
@@ -1035,7 +1035,7 @@
                 attrs: [],
                 description: '',
                 ficti: 0,
-                give_integral: 0,
+                // give_integral: 0,
                 sort: 0,
                 is_show: 1,
                 is_hot: 0,
@@ -1061,7 +1061,7 @@
             batchAttr: {
                 pic: '',
                 price: 0,
-                integral: 0,
+                // integral: 0,
                 cost: 0,
                 ot_price: 0,
                 stock: 0,
@@ -1173,7 +1173,7 @@
                 this.$set(this, 'batchAttr', {
                     pic: '',
                     price: 0,
-                    integral: 0,
+                    // integral: 0,
                     cost: 0,
                     ot_price: 0,
                     stock: 0,
@@ -1194,9 +1194,9 @@
                     if (that.batchAttr.price > 0) {
                         item.price = that.batchAttr.price;
                     }
-                    if (that.batchAttr.integral > 0) {
-                        item.integral = that.batchAttr.integral;
-                    }
+                    // if (that.batchAttr.integral > 0) {
+                    //     item.integral = that.batchAttr.integral;
+                    // }
                     if (that.batchAttr.cost > 0) {
                         item.cost = that.batchAttr.cost;
                     }
@@ -1613,7 +1613,7 @@
                     var attr = {
                         pic: that.formData.attr.pic,
                         price: that.formData.attr.price,
-                        integral: that.formData.attr.integral,
+                        // integral: that.formData.attr.integral,
                         cost: that.formData.attr.cost,
                         ot_price: that.formData.attr.ot_price,
                         stock: that.formData.attr.stock,

app/models/store/StoreProduct.php

@@ -58,7 +58,7 @@ class StoreProduct extends BaseModel
         return htmlspecialchars_decode($value);
     }
 
-    public static function getValidProduct($productId, $field = 'min_integral,max_integral,add_time,browse,cate_id,code_path,cost,ficti,give_integral,id,image,is_sub,is_bargain,is_benefit,is_best,is_del,is_hot,is_new,is_postage,is_seckill,is_show,keyword,mer_id,mer_use,ot_price,postage,price,sales,slider_image,sort,stock,store_info,store_name,unit_name,vip_price,spec_type,IFNULL(sales,0) + IFNULL(ficti,0) as fsales,video_link')
+    public static function getValidProduct($productId, $field = 'min_integral,max_integral,add_time,browse,cate_id,code_path,cost,ficti,give_integral,id,image,is_sub,is_bargain,is_benefit,is_best,is_del,is_hot,is_new,is_postage,is_seckill,is_show,is_explosive,keyword,mer_id,mer_use,ot_price,postage,price,sales,slider_image,sort,stock,store_info,store_name,unit_name,vip_price,spec_type,IFNULL(sales,0) + IFNULL(ficti,0) as fsales,video_link')
     {
         $Product = self::where('is_del', 0)->where('is_show', 1)->where('id', $productId)->field($field)->find();
         if ($Product) return $Product->toArray();
@@ -121,7 +121,7 @@ class StoreProduct extends BaseModel
         if ($salesOrder) $baseOrder = $salesOrder == 'desc' ? 'sales DESC' : 'sales ASC';//虚拟销量
         if ($baseOrder) $baseOrder .= ', ';
         $model->order($baseOrder . 'sort DESC, add_time DESC');
-        $list = $model->page((int)$page, (int)$limit)->field('id,store_name,cate_id,image,IFNULL(sales,0) + IFNULL(ficti,0) as sales,price,stock')->select()->each(function ($item) use ($uid, $type) {
+        $list = $model->page((int)$page, (int)$limit)->field('id,store_name,is_explosive,cate_id,image,IFNULL(sales,0) + IFNULL(ficti,0) as sales,price,stock')->select()->each(function ($item) use ($uid, $type) {
             if ($type) {
                 $item['is_att'] = StoreProductAttrValueModel::where('product_id', $item['id'])->count() ? true : false;
                 if ($uid) $item['cart_num'] = StoreCart::where('is_pay', 0)->where('is_del', 0)->where('is_new', 0)->where('type', 'product')->where('product_id', $item['id'])->where('uid', $uid)->value('cart_num');