fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit 33e1b0fa0580c3fba7d7410a11d3bfd6d2085ca2 2 parents 59f8b407 1b532d51

Merge branch 'yohobuy_portal_dev_v4.6_20160601' of http://git.yoho.cn/fe/yohobuy… 

…-portal-fe into yohobuy_portal_dev_v4.6_20160601
Inline Side-by-side
Showing 3 changed files with 12 additions and 6 deletions
... ... @@ -75,7 +75,12 @@ $(document).on("change", ".observe", function() {
});
$(document).on("click", "#addUrl", function () {
common.dialog.confirm("添加链接", common.util.__template2($("#template2").html(), {}), function () {
var urlIndex = '","url":"';
var val = $("#sortUrl").val();
var action = val.substring('{"action":"'.length, val.indexOf(urlIndex));
console.log(action);
var url = val.substring(val.indexOf(urlIndex) + urlIndex.length, val.length - 2);
common.dialog.confirm("添加链接", common.util.__template2($("#template2").html(), {action: action, url: url}), function () {
var url = JSON.stringify({
action: $("#goTo").val(),
url: $("#goToUrl").val()
... ... @@ -83,6 +88,7 @@ $(document).on("click", "#addUrl", function () {
$("#sortUrl").val(url);
Category.sortUrl = url;
});
new common.edit2("#action-row").init();
});
$(document).on("click", "#saveBtn", function () {
... ...
... ... @@ -35,8 +35,8 @@ var config = {
},
apiKey: 'sd4H1ecAqlp',
// domain:'http://192.168.102.210:8088/platform',//联调地址
domain: 'http://192.168.102.202:8088/platform',//测试
// domain: 'http://10.66.100.6:8088/platform',//腾讯云环境
//domain: 'http://192.168.102.202:8088/platform',//测试
domain: 'http://10.66.100.6:8088/platform',//腾讯云环境
logsFile: '/Data/logs/node/yohobuy-portal-log/',
loggers: {
api: {
... ...
... ... @@ -156,12 +156,12 @@
</script>
<script type="text/template" id="template2">
<div class="rows">
<div id="action-row" class="rows">
<div class="form-group">
<label class="col-sm-2 control-label">选择跳转目的地:</label>
<div class="col-sm-8">
<select name="goTo" id="goTo" class="form-control">
<select name="goTo" id="goTo" class="form-control" value="[[action]]">
[[layout action_template]]
</select>
... ... @@ -172,7 +172,7 @@
<label class="col-sm-2 control-label">跳转地址:</label>
<div class="col-sm-8">
<textarea rows="2" id="goToUrl" class="form-control" placeholder="跳转地址"></textarea>
<textarea rows="2" id="goToUrl" class="form-control" placeholder="跳转地址">[[url]]</textarea>
</div>
</div>
... ...