验收调整

components/register-saler/register/StepFirst.vue

@@ -364,8 +364,11 @@
         this.data.logoUrl = val.logoImage || ''
         this.data.profession = val.profession || ''
 //        this.data.tagsData = val.tags || []
-        if (typeof val.tags === 'string' || !val.tags) {
-          this.data.tagsData = val.tags.split(',') || []
+        if (typeof val.tags === 'string') {
+//          let tmp = val.tags || ''
+          this.data.tagsData = val.tags.split(',')
+        } else {
+          this.data.tagsData = []
         }
       },
       initSelfData: function (val) {

components/register-saler/register/StepSecond.vue

@@ -97,13 +97,14 @@
     color: #5078cb;
     border: 1px solid #5078cb;
   }
-  .join_xieyi .ql-editor {
-    padding-left: 30px;
-  }
   .join_xieyi .ql-editor span,.join_xieyi .ql-editor a {
     font-size: 10px;
   }
   .join_xieyi .ql-editor br {
     display: none;
   }
+  .join_xieyi .ql-editor p {
+    width: 494px;
+    margin: 0 auto;
+  }
 </style>

components/register-saler/register/StepThird.vue

@@ -252,7 +252,7 @@
             <a @click="showBrandNameInvalid = false"><i class="fa fa-close fa-lg"></i></a>
           </div>
           <div class="content">
-            <p style="line-height: 20px;margin-top: 10px;">非常抱歉，目前暂无此品牌！<br>若直接前往“品牌申请”，我们将为您先开通寄售功能，待申请通过后再提交开店申请。</p>
+            <p style="line-height: 20px;margin-top: 10px;padding:0 10px">非常抱歉，目前暂无此品牌！<br>若直接前往“品牌申请”，我们将为您先开通寄售功能，待申请通过后再提交开店申请。</p>
             <p style="line-height: 20px;">前往<a @click="goBrandApply()"  target="_blank" style="color: #5078CB">品牌申请&nbsp;<i class="fa fa-arrow-right"></i></a></p>
           </div>
         </div>
@@ -269,6 +269,7 @@
 </template>
 <script>
   import Upload from '~components/common/upload/upload.vue'
+  import { Loading } from 'element-ui'
   export default {
     data () {
       return {
@@ -471,12 +472,14 @@
                 tmpBrands.push(item)
               }
             })
+            let loadingInstance = Loading.service({ fullscreen: true })
             this.$http.post('/store-service/applications', {
               brands: tmpBrands,
               qualifications: qualifications,
               type: this.tab
             }).then(response => {
               if (response.data.success) {
+                loadingInstance.close()
                 this.$message.success('感谢您对优软商城的支持，我们会尽快对您提交的信息进行审核，预计审核时间为3个工作日，审核结果将以站内消息及邮件形式通知您！')
                 this.$http.post('/basic/enterprise/openVendor/' + enuu)
                   .then(() => {
@@ -877,16 +880,18 @@
   }
   .com-del-box{
     position: fixed;
-    z-index: 2;
-    height: 152px;
+    z-index: 1000;
+    height: auto;
     opacity: 1;
     background-color: white;
     width: 310px;
     -webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
+    -moz-box-shadow: 0 5px 15px rgba(0,0,0,.5);
+    -o-box-shadow: 0 5px 15px rgba(0,0,0,.5);
     box-shadow: 0 5px 15px rgba(0,0,0,.5);
     margin: -155px 0 0 -75px;
     top: 55%;
-    left: 50%;
+    left: 43%;
   }
   .com-del-box .title{
     height: 30px;

pages/register-saler/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="become-store">
-    <div class="content">
+    <div class="all-content">
       <reg-header></reg-header>
       <register></register>
     </div>
@@ -26,38 +26,38 @@
     width: 100%;
     margin: 0 auto;
   }
-  .become-store .content{
+  .become-store .all-content{
     width: 1026px;
     margin: 0 auto;
     background: #fff;
     padding-bottom: 40px;
     border: #e8e8e8 1px solid;
   }
-  .become-store .content .h3{
+  .become-store .all-content .h3{
     font-size: 24px;
     line-height: 80px;
     text-align: center;
     font-weight: bold;
   }
-  .become-store .content .header-title{
+  .become-store .all-content .header-title{
     width: 70%;
     margin: 0 auto;
     margin-bottom: 40px;
   }
-  .become-store .content .header-title .col-md-6{
+  .become-store .all-content .header-title .col-md-6{
     padding: 0 45px;
   }
-  .become-store .content .header-title .col-md-6 img {
+  .become-store .all-content .header-title .col-md-6 img {
     margin-left: 95px;
   }
-  .become-store .content .header-title h4{
+  .become-store .all-content .header-title h4{
     font-size: 18px;
     line-height: 30px;
     text-align: center;
     margin-top: 5px;
     margin-bottom: 10px;
   }
-  .become-store .content .header-title p{
+  .become-store .all-content .header-title p{
     font-size: 14px;
     line-height: 25px;
     color: #666;