build project

@@ -87,7 +87,7 @@ webpackJsonp([0],[
 	        type: 'checkbox'
 	    },{
 	        display: '订单号',
-	        name: "orderId"
+	        name: "orderCode"
 	    }, {
 	        display: '商品名称',
 	        render: function (item) {
@@ -134,6 +134,7 @@ webpackJsonp([0],[
 	                return  true ? ENUM.AuditEnum[item.status] : "" + "</p>";
 	            }
 	        },
+	        { display: '审核人', name: 'auditorName' },
 	        {
 	            display: '审核返币',
 	            render: function (item) {

@@ -146,6 +146,11 @@ webpackJsonp([96],[
 	                return '否';
 	            }
 	        }
+	    },{
+	        display: "首次开启时间",
+	        render: function(items) {
+	            return common.util.__secondsFormat(items.firstShowTime);
+	        }
 	    }, {
 	        display: "操作",
 	        render: function(items) {
@@ -328,5 +333,6 @@ webpackJsonp([96],[
 	    });
 	});
 
+
 /***/ }
 ]);
\ No newline at end of file

@@ -14,8 +14,8 @@ webpackJsonp([143],[
 	        '0': '否'
 	    },
 	    StatusEnum: {
-	        1: '<b style="color:#5cb85c">开启</b>',
-	        0: '<b style="color:#ff0000">关闭</b>'
+	        '0': '<b style="color:#5cb85c">开启</b>',
+	        '1': '<b style="color:#ff0000">关闭</b>'
 	    }
 
 	}
@@ -27,6 +27,7 @@ webpackJsonp([143],[
 	    parms: function () {
 	        return {
 	            name: common.util.__input('unionTypeName'),
+	            goUrl: common.util.__input('goUrl'),            
 	            unionType: common.util.__input('unionTypeID')
 	        };
 	    },
@@ -36,12 +37,23 @@ webpackJsonp([143],[
 	                return '<a target="_blank" href="JavaScript:;" data-index="'+items.__index+'" class="btn btn-danger btn-xs url-detail">' + items.id + '</a>';
 	        }},
 	        {display: '名称', name: "name"},
-	        {display: '创建人', name: "createId"},
+	        {display: 'go_url', name: "goUrl"},
+	        {display: '创建人', name: "createUser"},
 	        {display: '创建时间', name: "createTimeStr"},
 	        {display: '类型ID', name: "unionType"},
+	        /*{display: '状态',render:function(items){
+	            return ENUM.StatusEnum[items.status] ? ENUM.StatusEnum[items.status] : "";
+	        }},*/
 	        {display: '操作', name: "status", render: function (items) {
 	            var HtmArr = [];
 	            HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-danger btn-xs info-modify">编辑</a>');
+
+	            /*if (items.status == 0) {
+	                HtmArr.push('<a  data-index="' + items.__index + '" data-type="1" href="JavaScript:;" class="btn btn-danger btn-xs switch-status">关闭</a>');
+	            } else {
+	                HtmArr.push('<a data-index="' + items.__index + '" data-type="0" href="JavaScript:;" class="btn btn-success btn-xs switch-status">开启</a>');
+	            }*/
+
 	            return HtmArr.join('');
 	        }}
 	    ]
@@ -77,15 +89,16 @@ webpackJsonp([143],[
 	            };
 	        },
 	        columns: [
-	            {display: '对外提供的链接', name: "url"},
-	            {display: '适配应用市场推广', name: "applicationExtend"},
-	            {display: '适配微信推广', name: "wechatExtend"},
-	            {display: '适配网页推广', name: "webExtend"},
-	            {display: '适配ios推广', name: "iosExtend"},
-	            {display: '适配android推广', name: "androidExtend"},
+	            {display: '推广链接', name: "url"},
+	            {display: '应用市场',width:80, name: "applicationExtend"},
+	            {display: 'app类型',width:80, name: "appType"},
+	            {display: '链接类型',width:80, name: "urlType"},
+	            {display: '微信   ',width:50, name: "wechatExtend"},
+	            {display: '网页或者二维码（IOS）',width:170, name: "iosExtend"},
+	            {display: '网页或者二维码（Android）',width:190, name: "androidExtend"},
 	            {display: '优点', name: "pros"},
 	            {display: '缺点', name: "cons"},
-	            {display: '备注', name: "commont"}
+	            {display: 'DEMO', name: "demo"}
 	        ]
 	    });
 	    gUrl.init('/unionType/getUnionTypeUrls');
@@ -127,5 +140,29 @@ webpackJsonp([143],[
 	    a.init();
 	}
 
+
+	// 推荐
+	$(document).on('click', '.switch-status', function () {
+
+	    var item = g.rows[$(this).data("index")];
+
+	    var type = $(this).data('type');  
+	    common.util.__ajax({
+	        url: '/unionType/updateStatus',
+	        data: {
+	            id: item.id,
+	            status: type            
+	        }
+	    }, function (res) {
+	        if (res.code == 200) {
+	            // common.util.__tip('操作成功', 'success');
+	            g.reload();
+	        } else {
+	            // common.util.__tip(res.message, 'danger');
+	        }
+	    }, false);
+
+	});
+
 /***/ }
 ]);
\ No newline at end of file

@@ -18,6 +18,9 @@ module.exports = function (app){
     //修改
     app.post("/unionType/updateUnionType","unionType_updateUnionType");
 
+    //修改状态
+   /* app.post("/unionType/updateStatus","unionType_updateStatus");*/
+
     //列表
     app.post("/unionType/getUnionTypeUrls","unionType_getUnionTypeUrls");
 

@@ -24,7 +24,8 @@ module.exports={
             title:"添加联盟",
             url:"/unionType/addUnionType",
             params:[
-                {name: 'name', type: 'String'}
+                {name: 'name', type: 'String'},
+                {name: 'goUrl', type: 'String'}
             ]
         },
 
@@ -33,10 +34,20 @@ module.exports={
             url:"/unionType/updateUnionType",
             params:[
                 {name: 'id', type: 'Number'},
-                {name: 'name', type: 'String'}
+                {name: 'name', type: 'String'},
+                {name: 'goUrl', type: 'String'}
             ]
         },
 
+       /* updateStatus:{
+            title:"修改状态",
+            url:"/unionType/updateStatus",
+            params:[
+                {name: 'id', type: 'Number'},
+                {name: 'status', type: 'String'}
+            ]
+        },*/
+
         getUnionTypeUrls:{
             title:"获取链接",
             url:"/unionType/getUnionTypeUrls",

@@ -56,5 +56,12 @@
             </div>
             <div class="col-sm-2"><label style="color: #ff0000; line-height: 40px"> * 必填</label></div>            
         </div> 
+        <div class="form-group">
+            <label for="goUrl" class="col-sm-2 control-label">go_url：</label>
+            <div class="col-sm-offset-1 col-sm-5">
+                <input type="text" value="[[goUrl]]" id="goUrl" placeholder="go_url" required="required" class="form-control">
+            </div>
+            <div class="col-sm-2"><label style="color: #ff0000; line-height: 40px"> * 必填</label></div>
+        </div>         
     </div>
 </script>