Merge pull request 'preview' (#43) from preview into master
Reviewed-on: https://gitea.lihaink.cn/mkm/shop-php/pulls/43
This commit is contained in:
commit
1eb698f6e9
11
.example.env
11
.example.env
@ -16,7 +16,16 @@ USERNAME = preview_shop_lihaink_cn
|
||||
PASSWORD = HwQ2RsjDTDJWcS7r
|
||||
CHARSET = utf8mb4
|
||||
DEBUG = true
|
||||
|
||||
[DATABASE]
|
||||
TYPE = mysql
|
||||
HOSTNAME = 47.109.36.146
|
||||
DATABASE = ceshi_shop_lihaink_cn
|
||||
PREFIX = eb_
|
||||
HOSTPORT = 3306
|
||||
USERNAME = ceshi_shop_lihaink_cn
|
||||
PASSWORD = 4EfPeWfkx2rtGQef
|
||||
CHARSET = utf8mb4
|
||||
DEBUG = true
|
||||
[LANG]
|
||||
default_lang = zh-cn
|
||||
|
||||
|
||||
@ -1254,10 +1254,28 @@ class ProductRepository extends BaseRepository
|
||||
$res->append($append);
|
||||
if ($res['content'] && $res['content']['type'] == 1) {
|
||||
$content= json_decode($res['content']['content']);
|
||||
if(isset($content['image'])){
|
||||
$res['content']['content'] =$content;
|
||||
}else{
|
||||
if(is_Array($content) && isset($content['image'])){
|
||||
// $img='<p>';
|
||||
$image= $content['image']??[];
|
||||
// foreach($content['image'] as $k=>$v){
|
||||
// $img =$img. '<img src="'.$v.'"/>';
|
||||
// }
|
||||
$res['content']['content']=['image'=>$image];
|
||||
|
||||
}elseif(is_object($content)){
|
||||
$image= $content->image??[];
|
||||
// $img='<p>';
|
||||
// foreach($image as $k=>$v){
|
||||
// $img =$img. '<img src="'.$v.'"/>';
|
||||
// }
|
||||
$res['content']['content']=['image'=>$image];
|
||||
}
|
||||
else{
|
||||
if(is_Array($content)){
|
||||
$res['content']['content']=['image'=>$content];
|
||||
}else{
|
||||
$res['content']['content']=$content;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -2,4 +2,4 @@
|
||||
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
|
||||
if(window.location.protocol == 'https:'){
|
||||
document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">')
|
||||
}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.958c16a8.js></script><script src=/static/js/index.b64f7155.js></script></body></html>
|
||||
}</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.958c16a8.js></script><script src=/static/js/index.58c5e001.js></script></body></html>
|
||||
1
public/static/js/index.58c5e001.js
Normal file
1
public/static/js/index.58c5e001.js
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
public/system/css/chunk-087b7d1e.770ca5ba.css
Normal file
1
public/system/css/chunk-087b7d1e.770ca5ba.css
Normal file
@ -0,0 +1 @@
|
||||
.projectInfo[data-v-6321a5b0] .el-dialog__body{padding-top:0!important}.projectInfo[data-v-6321a5b0] .el-tabs__content{padding-left:10px!important}.tabPic[data-v-6321a5b0]{width:40px!important;height:40px!important}.tabPic img[data-v-6321a5b0]{width:100%;height:100%}.sp[data-v-6321a5b0]{display:block;width:33%;font-size:12px;margin-bottom:20px}.sp100[data-v-6321a5b0]{width:100%;margin-bottom:15px;display:inline-block}.third[data-v-6321a5b0]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.pictrue[data-v-6321a5b0]{display:inline-block}.pictrue img[data-v-6321a5b0]{width:100%;height:100%}.demo-image__preview[data-v-6321a5b0]{display:inline-block}.pictrue[data-v-6321a5b0]{width:60px;height:60px;border:1px dotted rgba(0,0,0,.1);margin-right:10px;position:relative;cursor:pointer}.pictrue .img[data-v-6321a5b0]{width:100%;height:100%}.details_pictrue[data-v-6321a5b0]{width:400px;height:400px}.demo-table-expand[data-v-3ee8db86]{font-size:0}.demo-table-expand[data-v-3ee8db86] label{width:77px;color:#99a9bf}.demo-table-expand .el-form-item[data-v-3ee8db86]{margin-right:0;margin-bottom:0;width:33.33%}.selWidth[data-v-3ee8db86]{width:350px!important}.seachTiele[data-v-3ee8db86]{line-height:35px}
|
||||
1
public/system/css/chunk-2412cb60.e7ee2a18.css
Normal file
1
public/system/css/chunk-2412cb60.e7ee2a18.css
Normal file
@ -0,0 +1 @@
|
||||
.projectInfo[data-v-6321a5b0] .el-dialog__body{padding-top:0!important}.projectInfo[data-v-6321a5b0] .el-tabs__content{padding-left:10px!important}.tabPic[data-v-6321a5b0]{width:40px!important;height:40px!important}.tabPic img[data-v-6321a5b0]{width:100%;height:100%}.sp[data-v-6321a5b0]{display:block;width:33%;font-size:12px;margin-bottom:20px}.sp100[data-v-6321a5b0]{width:100%;margin-bottom:15px;display:inline-block}.third[data-v-6321a5b0]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.pictrue[data-v-6321a5b0]{display:inline-block}.pictrue img[data-v-6321a5b0]{width:100%;height:100%}.demo-image__preview[data-v-6321a5b0]{display:inline-block}.pictrue[data-v-6321a5b0]{width:60px;height:60px;border:1px dotted rgba(0,0,0,.1);margin-right:10px;position:relative;cursor:pointer}.pictrue .img[data-v-6321a5b0]{width:100%;height:100%}.details_pictrue[data-v-6321a5b0]{width:400px;height:400px}[data-v-dabcd93e] .el-select-dropdown__item{max-width:350px!important}.template[data-v-dabcd93e]{overflow:hidden}.label-list[data-v-dabcd93e]{height:100%}.bg[data-v-dabcd93e]{z-index:100;position:fixed;left:0;top:0;width:100%;height:100%;background:rgba(0,0,0,.5)}.rate_star[data-v-dabcd93e]{position:relative;top:5px}table .el-image[data-v-dabcd93e]{display:inline-block}.demo-table-expand[data-v-dabcd93e]{font-size:0}.demo-table-expand[data-v-dabcd93e] label{width:105px;color:#99a9bf}.demo-table-expand .el-form-item[data-v-dabcd93e]{margin-right:0;margin-bottom:0;width:33.33%}.selWidth[data-v-dabcd93e]{width:350px!important}.seachTiele[data-v-dabcd93e]{line-height:35px}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user