najixian / xt_dc_admin · Commits

Go to a project

Commit 93cb9343d5e82c6a2eb395825402a0402ed1c3e5

Authored by u123231312
1 parent 90a9b17e
build: skipped

no message

Inline Side-by-side
Showing 3 changed files with 11 additions and 49 deletions
@@ -50,12 +50,12 @@ class UpFiles extends Common @@ -50,12 +50,12 @@ class UpFiles extends Common
50 chmod($uploadFolder,0777); 50 chmod($uploadFolder,0777);
51 } 51 }
52 $imgPath = $uploadFolder . $name . $ext; 52 $imgPath = $uploadFolder . $name . $ext;
  53 + if($obj['size']> 122880){
  54 + $image = new Compression($imgPath);
  55 + $imgPath = $image->getThumb();
  56 + }
53 //移动到临时目录 57 //移动到临时目录
54 if (move_uploaded_file($tmpName, $imgPath)) { 58 if (move_uploaded_file($tmpName, $imgPath)) {
55 - if($obj['size']> 122880){  
56 - $image = new Compression($imgPath);  
57 - $imgPaths = $image->getThumb();  
58 - }  
59 /*if(filesize($imgPath)> 122880){ 59 /*if(filesize($imgPath)> 122880){
60 $result['code'] =0; 60 $result['code'] =0;
61 $result['info'] = "图片超出125KB"; 61 $result['info'] = "图片超出125KB";
@@ -72,7 +72,7 @@ class UpFiles extends Common @@ -72,7 +72,7 @@ class UpFiles extends Common
72 // 构建 UploadManager 对象 72 // 构建 UploadManager 对象
73 $uploadMgr = new UploadManager(); 73 $uploadMgr = new UploadManager();
74 $backUrl = "pe9jzv1q9.bkt.clouddn.com"; //返回图片在七牛的路径 74 $backUrl = "pe9jzv1q9.bkt.clouddn.com"; //返回图片在七牛的路径
75 - list($ret, $err) = $uploadMgr->putFile($token,$key,$imgPaths); 75 + list($ret, $err) = $uploadMgr->putFile($token,$key,$imgPath);
76 // 获取视频的时长 76 // 获取视频的时长
77 // 第一步先获取到到的是关于视频所有信息的json字符串 77 // 第一步先获取到到的是关于视频所有信息的json字符串
78 //$shichang = file_get_contents('http://'.WAILIAN.$key.'?avinfo'); 78 //$shichang = file_get_contents('http://'.WAILIAN.$key.'?avinfo');
@@ -99,11 +99,12 @@ class UpFiles extends Common @@ -99,11 +99,12 @@ class UpFiles extends Common
99 if($rs['url']){ 99 if($rs['url']){
100 //上传成功之后删除服务器文件 100 //上传成功之后删除服务器文件
101 unlink($imgPath); 101 unlink($imgPath);
102 - unlink($imgPaths);  
103 $result['code'] = 1; 102 $result['code'] = 1;
104 $result['info'] = '图片上传成功!'; 103 $result['info'] = '图片上传成功!';
105 $path=str_replace('\\','/',$rs['url']); 104 $path=str_replace('\\','/',$rs['url']);
106 $result['url'] = $path; 105 $result['url'] = $path;
  106 + $key = substr($key,0,strrpos($key,"."));
  107 + $result['picname'] = $key;
107 return $result; 108 return $result;
108 }else{ 109 }else{
109 // 上传失败获取错误信息 110 // 上传失败获取错误信息
1 {include file="common/head"/} 1 {include file="common/head"/}
2 <div class="admin-main layui-anim layui-anim-upbit" ng-app="hd" ng-controller="ctrl"> 2 <div class="admin-main layui-anim layui-anim-upbit" ng-app="hd" ng-controller="ctrl">
3 - <!--<form class="layui-form layui-form-pane">  
4 - <div class="layui-form-item" id="container">  
5 - <label class="layui-form-label">菜品名称</label>  
6 - <div class="layui-input-1">  
7 - <input type="text" name="name" ng-model="field.name" lay-verify="required" placeholder="{:lang('pleaseEnter')}图片/视频名称" class="layui-input">  
8 - </div>  
9 - <label class="layui-form-label">菜系</label>  
10 - <div class="layui-input-1">  
11 - <select name="class" id="class" lay-filter="myselect">  
12 - <option value="">请选择类别</option>  
13 - <option value="22222">22222</option>  
14 - </select>  
15 - </div>  
16 - <label class="layui-form-label">菜品简介</label>  
17 - <div class="layui-input-2">  
18 - <textarea name="content" style="text-align:left;" class="layui-input"></textarea>  
19 - </div>  
20 - <label class="layui-form-label">菜品图片</label>  
21 - <input type="hidden" name="pic" id="pic" value="{{field.pic}}">  
22 - <div class="layui-input-1">  
23 - <div class="layui-upload">  
24 - <button type="button" class="layui-btn layui-btn-primary" id="adBtn"><i class="icon icon-upload3"></i>点击上传</button>  
25 - <div class="layui-upload-list">  
26 - <img class="layui-upload-img" id="adPic">  
27 - <p id="demoText"></p>  
28 - <video src="" id="adVideo" controls="controls" style="width: 300px;height: 200px;display: none">  
29 - 您的浏览器不支持 video 标签。  
30 - </video>  
31 - </div>  
32 - </div>  
33 - </div>  
34 - </div>  
35 -  
36 - <div class="layui-form-item">  
37 - <button type="button" class="layui-btn" lay-submit="" lay-filter="submit">{:lang('submit')}</button>  
38 - </div>  
39 - </div>  
40 - </form>-->  
41 <div id="mainContent" class="main-content"> 3 <div id="mainContent" class="main-content">
42 <form class="layui-form layui-form-pane"> 4 <form class="layui-form layui-form-pane">
43 <div class="table-responsive"> 5 <div class="table-responsive">
@@ -55,7 +17,7 @@ @@ -55,7 +17,7 @@
55 <tr> 17 <tr>
56 <td> 18 <td>
57 <div class="layui-input-10"> 19 <div class="layui-input-10">
58 - <input type="text" name="name{$vo}" ng-model="field.name{$vo}" lay-verify="required" placeholder="{:lang('pleaseEnter')}图片/视频名称" class="layui-input"> 20 + <input type="text" name="name{$vo}" id="picname{$vo}" ng-model="field.name{$vo}" lay-verify="required" placeholder="{:lang('pleaseEnter')}图片/视频名称" class="layui-input">
59 </div> 21 </div>
60 </td> 22 </td>
61 <td> 23 <td>
@@ -93,9 +55,6 @@ @@ -93,9 +55,6 @@
93 </div> 55 </div>
94 </form> 56 </form>
95 </div> 57 </div>
96 -  
97 -  
98 -  
99 </div> 58 </div>
100 {include file="common/foot"/} 59 {include file="common/foot"/}
101 <script src="/static/common/js/angular.min.js"></script> 60 <script src="/static/common/js/angular.min.js"></script>
@@ -137,6 +96,7 @@ @@ -137,6 +96,7 @@
137 var item = this.item; 96 var item = this.item;
138 if(res.code>0){ 97 if(res.code>0){
139 $('#pic'+item.context.id).val(res.url); 98 $('#pic'+item.context.id).val(res.url);
  99 + $('#picname'+item.context.id).val(res.picname);
140 $('#tip'+item.context.id).css('display', 'block'); 100 $('#tip'+item.context.id).css('display', 'block');
141 return layer.msg('上传成功'); 101 return layer.msg('上传成功');
142 }else{ 102 }else{
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <div class="layui-form-item" id="container"> 19 <div class="layui-form-item" id="container">
20 <label class="layui-form-label">菜品名称</label> 20 <label class="layui-form-label">菜品名称</label>
21 <div class="layui-input-1"> 21 <div class="layui-input-1">
22 - <input type="text" name="name" ng-model="field.name" lay-verify="required" placeholder="{:lang('pleaseEnter')}图片/视频名称" class="layui-input"> 22 + <input type="text" name="name" id="picname" ng-model="field.name" lay-verify="required" placeholder="{:lang('pleaseEnter')}图片/视频名称" class="layui-input">
23 </div> 23 </div>
24 <label class="layui-form-label">菜系</label> 24 <label class="layui-form-label">菜系</label>
25 <div class="layui-input-1"> 25 <div class="layui-input-1">
@@ -102,6 +102,7 @@ @@ -102,6 +102,7 @@
102 },done: function(res){ 102 },done: function(res){
103 if(res.code>0){ 103 if(res.code>0){
104 $('#pic').val(res.url); 104 $('#pic').val(res.url);
  105 + $('#picname').val(res.picname);
105 return layer.msg('上传成功'); 106 return layer.msg('上传成功');
106 }else{ 107 }else{
107 //如果上传失败 108 //如果上传失败