Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0

Application/Admin/View/Promote/linkInfo.html

@@ -130,7 +130,7 @@ $(".select_gallery").select2();
 </script>
 <script type="text/javascript">
 //导航高亮
-highlight_subnav('{:U('Support/lists')}');
+highlight_subnav('{:U('Promote/linkInfo')}');
 $(function(){
     //搜索功能
     $("#search").click(function(){

Application/Admin/View/SuperStatistical/index.html

@@ -107,14 +107,14 @@
         {$_page|default=''}
     </div>
 
-		<div class="common_settings">
-			<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
-			<form class="addShortcutIcon">
-				<input type="hidden" name="title" value="{$m_title}">
-				<input type="hidden" name="url" value="Spend/lists">
-			</form>
-			<a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
-		</div>
+        <div class="common_settings">
+            <span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
+            <form class="addShortcutIcon">
+                <input type="hidden" name="title" value="{$m_title}">
+                <input type="hidden" name="url" value="Spend/lists">
+            </form>
+            <a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
+        </div>
 
 </block>