bugCommit

src/main/resources/static/js/supplier-center/shop/release.js

@@ -10,7 +10,7 @@ var releaseContainer = new Vue({
         NODE_ENV_BASE_URL:'',
         releaseType:'',
         productId:'',
-        activeNum:0,
+        activeNum:2,
         isSelectActive:0,
         isRequest:false,
         isAddBrand:false,//控制提交品牌弹窗
@@ -36,7 +36,7 @@ var releaseContainer = new Vue({
             normalPrice:'',//市场价
             price1:'',//售价
             costPrice:'',//结算价
-            includedTax:3,//是否含税
+            includedTax:1,//是否含税
             invoiceType:1,//发票类型
             taxPoint:13,//税率
             minBuyNumber:'',//起订量
@@ -536,11 +536,29 @@ var releaseContainer = new Vue({
             var _this = this;
             var inputDOM = _this.$refs.goodsImages;
             var file = inputDOM.files;
-            _this.formData.append('file', file[0]);
-            SupplierApi.uploadimg(_this.formData,function(response){
-                _this.GoodsImagesList.push(response.data);
-                event.target.value = '';
-            });
+            var reader = new FileReader();
+            reader.readAsDataURL(file[0]);
+            reader.onload = function(e) {
+                var image = new Image();
+                image.src = e.target.result;
+                image.onload = function() {
+                    var w = this.width;
+                    var h = this.height;
+                    if (w != h) {
+                        CAIMEI.dialog('请上传尺寸比例为1:1的图片');
+                        return false;
+                    }
+                    if (w < 750 || h < 750) {
+                        CAIMEI.dialog('请上传分辨率大于750*750的图片');
+                        return false;
+                    }
+                    _this.formData.append('file', file[0]);
+                    SupplierApi.uploadimg(_this.formData,function(response){
+                        _this.GoodsImagesList.push(response.data);
+                        event.target.value = '';
+                    });
+                }
+            };
         },
         showViewerImageFn: function(index ){//预览上传图片
             var _this = this;

src/main/resources/templates/supplier-center/shop/release.html

@@ -266,11 +266,11 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="release-from clear" v-show="releaseParams.invoiceType != '3' && releaseParams.includedTax == 0 && releaseParams.taxPoint>0">
+                            <div class="release-from clear" v-show="releaseParams.invoiceType != '3'">
                                 <div class="release-input">
                                     <span class="tax" :style="{color:'#FF0000'}">*</span>
                                     <span class="tax">税率：<span class="mg">{{releaseParams.taxPoint}}%</span></span>
-                                    <a href="javascript: void(0);" class="edit-btn" v-show="releaseParams.includedTax == 0" @click="taxPonitEdit">修改</a>
+                                    <a href="javascript: void(0);" class="edit-btn" @click="taxPonitEdit">修改</a>
                                 </div>
                                 <div class="release-tips" v-show="vShow_Price1">{{fromMessage}}</div>
                             </div>
@@ -390,7 +390,7 @@
                             </div>
                             <div class="release-from text imgText" style="margin-bottom: 10px;">
                                 <P class="text" style="line-height: 24px;">最多上传<span class="em">5张</span>图片，可拖动图片改变位置,第一张默认为产品主图；仅支持
-                                <span class="em">JPG、GIF、JPEG</span>和<span class="em">BMP</span>格式，建议图片<span class="em">分辨率在750*750以上，</span>
+                                <span class="em">JPG、GIF、JPEG</span>和<span class="em">BMP</span>格式，建议图片<span class="em">比例必须为1:1且分辨率必须在750*750以上，</span>
                                 <span class="em">每张图小于5M</span>；图片请避免全文字，否则有可能审核不通过</P>
 <!--                                <P class="text" style="line-height: 24px;">仅支持<span class="em">JPG、GIF、JPEG</span>和<span class="em">BMP</span>格式，建议图片<span class="em">分辨率在750*750以上，</span></P>-->
 <!--                                <P class="text" style="line-height: 24px;"><span class="em">每张图小于5M</span>；图片请避免全文字，否则有可能审核不通过</P>-->