跨境商品调整

backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -105,7 +105,6 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
         if(!$this->columns){
             $this->columns = [
                 'ID' => null,
-                'SN' => null,
                 'DEC_SN' => null,
                 'USER_NAME' => [
                     'header' => '会员编号',
@@ -235,8 +234,8 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                                 return '充值账户';
                             case 'exchange':
                                 return '兑换点数';
-                            case 'iPay88':
-                                return '在线支付';
+                            case 'ALiPay':
+                                return '支付宝';
                             default:
                                 return '复消积分';
                         }

common/helpers/Logistics.php

@@ -149,7 +149,9 @@ class Logistics
             'post_code' => '14000', // $order['ZIP_CODE'],  // 收件人邮政编码 TODO: '14000'
             'address' => $order['ADDRESS'],    // 送货地址
             'consignee' => $order['CONSIGNEE_REAL_NAME'],  // 收货人姓名，使用订单中的收货人真实姓名
+            'consignee_ic_number' => $order['CONSIGNEE_ID_NO'],
             'telephone' => $order['MOBILE'],  // 收件人电话号码
+            'sender' => $order['CONSIGNEE_REAL_NAME'],
             'products' => [
                 [
                     'product_no' => $order['SKU_CODE'], // 客户系统中的产品编号

common/models/ShopGoods.php

@@ -172,8 +172,8 @@ class ShopGoods extends \common\components\ActiveRecord
             'exchange' => [
                 'name' => '无业绩兑换点数'
             ],
-            'iPay88' => [
-                'name' => 'iPay88'
+            'ALiPay' => [
+                'name' => '支付宝'
             ],
         ];
     }

common/models/forms/ApproachOrderForm.php

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

frontendApi/config/menu.php

@@ -31,7 +31,7 @@ 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'=>'IPay88支付', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'i-pay88', 'routePath'=>'shop/i-pay88', 'show'=>0,],
+            ['name'=>'ALiPay', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'i-pay88', 'routePath'=>'shop/i-pay88', 'show'=>0,],
         ]
     ],
     'user'=>[

frontendApi/modules/v1/controllers/ShopController.php

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

frontendEle/src/views/shop/index.vue

@@ -96,6 +96,14 @@ export default {
                 console.log(val);
             },
             goToAccounts() {
+                if (this.cate.length > 1) {
+                  this.$message({
+                    message: '海内商品、海外商品只能选择一种',
+                    type: 'warning'
+                  })
+                  return false
+                }
+
                 this.is_go_order=true;
                 // this.multipleSelection.map((item,index)=>{
                 //     item.chose_num = parseInt(item.chose_num);

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

@@ -17,7 +17,7 @@
         </el-table-column>
         <el-table-column label="订单编号" prop="SN">
           <template slot-scope="{row}">
-            <el-link v-if="row.PAY_TYPE == 'iPay88'" href="https://taoplus.com.my/index.php?route=information/order_tracking/json&order_tracking_search=TBS10182495KJ2430" target="_blank">{{ row.SN }}</el-link>
+            <el-link v-if="row.PAY_TYPE === 'ALiPay'" href="https://taoplus.com.my/index.php?route=information/order_tracking/json&order_tracking_search=TBS10182495KJ2430" target="_blank">{{ row.SN }}</el-link>
 <!--            <el-link @click="showLogistics(row.SN)">{{ row.SN }}</el-link>-->
             <span v-else>{{ row.SN }}</span>
           </template>

frontendEle/src/views/shop/order-overseas.vue

@@ -30,16 +30,16 @@
                 </el-table>
             </div>
 
-            <div class="address_box">
-                收件人信息：
+            <div class="box address_box">
+                <div style="min-width: 65px;">收件人：</div>
                 <div class="sum" style="margin-top: 5px; margin-bottom: 5px;">
                   <div class="sum_box">
-                    <div>真实姓名</div>
-                    <div><el-input size="small" v-model="consigneeRealName" style="width: 300px;"></el-input></div>
+                    <div style="min-width: 70px; font-size: 14px; margin-right: 0;">真实姓名<span style="color: red;">*</span></div>
+                    <div><el-input size="small" v-model="consigneeRealName" style="min-width: 150px;"></el-input></div>
                   </div>
                   <div class="sum_box" style="margin-top: 5px;">
-                    <div>身份证号</div>
-                    <div> <el-input size="small" v-model="consigneeIdNo" style="width: 300px;"></el-input></div>
+                    <div style="min-width: 70px; font-size: 14px; margin-right: 0;">身份证号<span style="color: red;">*</span></div>
+                    <div><el-input size="small" v-model="consigneeIdNo" style="min-width: 150px;"></el-input></div>
                   </div>
                 </div>
             </div>
@@ -49,9 +49,8 @@
                     <div v-for="(item , index) in all_address" :key='index' class="address">
                         <el-radio :label="item.ID" >
                             {{item.PROVINCE_NAME}}省{{item.CITY_NAME}}市{{item.COUNTY_NAME}}县&nbsp;&nbsp;&nbsp;&nbsp;
-                            详细地址{{item.ADDRESS}}
-                            邮编{{item.ZIP_CODE}}
-                            收件人姓名：{{item.CONSIGNEE}}&nbsp;&nbsp;&nbsp;&nbsp;
+                            详细地址：{{item.ADDRESS}}
+                            邮编：{{item.ZIP_CODE}}
                             手机号码：{{item.MOBILE}}
                         </el-radio>
                     </div>
@@ -70,10 +69,6 @@
             <div class="box address_box">
                 合计：
                 <div class="sum">
-                    <div class="sum_box">
-                        <div>运费</div>
-                        <div>￥{{ freight }}元</div>
-                    </div>
                     <div class="sum_box">
                         <div>实付金额</div>
                         <div>￥{{ cashSum }}元</div>
@@ -85,7 +80,7 @@
             </div>
         </div>
 
-      <el-dialog title="支付" v-if="visible" :visible.sync="visible" width="30%" :before-close="handleClose">
+      <el-dialog title="支付" v-if="visible" :visible.sync="visible" width="450px" :before-close="handleClose">
         <div class="app-container">
           <div v-loading="loading" class="white-box">
             <form method="post" name="ePayment" :action="actionUrl">
@@ -110,7 +105,7 @@
         </div>
       </el-dialog>
 
-      <el-dialog title="支付成功" :visible.sync="payDialog" :show-close="false" width="350px" :close="handleOrderList">
+      <el-dialog title="支付成功" :visible.sync="payDialog" :show-close="false" width="320px" :close="handleOrderList">
         <el-result icon="success" title="支付成功">
           <template slot="extra">
             <span style="color: #008efa; font-size: 30px;">{{ countdown }}</span>
@@ -119,8 +114,9 @@
       </el-dialog>
 
       <el-dialog title="提示" :visible.sync="IDCardDialog" width="350px">
-        <el-result icon="info" title="提示" subTitle="购买跨境商品需要上传身份证信息，如已上传请忽略">
+        <el-result icon="warning" title="">
           <template slot="extra">
+            <span style="font-size: 15px;">购买跨境商品必须上传<span style="color: red;">收件人身份信息</span>，如已上传请忽略</span><br /><br />
             <el-button type="primary" size="medium" @click="uploadIDCard">去上传</el-button>
           </template>
         </el-result>
@@ -320,12 +316,12 @@
               this.goodsId=goodsId;
               //增加运费03-12yuan
               let payAmount = tool.sum(cash_plus_sum);
-
-              if(payAmount>=300){
-                this.pointFreight = this.freight = 0;
-              }else{
-                this.pointFreight = this.freight = 15;
-              }
+              this.pointFreight = 0
+              // if(payAmount>=300){
+              //   this.pointFreight = this.freight = 0;
+              // }else{
+              //   this.pointFreight = this.freight = 15;
+              // }
 
             this.pointsSum = this.cashSum = tool.formatPrice(tool.sum(cash_plus_sum) + this.freight) ;
           },
@@ -346,7 +342,7 @@
 
                   for(let key in response.payList){
                     // 如果是海外商品,则只有在线支付
-                    if (key == 'iPay88') {
+                    if (key === 'ALiPay') {
                       this.payList.push({type:key, name:response.payList[key].name})
                       break;
                     }

frontendEle/src/views/shop/order.vue

@@ -245,7 +245,7 @@
                         }
                     })
                     for(let key in response.payList){
-                        if (key === 'iPay88') {
+                        if (key === 'ALiPay') {
                           continue
                         }
                         this.payList.push({type:key,name:response.payList[key].name})