5月小需求 BUG 修复

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

@@ -53,10 +53,10 @@ logging:
 # 服务域名
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
-#  spiServer: https://spi-b.caimei365.com
-  spiServer: http://192.168.2.67:8008
-#  coreServer: https://core-b.caimei365.com
-  coreServer: http://192.168.2.67:18002
+  spiServer: https://spi-b.caimei365.com
+#  spiServer: http://192.168.2.67:8008
+  coreServer: https://core-b.caimei365.com
+#  coreServer: http://192.168.2.67:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: http:localhost:8009
   destPath: D:/_PLAN_WORKSPACE/test/static

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

@@ -7,7 +7,7 @@ body{background: #fff}
      .mt-top {line-height: 105px;letter-spacing: 0px;color: #22272e;text-align: center;font-size: 32px;font-weight: bold;height: 105px}
      .newsTitle {height: 60px;line-height: 30px;background-image: linear-gradient(270deg, rgba(255, 255, 255, 0), rgba(225, 86, 22, .1), rgba(255, 255, 255, 0));text-align: center;padding: 7px 157px;color: #e15616}
      .mt-bottom {width: 44%;margin: 20px auto;}
-     #mt-form {position: relative;overflow: hidden;}
+     #mt-form {position: relative;}
      .secondradio div {width: 154px;height: 36px;line-height: 36px;background-color: #ffffff;border: solid 1px #b8bfca;text-align: center;display: inline-block;cursor: pointer;position: relative;color: #627386;}
      .secondradio div:nth-child(2) {margin: 0 20px;}
      .secondradio div.active {color: #e15616;border: solid 1px #e15616;}
@@ -36,7 +36,7 @@ body{background: #fff}
      .input-file-btn input{width: 90px;height: 36px;opacity: 0;cursor: pointer;position: absolute;top: 0;left: 0;z-index: 999;}
      .upload-img {width: 100%;height: 100%;display: block;border-radius: 2px;}
      .add-text {font-size: 12px;color: #333330;opacity: 0.5;position: absolute;top: 60%;right: 13px}
-     .release-main-container {overflow: hidden;}
+     .release-main-container {width: 100%;height: auto;float: left;}
      #uploadGoodsImages {width: 496px;}
      .icon.add:before {width: 25px;height: 25px;background-position: -168px -374px;position: absolute;top: 17px;right: 24px;}
      .icon.del:before {width: 20px;height: 20px;background-position: -116px -138px;position: absolute;top: -3px;right: -3px;}
@@ -46,7 +46,7 @@ body{background: #fff}
      .wen-tips {width: 462px;height: 46px;line-height: 46px;text-align: center;color: #FFF;font-size: 14px;background-color: #1890f9;box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17);position: absolute;bottom: 10px;left: -32px;border-radius: 3px;display: none;}
      .form-upload-tips:hover .wen-tips {display: block;}
      #word-limit {position: absolute;right: 0;bottom: 10px;font-size: 12px;color: #9aa5b5}
-     .unlogin-item {margin-top: 20px;}
+     .unlogin-item {margin-top: 20px;width: 100%;float: left;}
      .textarea-wrapper {letter-spacing: 1.5px;line-height: 24px;color: #627386;position: relative;width: 496px;}
      .BtnAll {margin-top: 30px;width: 520px;overflow: hidden}
      .BtnAll button {width: 232px;height: 50px;border-radius: 2px;line-height: 50px;text-align: center;font-size: 18px;cursor: pointer;}
@@ -97,7 +97,7 @@ body{background: #fff}
      .newsTitle {line-height: 6.4vw;text-align: left;color: #e15616;padding: 2.7vw;background-color: rgba(225, 86, 22, .1)}
      .mt-bottom {margin: 5.3vw auto;}
      #mt-form {position: relative;overflow: hidden;width: 93.4vw;margin: auto}
-     .unlogin-label {width: 39vw;margin-bottom: 2.7vw;color: #627386;padding-left: 2.7vw}
+     .unlogin-label {width: 100%;margin-bottom: 2.7vw;color: #627386;padding-left: 2.7vw}
      .secondradio div {width: 27vw;height: 10.7vw;line-height: 10.7vw;background-color: #ffffff;border: solid .27vw #b8bfca;text-align: center;display: inline-block;cursor: pointer;position: relative;color: #627386}
      .secondradio div:nth-child(2) {margin: 0 5.3vw;}
      .secondradio div.active {color: #e15616;border: solid .27vw #e15616;}
@@ -118,16 +118,16 @@ body{background: #fff}
      .border-grey {width: 100%;height: 56.3vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;margin-top: 5.3vw;resize: none;padding: 2.7vw;box-sizing: border-box}
      #description {margin-top: 0;}
      .upload-file {position: relative;float: left;margin: 2.7vw 2.7vw 2.7vw 0px;cursor: pointer;width: 21.3vw;height: 21.3vw;border-radius: .53vw;border: solid .27vw #b8bfca}
-     .login-form input.upload-file-name{ width: 55.7vw !important; padding: 0 2.7vw;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
+     .login-form input.upload-file-name{ width: 100% !important; padding: 0 2.7vw;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
      .input-file {width: 21.3vw;height: 21.3vw;opacity: 0;cursor: pointer;position: absolute;}
-     .input-file-btn {width: 33.6vw;height: 9.6vw;box-sizing: border-box; cursor: pointer;position: absolute;	background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;text-align: center;line-height: 9.6vw;font-size: 14px;color: #e15616;position: relative;float: right;}
+     .input-file-btn {width: 33.6vw;height: 9.6vw;box-sizing: border-box; cursor: pointer;position: absolute;	background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;text-align: center;line-height: 9.6vw;font-size: 14px;color: #e15616;right: 0;top: 7.8vw;}
      .input-file-btn input{width: 33.6vw;height: 9.6vw;opacity: 0;cursor: pointer;position: absolute;top: 0;left: 0;z-index: 999;}
      .upload-img {width: 100%;height: 100%;display: block;border-radius: .53vw;}
      .add-text {font-size: 3.2vw;color: #333330;opacity: 0.5;position: absolute;top: 60%;right:3.3vw}
      .release-main-container {overflow: hidden;}
      #uploadGoodsImages {width: 100%;overflow: auto;}
      .mIcon.add:before {width: 6.7vw;height: 6.7vw;background-position: -8.8vw -61vw;position: absolute;top: 4.5vw;right: 7.2vw}
-     .mIcon.del:before {width: 5.3vw;height: 5.3vw;background-position: -89.6vw -7.7vw;position: absolute;top: -1vw;right: -.8vw}
+     .mIcon.del:before {width: 5.3vw;height: 5.3vw;background-position: -89.6vw -7.7vw;position: absolute;top: 10vw;right: 2vw}
      .form-upload-tips .icon-wen:before {width: 5.3vw;height: 6.3vw;background-position: -76.5vw 0px;cursor: pointer;}
      .form-upload-tips .wen-tips:before {content: '';width: 0px;height: 0px;border-width: 2.1vw;border-style: solid;border-color: transparent transparent #1890f9 transparent;position: absolute;top: -4vw;left: 27.2vw;}
      .form-upload-tips {width: 5.3vw;float: left;margin-top: 2.7vw;}

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

@@ -152,8 +152,14 @@ var fleaMarketForm = new Vue({
         uploadGoodsImagesFn: function(event){//上传商品图片
             var _this = this;
             var inputDOM = _this.$refs.goodsImages;
-            var file = inputDOM.files;
-            _this.formData.append('file', file[0]);
+            var file = inputDOM.files[0];
+            var size = file.size;
+            if(size > 5242880){//限制了文件的大小5MB
+                CAIMEI.dialog('图片不能超过5M');
+                event.target.value = '';
+                return;
+            }
+            _this.formData.append('file', file);
             SecondApi.uploadimg(_this.formData,function(response){
                 _this.GoodsImagesList.push(response.data);
                 _this.secondParams.image =_this.GoodsImagesList.toString()+',';
@@ -163,8 +169,14 @@ var fleaMarketForm = new Vue({
         uploadAuthenticationImagesFn: function(event){//上传身份验证照片
             var _this = this;
             var inputDOM = _this.$refs.AuthenticationImage;
-            var file = inputDOM.files;
-            _this.formData.append('file', file[0]);
+            var file = inputDOM.files[0];
+            var size = file.size;
+            if(size > 5242880){//限制了文件的大小5MB
+                CAIMEI.dialog('图片不能超过5M');
+                event.target.value = '';
+                return;
+            }
+            _this.formData.append('file', file);
             SecondApi.uploadimg(_this.formData,function(response){
                 _this.secondParams.authenticationImage = response.data;
                 event.target.value = '';
@@ -173,8 +185,14 @@ var fleaMarketForm = new Vue({
         uploadCommitmentImagesFn: function(event){//上传承诺函图片
             var _this = this;
             var inputDOM = _this.$refs.CommitmentImage;
-            var file = inputDOM.files;
-            _this.formData.append('file', file[0]);
+            var file = inputDOM.files[0];
+            var size = file.size;
+            if(size > 5242880){//限制了文件的大小5MB
+                CAIMEI.dialog('图片不能超过5M');
+                event.target.value = '';
+                return;
+            }
+            _this.formData.append('file', file);
             SecondApi.uploadimg(_this.formData,function(response){
                 _this.secondParams.commitmentImage = response.data;
                 event.target.value = '';
@@ -183,10 +201,21 @@ var fleaMarketForm = new Vue({
         uploadCommitmentFileFn : function(event){//上传承诺函文件
             var _this = this;
             var inputDOM = _this.$refs.CommitmentImagefile;
-            var file = inputDOM.files;
+            var file = inputDOM.files[0];
             var formData = new FormData();
-            console.log(file[0])
-            formData.append('file', file[0]);
+            var size = file.size;
+            var newfilename = file.name;
+            if ( newfilename.indexOf(".pdf")==-1 ){ //限制了文件类型
+                CAIMEI.dialog('文件必须为".pdf"格式!');
+                event.target.value = '';
+                return;
+            }
+            if(size > 20971520){//限制了文件的大小20MB
+                CAIMEI.dialog('文件大小不能超过20M');
+                event.target.value = '';
+                return;
+            }
+            formData.append('file', file);
             SecondApi.uploadFile(formData,function(response){
                 _this.secondParams.ossName = response.data.ossName;
                 _this.secondParams.fileName = response.data.fileName;
@@ -217,6 +246,24 @@ var fleaMarketForm = new Vue({
                 }
             })
         },
+        showViewerImageFn: function( ){//预览身份验证图片
+            var _this = this;
+            var DomEven = '#ViewerAuthenticationImage';
+            var ViewerDom = document.querySelector(DomEven);
+            _this.viewer = new Viewer(ViewerDom, {url:'data-image'});
+        },
+        showViewerImageFn1: function(){//预览承诺函图片
+            var _this = this;
+            var DomEven = '#ViewerCommitmentImage';
+            var ViewerDom = document.querySelector(DomEven);
+            _this.viewer = new Viewer(ViewerDom, {url:'data-image'});
+        },
+        showViewerImageFn2: function(index,imageIndex ){//预览图片
+            var _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;
@@ -355,7 +402,7 @@ var fleaMarketForm = new Vue({
             console.log(_this.secondParams);
             if(_this.secondParams.authenticationImage == ''){
                 _this.PopupShow = true;
-                _this.tipsContentText = '上传身份验证照片。您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。';
+                _this.tipsContentText = '上传身份验证照片,您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。';
                 _this.cancelButtonText = '继续发布';
                 _this.confirmButtonText = '去上传';
                 _this.isButtonsType = 1;
@@ -363,7 +410,7 @@ var fleaMarketForm = new Vue({
             }
             if(_this.secondParams.commitmentImage == '' || _this.secondParams.ossName == ''){
                 _this.PopupShow = true;
-                _this.tipsContentText = '上传二手出让承诺函。您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。';
+                _this.tipsContentText = '上传二手出让承诺函,您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。';
                 _this.cancelButtonText = '继续发布';
                 _this.confirmButtonText = '去上传';
                 _this.isButtonsType = 1;

src/main/resources/static/js/supplier-center/order/qualifications.js

@@ -130,10 +130,22 @@ var addlogistics = new Vue({
         uploadFileFn : function(index,array,event){//上传承诺函文件
             var _this = this;
             var inputDOM = _this.$refs['QualificationsFile'+index];
-            var file = inputDOM[0].files;
+            var file = inputDOM[0].files[0];
             console.log('file========>',file);
             var formData = new FormData();
-            formData.append('file', file[0]);
+            var size = file.size;
+            var newfilename = file.name;
+            if ( newfilename.indexOf(".pdf")==-1 || newfilename.indexOf(".doc")==-1 || newfilename.indexOf(".docx")==-1){ //限制了文件类型
+                CAIMEI.dialog('文件必须为".pdf,.doc,.docx"格式!');
+                event.target.value = '';
+                return;
+            }
+            if(size > 52428800){//限制了文件的大小20MB
+                CAIMEI.dialog('文件大小不能超过50M');
+                event.target.value = '';
+                return;
+            }
+            formData.append('file', file);
             PublicApi.uploadFile(formData,function(response){
                 var obj = {
                         fileName:response.data.fileName,

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

@@ -87,7 +87,7 @@
                         </div>
                         <div class="release-main-container">
                             <div class="release-from">
-                                <div class="release-label">身份验证照片<span style="color:#ffb496">(个人请上传身份证正面照片；机构请上传营业执照照片)</span>：</div>
+                                <div class="release-label">身份验证照片：<span style="color:#ffb496">个人请上传身份证正面照片；机构请上传营业执照照片(照片大小不超过5M)</span></div>
                                 <div class="release-input upload image"  id="uploadAuthenticationImage">
                                     <div class="upload-file" v-if="secondParams.authenticationImage == ''">
                                         <i class="icon mIcon add"></i>
@@ -95,7 +95,14 @@
                                         <input ref="AuthenticationImage" type="file" name="file" value="" class="input-file" accept="image/png,image/jpeg,image/gif,image/jpg"  @change="uploadAuthenticationImagesFn">
                                     </div>
                                     <div class="upload-file" v-else>
-                                        <img :data-original='secondParams.authenticationImage' :src="secondParams.authenticationImage" :data-image="secondParams.authenticationImage" alt="" class="upload-img" >
+                                        <img :data-original='secondParams.authenticationImage'
+                                             :src="secondParams.authenticationImage"
+                                             :data-image="secondParams.authenticationImage"
+                                             class="upload-img"
+                                             alt="身份验证照片"
+                                             id="ViewerAuthenticationImage"
+                                             @click="showViewerImageFn"
+                                        >
                                         <i class="icon mIcon del" @click="removeAuthenticationImagesFn"></i>
                                     </div>
                                 </div>
@@ -144,7 +151,14 @@
                                 <div class="release-label"><span class="red-color" >*</span>商品图片：</div>
                                 <div class="release-input upload image"  id="uploadGoodsImages">
                                     <div class="upload-file"  v-for="(item, index) in GoodsImagesList" :key="index">
-                                        <img :data-original='item' :src="item" :data-image="item" alt="" class="upload-img" >
+                                        <img :data-original='item'
+                                             :src="item"
+                                             :data-image="item"
+                                             alt="商品图片"
+                                             class="upload-img"
+                                             :id="'ViewerGoodsImages'+index"
+                                             @click="showViewerImageFn2(index)"
+                                        >
                                         <i class="icon mIcon del" @click="removeGoodsImagesFn(index)"></i>
                                     </div>
                                     <div class="upload-file" v-show="GoodsImagesList.length<5">
@@ -168,19 +182,19 @@
                             </div>
                         </div>
                         <div class="unlogin-item input-item shrink-spacing">
-                            <div class="unlogin-label spacing">二手出让承诺函文件：<span style="color:#ffb496">(仅支持pdf文件)</span>：</div>
+                            <div class="unlogin-label spacing">二手出让承诺函文件：<span style="color:#ffb496">(仅支持pdf,大小不能超过20M)</span></div>
                             <div class="upload-file-view">
                                 <input class="upload-file-name" type="text" v-model="secondParams.fileName" disabled="disabled">
                                 <div class="input-file-btn" v-if="secondParams.ossName == ''">
                                     上传文件
-                                    <input class="input-file-btn"  ref="CommitmentImagefile" type="file" name="file" value="" accept=".pdf"  @change="uploadCommitmentFileFn">
+                                    <input class="input-file-btn"  ref="CommitmentImagefile" type="file" name="file" value="" accept="*.pdf/*.doc*/.docx"  @change="uploadCommitmentFileFn">
                                 </div>
                                 <i class="icon mIcon del" v-else @click="deleteCommitmentFile"></i>
                             </div>
                         </div>
                         <div class="release-main-container">
                             <div class="release-from">
-                                <div class="release-label">二手出让承诺函图片<span style="color:#ffb496">(若不方便上传承诺函文件，可对承诺函进行拍照或者截图，再上传图片)</span>：</div>
+                                <div class="release-label">二手出让承诺函图片：<span style="color:#ffb496">(若不方便上传承诺函文件，可对承诺函进行拍照或者截图，再上传图片,照片大小不超过5M)</span></div>
                                 <div class="release-input upload image"  id="uploadCommitmentImage">
                                     <div class="upload-file" v-if="secondParams.commitmentImage == ''">
                                         <i class="icon mIcon add"></i>
@@ -188,7 +202,14 @@
                                         <input ref="CommitmentImage" type="file" name="file" value="" class="input-file" accept="image/png,image/jpeg,image/gif,image/jpg"  @change="uploadCommitmentImagesFn">
                                     </div>
                                     <div class="upload-file" v-else>
-                                        <img :data-original='secondParams.commitmentImage' :src="secondParams.commitmentImage" :data-image="secondParams.commitmentImage" alt="" class="upload-img" >
+                                        <img :data-original='secondParams.commitmentImage'
+                                             :src="secondParams.commitmentImage"
+                                             :data-image="secondParams.commitmentImage"
+                                             class="upload-img"
+                                             alt="身份验证照片"
+                                             id="ViewerCommitmentImage"
+                                             @click="showViewerImageFn1"
+                                        >
                                         <i class="icon mIcon del" @click="removeCommitmentImagesFn"></i>
                                     </div>
                                 </div>