Merge branch 'develop' into release/qqtest

@@ -3,11 +3,11 @@
  * 资源管理路由
  */
 
-//exports.domain = require('../config/common.js').domain;
+exports.domain = require('../config/common.js').domain;
 //exports.domain = 'http://172.16.6.115:8080/platform';//王伟
 //exports.domain = 'http://192.168.102.216:8180/platform'; //测试环境
 //exports.domain = 'http://172.16.6.231:8080/platform';
-exports.domain = 'http://172.16.6.225:8080/platform';
+//exports.domain = 'http://172.16.6.225:8080/platform';
 //exports.domain = 'http://192.168.102.216:8086/platform';
 
 exports.res = [

@@ -79,6 +79,7 @@
     [[/each]]
 </script>
 
+{{> resource/actions}}
 {{> resource/taoyu}}
 {{> resource/weiqingting}}
 {{> resource/jiangming}}

@@ -1232,43 +1232,6 @@
         [[/each]]
     </ul>
 </script>
-<!--select选项-->
-<script type="text/template" id="action_template">
-    <option value="">选择跳转目标</option>
-    <option value="go.brand">品牌列表页</option>
-    <option value="go.productDetail">商品详情页</option>
-    <option value="go.coupon">优惠券页</option>
-    <option value="go.fav">收藏列表页</option>
-    <option value="go.mine">我的页面</option>
-    <option value="go.list">列表或搜索页</option>
-    <option value="go.attention">关注页</option>
-    <option value="go.plus">plus页</option>
-    <option value="go.star">star页</option>
-    <option value="go.new">新品到着页</option>
-    <option value="go.sale">折扣页</option>
-    <option value="go.share">分享</option>
-    <option value="go.h5">h5网页</option>
-    <option value="go.weblogin">h5网页调用本地登录</option>
-    <option value="go.guangchannel">逛频道</option>
-    <option value="go.gender">男女首页</option>
-    <option value="go.activity">app活动页</option>
-    <option value="go.home">频道首页</option>
-    <option value="go.yohood">YOHOOD</option>
-    <option value="go.top100">热销排行</option>
-    <option value="go.activitytemplate">活动模板</option>
-    <option value="go.globalpurchase">全球购</option>
-    <option value="go.subchannel">二级频道</option>
-    <option value="go.guangchannel">逛频道或SHOW晒单页</option>
-    <option value="go.showgoods">去晒单</option>
-    <option value="go.limitpurchase">尖货频道</option>
-    <option value="go.vippro">会员商品</option>
-    <option value="go.shortsize">断码页</option>
-    <option value="go.discountmarket">折扣专区</option>
-    <option value="go.discountmarketpro">折扣专区详情页</option>
-    <option value="go.signin">签到页</option>
-    <option value="go.playvideo">视频播放</option>
-    <option value="go.shop">店铺</option>
-</script>
 <script type="text/template" id="noEdit-template">
     <div>固定内容，暂时无法编辑!</div>
 </script>
\ No newline at end of file