Merge remote-tracking branch 'origin/developerA' into developerA

src/main/java/com/caimei/www/config/CustomExceptionHandler.java

@@ -2,7 +2,6 @@ package com.caimei.www.config;
 
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import reactor.core.publisher.Mono;
 

src/main/java/com/caimei/www/controller/RedirectController.java

@@ -36,6 +36,10 @@ public class RedirectController {
 	 */
 	@GetMapping("/cmpage/info-1-{id}.html")
 	public String toTopic(@PathVariable("id") Integer type) {
+		// 二手商品【旧】
+		if (Integer.valueOf("189").equals(type)){
+			return "redirect:/flea-market/list.html";
+		}
 		return "redirect:/topic.html?type=" + type;
 	}
 	/**

src/main/java/com/caimei/www/controller/unlimited/HomeController.java

@@ -24,6 +24,10 @@ import java.util.List;
 public class HomeController extends BaseController {
 
 	private static final String HOME_PATH = "index";
+    /** 错误页面 */
+	private static final String ERROR_PATH = "error/404";
+	private static final String SEARCH_CHILDREN = "error/search_children";
+
 
     private HomeService homeService;
     @Autowired
@@ -39,11 +43,27 @@ public class HomeController extends BaseController {
     @GetMapping("/index.html")
     public String home(final Model model) {
         model.addAttribute("msg", "首页");
-        /*List<PageFloor> pageFloors = homeService.getHomePageFloor();*/
-       /* model.addAttribute("pageFloors", pageFloors);*/
         return HOME_PATH;
     }
 
+    /**
+     *  404
+     */
+    @GetMapping("/404.html")
+    public String errorPage(final Model model) {
+        model.addAttribute("msg", "404页面");
+        return ERROR_PATH;
+    }
+
+    /**
+     *  腾讯公益
+     */
+    @GetMapping("/search_children.html")
+    public String searchChildren(final Model model) {
+        model.addAttribute("msg", "腾讯公益");
+        return SEARCH_CHILDREN;
+    }
+
     /**
      * 首页轮播图列表
      * @return
@@ -74,16 +94,6 @@ public class HomeController extends BaseController {
         return homeService.getHomePageFloorData();
     }
 
-    /**
-     * 首页楼层专题数据
-     * @return
-     */
-    /*@GetMapping("/home/topic")
-    @ResponseBody
-    public JsonModel<Map<String, Object>> getHomeTopicData() {
-        return homeService.getHomeTopicData();
-    }*/
-
     /**
      * 首页左侧广告图
      * @return

src/main/resources/static/css/account/register.css

@@ -4,13 +4,13 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-body{background: #FFF url(/img/account/register.png) no-repeat center 84px;background-attachment: fixed;}
+body{background: #FFF url(/img/account/supplierbg.png) no-repeat center 84px;background-attachment: fixed;}
 footer .footTop{display:none;}
 .registerClub{padding: 20px 0 100px 0;}
 .selectAccount{width:1184px;height:558px;text-align:center;margin:0 auto;}
 .selectAccount .title{height:42px;font-size:32px;line-height:42px;font-weight:bold;color:#22272e;padding-top:102px}
 .selectAccount .cont{margin-top:44px}
-.selectAccount .cont span{display:inline-block;width:168px;margin:0 55px;line-height:42px;color:#3b77ff;font-size:24px;cursor:pointer}
+.selectAccount .cont span{display:inline-block;width:190px;margin:0 55px;line-height:42px;color:#3b77ff;font-size:24px;cursor:pointer}
 .selectAccount .cont img{display:inline-block;width:168px;height:168px;background-color:#c2d8fa;border-radius:84px}
 .signAccount.upgrade {width: 968px;margin: 0 auto;}
 .signAccount .title {height: 42px;font-size: 32px;line-height: 42px;font-weight: normal;color: #22272e;padding: 20px 0;text-align: center;}
@@ -65,7 +65,9 @@ footer .footTop{display:none;}
 .formLine .business input[type="text"] {width: 350px;display: block;float: left;margin-right: 15px;}
 .formLine .business a {display: block;float: left; width: 92px;height: 32px;line-height: 34px;font-size: 14px;color: #e15616;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;text-align: center;}
 .supplierConfirm{width: 100%;height: 100%;position: fixed;top:0;left:0;z-index: 999;background: rgba(0,0,0,.3);}
-
+.purchase{font-size: 18px;width: 127px;margin: 10px auto 0;text-align: center}
+.b .purchase{color: #FF7A51}
+.tips-text{color: #999999;font-size: 14px;line-height: 20px;}
 
 }
 
@@ -78,9 +80,9 @@ footer{display:none}
 .registerClub{padding: 20px 0;}
 .registerShop{padding: 20px 0;}
 .selectAccount{width:100%;height:90vh;text-align:center;}
-.selectAccount .title{height:6vw;font-size:4.2vw;font-weight:bold;line-height:6vw;color:#22272e;padding-top:36vw}
+.selectAccount .title{height:6vw;font-size:4.2vw;font-weight:bold;line-height:6vw;color:#22272e;padding-top:15vw}
 .selectAccount .cont{margin-top:10vw;}
-.selectAccount .cont span{display:inline-block;width:24.8vw;margin:0 6.7vw;line-height:4.6vw;color:#3b77ff;font-size:3.4vw;cursor:pointer}
+.selectAccount .cont span{display:inline-block;width:100%;margin:3.7vw 0;line-height:4.6vw;color:#3b77ff;font-size:3.4vw;cursor:pointer}
 .selectAccount .cont img{display:inline-block;width:24.8vw;height:24.8vw;background-color:#c2d8fa;border-radius:12.4vw}
 .signAccount .title-tips{margin-bottom: 3.2vm;width: 100%;height:9.6vw;background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);}
 .signAccount .title-tips p{width: 100%;height:9.6vw;font-family: Microsoft YaHei;font-size:3.1vw;font-weight: normal;font-stretch: normal;line-height: 9.6vw;letter-spacing:0;color: #e15616;text-align: center;}
@@ -137,4 +139,7 @@ footer{display:none}
 .subLine .btn-upgrade {cursor: pointer;display: block;width: 93.4vw;height: 11.2vw;line-height: 50px;background-color: #e15616;border-radius: 0.2vw;text-align: center;font-size: 3.4vw;color: #FFF;float: left;margin-bottom: 2.8vw;}
 .subLine .btn-upgrade.none{border: 1px solid #E15616;background-color: #ffe6dc;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);color: #e15616;}
 .subLine .btn-upgrade.disabled{background-color: #999999;}
+.purchase{font-size: 3.8vw;background: #fff;margin: 2.7vw auto;text-align: center}
+.b .purchase{color: #e15616}
+.tips-text{color: #999999;font-size: 3.4vw;}
 }

src/main/resources/static/css/single-page/promotions.css

@@ -3,6 +3,7 @@ li{list-style:none}
 /**
  * PC端
  */
+ .promotions a.noclick{pointer-events:none}
 @media screen and (min-width:768px){
     .promotions{width:100%;background:#FFF;position:relative;margin-top:16px}
     .promotions a{display:block;font-size:20px;}

src/main/resources/static/js/pay/caimei-paycash.js

@@ -46,7 +46,7 @@ var payContainer = new Vue({
         receiptAmount:'',//已支付金额
         balanceAmount:'',//应付剩余金额
         payAmount:'',//本次支付金额
-        paymentIimit:50000,
+        paymentIimit:10000,
         paymentIimitText:'',
         discernReceiptList:[],//支付记录列表
         tabIndex:0,//支付方式 0 移动支付 1网银支付 2线下转账
@@ -158,10 +158,10 @@ var payContainer = new Vue({
                 if(_self.payAmount > _self.paymentIimit){
                     switch (_self.payInfo.PAY_BANK_NUM) {
                         case 'WEIXIN':
-                            _self.paymentIimitText = '本次支付金额已超出微信支付限额，请输入小于5万的金额进行支付';
+                            _self.paymentIimitText = '本次支付金额已超出微信支付限额，请输入小于1万的金额进行支付';
                             break;
                         case 'ALIPAY':
-                            _self.paymentIimitText = '本次支付金额已超出支付宝限额，请输入小于5万的金额进行支付';
+                            _self.paymentIimitText = '本次支付金额已超出支付宝限额，请输入小于1万的金额进行支付';
                             break;
                     }
                     CAIMEI.Alert(_self.paymentIimitText,'知道了');

src/main/resources/static/js/single-page/page.js

@@ -14,5 +14,15 @@ var freePage = new Vue({
     },
     mounted: function () {
         var _self = this;
+       if (!isPC) {
+            var scale = $(window).width()/1184;
+            var beforeHeight = $(".freePage").height();
+            $(".freePage").css({
+                "width": "1184px",
+                "height": beforeHeight,
+                "transform": "scale("+scale+")",
+                "transform-origin": "0 0"
+            });
+       }
     }
 });

src/main/resources/templates/account/register.html

@@ -16,8 +16,8 @@
     <div class="selectAccount">
         <div class="title">请选择注册的账号类型</div>
         <div class="cont">
-            <span class="a"><img src="/img/account/club.png" @click="clickTab(1)">机构</span>
-            <span class="b"><img src="/img/account/supplier.png"  @click="clickTab(2)">供应商</span>
+            <span class="a"><img src="/img/account/clubPC.png" @click="clickTab(1)"> <p class="purchase">采购方(买家)</p><p class="tips-text">医院机构/美容会所/个人买家</p></span>
+            <span class="b"><img src="/img/account/supplierPC.png"  @click="clickTab(2)"><p class="purchase">供应商(卖家)</p><p class="tips-text">仪器/产品/服务供应商</p></span>
         </div>
     </div>
 </div>

src/main/resources/templates/error/404.html

@@ -4,21 +4,53 @@
 <head>
     <title>采美365网--医疗美容生活美容正品采购平台</title>
     <template th:replace="components/head-link"></template>
-    <link th:href="@{/css/base/404.css(v=${version})}" rel="stylesheet" type="text/css">
+    <style>
+        body {
+            background: #f6f6f6;
+            position: relative;
+        }
+        /** PC端 */
+        @media screen and (min-width:768px){
+            body {
+                min-width: 1184px;
+            }
+            #errorContent{
+                margin-top: 30px;
+                width:1200px!important;
+                min-height:750px!important;
+                height:auto!important;
+                overflow: hidden;
+                border:none;
+            }
+        }
+        /** 移动端 */
+        @media screen and (max-width:768px){
+            #errorContent{
+                width: 100%!important;
+                min-height:250vw!important;
+                height:auto!important;
+                overflow: hidden;
+                border: none;
+            }
+
+        }
+    </style>
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 
 <!-- 404页面 -->
-<div id="errorPage">
-    <img src="/img/base/error.png" alt="404">
-    <h5><a href="/" class="desc_link">回主页</a><a href="javascript:history.go(-1);" class="desc_link">返回上一步</a></h5>
+<div style="text-align:center;">
+    <iframe id="errorContent" src="/search_children.html"></iframe>
 </div>
-
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-<script type="text/javascript" src="//qzonestyle.gtimg.cn/qzone/hybrid/app/404/search_children.js" charset="utf-8" homePageUrl="/" homePageName="返回首页"></script>
+<script type="text/javascript">
+    if(!($('#spiServer').val() && $('#spiServer').val().length>0)){
+        window.location.href = '/404.html';
+    }
+</script>
 </body>
 </html>

src/main/resources/templates/error/search_children.html

@@ -0,0 +1,32 @@
+<!doctype html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>腾讯公益404</title>
+    <style>
+    .desc_link{color:#E15616;}
+    @media screen and (max-width:768px){
+        html,body{min-height:250vw!important;height:auto!important;}
+    }
+    </style>
+</head>
+<body>
+    <script type="text/javascript" src="//qzonestyle.gtimg.cn/qzone/hybrid/app/404/search_children.js" charset="utf-8" homePageUrl="/" homePageName="返回首页"></script>
+    <script type="text/javascript">
+        window.onload=function(){
+            var arr = document.getElementsByTagName("a");
+            for (var i=0; i<arr.length; i++){
+                if(arr[i]){
+                    arr[i].setAttribute("target","_blank");
+                }
+                if(arr[i].className=='desc_link'){
+                　　　arr[i].setAttribute("target","");
+                }
+            }
+        }
+    </script>
+</body>
+</html>

src/main/resources/templates/single-page/page.html

@@ -7,6 +7,7 @@
     <meta http-equiv="description" th:content="${pageData.description}">
     <template th:replace="components/head-link"></template>
     <style type="text/css">
+        #freePage{position:relative;}
         /** PC端 */
         @media screen and (min-width:768px){
             .freePage{width:1184px;margin:0 auto;padding:16px 0;text-align:center;}
@@ -16,7 +17,7 @@
         /** 移动端 */
         @media screen and (max-width:768px){
             header,footer{display: none;}
-            .freePage{width:100vw;margin:0 auto;text-align:center;}
+            .freePage{margin:0 auto;text-align:center;}
             .freePage img {max-width:100%;height:auto !important;}
             .freePage table{width:100%;text-align:left}
         }

src/main/resources/templates/single-page/promotions.html

@@ -13,7 +13,7 @@
 <!-- 二级页面 -->
 <div id="promotionsList">
     <ul class="wrap">
-        <li class="promotions" v-for="item in listData"><a :href="item.link">
+        <li class="promotions" v-for="item in listData"><a :href="item.link" :class="item.status==3?'noclick':''" >
             <img :src="item.image">
             <p v-text="item.title"></p>
             <span v-if="item.status==1" class="time" v-text="''+item.detail">活动时间：活动即将开始</span>