Merge branch 'feature/feature_v4.6_20160525' of http://git.yoho.cn/fe/yohobuy-po…

…rtal-fe into feature/feature_v4.6_20160525

Merge branch 'feature/feature_v4.6_20160525' of http://git.yoho.cn/fe/yohobuy-po…
…rtal-fe into feature/feature_v4.6_20160525
姜敏
Commit 5f1f646006dbd57d2f9e42cede98db82629e1840 2 parents b2cb9664 2159d005
Showing 5 changed files with 21 additions and 14 deletions
client/js/common/edit2.js
client/js/operations/categoryManageAdd.js
client/sass/common/source-m.css
server/interface/categoryManage.js
server/views/pages/operations/categoryManageAdd.html
--- a/client/js/common/edit2.js
View file @5f1f646
+++ b/client/js/common/edit2.js
View file @5f1f646
@@ -86,7 +86,9 @@ components.prototype={
         $("input[type=file]", that.el).each(function() {
             var value = $.trim($(this).attr("value"));
             if ($(this).attr("required") && !value) {
-                err.push("<p>请上传文件</p>");
+                var prompt = $.trim($(this).attr("prompt"));
+                if(!prompt) err.push("<p>请上传文件</p>");
+                else err.push("<p>请上传"+ prompt +"</p>");
                 return false;
             }
         });
--- a/client/js/operations/categoryManageAdd.js
View file @5f1f646
+++ b/client/js/operations/categoryManageAdd.js
View file @5f1f646
@@ -81,14 +81,19 @@ $(document).on("click", "#addUrl", function () {
 });
 $(document).on("click", "#saveBtn", function () {
+    if(!edit.validate()) {
+        return false;
+    }
     var isNew = $("#isNew").val();
     var isHot = $("#isHot").val();
     var separativeSign = $("#separativeSign").val();
     var isNewPage = $("#isNewPage").val();
+    var platform = $("#platform").val();
     Category.isNew = !!isNew ? isNew : Category.isNew;
     Category.isHot = !!isHot ? isHot : Category.isHot;
     Category.separativeSign = !!separativeSign ? separativeSign : Category.separativeSign;
     Category.isNewPage = !!isNewPage ? isNewPage : Category.isNewPage;
+    Category.platform = platform.replace(/\|/g, ",");
     delete Category.categories;
     //console.log(Category);
--- a/client/sass/common/source-m.css
View file @5f1f646
+++ b/client/sass/common/source-m.css
View file @5f1f646
@@ -539,7 +539,7 @@ li.sortable-placeholder {
 }
 .dd-handle:hover {background: #fff; }
-.dd-item > button { display: block; position: relative; cursor: pointer; float: left; width: 25px; height: 20px; margin: 5px 0; padding: 0; text-indent: 100%; white-space: nowrap; overflow: hidden; border: 0; background: transparent; font-size: 12px; line-height: 1; text-align: center; font-weight: bold; }
+.dd-item > button { display: block; position: relative; cursor: pointer; float: left; width: 25px; height: 20px; margin: 16px 0; padding: 0; text-indent: 100%; white-space: nowrap; overflow: hidden; border: 0; background: transparent; font-size: 12px; line-height: 1; text-align: center; font-weight: bold;font-size: 20px; }
 .dd-item > button:before { content: '+'; display: block; position: absolute; width: 100%; text-align: center; text-indent: 0; }
 .dd-item > button[data-action="collapse"]:before { content: '-'; }
--- a/server/interface/categoryManage.js
View file @5f1f646
+++ b/server/interface/categoryManage.js
View file @5f1f646
@@ -2,11 +2,11 @@
  * Created by ty on 2016/5/26.
  * 分类管理路由
  */
-exports.domain = require('../config/common.js').domain;
+//exports.domain = require('../config/common.js').domain;
 //exports.domain = 'http://172.16.6.115:8080/platform';//王伟
 //exports.domain = 'http://192.168.102.216:8180/platform'; //测试环境
 //exports.domain = 'http://172.16.6.231:8080/platform';
-//exports.domain = 'http://172.16.6.225:8080/platform';
+exports.domain = 'http://172.16.6.225:8080/platform';
 //exports.domain = 'http://192.168.102.216:8086/platform';
 exports.res = [
--- a/server/views/pages/operations/categoryManageAdd.html
View file @5f1f646
+++ b/server/views/pages/operations/categoryManageAdd.html
View file @5f1f646
@@ -75,7 +75,7 @@
         <div class="form-group">
             <label class="col-sm-1 control-label">分类图标</label>
             <div class="col-sm-9">
-                <input type="file" name="file" prompt="分类图标" value="[[sortIco]]" class="observe" data-field="sortIco">
+                <input type="file" name="file" prompt="分类图标" value="[[sortIco]]" class="observe" data-field="sortIco" required>
             </div>
         </div>
@@ -136,15 +136,15 @@
         <div class="form-group">
             <label class="col-sm-1 control-label">显示平台</label>
             <div class="col-sm-8">
-                <input type="checkbox" value="iphone" style="width:18px;height:18px;margin-left:5px;" name="platform" id="checkboxiphone"> IOS手机
-                <input type="checkbox" value="ipad" style="width:18px;height:18px;margin-left:5px;" name="platform" id="checkboxipad"> IOS Pad
-                <input type="checkbox" value="android" style="width:18px;height:18px;margin-left:5px;" name="platform" id="checkboxandroid"> 安卓手机
-                <input type="checkbox" value="androidpad" style="width:18px;height:18px;margin-left:5px;" name="platform" id="checkboxandroidpad"> 安卓Pad
-                <input type="checkbox" value="h5" style="width:18px;height:18px;margin-left:5px;" name="platform" id="checkboxh5"> 手机网站
-                <input type="checkbox" value="web" style="width:18px;height:18px;margin-left:5px;" name="platform" id="checkboxweb"> 网站
-                <input type="checkbox" value="platform" style="width:18px;height:18px;margin-left:5px;" name="platform" id="checkboxplatform"> 平台
-            </div>
-            <input type="hidden" id="platform" for="radio" value="[[platform]]">
+                <input type="checkbox" value="iphone" style="width:18px;height:18px;margin-left:5px;" name="platform"> IOS手机
+                <input type="checkbox" value="ipad" style="width:18px;height:18px;margin-left:5px;" name="platform"> IOS Pad
+                <input type="checkbox" value="android" style="width:18px;height:18px;margin-left:5px;" name="platform"> 安卓手机
+                <input type="checkbox" value="androidpad" style="width:18px;height:18px;margin-left:5px;" name="platform"> 安卓Pad
+                <input type="checkbox" value="h5" style="width:18px;height:18px;margin-left:5px;" name="platform"> 手机网站
+                <input type="checkbox" value="web" style="width:18px;height:18px;margin-left:5px;" name="platform"> 网站
+                <input type="checkbox" value="platform" style="width:18px;height:18px;margin-left:5px;" name="platform"> 平台
+            </div>
+            <input type="hidden" id="platform" for="checkbox" value="[[platform]]">
         </div><!-- form-group -->
         <div class="form-group">
             <label class="col-sm-1 control-label">排序</label>