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

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8100
+  port: 8081
 spring:
   application:
     # 指定服务名

src/main/resources/config/beta/application-beta.yml

@@ -3,9 +3,9 @@ spring:
     cache: true  #是否使用缓存
   #数据源连接--start
   datasource:
-    url: jdbc:mysql://10.104.50.235:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://10.104.59.165:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
-    password: J5p";~OVazNl%y)?
+    password: 05bZ/OxTB:X+yd%1
     # Hikari will use the above plus the following to setup connection pooling
     type: com.zaxxer.hikari.HikariDataSource
     hikari:

src/main/resources/config/dev/application-dev.yml

@@ -4,7 +4,7 @@ spring:
   #数据源连接--start
   datasource:
     #driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.2.101:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
     password: 05bZ/OxTB:X+yd%1
 #    url: jdbc:mysql://119.29.0.46:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai

src/main/resources/config/prod/application-prod.yml

@@ -3,9 +3,9 @@ spring:
     cache: true  #是否使用缓存
   #数据源连接--start
   datasource:
-    url: jdbc:mysql://10.104.172.219:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-    username: developer
-    password: diKtPYZ'wToI&9#L
+    url: jdbc:mysql://rm-wz928s8btl7kxil44.mysql.rds.aliyuncs.com:3306/caimei?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
+    username: coder
+    password: diKtPYZ%wToI&9#L
     # Hikari will use the above plus the following to setup connection pooling
     type: com.zaxxer.hikari.HikariDataSource
     hikari:
@@ -20,7 +20,7 @@ spring:
   #数据源连接--end
 
   redis:
-    host: 10.104.172.216
+    host: 172.31.165.23
     port: 6379
     #password: 6#xsI%b4o@5c3RoE
     #Redis数据库索引（默认为0）
@@ -41,7 +41,7 @@ spring:
 #日志配置
 logging:
   file:
-    path: /mnt/newdatadrive/data/runtime/tomcat-instance/www/logs
+    path: /mnt/newdatadrive/data/runtime/jar-instance/www/logs
   level:
     root: info
 
@@ -62,7 +62,7 @@ fdfs:
     width: 150
     height: 150
   tracker-list:            #TrackerList参数,支持多个
-  - 10.104.172.219:22122
+  - 172.31.165.24:22122
 
 http:
   multipart:

src/main/resources/static/css/index/index_new.pc.css

@@ -132,7 +132,7 @@ li{list-style:none;}
     height: 42px;
     float: left;
     box-sizing: border-box;
-    margin-top: 5px;
+    margin-top: 10px;
     padding: 0 8px;
     white-space: normal;
     word-break: break-all;
@@ -214,7 +214,7 @@ li{list-style:none;}
     height: 24px;
     box-sizing: border-box;
     float: left;
