Browse Source

Merge remote-tracking branch 'origin/release-wangcz-201814' into release-wangcz-201814

Administrator 7 years ago
parent
commit
d9e3656cfb

+ 41 - 41
components/mobile/register-saler/register/StepFirst.vue

@@ -9,7 +9,7 @@
       <div class="">
         <label class="col-sm-2 mobile-x-required">企业名称:</label>
         <div class="col-sm-5 mobile-x-input-kuang">
-          <input :class="!validName.isValidTypeName || !validName.isValidName?'form-control error-box-border':'form-control'" type="text" @input="nameTypeCheck()" :disabled="!loginData.isSelf" v-model="data.name" name="name" required="" placeholder="填写营业执照上的企业名称">
+          <input :class="!validName.isValidTypeName || !validName.isValidName?'form-control error-box-border':'form-control'" type="text" @input="nameTypeCheck()" @change="nameCheck(3)" :disabled="!loginData.isSelf" v-model="data.name" name="name" required="" placeholder="填写营业执照上的企业名称">
           <div class="mobile-x-text-help" v-show="validName.isValidTypeName && validName.isValidName && !validName.init">
             <i class="glyphicon glyphicon-ok x-icon-left"></i>
           </div>
@@ -266,46 +266,46 @@
         this.data.address = val.address || val.enAddress || ''
       },
       sectionChange: function (type) {
-        this.nameCheck(3, () => {
-          if (!this.isValid) {
-            // this.nameCheck(3)
-            if (!this.validName.isValidName) {
-              this.showBangdingPage = true
-            } else {
-              this.timeoutCount++
-              this.collectResult = '请填写正确的注册信息'
-            }
-            // this.$message.error('请填写正确的注册信息')
+        // this.nameCheck(3, () => {
+        if (!this.isValid) {
+          // this.nameCheck(3)
+          if (!this.validName.isValidName) {
+            this.showBangdingPage = true
           } else {
-            if (this.enterpriseData.uu) {
-              this.enCheckFullData()
-            } else {
-              this.checkFullData()
-            }
-            let enterprise = this.data
-  //          enterprise.tagsData = enterprise.tagsData.toString()
-  //          if (typeof this.data.tagsData === 'string') {
-  //            this.data.tagsData = this.data.tagsData.split(',')
-  //          }
-            let data = {}
-            data.enterprise = enterprise
-            data.isValidRegister = this.isValid
-  //          data.url = this.data.url
-            enterprise.enIsRead = false
-  //          enterprise.enBussinessCodeImage = this.data.url
-            // 个人用户,提交保存缓存企业信息
-            if (this.loginData.isSelf) {
-              this.$http.post('/basic/user/userCacheEnterprise', enterprise)
-              this.$emit('isSelfCacheDataAction', enterprise)
-            } else { // 企业用户,更新当前企业信息,主要是更新企业地址
-              this.enterpriseData.enAddress = this.data.address
-              this.$http.post('/basic/enterprise/' + this.enterpriseData.uu + '/updateInfo', this.enterpriseData)
-            }
-            this.$emit('registerAction', data)
-            this.$emit('sectionEvent', type)
-  //          this.$emit('businessImgUrlAction', this.data.url)
+            this.timeoutCount++
+            this.collectResult = '请填写正确的注册信息'
           }
-        })
+          // this.$message.error('请填写正确的注册信息')
+        } else {
+          if (this.enterpriseData.uu) {
+            this.enCheckFullData()
+          } else {
+            this.checkFullData()
+          }
+          let enterprise = this.data
+//          enterprise.tagsData = enterprise.tagsData.toString()
+//          if (typeof this.data.tagsData === 'string') {
+//            this.data.tagsData = this.data.tagsData.split(',')
+//          }
+          let data = {}
+          data.enterprise = enterprise
+          data.isValidRegister = this.isValid
+//          data.url = this.data.url
+          enterprise.enIsRead = false
+//          enterprise.enBussinessCodeImage = this.data.url
+          // 个人用户,提交保存缓存企业信息
+          if (this.loginData.isSelf) {
+            this.$http.post('/basic/user/userCacheEnterprise', enterprise)
+            this.$emit('isSelfCacheDataAction', enterprise)
+          } else { // 企业用户,更新当前企业信息,主要是更新企业地址
+            this.enterpriseData.enAddress = this.data.address
+            this.$http.post('/basic/enterprise/' + this.enterpriseData.uu + '/updateInfo', this.enterpriseData)
+          }
+          this.$emit('registerAction', data)
+          this.$emit('sectionEvent', type)
+//          this.$emit('businessImgUrlAction', this.data.url)
+        }
+        // })
       },
 //      upload: function (e) {
 //        let file = e.target.files[0]
@@ -402,7 +402,7 @@
         this.validName.init = false
       },
       // 企业名称是否已存在验证
