Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

learn/active/src/Api.php

@@ -156,11 +156,14 @@ Class Api extends Core {
 	#详情页
 	public function getDesc(){
 		$id = Dever::input('id');
+		if (!$id) {
+			Dever::alert('订单id不能不空');
+		}
 		$user = $this->user;
 		$data['user']['name'] = $user['name'];
 		$data['user']['mobile'] = $user['mobile']; 
 		$data['info'] = Dever::db('active/order')->find($id);
-		if($data['info']){
+		if ($data['info']) {
 			$active = Dever::db('active/info')->find($data['info']['active_id']);
 			$data['info']['active_name'] = $active['name'];
 			$data['info']['cash'] = $active['price'];#单价
@@ -172,6 +175,8 @@ Class Api extends Core {
 				$data['info']['refund_cash'] = $data['info']['price'];
 			}
 			$data['info']['mobile'] = $active['mobile'];
+		} else {
+			Dever::alert('订单不存在');
 		}
 		return $data;
 	}

service/agent/lib/Soft_cash.php

@@ -122,7 +122,11 @@ Class Soft_cash
         if ($member['idcard_back']) {
             $idcard_pic .= '<a href="'.$member['idcard_back'].'" target="_blank"><img src="'.$member['idcard_back'].'" width="100" /></a>';
         }
-        $pic = '<a href="'.$info['pic'].'" target="_blank"><img src="'.$info['pic'].'" width="100" /></a>';
+        $picture = explode(',',$info['pic']);
+        $pic = '';
+        foreach ($picture as $k => $v){
+            $pic .= '<a href="'.$v.'" target="_blank"><img src="'.$v.'" width="100" /></a>';
+        }
         $result['订单信息'] = array
         (
             'type' => 'info',

service/option/database/account.php

@@ -85,11 +85,9 @@ if ($search_auth == 1) {
     $list_button['list1'] = array('账户列表', '"member&search_option_aid={id}&search_option_dever_auth='.$search_auth.'"');
 }
 
-if (Dever::load('manage/auth')->checkFunc('menu_279.menu_290','setmessage','发送短信')) {
-        $table = 'template';
-        $res = Dever::load('sms/api')->getTable($table);
-        $list_button['fast'] = array('发送短信','Dever::load("option/lib/account.send_sms",{mid})');
-}
+// if (Dever::load('manage/auth')->checkFunc('menu_279.menu_290','setmessage','发送短信')) {
+//         $list_button['fast'] = array('发送短信','Dever::load("option/lib/account.send_sms",{mid})');
+// }
 
 return array
 (