-    margin-top: 5px;
+    margin-top: 2px;
 }
 .section_page .page_main_price .main_price_none.sec{
     margin-top: 25px;

src/main/resources/static/css/product/detail.pc.css

@@ -30,6 +30,7 @@ li{list-style:none;}
 .productBox .detailBox .none-details.show{opacity: 1;}
 .productBox .detailBox .detail hr{border:none;border-top:1px dashed #E2E7EF;margin:12px 0}
 .productBox .detailBox .row{padding:3px 0 3px 80px;line-height:24px;}
+.productBox .detailBox .row.actStatus{position: relative}
 .productBox .detailBox .row .l{display:inline-block;min-width:60px;height:24px;text-align:justify;vertical-align:top;margin-left:-80px;}
 .productBox .detailBox .row .l:after{content:'';display:inline-block;width:100%}
 .productBox .detailBox .row>i{font-style:normal;}
@@ -47,7 +48,7 @@ li{list-style:none;}
 .productBox .detailBox .price .icon.i3:before{background-position:-295px -208px}
 .productBox .detailBox .price .icon.i4:before{background-position:-295px -242px}
 .productBox .detailBox .price .icon.i5:before{background-position:-295px -276px}
-.productBox .detailBox .priceTag {position:absolute;top:0;left:88px;}
+.productBox .detailBox .priceTag {position:absolute;top:0px;left:88px;}
 .productBox .detailBox .number{display:inline-block;width:96px;line-height:24px;height:24px;box-sizing:border-box;border:1px solid #FFE6DC;border-radius:2px;font-size:0;white-space:nowrap;text-align:center;overflow:hidden;vertical-align:top;}
 .productBox .detailBox .number>em{display:inline-block;width:24px;height:22px;background:#FFE6DC;font-size:20px;font-style:normal;line-height:20px;vertical-align:top;cursor:pointer}
 .productBox .detailBox .number input{width:48px;border:none;line-height:22px;font-size:14px;vertical-align:top;text-align:center;color:#E15616;}

src/main/resources/static/css/product/instruement-list.css

@@ -3,8 +3,8 @@
     .crumbs-nav{height: 40px}
     .crumbs-nav .crumbs-link{color:#4a4f58 }
     .sortBox li:before,.sortBox li:after{position:absolute;right:35px;content:'';width:0;height:0;border-style:solid}
-    .sortBox li:before{border-width:0 5px 5px 5px;border-color:transparent transparent #BEC2C9 transparent;top:23px}
-    .sortBox li:after{border-width:5px 5px 0 5px;border-color:#BEC2C9 transparent transparent transparent;top:30px}
+    .sortBox li:before{border-width:0 5px 5px 5px;border-color:transparent transparent #BEC2C9 transparent;top:27px}
+    .sortBox li:after{border-width:5px 5px 0 5px;border-color:#BEC2C9 transparent transparent transparent;top:34px}
     .sortBox li:first-child:before,.sortBox li:first-child:after{display:none}
     .sortBox li.up:before{border-bottom-color:#E15616}
     .sortBox li.up:after{border-top-color:#E15616;opacity:.3}
@@ -40,6 +40,7 @@
         width:1040px;
         display: inline-block;
         border-left: 1px solid #f7f7f7;
+        font-size: 0;
     }
     .classification .class-nav-main div.on{
         color: #e15616;
@@ -73,7 +74,7 @@
     }
     .list-container ul li.productItem {
         width: 184px;
-        height: 288px;
+        height: 268px;
         float: left;
         background: #fff;
         position: relative;
@@ -83,11 +84,12 @@
     }
     .list-container ul li img {
         width: 100%;
-        height: 184px;
+        height: 164px;
     }
     .list-container ul li .name{
         display: block;
-        padding: 0 16px;
+        padding: 0 8px;
+        margin-top: 8px;
         height: 40px;
         line-height: 21px;
         vertical-align: middle;
@@ -100,6 +102,10 @@
     }
     .productItem .price{
         border: 0;
+        box-sizing: border-box;
+        padding: 0 8px;
+        height: 54px;
+        width: 100%;
     }
     .productItem .price .icon:before{
         width: 63px;
@@ -140,6 +146,10 @@
     }
     .productItem .price em{font-weight: normal}
     .productItem .price em.bold{font-weight: bold}
+    .productItem .price .price_text_tag{width: 100%;height: 22px;box-sizing: border-box;float: left;margin-top: 3px;}
+    .productItem .price .price_text_tag .listTag{margin: 0;float: left}
+    .productItem .price .main_price_unde { width: 100%;height: 31px;line-height: 31px;font-size: 14px;color: #4a4f58;text-align: left;float: left;}
+    .productItem .price .main_price_show { width: 100%;height: 30px;line-height: 30px;font-size: 14px;color: #f94b4b;text-align: left;float: left;}
 }
 
 
@@ -170,7 +180,9 @@
     .productItem .name {display: block;padding: 0 3.2vw;height: 9.3vw;line-height: 4.8vw;font-size: 3.4vw;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;}
     .price {padding: 2.7vw 3.2vw;overflow: hidden;}
     .priceTag .tag, .listTag {padding: 0 2vw;border: .27vw solid #ffe6dc;background: none;font-size: 2.8vw;float: right;}
-
+    .productItem .price .main_price_unde {width: 100%;height: 6.5vw;line-height: 6.5vw;font-size: 3.4vw;color: #4a4f58;text-align: left;float: left;}
+    .productItem .price .price_text_tag {width: 100%;box-sizing: border-box;}
+    .productItem .price .main_price_show{color: #f94b4b}
 
 }
 

src/main/resources/static/css/product/instruement.css

@@ -64,10 +64,11 @@
     .brand{color: #9aa5b5;margin: 10px 8px;border: 1px solid #e3ebf7;display: inline-block;padding: 0 10px;border-radius: 2px}
     .item_icon{ width: 100%;height: 36px;padding: 12px 0 8px 0;}
     .item_icon img{width: 36px;height: 36px;display: block;margin: 0 auto;}
-    .productItem .price .price_grade{font-weight: normal;margin: 0;}
+    .productItem .price .price_grade{font-weight: normal;margin-top: 2px; width: 100%;height: 24px;box-sizing: border-box;float: left;}
     .productItem .price .price_grade .bold{margin: 0}
     .price .right-box{margin:12px 0 0 0}
-    .productItem .price .price_grade.sec{display: block;margin-top: 15px}
+    .productItem .price .price_grade.sec{display: block;margin-top: 15px;margin-left: 0}
+    .section_page_main .page_main_item.default{cursor: default}
 }
 
 

src/main/resources/static/js/base.js

@@ -62,7 +62,7 @@ var globalHead = new Vue({
         },
         GetNavigationMenu :function(){//获取顶部导航分类
             var _self = this;
-            PublicApi.GetNavigationMenu({},function(response){
+            PublicApi.GetNavigationMenu({source:1},function(response){
                 if(response.code == 0){
                     _self.topMenuList = response.data.topMenuList;
                 }else{

src/main/resources/static/js/flea-market/form.js

@@ -50,6 +50,9 @@ var fleaMarketForm = new Vue({
             image1:'',//图片
             productDetails:'',//商品详细信息
             source:1,
+            dockingPeopleMobile:'',
+            dockingPeopleName:''
+
          },
         brandname:'请选择',
         checkbox:false,
@@ -78,6 +81,7 @@ var fleaMarketForm = new Vue({
         vShow_shopColor:false,
         vShow_contactName:false,
         vShow_contactMobile:false,
+        vShow_caimeiMobile:false,
         vShow_Address:false,
         vShow_TownId:false,
         vShow_Market:false,
@@ -161,6 +165,7 @@ var fleaMarketForm = new Vue({
         },
         submitBtn:function () {
          var _this = this;
+         var re = /^1\d{10}$/;
           if(_this.secondParams.secondHandType == ''){
                 _this.vShow_secondHandType = true;
                 _this.fromMessage = '请选择分类';
@@ -199,26 +204,6 @@ var fleaMarketForm = new Vue({
                 },2000);
                 return
          }
-         // if(_this.secondParams.secondHandType ==2) {
-         // if (_this.secondParams.normalPrice == '') {
-         //         _this.vShow_Market = true;
-         //         _this.fromMessage = '请输入市场价';
-         //         _this.scrollIntoView();
-         //         setTimeout(function () {
-         //             _this.vShow_Market = false;
-         //         }, 2000);
-         //         return
-         //     }
-         //     if (_this.secondParams.maturityYears == '') {
-         //         _this.vShow_expire = true;
-         //         _this.fromMessage = '请输入产品到期日';
-         //         _this.scrollIntoView();
-         //         setTimeout(function () {
-         //             _this.vShow_expire = false;
-         //         }, 2000);
-         //         return
-         //     }
-         // }
          if(_this.secondParams.price1 == ''){
                   _this.vShow_Price = true;
                   _this.fromMessage = '请输入交易价';
@@ -228,28 +213,6 @@ var fleaMarketForm = new Vue({
                     },2000);
                     return
              }
-         // if(_this.secondParams.secondHandType ==2){
-         //     if(_this.secondParams.originalPrice == ''){
-         //      _this.vShow_original = true;
-         //      _this.fromMessage = '请输入采购价/原价';
-         //      _this.scrollIntoView();
-         //        setTimeout(function(){
-         //            _this.vShow_original = false;
-         //        },2000);
-         //        return
-         //   }
-         // if(_this.secondParams.stock == ''){
-         //      _this.vShow_Number = true;
-         //      _this.fromMessage = '请输入数量';
-         //      _this.scrollIntoView();
-         //        setTimeout(function(){
-         //            _this.vShow_Number = false;
-         //        },2000);
-         //        return
-         //    }
-         // }
-
-
          if(_this.secondParams.productQuality == ''){
               _this.vShow_shopColor = true;
               _this.fromMessage = '请输入商品成色';
@@ -277,7 +240,7 @@ var fleaMarketForm = new Vue({
                 },2000);
                 return
          }
-         if(_this.secondParams.contactMobile.length !=11){
+         if(!re.test(_this.secondParams.contactMobile)){
               _this.vShow_contactMobile = true;
               _this.fromMessage = '联系方式格式不正确';
               _this.scrollIntoView();
@@ -286,6 +249,15 @@ var fleaMarketForm = new Vue({
                 },2000);
                  return
           }
+          if(_this.secondParams.dockingPeopleMobile!='' && !re.test(_this.secondParams.dockingPeopleMobile)){
+              _this.vShow_caimeiMobile = true;
+              _this.fromMessage = '联系方式格式不正确';
+              _this.scrollIntoView();
+                setTimeout(function(){
+                    _this.vShow_caimeiMobile = false;
+                },2000);
+                 return
+          }
           if(_this.secondParams.townId == ''|| _this.secondParams.townId == undefined){
               _this.vShow_TownId = true;
               _this.fromMessage = '请完善联系地址';

src/main/resources/static/js/index.js

@@ -135,6 +135,7 @@ var homeData = new Vue({
                             }
                         }
                     });
+                    _self.GetHomeRightData();
                     setTimeout(function() {
                         // 设置侧边导航数据
                         _self.SetAsideNav();
@@ -145,16 +146,6 @@ var homeData = new Vue({
                 }
             });
         },
-        GetNavigationMenu : function(){//获取顶部导航分类
-            var _self = this;
-            PublicApi.GetNavigationMenu({},function(response){
-                if(response.code == 0){
-                    _self.topMenuList = response.data.topMenuList;
-                }else{
-                    CAIMEI.Alert(response.msg, '确定');
-                }
-            });
-        },
         GetHomeRightData: function(){
             var _self = this;
             PublicApi.GetHomeRightData({ source: 1 },function(response){
@@ -256,8 +247,6 @@ var homeData = new Vue({
         }
         this.GetBanners();
         this.GetHomeFloorData();
-        this.GetHomeRightData();
-        this.GetNavigationMenu();
     },
     mounted: function() {
         // this.getAdvertising();
@@ -268,7 +257,7 @@ var homeData = new Vue({
                 return false;
             }
             var scoll = Math.max($('html').scrollTop(), $('body').scrollTop());
-            if(scoll >450){
+            if(scoll >300){
                 $('#sideNav').show();
                 if(isPC){
                     $('#advertising').show();

src/main/resources/static/js/product/instruement.js

@@ -8,7 +8,6 @@
          floorList: [],
          userId:0,
          typeSort:'',
-         isPageMore:true,
          showflag:false,
          params:{
             pageId:'',
@@ -63,20 +62,38 @@
                      _self.typeSort = res.data.page.typeSort;
                      _self.listLoading =false;
                      _self.floorList.forEach(function(page){
-                        if(page.floorContent.templateType == '1' || page.floorContent.templateType == '3'){
-                            if (page.floorImageList.length>7){
-                                page.isPageMore = true;
-                            }
-                        }else if(page.floorContent.templateType == '2' || page.floorContent.templateType == '4' || page.floorContent.templateType == '7'){
-                            if (page.floorImageList.length>5){
-                                page.isPageMore = true;
-                            }
-                        }else if(page.floorContent.templateType == '5'){
-                            if (page.floorImageList.length>10){
-                                page.isPageMore = true;
-                            }
-                        }
+                           if(isPC){
+                               if(page.floorContent.templateType == '1' || page.floorContent.templateType == '3'){
+                                        if (page.floorImageList.length>7){
+                                            page.isPageMore = true;
+                                        }
+                                    }else if(page.floorContent.templateType == '2' || page.floorContent.templateType == '4' || page.floorContent.templateType == '7'){
+                                        if (page.floorImageList.length>5){
+                                            page.isPageMore = true;
+                                        }
+                                    }else if(page.floorContent.templateType == '5'){
+                                        if (page.floorImageList.length>10){
+                                            page.isPageMore = true;
+                                        }
+                                    }
+                             }else {
+                                if(page.floorContent.templateType == '1' || page.floorContent.templateType == '3'){
+                                    if (page.floorImageList.length>3){
+                                        page.isPageMore = true;
+                                    }
+                                }else if(page.floorContent.templateType == '2' || page.floorContent.templateType == '4'){
+                                    if (page.floorImageList.length>2){
+                                        page.isPageMore = true;
+                                    }
+                                }else if(page.floorContent.templateType == '5'){
+                                    if (page.floorImageList.length>4){
+                                        page.isPageMore = true;
+                                    }
+                                }
+                             }
                     });
+
+
                      _self.SwiperNanner();
                      _self.getClassify();
                  }else {

src/main/resources/static/js/product/produce-list.js

@@ -28,6 +28,11 @@ var productList = new Vue({
             pageNum: 1,
             idType:1
         },
+    },
+     filters:{
+         NumFormat:function(value) {//处理金额
+            return Number(value).toFixed(2);
+        },
     },
     computed: {
         pageTotal: function () {
@@ -79,7 +84,6 @@ var productList = new Vue({
                         }else{
                             _self.listData = _self.listData.concat(resultData);
                         }
-
                         _self.listLoading = false;
                         _self.requestFlag = true;
                }else {
@@ -97,6 +101,7 @@ var productList = new Vue({
         toPagination: function (pageNum) {
             if (pageNum <= this.pageTotal) {
                 this.params.pageNum = pageNum;
+                this.listData=[];
                 this.getproductList();
             }
         },
@@ -104,6 +109,7 @@ var productList = new Vue({
              this.params.sortField= sortField;
              this.params.sortType = sortType;
              this.params.pageNum = 1;
+             this.listData=[];
              this.getproductList();
         },
         removeNama:function(index){//删除三级分类+

src/main/resources/templates/flea-market/form.html

@@ -38,10 +38,6 @@
                         </div>
                          <span class="release-tips errTips icon mIcon" v-show="vShow_instrumentType">{{fromMessage}}</span>
                     </div>
-<!--                    <div class="linqi_text" v-show="secondParams.secondHandType==2">-->
-<!--                        <div class="jiaobiao"></div>-->
-<!--                        <p>临期产品是指临近保质期的产品，距离到期日最好在6个月以上</p>-->
-<!--                    </div>-->
                     <div class="unlogin-item input-item shrink-spacing">
                         <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>商品品牌：</div>
 
@@ -63,11 +59,6 @@
                         <div class="unlogin-label spacing" style="letter-spacing: 1px;">出厂日期：</div>
                         <input type="text"  v-model="secondParams.fixedYears" id="shopyear" maxlength="10" placeholder="请输入出厂日期 如：2020年06月">
                     </div>
-<!--                     <div class="unlogin-item input-item shrink-spacing"  v-show="secondParams.secondHandType==2">-->
-<!--                        <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>产品到期日：</div>-->
-<!--                        <input type="text"  v-model="secondParams.maturityYears" id="expire" maxlength="10" placeholder="请输入产品到期日，如：2020年12月">-->
-<!--                        <span class="release-tips errTips icon mIcon" v-show="vShow_expire">{{fromMessage}}</span>-->
-<!--                    </div>-->
                     <div class="unlogin-item input-item shrink-spacing">
                         <div class="unlogin-label spacing" style="letter-spacing: 1px;">公司名称：</div>
                         <input type="text"  v-model="secondParams.companyName" id="mechanismname" maxlength="30" placeholder="请输入公司名称，不超过30个汉字">
@@ -81,21 +72,6 @@
                         <span class="showflag" v-show="vShow_detailTalkFlag">(勾选代表同意不显示交易价)</span>
                         <span class="release-tips errTips icon mIcon" v-show="vShow_Price">{{fromMessage}}</span>
                     </div>
-<!--                     <div class="unlogin-item input-item shrink-spacing" v-show="secondParams.secondHandType==2">-->
-<!--                        <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>市场价：</div>-->
-<!--                        <input type="text"  v-model="secondParams.normalPrice" id="market" maxlength="30" oninput="value=value.replace(/[^\d]/g, '')"   placeholder="请输入市场价">-->
-<!--                        <span class="release-tips errTips icon mIcon" v-show="vShow_Market">{{fromMessage}}</span>-->
-<!--                    </div>-->
-<!--                    <div class="unlogin-item input-item shrink-spacing" v-show="secondParams.secondHandType==2">-->
-<!--                        <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>采购价/原价：</div>-->
-<!--                        <input type="text"  v-model="secondParams.originalPrice" id="original_price" maxlength="30" oninput="value=value.replace(/[^\d]/g, '')" placeholder="请输入采购价/原价"/>-->
-<!--                        <span class="release-tips errTips icon mIcon" v-show="vShow_original">{{fromMessage}}</span>-->
-<!--                    </div>-->
-<!--                     <div class="unlogin-item input-item shrink-spacing" v-show="secondParams.secondHandType==2">-->
-<!--                        <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>数量：</div>-->
-<!--                        <input type="text"  id="number" v-model="secondParams.stock" maxlength="30" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入数量">-->
-<!--                       <span class="release-tips errTips icon mIcon" v-show="vShow_Number">{{fromMessage}}</span>-->
-<!--                    </div>-->
                     <div class="unlogin-item input-item shrink-spacing">
                         <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>商品成色：</div>
                         <input type="text" maxlength="10" id="shopcolor"v-model="secondParams.productQuality"  placeholder="请输入商品成色，如“9成新”">
@@ -103,13 +79,22 @@
                     </div>
                     <div class="unlogin-item input-item shrink-spacing">
                         <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>联系人：</div>
-                        <input type="text" maxlength="6" v-model="secondParams.contactName" id="linkman"  placeholder="请输入联系人姓名">
+                        <input type="text" maxlength="15" v-model="secondParams.contactName" id="linkman"  placeholder="请输入联系人姓名">
                         <span class="release-tips errTips icon mIcon" v-show="vShow_contactName">{{fromMessage}}</span>
                     </div>
                     <div class="unlogin-item input-item shrink-spacing">
                         <div class="unlogin-label spacing"><span class="red-color">*</span>联系方式：</div>
-                        <input type="text"  v-model="secondParams.contactMobile"  oninput="value=value.replace(/[^\d]/g,'')"  id="phoneNum" maxlength="11" placeholder="请输入联系人手机号 / 固话">
+                        <input type="text"  v-model="secondParams.contactMobile"  oninput="value=value.replace(/[^\d]/g,'')"  id="phoneNum" maxlength="11" placeholder="请输入联系人手机号">
                         <span class="release-tips errTips icon mIcon" v-show="vShow_contactMobile">{{fromMessage}}</span>
+                    </div>
+                     <div class="unlogin-item input-item shrink-spacing">
+                        <div class="unlogin-label spacing" style="letter-spacing: 1px;">采美对接人：</div>
+                        <input type="text" maxlength="15" v-model="secondParams.dockingPeopleName"  placeholder="请输入采美对接人姓名">
+                    </div>
+                    <div class="unlogin-item input-item shrink-spacing">
+                        <div class="unlogin-label spacing">采美对接人联系方式：</div>
+                        <input type="text"  v-model="secondParams.dockingPeopleMobile"  oninput="value=value.replace(/[^\d]/g,'')"  maxlength="11" placeholder="请输入采美对接人手机号">
+                        <span class="release-tips errTips icon mIcon" v-show="vShow_caimeiMobile">{{fromMessage}}</span>
                     </div>
                     <div class="unlogin-item input-item shrink-spacing">
                         <div class="unlogin-label spacing">商品类型：</div>

src/main/resources/templates/product/detail.html

@@ -76,7 +76,7 @@
                              <em><del>￥{{priceObj.normalPrice.toFixed(2)}}</del></em>
                         </div>
                     </template>
-                    <div class="row" v-if="priceObj.actStatus==1||priceObj.ladderPriceFlag==1" ><span class="l">促销</span><i>：</i>
+                    <div class="row actStatus" v-if="priceObj.actStatus==1||priceObj.ladderPriceFlag==1" ><span class="l">促销</span><i>：</i>
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && ((priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.supplierId==GLOBAL_SHOP_ID))">
                             <!-- 阶梯价 -->
                             <div v-if="priceObj.ladderPriceFlag==1" class="priceTag">

src/main/resources/templates/product/instruelist.html

@@ -86,26 +86,40 @@
                                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                     <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                     <template v-if="p.priceFlag==1">
-                                        <em>￥价格未公开</em>
+                                       <div class="price_text_tag">
+                                            <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                        </div>
+                                        <div class="main_price_unde">￥价格未公开</div>
                                     </template>
                                     <template v-else>
                                         <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
-                                            <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
-                                            <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                           <div class="price_text_tag">
+                                                <p class="listTag" v-if="p.actStatus==1">
+                                                    {{p.promotions.name}}
+                                                    <span v-if="p.priceFlag != 1">:￥{{p.promotions.retailPrice | NumFormat}}</span>
+                                                </p>
+                                            </div>
+                                            <div class="main_price_show" v-text="'￥'+parseFloat(p.price).toFixed(2)"></div>
                                         </template>
                                         <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
-                                            <em>￥会员可见</em>
-                                            <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                             <div class="price_text_tag">
+                                                <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                            </div>
+                                            <div class="main_price_unde">￥会员可见</div>
                                         </template>
                                         <template v-else>
-                                            <em class="bold">￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
-                                            <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                         <div class="price_text_tag">
+                                            <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                        </div>
+                                        <div class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                         </template>
                                     </template>
                                 </template>
                                 <template v-else>
-                                    <em class="bold">￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
-                                    <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                     <div class="price_text_tag">
+                                            <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                      </div>
+                                      <div class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                 </template>
                             </div>
                         </a>

src/main/resources/templates/product/instrument.html

@@ -50,7 +50,9 @@
                              <div class="floorCon">
                                  <div class="hotList recommend">
                                     <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
-                                        <a  class="img01" :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'" ><img :src="page.floorContent.pcAdsImage1"/></a>
+                                        <a  class="img01 page_main_item" :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"
+                                        :class="page.floorContent.adsLink1!='' ? '' : 'default' " >
+                                        <img :src="page.floorContent.pcAdsImage1"/></a>
                                         <a class="productItem" :href="pros.link" v-for="(pros,index) in page.floorImageList" >
                                             <img :src="pros.image ? pros.image : '/img/base/placeholder.png'" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
@@ -119,8 +121,10 @@
                              <div class="floorCon">
                                  <div class="hotList">
                                     <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
-                                        <a :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'" class="img01"><img  :src="page.floorContent.pcAdsImage1" alt=""> </a>
-                                        <a :href="page.floorContent.adsLink2" class="img02"><img  :src="page.floorContent.pcAdsImage2" alt=""> </a>
+                                        <a :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"
+                                        class="img01 page_main_item" :class="page.floorContent.adsLink1!='' ? '' : 'default' ">
+                                        <img  :src="page.floorContent.pcAdsImage1" alt=""> </a>
+                                        <a :href="page.floorContent.adsLink2" class="img02 page_main_item"><img  :src="page.floorContent.pcAdsImage2" alt=""> </a>
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
@@ -189,8 +193,10 @@
                             <div class="floorCon">
                                 <div class="hotList">
                                     <div class="section_page_main type clear mfw" :class="page.isPageMore ? '' : 'max'">
-                                        <a class='imgbaner' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"><img :src="page.floorContent.pcAdsImage1"></a>
-                                        <a class="img01" :href="page.floorContent.adsLink2"><img :src="page.floorContent.pcAdsImage2"/></a>
+                                        <a class='imgbaner page_main_item' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"
+                                         :class="page.floorContent.adsLink1!='' ? '' : 'default' "><img :src="page.floorContent.pcAdsImage1"></a>
+                                        <a class="img01 page_main_item" :href="page.floorContent.adsLink2!='' ? page.floorContent.adsLink2 : 'javascript:void(0)'"
+                                        :class="page.floorContent.adsLink2!='' ? '' : 'default' "><img :src="page.floorContent.pcAdsImage2"/></a>
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
@@ -259,9 +265,15 @@
                             <div class="floorCon">
                                 <div class="hotList">
                                     <div class="section_page_main type clear mfw"  :class="page.isPageMore ? '' : 'max'">
-                                        <a class='imgbaner' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"><img :src="page.floorContent.pcAdsImage1"></a>
-                                        <a class="img01" :href="page.floorContent.adsLink2"><img :src="page.floorContent.pcAdsImage2"/></a>
-                                        <a class="img02" :href="page.floorContent.adsLink3"><img :src="page.floorContent.pcAdsImage3"/></a>
+                                        <a class='imgbaner page_main_item' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"
+                                         :class="page.floorContent.adsLink1!='' ? '' : 'default' ">
+                                         <img :src="page.floorContent.pcAdsImage1"></a>
+                                        <a class="img01 page_main_item" :href="page.floorContent.adsLink2!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"
+                                        :class="page.floorContent.adsLink2!='' ? '' : 'default' ">
+                                        <img :src="page.floorContent.pcAdsImage2"/></a>
+                                        <a class="img02 page_main_item" :href="page.floorContent.adsLink3!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"
+                                        :class="page.floorContent.adsLink3!='' ? '' : 'default' ">
+                                        <img :src="page.floorContent.pcAdsImage3"/></a>
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
@@ -330,7 +342,8 @@
                             <div class="floorCon">
                                 <div class="hotList">
                                     <div class="section_page_main type clear mfw" :class="page.isPageMore ? '' : 'max'">
-                                        <a class='imgbaner' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"><img :src="page.floorContent.pcAdsImage1"></a>
+                                        <a class='imgbaner page_main_item' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"
+                                        :class="page.floorContent.adsLink1!='' ? '' : 'default' "><img :src="page.floorContent.pcAdsImage1"></a>
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
@@ -459,7 +472,8 @@
                                              </div>
                                         </a>
                                     </div>
-                                     <a class='imgbaner' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"><img :src="page.floorContent.pcAdsImage1"></a>
+                                     <a class='imgbaner page_main_item' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"
+                                     :class="page.floorContent.adsLink1!='' ? '' : 'default' "><img :src="page.floorContent.pcAdsImage1"></a>
                                     <div class="unfold" @click="seeMore(page)" v-if="page.isPageMore">查看更多 ∨</div>
                                 </div>
                              </div>