Merge branch 'hotfix/shopbetter2' into grey

# Conflicts: # code/static/js.jquery/module/goods/netsale/Index.js

Merge branch 'hotfix/shopbetter2' into grey
# Conflicts: # code/static/js.jquery/module/goods/netsale/Index.js
xuhongyun
Commit 4dc55df4e90ea3dc43ba2ad91727b5dfb2721db2 2 parents d8506519 4317b612
Showing 8 changed files with 51 additions and 27 deletions
code/apps/goods/views/basegoods/Edit.html
code/apps/goods/views/netsale/Edit.html
code/apps/goods/views/netsale/__partail/basic_info.html
code/apps/goods/views/netsale/__partail/goods_description.html
code/apps/goods/views/productdesc/Index.html
code/static/js.jquery/common/umeditor.js
code/static/js.jquery/module/goods/basegoods/Index.js
code/static/js.jquery/module/goods/netsale/Index.js
--- a/code/apps/goods/views/basegoods/Edit.html
View file @4dc55df
+++ b/code/apps/goods/views/basegoods/Edit.html
View file @4dc55df
@@ -99,14 +99,14 @@
                 </select>
             </div>
-            <label class="col-sm-1 control-label">管理店铺 <span class="red">*</span></label>
+            <label class="col-sm-2 control-label">管理店铺 <span class="red">*</span></label>
             <div class="col-sm-2">
                 <select id="shopId" class="form-control" required placeholder="管理店铺">
                     <option value="[[shopId||'-1']]">[[shopName||'店铺']]</option>
                 </select>
             </div>
-            <label class="col-sm-1 control-label">JIT供应商</label>
+            <label class="col-sm-2 control-label">JIT供应商</label>
             <div class="col-sm-2">
                 <select id="supplierId" class="form-control">
                     <option value="[[supplierId||'-1']]">[[supplierName||'供应商']]</option>
@@ -117,7 +117,7 @@
         </div>
         <div class="form-group">
             <label class="col-sm-2 control-label">分类 <span class="red">*</span></label>
-            <div class="col-sm-5">
+            <div class="col-sm-4">
                 <div id="tree" style="width: 100%"></div>
             </div>
             <span class="showPlatform" style="display: none">
@@ -127,16 +127,16 @@
                     <input type="hidden" id="appType" name="appType" value="[[appType||'0']]" for="checkbox"   />
                 </div>
             </span>
+            <label class="col-sm-1 control-label">厂家编号 <span class="red">*</span></label>
+            <div class="col-sm-2">
+                <input type="text" id="factoryCode" placeholder="厂家编号" value="[[factoryCode]]" class="form-control" required/>
+            </div>
         </div>
         <div class="form-group">
             <label class="col-sm-2 control-label">商品名称 <span class="red">*</span></label>
-            <div class="col-sm-3">
+            <div class="col-sm-10">
                 <input type="text" id="productName" class="form-control" value="[[productName]]" placeholder="品牌英文名+性别+最小类目" required/>
             </div>
-            <label class="col-sm-1 control-label">厂家编号 <span class="red">*</span></label>
-            <div class="col-sm-1">
-                <input type="text" id="factoryCode" placeholder="厂家编号" value="[[factoryCode]]" class="form-control" required/>
-            </div>
         </div>
         <div class="form-group">
             <label class="col-sm-2 control-label">货品年 <span class="red">*</span></label>
@@ -169,7 +169,7 @@
         </div>
         <div class="form-group">
             <label class="col-sm-2 control-label">商品话题</label>
-            <div class="col-sm-5">
+            <div class="col-sm-10">
                 <input type="text" id="productTag" class="form-control" value="[[productTag]]" />
             </div>
         </div>
--- a/code/apps/goods/views/netsale/Edit.html
View file @4dc55df
+++ b/code/apps/goods/views/netsale/Edit.html
View file @4dc55df
@@ -18,8 +18,8 @@
             	<%include './__partail/fenmian'%>
             	<%include './__partail/goods_description'%>
+                <%include './__partail/goods_params'%>
             	<%include './__partail/size_info'%>
-            	<%include './__partail/goods_params'%>
             	<%include './__partail/goods_sort'%>
             </div>
--- a/code/apps/goods/views/netsale/__partail/basic_info.html
View file @4dc55df
+++ b/code/apps/goods/views/netsale/__partail/basic_info.html
View file @4dc55df
@@ -46,15 +46,15 @@
         <div class="col-sm-3">商品类型：[[attribute]]</div>
     </div>
     <div class="form-group">
-        
-        <div class="col-sm-12">
-            <label>商品名称<i class="red">*</i>：</label>
+            <label class="col-sm-1">商品名称<i class="red">*</i>：</label>
+            <div class="col-sm-11">
             [[if renderType=='edit']]
-            <input id="productName" style="width: 280px;display:inline-block;" class="form-control" placeholder="基础商品名称" type="text" value="[[productName]]" required maxlength="100">
+            <input id="productName" class="form-control" placeholder="基础商品名称" type="text" value="[[productName]]" required maxlength="100">
             [[else]]
             <span>[[productName]]</span>
             [[/if]]
