dever il y a 3 ans
Parent
commit
421bda4e00
4 fichiers modifiés avec 12 ajouts et 17 suppressions
  1. 1 1
      app/cash/database/store.php
  2. 9 14
      app/cash/lib/Set.php
  3. 1 1
      main/database/news.php
  4. 1 1
      main/template/pc/home.php

+ 1 - 1
app/cash/database/store.php

@@ -106,7 +106,7 @@ return array
             'desc'      => '对账金额',
             'match'     => 'option',
             'update'    => 'text',
-            'list'      => true,
+            //'list'      => true,
         ),
 
         'num'      => array

+ 9 - 14
app/cash/lib/Set.php

@@ -165,8 +165,12 @@ class Set
 
         </tr>';
 
-        if ($type == 'store' && $show == 2) {
+        if ($type == 'store') {
+            $html .= '<tr>
+              <td width="80">商品数量</td>
+              <td>'.$this->table(false, array(array($info['num']))).'</td>
 
+            </tr>';
         } else {
             $html .= '<tr>
               <td width="80">对账金额</td>
@@ -174,15 +178,6 @@ class Set
 
             </tr>';
         }
-        
-
-        if ($type == 'store') {
-            $html .= '<tr>
-              <td width="80">商品数量</td>
-              <td>'.$this->table(false, array(array($info['num']))).'</td>
-
-            </tr>';
-        }
 
         if ($show == 1) {
             $html .= '<tr>
@@ -268,7 +263,7 @@ class Set
 
                     $head = array('结算单号', '订货单号', '结算类型', '下单日期', '完成日期', '结算日期', '对账金额');
                     if ($type == 'store') {
-                        $head[] = '商品数量';
+                        $head[6] = '商品数量';
                     }
                     $head[] = '结算状态';
 
@@ -284,7 +279,7 @@ class Set
                     );
 
                     if ($type == 'store') {
-                        $d[] = $v['num'];
+                        $d[6] = $v['num'];
                     }
                     $d[] = '已入账';
                     $body[] = $d;
@@ -398,7 +393,7 @@ class Set
             '对账金额',
         );
         if ($type == 'store') {
-            $head[] = '商品数量';
+            $head[6] = '商品数量';
         }
         $head[] = '结算状态';
         if ($data) {
@@ -424,7 +419,7 @@ class Set
                 $body[$k][5] = $fdate;
                 $body[$k][6] = $cash;
                 if ($type == 'store') {
-                    $body[$k][] = $v['num'];
+                    $body[$k][6] = $v['num'];
                 }
                 $body[$k][] = '已入账';
             }

+ 1 - 1
main/database/news.php

@@ -120,7 +120,7 @@ return array
 			'match' 	=> 'option',
 			'update'	=> 'image',
 			'key' 		=> '1',
-			'place'		=> '380*158',
+			'place'		=> '378*224',
 			//直接上传到云端
 			//'upload'	=> 'qiniu',
 			//上传大数据

+ 1 - 1
main/template/pc/home.php

@@ -38,7 +38,7 @@ $view
 	        (
 	            'src' => '$v.pic_cover',
 	        ),
-	        'dd' => '$v.name',	
+	        'dd' => array('html' => '$v.name'),	
         ),
     )
 )