-      nameCheck: function (num, cb) {
+      nameCheck: function (num) {
         if (num > 0) {
           this.$http.post('/basic/enterprise/register/valid/name?name=' + this.data.name)
             .then(response => {
@@ -410,7 +410,7 @@
                 this.validName.init = false
                 this.validName.isValidName = response.data.success
                 this.validCheck()
-                cb && cb()
+                // cb && cb()
               } else {
                 this.nameCheck(num - 1)
               }

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

@@ -19,7 +19,7 @@
             《优软商城买卖条例》</a>
           </div>
         </div>
-        <div class="row next-btn step-two-btn" style="">
+        <div class="row next-btn step-two-btn" style="padding-top: 0px;">
           <button @click="sectionChange(1)" class="btn">不同意</button>
           <button @click="sectionChange(3)" class="btn" :style="!checkData.checked ? 'opacity: 1;':''">同意</button>
         </div>
@@ -113,8 +113,8 @@
   .mobile-join_xieyi .ql-editor br {
     display: none;
   }
-  .mobile-join_xieyi .ql-editor {
-    padding: 0 5px;
+  .mobile-join_xieyi .ql-container.ql-snow .ql-editor {
+    padding: 0 5px !important;
   }
  /* .join_xieyi .ql-editor p {
     width: 494px;

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

@@ -18,7 +18,7 @@
       <!--</label>-->
     <!--</div>-->
     <!--导入店铺模板-->
-    <div class="vendor_store_apply" v-show="selectFlag == 'open'">
+    <div class="mobile-vendor_store_apply" v-show="selectFlag == 'open'">
         <div>
           <!-- Nav tabs -->
           <ul class="nav nav-tabs" v-show="false">

+ 27 - 25
pages/mobile/store/index.vue

@@ -180,6 +180,8 @@
     letter-spacing: 4px;
     background: #fff;
     color: #3f84f6;
+    margin-right: 0px;
+    border: 0px;
   }
   .no-apply{
     width: 150px;
@@ -343,90 +345,90 @@
     height: 120px;
     top: 69px;
   }
-  .mobile-tab-list div.vendor_store_apply {
+  .mobile-tab-list div.mobile-vendor_store_apply {
     background-color: #f1f3f6;
   }
 
 
-  .mobile-tab-list div.vendor_store_apply .title_row {
+  .mobile-tab-list div.mobile-vendor_store_apply .title_row {
     margin-bottom: 20px;
     border-bottom: #e8e8e8 1px solid;
   }
 
-  .mobile-tab-list div.vendor_store_apply .custom_col {
+  .mobile-tab-list div.mobile-vendor_store_apply .custom_col {
     margin: 0.2rem;
     border-radius: 5px;
     border: 1px solid #d3d3d3;
     background: #fff;
     padding: 0 0 0.2rem 0;
   }
-  .mobile-tab-list div.vendor_store_apply .infoTextMobile {
+  .mobile-tab-list div.mobile-vendor_store_apply .infoTextMobile {
     color: #999;
     font-size: 0.28rem
   }
 
-  .mobile-tab-list div.vendor_store_apply .custom_col img.previewImage {
+  .mobile-tab-list div.mobile-vendor_store_apply .custom_col img.previewImage {
     width: 100%;
     cursor: pointer;
     /*padding: 0 30px;*/
   }
 
-  .mobile-tab-list div.vendor_store_apply .row h2 {
+  .mobile-tab-list div.mobile-vendor_store_apply .row h2 {
     padding: 10px 0;
     font-size: 16px;
     font-weight: 500;
     color: #000000;
   }
 
-  .mobile-tab-list div.vendor_store_apply .row span {
+  .mobile-tab-list div.mobile-vendor_store_apply .row span {
     /*display: block;*/
     /*padding: 10px 0;*/
     font-size: 14px;
     color: #000000;
   }
-  .mobile-tab-list div.vendor_store_apply .mobile-register-brand-name {
+  .mobile-tab-list div.mobile-vendor_store_apply .mobile-register-brand-name {
     font-size: 0.28rem;
     color: #226ce7;
     border-bottom: 1px solid #d3d3d3;
   }
-  .mobile-tab-list div.vendor_store_apply .mobile-register-brand-name input {
+  .mobile-tab-list div.mobile-vendor_store_apply .mobile-register-brand-name input {
     font-size: 0.28rem;
     color: #999;
     width: 5rem;
   }
 
-  .mobile-tab-list div.vendor_store_apply #file_upload {
+  .mobile-tab-list div.mobile-vendor_store_apply #file_upload {
     width: 100px;
     height: 100px;
     border:1px solid #CDCDCD;
     /*background: url("static/img/vendor/images/upload.png");*/
   }
 
-  .mobile-tab-list div.vendor_store_apply #upload_qualification {
+  .mobile-tab-list div.mobile-vendor_store_apply #upload_qualification {
     width: 100px;
     height: 100px;
     opacity: 0;
   }
 
-  .mobile-tab-list div.vendor_store_apply .custom_tab {
+  .mobile-tab-list div.mobile-vendor_store_apply .custom_tab {
     margin: 0 15px;
     width: 90px;
     text-align: center;
   }
 
-  .mobile-tab-list div.vendor_store_apply .nav li.custom_tab.active>a,
-  .mobile-tab-list div.vendor_store_apply .nav li.custom_tab.active>a:focus,
-  .mobile-tab-list div.vendor_store_apply .nav li.custom_tab.active>a:hover {
+  .mobile-tab-list div.mobile-vendor_store_apply .nav li.custom_tab.active>a,
+  .mobile-tab-list div.mobile-vendor_store_apply .nav li.custom_tab.active>a:focus,
+  .mobile-tab-list div.mobile-vendor_store_apply .nav li.custom_tab.active>a:hover {
     border: 1px solid #5078CB;
     border-bottom-color: transparent;
     color: #5078cb;
   }
 
-  .mobile-tab-list div.vendor_store_apply .uploadify-button {
+  .mobile-tab-list div.mobile-vendor_store_apply .uploadify-button {
     display: block;
   }
 
-  .mobile-tab-list div.vendor_store_apply .custom_col .show_image_area {
+  .mobile-tab-list div.mobile-vendor_store_apply .custom_col .show_image_area {
     height: 1.09rem;
     position: relative;
     overflow: hidden;
@@ -443,20 +445,20 @@
     border-radius: 0;
     color: #333;
   }
-  .mobile-tab-list div.vendor_store_apply .btn-primary{
+  .mobile-tab-list div.mobile-vendor_store_apply .btn-primary{
     background: #5078cb;
     border-radius: 0;
   }
-  .mobile-tab-list div.vendor_store_apply .btn-primary:hover{
+  .mobile-tab-list div.mobile-vendor_store_apply .btn-primary:hover{
     background: #3f7ae3;
   }
-  .mobile-tab-list div.vendor_store_apply .com_row .col-md-2{
+  .mobile-tab-list div.mobile-vendor_store_apply .com_row .col-md-2{
     width: 120px;
   }
-  .mobile-tab-list div.vendor_store_apply .com_row .col-md-10 span{
+  .mobile-tab-list div.mobile-vendor_store_apply .com_row .col-md-10 span{
     color: #666;
   }
-  .mobile-tab-list div.vendor_store_apply .brand-small-upload {margin-top:0.2rem;}
+  .mobile-tab-list div.mobile-vendor_store_apply .brand-small-upload {margin-top:0.2rem;}
   /*修改的样式*/
   .hover-show{
     position: absolute;
@@ -466,7 +468,7 @@
     left: 0;
     background: rgba(0,0,0,.5);
   }
-  .mobile-tab-list div.vendor_store_apply .custom_col .show_image_area .hover-show{
+  .mobile-tab-list div.mobile-vendor_store_apply .custom_col .show_image_area .hover-show{
     top: 0;
   }
   .mobile-tab-list .hover-show .delete{
@@ -701,10 +703,10 @@
     display: none;
   }
 
-  .mobile-tab-list div.vendor_store_apply .custom_col .show_image_area:hover .hoverShow{
+  .mobile-tab-list div.mobile-vendor_store_apply .custom_col .show_image_area:hover .hoverShow{
     display: block;
   }
-  .mobile-tab-list div.vendor_store_apply .custom_col .show_image_area .deleteImg{
+  .mobile-tab-list div.mobile-vendor_store_apply .custom_col .show_image_area .deleteImg{
     position: absolute;
     right: 7px;
     top: 0;

+ 3 - 0
pages/mobile/user/index.vue

@@ -132,6 +132,9 @@
           this.$store.dispatch('loadUserInfo').then(() => {
             this.showLogin = false
             this.$store.dispatch('loadStoreStatus', {op: 'check'})
+            this.$http.get('/store-service/applications?status=normal').then(res => {
+              this.applyStatus = res.data.data.status
+            })
           })
         })
       },