Merge branch 'gray' of http://git.yoho.cn/fe/yohobuy-shop-fe2 into gray

xuhongyun
Commit 96c5e48a174e9c591216e9d7b9b15d04a119883a 2 parents d15ec2b1 bbe6a04c
Showing 9 changed files with 64 additions and 90 deletions
code/apps/goods/views/basegoods/Edit.html
code/apps/goods/views/basegoods/Info.html
code/apps/goods/views/netsale/Index.html
code/apps/goods/views/netsale/partials/add-info.html
code/apps/goods/views/netsale/partials/basic-info.html
code/libs/App.js
code/static/js.jquery/module/goods/basegoods.Edit.js
code/static/js.jquery/module/goods/basegoods.Index.js
code/static/js.jquery/module/goods/partials/basic-info.js
--- a/code/apps/goods/views/basegoods/Edit.html
View file @96c5e48
+++ b/code/apps/goods/views/basegoods/Edit.html
View file @96c5e48
@@ -66,7 +66,7 @@
         <div class="col-sm-2">
             <input class="form-control btn-sort-tiaoma" value="[[item.factoryCode]]" placeholder="条码" data-index=[[index]] data-eq=[[__index]]></input>
         </div>
-        <div class="col-sm-2">
+        <!-- <div class="col-sm-2">
             <select class="form-control btn-sort-kebu" value="[[item.isSuppled||'Y']]" data-index=[[index]] data-eq=[[__index]]>
                 <option value="N">不可补货</option>
                 <option value="Y">可补货</option>
@@ -74,7 +74,7 @@
         </div>
         <div class="col-sm-2">
             <input class="form-control btn-sort-upmCode" value="[[item.upmCode]]" placeholder="UPM条码" data-index=[[index]] data-eq=[[__index]]></input>
-        </div>
+        </div> -->
         <div class="col-sm-2">
             [[if __index==goodsSizeList.length-1]]
             <button type="button" class="btn btn-info btn-xs btn-sort-add" data-index=[[index]]>+</button>
@@ -145,14 +145,14 @@
                     <option value="6">秋冬</option>
                 </select>
             </div>
-            <!-- <label class="col-sm-1 control-label">商品属性<span class="red">*</span></label>
+            <label class="col-sm-1 control-label">商品属性<span class="red">*</span></label>
             <div class="col-sm-2">
                 <select id="attribute" class="form-control" value="[[attribute]]">
                     <option value="1">普通商品</option>
-                    <option value="2">赠品</option>
-                    <option value="3">虚拟商品</option>
+                    <!-- <option value="2">赠品</option>
+                    <option value="3">虚拟商品</option> -->
                 </select>
-            </div> -->
+            </div>
         </div>
         <!-- <div class="form-group">
             <label class="col-sm-2 control-label">商品话题</label>
--- a/code/apps/goods/views/basegoods/Info.html
View file @96c5e48
+++ b/code/apps/goods/views/basegoods/Info.html
View file @96c5e48
@@ -45,10 +45,10 @@
                         <div class="col-sm-3">货品年/季：[[goodsYears]] / [[goodsSeason]]</div>
                         <div class="col-sm-3">厂家编号：[[factoryCode]]</div>
                     </div>
-                    <div class="form-group">
+                    <!-- <div class="form-group">
                         <div class="col-sm-2">SKN：[[productSkn]]</div>
                         <div class="col-sm-2">商品话题：[[productTag]]</div>
-                    </div>
+                    </div> -->
                     <div class="form-group">
                         <div class="col-sm-2">商品名称：[[productName]]</div>
--- a/code/apps/goods/views/netsale/Index.html
View file @96c5e48
+++ b/code/apps/goods/views/netsale/Index.html
View file @96c5e48
@@ -126,7 +126,7 @@
                 </div>
                 <div class="panel-col2">
                     <a id="export-btn" href="javascript:;" class="btn btn-info">导出</a>
-                    <a id="import-btn" href="/goods/netsale/batch" class="btn btn-info">批量（排序、款型系列、下架）</a>
+                    <a id="import-btn" href="/goods/netsale/batch" class="btn btn-info">批量（下架）</a>
                 </div>
             </div>
@@ -183,8 +183,8 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <a class="btn btn-info" data-type="2" href="javascript:;">上架上新</a>
-                    <a class="btn btn-info" data-type="1" href="javascript:;">上架不上新</a>
+                    <!-- <a class="btn btn-info" data-type="2" href="javascript:;">上架上新</a> -->
+                    <a class="btn btn-info" data-type="1" href="javascript:;">上架</a>
                 </div>
             </div>
         </div>
