diff --git a/Application/Common/View/public/header.html b/Application/Common/View/public/header.html
index aaa4b86..abf8e31 100644
--- a/Application/Common/View/public/header.html
+++ b/Application/Common/View/public/header.html
@@ -3,7 +3,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<meta name="keywords" content=""/>
<meta name="description" content=""/>
-<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/>
+<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0,user-scalable=no"/>
<title>芯掌柜</title>
<link rel="shortcut icon" href="__PUBLIC__/images/logo.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="__PUBLIC__/css/common/base.css">
diff --git a/Application/Common/View/public/indexheader.html b/Application/Common/View/public/indexheader.html
index 96558fe..76b16e9 100644
--- a/Application/Common/View/public/indexheader.html
+++ b/Application/Common/View/public/indexheader.html
@@ -17,7 +17,7 @@
<div class="fl btn btn_blue app_btn">APP</div>
<div class="fl btn btn_yellow web_btn">网页版</div>
<div class="pull_qrcode xcx_qrcode header_qrcode">
- <img src="__PUBLIC__/images/xcx.jpg " alt="">
+ <img src="__PUBLIC__/images/xcxm.png" alt="">
<p>微信小程序</p>
</div>
<div class="pull_qrcode header_qrcode app_qrcode">
diff --git a/Application/Index/View/Index/index.html b/Application/Index/View/Index/index.html
index 4ce9a50..da3bf96 100644
--- a/Application/Index/View/Index/index.html
+++ b/Application/Index/View/Index/index.html
@@ -47,7 +47,7 @@
<img src="__PUBLIC__/images/lb2.png" alt="">
<div class="qrcode_div">
<div class="xcx_div">
- <img src="__PUBLIC__/images/xcx.jpg" alt="">
+ <img src="__PUBLIC__/images/xcxm.png" alt="">
</div>
<p>微信扫一扫，进入小程序</p>
</div>
@@ -151,7 +151,7 @@
</div> -->
<div class="about_us_qrcode">
<div class="qrcode" style="margin:0">
- <img src="__PUBLIC__/images/xcx.jpg" alt="">
+ <img src="__PUBLIC__/images/xcxm.png" alt="">
<p>微信小程序</p>
</div>
<div class="qrcode">
@@ -299,8 +299,16 @@
</div>
<div class="xcx_mask">
<div class="mask_img_div">
- <img src="__PUBLIC__/images/xcx.jpg" alt="">
- <p>微信小程序<br/>长按图片</p>
+ <img src="__PUBLIC__/images/xcxm.png" alt="">
+ <p class="mask_title bold">微信小程序</p>
+ <p class="mask_li mask_li1">
+ <span>1</span>
+ 长按识别小程序二维码，进入小程序
+ </p>
+ <p class="mask_li">
+ <span>2</span>
+ 截图保存此二维码，微信扫一扫进入
+ </p>
</div>
</div>
diff --git a/dist/css/index.css b/dist/css/index.css
index 51aab42..a6ffdc3 100644
--- a/dist/css/index.css
+++ b/dist/css/index.css
@@ -575,22 +575,38 @@
display: none;
}
.mobile_wrapper .xcx_mask .mask_img_div {
- width: 70%;
+ width: 80%;
position: absolute;
- top: 20%;
- left: 15%;
- height: 200px;
+ top: 15%;
+ left: 10%;
background-color: #fff;
border-radius: 8px;
- padding: 10% 0;
+ padding: 8.57142857vw 0;
text-align: center;
}
.mobile_wrapper .xcx_mask .mask_img_div img {
width: 60%;
}
-.mobile_wrapper .xcx_mask .mask_img_div p {
- margin-top: 4.28571429vw;
- font-size: 3.42857143vw;
- line-height: 140%;
- color: #ADB6BF;
+.mobile_wrapper .xcx_mask .mask_img_div .mask_title {
+ color: #2E3033;
+ font-size: 5.14285714vw;
+ margin: 6.42857143vw 0;
+}
+.mobile_wrapper .xcx_mask .mask_img_div .mask_li {
+ font-size: 3.71428571vw;
+ color: #8A9299;
+}
+.mobile_wrapper .xcx_mask .mask_img_div .mask_li.mask_li1 {
+ margin-bottom: 2.85714286vw;
+}
+.mobile_wrapper .xcx_mask .mask_img_div .mask_li span {
+ display: inline-block;
+ height: 5.28571429vw;
+ width: 5.28571429vw;
+ border-radius: 50% 50%;
+ color: #FEFEFE;
+ background-color: #61A0F2;
+ text-align: center;
+ line-height: 5.28571429vw;
+ margin-right: 1.85714286vw;
}
diff --git a/dist/css/index.less b/dist/css/index.less
index 07bd505..166e16f 100644
--- a/dist/css/index.less
+++ b/dist/css/index.less
@@ -707,34 +707,42 @@
z-index:100000;
display: none;
.mask_img_div{
- width:70%;
+ width:80%;
position: absolute;
- top:20%;
- left:15%;
- height:200px;
+ top:15%;
+ left:10%;
background-color: #fff;
border-radius: 8px;
- padding:10% 0;
+ padding:60vw/@fixedNum 0;
text-align: center;
img{
width:60%;
}
- p{
- margin-top:30vw/@fixedNum;
- font-size: 24vw/@fixedNum;
- line-height: 140%;
- color:#ADB6BF;
+ .mask_title{
+ color:#2E3033;
+ font-size: 36vw/@fixedNum;
+ margin:45vw/@fixedNum 0
+ }
+ .mask_li{
+ font-size: 26vw/@fixedNum;
+ color:#8A9299;
+ &.mask_li1{
+ margin-bottom:20vw/@fixedNum;
+ }
+ span{
+ display: inline-block;
+ height:37vw/@fixedNum;
+ width:37vw/@fixedNum;
+ border-radius: 50% 50%;
+ color:#FEFEFE;
+ background-color: #61A0F2;
+ text-align: center;
+ line-height: 37vw/@fixedNum;
+ margin-right:13vw/@fixedNum
+ }
}
}
- // img{
- // position: absolute;
- // top:50%;
- // left:50%;
- // height:200vw/@fixedNum;
- // width:200vw/@fixedNum;
- // margin:-100vw/@fixedNum 0 0 -100vw/@fixedNum;
- // }
}
}
\ No newline at end of file
diff --git a/dist/images/xcx.jpg b/dist/images/xcx.jpg
deleted file mode 100644
index 20c36c7..0000000
Binary files a/dist/images/xcx.jpg and /dev/null differ
diff --git a/dist/images/xcxm.png b/dist/images/xcxm.png
new file mode 100644
index 0000000..b309c9e
Binary files /dev/null and b/dist/images/xcxm.png differ