Merge branch 'feature/payEnd' into 'release/5.4'

资源位接口升版本



See merge request !110

@@ -11,7 +11,7 @@ const isTest = process.env.NODE_ENV === 'test';
 
 
 module.exports = {
 module.exports = {
     app: 'h5',
     app: 'h5',
-    appVersion: '5.3.0', // 调用api的版本
+    appVersion: '5.4', // 调用api的版本
     port: 6001,
     port: 6001,
     siteUrl: '//m.yohobuy.com',
     siteUrl: '//m.yohobuy.com',
     assetUrl: '//127.0.0.1:5001',
     assetUrl: '//127.0.0.1:5001',

@@ -114,10 +114,11 @@
 
 
     .fraud-prompt {
     .fraud-prompt {
         height: 62px;
         height: 62px;
-        line-height: 62px;
+        line-height: 63px;
         background-color: #ff7579;
         background-color: #ff7579;
         color: #fff;
         color: #fff;
         overflow: hidden;
         overflow: hidden;
+        background-size: 20% 60%;
     }
     }
 
 
     .fraud-tip {
     .fraud-tip {
@@ -125,11 +126,14 @@
     }
     }
 
 
     .tip {
     .tip {
-        margin: 19px 10px 0 0;
+        margin-right: 10px;
         width: 20px;
         width: 20px;
-        height: 24px;
-        background: resolve("cart/person-tip.png") no-repeat;
+        height: 62px;
+        background: resolve("cart/person-tip.png") no-repeat center;
         float: left;
         float: left;
-        background-size: 100% 100%;
+        background-size: 100% 39%;
+        line-height: 24px;
+        display: inline-block;
+        background-position: center;
     }
     }
 }
 }