--- a/code/apps/goods/views/netsale/partials/add-info.html
View file @96c5e48
+++ b/code/apps/goods/views/netsale/partials/add-info.html
View file @96c5e48
@@ -40,7 +40,7 @@
         </div>
     [[/each]]
-    <div id="brandModelWrap" class="form-group">
+    <!-- <div id="brandModelWrap" class="form-group">
         <label>品牌款型：</label>
         <div style="display: inline-block;width: 280px;">
             <select name="brandModelSelect" id="brandModelSelect" tabindex="-1" title="" class="form-control" >
@@ -65,7 +65,7 @@
             </select>
         </div>
         <input type="hidden" id="brandSeries" value="[[brandSeries]]"> 
-    </div>
+    </div> -->
     <div class="form-group">
         <label>促销短语：</label>
--- a/code/apps/goods/views/netsale/partials/basic-info.html
View file @96c5e48
+++ b/code/apps/goods/views/netsale/partials/basic-info.html
View file @96c5e48
@@ -10,7 +10,7 @@
         <div id="basic-info"></div>
         <div id="goods-table">
             <div class="form-group">
-                <h5>能否补货</h5>
+               <!--  <h5>能否补货</h5> -->
                 <div id="suppled-table" class="dataTables_wrapper no-footer">
                 </div>
             </div>
@@ -135,7 +135,7 @@
 <script type="text/template" id="productExtBoTemp">
-    <div class="form-group">
+    <!-- <div class="form-group">
      <label class="col-sm-1 control-label">商品短评：</label>
      [[if renderType=='edit']]
         <div class="col-sm-11">
@@ -146,7 +146,7 @@
             [[phrase]]
         </div>
     [[/if]]
-    </div>
+    </div> -->
     <!-- <div class="form-group">
             <label class="col-sm-1 control-label">是否新品：</label>
             <div class="col-sm-4">
