From 9a129508d14ad3371d58c6d41089cfa9b1e7463a Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Sat, 18 May 2019 00:04:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/plugins/freightfee/service/Service.php | 2 +-
 public/static/index/default/css/user.css           | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/plugins/freightfee/service/Service.php b/application/plugins/freightfee/service/Service.php
index 7191003e6..751f3fb1a 100644
--- a/application/plugins/freightfee/service/Service.php
+++ b/application/plugins/freightfee/service/Service.php
@@ -50,7 +50,7 @@ class Service
             // 地区
             foreach($data['data'] as &$v)
             {
-                $v['region_names'] = empty($v['region_show']) ? '' : implode('、', Db::name('Region')->where('id', 'in', explode('-', $v['region_show']))->column('name'));
+                $v['region_names'] = (empty($v['region_show']) || $v['region_show'] == 'default') ? '' : implode('、', Db::name('Region')->where('id', 'in', explode('-', $v['region_show']))->column('name'));
             }
 
             // 商品列表
diff --git a/public/static/index/default/css/user.css b/public/static/index/default/css/user.css
index 2dac8e2d9..b82da8d1b 100755
--- a/public/static/index/default/css/user.css
+++ b/public/static/index/default/css/user.css
@@ -107,8 +107,10 @@
     top: -1px;
     left: -1px;
 }
-.my-content form.am-form .form-verify:hover a.form-verify-tips {
-    display: block;
+@media only screen and (max-width:641px) {
+    .my-content form.am-form .form-verify:hover a.form-verify-tips {
+        display: block;
+    }
 }
 
 /**
-- 
GitLab