Merge branch 'master' of http://git.huxiukeji.com/lizhen/xiaoshan

addons/shopro/library/activity/getter/Db.php

@@ -39,9 +39,9 @@ class Db extends Base
         $activities = $this->model->where('type', 'in', $activityTypes);
 
         if ($range_type == 'overlap') {
-            $activities = $activities->where('prehead_time', '<=', $range[1])->where('end_time', '>=', $range[0]);
+            $activities = $activities->where('start_time', '<=', $range[1])->where('end_time', '>=', $range[0]);
         } elseif ($range_type == 'contain') {
-            $activities = $activities->where('prehead_time', '>=', $range[0])->where('end_time', '<=', $range[1]);
+            $activities = $activities->where('start_time', '>=', $range[0])->where('end_time', '<=', $range[1]);
         }
 
         $activities = $activities->select();

addons/shopro/library/activity/getter/Redis.php

@@ -35,7 +35,7 @@ class Redis extends Base
 
         $newActivities = [];
         foreach ($activities as $key => $activity) {
-            if ($this->rangeCompare($range, [$activity['prehead_time'], $activity['end_time']], $range_type)) {
+            if ($this->rangeCompare($range, [$activity['start_time'], $activity['end_time']], $range_type)) {
                 $newActivities[] = $activity;
             }
         }

application/admin/model/shopro/activity/Activity.php

@@ -160,14 +160,14 @@ class Activity extends Common
                         case 'nostart':
                             $query->where('start_time', '>', time());
                             break;
-                        case 'prehead':
+                        /*case 'prehead':
                             $query->where('prehead_time', '<=', time())->where('start_time', '>', time());
-                            break;
+                            break;*/
                         case 'ing':
                             $query->where('start_time', '<=', time())->where('end_time', '>=', time());
                             break;
                         case 'show':
-                            $query->where('prehead_time', '<=', time())->where('end_time', '>=', time());
+                            $query->where('start_time', '<=', time())->where('end_time', '>=', time());
                             break;
                         case 'ended':
                             $query->where('end_time', '<', time());
@@ -199,10 +199,10 @@ class Activity extends Common
      * @param think\query\Query $query
      * @return void
      */
-    public function scopePrehead($query)
+    /*public function scopePrehead($query)
     {
         return $query->where('prehead_time', '<=', time())->where('start_time', '>', time());
-    }
+    }*/
 
     /**
      * 进行中的活动
@@ -223,7 +223,7 @@ class Activity extends Common
      */
     public function scopeShow($query)
     {
-        return $query->where('prehead_time', '<=', time())->where('end_time', '>=', time());
+        return $query->where('start_time', '<=', time())->where('end_time', '>=', time());
     }
 
     /**

application/admin/view/shopro/activity/activity/add.html

@@ -360,13 +360,13 @@
                                 </el-button>
                             </el-form-item>
                         </template>
-                        <el-form-item label="单独购买">
+                        <!--<el-form-item label="单独购买">
                             <el-switch v-model="form.model.rules.is_alone" active-value="1" inactive-value="0"
                                 :disabled="state.activityStatus"></el-switch>
                             <span class="ml-2" :class="form.model.rules.is_alone == 0 ?'':'sa-color--primary'">
                                 {{ form.model.rules.is_alone == 0 ? '不允许' : '允许' }}
                             </span>
-                        </el-form-item>
+                        </el-form-item>-->
                         <el-form-item label="虚拟成团">
                             <el-switch v-model="form.model.rules.is_fictitious" active-value="1" inactive-value="0"
                                 :disabled="state.activityStatus"></el-switch>
@@ -400,7 +400,7 @@
                                 </el-form-item>
                             </el-form-item>
                         </div>
-                        <el-form-item label="参团卡显示">
+                        <!--<el-form-item label="参团卡显示">
                             <el-switch v-model="form.model.rules.is_team_card" active-value="1" inactive-value="0"
                                 :disabled="state.activityStatus"></el-switch>
                             <span class="ml-2" :class="form.model.rules.is_team_card == 0?'':'sa-color--primary'">
@@ -409,7 +409,7 @@
                             <div class="tip">
                                 开启参团卡显示后，商品详情页显示未成团的团列表，买家可以直接选择一个参团。
                             </div>
-                        </el-form-item>
+                        </el-form-item>-->
                         <el-form-item label="拼团销量展示">
                             <el-radio-group v-model="form.model.rules.sales_show_type" :disabled="state.activityStatus">
                                 <el-radio label="real">真实活动销量</el-radio>
@@ -421,7 +421,7 @@
                                 </el-radio>
                             </el-radio-group>
                         </el-form-item>
-                        <el-form-item label="是否参与分销">
+                        <!--<el-form-item label="是否参与分销">
                             <el-switch v-model="form.model.rules.is_commission" active-value="1" inactive-value="0"
                                 :disabled="state.activityStatus"></el-switch>
                             <span class="ml-2" :class="form.model.rules.is_commission == 0?'':'sa-color--primary'">
@@ -438,7 +438,7 @@
                         <el-form-item label="团长优惠">
                             <el-switch v-model="form.model.rules.is_leader_discount" active-value="1" inactive-value="0"
                                 :disabled="state.activityStatus"></el-switch>
-                        </el-form-item>
+                        </el-form-item>-->
                         <el-form-item label="限购数量">
                             <el-input class="w-120" v-positiveinteger v-model="form.model.rules.limit_num" type="number"
                                 :disabled="state.activityStatus">
@@ -469,7 +469,7 @@
                                 prefix-icon="Calendar" :disabled="state.activityStatus" :editable="false">
                             </el-date-picker>
                         </el-form-item>
-                        <el-form-item label="是否参与分销">
+                        <!--<el-form-item label="是否参与分销">
                             <el-switch v-model="form.model.rules.is_commission" active-value="1" inactive-value="0"
                                 :disabled="state.activityStatus"></el-switch>
                             <span class="ml-2" :class="form.model.rules.is_commission == 0?'':'sa-color--primary'">
@@ -482,7 +482,7 @@
                             <span class="ml-2" :class="form.model.rules.is_free_shipping == 0?'':'sa-color--primary'">
                                 {{ form.model.rules.is_free_shipping == 0 ? '不包邮' : '包邮' }}
                             </span>
-                        </el-form-item>
+                        </el-form-item>-->
                         <el-form-item label="秒杀销量展示">
                             <el-radio-group v-model="form.model.rules.sales_show_type" :disabled="state.activityStatus">
                                 <el-radio label="real">真实活动销量</el-radio>
@@ -647,13 +647,13 @@
                             </el-form-item>
                         </div>
                     </template>
-                    <el-form-item label="活动说明">
+                    <!--<el-form-item label="活动说明">
                         <el-input class="sa-w-360" v-model="form.model.richtext_title" placeholder="请选择活动说明">
                             <template #append>
                                 <span class="cursor-pointer" @click="onSelectRichtext">选择活动说明</span>
                             </template>
                         </el-input>
-                    </el-form-item>
+                    </el-form-item>-->
                     <template v-if="form.model.type != 'signin'">
                         <el-form-item v-if="!isActivity" label="活动商品" prop="state.goodsType">
                             <el-radio-group v-model="state.goodsType" :disabled="state.activityStatus"

application/admin/view/shopro/coupon/add.html

@@ -118,7 +118,7 @@
                             </el-form-item>
                         </el-form-item>
                     </div>
-                    <el-form-item label="优惠叠加">
+                    <!--<el-form-item label="优惠叠加">
                         <div>
                             <div class="sa-flex">
                                 <el-switch v-model="form.model.is_double_discount" :active-value="1"
@@ -130,8 +130,8 @@
                             </div>
                             <div class="tip"> 开启优惠叠加，优惠券将可以和活动一起使用 </div>
                         </div>
-                    </el-form-item>
-                    <el-form-item label="券状态" prop="status">
+                    </el-form-item>-->
+                    <!--<el-form-item label="券状态" prop="status">
                         <div>
                             <el-radio-group v-model="form.model.status">
                                 <el-radio label="normal">公开发放</el-radio>
@@ -142,7 +142,7 @@
                                 后台发放状态改为别的状态，将导致满赠活动无法赠送该优惠券
                             </div>
                         </div>
-                    </el-form-item>
+                    </el-form-item>-->
                     <el-form-item label="可用范围" prop="use_scope">
                         <el-radio-group v-model="form.model.use_scope" @change="form.model.items_value = []">
                             <el-radio label="all_use">全场通用</el-radio>

application/admin/view/shopro/coupon/index.html

@@ -146,7 +146,7 @@
                         <div class="sa-table-line-1">{{ scope.row.stock }}</div>
                     </template>
                 </el-table-column>
-                <el-table-column label="状态" min-width="130">
+                <!--<el-table-column label="状态" min-width="130">
                     <template #default="scope">
                         {if $auth->check('shopro/coupon/edit')}
                         <el-dropdown trigger="click" @command="onCommand">
@@ -177,7 +177,7 @@
                         </el-dropdown>
                         {/if}
                     </template>
-                </el-table-column>
+                </el-table-column>-->
                 <el-table-column label="操作" min-width="260" fixed="right">
                     <template #default="scope">
                         {if $auth->check('shopro/coupon/send')}