fix 下单时收货地址

frontendApi/modules/v1/controllers/ShopController.php

@@ -92,8 +92,6 @@ class ShopController extends BaseController {
         if($allAddress) {
             foreach ($allAddress as $key => $row) {
                 $allAddress[$key]['PROVINCE_NAME'] = Region::getCnName($row['PROVINCE']);
-                $allAddress[$key]['CITY_NAME'] = Region::getCnName($row['CITY']);
-                $allAddress[$key]['COUNTY_NAME'] = Region::getCnName($row['COUNTY']);
             }
         }
         $userBalance = [

frontendEle/src/views/shop/order.vue

@@ -161,8 +161,9 @@
                 :close="processClose"
             >
                 <el-button type="primary" size="small">支 付</el-button>
-<!--                <el-button type="danger" size="small"  class="cancelButton" @click="handleClose">取 消</el-button>-->
+<!--                -->
             </paystack>
+            <el-button type="danger" size="small"  class="cancelButton" @click="handleClose">取 消</el-button>
         </el-dialog>
     </div>
 </template>