Merge branch 'master' of http://18.167.157.193:1026/guanli/ngds

frontendApi/modules/v1/controllers/ShopController.php

@@ -487,7 +487,7 @@ class ShopController extends BaseController {
         $uname = Info::getUserNameByUserId(\Yii::$app->user->id);
         $orderSn = \Yii::$app->request->get('orderSn');
 
-        $condition = " AND ORDER_TYPE='FX' AND (USER_ID=:USER_ID OR CREATE_USER='$uname') AND SN=:SN";
+        $condition = " AND (USER_ID=:USER_ID OR CREATE_USER='$uname') AND SN=:SN";
         $params = [
             ':USER_ID' => \Yii::$app->user->id,
             ':SN' => $orderSn,
@@ -636,7 +636,7 @@ ORDER;
                                     <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product code</th>
                                     <th width="25%" style="font-size: 14px; font-weight: bold; text-align: center;">Product name</th>
                                     <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product price</th>
-                                    <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Quantity</th>
+                                    <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Qty</th>
                                     <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax rate</th>
                                     <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax</th>
                                     <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Total amount</th>
@@ -748,7 +748,7 @@ ORDER;
             $data = ApproachDecOrder::lists($condition, $params, [
                 'select' => 'DO.*,U.USER_NAME USER_NAME,U.REAL_NAME REAL_NAME,RU.USER_NAME REC_USER_NAME,RU.REAL_NAME REC_REAL_NAME,CU.USER_NAME CON_USER_NAME,CU.REAL_NAME CON_REAL_NAME,OG.*,OD.PROVINCE,OD.CITY,OD.COUNTY,OD.ADDRESS,OD.MOBILE,OD.PAY_AT,OD.ORDER_AMOUNT',
                 'orderBy' => 'DO.CREATED_AT DESC',
-                'from' => DecOrder::tableName() . ' AS DO',
+                'from' => ApproachDecOrder::tableName() . ' AS DO',
                 'join' => [
                     ['LEFT JOIN', User::tableName() . ' AS U', 'DO.TO_USER_ID=U.ID'],
                     ['LEFT JOIN', User::tableName() . ' AS RU', 'DO.REC_USER_ID=RU.ID'],
@@ -880,7 +880,7 @@ ORDER;
                                     <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product code</th>
                                     <th width="25%" style="font-size: 14px; font-weight: bold; text-align: center;">Product name</th>
                                     <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product price</th>
-                                    <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Quantity</th>
+                                    <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Qty</th>
                                     <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax rate</th>
                                     <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax</th>
                                     <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Total amount</th>

frontendEle/src/views/shop/dec-order-list.vue

@@ -146,7 +146,6 @@
                     } );
 
                     _this.tableData=settingArr;
-                    console.log('11111',_this.tableData);
                     _this.getSpanArr(_this.tableData);
                 });
             },