bugfix

common/models/forms/OrderForm.php

@@ -94,7 +94,7 @@ class OrderForm extends Model
             'status' => '状态',
             'remark' => '备注',
             'type' => '订单类型',
-            'addressId' => '收货地址',
+            'addressId' => 'Shipping address',// 收货地址
             'payType' => '支付方式',
             'goodsId' => 'product ID',//商品ID
             'goodsNum' => 'Product quantity',//商品数量

frontendApi/modules/v1/controllers/ShopController.php

@@ -146,7 +146,7 @@ class ShopController extends BaseController {
         if (\Yii::$app->request->isPost) {
             $formModel = new OrderForm();
             $formModel->scenario = 'userOrder';
-            $formModel->remark = '复销备注';
+            $formModel->remark = 'FX';//复销备注
             $post = \Yii::$app->request->post();
             $post['type'] = DeclarationForm::TYPE_FX;
             if ($formModel->load($post, '') && $order = $formModel->add()) {
@@ -392,6 +392,7 @@ class ShopController extends BaseController {
 //                $data['list'][$key]['FULL_ADDRESS'] .= Region::getCnName($value['COUNTY']);
 //            }
             $data['list'][$key]['TAX_AMOUNT'] = Tool::formatPrice(($value['REAL_PRICE'] - $value['REAL_PRICE'] / (1 + $value['TAX_RATE'] / 100)) * $value['BUY_NUMS']);
+            $data['list'][$key]['TOTAL_AMOUNT'] = Tool::formatPrice($value['REAL_PRICE'] * $value['BUY_NUMS']);
         }
 
         return static::notice($data);

frontendEle/src/views/finance/recharge-add.vue

@@ -3,7 +3,7 @@
         <div class="white-box">
             <el-form ref="form"  label-width="250px" class="form-page">
                 <el-form-item label="Recharge Amount">
-                    <el-input v-model="form.applyAmount" type="number" min="1" max="10000000000"></el-input>
+                    <el-input-number v-model="form.applyAmount" :min="1" :max="10000000000" label="" style="width: 100%"></el-input-number>
                 </el-form-item>
                 <el-form-item label="Bank account">
                     <el-input v-model="form.bankNo"></el-input>

frontendEle/src/views/shop/index.vue

@@ -60,21 +60,13 @@
                 </el-tab-pane>
             </el-tabs>
             <div class="white-box-footer">
-                <el-row>
-                  <el-col :span="3">
-                      <el-button type="primary" size="small" @click="goToAccounts()">Check Out</el-button><!--去结算-->
-                  </el-col>
-                  <el-col :span="15">
-                      <div class='flex data' style="line-height: 35px; font-size: 14px;">
-                          <div style="margin-right: 2rem;">Price：₦ {{ sell_price_sum }}</div><!--商品价格-->
-                          <div style="margin-right: 2rem;">BV：{{ price_pv_sum }}</div><!--商品BV-->
-                          <div>Tax：₦ {{ tax_sum }}</div><!--商品BV-->
-                      </div>
-                  </el-col>
-                  <el-col :span="6">
-                      <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
-                  </el-col>
-                </el-row>
+                <el-button type="primary" size="small" @click="goToAccounts()">Check Out</el-button><!--去结算-->
+                <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
+            </div>
+            <div class='flex data' style="line-height: 35px; font-size: 14px;margin-top: 20px; border: 1px solid #dcdfe6; border-radius: 4px; padding: 0 15px;">
+              <div style="margin-right: 2rem;">Price：₦ {{ sell_price_sum }}</div><!--商品价格-->
+              <div style="margin-right: 2rem;">BV：{{ price_pv_sum }}</div><!--商品BV-->
+              <div>Tax：₦ {{ tax_sum }}</div><!--商品BV-->
             </div>
         </div>
     </div>
@@ -113,7 +105,7 @@ export default {
                 selectLock:false,
                 goodsCategory: '1',
                 goodsActive: [],
-                maxHeight: tool.getTableHeight(),
+                maxHeight: tool.getTableHeight() - 35,
                 sell_price_sum: 0.00,
                 price_pv_sum: 0.00,
                 tax_sum: 0.00,

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

@@ -2,23 +2,22 @@
     <div v-loading="loading">
         <div class="white-box">
             <el-table class="withdraw-table" :data="tableData" :max-height="maxHeight" style="width: 100%;" :span-method="objectSpanMethod">
-              <el-table-column width="120" label="Product code" prop="SKU_CODE"></el-table-column><!--商品编号-->
+              <el-table-column width="120" label="Product Code" prop="SKU_CODE"></el-table-column><!--商品编号-->
               <el-table-column width="120" label="Product Name" prop="GOODS_TITLE"></el-table-column><!--商品名称-->
-                <el-table-column width="120" label="Quantity" prop="BUY_NUMS"></el-table-column><!--数量-->
-                <el-table-column width="120" label="Product price"><!--商品价格-->
-                    <template slot-scope="props">
-                        {{ Math.round(props.row.REAL_PRICE * props.row.BUY_NUMS * 100) / 100 }}
-                    </template>
-                </el-table-column>
-                <el-table-column width="120" label="Product BV"><!--商品BV-->
-                    <template slot-scope="props">
-                        <span v-if="![4, 5, 6].includes(props.row.CATEGORY_TYPE)">{{ Math.round(props.row.REAL_PV * props.row.BUY_NUMS * 100) / 100 }}</span>
-                        <span v-else>0</span>
-                    </template>
-                </el-table-column>
-                <el-table-column width="120" label="Tax rate" prop="TAX_RATE"></el-table-column><!--税率-->
+              <el-table-column width="120" label="Product Price" prop="REAL_PRICE"><!--商品价格-->
+              </el-table-column>
+              <el-table-column width="120" label="Product BV"><!--商品BV-->
+                <template slot-scope="props">
+                  <span v-if="![4, 5, 6].includes(props.row.CATEGORY_TYPE)">{{ Math.round(props.row.REAL_PV * props.row.BUY_NUMS * 100) / 100 }}</span>
+                  <span v-else>0</span>
+                </template>
+              </el-table-column>
+                <el-table-column width="120" label="Qty" prop="BUY_NUMS"></el-table-column><!--数量-->
+
+                <el-table-column width="120" label="Tax Rate" prop="TAX_RATE"></el-table-column><!--税率-->
                 <el-table-column width="120" label="Tax" prop="TAX_AMOUNT"></el-table-column><!--税额-->
-                <el-table-column width="150" label="Product category" prop="CATEGORY"></el-table-column><!--商品分类-->
+                <el-table-column width="120" label="Total Price" prop="TOTAL_AMOUNT"></el-table-column><!--税额-->
+                <el-table-column width="150" label="Product Category" prop="CATEGORY"></el-table-column><!--商品分类-->
                 <el-table-column width="120" label="Order Code" prop="SN"></el-table-column><!--订单编号-->
                 <el-table-column width="120" label="Member Code" prop="USER_NAME"></el-table-column><!--会员编号-->
                 <el-table-column width="120" label="Member Name" prop="REAL_NAME"></el-table-column><!--会员姓名-->
@@ -80,7 +79,7 @@
   //
       objectSpanMethod(obj) {
 
-        if (obj.columnIndex > 6) {
+        if (obj.columnIndex > 7) {
           // ⼆维数组存储的数据取出
           var _row = this.spanArr[obj.rowIndex];
           var _col = _row > 0 ? 1 : 0;