goods

service/Application/Admin/Controller/CommonController.class.php

@@ -347,25 +347,11 @@ class CommonController extends Controller
 	{
 		if(isset($_FILES[$post_name]['error']))
 		{
-			// 文件上传校验
-			$error = FileUploadError($post_name);
-			if($error !== true)
+			$file_obj = new \Library\FileUpload(['root_path'=>ROOT_PATH, 'path'=>$path]);
+			$ret = $file_obj->Save($post_name);
+			if($ret['status'] === true)
 			{
-				$this->ajaxReturn($error, -1);
-			}
-
-			// 文件类型
-			list($type, $suffix) = explode('/', $_FILES[$post_name]['type']);
-			$path = 'Public'.DS.'Upload'.DS.$dir.DS.'images'.DS;
-			if(!is_dir($path))
-			{
-				mkdir(ROOT_PATH.$path, 0777, true);
-			}
-			$filename = date('YmdHis').'.'.$suffix;
-			$file = $path.$filename;
-			if(move_uploaded_file($_FILES[$post_name]['tmp_name'], ROOT_PATH.$file))
-			{
-				$_POST[$field] = DS.$file;
+				$_POST[$field] = $ret['data']['url'];
 			}
 		}
 	}

service/Application/Admin/Controller/GoodsController.class.php

@@ -437,11 +437,10 @@ class GoodsController extends CommonController
 		if(!empty($data))
 		{
 			// 定义图片目录
-			$root_path = ROOT_PATH;
 			$path = DS.'Public'.DS.'Upload'.DS.'goods_video'.DS.date('Y').DS.date('m').DS.date('d').DS;
 
 			// 类库
-			$file_obj = new \Library\FileUpload(['root_path'=>$root_path, 'path'=>$path]);
+			$file_obj = new \Library\FileUpload(['root_path'=>ROOT_PATH, 'path'=>$path]);
 			foreach($data as $field)
 			{
 				if(!empty($_FILES[$field]))

service/Application/Admin/View/Default/Goods/SaveInfo.html

@@ -188,11 +188,10 @@
 					<i class="am-icon-trash-o am-icon-sm original-images-url-delete" data-input-tag="input.original-video-images-url" data-video-tag="#form-view-video" data-tips-tag="#form-video-tips" data-file-tag="input.file_video-tag"></i>
 					<input type="file" name="file_video" multiple data-validation-message="{{:L('common_select_images_tips')}}" accept=".mp4" class="js-choice-one video-file-event file_video-tag" data-choice-one-to=".original-video-images-url" data-tips-tag="#form-video-tips" data-video-tag="#form-view-video" />
 					<div id="form-video-tips" class="m-t-5"></div>
-					<video src="<if condition="!empty($data['video'])">{{$image_host}}{{$data.video}}</if>" id="form-view-video" class="block m-t-5 am-img-thumbnail am-radius" width="150" height="150" data-default="<if condition="!empty($data['video'])">{{$image_host}}{{$data.video}}</if>" controls>
+					<video src="<if condition="!empty($data['video'])">{{$image_host}}{{$data.video}}</if>" id="form-view-video" class="block m-t-5 am-img-thumbnail am-radius" width="200" data-default="<if condition="!empty($data['video'])">{{$image_host}}{{$data.video}}</if>" controls>
 						your browser does not support the video tag
 					</video>
 				</div>
-
 			</div>
 			<div id="goods-nav-attribute" class="division-block">
 				<label class="block nav-detail-title">{{:L('goods_nav_attribute_name')}}</label>

service/Public/Home/Default/Css/Common.css

@@ -134,12 +134,11 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px ;}
     .nav-search .logo-big{ display:block;float:left;height:40px;width:135px; margin:0px auto; margin-left:5px; margin-right: 5px;} 
     .nav-search .logo-big img{width:100%;}
     .search-bar {height: 40px; width: calc(100% - 146px);}
-    #ai-topsearch {height: 36px;}
     .search-bar input {width: 80%;height:36px;} 
     .classified{display:none;}
     .mobile-navigation{display:none;}
     .nav-search{ position:relative;top:0px;z-index:0;margin-bottom: 5px;margin-top: 5px;}
-     #ai-topsearch{ font-size:18px;height: 36px;}
+     #ai-topsearch{ font-size:14px;height: 36px;line-height: 26px;}
      /*底部*/
     .am-footer {text-align:center; display:block;position: relative;margin: 0px auto; padding: 7px 0px 9px; margin-top:20px;}
     .am-footer .footer-bd p, .footer .footer-hd p {margin-bottom: 8px;line-height: 27px;border-bottom: 1px solid #DDD; text-align:left;}
@@ -155,17 +154,15 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px ;}
 
 @media only screen and (min-width: 1025px) {
     .am-container { padding-left:0rem;padding-right:0rem;max-width: 1000px;}
-    .shop-nav{margin:0px;border-bottom: 2px solid #d2364c; height: 49px;}
+    .shop-nav{margin:0px;border-bottom: 2px solid #d2364c; height: 59px;}
 
     .mui-mbar-tabs{ display:block;}  
     .nav-search{padding-left:0px; max-width:1000px; margin:0px auto;padding: 20px 0;}
     .nav-search .logo{display:none;}
     .nav-search .logo-big { display: -webkit-inline-box; float:left;height:60px; width:230px; margin:0px;}
-    .search-bar{height:50px; margin:auto;display: -webkit-inline-box;width: calc(60%);padding-left: 8%;}
-    #ai-topsearch {height: 47px;}
+    .search-bar{margin:auto;display: -webkit-inline-box;width: calc(60%);padding-left: 8%;}
     .shopMain{margin:0px 0px 0px 5px;} 
     .shopCon li{width:20%;padding:10px;}
-    .search-bar input { height: 46px;}
     .tip{display:block;}
           
           
@@ -174,9 +171,9 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px ;}
     .goods-category-s, .goods-category-title { z-index: 100; }
     .nav-table{max-width:1000px;margin: 0px auto;height: 45px;position: relative;overflow: hidden;}
     .all-goods{font-size: 16px;}
-    .goods-category-title{background:#d2364c;color:#fff ;height: 45px;line-height: 45px;display:block;position: absolute;width:150px ;text-align: center;font-size:16px ;top:0px;z-index: 6;cursor: pointer;}
-    .nav-cont{position: absolute;padding-left:150px;display:block;width:100% ;top:4px}
-    .nav-cont li{float: left;height: 45px;line-height: 45px;}
+    .goods-category-title{background:#d2364c;color:#fff ;height: 40px;line-height: 40px;display:block;position: absolute;width:150px ;text-align: center;font-size:16px ;top:3px;z-index: 6;cursor: pointer;}
+    .nav-cont{position: absolute;padding-left:150px;display:block;width:100% ;top:20px}
+    .nav-cont li{float: left;height: 40px;line-height: 40px;}
     .nav-cont li::before{content: '\20';display: inline-block;height: 16px;border-right: 1px solid #d9d9d9;width: 0;vertical-align: middle;margin-left: -1px;}
     .nav-cont li a {font-size: 16px;color: #333;line-height: 36px;margin-left: -1px;padding: 0 25px;text-decoration: none;font-weight: 700;display: inline-block;vertical-align: middle;}
     .nav-cont li a:hover { color:#d2364c; }