edit

service/agent/lib/Agreement.php

@@ -20,15 +20,16 @@ class Agreement
 			Dever::alert('传入参数有误');
 		}
 		$source = $p['source'];
-		if ($source == 1) {
-			Dever::load('manage/auth')->init();
-			$mid = false;
+		if ($source == 2) {
+            # 获取当前登录的uid
+            $mid = Dever::load('passport/user')->check(false);
+            if (!$mid) {
+                Dever::alert('请先登录');
+            }
+			
 		} else {
-			# 获取当前登录的uid
-			$mid = Dever::load('passport/user')->check(false);
-			if (!$mid) {
-				Dever::alert('请先登录');
-			}
+			Dever::load('manage/auth')->init();
+            $mid = false;
 		}
 		$agreement_id = $p['agreement_id'];
 		$status = $p['status'];
@@ -62,7 +63,7 @@ class Agreement
 		Dever::load('manage/auth')->init();
 		$id = Dever::input('id');
 		$info = Dever::db('agent/member_agreement')->find($id);
-		$info = $this->name($info['agreement_id'], $info, $info['role'], 2, 1);
+		$info = $this->name($info['agreement_id'], $info, $info['role'], 2, 3);
 
 		Dever::location($info[1]);
 	}
@@ -104,11 +105,11 @@ class Agreement
         	$param['agreement_id'] = $agreement['id'];
         	$param = Dever::encode(Dever::json_encode($param));
         	$link = Dever::url('agent/lib/agreement.show?p=' . $param);
-        	if ($status == 1) {
+        	if ($source == 1) {
 	        	# 1 是未生成合同，预览
 	        	# 2 是已生成合同
 	        	$name = '<a href="'.$link.'" target="_blank">'.$name.'</a>';
-	        } elseif ($status == 2) {
+	        } else {
 	        	return array($name, $link);
 	        }
         }

service/agent/lib/Order.php

@@ -858,23 +858,23 @@ class Order
     private function show_agreement($process, $info, $role, &$result)
     {
         $table = array();
-        $table['head'] = array('合同类型', '合同名称');
+        $table['head'] = array('合同类型', '合同名称', '合同状态');
         $table['body'] = array();
         $agreement_type = Dever::db('setting/agreement')->config['config_type'];
+        $agreement_status = Dever::db('agent/member_agreement')->config['status'];
         if (isset($process[3]['type']) && is_array($process[3]['type']) && in_array(5, $process[3]['type'])) {
-            $agreement_status = 1;
             $agreement_title = '（已生成合同）';
             $agreement_button = array();
 
             $agreement = Dever::db('agent/member_agreement')->getData(array('order_id' => $info['id']));
             foreach ($agreement as $k => $v) {
                 $agreement_info = Dever::db('setting/agreement')->find($v['agreement_id']);
+                $agreement_status_name = $agreement_status[$v['status']];
 
-                $table['body'][] = array($agreement_type[$agreement_info['type']], Dever::load('agent/lib/agreement')->name($agreement_info, $v, $role, 2));
+                $table['body'][] = array($agreement_type[$agreement_info['type']], Dever::load('agent/lib/agreement')->name($agreement_info, $v, $role, 1), $agreement_status_name);
             }
 
         } else {
-            $agreement_status = 2;
             $agreement_title = '（未生成合同）';
             
             $agreement_button[] = array(
@@ -884,12 +884,13 @@ class Order
             );
 
             $agreement = Dever::db('setting/agreement')->getData();
-            $table['body'][] = array($agreement_type[$agreement[1]['type']], Dever::load('agent/lib/agreement')->name($agreement[1], $info, $role, 1));
+            $agreement_status_name = $agreement_status[1];
+            $table['body'][] = array($agreement_type[$agreement[1]['type']], Dever::load('agent/lib/agreement')->name($agreement[1], $info, $role, 1), $agreement_status_name);
             if ($info['order_type'] == 2) {
                 # 升级的话，增加解除合同
-                $table['body'][] = array($agreement_type[$agreement[2]['type']], Dever::load('agent/lib/agreement')->name($agreement[2], $info, $role, 1));
+                $table['body'][] = array($agreement_type[$agreement[2]['type']], Dever::load('agent/lib/agreement')->name($agreement[2], $info, $role, 1), $agreement_status_name);
             } else {
-                $table['body'][] = array($agreement_type[$agreement[4]['type']], Dever::load('agent/lib/agreement')->name($agreement[4], $info, $role, 1));
+                $table['body'][] = array($agreement_type[$agreement[4]['type']], Dever::load('agent/lib/agreement')->name($agreement[4], $info, $role, 1), $agreement_status_name);
             }
         }