发布从测试版本2.3.4

app/Gdoo/Order/views/order/create.blade.php

@@ -125,6 +125,8 @@ var form_action = '{{$action}}';
             query.customer_id = customer_id;
         },
         onSelect(row, selected) {
+            row.is_gift_name = '否';
+            row.is_gift = 0;
             if (row.product_code == '99001') {
                 row.type_id_name = '费用';
                 row.type_id = 5;
@@ -270,6 +272,8 @@ var form_action = '{{$action}}';
                         var rows = $ref_promotion_data.api.getSelectedRows();
                         for (let i = 0; i < rows.length; i++) {
                             var row = rows[i];
+                            row.is_gift_name = '是';
+                            row.is_gift = 1;
                             row.quantity = row.wsy_num;
                             row.delivery_quantity = row.quantity;
                             row.total_weight = row.quantity * row.weight;

app/Gdoo/Order/views/report/city.blade.php

@@ -21,7 +21,7 @@
 
 <th style="white-space:nowrap"></th>
 
-@if(count($categorys))
+@if($categorys)
     @foreach($categorys as $k => $v)
         @if($v['parent_id'] == 226)
             <th nowrap="nowrap">{{$v['name']}}</th>
@@ -39,7 +39,7 @@
 -->
 </tr>
 
-@if(count($now_year_single['money']))
+@if($now_year_single['money'])
 @foreach($now_year_single['money'] as $key => $value)
 
 <tr>
@@ -50,7 +50,7 @@
 
 <td align="center" style="vertical-align:middle;color:#999;">销售金额(元)</td>
 
-@if(count($categorys)) 
+@if($categorys)
 @foreach($categorys as $k => $v)
     @if($v['parent_id'] == 226)
 	   <td align="right">
@@ -96,7 +96,7 @@
 
 <td align="center" style="vertical-align:middle;color:#999;">去年同期增长率</td>
 
-@if(count($categorys))
+@if($categorys)
     @foreach($categorys as $category_id => $category)
         @if($category['parent_id'] == 226)
         <td align="right" title="去年同期增长率" nowrap="nowrap">
@@ -133,7 +133,7 @@
 
 <tr>
     <td align="center" style="vertical-align:middle;color:#999;">占区域该品类百分比</td>
-	@if(count($categorys)) 
+	@if($categorys)
     @foreach($categorys as $k => $v)
         @if($v['parent_id'] == 226)
     		<td align="right" title="占区域该品类百分比">

app/Gdoo/Order/views/report/single.blade.php

@@ -24,7 +24,7 @@
             </select>
 
             &nbsp;年份
-            <input type="text" id="year" name="year" onclick="datePicker({dateFmt:'yyyy'});" value="{{$select['select']['year']}}" class="form-control input-sm">
+            <input type="text" id="year" name="year" autocomplete="off" onclick="datePicker({dateFmt:'yyyy'});" value="{{$select['query']['year']}}" class="form-control input-sm">
 
             <button type="submit" class="btn btn-default btn-sm">筛选</button>
         </form>