fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by xuhongyun
Commit 03c8d52558bced91c4fbe8f169e20697cb4109a4 1 parent fd9011b3

build project

Inline Side-by-side
Showing 6 changed files with 80 additions and 15 deletions
@@ -87,7 +87,7 @@ webpackJsonp([0],[ @@ -87,7 +87,7 @@ webpackJsonp([0],[
87 type: 'checkbox' 87 type: 'checkbox'
88 },{ 88 },{
89 display: '订单号', 89 display: '订单号',
90 - name: "orderId" 90 + name: "orderCode"
91 }, { 91 }, {
92 display: '商品名称', 92 display: '商品名称',
93 render: function (item) { 93 render: function (item) {
@@ -134,6 +134,7 @@ webpackJsonp([0],[ @@ -134,6 +134,7 @@ webpackJsonp([0],[
134 return true ? ENUM.AuditEnum[item.status] : "" + "</p>"; 134 return true ? ENUM.AuditEnum[item.status] : "" + "</p>";
135 } 135 }
136 }, 136 },
  137 + { display: '审核人', name: 'auditorName' },
137 { 138 {
138 display: '审核返币', 139 display: '审核返币',
139 render: function (item) { 140 render: function (item) {
@@ -146,6 +146,11 @@ webpackJsonp([96],[ @@ -146,6 +146,11 @@ webpackJsonp([96],[
146 return '否'; 146 return '否';
147 } 147 }
148 } 148 }
  149 + },{
  150 + display: "首次开启时间",
  151 + render: function(items) {
  152 + return common.util.__secondsFormat(items.firstShowTime);
  153 + }
149 }, { 154 }, {
150 display: "操作", 155 display: "操作",
151 render: function(items) { 156 render: function(items) {
@@ -328,5 +333,6 @@ webpackJsonp([96],[ @@ -328,5 +333,6 @@ webpackJsonp([96],[
328 }); 333 });
329 }); 334 });
330 335
  336 +
331 /***/ } 337 /***/ }
332 ]); 338 ]);
@@ -14,8 +14,8 @@ webpackJsonp([143],[ @@ -14,8 +14,8 @@ webpackJsonp([143],[
14 '0': '否' 14 '0': '否'
15 }, 15 },
16 StatusEnum: { 16 StatusEnum: {
17 - 1: '<b style="color:#5cb85c">开启</b>',  
18 - 0: '<b style="color:#ff0000">关闭</b>' 17 + '0': '<b style="color:#5cb85c">开启</b>',
  18 + '1': '<b style="color:#ff0000">关闭</b>'
19 } 19 }
20 20
21 } 21 }
@@ -27,6 +27,7 @@ webpackJsonp([143],[ @@ -27,6 +27,7 @@ webpackJsonp([143],[
27 parms: function () { 27 parms: function () {
28 return { 28 return {
29 name: common.util.__input('unionTypeName'), 29 name: common.util.__input('unionTypeName'),
  30 + goUrl: common.util.__input('goUrl'),
30 unionType: common.util.__input('unionTypeID') 31 unionType: common.util.__input('unionTypeID')
31 }; 32 };
32 }, 33 },
@@ -36,12 +37,23 @@ webpackJsonp([143],[ @@ -36,12 +37,23 @@ webpackJsonp([143],[
36 return '<a target="_blank" href="JavaScript:;" data-index="'+items.__index+'" class="btn btn-danger btn-xs url-detail">' + items.id + '</a>'; 37 return '<a target="_blank" href="JavaScript:;" data-index="'+items.__index+'" class="btn btn-danger btn-xs url-detail">' + items.id + '</a>';
37 }}, 38 }},
38 {display: '名称', name: "name"}, 39 {display: '名称', name: "name"},
39 - {display: '创建人', name: "createId"}, 40 + {display: 'go_url', name: "goUrl"},
  41 + {display: '创建人', name: "createUser"},
40 {display: '创建时间', name: "createTimeStr"}, 42 {display: '创建时间', name: "createTimeStr"},
41 {display: '类型ID', name: "unionType"}, 43 {display: '类型ID', name: "unionType"},
  44 + /*{display: '状态',render:function(items){
  45 + return ENUM.StatusEnum[items.status] ? ENUM.StatusEnum[items.status] : "";
  46 + }},*/
42 {display: '操作', name: "status", render: function (items) { 47 {display: '操作', name: "status", render: function (items) {
43 var HtmArr = []; 48 var HtmArr = [];
44 - HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-danger btn-xs info-modify">编辑</a>'); 49 + HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-danger btn-xs info-modify">编辑</a>');
  50 +
  51 + /*if (items.status == 0) {
  52 + HtmArr.push('<a data-index="' + items.__index + '" data-type="1" href="JavaScript:;" class="btn btn-danger btn-xs switch-status">关闭</a>');
  53 + } else {
  54 + HtmArr.push('<a data-index="' + items.__index + '" data-type="0" href="JavaScript:;" class="btn btn-success btn-xs switch-status">开启</a>');
  55 + }*/
  56 +
45 return HtmArr.join(''); 57 return HtmArr.join('');
46 }} 58 }}
47 ] 59 ]
@@ -77,15 +89,16 @@ webpackJsonp([143],[ @@ -77,15 +89,16 @@ webpackJsonp([143],[
77 }; 89 };
78 }, 90 },
79 columns: [ 91 columns: [
80 - {display: '对外提供的链接', name: "url"},  
81 - {display: '适配应用市场推广', name: "applicationExtend"},  
82 - {display: '适配微信推广', name: "wechatExtend"},  
83 - {display: '适配网页推广', name: "webExtend"},  
84 - {display: '适配ios推广', name: "iosExtend"},  
85 - {display: '适配android推广', name: "androidExtend"}, 92 + {display: '推广链接', name: "url"},
  93 + {display: '应用市场',width:80, name: "applicationExtend"},
  94 + {display: 'app类型',width:80, name: "appType"},
  95 + {display: '链接类型',width:80, name: "urlType"},
  96 + {display: '微信 ',width:50, name: "wechatExtend"},
  97 + {display: '网页或者二维码（IOS）',width:170, name: "iosExtend"},
  98 + {display: '网页或者二维码（Android）',width:190, name: "androidExtend"},
86 {display: '优点', name: "pros"}, 99 {display: '优点', name: "pros"},
87 {display: '缺点', name: "cons"}, 100 {display: '缺点', name: "cons"},
88 - {display: '备注', name: "commont"} 101 + {display: 'DEMO', name: "demo"}
89 ] 102 ]
90 }); 103 });
91 gUrl.init('/unionType/getUnionTypeUrls'); 104 gUrl.init('/unionType/getUnionTypeUrls');
@@ -127,5 +140,29 @@ webpackJsonp([143],[ @@ -127,5 +140,29 @@ webpackJsonp([143],[
127 a.init(); 140 a.init();
128 } 141 }
129 142
  143 +
  144 + // 推荐
  145 + $(document).on('click', '.switch-status', function () {
  146 +
  147 + var item = g.rows[$(this).data("index")];
  148 +
  149 + var type = $(this).data('type');
  150 + common.util.__ajax({
  151 + url: '/unionType/updateStatus',
  152 + data: {
  153 + id: item.id,
  154 + status: type
  155 + }
  156 + }, function (res) {
  157 + if (res.code == 200) {
  158 + // common.util.__tip('操作成功', 'success');
  159 + g.reload();
  160 + } else {
  161 + // common.util.__tip(res.message, 'danger');
  162 + }
  163 + }, false);
  164 +
  165 + });
  166 +
130 /***/ } 167 /***/ }
131 ]); 168 ]);
@@ -18,6 +18,9 @@ module.exports = function (app){ @@ -18,6 +18,9 @@ module.exports = function (app){
18 //修改 18 //修改
19 app.post("/unionType/updateUnionType","unionType_updateUnionType"); 19 app.post("/unionType/updateUnionType","unionType_updateUnionType");
20 20
  21 + //修改状态
  22 + /* app.post("/unionType/updateStatus","unionType_updateStatus");*/
  23 +
21 //列表 24 //列表
22 app.post("/unionType/getUnionTypeUrls","unionType_getUnionTypeUrls"); 25 app.post("/unionType/getUnionTypeUrls","unionType_getUnionTypeUrls");
23 26
@@ -24,7 +24,8 @@ module.exports={ @@ -24,7 +24,8 @@ module.exports={
24 title:"添加联盟", 24 title:"添加联盟",
25 url:"/unionType/addUnionType", 25 url:"/unionType/addUnionType",
26 params:[ 26 params:[
27 - {name: 'name', type: 'String'} 27 + {name: 'name', type: 'String'},
  28 + {name: 'goUrl', type: 'String'}
28 ] 29 ]
29 }, 30 },
30 31
@@ -33,10 +34,20 @@ module.exports={ @@ -33,10 +34,20 @@ module.exports={
33 url:"/unionType/updateUnionType", 34 url:"/unionType/updateUnionType",
34 params:[ 35 params:[
35 {name: 'id', type: 'Number'}, 36 {name: 'id', type: 'Number'},
36 - {name: 'name', type: 'String'} 37 + {name: 'name', type: 'String'},
  38 + {name: 'goUrl', type: 'String'}
37 ] 39 ]
38 }, 40 },
39 41
  42 + /* updateStatus:{
  43 + title:"修改状态",
  44 + url:"/unionType/updateStatus",
  45 + params:[
  46 + {name: 'id', type: 'Number'},
  47 + {name: 'status', type: 'String'}
  48 + ]
  49 + },*/
  50 +
40 getUnionTypeUrls:{ 51 getUnionTypeUrls:{
41 title:"获取链接", 52 title:"获取链接",
42 url:"/unionType/getUnionTypeUrls", 53 url:"/unionType/getUnionTypeUrls",
@@ -54,7 +54,14 @@ @@ -54,7 +54,14 @@
54 <div class="col-sm-offset-1 col-sm-5"> 54 <div class="col-sm-offset-1 col-sm-5">
55 <input type="text" value="[[name]]" id="name" placeholder="联盟名称" required="required" class="form-control"> 55 <input type="text" value="[[name]]" id="name" placeholder="联盟名称" required="required" class="form-control">
56 </div> 56 </div>
  57 + <div class="col-sm-2"><label style="color: #ff0000; line-height: 40px"> * 必填</label></div>
  58 + </div>
  59 + <div class="form-group">
  60 + <label for="goUrl" class="col-sm-2 control-label">go_url：</label>
  61 + <div class="col-sm-offset-1 col-sm-5">
  62 + <input type="text" value="[[goUrl]]" id="goUrl" placeholder="go_url" required="required" class="form-control">
  63 + </div>
57 <div class="col-sm-2"><label style="color: #ff0000; line-height: 40px"> * 必填</label></div> 64 <div class="col-sm-2"><label style="color: #ff0000; line-height: 40px"> * 必填</label></div>
58 - </div> 65 + </div>
59 </div> 66 </div>
60 </script> 67 </script>