修改品牌款型功能bug

@@ -159,7 +159,7 @@ var util = {
         // console.log(params);
         // console.log(params);
         //.match(/(\w+)+/g)
         //.match(/(\w+)+/g)
         for (var i in params) {
         for (var i in params) {
-            var aps = params[i].split(/\+|\-|\*|\/|\=|\!|\~|'|"/g);
+            var aps = params[i].split(/\+|\-|\*|\/|\=|\!|\~|'|"|\|/g);
             for (var j in aps) {
             for (var j in aps) {
                 var ap = aps[j].replace(/^\s+|\s+$/, '');
                 var ap = aps[j].replace(/^\s+|\s+$/, '');
                 // console.log(":" + ap + ":");
                 // console.log(":" + ap + ":");

@@ -52,7 +52,8 @@ var g = new common.grid({
             brandId: common.util.__input("brand"),
             brandId: common.util.__input("brand"),
             type: common.util.__input("models-type"),
             type: common.util.__input("models-type"),
             status: common.util.__input("status"),
             status: common.util.__input("status"),
-            bannarImg: common.util.__input("bannarImg")
+            bannarImg: common.util.__input("bannarImg"),
+            id: common.util.__input("id")
         };
         };
     },
     },
     columns: [{
     columns: [{
@@ -90,7 +91,7 @@ var g = new common.grid({
     }, {
     }, {
         display: '状态',
         display: '状态',
         render: function(item) {
         render: function(item) {
-            return '<p>'+TypeEnum.enum[item.status] +'<p>';
+            return '<p>'+StatusEnum.enum[item.status] +'<p>';
         }
         }
     },  {
     },  {
         display: '操作',
         display: '操作',
@@ -134,7 +135,7 @@ $(document).on('click', '.edit-class-btn', function () {
 function attributeOp(prefix, url, item) {
 function attributeOp(prefix, url, item) {
 
 
     var a = new common.edit(".confirm");
     var a = new common.edit(".confirm");
-    common.dialog.confirm(prefix + "款型系列", common.util.__template($("#template").html(), item), function () {
+    common.dialog.confirm(prefix + "款型系列", common.util.__template2($("#template").html(), item), function () {
 
 
         return a.submit(url, function (option) {
         return a.submit(url, function (option) {
             option.data.categoryId = item.categoryId;
             option.data.categoryId = item.categoryId;

@@ -84,8 +84,8 @@
             </label>
             </label>
 
 
             <div class="col-md-6">
             <div class="col-md-6">
-                <select name="shop" id="shopsId" value="{shopsId}" tabindex="-1" title="" class="form-control height40">
-                    <option value="-1">{shopsName}</option>
+                <select name="shop" id="shopsId" value="[[shopsId]]" tabindex="-1" title="" class="form-control height40">
+                    <option value="[[shopsId||'-1']]">[[shopsName||"请选择店铺"]]</option>
                 </select>
                 </select>
             </div>
             </div>
         </div>
         </div>
@@ -96,8 +96,8 @@
             </label>
             </label>
 
 
             <div class="col-md-6">
             <div class="col-md-6">
-                <select name="shop" id="brandId" value="{brandId}" tabindex="-1" title="" class="form-control height40">
-                    <option value="-1">{brandName}</option>
+                <select name="shop" id="brandId" value="[[brandId]]" tabindex="-1" title="" class="form-control height40">
+                    <option value="[[brandId||'-1']]">[[brandName||"请选择品牌"]]</option>
                 </select>
                 </select>
             </div>
             </div>
         </div>
         </div>
@@ -108,7 +108,7 @@
             </label>
             </label>
 
 
             <div class="panel-col">
             <div class="panel-col">
-                <select name="type" id="type" tabindex="-1" title="" class="form-control height40">
+                <select name="type" id="type" value="[[type]]" tabindex="-1" title="" class="form-control height40">
                     <option value="-1">类型</option>
                     <option value="-1">类型</option>
                     <option value="1">品牌款型</option>
                     <option value="1">品牌款型</option>
                     <option value="2">品牌系列</option>
                     <option value="2">品牌系列</option>
@@ -123,7 +123,7 @@
             </label>
             </label>
 
 
             <div class="col-md-6">
             <div class="col-md-6">
-                <input id="seriesName" value="{seriesName}" class="form-control width300" type="text" placeholder="款型系列名称">
+                <input id="seriesName" value="[[seriesName]]" class="form-control width300" type="text" placeholder="款型系列名称">
             </div>
             </div>
         </div>
         </div>
 
 
@@ -131,7 +131,7 @@
         <div class="form-group">
         <div class="form-group">
             <label for="bannarImg" class="col-sm-3 control-label">banner图片:</label>
             <label for="bannarImg" class="col-sm-3 control-label">banner图片:</label>
             <div class="col-sm-6" id="colorUrlBox">
             <div class="col-sm-6" id="colorUrlBox">
-                <input type="file" id="bannarImg" name="bannarImg">
+                <input type="file" id="bannarImg" name="bannarImg" value="[[bannarImg]]">
             </div>
             </div>
         </div>
         </div>
 
 
@@ -142,10 +142,12 @@
             </label>
             </label>
 
 
             <div class="col-md-6">
             <div class="col-md-6">
-                <input id="orderBy" value="{orderBy}" class="form-control width300" type="text" placeholder="排序">
+                <input id="orderBy" value="[[orderBy]]" class="form-control width300" type="text" placeholder="排序">
             </div>
             </div>
         </div>
         </div>
 
 
+        <input id="id" hidden="ture" value="[[id]]" />
+
 
 
 
 
     </form>
     </form>