Merge branch 'yohobuy_portal_dev_v4.4_20160525' into feature/yohobuy_portal_dev_v4.4_shops_20160527

@@ -872,7 +872,10 @@ $(document).on("click", "#submit", function () {
                     data.push(item1);
                     data.push(item1);
                 });
                 });
             }
             }
-            item.contentData.data=data;
+            if(data.length!=0){
+                item.contentData.data=data;
+            }
+
             item.contentData = common.util.__ArrayToObj(item.contentData);
             item.contentData = common.util.__ArrayToObj(item.contentData);
             return item;
             return item;
         });
         });

@@ -21,8 +21,8 @@ var g = new common.grid({
             modelName: common.util.__input('content-filter1'),
             modelName: common.util.__input('content-filter1'),
             beginTime:((new Date($('#beginTime').val())).getTime())/1000||"",
             beginTime:((new Date($('#beginTime').val())).getTime())/1000||"",
             endTime: ((new Date($('#endTime').val())).getTime())/1000||"",
             endTime: ((new Date($('#endTime').val())).getTime())/1000||"",
-            modelType:parseInt($("#aa").val()),
-            status: parseInt($("#bb").val())
+            modelType:parseInt($("#aa").val())
+            // status: parseInt($("#bb").val())
         };
         };
     },
     },
     //列表显示
     //列表显示

@@ -244,12 +244,14 @@ function attributeOp(prefix, url, item) {
                     } else {
                     } else {
                         // 显示属性列表
                         // 显示属性列表
                         if (propVlaueArr) {
                         if (propVlaueArr) {
+                            var count=0;
                             propVlaueArr.forEach(function (pv) {
                             propVlaueArr.forEach(function (pv) {
                                 if (!pv.name) {
                                 if (!pv.name) {
-                                    a.$tip('属性值不能为空');
-                                    return false;
+                                    count++;
+                                    
                                 }
                                 }
-
+                            });
+                            if(!count){
                                 a.submit(url+"?_datetime_="+Date.now(), function (option) {
                                 a.submit(url+"?_datetime_="+Date.now(), function (option) {
                                     option.data.categoryId = item.categoryId;
                                     option.data.categoryId = item.categoryId;
                                     option.data.attributeId = item.attributeId;
                                     option.data.attributeId = item.attributeId;
@@ -283,7 +285,11 @@ function attributeOp(prefix, url, item) {
                                             a.$tip(res.message);
                                             a.$tip(res.message);
                                         }
                                         }
                                 });
                                 });
-                            });
+                            }else {
+                                a.$tip('属性值不能为空');
+                                return false;
+                            }
+                             
                         } else {
                         } else {
                             a.$tip('属性值不能为空');
                             a.$tip('属性值不能为空');
                             return false;
                             return false;

@@ -161,29 +161,6 @@ function _makeMenu (data) {
         }
         }
         menu.push(item);
         menu.push(item);
     }
     }
-    // _.forEach(data,function(v){
-    //     var item = {
-    //         title:v.menu_name,
-    //     }
-    //     if(v.parent_id === "0") {
-    //         item.parent = 'menu-template';
-    //         var itemSubs = [];
-    //         _.forEach(v.sub,function(val) {
-    //           console.log(v.sub);
-    //             var sub = {
-    //                 title:val.menu_name,
-    //                 href:val.menu_url,
-    //                 icon: 'list-alt'
-    //             }
-    //             right[val.menu_url] = true;
-    //             itemSubs.push(sub);
-    //         });
-
-    //         item.menu = itemSubs;
-    //     }
-    //     menu.push(item);
-    // });
-
     return {
     return {
       menu:menu,
       menu:menu,
       right:right
       right:right

@@ -137,15 +137,15 @@
                 <input type="file" value="[[modelCard]]" class="form-control modelCard" id="modelCard" name="modelCard" placeholder="模特卡" required="required"/>
                 <input type="file" value="[[modelCard]]" class="form-control modelCard" id="modelCard" name="modelCard" placeholder="模特卡" required="required"/>
             </div>
             </div>
         </div>
         </div>
-        [[if __state=='update']]
+    
         <div class="form-group">
         <div class="form-group">
             <label class="col-sm-2 control-label">状态</label>
             <label class="col-sm-2 control-label">状态</label>
             <div class="col-sm-8">
             <div class="col-sm-8">
-                <label style="cursor: pointer;"><input type="radio" name="status" value="1">启用</label>
+                <label style="cursor: pointer;"><input type="radio" name="status" checked value="1">启用</label>
                 <label style="cursor: pointer;"><input type="radio" name="status" value="0">禁用</label>
                 <label style="cursor: pointer;"><input type="radio" name="status" value="0">禁用</label>
             </div>
             </div>
-            <input type="hidden" id="status" value="[[status]]" for="radio">
+            <input type="hidden" id="status" value="[[status||1]]" for="radio" required>
         </div>
         </div>
-        [[/if]]
+        
     </div>
     </div>
 </script>
 </script>

@@ -12,6 +12,16 @@
             <i class="fa fa-suitcase"></i>
             <i class="fa fa-suitcase"></i>
             <span>{{title}}</span>
             <span>{{title}}</span>
           </a>
           </a>
+          {{#if sub}}
+            {{#sub}}
+            <li style="margin-left: 20px;">
+              <a {{#if module_url}}href="{{module_url}}"{{/if}}>
+                <i class="fa fa-suitcase"></i>
+                <span>{{resource_name}}</span>
+              </a>
+            </li>
+            {{/sub}}
+          {{/if}}
         </li>
         </li>
       {{/menu}}
       {{/menu}}
       </ul>
       </ul>
@@ -19,3 +29,4 @@
   </a>
   </a>
 </li>
 </li>
 {{/menu}}
 {{/menu}}
+