shenjj 7 жил өмнө
parent
commit
a73e225e41

+ 8 - 0
components/common/upload/upload.vue

@@ -48,6 +48,7 @@
     },
     mounted() {
       this.qualifications.url = this.url || ''
+      this.clearInfo()
     },
     methods: {
       update (e) {
@@ -108,6 +109,13 @@
         this.qualifications.url = ''
         this.qualifications.type = this.typeData
         this.$emit('uploadAction', this.qualifications)
+      },
+      clearInfo() {
+        this.qualifications = {
+          url: '', type: ''
+        }
+        this.isShow = false
+        this.isPdf = false
       }
     }
   }

+ 3 - 4
components/mobile/register-saler/Register.vue

@@ -14,8 +14,6 @@
                   @sectionEvent="sectionChange"
                   @registerAction="onRegister"
                   :loginData="loginData"
-                  :enterpriseData="enterpriseData"
-                  :businessImgUrl="businessImgUrl"
                   @businessImgUrlAction="onBusinessImgUrl"
                   @isSelfCacheDataAction="onCacheData"></step-first>
       <step-second v-show="section == 2"
@@ -33,10 +31,9 @@
                   :registerData="registerData"
                   :enterpriseData="enterpriseData"
                   :checkData="checkData"
-                  :businessImgUrl="businessImgUrl"
                   @businessImgUrlAction="onBusinessImgUrl"
                   :loginData="loginData"
-                  :tab="tab"></step-third>
+                  :tab="tab" ref="clearInfo"></step-third>
     </div>
     </div>
 </template>
