kevin_zhangl 2 лет назад
Родитель
Сommit
73b0271f17

+ 1 - 1
backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -234,7 +234,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                                 return '充值账户';
                             case 'exchange':
                                 return '兑换点数';
-                            case 'ALiPay':
+                            case 'online':
                                 return '在线支付';
                             default:
                                 return '复消积分';

+ 1 - 1
common/models/ShopGoods.php

@@ -172,7 +172,7 @@ class ShopGoods extends \common\components\ActiveRecord
             'exchange' => [
                 'name' => '无业绩兑换点数'
             ],
-            'ALiPay' => [
+            'online' => [
                 'name' => '在线支付'
             ],
         ];

+ 1 - 1
common/models/forms/ApproachOrderForm.php

@@ -182,7 +182,7 @@ class ApproachOrderForm extends Model
      */
     public function isPayType($attribute)
     {
-        if ($this->payType != 'ALiPay'){
+        if ($this->payType != 'online'){
             $this->addError('支付方式错误');
         }
 

+ 0 - 1
frontendApi/config/menu.php

@@ -31,7 +31,6 @@ return [
             ['name'=>'复消商品', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'reconsume', 'routePath'=>'shop/reconsume', 'show'=>1,'allow'=>'studio'],
             ['name'=>'报单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,'allow'=>'declarer',],
             ['name'=>'订单列表', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],
-            ['name'=>'ALiPay', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'i-pay88', 'routePath'=>'shop/i-pay88', 'show'=>0,],
         ]
     ],
     'user'=>[

+ 1 - 1
frontendApi/modules/v1/controllers/ShopController.php

@@ -508,7 +508,7 @@ class ShopController extends BaseController {
                     ':CREATED_AT_END' => $createdAtEnd,
                     ':STATUS' => \Yii::$app->params['orderStatus']['paid']['value'],
                     ':SEND_AT' => 0,
-                    'PAY_TYPE' => 'ALiPay',
+                    'PAY_TYPE' => 'online',
                 ]
             )
             ->select('O.*,U.REAL_NAME,OG.REAL_PRICE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV')

+ 1 - 1
frontendEle/src/views/shop/order-list.vue

@@ -17,7 +17,7 @@
         </el-table-column>
         <el-table-column label="订单编号" prop="SN">
           <template slot-scope="{row}">
-            <span v-if="row.PAY_TYPE === '支付'" @click="showLogistics(row.SN)" style="cursor: pointer;">{{ row.SN }} <i class="el-icon-truck" style="color: #2c5ca9; font-size: 15px;"></i></span>
+            <span v-if="row.PAY_TYPE === '在线支付'" @click="showLogistics(row.SN)" style="cursor: pointer;">{{ row.SN }} <i class="el-icon-truck" style="color: #2c5ca9; font-size: 15px;"></i></span>
             <span v-else>{{ row.SN }}</span>
           </template>
         </el-table-column>