From f802f48299feced1f78ffdff91331deab458f1b8 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Tue, 30 Aug 2022 10:11:56 +0800
Subject: [PATCH] wip

---
 plugins/FlatShipping/Static/image/logo.png | Bin 1966 -> 0 bytes
 plugins/FlatShipping/config.json           |   2 +-
 themes/default/checkout.blade.php          |   6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 plugins/FlatShipping/Static/image/logo.png

diff --git a/plugins/FlatShipping/Static/image/logo.png b/plugins/FlatShipping/Static/image/logo.png
deleted file mode 100644
index ab5c4a5041032ed1c41f3bd263f57da844d93fb0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1966
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
CW{;`>

diff --git a/plugins/FlatShipping/config.json b/plugins/FlatShipping/config.json
index 923ccbc6..06ed736b 100644
--- a/plugins/FlatShipping/config.json
+++ b/plugins/FlatShipping/config.json
@@ -4,7 +4,7 @@
     "description": "按订单总额收取固定运费",
     "type": "shipping",
     "version": "v1.0.0",
-    "icon": "plugin/flat_shipping/image/logo.png",
+    "icon": "",
     "author": {
         "name": "成都光大网络科技有限公司",
         "email": "yangjin@opencart.cn"
diff --git a/themes/default/checkout.blade.php b/themes/default/checkout.blade.php
index 21c30e95..115b61ca 100644
--- a/themes/default/checkout.blade.php
+++ b/themes/default/checkout.blade.php
@@ -118,7 +118,7 @@
                   :id="'payment-method-' + index" class="form-check-input">
                 <img :src="payment.icon" class="img-fluid">
               </div>
-              <div class="right">
+              <div class="right ms-3">
                 <div class="title">@{{ payment.name }}</div>
                 <div class="sub-title" v-html="payment.description"></div>
               </div>
@@ -135,9 +135,9 @@
               <div class="left">
                 <input name="shipping" type="radio" v-model="form.shipping_method_code" :value="shipping.code"
                   :id="'shipping-method-' + index" class="form-check-input">
-                <img :src="shipping.icon" class="img-fluid">
+                <img :src="shipping.icon" class="img-fluid" v-if="shipping.icon">
               </div>
-              <div class="right">
+              <div class="right ms-3">
                 <div class="title">@{{ shipping.name }}</div>
                 <div class="sub-title" v-html="shipping.description"></div>
               </div>