wangmingchuan
/
yanzong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
v1.0
lqmac 11 months ago
parent d91e789bcc
commit b7f682153a
5 changed files with 14 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9
      app/store/model/Goods.php
  2. 1
      public/admin/css/goods.c51f5d7d.css
  3. 2
      public/admin/index.html
  4. 1
      public/admin/js/app.6d1b1645.js
  5. 3
      public/admin/js/goods.c126a06c.js

9
app/store/model/Goods.php
Unescape View File

@ -80,6 +80,10 @@ class Goods extends GoodsModel
}
// 获取商品记录
$goodsInfo = static::detail($goodsId, $with);
if ($goodsInfo->region && $goodsInfo->region_text) {
$goodsInfo->rules = [['key' => 0, 'region' => json_decode($goodsInfo->region), 'region_text' => json_decode($goodsInfo->region_text)]];
}
// echo "<pre>";
// print_r($goodsInfo->toArray());
// exit();
@ -267,7 +271,10 @@ class Goods extends GoodsModel
'store_id' => self::$storeId,
'sale_areas' => $arr ? implode("、", $arr) : "",
]);
if (isset($data['rules'])) {
$data['region'] = isset($data['rules'][0]['region']) ? json_encode($data['rules'][0]['region']) :"";
$data['region_text'] = isset($data['rules'][0]['region_text']) ? json_encode($data['rules'][0]['region_text'], JSON_UNESCAPED_UNICODE) :"";
}
// 整理商品的价格和库存总量
if ($data['spec_type'] == GoodsSpecTypeEnum::MULTI) {
// $data['stock_total'] = GoodsSkuModel::getStockTotal($data['specData']['skuList']);

1
public/admin/css/goods.c51f5d7d.css
View File

File diff suppressed because one or more lines are too long

2
public/admin/index.html
Unescape View File

@ -1 +1 @@
<!DOCTYPE html><html lang="zh-cmn-Hans"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>超级管理后台</title><style>#loading-mask{position:fixed;left:0;top:0;height:100%;width:100%;background:#fff;user-select:none;z-index:9999;overflow:hidden}.loading-wrapper{position:absolute;top:50%;left:50%;transform:translate(-50%,-100%)}.loading-dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:64px;width:64px;height:64px;box-sizing:border-box}.loading-dot i{width:22px;height:22px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.loading-dot i:nth-child(1){top:0;left:0}.loading-dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.loading-dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.loading-dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style><link href="css/cloud.a47f0029.css" rel="prefetch"><link href="css/goods.2f091d40.css" rel="prefetch"><link href="css/menu.0391ed9c.css" rel="prefetch"><link href="css/setting.acf5c21b.css" rel="prefetch"><link href="css/store.14ef162f.css" rel="prefetch"><link href="css/user.6c29834d.css" rel="prefetch"><link href="js/cloud.5250d74c.js" rel="prefetch"><link href="js/fail.9f520b72.js" rel="prefetch"><link href="js/goods.b0b5edfb.js" rel="prefetch"><link href="js/menu.c52f90e4.js" rel="prefetch"><link href="js/setting.9458c846.js" rel="prefetch"><link href="js/store.47835409.js" rel="prefetch"><link href="js/user.8c820957.js" rel="prefetch"><link href="css/app.790beb9b.css" rel="preload" as="style"><link href="css/chunk-vendors.0e71d16e.css" rel="preload" as="style"><link href="js/app.18d260a0.js" rel="preload" as="script"><link href="js/chunk-vendors.deec1c57.js" rel="preload" as="script"><link href="css/chunk-vendors.0e71d16e.css" rel="stylesheet"><link href="css/app.790beb9b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue-antd-pro doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><div id="loading-mask"><div class="loading-wrapper"><span class="loading-dot loading-dot-spin"><i></i><i></i><i></i><i></i></span></div></div></div><script src="config.js"></script><script src="js/chunk-vendors.deec1c57.js"></script><script src="js/app.18d260a0.js"></script></body></html>
<!DOCTYPE html><html lang="zh-cmn-Hans"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>超级管理后台</title><style>#loading-mask{position:fixed;left:0;top:0;height:100%;width:100%;background:#fff;user-select:none;z-index:9999;overflow:hidden}.loading-wrapper{position:absolute;top:50%;left:50%;transform:translate(-50%,-100%)}.loading-dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:64px;width:64px;height:64px;box-sizing:border-box}.loading-dot i{width:22px;height:22px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.loading-dot i:nth-child(1){top:0;left:0}.loading-dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.loading-dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.loading-dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style><link href="css/cloud.a47f0029.css" rel="prefetch"><link href="css/goods.c51f5d7d.css" rel="prefetch"><link href="css/menu.0391ed9c.css" rel="prefetch"><link href="css/setting.acf5c21b.css" rel="prefetch"><link href="css/store.14ef162f.css" rel="prefetch"><link href="css/user.6c29834d.css" rel="prefetch"><link href="js/cloud.5250d74c.js" rel="prefetch"><link href="js/fail.9f520b72.js" rel="prefetch"><link href="js/goods.c126a06c.js" rel="prefetch"><link href="js/menu.c52f90e4.js" rel="prefetch"><link href="js/setting.9458c846.js" rel="prefetch"><link href="js/store.47835409.js" rel="prefetch"><link href="js/user.8c820957.js" rel="prefetch"><link href="css/app.790beb9b.css" rel="preload" as="style"><link href="css/chunk-vendors.0e71d16e.css" rel="preload" as="style"><link href="js/app.6d1b1645.js" rel="preload" as="script"><link href="js/chunk-vendors.deec1c57.js" rel="preload" as="script"><link href="css/chunk-vendors.0e71d16e.css" rel="stylesheet"><link href="css/app.790beb9b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but vue-antd-pro doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><div id="loading-mask"><div class="loading-wrapper"><span class="loading-dot loading-dot-spin"><i></i><i></i><i></i><i></i></span></div></div></div><script src="config.js"></script><script src="js/chunk-vendors.deec1c57.js"></script><script src="js/app.6d1b1645.js"></script></body></html>

1
public/admin/js/app.6d1b1645.js
View File

File diff suppressed because one or more lines are too long

3
public/admin/js/goods.c126a06c.js
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save