From 062b86b62419023612bb262f7a6e5b60c137b0d6 Mon Sep 17 00:00:00 2001
From: yin5th <541304803@qq.com>
Date: Fri, 13 May 2022 10:42:59 +0800
Subject: [PATCH] setter
---
app/controller/api/Business.php | 5 +++--
public/kUUW7FwHXa.txt | 1 +
public/static/css/base.css | 4 ++--
public/static/css/style.css | 10 ++++++----
view/page/screen.html | 14 +++++++++++++-
5 files changed, 25 insertions(+), 9 deletions(-)
create mode 100755 public/kUUW7FwHXa.txt
diff --git a/app/controller/api/Business.php b/app/controller/api/Business.php
index cfe05cf..d65c6ab 100644
--- a/app/controller/api/Business.php
+++ b/app/controller/api/Business.php
@@ -393,8 +393,9 @@ class Business extends Base
$data["usingRule"] = DictionaryRepository::getInstance()->getUsingRuleByCouponMainId($couponMain->id);
$data["punishRule"] = '';//处罚规则 已取消
- $pregRule = "/<[img|IMG].*?src=[\'|\"]/(.*?(?:[\.jpg|\.jpeg|\.png|\.gif|\.bmp]))[\'|\"].*?[\/]?>/";
- $data["content"] = preg_replace($pregRule, ' . '${1})
', (string)$couponMain->content );
+ $pregRule = "/<[img|IMG].*?src=[\'|\"][\/storage]{1}(.*?(?:[\.jpg|\.jpeg|\.png|\.gif|\.bmp]))[\'|\"].*?[\/]?>/";
+ $data["content"] = preg_replace($pregRule, ' . '/${1})
', (string)$couponMain->content );
+
// $data["content"] = (string)$couponMain->content;
//未登录可以领取 0可领取 1已领取 2 已领完
diff --git a/public/kUUW7FwHXa.txt b/public/kUUW7FwHXa.txt
new file mode 100755
index 0000000..1f8837b
--- /dev/null
+++ b/public/kUUW7FwHXa.txt
@@ -0,0 +1 @@
+6652428bf01d109ba8459c3ba6e19203
\ No newline at end of file
diff --git a/public/static/css/base.css b/public/static/css/base.css
index aaecb39..14c749d 100644
--- a/public/static/css/base.css
+++ b/public/static/css/base.css
@@ -22,8 +22,8 @@ body {
background-color: #F5F5F5;
font: 12px/1.5 Microsoft YaHei, Heiti SC, tahoma, arial, Hiragino Sans GB, "\5B8B\4F53", sans-serif;
color: #333;
- width: 880px;
- height: 1620px;
+ max-width: 880px;
+ /*height: 1620px;*/
}
/* em 和 i 斜体的文字不倾斜 */
em,
diff --git a/public/static/css/style.css b/public/static/css/style.css
index 57a9061..1ec0d1c 100644
--- a/public/static/css/style.css
+++ b/public/static/css/style.css
@@ -3,7 +3,8 @@
z-index: 100;
top: 0;left: 0;right: 0;
background-color: red;
- height: 200px;
+ max-height: 200px;
+ padding-bottom: 4px;
/* overflow: hidden; */
}
.head-box img{
@@ -12,8 +13,9 @@
}
/* 轮播样式 start */
.banner-swiper {
- width: 880px;
- overflow-x: hidden;
+ /*width: 880px;*/
+ width: 100%;
+ /*overflow-x: hidden;*/
position: fixed;
left: 0;
right: 0;
@@ -21,7 +23,7 @@
padding: 0 30px;
margin: 0 auto;
height: 1440px;
- /* max-width: 880px; */
+ max-width: 880px;
}
.banner-swiper::-webkit-scrollbar{
display: none;
diff --git a/view/page/screen.html b/view/page/screen.html
index 000797e..016b42f 100644
--- a/view/page/screen.html
+++ b/view/page/screen.html
@@ -66,6 +66,8 @@
pauseOnMouseEnter: true,
//鼠标置于swiper时暂停自动切换，鼠标离开时恢复自动切换。
},
+ simulateTouch: false,//禁止鼠标模拟
+ allowTouchMove: false,
direction : 'vertical',
//轮播切换方向默认向左：horizontal、向右：vertical
// height: 400,//slide高度
@@ -195,8 +197,18 @@
}
}
+
-
+