Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong

app/api/model/Goods.php

@@ -708,8 +708,9 @@ class Goods extends GoodsModel
             return false;
         }
         //批量修改秒杀价格
-        $sku_ids = explode(',', $data['sku_id']);
-        foreach ($sku_ids as $sku_id) {
+//        var_dump($data['sku_id']);
+        $sku_id = $data['sku_id'];
+//        foreach ($sku_ids as $sku_id) {
             $skuData = GoodsSkuModel::get(['id' => $sku_id,'goods_id' => $data['goods_id']]);
             if ($skuData) {
                 $up_data = [
@@ -721,7 +722,7 @@ class Goods extends GoodsModel
                 ];
                 $skuData->save($up_data);
             }
-        }
+//        }
         return true;
     }
 }

app/common/model/PreSale.php

@@ -28,4 +28,5 @@ class PreSale extends BaseModel
     protected $pk = 'id';
 
     protected $updateTime = false;
+
 }

app/store/controller/Presale.php

@@ -36,7 +36,7 @@ class Presale extends Controller
         $model = new PreSaleModel;
         $goodsModel = new \app\common\model\Goods();
         $detail = $model->get($id);
-        $detail['goods_list'] = $goodsModel->whereIn('goods_id', explode(',', $detail['goods_list']))->select()->toArray();
+        $detail['goods_list'] = $goodsModel->with(['images.file'])->whereIn('goods_id', explode(',', $detail['goods_list']))->select()->toArray();
         return $this->renderSuccess(compact('detail'));
     }
 
@@ -45,7 +45,7 @@ class Presale extends Controller
      */
     public function log(int $pre_id): Json {
         $model = new PreSaleLogModel();
-        $list = $model->with(['goods'])
+        $list = $model->with(['goods.images.file'])
             ->where('store_id', $this->storeId)
             ->where('pre_id', $pre_id)
             ->paginate(15);
@@ -75,7 +75,11 @@ class Presale extends Controller
     {
         // 新增记录
         $model = new PreSaleModel;
-        if ($model->save($this->postForm())) {
+        $data = $this->postForm();
+        $data['store_id'] = $this->storeId;
+        $data['ctime'] = format_time(time());
+        $data['p_time'] = format_time(time());
+        if ($model->save($data)) {
             return $this->renderSuccess('添加成功');
         }
         return $this->renderError($model->getError() ?: '添加失败');
@@ -90,8 +94,10 @@ class Presale extends Controller
     {
         // 评论详情
         $model = PreSaleModel::get($id);
+        $data = $this->postForm();
+        $data['p_time'] = format_time(time());
         // 更新记录
-        if ($model->save($this->postForm())) {
+        if ($model->save($data)) {
             return $this->renderSuccess('更新成功');
         }
         return $this->renderError($model->getError() ?: '更新失败');