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

service/agent/database/option_account.php

@@ -221,7 +221,7 @@ return array
             'desc'      => '上传附件',
             'match'     => 'is_string',
             'update'    => 'upload',
-            'key'       => '1',
+            'key'       => '10',
             // 'place'     => '759*562',
         ),
 

service/agent/lib/Dhorder.php

@@ -1215,7 +1215,7 @@ class Dhorder
     }
     #权益管理导出
     public function out_member_goods_api($data){
-        $header = array('权益名称', '会员等级', '姓名', '手机号', '剩余数量', '获取方式', '获取时间');
+        $header = array('权益名称', '会员等级', '姓名', '手机号', '剩余数量', '总数量', '获取方式', '获取时间');
         $body = array();
         foreach($data as $k => $v){
             $member = Dever::db('agent/member')->find(array('id'=>$v['mid']));
@@ -1226,7 +1226,8 @@ class Dhorder
                 $role['name'],
                 $member['name'],
                 $member['mobile'],
-                $v['num'],
+                $v['total_num']-$v['sell_num'],
+                $v['total_num'],
                 '',
                 date('Y-m-d H:i',$v['cdate']),
                 

service/agent/lib/Option_account.php

@@ -53,6 +53,7 @@ Class Option_account{
 		$count = $info['price']+$info['zh_price']+$info['zj_price']+$info['other_price'];
 		$info_price = '设备费：'.$info['price'].'万元；装修费：'.$info['zh_price'].'万元；租金费：'.$info['zj_price'].'万元；其他：'.$info['other_price'].'万元；总计：'.$count.'万元';
 		$area = Dever::load("area/api.string", $info['area']);
+		$area = str_replace(',','',$area);
 		$image = explode(',',$info['pic']);
 		$pic = '';
 		foreach($image as $k => $v){