正在显示
3 个修改的文件
包含
13 行增加
和
3 行删除
@@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
30 | <label class="control-label col-xs-12 col-sm-2">{:__('Files')}:</label> | 30 | <label class="control-label col-xs-12 col-sm-2">{:__('Files')}:</label> |
31 | <div class="col-xs-12 col-sm-8"> | 31 | <div class="col-xs-12 col-sm-8"> |
32 | <div class="input-group"> | 32 | <div class="input-group"> |
33 | - <input id="c-files" data-rule="required" class="form-control" size="50" name="row[files]" type="text"> | 33 | + <input id="c-files" class="form-control" size="50" name="row[files]" type="text"> |
34 | <div class="input-group-addon no-border no-padding"> | 34 | <div class="input-group-addon no-border no-padding"> |
35 | <span><button type="button" id="plupload-files" class="btn btn-danger plupload" data-input-id="c-files" data-multiple="true" data-preview-id="p-files"><i class="fa fa-upload"></i> {:__('Upload')}</button></span> | 35 | <span><button type="button" id="plupload-files" class="btn btn-danger plupload" data-input-id="c-files" data-multiple="true" data-preview-id="p-files"><i class="fa fa-upload"></i> {:__('Upload')}</button></span> |
36 | <span><button type="button" id="fachoose-files" class="btn btn-primary fachoose" data-input-id="c-files" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span> | 36 | <span><button type="button" id="fachoose-files" class="btn btn-primary fachoose" data-input-id="c-files" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span> |
@@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
30 | <label class="control-label col-xs-12 col-sm-2">{:__('Files')}:</label> | 30 | <label class="control-label col-xs-12 col-sm-2">{:__('Files')}:</label> |
31 | <div class="col-xs-12 col-sm-8"> | 31 | <div class="col-xs-12 col-sm-8"> |
32 | <div class="input-group"> | 32 | <div class="input-group"> |
33 | - <input id="c-files" data-rule="required" class="form-control" size="50" name="row[files]" type="text" value="{$row.files}"> | 33 | + <input id="c-files" class="form-control" size="50" name="row[files]" type="text" value="{$row.files}"> |
34 | <div class="input-group-addon no-border no-padding"> | 34 | <div class="input-group-addon no-border no-padding"> |
35 | <span><button type="button" id="plupload-files" class="btn btn-danger plupload" data-input-id="c-files" data-multiple="true" data-preview-id="p-files"><i class="fa fa-upload"></i> {:__('Upload')}</button></span> | 35 | <span><button type="button" id="plupload-files" class="btn btn-danger plupload" data-input-id="c-files" data-multiple="true" data-preview-id="p-files"><i class="fa fa-upload"></i> {:__('Upload')}</button></span> |
36 | <span><button type="button" id="fachoose-files" class="btn btn-primary fachoose" data-input-id="c-files" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span> | 36 | <span><button type="button" id="fachoose-files" class="btn btn-primary fachoose" data-input-id="c-files" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span> |
@@ -283,8 +283,18 @@ class Index extends Api | @@ -283,8 +283,18 @@ class Index extends Api | ||
283 | 283 | ||
284 | $res = Common::findSoftWhereData('ulist',['id'=>$u_list_id],'createtime,updatetime,deletetime',true); | 284 | $res = Common::findSoftWhereData('ulist',['id'=>$u_list_id],'createtime,updatetime,deletetime',true); |
285 | if($res){ | 285 | if($res){ |
286 | + $res['images1'] = []; | ||
286 | $res['image'] = $this->auth->absolutionUrlOne($res['image']); | 287 | $res['image'] = $this->auth->absolutionUrlOne($res['image']); |
287 | - $res['images'] = $this->auth->absolutionUrl($res['images']); | 288 | + $res['images1'] = $this->auth->absolutionUrl($res['images']); |
289 | + if(!empty($res['files'])){ | ||
290 | + $res['files'] = $this->auth->absolutionUrl($res['files']); | ||
291 | + }else{ | ||
292 | + $res['files'] = []; | ||
293 | + } | ||
294 | + $res['images'] = array_merge($res['images1'],$res['files']); | ||
295 | + | ||
296 | + unset($res['images1']); | ||
297 | + unset($res['files']); | ||
288 | $res_goods = Common::findSoftWhereData('goods',['id'=>$res['g_id']],'image,name,introduce'); | 298 | $res_goods = Common::findSoftWhereData('goods',['id'=>$res['g_id']],'image,name,introduce'); |
289 | $res['goods'] = ''; | 299 | $res['goods'] = ''; |
290 | if($res_goods){ | 300 | if($res_goods){ |
-
请 注册 或 登录 后发表评论