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

learn/active/lib/Active.php

@@ -48,7 +48,7 @@ class Active
 				}
 			}
 		}
-		if ($data && $data['total'] && $data['tatal'] > $data['num']) {
+		if ($data && $data['total'] && $data['total'] > $data['num']) {
 			Dever::alert('您已超过限购数量');
 		}
 		$insert['order_num'] = $this->getOrderId();

learn/active/src/Home.php

@@ -65,6 +65,12 @@ Class Home extends Core
 				$uid = Dever::db('active/user')->insert($data);
 			}
 		}
+		if ($uid) {
+			$where['where_id'] = $uid;
+			$where['name'] = $data['name'];
+			$where['idcard'] = $data['idcard'];
+			Dever::db('active/user')->update($where); 
+		}
 		$result = array();
 		$result = Dever::load('passport/reg')->getSign($uid);
 

service/agent/lib/Order.php

@@ -1671,7 +1671,7 @@ class Order
     }
     #软件服务费导出
     public function out_softorder($data){
-        $header = array('合同乙方', '手机号码', '合同总期数（年）', '合同类型', '签订日期', '合同金额', '购买日期', '录入日期', '终审日期');
+        $header = array('合同乙方', '手机号码', '身份证号码', '合同总期数（年）', '合同类型', '签订日期', '合同金额', '购买日期', '录入日期', '终审日期');
 
         $body = array();
         foreach($data as $k => $v){
@@ -1737,6 +1737,7 @@ class Order
                 (
                     $v['name'],
                     $v['mobile'],
+                    $v['idcard'],
                     $year,
                     $name,
                     $zcdate,