Merge branch 'master' of http://116.62.159.90:3000/dlh/dlh_test_server
This commit is contained in:
commit
e1c096cd2a
@ -155,7 +155,14 @@ class BusinessSchoolLogic extends Logic
|
||||
public static function detail_content($id)
|
||||
{
|
||||
$res = BusinessSchool::field(true)->findOrEmpty($id)->toArray();
|
||||
$res['file'] = BusinessSchoolFile::where('bsid', $id)->select()->toArray();
|
||||
$file = BusinessSchoolFile::where('bsid', $id)->select()->toArray();
|
||||
foreach ($file as &$v) {
|
||||
if ($v['type'] == 1) {
|
||||
$res['image'][] = $v['src'];
|
||||
} else if($v['type'] == 2) {
|
||||
$res['file'][] = $v['src'];
|
||||
}
|
||||
}
|
||||
return $res;
|
||||
}
|
||||
|
||||
|
||||
@ -61,8 +61,7 @@
|
||||
<div class="upload-image-elem"><a class="add-upload-video"> + 上传视频</a></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="video-block" {if condition="$detail.video"} style="display: block" {/if}>
|
||||
<div id="video-block" {if condition="$detail.video"} style="display: block" {else} style="display: none" {/if}>
|
||||
<div class="del-video-btn" style="visibility: inherit">x</div>
|
||||
<video id="businessSchoolVideo" controls src="{$detail.video}" style="width: 500px;height: 300px;"></video>
|
||||
<input type="hidden" name="video" value="{$detail.video}">
|
||||
@ -76,15 +75,13 @@
|
||||
|
||||
<div id="business-school-image" class="layui-form-item">
|
||||
<label class="layui-form-label">图片:</label>
|
||||
{if !empty($detail.file)}
|
||||
{foreach $detail.file as $val}
|
||||
{if $val.type == 1}
|
||||
<div class="upload-image-div">
|
||||
<img src="{$val.src}" alt="img" />
|
||||
<input type="hidden" name="image[]" value="{$val.src}">
|
||||
<div class="del-upload-btn">x</div>
|
||||
</div>
|
||||
{/if}
|
||||
{if !empty($detail.image)}
|
||||
{foreach $detail.image as $val}
|
||||
<div class="upload-image-div">
|
||||
<img src="{$val}" alt="img" />
|
||||
<input type="hidden" name="image[]" value="{$val}">
|
||||
<div class="del-upload-btn">x</div>
|
||||
</div>
|
||||
{/foreach}
|
||||
{/if}
|
||||
|
||||
@ -100,13 +97,11 @@
|
||||
<div class="layui-input-block" id="qualifications_images">
|
||||
{if !empty($detail.file)}
|
||||
{foreach $detail.file as $val}
|
||||
{if $val.type == 2}
|
||||
<div class="upload-image-div">
|
||||
<a class="file-thumb" href="{$val.src}"> {$val.src|basename}</a>
|
||||
<input type="hidden" name="file[]" value="{$val.src}">
|
||||
<div class="del-upload-btn">x</div>
|
||||
</div>
|
||||
{/if}
|
||||
<div class="upload-image-div">
|
||||
<a class="file-thumb" href="{$val}"> {$val|basename}</a>
|
||||
<input type="hidden" name="file[]" value="{$val}">
|
||||
<div class="del-upload-btn">x</div>
|
||||
</div>
|
||||
{/foreach}
|
||||
{/if}
|
||||
<div id="upload-file-block">
|
||||
@ -228,9 +223,12 @@
|
||||
url: '{:url("BusinessSchool/delVideo")}',
|
||||
data: {videoFile},
|
||||
type: "post",
|
||||
success: function (res) {}
|
||||
success: function (res) {
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
$("input[name='video']").val('')
|
||||
$("#upload-video-block").show()
|
||||
$("#video-block").hide()
|
||||
$("#businessSchoolVideo").attr('src', '')
|
||||
|
||||
@ -5,6 +5,7 @@ namespace app\api\logic;
|
||||
use app\common\basics\Logic;
|
||||
use app\common\model\BusinessSchool;
|
||||
use app\common\model\BusinessSchoolCategory;
|
||||
use app\common\model\BusinessSchoolFile;
|
||||
|
||||
class BusinessSchoolLogic extends Logic
|
||||
{
|
||||
@ -43,7 +44,7 @@ class BusinessSchoolLogic extends Logic
|
||||
|
||||
$model = new BusinessSchool();
|
||||
|
||||
$count = $model->alias('a')->join('article_category c', 'c.id = a.cid')->where($where)->count();
|
||||
$count = $model->alias('a')->join('business_school_category c', 'c.id = a.cid')->where($where)->count();
|
||||
|
||||
$list = $model->alias('a')
|
||||
->join('business_school_category c', 'c.id = a.cid')
|
||||
@ -82,6 +83,15 @@ class BusinessSchoolLogic extends Logic
|
||||
$article = [];
|
||||
}else{
|
||||
$article = $article->toArray();
|
||||
$file = BusinessSchoolFile::where('bsid', $id)->select()->toArray();
|
||||
foreach ($file as $k => &$v) {
|
||||
if ($v['type'] == 1) {
|
||||
$article['image'][] = $v['src'];
|
||||
} else if($v['type'] == 2) {
|
||||
$article['file'][$k]['src'] = $v['src'];
|
||||
$article['file'][$k]['name'] = basename($v['src']);
|
||||
}
|
||||
}
|
||||
}
|
||||
return $article;
|
||||
}
|
||||
|
||||
@ -14,6 +14,8 @@ class BusinessSchool extends Models
|
||||
|
||||
public function getVideoAttr($value)
|
||||
{
|
||||
return Config::get('aliyunoss.domain') . $value;
|
||||
if ($value) {
|
||||
return Config::get('aliyunoss.domain') . $value;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -95,7 +95,7 @@
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">商品分类:</label>
|
||||
<div class="layui-input-inline">
|
||||
<select name="shop_cate_id" lay-filter="shop_cate_id" switch-tab="0" verify-msg="请选择分类">
|
||||
<select name="shop_cate_id" lay-filter="shop_cate_id" switch-tab="0" verify-msg="请选择分类" lay-search>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
@ -127,7 +127,7 @@
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">商品单位:</label>
|
||||
<div class="layui-input-inline">
|
||||
<select name="unit_id" switch-tab="0" verify-msg="请选择分类">
|
||||
<select name="unit_id" switch-tab="0" verify-msg="请选择分类" lay-search>
|
||||
<option value="">请选择单位</option>
|
||||
</select>
|
||||
</div>
|
||||
@ -136,7 +136,7 @@
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">商品品牌:</label>
|
||||
<div class="layui-input-inline">
|
||||
<select name="brand_id" lay-verType="tips" switch-tab="0" verify-msg="请选择商品品牌">
|
||||
<select name="brand_id" lay-verType="tips" switch-tab="0" verify-msg="请选择商品品牌" lay-search>
|
||||
<option value="">请选择品牌</option>
|
||||
</select>
|
||||
</div>
|
||||
@ -145,7 +145,7 @@
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">供货商:</label>
|
||||
<div class="layui-input-inline">
|
||||
<select name="supplier_id" lay-verType="tips" switch-tab="0" verify-msg="请选择供货商">
|
||||
<select name="supplier_id" lay-verType="tips" switch-tab="0" verify-msg="请选择供货商" lay-search>
|
||||
<option value="">请选择供货商</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user