瀏覽代碼

list改为解构赋值

萤火科技 3 年之前
父節點
當前提交
ecb60b0462
共有 4 個文件被更改,包括 7 次插入 和 8 次删除
  1. 1 1
      app/admin/service/Cache.php
  2. 2 2
      app/api/model/UserAddress.php
  3. 2 2
      app/store/model/Goods.php
  4. 2 3
      app/store/model/store/Address.php

+ 1 - 1
app/admin/service/Cache.php

@@ -45,7 +45,7 @@ class Cache extends BaseService
         // 数据缓存
         if (in_array('data', $data['item'])) {
             // 强制模式
-            $isForce = isset($data['isForce']) ? (bool)$data['isForce'] : false;
+            $isForce = isset($data['isForce']) && $data['isForce'];
             // 清除缓存
             $isForce ? $this->cache->clear() : $this->cache->tag('cache')->clear();
         }

+ 2 - 2
app/api/model/UserAddress.php

@@ -73,7 +73,7 @@ class UserAddress extends UserAddressModel
         // 当前用户信息
         $user = UserService::getCurrentLoginUser(true);
         // 省市区ID
-        list($data['province_id'], $data['city_id'], $data['region_id']) = $this->getRegionId($data);
+        [$data['province_id'], $data['city_id'], $data['region_id']] = $this->getRegionId($data);
         // 添加收货地址
         return $this->transaction(function () use ($user, $data) {
             $this->save([
@@ -120,7 +120,7 @@ class UserAddress extends UserAddressModel
     public function edit(array $data)
     {
         // 省市区ID
-        list($data['province_id'], $data['city_id'], $data['region_id']) = $this->getRegionId($data);
+        [$data['province_id'], $data['city_id'], $data['region_id']] = $this->getRegionId($data);
         // 更新收货地址
         return $this->save([
                 'name' => $data['name'],

+ 2 - 2
app/store/model/Goods.php

@@ -210,8 +210,8 @@ class Goods extends GoodsModel
         // 商品价格 最低最高
         if ($data['spec_type'] == SpecTypeEnum::MULTI) {
             $data['stock_total'] = GoodsSkuModel::getStockTotal($data['specData']['skuList']);
-            list($data['goods_price_min'], $data['goods_price_max']) = GoodsSkuModel::getGoodsPrices($data['specData']['skuList']);
-            list($data['line_price_min'], $data['line_price_max']) = GoodsSkuModel::getLinePrices($data['specData']['skuList']);
+            [$data['goods_price_min'], $data['goods_price_max']] = GoodsSkuModel::getGoodsPrices($data['specData']['skuList']);
+            [$data['line_price_min'], $data['line_price_max']] = GoodsSkuModel::getLinePrices($data['specData']['skuList']);
         } elseif ($data['spec_type'] == SpecTypeEnum::SINGLE) {
             $data['goods_price_min'] = $data['goods_price_max'] = $data['goods_price'];
             $data['line_price_min'] = $data['line_price_max'] = $data['line_price'];

+ 2 - 3
app/store/model/store/Address.php

@@ -77,7 +77,7 @@ class Address extends StoreAddressModel
      */
     public function add(array $data)
     {
-        list($data['province_id'], $data['city_id'], $data['region_id']) = $data['cascader'];
+        [$data['province_id'], $data['city_id'], $data['region_id']] = $data['cascader'];
         $data['store_id'] = self::$storeId;
         return $this->save($data);
     }
@@ -89,7 +89,7 @@ class Address extends StoreAddressModel
      */
     public function edit(array $data)
     {
-        list($data['province_id'], $data['city_id'], $data['region_id']) = $data['cascader'];
+        [$data['province_id'], $data['city_id'], $data['region_id']] = $data['cascader'];
         return $this->save($data);
     }
 
@@ -101,5 +101,4 @@ class Address extends StoreAddressModel
     {
         return $this->save(['is_delete' => 1]);
     }
-
 }