diff --git a/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js b/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js index d4e9207fab7c95eb383de700f67a864ae99b8110..c12045c98aee995f305d854a50acb4bc9bb295c7 100644 --- a/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js +++ b/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js @@ -14,7 +14,7 @@ layui.config({ // 加载区域 shopUtil.getShopAreaMation(function (json){ - $("#areaId").html(getDataUseHandlebars(selOption, json)); + $("#areaId").html(getDataUseHandlebars($("#selectTemplate").html(), json)); form.render('select'); }); form.on('select(areaId)', function(data) { diff --git a/shop/src/main/resources/template/js/mealOrder/allMealOrderList.js b/shop/src/main/resources/template/js/mealOrder/allMealOrderList.js index d7df7a5374f4cb234a6f181b2a4b16c8cbbd674d..ce5e745743cc8f41d1960df7c79570a7de6343dc 100644 --- a/shop/src/main/resources/template/js/mealOrder/allMealOrderList.js +++ b/shop/src/main/resources/template/js/mealOrder/allMealOrderList.js @@ -14,7 +14,7 @@ layui.config({ // 加载区域 shopUtil.getShopAreaMation(function (json){ - $("#areaId").html(getDataUseHandlebars(selOption, json)); + $("#areaId").html(getDataUseHandlebars($("#selectTemplate").html(), json)); form.render('select'); }); form.on('select(areaId)', function(data) { @@ -54,7 +54,7 @@ layui.config({ return shopUtil.getMealOrderStateName(d); }}, { field: 'natureName', title: '订单性质', width: 80, rowspan: '2', align: "center"}, - { field: 'label', title: '员工标签', width: 120, align: "left"}, + { field: 'label', title: '员工标签', width: 120, rowspan: '2', align: "left"}, { field: 'payTime', title: '支付时间', align: 'center', rowspan: '2', width: 150 }, { field: 'type', title: '订单来源', width: 80, align: "center", rowspan: '2', templet: function(d){ if(d.type == 1){ diff --git a/shop/src/main/resources/template/tpl/keepFitOrder/allKeepFitOrderList.html b/shop/src/main/resources/template/tpl/keepFitOrder/allKeepFitOrderList.html index bcdc3992b514a3a9e418a5c4f58bf28884a7a9b9..450d5c34c8ab994a4c33539e0dbb9d17c5e92bb2 100644 --- a/shop/src/main/resources/template/tpl/keepFitOrder/allKeepFitOrderList.html +++ b/shop/src/main/resources/template/tpl/keepFitOrder/allKeepFitOrderList.html @@ -81,6 +81,8 @@