--- a/code/libs/App.js
View file @96c5e48
+++ b/code/libs/App.js
View file @96c5e48
@@ -82,7 +82,17 @@ module.exports = function (apiCofig) {
     /*内置中间件 对Http请求解析*/
     App.use(bodyParser.json());
     App.use(bodyParser.urlencoded({extended: true}));
-    App.use(cookieParser());
+    App.use(cookieParser(), function (req, res, next) {
+        // console.log("xxxxxxxxxxxxxxxx");
+        if (req.cookies) {
+            var phpsess = req.cookies["PHPSESSID"];
+            if (phpsess && phpsess != "") {
+                res.cookie("PHPSESSID", phpsess, { maxAge: 7200000, httpOnly: true, domain: ".yohobuy.com" });
+            }
+        }
+
+        next();
+    });
     App.use(multer());
     App.use("/" + apiCofig.static.name, express.static(apiCofig.static.value));
--- a/code/static/js.jquery/module/goods/basegoods.Edit.js
View file @96c5e48
+++ b/code/static/js.jquery/module/goods/basegoods.Edit.js
View file @96c5e48
@@ -164,7 +164,7 @@ var g=new common.grid({
 			}
 		},
 		{
-			display:"<label class='red'>厂家颜色、尺码、款型编码、销售价、条码必填，可补货将开启到货通知，不可补货将关闭到货通知</label>",render:function(item){
+			display:"<label class='red'>厂家颜色、尺码、款型编码、销售价、条码必填</label>",render:function(item){
 				if(!item.isAdd&&!g.__gsm.hasOwnProperty(item.__index)){
 					g.__gsm[item.__index]=item.goodsSizeList.length;
 				}
--- a/code/static/js.jquery/module/goods/basegoods.Index.js
View file @96c5e48
+++ b/code/static/js.jquery/module/goods/basegoods.Index.js
View file @96c5e48
@@ -113,36 +113,36 @@ var t = new common.tab2({
         var columnname=t.options.columns[t.options.active].name;
-        g.options.columns[6].hidden = true;  // 奥莱在商家端不展示
-        g.options.columns[9].hidden = true; //隐藏【创建时间】
-        g.options.columns[10].hidden = true; //隐藏【创建人】
-        g.options.columns[11].hidden = true; //隐藏【驳回时间】
-        g.options.columns[12].hidden = true; //隐藏【原因】
-        g.options.columns[13].hidden = true; //隐藏【通过时间】
-        g.options.columns[14].hidden = true; //隐藏【通过人】
-        g.options.columns[15].hidden = true; //隐藏【状态】
-        g.options.columns[16].hidden = true; //隐藏【操作信息】
+        //g.options.columns[6].hidden = true;  // 奥莱在商家端不展示
+        g.options.columns[8].hidden = true; //隐藏【创建时间】
+        g.options.columns[9].hidden = true; //隐藏【创建人】
+        g.options.columns[10].hidden = true; //隐藏【驳回时间】
+        g.options.columns[11].hidden = true; //隐藏【原因】
+        g.options.columns[12].hidden = true; //隐藏【通过时间】
+        g.options.columns[13].hidden = true; //隐藏【通过人】
+        g.options.columns[14].hidden = true; //隐藏【状态】
+        g.options.columns[15].hidden = true; //隐藏【操作信息】
         if (columnname == "all") {
             /*g.options.columns[6].hidden = false;*/
-            g.options.columns[15].hidden = false; //显示【状态】
-            g.options.columns[16].hidden = false; //显示【操作信息】
+            g.options.columns[14].hidden = false; //显示【状态】
+            g.options.columns[15].hidden = false; //显示【操作信息】
             $("#daochu").hide();
         } else {
             switch (columnname) {
                 case 'toAuditNum':
                     { // 待审核
-                        g.options.columns[9].hidden = false; //显示【创建时间】
-                        g.options.columns[10].hidden = false; //显示【创建人】
+                        g.options.columns[8].hidden = false; //显示【创建时间】
+                        g.options.columns[9].hidden = false; //显示【创建人】
                     }
                     $("#daochu").hide();
                     break;
                 case 'failAuditNum':
                     { // 待审核
-                        g.options.columns[11].hidden = false; //显示【驳回时间】
-                        g.options.columns[12].hidden = false; //显示【原因】
+                        g.options.columns[10].hidden = false; //显示【驳回时间】
+                        g.options.columns[11].hidden = false; //显示【原因】
                     }
                     $("#daochu").hide();
                     break;
@@ -150,8 +150,8 @@ var t = new common.tab2({
                 case 'passAuditNum':
                     { // 待审核
                         /*g.options.columns[6].hidden = false;*/
-                        g.options.columns[13].hidden = false; //显示【通过时间】
-                        g.options.columns[14].hidden = false; //显示【通过人】
+                        g.options.columns[12].hidden = false; //显示【通过时间】
+                        g.options.columns[13].hidden = false; //显示【通过人】
                     }
                     $("#daochu").show();
                     break;
@@ -310,7 +310,7 @@ var g = new common.grid({
             }
         },
-        {
+        /*{
             display: "奥莱",
             render: function(item) {
                 if (item.isOutLets == "Y") {
@@ -321,7 +321,7 @@ var g = new common.grid({
                     return "<p>品牌设置</p>";
                 }
             }
-        },
+        },*/
         {
             display: "商品类别",
@@ -352,7 +352,7 @@ var g = new common.grid({
         },
-        // 9
+        // 8
         {
             display: "创建时间",
             hidden: true,
@@ -365,14 +365,14 @@ var g = new common.grid({
         },
-        // 10
+        // 9
         {
             display: "创建人",
             name: "founderName",
             hidden: true,
         },
-        // 11
+        // 10
         {
             display: "驳回时间",
             hidden: true,
@@ -383,7 +383,7 @@ var g = new common.grid({
             }
         },
-        // 12
+        // 11
         {
             display: "原因",
             hidden: true,
@@ -392,7 +392,7 @@ var g = new common.grid({
             }
         },
-        // 13
+        // 12
         {
             display: "通过时间",
             hidden: true,
@@ -403,7 +403,7 @@ var g = new common.grid({
             }
         },
-        // 14
+        // 13
         {
             display: "通过人",
             hidden: true,
@@ -413,7 +413,7 @@ var g = new common.grid({
             }
         },
-        // 15
+        // 14
         {
             display: "状态",
             render: function(item) {
@@ -423,7 +423,7 @@ var g = new common.grid({
             }
         },
-        // 16
+        // 15
         {
             display: "操作信息",
             render: function(item) {
--- a/code/static/js.jquery/module/goods/partials/basic-info.js
View file @96c5e48
+++ b/code/static/js.jquery/module/goods/partials/basic-info.js
View file @96c5e48
@@ -115,42 +115,32 @@ $(document).ready(function(){
 });
 function initInfo(basicInfo) {
-	$("#ageLevel").val(basicInfo.ageLevel);
 	$("#seasons").val(basicInfo.seasons);
-	$("#gender").val(basicInfo.gender);
-	$("#grade").val(basicInfo.grade);
+	$("#grade").val(basicInfo.grade||'0');
 	$("#isLimited").val(basicInfo.isLimited);
 	$("#isOutlets").val(basicInfo.isOutLets);
-	var ageLevel=basicInfo.ageLevel;
-	$(":checkbox[name=ageLevel]").each(function(){
-		if(ageLevel.indexOf($(this).val())>-1){
-			$(this).prop("checked",true)
-		}
-	});
-
 	$(":checkbox[name=seasons]").each(function(){
-		if(basicInfo.seasons.indexOf($(this).val())>-1){
-			$(this).prop("checked",true)
-		}
-	});
-	$(":radio[name=gender]").each(function(){
-		if(basicInfo.gender.indexOf($(this).val())>-1){
+		if(basicInfo.seasons!=null&&basicInfo.seasons!=undefined&&basicInfo.seasons!=''&&
+			basicInfo.seasons.indexOf($(this).val())>-1){
 			$(this).prop("checked",true)
 		}
 	});
 	$(":radio[name=grade]").each(function(){
-		if(basicInfo.grade.indexOf($(this).val())>-1){
+		if(basicInfo.grade!=null&&basicInfo.grade!=undefined&&basicInfo.grade!=''&&
+			basicInfo.grade.indexOf($(this).val())>-1){
 			$(this).prop("checked",true)
 		}
 	});
 	$(":radio[name=isLimited]").each(function(){
-		if(basicInfo.isLimited.indexOf($(this).val())>-1){
+		if(basicInfo.isLimited!=null&&basicInfo.isLimited!=undefined&&basicInfo.isLimited!=''&&
+			basicInfo.isLimited.indexOf($(this).val())>-1){
 			$(this).prop("checked",true)
 		}
 	});
 	$(":radio[name=isOutLets]").each(function(){
-		if(basicInfo.isOutLets.indexOf($(this).val())>-1){
+		if(basicInfo.isOutLets!=null&&basicInfo.isOutLets!=undefined&&basicInfo.isOutLets!=''&&
+			basicInfo.isOutLets.indexOf($(this).val())>-1){
 			$(this).prop("checked",true)
 		}
 	});
@@ -177,11 +167,6 @@ var suppledTable = new common.grid({
 		render: function(item) {
 			return item.factoryCode;
 		}
-	}, {
-		display: '能否补货',
-		render: function(item) {
-			return ENUM.isSuppled[item.isSuppled];
-		}
 	}]
 });
 suppledTable.init(NETSALEDATA.goodsList, 'goodsSizeList')
@@ -218,22 +203,6 @@ common.util.__ajax({
 }, true);
 $('#product-ext').html(common.util.__template2($('#productExtBoTemp').html(), productExtBo));
-$(document).on("change", ":checkbox[name=ageLevel]", function () {
-	var value = $(this).val();
-	var c = $(":checkbox[name=ageLevel]");
-	if ($(this).is(":checked")) {
-		if (value == 1) {
-			c.slice(1, 5).prop("checked", false);
-		} else {
-			c.eq(0).prop("checked", false);
-		}
-	}
-	var arr = [];
-	$(":checked[name=ageLevel]").each(function () {
-		arr.push($(this).val())
-	});
-	$("#ageLevel").val(arr.join('|'));
-});
 $(document).on("change",":checkbox[name=seasons]",function(){
 	var value=$(this).val();
@@ -252,9 +221,6 @@ $(document).on("change",":checkbox[name=seasons]",function(){
 	$("#seasons").val(arr.join(','));
 });
-$(document).on("change",":radio[name=gender]",function(){
-	$("#gender").val($(this).val());
-});
 $(document).on("change",":radio[name=isOutLets]",function(){
 	$("#isOutlets").val($(this).val());
 });
@@ -299,8 +265,6 @@ GOLABDATA.on("LYbasicInfo", function () {
 		data.productSkn = $('#productSkn').val();
 		data.sellChannels = data.sellChannels.split('|').join(',');
 		data.shopIds = data.shopIds ? data.shopIds.split('|').join(',') : '';
-		data.ageLevel = common.util.__input('ageLevel');
-		data.gender = common.util.__input('gender');
 		data.grade = common.util.__input('grade')||'0';
 		data.isLimited = common.util.__input('isLimited')||'N';
 		data.isOutlets =$('#isOutlets').val()||'N';