拍摄复尺 完善路由与接口

@@ -5,7 +5,7 @@ module.exports = function (app) {
 
     /*************************************拍摄模特*************************************/
     //列表页
-    app.get("/shootMeter/model", "shootMeter.Model.Index",function(){
+    app.get("/shotManage/model/index", "shootMeter.Model.Index",function(){
         this.$extend={
             moduleName:'拍摄复尺',
             pageName:'拍摄模特管理',
@@ -15,20 +15,20 @@ module.exports = function (app) {
     });
 
     //获取所有拍摄模特的信息
-    app.post("/shootMeter/queryModelList", "shootMeter_queryModelList");
+    app.post("/shotManage/model/getAllModels", "shootMeter_queryModelList");
 
     //添加模特信息
-    app.post("/shootMeter/addModel", "shootMeter_addModel");
+    app.post("/shotManage/model/addModel", "shootMeter_addModel");
 
     //编辑模特信息
-    app.post("/shootMeter/updateModel", "shootMeter_updateModel");
+    app.post("/shotManage/model/updateModel", "shootMeter_updateModel");
 
     //删除模特信息
-    app.post("/shootMeter/delModel", "shootMeter_delModel");
+    app.post("/shotManage/model/delModel", "shootMeter_delModel");
 
     /*************************************试穿模特*************************************/
     //列表页
-    app.get("/shootMeter/tryModel", "shootMeter.TryModel.Index",function(){
+    app.get("/meterManage/tryModel/index", "shootMeter.TryModel.Index",function(){
         this.$extend={
             moduleName:'拍摄复尺',
             pageName:'试穿模特管理',
@@ -37,21 +37,21 @@ module.exports = function (app) {
         }
     });
 
-    //获取所有拍摄模特的信息
-    app.post("/shootMeter/queryModelList", "shootMeter_queryModelList");
+    //获取所有试穿模特的信息
+    app.post("/meterManage/tryModel/index1", "shootMeter_queryModelList");
 
     //添加模特信息
-    app.post("/shootMeter/addModel", "shootMeter_addModel");
+    app.post("/meterManage/tryModel/addModel", "shootMeter_addModel");
 
     //编辑模特信息
-    app.post("/shootMeter/updateModel", "shootMeter_updateModel");
+    app.post("/meterManage/tryModel/updateModel", "shootMeter_updateModel");
 
     //删除模特信息
-    app.post("/shootMeter/delModel", "shootMeter_delModel");
+    app.post("/meterManage/tryModel/delModel", "shootMeter_delModel");
 
     /*************************************尺码测量管理*************************************/
     //列表页
-    app.get("/shootMeter/meterSize", "shootMeter.MeterSize.Index",function(){
+    app.get("/meterManage/meterSize/index", "shootMeter.MeterSize.Index",function(){
         this.$extend={
             moduleName:'拍摄复尺',
             pageName:'尺码测量管理'
@@ -59,10 +59,10 @@ module.exports = function (app) {
     });
     
     //获取所有尺码测量数据
-    app.post("/shootMeter/queryProdSizeList", "shootMeter_queryProdSizeList");
+    app.post("/meterManage/productSize/queryProdSizeList", "shootMeter_queryProdSizeList");
     
     //添加尺码测量数据界面
-    app.get("/shootMeter/addSizeInfo", "shootMeter.MeterSize.Add",function(){
+    app.get("/meterManage/meterSize/add", "shootMeter.MeterSize.Add",function(){
         this.$extend={
             moduleName:'拍摄复尺',
             pageName:'添加尺码信息'
@@ -70,14 +70,14 @@ module.exports = function (app) {
     });
 
     //添加尺码测量数据
-    app.post("/shootMeter/saveProdSizeInfo", "shootMeter_saveProdSizeInfo");
+    app.post("/meterManage/productSize/saveProdSizeInfo", "shootMeter_saveProdSizeInfo");
 
     //编辑品牌选项
-    app.post("/shootMeter/getSelectItems", "shootMeter_getSelectItems");
+    app.post("/meterManage/brand/getSelectItems", "shootMeter_getSelectItems");
 
     /*************************************试穿信息管理*************************************/
     //列表页
-    app.get("/shootMeter/tryInfo", "shootMeter.TryInfo.Index",function(){
+    app.get("/meterManage/tryInfo/index", "shootMeter.TryInfo.Index",function(){
         this.$extend={
             moduleName:'拍摄复尺',
             pageName:'试穿信息管理'
@@ -85,7 +85,7 @@ module.exports = function (app) {
     });
 
     //上传文件
-    app.get("/shootMeter/batch", "shootMeter.TryInfo.Batch",function(){
+    app.get("/meterManage/tryInfo/batch", "shootMeter.TryInfo.Batch",function(){
         this.$extend={
             moduleName:'拍摄复尺',
             pageName:'上传文件'
@@ -93,17 +93,17 @@ module.exports = function (app) {
     });
 
     //获取所有试穿信息
-    app.post("/shootMeter/queryProdExtraList", "shootMeter_queryProdExtraList");
+    app.post("/meterManage/tryInfo/index2", "shootMeter_queryProdExtraList");
 
     //获取单个skn对应的试穿信息
-    app.post("/shootMeter/queryProdExtraInfo", "shootMeter_queryProdExtraInfo");
+    app.post("/meterManage/tryInfo/info1", "shootMeter_queryProdExtraInfo");
 
     //添加试穿信息
-    app.post("/shootMeter/saveProdExtraInfo", "shootMeter_saveProdExtraInfo");
+    app.post("/meterManage/tryInfo/add", "shootMeter_saveProdExtraInfo");
 
     /*************************************拍摄要求管理*************************************/
     //列表页
-    app.get("/shootMeter/shootRequire", "shootMeter.ShootRequire.Index",function(){
+    app.get("/shotManage/shotRequire/index", "shootMeter.ShootRequire.Index",function(){
         this.$extend={
             moduleName:'拍摄复尺',
             pageName:'拍摄要求管理'
@@ -111,14 +111,17 @@ module.exports = function (app) {
     });
 
     //获取所有拍摄要求信息
-    app.post("/shootMeter/queryShootRequireList", "shootMeter_queryShootRequireList");
+    app.post("/shotManage/shotRequire/index1", "shootMeter_queryShootRequireList");
+
+    //保存拍摄要求
+    app.post("/shotManage/shotRequire/add", "shootMeter_saveShootRequire");
 
-    //保存,修改,删除拍摄要求
-    app.post("/shootMeter/saveShootRequire", "shootMeter_saveShootRequire");
+    //修改、删除拍摄要求
+    app.post("/shotManage/shotRequire/update", "shootMeter_saveShootRequire");
 
     /*************************************产品图片管理*************************************/
     //列表页
-    app.get("/shootMeter/proPhoto", "shootMeter.ProPhoto.Index",function(){
+    app.get("/shotManage/proPhoto/index", "shootMeter.ProPhoto.Index",function(){
         this.$extend={
             moduleName:'拍摄复尺',
             pageName:'产品图片管理'
@@ -126,9 +129,9 @@ module.exports = function (app) {
     });
 
     //产品图片数据列表
-    app.post("/shootMeter/queryProductPhotoList", "shootMeter_queryProductPhotoList");
+    app.post("/shotManage/proPhoto/index2", "shootMeter_queryProductPhotoList");
 
     //添加产品图片
-    app.post("/shootMeter/addProductBatchPhoto", "shootMeter_addProductBatchPhoto");
+    app.post("/shotManage/proPhoto/add", "shootMeter_addProductBatchPhoto");
 
 };
\ No newline at end of file

@@ -9,7 +9,6 @@ module.exports = {
         /*************************************模特管理*************************************/
         queryModelList: {
             title: "获取所有模特数据",
-            domain: "{domain}",
             url: "/model/queryModelList",
             params: {
                 englishName: {type: String},
@@ -23,7 +22,6 @@ module.exports = {
 
         addModel: {
             title: "新增模特",
-            domain: "{domain}",
             url: "/model/addModel",
             params: {
                 englishName: {type: String},
@@ -43,7 +41,6 @@ module.exports = {
 
         updateModel: {
             title: "编辑模特",
-            domain: "{domain}",
             url: "/model/updateModel",
             params: {
                 id: {type: Number},
@@ -64,7 +61,6 @@ module.exports = {
 
         delModel: {
             title: "删除模特",
-            domain: "{domain}",
             url: "/model/delModel",
             params: {
                 id: {type: Number}
@@ -75,7 +71,6 @@ module.exports = {
 
         queryProdSizeList: {
             title: "获取所有尺码测量数据",
-            domain: "{domain}",
             url: "/productSize/queryProdSizeList",
             params: {
                 page: {type: Number},
@@ -91,7 +86,6 @@ module.exports = {
 
         saveProdSizeInfo: {
             title: "保存尺码测量数据",
-            domain: "{domain}",
             url: "/productSize/saveProdSizeInfo",
             params: {
                 productSkn: {type: Number},
@@ -103,7 +97,6 @@ module.exports = {
 
         getSelectItems: {
             title: "获取品牌选项",
-            domain: "{domain}",
             url: "/brand/getSelectItems",
             params: {}
         },
@@ -112,7 +105,6 @@ module.exports = {
 
         queryProdExtraList: {
             title: "获取所有试穿数据",
-            domain: "{domain}",
             url: "/productExtraInfo/queryProdExtraList",
             params: {
                 page: {type: Number},
@@ -125,7 +117,6 @@ module.exports = {
 
         queryProdExtraInfo: {
             title: "获取单个skn对应的试穿信息",
-            domain: "{domain}",
             url: "/productExtraInfo/queryProdExtraInfo",
             params: {
                 productSkn: {type: Number}
@@ -134,7 +125,6 @@ module.exports = {
 
         saveProdExtraInfo: {
             title: "添加试穿信息",
-            domain: "{domain}",
             url: "/productExtraInfo/saveProdExtraInfo",
             params: {
                 productSkn: {type: Number},
@@ -146,7 +136,6 @@ module.exports = {
 
         queryShootRequireList: {
             title: "获取所有拍摄要求数据",
-            domain: "{domain}",
             url: "/shootRequire/queryShootRequireList",
             params: {
                 page: {type: Number},
@@ -158,7 +147,6 @@ module.exports = {
 
         saveShootRequire: {
             title: "保存,修改,删除拍摄要求",
-            domain: "{domain}",
             url: "/shootRequire/saveShootRequire",
             params: {
                 id: {type: Number},
@@ -170,7 +158,6 @@ module.exports = {
         /************************************产品图片管理*************************************/
         queryProductPhotoList: {
             title: "产品图片数据列表",
-            domain: "{domain}",
             url: "/productPhoto/queryProductPhotoList",
             params: {
                 page: {type: Number},
@@ -184,7 +171,6 @@ module.exports = {
         },
         addProductBatchPhoto: {
             title: "添加产品图片",
-            domain: "{domain}",
             url: "/productPhoto/addProductBatchPhoto",
             params: {
                 productSkn: {type: Number},

@@ -78,7 +78,9 @@ var apiCofig = {
 
 console.log("环境:"+process.env.NODE_ENV);
 
-if(process.env.NODE_ENV!=='development'){
+if(process.env.NODE_ENV=='development'||process.env.NODE_ENV=='coding'){
+	apiCofig.log.src=path.join(__dirname,"..","logs")
+}else{
 	apiCofig.log.src="/Data/logsnode/yohobuy-portal-log/"
 }
 

@@ -243,7 +243,7 @@ grid.prototype = {
                 g.tbody.html("<tr><td colspan=100><center>正在加载中...</center></td></tr>");
             },
             success: function(res) {
-                var data = res.data.data;
+                var data = res.data;
                 p.callback && (data = p.callback(res.data)); //data.data,data.data1
 
                 g.__pagination({

@@ -2,17 +2,16 @@
  * Created by ty on 2016/3/24.
  */
 var $ = require('jquery');
-var common = require('../common/common');
-var util = require('../common/util');
+var common = require('../../../common/common');
 
 var hasClickEvent = false;//判断保存按钮是否有点击事件;
 //定义全局数据变量
-var dataList={};
+var dataList = {};
 //点击搜索按钮
 $(document).on('click', '#searchSku', function () {
     var val = $.trim($("#skuInput").val());
     if (!val.match(/^[0-9]+$/)) {
-        util.__tip("输入不合法", "warning");
+        common.util.__tip("输入不合法", "warning");
         return;
     }
     if (val) {
@@ -41,7 +40,7 @@ $(document).on('click', '#searchSku', function () {
                     });
                     for (var i = 0; i < dataList.sizeRelationsList[0].prdSizeAttributeBoList.length; i++) {//尺码列
                         var sizeAttributes = dataList.sizeRelationsList[0].prdSizeAttributeBoList[i];//参考尺码数组里的数据
-                        var chkbox = '<label style="cursor: pointer;"><input type="checkbox" name="noMeasureIds" data-index="'+i+'" value="' + sizeAttributes.sizeAttributeId + '"/>无需测量</label>';
+                        var chkbox = '<label style="cursor: pointer;"><input type="checkbox" name="noMeasureIds" data-index="' + i + '" value="' + sizeAttributes.sizeAttributeId + '"/>无需测量</label>';
                         headList.push({
                             display: sizeAttributes.sizeAttributeName + "<br>" + chkbox,
                             name: "sizeValue",
@@ -68,34 +67,6 @@ $(document).on('click', '#searchSku', function () {
                 if (!hasClickEvent) {
                     hasClickEvent = true;
                     $(document).on('click', '#add-saveBtn', function () {
-                        //var flag = false;
-                        //$("input[name='noMeasureIds']").not("input:checked").each(function () {
-                        //    $("." + $(this).val()).each(function () {
-                        //        if (!$(this).val()) {
-                        //            flag = true;
-                        //            return false;
-                        //        }
-                        //    });
-                        //    if (flag) return false;
-                        //});
-                        //if (flag) {
-                        //    util.__tip("请将没有勾选无需测量的列填写完整！", "warning");
-                        //    return false;
-                        //}
-                        //var flag = false;
-                        //$("input[name='noMeasureIds']").not("input:checked").each(function () {
-                        //    $("." + $(this).val()).each(function () {
-                        //        if (!$(this).val()) {
-                        //            flag = true;
-                        //            return false;
-                        //        }
-                        //    });
-                        //    if (flag) return false;
-                        //});
-                        //if (flag) {
-                        //    util.__tip("请将没有勾选无需测量的列填写完整！", "warning");
-                        //    return false;
-                        //}
                         var noMeasureIds = JSON.stringify($("#noMeasureIds").val() ? $("#noMeasureIds").val().split("|") : []);//无需测量的列
                         //尺码信息列表
                         var sizeInfoList = [];
@@ -131,7 +102,7 @@ $(document).on('click', '#searchSku', function () {
                             url: "/meterManage/productSize/saveProdSizeInfo",
                             data: data
                         }, function (res) {
-                            if(res.code=='200'){
+                            if (res.code == '200') {
                             }
 
                         });
@@ -139,7 +110,7 @@ $(document).on('click', '#searchSku', function () {
                     });
                 }
             } else {
-                util.__tip("未搜索到sku:" + val);
+                common.util.__tip("未搜索到sku:" + val);
             }
         }, true);
     }

@@ -3,9 +3,8 @@
  * 测量尺码管理
  */
 
-var $ = require('jquery'),
-    common = require('../common/common'),
-    util = require('../common/util');
+var $ = require('jquery');
+var common = require('../../../common/common');
 
 new common.edit("#filter").init();
 
@@ -118,20 +117,6 @@ var Bll = {
                 value: "提交",
                 css: 'btn-info',
                 callback: function () {
-                    //var flag = false;
-                    //$("input[name='noMeasureIds']").not("input:checked").each(function () {
-                    //    $("." + $(this).val()).each(function () {
-                    //        if (!$(this).val()) {
-                    //            flag = true;
-                    //            return false;
-                    //        }
-                    //    });
-                    //    if (flag) return false;
-                    //});
-                    //if (flag) {
-                    //    util.__tip("请将没有勾选无需测量的列填写完整！", "warning");
-                    //    return false;
-                    //}
                     var noMeasureIds = JSON.stringify($("#noMeasureIds").val() ? $("#noMeasureIds").val().split("|") : []);//无需测量的列
                     //尺码信息列表
                     var sizeInfoList = [];
@@ -172,7 +157,7 @@ var Bll = {
                             dialog.close();
                         }
                         else {
-                            util.__tip(res.data.message, "warning");
+                            common.util.__tip(res.data.message, "warning");
                         }
 
                     });
@@ -206,7 +191,6 @@ var Bll = {
                         var prdList = item1.prdSizeAttributeBoList;
                         if (j >= prdList.length) j = 0;//防止越界
                         var sizeVal = prdList[j].sizeValue ? prdList[j].sizeValue : "";
-                        //j++;//
                         return '<input class="form-control sizeInfo ' + prdList[j++].sizeAttributeId
                             + '" data-index="' + item1.__index + '"' + 'value="' + sizeVal + '"/>';
                     }
@@ -230,7 +214,7 @@ $(document).on('click', '#filter-btn', function () {
 
 $(document).on('click', '.add2', function () {
     var item = g.rows[$(this).data("index")];
-    //拼接分类字符串
+//拼接分类字符串
     var a = item.productType.replace(/<br>/g, "/");
     item.productType = a.substring(0, a.length - 1);
     Bll.toast("/meterManage/productSize/saveProdSizeInfo", item, "修改尺码");

@@ -3,7 +3,7 @@
  * 模特管理
  */
 var $ = require('jquery');
-var common = require('../common/common');
+var common = require('../../../common/common');
 var STATUS = {
     '1': "启用",
     '2': "禁用"
@@ -21,7 +21,7 @@ var g = new common.grid({
             modelName: common.util.__input('content-filter1'),
             englishName: common.util.__input('content-filter2'),
             status: common.util.__input('status-filter'),
-            modelType: parseInt($("#aa").val())
+            modelType: 1
         };
     },
 
@@ -31,7 +31,11 @@ var g = new common.grid({
         {display: "英文名", name: "englishName"},
         {
             display: "头像", name: "avatar", render: function (item) {
-            return '<img src="' + item.avatar + '?imageView/2/w/100/h/100" width="100" height="60"/>'
+            if(item.avatar){
+                return '<img src="' + item.avatar + '?imageView/2/w/100/h/100" width="100" height="60"/>'
+            }
+            return ""
+
         }
         },//图片显示
         {display: "国籍", name: "nationality"},
@@ -59,7 +63,11 @@ var g = new common.grid({
         {display: "衣服尺码", name: "dressSize"},
         {
             display: "模特卡", name: "modelCard ", render: function (item) {
-            return '<img src="' + item.modelCard + '?imageView/2/w/100/h/100" width="100" height="60"/>'
+            if(item.modelCard){
+                return '<img src="' + item.modelCard + '?imageView/2/w/100/h/100" width="100" height="60"/>'
+            }
+            return ""
+
         }
         },
         {
@@ -178,7 +186,7 @@ var Bll = {
                     }, function () {
                         g.reload(1);//重新加载界面
                         a.close();//关闭模态框
-                    },true)
+                    }, true)
                 }
             }, {
                 value: "取消",
@@ -266,7 +274,7 @@ $(document).on('click', '.delete', function () {
                 }
             }, function () {
                 g.reload(1);
-            },true);
+            }, true);
         });
 });
 //查询按钮--点击事件

@@ -3,7 +3,7 @@
  * 产品图片管理
  */
 var $ = require('jquery');
-var common = require('../common/common');
+var common = require('../../../common/common');
 //日期插件
 $('.hasDatepicker').fdatepicker({
     format: 'yyyy-mm-dd'
@@ -23,7 +23,7 @@ var g = new common.grid({
     },
     parms: function () {
         return {
-            //查询参数
+//查询参数
             productSkn: common.util.__input('content-filter1'),
             productSkc: common.util.__input('content-filter2'),
             productSku: common.util.__input('content-filter3'),
@@ -31,7 +31,7 @@ var g = new common.grid({
             endTime: ((new Date($('#endtime').val())).getTime()) / 1000
         };
     },
-    //列表显示
+//列表显示
     columns: [
         {display: "SKN", name: "productSkn"},
         {
@@ -73,7 +73,7 @@ var Bll = {
     pictureBoList: [],
     selectedBoId: [],
     clonePics: [],
-    //重新渲染图片列表
+//重新渲染图片列表
     rendBoList: function (pictureBoList) {
         $(".image-list").html('');
         $("#addPic").prepend(common.util.__template2($("#template2").html(),
@@ -82,7 +82,7 @@ var Bll = {
             }
         ));
     },
-    //获取编辑时新增的图片
+//获取编辑时新增的图片
     getNewPics: function (pictureBoList) {
         var newPic = [];
         if (pictureBoList.length > 0) {
@@ -94,7 +94,7 @@ var Bll = {
         }
         return newPic
     },
-    //模态
+//模态
     toast: function (url, item, datacall) {
         Bll.pictureBoList = item.pictureBoList || [];
         Bll.selectedBoId = [];
@@ -149,7 +149,7 @@ var Bll = {
                         var name = response.names[i];
                         var index = name.indexOf('.');
                         var name1 = name.substr(0, index);
-                        //判断图片名称是否符合标准
+//判断图片名称是否符合标准
                         if ((/^[0-9]+[_][0-9]+$/).test(name1) || (/^[1-9]\d*$/).test(name1)) {
                             Bll.pictureBoList.push({
                                 "fileName": response.datas[i],

@@ -3,20 +3,20 @@
  * 拍摄要求管理
  */
 var $ = require('jquery');
-var common = require('../common/common');
+var common = require('../../../common/common');
 /**
  * 列表显示数据
  */
 var g = new common.grid({
     el: '#content-list',
     hash: false,
-    //查询参数
+//查询参数
     parms: function () {
         return {
             type: common.util.__input('type-filter')
         };
     },
-    //列表显示
+//列表显示
     columns: [
         {display: "名称", name: "name"},
         {
@@ -44,9 +44,9 @@ g.init("/shotManage/shotRequire/index1");
 var edit = new common.edit2(".modal-body");
 var Bll = {
     module: null,
-    //弹框
+//弹框
     toast: function (module, hint, url) {
-        if(module.__type=='update'){
+        if (module.__type == 'update') {
             delete module.status;
         }
         Bll.module = module;
@@ -70,7 +70,7 @@ var Bll = {
                                 else {
                                     common.util.__tip(res.message, "warning");
                                 }
-                            },true);
+                            }, true);
                         }
                         return false;
                     },
@@ -103,7 +103,7 @@ $('#add-content').on('click', function () {
         "name": "",
         "type": -1,
         "status": 1,
-        "__type":"add"
+        "__type": "add"
     };
     Bll.toast(item, "添加", "/shotManage/shotRequire/add");
 });
@@ -112,7 +112,7 @@ $('#add-content').on('click', function () {
  */
 $(document).on('click', '.update', function () {
     var item = g.rows[$(this).data("index")];
-    item.__type="update";
+    item.__type = "update";
     Bll.toast(item, "编辑", "/shotManage/shotRequire/update");
 });
 
@@ -122,13 +122,13 @@ $(document).on('click', '.delete', function () {
     common.dialog.confirm("警告",
         "确认删除？",
         function () {
-            item.status=0;
+            item.status = 0;
             common.util.__ajax({
                 url: '/shotManage/shotRequire/update',
                 data: item
             }, function () {
                 g.reload();
-            },true);
+            }, true);
         });
 });
 //查询按钮--点击事件

 'use strict';
 var $ = require('jquery');
-var common = require('../common/common');
+var common = require('../../../common/common');
 
 function batchExport(el, type) {
     var loadModal = null;
@@ -14,7 +14,7 @@ function batchExport(el, type) {
             loadModal = common.dialog.load();
         },
         onComplete: function (response) {
-            console.log("response",response);
+            console.log("response", response);
             if (loadModal) {
                 loadModal.close();
             }

-
 /**
  * Created by JiangMin on 2016/3/22.
  * 试穿信息管理
  */
 var $ = require('jquery');
-var common = require('../common/common');
+var common = require('../../../common/common');
 /**
  * 列表显示数据
  * @type {common.grid}
@@ -12,7 +11,7 @@ var common = require('../common/common');
 var g = new common.grid({
     el: '#content-list',
     hash: false,
-    //查询参数
+//查询参数
     parms: function () {
         return {
             productSku: common.util.__input('content-filter1'),
@@ -20,11 +19,14 @@ var g = new common.grid({
             productName: common.util.__input('content-filter3')
         };
     },
-    //列表显示
+//列表显示
     columns: [
         {
             display: "图片", name: "defaultImg", render: function (item) {
-            return '<img src="' + item.defaultImg + '?imageView/0/w/78/h/78" width="100" height="60"/>'
+            if (item.defaultImg) {
+                return '<img src="' + item.defaultImg + '?imageView/0/w/78/h/78" width="100" height="60"/>'
+            }
+            return ""
         }
         },//图片显示
         {display: "skn", name: "productSkn"},
@@ -51,7 +53,7 @@ var getAllInfo = function (item, callback) {
         };
         var infoLists = data.data || {};
         modelLists = infoLists.tryModelList || [];
-        //如果存在试穿信息
+//如果存在试穿信息
         if (infoLists.tryInfoBoMap) {
             var tryInfo = infoLists.tryInfoBoMap;
             for (var i = 0; i < modelLists.length; i++) {
@@ -67,7 +69,7 @@ var getAllInfo = function (item, callback) {
                 }
             }
         }
-        //不存在
+//不存在
         else {
             for (var j = 0; j < modelLists.length; j++) {
                 modelLists[j].tryInfo = {};
@@ -77,14 +79,14 @@ var getAllInfo = function (item, callback) {
         var e = new common.edit("#baseInfo");
         e.init();
         var sortId;
-        if(item.smallSortId&&item.smallSortId>1){
-            sortId=item.smallSortId;
-        }else{
-            if(item.middleSortId||item.middleSortId>1){
-                sortId=item.middleSortId;
+        if (item.smallSortId && item.smallSortId > 1) {
+            sortId = item.smallSortId;
+        } else {
+            if (item.middleSortId || item.middleSortId > 1) {
+                sortId = item.middleSortId;
             }
-            else{
-                sortId=item.maxSortId;
+            else {
+                sortId = item.maxSortId;
             }
         }
         new common.dropDown({
@@ -116,9 +118,9 @@ var getNewLists = function (modelLists, callback) {
             newList[i].fit_remark = "";
         }
     }
-    var postDoc=[];
-    for(var j=0;j<newList.length;j++){
-        if(newList[j].feel_id||newList[j].fit_size||newList[j].fit_remark){
+    var postDoc = [];
+    for (var j = 0; j < newList.length; j++) {
+        if (newList[j].feel_id || newList[j].fit_size || newList[j].fit_remark) {
             postDoc.push(newList[j]);
         }
     }

@@ -3,7 +3,7 @@
  * 模特管理
  */
 var $ = require('jquery');
-var common = require('../common/common');
+var common = require('../../../common/common');
 //日期插件
 $('.hasDatepicker').fdatepicker({
     format: 'yyyy-mm-dd'
@@ -15,23 +15,25 @@ $('.hasDatepicker').fdatepicker({
 var g = new common.grid({
     el: '#content-list',
     hash: false,
-    //查询参数
+//查询参数
     parms: function () {
         return {
             modelName: common.util.__input('content-filter1'),
             beginTime: ((new Date($('#beginTime').val())).getTime()) / 1000 || "",
             endTime: ((new Date($('#endTime').val())).getTime()) / 1000 || "",
             modelType: parseInt($("#aa").val())
-            // status: $("#bb").val()?parseInt($("#bb").val()):undefined
         };
     },
-    //列表显示
+//列表显示
     columns: [
         {display: "ID", name: "id"},
         {display: "姓名", name: "modelName"},
         {
             display: "头像", name: "avatar", render: function (item) {
-            return '<img src="' + item.avatar + '?imageView/0/w/78/h/78" width="100" height="60"/>'
+            if (item.avatar) {
+                return '<img src="' + item.avatar + '?imageView/0/w/78/h/78" width="100" height="60"/>'
+            }
+            return ""
         }
         },//图片显示
         {display: "身高", name: "height"},
@@ -81,7 +83,7 @@ var Bll = {
         $(selecter).html(common.util.__template2($("#" + templater).html(), data));
     },
     edit: function () {
-        //验证英文名
+//验证英文名
         if ($("#englishName").val()) {
             e.on("validate", function () {
                 var englishName = $.trim($("#englishName").val());
@@ -93,7 +95,7 @@ var Bll = {
             });
         }
 
-        //验证身高
+//验证身高
         if ($("#height").val()) {
             e.on("validate", function () {
                 var height = $.trim($("#height").val());
@@ -104,7 +106,7 @@ var Bll = {
             });
         }
 
-        //验证体重
+//验证体重
         if ($("#weight").val()) {
             e.on("validate", function () {
                 var weight = $.trim($("#weight").val());
@@ -115,7 +117,7 @@ var Bll = {
             });
         }
 
-        //验证胸围
+//验证胸围
         if ($("#Bust").val()) {
             e.on("validate", function () {
                 var Bust = $.trim($("#Bust").val());
@@ -126,7 +128,7 @@ var Bll = {
             });
         }
 
-        //验证腰围
+//验证腰围
         if ($("#waist").val()) {
             e.on("validate", function () {
                 var waist = $.trim($("#waist").val());
@@ -137,7 +139,7 @@ var Bll = {
             });
         }
 
-        //验证臀围
+//验证臀围
         if ($("#hips").val()) {
             e.on("validate", function () {
                 var hips = $.trim($("#hips").val());