-        </div>
+            </div>
+
         [[if renderType=='edit']]
         <div class="col-sm-12" style="color: red;padding: 0 0 0 85px;">建议名称：【品牌英文+性别+图案纹理+版型+风格+三级类目+商家款号+（款型）】，如此可增加商品在搜索页的展示。</div>
         [[/if]]
@@ -94,11 +94,11 @@
     <div class="form-group">
      <label class="col-sm-1 control-label">商品短评：</label>
      [[if renderType=='edit']]
-        <div class="col-sm-9">
-            <input id="phrase" style="display:inline-block;width: 280px;" class="form-control" placeholder="商品短评" type="text" value="[[phrase]]">
+        <div class="col-sm-11">
+            <input id="phrase" class="form-control" placeholder="商品短评" type="text" value="[[phrase]]">
         </div>
     [[else]]
-        <div class="col-sm-9">
+        <div class="col-sm-11">
             [[phrase]]
         </div>
     [[/if]]
--- a/code/apps/goods/views/netsale/__partail/goods_description.html
View file @4dc55df
+++ b/code/apps/goods/views/netsale/__partail/goods_description.html
View file @4dc55df
@@ -8,7 +8,7 @@
             <h2 class="panel-title">商品描述</h2>
         </div>
         <div id="descriptionerWrap" class="panel-body nopadding">
-            <script id="edit-descriptioner" type="text/plain" style="width:100%;height:500px;"></script>
+            <script id="edit-descriptioner" type="text/plain" style="width:100%;"></script>
             <input id="productDesc" type="hidden" required placeholder="商品描述">
         </div>
         <div class="panel-footer">
--- a/code/apps/goods/views/productdesc/Index.html
View file @4dc55df
+++ b/code/apps/goods/views/productdesc/Index.html
View file @4dc55df
@@ -43,7 +43,7 @@
             <h2 class="panel-title">商品描述</h2>
         </div>
         <div id="descriptionerWrap" class="panel-body nopadding">
-            <script id="edit-descriptioner" type="text/plain" style="width:100%;height:500px;"></script>
+            <script id="edit-descriptioner" type="text/plain" style="width:100%;"></script>
             <input id="productDesc" type="hidden" required placeholder="商品描述">
         </div>
         <div class="panel-footer">
--- a/code/static/js.jquery/common/umeditor.js
View file @4dc55df
+++ b/code/static/js.jquery/common/umeditor.js
View file @4dc55df
@@ -3714,7 +3714,7 @@ var jQuery = require('jquery');
                 themePath: me.options.UMEDITOR_HOME_URL + 'themes/',
                 allHtmlEnabled: false,
                 autoSyncData: true,
-                autoHeightEnabled: true,
+                autoHeightEnabled: false,
                 excludePlugins: ''
             });
             me.plugins = {};
--- a/code/static/js.jquery/module/goods/basegoods/Index.js
View file @4dc55df
+++ b/code/static/js.jquery/module/goods/basegoods/Index.js
View file @4dc55df
@@ -322,7 +322,26 @@ var g = new common.grid({
                 return html.join('');
             }
         },
-
+        {
+            display: "是否BLK",
+            render: function(item) {
+                if (item.appType === 0) {
+                    return "<p>有货</p>";
+                } else if (item.appType === 1) {
+                    return "<p>BLK</p>";
+                }
+            }
+        },
+        {
+            display: "是否JIT",
+            render: function(item) {
+                if (item.isJit == "Y") {
+                    return "<p>是</p>";
+                } else if (item.isJit == "N") {
+                    return "<p>否</p>";
+                }
+            }
+        },
         {
             display: "奥莱",
             render: function(item) {
--- a/code/static/js.jquery/module/goods/netsale/Index.js
View file @4dc55df
+++ b/code/static/js.jquery/module/goods/netsale/Index.js
View file @4dc55df
@@ -37,6 +37,7 @@ var ENUM = {
         '2': 0,
         '3': 0,
         '4': 0,
+        '5': 0,
         'all': 0
     },
     isVIP: {
@@ -69,7 +70,7 @@ var editPostion = '', isInfoMiss, sortFlag;
 var t = new common.tab2({
     el: "#basicTab",
-    active: 4,
+    active: 5,
     click: function () {
         var columnname = t.options.columns[t.options.active].name;
         g.options.columns[11].hidden = true;
@@ -82,7 +83,7 @@ var t = new common.tab2({
             g.options.columns[8].hidden = false;
         }
-        if (columnname == 1 || columnname == 2 || columnname == 3) {
+        if (columnname == 1 || columnname == 2 || columnname == 3 || columnname == 4) {
             sortFlag = 2;
         } else {
             sortFlag = 1;
@@ -96,8 +97,8 @@ var t = new common.tab2({
     },
     columns: [{
         name: "0",
-        value: '8',
-        display: "上架前({1})"
+        value: '8,3,2',
+        display: "新品待上架({1})"
     }, {
         name: "1",
         value: '1',
@@ -110,7 +111,11 @@ var t = new common.tab2({
         name: "3",
         value: '1',
         display: "上架后信息缺失({4})"
-    }, {
+    },  {
+        name: "4",
+        value: '0',
+        display: "已下架({5})"
+    },{
         name: "all",
         value: 'all',
         display: "全部商品({all})"