Your Name 3 jaren geleden
bovenliggende
commit
10ab83b392
3 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. 1 1
      learn/active/database/info.php
  2. 1 1
      learn/active/src/Off.php
  3. 2 2
      service/agent/lib/Option_account.php

+ 1 - 1
learn/active/database/info.php

@@ -474,7 +474,7 @@ return array
             # 匹配的正则或函数 选填项
             'option' => array
             (
-                'id' => 'yes',
+                'off_id' => array('yes','in'),
                 'state' => 1,
             ),
             'type' => 'all',

+ 1 - 1
learn/active/src/Off.php

@@ -10,7 +10,7 @@ Class Off extends Coreoff
 	public function getHome()
 	{
 		$data['user'] = $this->user;
-		$data['info'] = Dever::db('active/info')->getAll($data['user']['active_id']);
+		$data['info'] = Dever::db('active/info')->getAll(array('off_id'=>$data['user']['id']));
 		foreach ($data['info'] as $k => $v) {
 			$data['info'][$k]['act_time'] = date('Y-m-d H:i',$v['act_start']).'~'.date('Y-m-d H:i',$v['act_end']);
 			unset($data['info'][$k]['sign_end'],$data['info'][$k]['act_start'],$data['info'][$k]['act_end']);

+ 2 - 2
service/agent/lib/Option_account.php

@@ -271,9 +271,9 @@ Class Option_account{
 		}
 		if (!$info['zj_price'] || $info['zj_price'] <=0) {
 			if ($info['price'] <= $info['zh_price']) {
-				$zj_price = $info['zh_price'];
+				$zj_price = $info['price'];
 			} elseif ($info['price'] > $info['zh_price']) {
-				$zj_price = $info['zh_price'] - $info['zh_price'];
+				$zj_price = $info['price'] - $info['zh_price'];
 			}
 			$w['where_id'] = $info['id'];
 			$w['zj_price'] = $zj_price;