Merge branch 'master' of http://132.232.91.252:9999/ice/xiaozhan

admin/themes/simplebootx/Admin/Config/index.html

@@ -140,7 +140,7 @@ input{
 
 
 							</div>
 							</div>
 						</div>
 						</div>
-
+						<!--
 						<div class="control-group">
 						<div class="control-group">
 							<label class="control-label">微信公众号</label>
 							<label class="control-label">微信公众号</label>
 							<div class="controls">
 							<div class="controls">
@@ -195,7 +195,7 @@ input{
 									<input type="text" name="post[sina_url]" value="{$config['sina_url']}"> 以http://或https://开头
 									<input type="text" name="post[sina_url]" value="{$config['sina_url']}"> 以http://或https://开头
 							</div>
 							</div>
 						</div>
 						</div>
-						<!--
+
 						<div class="control-group">
 						<div class="control-group">
 							<label class="control-label">官微B图标</label>
 							<label class="control-label">官微B图标</label>
 							<div class="controls">
 							<div class="controls">

application/Admin/Controller/PublicController.class.php

@@ -54,13 +54,13 @@ class PublicController extends AdminbaseController {
     	}
     	}
     	$verrify = trim(I("post.verify"));
     	$verrify = trim(I("post.verify"));
 
 
-     //    if(empty($verrify)){
-    	// 	$this->error(L('CAPTCHA_REQUIRED'));
-    	// }
+         if(empty($verrify)){
+    	 	$this->error(L('CAPTCHA_REQUIRED'));
+    	 }
     	//验证码
     	//验证码
 
 
-    	//if(!sp_check_verify_code()){
-        if(false){
+    	if(!sp_check_verify_code()){
+//        if(false){
     		$this->error(L('CAPTCHA_NOT_RIGHT'));
     		$this->error(L('CAPTCHA_NOT_RIGHT'));
 
 
     	}else{
     	}else{

themes/simplebootx/Appapi/Mall/index.html

@@ -26,7 +26,7 @@
                 <div class="lianghaoList">
                 <div class="lianghaoList">
                     <div class="lhListHd">
                     <div class="lhListHd">
                         <div class="lhListHd_1">ID:{$v['name']}</div>
                         <div class="lhListHd_1">ID:{$v['name']}</div>
-                        <div class="lhListHd_2">{$v['coin_date']}币</div>
+                        <div class="lhListHd_2">{$v['coin_date']}钻石</div>
                     </div>
                     </div>
                     <div class="lhListBd liang_buy" data-id="{$v['id']}" data-name="{$v['name']}" data-coin="{$v['coin_date']}" >购买</div>
                     <div class="lhListBd liang_buy" data-id="{$v['id']}" data-name="{$v['name']}" data-coin="{$v['coin_date']}" >购买</div>
                 </div>
                 </div>