Jelajahi Sumber

二手发布

zhengjinyi 8 bulan lalu
induk
melakukan
b0d312957e

+ 3 - 2
src/main/resources/static/css/flea-market/form.css

@@ -54,8 +54,9 @@ body{background: #fff}
      #word-limit {position: absolute;right: 0;bottom: 10px;font-size: 12px;color: #9aa5b5}
      .unlogin-item {margin-bottom: 20px;width: 100%;float: left;}
      .unlogin-item.none {margin-bottom: 0;}
-     .getCode{box-sizing: border-box;width: 168px;height: 36px;margin-right: 15px;float: right; line-height: 34px;text-align: center;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #FF5B00;color: #FF5B00;font-size: 14px;}
-     .getCode.disabled{background-color: #D6D6D6;border-color: #D6D6D6;color: #FFFFFF;}
+     .getCode{box-sizing: border-box;width: 168px;height: 36px;margin-right: 15px;float: right; line-height: 34px;text-align: center;background: linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);border-radius: 2px;color: #FFFFFF;font-size: 14px;}
+     .getCode:hover{ color: #FFFFFF; }
+     .getCode.disabled{background: #D6D6D6;border-color: #D6D6D6;color: #FFFFFF;}
      .textarea-wrapper {letter-spacing: 1.5px;line-height: 24px;color: #627386;position: relative;width: 496px;}
      .release-button {width: 100%;height: auto;float: left;margin: 50px 0;}
      .release-button .text{width: 100%;text-align: center;margin: 15px 10px;}

+ 3 - 3
src/main/resources/static/css/flea-market/list.css

@@ -12,7 +12,7 @@
     .second-fixed-title{ width: 100%;height: 120px;z-index: 999; box-sizing: border-box;padding: 25px 0;position: fixed;bottom: 0;left: 0; background-color: rgba(255,255,255,0.9);opacity: 0;}
     .second-fixed-title.show{ opacity: 1 }
     .second-fixed-title .inner{ width: 1184px;margin: 0 auto; }
-    .second-fixed-title .second-fixed-btn{ width: 220px;height: 70px;line-height: 70px;font-size: 20px;font-weight: 600; text-align: center;color: #FFFFFF;letter-spacing: 3px;float: right;border-radius: 35px;background-image: linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);}
+    .second-fixed-title .second-fixed-btn{ width: 220px;height: 70px;line-height: 70px;font-size: 20px;font-weight: 600; text-align: center;color: #FFFFFF;letter-spacing: 3px;float: right;border-radius: 35px;background-image: linear-gradient(90deg, #FF9300 0%, #FF5B00 100%);cursor: pointer;}
     .fabu {float: right;text-align: center;height: 26px;margin-right: 30px;background: #FF5B00;width: 72px;line-height: 26px;margin-top: 7px;border-radius:13px}
     .fabu a {color: #fff}
     .intro{border-bottom: 1px solid #FF5B00;float: left;margin-top: 10px; }
@@ -94,8 +94,8 @@
     .no-content{padding:26.6vw 5.3vw;background-color: #fff;margin: auto;}
     .no-content img{width: 50%;display: block;margin: 0 auto;padding: 0.5rem 0;}
     .error-message{text-align: center;margin-top: 5.3vw;font-size: 3.7vw;color: #53504D}
-    .fabu{margin: auto; width: 100%;text-align: center;font-size: 3vw;position: fixed;bottom: 0;    background: #fff;padding: 2.7vw 0; }
-    .fabu a{ display: inline-block;box-sizing: border-box;border-radius:.54vw;width: 45.4vw;height: 9.8vw;line-height: 9.8vw;border-radius: 5vw;}
+    .fabu{margin: auto; width: 100%;text-align: center;font-size: 3vw;position: fixed;bottom: 0;    background: #fff;padding: 2.7vw;box-sizing: border-box; }
+    .fabu a{ display: inline-block;box-sizing: border-box;width: 100%;height: 11vw;line-height: 9.8vw;border-radius: 6vw;}
     .fabu .intro{ background: #ffe6dc;color: #FF5B00;margin-right: 2.7vw;}
     .fabu .form{background: linear-gradient(135deg, #f28f31 0%, #FF5B00 100%);color: #ffffff;}
     .fabu a .mIcon{width: 4.6vw;height: 4.6vw;display: block;margin: 0 auto;}

+ 22 - 17
src/main/resources/static/css/flea-market/secondDetail.css

@@ -17,7 +17,7 @@
     .preview-container {width: 100%;height: auto;background-color: #f6f6f6;margin-bottom: 20px;}
     .preview-container-top {width: 100%;height: 80px;background-color: #FFC684;font-size: 30px;color: #FFF;line-height: 80px;text-align: center;}
     .inner-container {width: 1184px;height: auto;margin: 0 auto;}
-    .preview-header {padding: 12px;background-color: #FFFFFF;margin: 10px 0 20px 0;overflow: hidden;border-radius: 16px;}
+    .preview-header {padding: 16px;background-color: #FFFFFF;margin: 10px 0 20px 0;overflow: hidden;border-radius: 16px;}
     .preview-header .preview-banner {width: 452px;height: 545px;float: left;position: relative;}
     .preview-header .preview-info {width: 685px;float: right;opacity: 0;}
     .preview-header .preview-info.active {opacity: 1;}
@@ -36,8 +36,10 @@
     .preview-info .preview-info-title .info-p {height: auto;float: left;}
     .preview-info .preview-info-title .info-p.classly {font-size: 14px;color: #999;}
     .preview-info .preview-info-title .info-p.name {font-size: 18px;color: #333;font-weight: bold;line-height: 24px;height: auto;width: 100%;margin: 10px 0;}
+
     .preview-info .preview-info-title .info-p.label .label-s {font-size: 12px;background: #A69DFE;color: #fff;padding: 5px 10px;border-radius: 2px;margin: 0 10px 5px 0;display: inline-block;}
-    .preview-info .preview-info-main {padding: 16px 20px;background-color: #f3f7fe;border-radius: 12px;float: left;margin-top: 15px;}
+    .preview-info .preview-info-main {height: 348px; padding: 16px 20px;background-color: #f3f7fe;border-radius: 12px;float: left;margin-top: 10px;}
+    .preview-info .preview-info-main .info.price{ display: none; }
     .preview-info .preview-info-main .info {width: 50%;height: 30px;float: left;margin-bottom: 5px;line-height: 30px;}
     .preview-info .preview-info-main .info .label {width: 70px;height: 30px;float: left;display: block;font-size: 14px;line-height: 30px;text-align: right;color: #999;}
     .preview-info .preview-info-main .info p {float: left;height: 100%;padding-left: 20px;color: #4a4f58;}
@@ -61,7 +63,7 @@
     .yishou_img {position: absolute;top: 0;right: 0;transform: translate(-9%, 7%);width: 15%;opacity: 0;}
     .iconLogo {position: absolute;left: 0;top: 0;color: #fff;font-size: 14px;padding: 5px 12px;border-radius: 0 0 10px 0;}
     .brandMain {position: absolute;left: 30px;top: 29px;width: 90%;padding: 15px;border: 1px solid #F2F2F2;border-radius: 10px;background-color: #fff;cursor: pointer;line-height: 24px;letter-spacing: 1.5px;}
-    .Brand img {vertical-align: -1px;margin-left: 5px;}
+    .Brand img {vertical-align: -1px;margin-left: 1px;}
     .zheng-graphics {position: absolute;left: 60px;top: -9px;width: 15px;height: 15px;background-color: #fff;border: 1px solid rgba(234, 234, 234, 1); /*box-shadow: 2px -2px 5px -2px rgba(0, 0, 0, 0.16);*/transform: rotate(-45deg);border-left: 0;border-bottom: 0;z-index: 1;}
     .brandMain:hover {box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, .16);}
     .brandMain:hover .zheng-graphics {box-shadow: 2px -2px 5px -2px rgba(0, 0, 0, 0.16);}
@@ -71,12 +73,12 @@
     .hoverBrand:hover .brandMain {display: block;}
     .swiper-pagination {bottom: 0 !important;}
     .preview-header .preview-banner-small .item.addImg {border: 1px solid #FF5B00;opacity:1;border-radius: 4px;overflow: hidden;}
-    .infotag {font-size: 10px;padding: 0 10px;height: 22px;line-height: 22px;text-align: center;display: inline-block;border-radius: 2px;flex: auto;margin: 0 10px}
+    .infotag {font-size: 10px;padding: 0 8px;height: 24px;line-height: 24px;text-align: center;display: inline-block;border-radius: 4px;flex: auto;box-sizing: border-box;}
     .ItemInfo tag {display: flex;}
-    .infotag.news {border: solid 1px #f94b4b;color: #f94b4b;background-color: #fadbdb}
-    .infotag.brand {border: solid 1px #f9a24b;color: #f9a24b;background-color: #faefdb;}
-    .infotag.sold {border: solid 1px #9aa5b5;color: #9aa5b5;background-color: #e3ebf7;}
-    .infotag.other {border: solid 1px #1890f9;color: #1890f9;background-color: #e3ebf7;}
+    .infotag.news {border: solid 1px #f94b4b;color: #f94b4b;background-color: #fadbdb;font-weight: normal;}
+    .infotag.brand {border: solid 1px #f9a24b;color: #f9a24b;background-color: #faefdb;font-weight: normal;}
+    .infotag.sold {border: solid 1px #9aa5b5;color: #9aa5b5;background-color: #e3ebf7;font-weight: normal;}
+    .infotag.other {border: solid 1px #1890f9;color: #1890f9;background-color: #e3ebf7;font-weight: normal;}
     .fave-text{color: #f94b4b;font-weight: bold;}
     .fave-text .big{font-size: 20px;}
 
@@ -85,16 +87,19 @@
 
 /* 移动端*/
 @media screen and (max-width:768px){
+    #fleaMarket{ padding-top: 27vw; }
+    footer{display: none; }
     .inner-container{width: 100%;overflow: hidden;}
     #swiperImage .swiper-wrapper .swiper-slide{position:relative;zoom:1;vertical-align:middle;width:100%;overflow:hidden;text-align:center}
     #swiperImage .swiper-wrapper img{width:auto;height:100vw;display:block}
     #imgShown{width: 100%; height: 100vw;position: relative;background: #fff}
     .preview-info{box-sizing: border-box;padding: 0 3.3vw;overflow: hidden;background: #fff}
-    .preview-info-main{box-sizing: border-box;padding: 2.8vw;font-size: 3.4vw;line-height: 7.5vw;color: #93979F;background: #f3f7fe;border-radius: 2px;position: relative;margin: 3.5vw 0;overflow: hidden}
+    .preview-info-main{box-sizing: border-box;padding: 2.8vw;font-size: 3.4vw;line-height: 7.5vw;color: #93979F;background: #f3f7fe;border-radius: 2vw;position: relative;margin: 3.5vw 0;overflow: hidden}
     .preview-info .preview-info-main .info {width: 100%;height: 8vw;float: left;margin-bottom: 1.3vw;line-height: 8vw;}
+    .preview-info .preview-info-main .info.price{ display: none; }
     .preview-info .preview-info-main .info .label {width: 18.7vw;height: 8vw;float: left;display: block;font-size: 3.4vw;line-height: 8vw;text-align: right;color: #9aa5b5;}
     .preview-info .preview-info-main .info p {float: left;height: 100%;padding-left: 5.3vw;color: #22272e;}
-    .preview-info-title{font-size: 3.6vw;color: #22272e;padding-top: 4vw;position: relative}
+    .preview-info-title{font-size: 3.6vw;color: #22272e;padding: 2vw 0;position: relative;line-height: 7vw;}
     .ercode{padding: 2.8vw;}
     .ercode img{width: 100%;height: 100%;}
     .main{margin-top: 5vw;padding: 2.8vw;background: #fff}
@@ -103,7 +108,7 @@
     .contentHtml div{margin-top: 2.7vw;}
     .contentHtml img{width: 100%;}
     .info-p.name{color: #22272e;font-size: 4.2vw;}
-    .infotag {font-size:  3vw;padding:0 2.7vw;height: 4.8vw;line-height:  4.8vw;text-align: center;display: inline-block;border-radius: .48vw;flex: auto;margin: 0 1.72vw}
+    .infotag {font-size:  3vw;padding:0 2.7vw;height: 4.8vw;line-height:  4.8vw;text-align: center;display: inline-block;border-radius: .48vw;flex: auto;margin: 0 1.72vw 0 0;}
     .infotag.news {border: solid .27vw #f94b4b;color: #f94b4b;background-color: #fadbdb}
     .infotag.brand {border: solid .27vw #f9a24b;color: #f9a24b;background-color: #faefdb;}
     .infotag.sold {border: solid .27vw #9aa5b5;color: #9aa5b5;background-color: #e3ebf7;}
@@ -116,10 +121,10 @@
     .loginWithParam {color: #FC4444;font-size: 3.2vw;cursor: pointer;}
     .yishou_img {width: 14%;position: absolute;top: 2vw;right: 0;transform: translate(-9%, 7%);z-index: 1;}
     .recommendBox{margin-top:2vw;width:100%;background:#FFF}
-.recommendBox .hd{font-size:3.4vw;color:#E15621;font-weight:bold;padding:2.7vw;text-align:center}
-#productRecommend{width:100%;height:50vw;overflow:hidden;position:relative;box-sizing:border-box;padding:0 2.4vw}
-#productRecommend li{width:29.2vw!important;height:41.8vw;overflow:hidden;text-align:center;background:none}
-#productRecommend li .item{position:relative;zoom:1;vertical-align:middle;overflow:hidden;width:26.8vw;height:41.8vw;font-size:3.4vw}
-#productRecommend li .item img{display:block;width:100%;height:26.8vw}
-#productRecommend li .item span {color: #93979F;overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;margin-top: 2.6vw;}
+    .recommendBox .hd{font-size:3.4vw;color:#E15621;font-weight:bold;padding:2.7vw;text-align:center}
+    #productRecommend{width:100%;height:50vw;overflow:hidden;position:relative;box-sizing:border-box;padding:0 2.4vw}
+    #productRecommend li{width:29.2vw!important;height:41.8vw;overflow:hidden;text-align:center;background:none}
+    #productRecommend li .item{position:relative;zoom:1;vertical-align:middle;overflow:hidden;width:26.8vw;height:41.8vw;font-size:3.4vw}
+    #productRecommend li .item img{display:block;width:100%;height:26.8vw}
+    #productRecommend li .item span {color: #93979F;overflow: hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;margin-top: 2.6vw;}
 }

+ 130 - 128
src/main/resources/static/js/flea-market/form.js

@@ -65,6 +65,7 @@ var fleaMarketForm = new Vue({
             commitmentImage:'',//承诺函图片
             fileName:'',//文件名称
             ossName:'',//文件OSS名称
+            userId:''//用户
          },
         brandname:'请选择',
         checkbox:false,
@@ -116,64 +117,58 @@ var fleaMarketForm = new Vue({
         isMobileDisabled:true,
     },
     methods:{
-        showBrand:function(){
-            var _this = this;
-            _this.selectBrand = !_this.selectBrand;
+        showBrand(){
+            this.selectBrand = !this.selectBrand;
         },
-        hadldPublishIdentity: function(item) {
-        var _this = this;
-            _this.handleCurrent = item.value;
-            _this.secondParams.publishIdentity = item.value;
+        hadldPublishIdentity(item) {
+            this.handleCurrent = item.value;
+            this.secondParams.publishIdentity = item.value;
         },
-        secondHandRidio: function(item) {
-        var _this = this;
-            _this.currentId = item.value;
-            _this.secondParams.secondHandType = item.value;
-            if (item.value==1){
-            _this.isShow = true;
+        secondHandRidio(item) {
+            this.currentId = item.value;
+            this.secondParams.secondHandType = item.value;
+            if (item.value===1){
+                this.isShow = true;
             }else {
-             _this.isShow = false;
+                this.isShow = false;
             }
         },
-        secondHandType:function(item){ //二手仪器
-        item.isChecked = ! item.isChecked;
-        var _this = this;
-          if(item.isChecked){
-           _this.checkVal.push(item.value);
-           _this.secondParams.instrumentType =  _this.checkVal.toString();
-          } else {
-            _this.checkVal.splice(_this.checkVal.indexOf(item.value), 1);
-            _this.secondParams.instrumentType = _this.checkVal.toString();
-          }
+        secondHandType(item){ //二手仪器
+            item.isChecked = ! item.isChecked;
+            if(item.isChecked){
+                this.checkVal.push(item.value);
+                this.secondParams.instrumentType =  this.checkVal.toString();
+            } else {
+                this.checkVal.splice(this.checkVal.indexOf(item.value), 1);
+                this.secondParams.instrumentType = this.checkVal.toString();
+            }
         },
-        ChangeBrand:function(item){ //品牌列表
-         var _this = this;
-            _this.brandname = item.name;
-            _this.secondParams.brandId = item.id;
-            if(_this.secondParams.brandId==161){
-              _this.shoplogoTwo = true;
+        ChangeBrand(item){ //品牌列表
+            this.brandname = item.name;
+            this.secondParams.brandId = item.id;
+            if(this.secondParams.brandId===161){
+                this.shoplogoTwo = true;
             }else {
-              _this.shoplogoTwo = false;
+                this.shoplogoTwo = false;
             }
         },
-        Detailed:function(){
-        var _this = this;
-         if(event.target.checked==true){
-             _this.secondParams.detailTalkFlag = 2 ;//启用价格详聊
-             _this.vShow_detailTalkFlag = true;
-          }else {
-            _this.secondParams.detailTalkFlag = 1 ;//不启用价格详聊
-            _this.vShow_detailTalkFlag = false;
-          }
+        Detailed(){
+            if(event.target.checked===true){
+                this.secondParams.detailTalkFlag = 2 ;//启用价格详聊
+                this.vShow_detailTalkFlag = true;
+            }else {
+                this.secondParams.detailTalkFlag = 1 ;//不启用价格详聊
+                this.vShow_detailTalkFlag = false;
+            }
         },
-        dragstart: function(value) {  // 记录初始信息
+        dragstart(value) {  // 记录初始信息
             this.oldNum = value;
         },
-        uploadGoodsImagesFn: function(event){//上传商品图片
-            var _this = this;
-            var inputDOM = _this.$refs.goodsImages;
-            var file = inputDOM.files[0];
-            var size = file.size;
+        uploadGoodsImagesFn(event){//上传商品图片
+            const _this = this;
+            const inputDOM = _this.$refs.goodsImages;
+            const file = inputDOM.files[0];
+            const size = file.size;
             if(size > 5242880){//限制了文件的大小5MB
                 CAIMEI.dialog('图片不能超过5M');
                 event.target.value = '';
@@ -186,12 +181,11 @@ var fleaMarketForm = new Vue({
                 event.target.value = '';
             });
         },
-        removeGoodsImagesFn: function(index){//删除商品图片
-            var _this = this;
-            _this.GoodsImagesList.splice(index,1);
-            _this.secondParams.image =_this.GoodsImagesList.toString()+',';
+        removeGoodsImagesFn(index){//删除商品图片
+            this.GoodsImagesList.splice(index,1);
+            this.secondParams.image = this.GoodsImagesList.toString()+',';
         },
-        contains:function(arr, val) {// 校验
+        contains(arr, val) {// 校验
             return arr.some(item => item === val)
         },
         handleMobileCodeInput(){//
@@ -201,25 +195,26 @@ var fleaMarketForm = new Vue({
             this.vShow_TownId = false;
             this.vShow_Address = false;
         },
-        handleMobileInput:function () {// 控制联系人手机号显示获取验证码按钮
-            var re = /^1\d{10}$/;
+        handleMobileInput () {// 控制联系人手机号显示获取验证码按钮
+            const re = /^1\d{10}$/;
             if(re.test(this.secondParams.contactMobile)){
-               this.isMobileDisabled = false
+                this.isMobileDisabled = false
+            }else{
+                this.isMobileDisabled = true
             }
         },
-        getNewMobileCodeFn:function(){//获取联系人手机号短信验证码
-            var _self = this;
-            var pass = verifyCheack('.massageBtn');
-            if (!pass) { return false; }
-            var params = {
-                mobile:_self.secondParams.contactMobile,
-                isCheckCaptcha:1,
-                activateCodeType:6,
-                platformType:0
+        getNewMobileCodeFn(){//获取联系人手机号短信验证码
+            const _self = this;
+            if (!_self.secondParams.contactMobile) { return false; }
+            const params = {
+                mobile: _self.secondParams.contactMobile,
+                isCheckCaptcha: 1,
+                activateCodeType: 6,
+                platformType: 0
             };
             _self.isMobileDisabled = true;
             UserApi.getRegisterMobileCode(params,function(response){
-                if(response.code == 0){
+                if(response.code === 0){
                     CAIMEI.dialog('验证短信已发送',false,function () {});
                     var TIME_COUNT = 60;
                     if (!_self.mobilTime) {
@@ -243,21 +238,20 @@ var fleaMarketForm = new Vue({
                 }
             })
         },
-        showViewerImageFn2: function(index,imageIndex ){//预览图片
-            var _this = this;
+        showViewerImageFn2(index,imageIndex ){//预览图片
+            const _this = this;
             var DomEven = '#ViewerGoodsImages'+index;
             var ViewerDom = document.querySelector(DomEven);
             _this.viewer = new Viewer(ViewerDom, {url:'data-image'});
         },
-        getProductType:function(item){
-            var _this = this;
-            _this.secondType=item;
-            _this.secondParams.secondProductType = item ;
+        getProductType(item){
+            this.secondType=item;
+            this.secondParams.secondProductType = item ;
         },
-        submitBtn:function () {
-            var _this = this;
-            var re = /^1\d{10}$/;
-            if(_this.secondParams.contactName == ''){
+        submitBtn () {
+            const _this = this;
+            const re = /^1\d{10}$/;
+            if(_this.secondParams.contactName === ''){
                 _this.vShow_contactName = true;
                 _this.fromMessage = '请输入联系人姓名';
                 _this.scrollIntoView('secondHandrelease');
@@ -266,7 +260,7 @@ var fleaMarketForm = new Vue({
                 },3000);
                 return
             }
-            if(_this.secondParams.contactMobile == ''){
+            if(_this.secondParams.contactMobile === ''){
                 _this.vShow_contactMobile = true;
                 _this.fromMessage = '请输入联系方式';
                 _this.scrollIntoView('secondHandrelease');
@@ -284,7 +278,7 @@ var fleaMarketForm = new Vue({
                 },3000);
                 return
             }
-            if(_this.secondParams.checkCode == ''){
+            if(_this.secondParams.checkCode === ''){
                 _this.vShow_checkCode = true;
                 _this.fromMessage = '请输入短信验证码';
                 _this.scrollIntoView('secondHandrelease');
@@ -293,7 +287,7 @@ var fleaMarketForm = new Vue({
                 },3000);
                 return
             }
-            if(_this.secondParams.secondHandType == ''){
+            if(_this.secondParams.secondHandType === ''){
                 _this.vShow_secondHandType = true;
                 _this.fromMessage = '请选择分类';
                 _this.scrollIntoView('secondHandrelease');
@@ -302,8 +296,8 @@ var fleaMarketForm = new Vue({
                 },3000);
                 return;
             }
-            if(_this.secondParams.secondHandType == 1 ){
-               if(_this.secondParams.instrumentType ==''){
+            if(_this.secondParams.secondHandType === 1 ){
+               if(_this.secondParams.instrumentType ===''){
                 _this.vShow_instrumentType = true;
                 _this.fromMessage = '请完善仪器分类';
                 _this.scrollIntoView('secondHandrelease');
@@ -313,7 +307,7 @@ var fleaMarketForm = new Vue({
                 return;
                 }
             }
-            if(_this.secondParams.brandId == ''){
+            if(_this.secondParams.brandId === ''){
                 _this.vShow_BrandID = true;
                 _this.fromMessage = '请选择商品品牌';
                 _this.scrollIntoView('secondHandrelease');
@@ -322,7 +316,7 @@ var fleaMarketForm = new Vue({
                 },3000);
                 return;
             }
-            if(_this.secondParams.name == ''){
+            if(_this.secondParams.name === ''){
                 _this.vShow_Name = true;
                 _this.fromMessage = '请输入商品名称';
                 _this.scrollIntoView('secondHandrelease');
@@ -332,7 +326,7 @@ var fleaMarketForm = new Vue({
                 return
             }
             if(_this.secondParams.publishIdentity === 2){
-                if(_this.secondParams.companyName == ''){
+                if(_this.secondParams.companyName === ''){
                     _this.vShow_companyName = true;
                     _this.fromMessage = '请输入公司名称';
                     _this.scrollIntoView('vShow_Name');
@@ -342,7 +336,7 @@ var fleaMarketForm = new Vue({
                     return
                 }
             }
-             if(_this.secondParams.productQuality == ''){
+             if(_this.secondParams.productQuality === ''){
                   _this.vShow_shopColor = true;
                   _this.fromMessage = '请输入商品成色';
                   _this.scrollIntoView('vShow_Name');
@@ -351,7 +345,7 @@ var fleaMarketForm = new Vue({
                     },3000);
                     return
              }
-              if(_this.secondParams.townId == ''|| _this.secondParams.townId == undefined){
+              if(_this.secondParams.townId === ''|| _this.secondParams.townId === undefined){
                   _this.vShow_TownId = true;
                   _this.fromMessage = '请完善联系地址';
                   _this.scrollIntoView('vShow_Name');
@@ -360,7 +354,7 @@ var fleaMarketForm = new Vue({
                   },3000);
                   return
              }
-             if(_this.secondParams.address == ''){
+             if(_this.secondParams.address === ''){
                   _this.vShow_Address = true;
                   _this.fromMessage = '请填写详细地址';
                   _this.scrollIntoView('vShow_Name');
@@ -369,7 +363,7 @@ var fleaMarketForm = new Vue({
                     },3000);
                     return
              }
-            if(_this.GoodsImagesList ==''){
+            if(_this.GoodsImagesList ===''){
                 _this.vShow_GoodsImages = true;
                 _this.fromMessage = '请上传图片';
                 _this.scrollIntoView('vShow_Address');
@@ -378,7 +372,7 @@ var fleaMarketForm = new Vue({
                 },3000);
                 return;
             }
-            if(_this.checkbox==false){
+            if(!_this.checkbox){
                 _this.vShow_checkBox = true;
                 _this.fromMessage='请阅读并勾选同意';
                 setTimeout(function(){
@@ -389,7 +383,7 @@ var fleaMarketForm = new Vue({
             console.log(_this.secondParams);
             _this.SecondHandProduct(_this.secondParams)
         },
-        SecondHandProduct:function(params){//提交发布
+        SecondHandProduct(params){//提交发布
             var _this = this;
             SecondApi.SecondHandProduct(params,function (res) {
                 if (res.code===0){
@@ -403,7 +397,7 @@ var fleaMarketForm = new Vue({
                 }
             })
         },
-        cancelButtonFn:function(){//弹窗操作按钮
+        cancelButtonFn(){//弹窗操作按钮
             var _this = this;
             switch(_this.isButtonsType){
                 case 1:
@@ -415,7 +409,7 @@ var fleaMarketForm = new Vue({
                     break;
             }
         },
-        confirmButtonFn:function(){//弹窗操作按钮
+        confirmButtonFn(){//弹窗操作按钮
             var _this = this;
             switch(_this.isButtonsType){
                 case 1:
@@ -427,32 +421,30 @@ var fleaMarketForm = new Vue({
                     break;
             }
         },
-        closePopupShow:function(){//关闭操作弹窗
-            var _this = this;
-            _this.PopupShow = false;
+        closePopupShow(){//关闭操作弹窗
+            this.PopupShow = false;
         },
-        scrollIntoView: function(id){
+        scrollIntoView(id){
             document.getElementById(id).scrollIntoView({block: 'start', behavior: 'smooth'});
         },
-        province:function () {
-           var _this = this;
-           _this.from.province = event.target.value;
-           console.log('aaa', _this.from.province)
-            if(_this.from.province==''){//省为请选择时市区初始化
-                _this.cityArray=[];
-                _this.townArray=[];
-                _this.secondParams.townId=''
+        province () {
+            this.from.province = event.target.value;
+           console.log('aaa', this.from.province)
+            if(this.from.province===''){//省为请选择时市区初始化
+                this.cityArray=[];
+                this.townArray=[];
+                this.secondParams.townId=''
             }else {
-              _this.getcity();
+                this.getcity();
             }
         },
-        getcity:function(event){//加载市
-           var _this = this;
+        getcity(event){//加载市
+            const _this = this;
             PublicApi.GetCity({ type:1, parentId: _this.from.province },function(response){
-                 if(response.code == 0 ){
+                 if(response.code === 0 ){
                     _this.cityArray = response.data;
                      _this.from.city = event.target.value;
-                     if(_this.from.city==''){
+                     if(_this.from.city===''){
                            _this.townArray=[];
                      }else {
                          _this.getcTown();
@@ -461,38 +453,48 @@ var fleaMarketForm = new Vue({
                 }
             })
         },
-        getcTown:function(event){
-            var _this = this;
+        getcTown(event){
+            const _this = this;
             PublicApi.GetTown({ type:2, parentId:_this.from.city},function(response){
-                if(response.code == 0 ){
+                if(response.code === 0 ){
                     _this.townArray = response.data;
                     _this.secondParams.townId = event.target.value;
                 }else{
-                    CAIMEI.Alert(response.msg, '确定', false);
+                    console.log('获取区异常~')
                 }
             })
         },
-        changeBox:function () {
-            if(event.target.checked ==true){
-             this.checkbox = true
-            }else {
-             this.checkbox = false
-            }
+        getBrandList(){//品牌列表
+            const _this = this;
+            SecondApi.brandList({},function (res) {
+                if(res.code === 0){
+                    _this.BrandList = res.data;
+                }
+            })
         },
-    },
-    mounted:function () {
-        var _this = this;
-        SecondApi.brandList({},function (res) {//品牌列表
-            if(res.code == 0){
-               _this.BrandList = res.data;
-            }
-        })
-         PublicApi.GetProvince({},function(response){ //省份
-                if(response.code == 0){
+        getProvince(){ //省份
+            const _this = this;
+            PublicApi.GetProvince({},function(response){ //省份
+                if(response.code === 0){
                     _this.provinceArray = response.data
                 }else{
-                    CAIMEI.Alert(response.msg, '确定', false);
+                    console.log('获取省份异常~')
                 }
             })
         },
+        changeBox () {
+            if(event.target.checked ===true){
+             this.checkbox = true
+            }else {
+             this.checkbox = false
+            }
+        },
+    },
+    mounted () {
+        this.getBrandList()
+        this.getProvince()
+        if(globalUserData){
+            this.secondParams.userId = globalUserData.userId
+        }
+    },
 })

+ 1 - 0
src/main/resources/static/js/flea-market/list.js

@@ -136,6 +136,7 @@ var fleaMarketList = new Vue({
            if(this.userId > 0){
                window.open('/flea-market/form.html')
            }else{
+               setBeforeUrl();
                window.location.href = '/login.html';
            }
          },

+ 38 - 35
src/main/resources/templates/flea-market/detail.html

@@ -45,38 +45,41 @@
             <div class="preview-info clearfix" v-show="isRequest" :class="isRequest?'active' : ''">
                 <div class="preview-info-title">
                     <span class="hoverBrand"  >
-                    <p class="info-p brandName" v-show="bnameShow" style="color: #999999">品牌:{{detail.brandName}}</p>
-                    <span class="Brand" v-if="isPC" style="padding: 15px" v-on:mouseover="changeActive($event)" v-on:mouseout="removeActive($event)" v-show="Showlogo"><img src="/img/flea-market/logo.png"/> </span>
+                        <p class="info-p brandName" v-show="bnameShow" style="color: #999999">品牌:{{detail.brandName}}</p>
+                        <span class="Brand" v-if="isPC" style="padding: 15px" v-on:mouseover="changeActive($event)" v-on:mouseout="removeActive($event)" v-show="Showlogo"><img src="/img/flea-market/logo.png"/> </span>
                     </span>
-                     <p class="info-p name">{{detail.name}}</p>
+                    <p class="info-p name">
+                        <span class="tag">
+                            <span class="infotag news" v-if="detail.sold==0&&detail.newAdded==1">最新</span>
+                            <span class="infotag sold" v-if="detail.sold==1">已售</span>
+                            <span class="infotag other" v-if="detail.brandID==161&&detail.brandName!=''&&detail.brandName!=null">{{detail.brandName}}</span>
+                        </span>
+                        {{detail.name}}
+                    </p>
                     <div class="brandMain" v-on:mouseover="changeActive($event)" v-on:mouseout="removeActive($event)" v-show="isShow" v-if="detail.brandInfo!=null||detail.brandInfo !=''"><div class="zheng-graphics"></div>{{detail.brandInfo}}</div>
                     <img src="/img/flea-market/yishou.png" class="yishou_img" v-if="soldImage" :class="soldImage?'show':''">
                 </div>
                 <div class="preview-info-main clearfix">
                     <div class="info price" style="width: 100%" v-if="detail.sold == 0">
-                        <span class="label">交&nbsp;&nbsp;易&nbsp;&nbsp;价:</span>
-                        <p>
-                            <span v-if="detail.detailTalkFlag==2&&userID == 0" class="fave-text">
-                                <span v-if="detail.sold == 1"></span>
-                                <span v-else>价格详聊</span>
-                            </span>
-                            <span v-else-if="userID == 0">
-                                <a class="member-detail toLogin loginWithParam " onclick="_czc.push(['_trackEvent','二手商品详情','登录查看价格','点击','','Um_Event_SecondDetailsLoginButton'])">
-                                    <span v-if="detail.sold == 1"></span>
-                                    <span v-else>登录查看价格></span>
-                                </a>
-                            </span>
-                            <span v-else-if="userID > 0 && detail.detailTalkFlag==2" class="fave-text">
-                                <span v-if="detail.sold == 1"></span>
-                                <span v-else>价格详聊</span>
-                            </span>
-                            <span v-else class="fave-text">¥<span class="big">{{detail.price}}</span></span>
-                        </p>
-                        <div class="tag">
-                           <span class="infotag news" v-if="detail.sold==0&&detail.newAdded==1">最新</span>
-                           <span class="infotag sold" v-if="detail.sold==1">已售</span>
-                           <span class="infotag other" v-if="detail.brandID==161&&detail.brandName!=''&&detail.brandName!=null">{{detail.brandName}}</span>
-                         </div>
+<!--                        <span class="label">交&nbsp;&nbsp;易&nbsp;&nbsp;价:</span>-->
+<!--                        <p>-->
+<!--                            <span v-if="detail.detailTalkFlag==2&&userID == 0" class="fave-text">-->
+<!--                                <span v-if="detail.sold == 1"></span>-->
+<!--                                <span v-else>价格详聊</span>-->
+<!--                            </span>-->
+<!--                            <span v-else-if="userID == 0">-->
+<!--                                <a class="member-detail toLogin loginWithParam " onclick="_czc.push(['_trackEvent','二手商品详情','登录查看价格','点击','','Um_Event_SecondDetailsLoginButton'])">-->
+<!--                                    <span v-if="detail.sold == 1"></span>-->
+<!--                                    <span v-else>登录查看价格></span>-->
+<!--                                </a>-->
+<!--                            </span>-->
+<!--                            <span v-else-if="userID > 0 && detail.detailTalkFlag==2" class="fave-text">-->
+<!--                                <span v-if="detail.sold == 1"></span>-->
+<!--                                <span v-else>价格详聊</span>-->
+<!--                            </span>-->
+<!--                            <span v-else class="fave-text">¥<span class="big">{{detail.price}}</span></span>-->
+<!--                        </p>-->
+
                     </div>
                      <div class="info " v-if="HandType && userID > 0">
                         <span class="label">市&nbsp;&nbsp;场&nbsp;&nbsp;价:</span>
@@ -102,28 +105,28 @@
                        <span class="label">商品成色:</span>
                         <p>{{detail.productQuality}}</p>
                     </div>
-                     <div class="info " v-if="detail.showContactFlag==2">
+                     <div class="info " v-if="detail.showContactFlag==='2'">
                        <span class="label">联&nbsp;&nbsp;系&nbsp;&nbsp;人:</span>
                         <p>{{ detail.contactName ? detail.contactName : '暂无' }}</p>
                     </div>
-                    <div class="info unit" v-if="detail.fixedYears!='' && detail.fixedYears!=null">
+                    <div class="info unit" v-if="detail.fixedYears">
                         <span class="label">出厂日期:</span>
                         <p>{{detail.fixedYears == 'null' ? '暂无' : detail.fixedYears }}</p>
                     </div>
-                    <div class="info unit" v-if="detail.showContactFlag==2">
+                    <div class="info unit" v-if="detail.showContactFlag==='2'">
                         <span class="label">联系方式:</span>
                         <p>{{ detail.contactMobile ? detail.contactMobile : '暂无' }}</p>
                     </div>
-                    <div class="info price" style="width: 100%" v-if="HandType">
+                    <div class="info unit" style="width: 100%" v-if="HandType">
                         <span class="label">库&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;存:</span>
                         <p>{{detail.stock}}</p>
                     </div>
-                    <div class="info price" v-if="detail.productType!=null && detail.productType!=''">
-                        <span class="label">商品类型:</span>
-                        <p v-if="detail.productType==1">医美</p>
+                    <div class="info unit">
+                        <span class="label">二手类型:</span>
+                        <p v-if="detail.productType===1">医美</p>
                         <p v-else>非医美</p>
                     </div>
-                    <div class="info price" v-if="detail.publishIdentity">
+                    <div class="info unit" v-if="detail.publishIdentity">
                         <span class="label">提&nbsp;&nbsp;供&nbsp;&nbsp;方:</span>
                         <p>{{ detail.publishIdentity == 1 ? '采美二手代售' : detail.companyName }}</p>
                     </div>
@@ -157,7 +160,7 @@
         </div>
      <div class="main">
         <div class="title">
-            <div class="li">商品详情</div>
+            <div class="li">二手详情</div>
         </div>
         <div class="mainContent">
             <div class="mainContentLeft">

+ 7 - 6
src/main/resources/templates/flea-market/form.html

@@ -17,11 +17,12 @@
 <!--            src="/img/flea-market/banner3.png " v-else></div>-->
     <div class="my-maintenance" id="secondHandrelease">
         <div class="mt-top"><span class="mt-title">发布二手</span></div>
-<!--        <div class="newsTitle">-->
-<!--            <p>-->
-<!--                欢迎您来到采美365网二手商品市场,您可以在这里发布二手仪器和产品,采美官方 人员将会对商品进行审核和专业的估价,估价完成后才能上架展示并销售,展示期为 3个月。为了完整展示您的商品,请您认真填写以下商品基本信息,谢谢合作。-->
-<!--            </p>-->
-<!--        </div>-->
+        <div class="newsTitle">
+            <p>
+                欢迎来到采美365网二手交易市场。您可以填写二手医美仪器和产品并发布。后续由我们的官方工作人员进行审核,信息通过后您的闲置商品将在网站展示3个月,请确保您所填写的产品信息无误且有效!
+                温馨提示:采美二手平台不收取任何费用,谢谢合作!
+            </p>
+        </div>
         <div class="mt-bottom">
             <form id="mt-form" method="post" enctype="multipart/form-data" class="login-form common-form">
                 <div class="unlogin-label spacing" style="letter-spacing: 1px;margin-right: 0"><span
@@ -53,7 +54,7 @@
                 </div>
                 <div class="unlogin-item input-item shrink-spacing" id="vShow_checkCode">
                     <div class="unlogin-label spacing" style="letter-spacing: 1px;"><span class="red-color">*</span>验证码:</div>
-                    <input class="code" type="text"  maxlength="6" v-model="secondParams.checkCode"   @blur="handleMobileCodeInput" placeholder="请输入验证码">
+                    <input class="code massageBtn" type="text"  maxlength="6" v-model="secondParams.checkCode"   @blur="handleMobileCodeInput" placeholder="请输入验证码">
                     <a class="getCode" href="javascript:void(0);" @click="getNewMobileCodeFn" :class="[isMobileDisabled  ? 'disabled' : '']">{{ mobileCodeText }}</a>
                     <span class="release-tips errTips icon mIcon" v-show="vShow_checkCode">{{fromMessage}}</span>
                 </div>

+ 8 - 10
src/main/resources/templates/flea-market/list.html

@@ -18,9 +18,7 @@
      </div>
      <template v-else>
         <div class="wrap">
-<!--            <div class="ListImg">-->
-<!--                <img src="/img/flea-market/banner.png" />-->
-<!--            </div>-->
+
 <!--            <template>-->
 <!--                <ul class="secondTitle " v-if="isPC">-->
 <!--                    <li class="ClassA icon" @click="handle('1')" :class="[currentId == '1' ? 'active':'',currentId == '1' ? 'jqSelect':'']">-->
@@ -51,7 +49,7 @@
 <!--            </template>-->
             <div class="second-fixed-title" v-if="isPC">
                 <div class="inner">
-                    <div class="second-fixed-btn">
+                    <div class="second-fixed-btn" @click="handleForm">
                         我要发布
                     </div>
                 </div>
@@ -61,7 +59,7 @@
             </ul>
             <div class="shopList">
                 <div class="Listitem" v-if="isShow" v-for="(item, index) in tabchildList">
-                    <a class="itemImg onhref" :href="'/flea-market-'+item.productId+'.html'">
+                    <a class="itemImg onhref" :href="'/flea-market-'+item.productId+'.html'" target="_blank">
                         <img :src="item.imageList[0]" :class="item.sold==1?'activeImg':''" class="bigImg">
                     </a>
                     <div class="ItemInfo">
@@ -71,7 +69,7 @@
                             <span class="infotag sold " v-if="item.sold==1">已售</span>
                             <span class="infotag other" v-if="item.brandID==161&&item.brandName!=''&&item.brandName!=null">{{item.brandName}}</span>
                         </div>
-                        <a class="productname" :href="'/flea-market-'+item.productId+'.html'">
+                        <a class="productname" :href="'/flea-market-'+item.productId+'.html'" target="_blank">
                             {{item.name}}
                         </a>
 <!--                        <div class="targetprice">-->
@@ -110,14 +108,14 @@
                     <img src="/img/flea-market/nologo.png" v-if="isPC" />
                     <img src="/img/flea-market/kong_m.png" v-else />
                     <div class="error-message">
-                        <p>此分类下面没有商品,换其它分类瞅瞅</p>
+                        <p>暂无数据</p>
                     </div>
                 </div>
             </div>
             <div class="fabu" v-if="!isPC">
-                 <a class="intro" href="/flea-market/intro.html">
-                     <p>二手市场介绍</p>
-                 </a>
+<!--                 <a class="intro" href="/flea-market/intro.html">-->
+<!--                     <p>二手市场介绍</p>-->
+<!--                 </a>-->
                  <a class="form" href="javascript:void(0)" @click="handleForm">
                      <p>我要发布</p>
                  </a>