@@ -133,7 +130,9 @@
     methods: {
       sectionChange: function (num, tab) {
         this.section = num
+        this.tab = ''
         if (tab) {
+          this.$refs.clearInfo.clearInfo()
           this.tab = tab
         }
       },

+ 1 - 0
components/mobile/register-saler/register/StepFirst.vue

@@ -717,6 +717,7 @@
       padding-left: 0.15rem;
       height: 0.7rem;
       line-height: 0.7rem;
+      border: 1px solid #dcdcdc;
     }
     .mobile-x-text-help {
       position: absolute;

+ 1 - 1
components/mobile/register-saler/register/StepSecond.vue

@@ -17,7 +17,7 @@
             我已阅读并同意<a href="http://www.usoftmall.com/help#/issue/50" target="_blank" style="margin-right: -.1rem">《优软商城服务条款》</a>、<a href="http://www.usoftmall.com/help#/issue/16" target="_blank" style="margin-left: -.26rem">《优软商城买卖条例》</a>
           </div>
         </div>
-        <div class="row next-btn step-two-btn" style="padding-top: 0px;">
+        <div class="row next-btn step-two-btn" style="padding-top: 0px !important;">
           <button @click="sectionChange(1)" class="btn">上一步</button>
           <button @click="sectionChange(3)" class="btn" :style="!checkData.checked ? 'opacity: 1;':''">同意</button>
         </div>

+ 29 - 11
components/mobile/register-saler/register/StepThird.vue

@@ -42,7 +42,7 @@
                   <div class="wrap-title"><span class="line"></span>营业执照</div>
                   <div class="clearfix" style="margin: 0 0.25rem">
                     <div class="show_image_area show_image pull-left">
-                      <upload :typeData="'BUSINESS_LICENSE'" :url="businessLicenseUrl" @uploadAction="onUpload"></upload>
+                      <upload ref="Pom" :typeData="'BUSINESS_LICENSE'" :url="businessLicenseUrl" @uploadAction="onUpload"></upload>
                     </div>
                     <div class="pull-left infoTextMobile" style="width: 5.1rem;margin-left: 0.2rem">
                       <em style="color: #FF0000;">*</em>如已上传最新版营业执照(三证合一),则其他两证无需上传;仅支持上传JPG、PNG、GIF、PDF格式,每张大小不超过3M
@@ -56,7 +56,7 @@
                   <div class="wrap-title"><span class="line"></span>纳税人证明</div>
                   <div class="" style="margin: 0 0.25rem">
                     <div class="show_image_area show_image">
-                      <upload  :typeData="'TAX_PAYER'" @uploadAction="onUpload"></upload>
+                      <upload ref="Pom"  :typeData="'TAX_PAYER'" @uploadAction="onUpload"></upload>
                     </div>
                   </div>
                 </div>
@@ -64,7 +64,7 @@
                   <div class="wrap-title"><span class="line"></span>税务登记证</div>
                   <div class="" style="margin: 0 0.25rem">
                     <div class="show_image_area show_image">
-                      <upload :typeData="'TAX_REGISTRATION'" @uploadAction="onUpload"></upload>
+                      <upload ref="Pom" :typeData="'TAX_REGISTRATION'" @uploadAction="onUpload"></upload>
                     </div>
                     <!--<div class="col-md-5" style="padding: 0;">-->
                       <!--<span style="margin-top: 50%;padding-right: 20px;">税务登记证</span>-->
@@ -104,7 +104,7 @@
                 </div>
                 <div class="brand-small-upload clearfix" style="margin: 0.1rem 0.25rem 0 0.25rem">
                   <div class="brand-small-img">
-                    <upload :typeData="index" @uploadAction="onUpload" :NopassThree="true"></upload>
+                    <upload ref="Pom" :typeData="index" @uploadAction="onUpload" :NopassThree="true"></upload>
                   </div>
                   <div class="file-text">品牌logo/商标注册原件/授权说明书</div>
                   <div v-show="brands.length > 1" @click="deleteBrand(index)" class="delete" title="删除" style="float: right;text-align: center;line-height: 1.09rem;height: 1.09rem;padding-top: 0.36rem;"><i class="fa fa-trash"></i></div>
@@ -127,7 +127,7 @@
                   <div class="wrap-title"><span class="line"></span>营业执照</div>
                   <div class="clearfix" style="margin: 0 0.25rem">
                     <div class="show_image_area show_image pull-left">
-                      <upload :typeData="'BUSINESS_LICENSE'" :url="businessLicenseUrl" @uploadAction="onUpload" :NopassThree="true"></upload>
+                      <upload ref="Pom" :typeData="'BUSINESS_LICENSE'" :url="businessLicenseUrl" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <div class="pull-left infoTextMobile" style="width: 5.1rem;margin-left: 0.2rem">
                       <em style="color: #FF0000;">*</em>如已上传最新版营业执照(三证合一),则其他两证无需上传;仅支持上传JPG、PNG、GIF、PDF格式,每张大小不超过3M
@@ -141,7 +141,7 @@
                   <div class="wrap-title"><span class="line"></span>纳税人证明</div>
                   <div class="" style="margin: 0 0.25rem">
                     <div class="show_image_area show_image">
-                      <upload  :typeData="'TAX_PAYER'" @uploadAction="onUpload" :NopassThree="true"></upload>
+                      <upload  ref="Pom" :typeData="'TAX_PAYER'" @uploadAction="onUpload" :NopassThree="true"></upload>
                   </div>
                   </div>
                 </div>
@@ -149,7 +149,7 @@
                   <div class="wrap-title"><span class="line"></span>税务登记证</div>
                   <div class="" style="margin: 0 0.25rem">
                     <div class="show_image_area show_image">
-                      <upload :typeData="'TAX_REGISTRATION'" @uploadAction="onUpload" :NopassThree="true"></upload>
+                      <upload ref="Pom" :typeData="'TAX_REGISTRATION'" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <!--<div class="col-md-5" style="padding: 0;">-->
                       <!--<span style="margin-top: 50%;padding-right: 20px;">税务登记证</span>-->
@@ -188,7 +188,7 @@
                 </div>
                 <div class="brand-small-upload clearfix"  style="margin: 0.1rem 0.25rem 0 0.25rem">
                   <div class="brand-small-img">
-                    <upload :typeData="index" @uploadAction="onUpload" :NopassThree="true"></upload>
+                    <upload  ref="Pom" :typeData="index" @uploadAction="onUpload" :NopassThree="true"></upload>
                   </div>
                   <div class="file-text">代理资格证/代理授权书</div>
                   <div v-show="brands.length > 1" @click="deleteBrand(index)" class="delete" title="删除"><i class="fa fa-trash"></i></div>
@@ -214,7 +214,7 @@
                   <div class="wrap-title"><span class="line"></span>营业执照</div>
                   <div class="clearfix" style="margin: 0 0.25rem">
                     <div class="show_image_area show_image pull-left">
-                      <upload :typeData="'BUSINESS_LICENSE'" :url="businessLicenseUrl" @uploadAction="onUpload" :NopassThree="true"></upload>
+                      <upload ref="Pom" :typeData="'BUSINESS_LICENSE'" :url="businessLicenseUrl" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <div class="pull-left infoTextMobile" style="width: 5.1rem;margin-left: 0.2rem">
                       <em style="color: #FF0000;">*</em>如已上传最新版营业执照(三证合一),则其他两证无需上传;仅支持上传JPG、PNG、GIF、PDF格式,每张大小不超过3M
@@ -228,7 +228,7 @@
                   <div class="wrap-title"><span class="line"></span>纳税人证明</div>
                   <div class="" style="margin: 0 0.25rem">
                     <div class="show_image_area show_image">
-                      <upload  :typeData="'TAX_PAYER'" @uploadAction="onUpload" :NopassThree="true"></upload>
+                      <upload ref="Pom" :typeData="'TAX_PAYER'" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                   </div>
                 </div>
@@ -236,7 +236,7 @@
                   <div class="wrap-title"><span class="line"></span>税务登记证</div>
                   <div class="" style="margin: 0 0.25rem">
                     <div class="show_image_area show_image">
-                      <upload :typeData="'TAX_REGISTRATION'" @uploadAction="onUpload" :NopassThree="true"></upload>
+                      <upload ref="Pom" :typeData="'TAX_REGISTRATION'" @uploadAction="onUpload" :NopassThree="true"></upload>
                     </div>
                     <!--<div class="col-md-5" style="padding: 0;">-->
                       <!--<span style="margin-top: 50%;padding-right: 20px;">税务登记证</span>-->
@@ -353,11 +353,13 @@
     watch: {
       enterpriseData: function (val, oldVal) {
         if (val !== {}) {
+          console.log(1)
           this.businessLicenseUrl = val.url || val.businessCodeImage || ''
 //          this.defaultBusinessUrl = val.enBussinessCodeImage || ''
         }
       },
       businessImgUrl: function (val, oldVal) {
+        console.log(2)
         this.businessLicenseUrl = val
       }
     },
@@ -371,6 +373,22 @@
       }
     },
     methods: {
+      clearInfo() {
+        this.brands = [{
+          type: 'BRAND',
+          name: '',
+          url: '',
+          isPdf: false,
+          brandUuid: ''
+        }]
+        this.businessLicenseUrl = ''
+        this.taxPayerUrl = ''
+        this.taxRegistrationUrl = ''
+        console.log('clear')
+        // for (let i = 0; i < this.$refs.Pom.length; i++) {
+        //   this.$refs.Pom[i].clearInfo()
+        // }
+      },
       sectionChange: function (type) {
         this.$emit('sectionEvent', type)
       },

+ 1 - 1
nuxt.config.js

@@ -1,7 +1,7 @@
 const path = require('path')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
 // b2c后台
-const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://api.usoftmall.com/' : 'http://192.168.253.3:36006/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://api.usoftmall.com/' : 'http://10.1.51.125:8080/')
 // 公共询价
 const commonUrl = process.env.COMMON_URL || (isProdMode ? 'https://api-inquiry.usoftmall.com/' : 'http://218.17.158.219:24000/')
 // 公共物料