From 9c6f3e494bacac1ecb32106bb067cb5b4062391b Mon Sep 17 00:00:00 2001
From: 徐洪云 <hongyun.xu@yoho.cn>
Date: Wed, 31 Aug 2016 00:48:16 +0800
Subject: [PATCH] build portal server
---
server/index.js | 2 +-
server/views/resource/__partail/taoyu.html | 2 +-
server/views/shop/Edit.html | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/index.js b/server/index.js
index 0ee9e47..dfea5b1 100644
--- a/server/index.js
+++ b/server/index.js
@@ -112,7 +112,7 @@ if(process.env.NODE_ENV==="gray"){
}
/*线上环境*/
if(process.env.NODE_ENV==="production"){
- apiCofig.EnvConst.domain="http://127.0.0.1:8088/platform";
+ apiCofig.EnvConst.domain="http://172.31.20.7:8088/platform";
apiCofig.EnvConst.yohoSearch="http://search.yohoops.org/yohosearch";
}
module.exports = require('./libs/App')(apiCofig);
\ No newline at end of file
diff --git a/server/views/resource/__partail/taoyu.html b/server/views/resource/__partail/taoyu.html
index 9228480..b5b6387 100644
--- a/server/views/resource/__partail/taoyu.html
+++ b/server/views/resource/__partail/taoyu.html
@@ -170,7 +170,7 @@
[[layout action_template]]
</select>
<input type="text" placeholder="url" value="[[item.url.url]]" data-field="[[index]].url.url" class="observe"/>
- <a type="button" class="btn btn-danger btn-xs delBtn" data-event="textNav.data" data-index="[[index]]">删除</a>
+ <a type="button" class="btn btn-danger btn-xs delBtn" data-event="categoryNavigation.data" data-index="[[index]]">删除</a>
</div>
</li>
[[/each]]
diff --git a/server/views/shop/Edit.html b/server/views/shop/Edit.html
index 625d784..4fecb67 100644
--- a/server/views/shop/Edit.html
+++ b/server/views/shop/Edit.html
@@ -43,6 +43,7 @@
aria-describedby="basic-addon2" required>
<span class="input-group-addon" id="basic-addon2">.yohobuy.com</span>
</div>
+ <p style="margin-top: 10px"><span class="red">注：1. 1-32个字符；2. 只能填英文和破折号-，不区分大小写，不能以破折号开头或者结尾</span></p>
</div>
</div>
<div class="form-group">
@@ -85,6 +86,7 @@
</div>
<div class="col-sm-8">
<input type="file" id="shopLogo" name="shopLogo" value="<%data.shopLogo%>">
+ <p><span class="red" style="position: absolute; bottom: 0">提示: 请上传像素为150*150的图片，大小小于500KB</span></p>
</div>
</div>
<div class="form-group">
--
libgit2 0.24.0