样式调整

components/register-saler/RegHeader.vue

@@ -3,10 +3,12 @@
     <h3 class="h3">成为优软卖家有什么好处？</h3>
     <div class="row header-title">
       <div class="col-md-6">
+        <img src="/images/register/open-store.jpg" alt="">
         <h4>免费开店</h4>
         <p>申请开店完全免费，一个企业只能开一家店，申请到正式开通预计需1-3个工作日。</p>
       </div>
       <div class="col-md-6">
+        <img src="/images/register/seller.jpg" alt="">
         <h4>库存寄售</h4>
         <p>无需开店，即可发布贵司仓库里的滞销产品，优软商城代为销售，匿名清仓无压力。</p>
       </div>

components/register-saler/register/StepFirst.vue

@@ -52,7 +52,7 @@
       <div class="row">
         <label class="col-sm-2 x-required">法定代表人：</label>
         <div class="col-sm-5">
-          <input type="text" :class="!validLawPerson.isValidLawPerson?'form-control error-box-border':'form-control'" @input="lawPersonCheck()" v-model="data.lawPerson" name="name" required="" placeholder="请填写营业执照上的法定代表人">
+          <input type="text" :disabled="!loginData.isSelf" :class="!validLawPerson.isValidLawPerson?'form-control error-box-border':'form-control'" @input="lawPersonCheck()" v-model="data.lawPerson" name="name" required="" placeholder="请填写营业执照上的法定代表人">
         </div>
         <div class="x-text-help" v-show="validLawPerson.isValidLawPerson && !validLawPerson.init">
           <i class="glyphicon glyphicon-ok x-icon-left"></i>
@@ -114,35 +114,35 @@
       <div class="row">
         <label class="col-sm-2">联系人：</label>
         <div class="col-sm-5">
-          <input type="text" class="form-control" title="请填写企业对外的联系人，为空则默认为管理员" v-model="data.linkman" name="name" required="" placeholder="请填写企业对外的联系人，为空则默认为管理员">
+          <input type="text" :disabled="!loginData.isSelf" class="form-control" title="请填写企业对外的联系人，为空则默认为管理员" v-model="data.linkman" name="name" required="" placeholder="请填写企业对外的联系人，为空则默认为管理员">
         </div>
         <div class="col-sm-5"></div>
       </div>
       <div class="row">
         <label class="col-sm-2">联系电话：</label>
         <div class="col-sm-5">
-          <input :class="!validPhone.isValidPhone?'form-control error-box-border':'form-control'" type="text" v-model="data.phone" @input="phoneCheck()" name="name" required="" placeholder="例如：13838883888">
+          <input :disabled="!loginData.isSelf" :class="!validPhone.isValidPhone?'form-control error-box-border':'form-control'" type="text" v-model="data.phone" @input="phoneCheck()" name="name" required="" placeholder="例如：13838883888">
         </div>
         <div class="col-sm-5"></div>
       </div>
       <div class="row">
         <label class="col-sm-2">邮箱：</label>
         <div class="col-sm-5">
-          <input type="text" :class="!validEmail.isValidEmail?'form-control error-box-border':'form-control'" v-model="data.email" @input="emailCheck()" required="" placeholder="例如：123123@usoft.com">
+          <input type="text" :disabled="!loginData.isSelf" :class="!validEmail.isValidEmail?'form-control error-box-border':'form-control'" v-model="data.email" @input="emailCheck()" required="" placeholder="例如：123123@usoft.com">
         </div>
         <div class="col-sm-5"></div>
       </div>
       <div class="row">
         <label class="col-sm-2">企业传真：</label>
         <div class="col-sm-5">
-          <input type="text" :class="!validFax.isValidFax?'form-control error-box-border':'form-control'" v-model="data.fax" @input="faxCheck()" required="" placeholder="例如：0755-268XXXXX">
+          <input type="text" :disabled="!loginData.isSelf" :class="!validFax.isValidFax?'form-control error-box-border':'form-control'" v-model="data.fax" @input="faxCheck()" required="" placeholder="例如：0755-268XXXXX">
         </div>
         <div class="col-sm-5"></div>
       </div>
       <div class="row">
         <label class="col-sm-2">企业官网：</label>
         <div class="col-sm-5">
-          <input type="text" class="form-control" v-model="data.website" name="name" required="" placeholder="www.usoftchina.com" style="padding-left:55px;">
+          <input type="text" :disabled="!loginData.isSelf" class="form-control" v-model="data.website" name="name" required="" placeholder="www.usoftchina.com" style="padding-left:55px;">
           <span class="web">http://</span>
         </div>
         <div class="col-sm-5"></div>
@@ -179,13 +179,15 @@
         </div>
         <div class="col-sm-5"></div>
       </div>
-      <div class="row">
+      <div class="row"  >
         <label class="col-sm-2">企业LOGO：</label>
         <div class="col-sm-5">
-          <input type="file" @change="uploadLogo" class="form-control file-input upload-area" required="" accept="image/jpeg,image/jpg,image/gif,image/bmp,image/png">
-          <img class="preview-logo-img" :src="data.logoUrl == ''?'/images/all/upload-bg.png':data.logoUrl" alt="">
+          <input type="file" v-if="loginData.isSelf" @change="uploadLogo" class="form-control file-input upload-area" required="" accept="image/jpeg,image/jpg,image/gif,image/bmp,image/png">
+          <div class="logo-img-area">
+            <img class="preview-logo-img" :src="data.logoUrl && data.logoUrl != ''?data.logoUrl:'/images/all/upload-bg.png'" alt="">
+          </div>
         </div>
-        <div class="col-sm-5"  v-show="!validLogo.isValidLogo"><p><i class="fa fa-info-circle"></i>logo大小不能超过100K</p></div>
+        <div class="col-sm-5"><p v-show="!validLogo.isValidLogo"><i class="fa fa-info-circle"></i>logo大小不能超过100K</p></div>
         <div class="logo-text">个性化展示您的企业形象，图片不超过100Kb，建议宽x高=100x60</div>
      <!--   <div class="x-text-help" v-show="validUpload.isValidUpload && !validUpload.init">
           <i class="glyphicon glyphicon-ok x-icon-left"></i>
@@ -198,20 +200,20 @@
           <div class="no-tags" v-if="!data.tagsData || data.tagsData.length == 0">暂无标签</div>
           <div class="tags-list">
             <ul>
-              <li v-for="(tag, index) in data.tagsData"><span v-text="tag"></span><i class="glyphicon glyphicon-remove" @click="removeTag(index)"></i></li>
+              <li v-for="(tag, index) in data.tagsData"><span v-text="tag"></span><i v-if="loginData.isSelf" class="glyphicon glyphicon-remove" @click="removeTag(index)"></i></li>
             </ul>
           </div>
         </div>
-        <div class="col-sm-5 tags-box">
+        <div class="col-sm-5 tags-box" v-if="loginData.isSelf">
           <input type="text" @input="tagCheck()" class="form-control" v-model="tag" name="name" required="">
-          <span class="add-tag-btn" @click="addTags()">+添加标签</span>
+          <span class="add-tag-btn" @click="addTags()" >+添加标签</span>
         </div>
-        <div class="col-sm-5">
+        <div class="col-sm-5" v-if="loginData.isSelf">
           <div class="x-text-tip">
             <i class="glyphicon glyphicon-info-sign x-icon-left"></i>标签长度不超过10个字
           </div>
         </div>
-        <div class="col-sm-12 tags-lists"><em class="pull-left">例如：</em><span>企业管理咨询</span><span>电子产品开发</span><span>货运代理</span></div>
+        <div class="col-sm-12 tags-lists" v-if="loginData.isSelf"><em class="pull-left">例如：</em><span>企业管理咨询</span><span>电子产品开发</span><span>货运代理</span></div>
       </div>
       <div class="row next-btn"><button class="btn" :style="loginData.isSelf && !isValid ? 'opacity: .65;':''" @click="sectionChange(2)">下一步</button></div>
     </div>
@@ -309,11 +311,7 @@
     watch: {
       enterpriseData: function (val, oldVal) {
         if (val !== {}) {
-          this.data.name = val.enName || ''
-          this.data.licenceId = val.enBussinessCode || ''
-          this.data.address = val.enAddress || ''
-          this.data.website = val.enUrl || ''
-          this.data.url = val.enBussinessCodeImage || ''
+          this.initData(val)
           if (this.loginData.isSelf) {
             this.nameCheck(3)
             this.nameTypeCheck()
@@ -321,9 +319,9 @@
             this.addressCheck()
             this.imgUrlCheck()
             this.lawPersonCheck()
-            this.phoneCheck()
-            this.emailCheck()
-            this.faxCheck()
+//            this.phoneCheck()
+//            this.emailCheck()
+//            this.faxCheck()
             this.checkFullData()
             this.submitRegisterData()
           }
@@ -350,19 +348,34 @@
       })
     },
     methods: {
+      initData: function (val) {
+        this.data.name = val.name || ''
+        this.data.licenceId = val.businessCode || ''
+        this.data.url = val.businessCodeImage || ''
+        this.data.lawPerson = val.corporation || ''
+        this.data.address = val.address || ''
+        this.data.website = val.url || ''
+        this.data.linkman = val.contactMan || ''
+        this.data.phone = val.contactTel || ''
+        this.data.email = val.contactEmail || ''
+        this.data.fax = val.fax || ''
+        this.data.logoUrl = val.logoImage || ''
+        this.data.profession = val.profession || ''
+        this.data.tagsData = val.tags || ''
+      },
       sectionChange: function (type) {
         if (this.loginData.isSelf && !this.isValid) {
           this.$message.error('请填写正确的注册信息')
         } else {
           this.checkFullData()
           let enterprise = this.data
-          enterprise.tagsData = enterprise.tagsData.toString()
+//          enterprise.tagsData = enterprise.tagsData.toString()
           let data = {}
           data.enterprise = enterprise
           data.isValidRegister = this.isValid
           data.url = this.data.url
           enterprise.enIsRead = false
-          enterprise.enBussinessCodeImage = this.data.url
+//          enterprise.enBussinessCodeImage = this.data.url
           if (this.loginData.isSelf) {
             this.$http.post('/basic/user/userCacheEnterprise', enterprise)
             this.$emit('isSelfCacheDataAction', enterprise)
@@ -426,7 +439,7 @@
           let config = {
             headers: {'Content-Type': file.type}
           }
-          this.$http.post('/file', param, config)
+          this.$http.post('/api/images', param, config)
             .then(response => {
               this.validLogo.isValidLogo = true
               this.data.logoUrl = response.data[0].path
@@ -758,10 +771,14 @@
     color: #999;
     line-height: 20px;
   }
-  .preview-logo-img {
+  .logo-img-area {
     width: 130px;
     height: 130px;
   }
+  .logo-img-area .preview-logo-img {
+    max-width: 130px;
+    max-height: 130px;
+  }
   .no-tags {
     float: left;
     padding: 2px 14px;

components/register-saler/register/StepSecond.vue

@@ -56,3 +56,11 @@
     }
   }
 </script>
+
+<style scoped>
+  .next-btn button:first-child{
+    background: #fff;
+    color: #5078cb;
+    border: 1px solid #5078cb;
+  }
+</style>

components/register-saler/register/StepThird.vue

@@ -2,23 +2,23 @@
   <!--最后一步-->
   <div class="section">
     <div class="step-last">
-      <h4 class="h4">免费开店</h4>
-      <p class="title">申请开店完全免费，一个企业只能开一家店，申请到正式开通预计需1-3个工作日。了解更多请看《开店规则》</p>
+<!--      <h4 class="h4">免费开店</h4>
+      <p class="title">申请开店完全免费，一个企业只能开一家店，申请到正式开通预计需1-3个工作日。了解更多请看《开店规则》</p>-->
     </div>
-    <p class="radioCheck">
-      <label for="buyer01" class="radioLabel">
-        <input type="radio" name="role" value="buyer" id="buyer01"/>
-        <label for="buyer01" class="txtContact"></label>
-        <span>我是买家</span>
+    <div class="radioCheck">
+      <label for="1" class="radioLabel">
+        <input type="radio" v-model="selectFlag" name="role" value="open" id="1"/>
+        <label for="1" class="txtContact"></label>
+        <span>免费开店</span>
       </label>
-      <label for="buyer02" class="radioLabel">
-        <input type="radio" name="role" value="seller" id="buyer02" checked/>
-        <label for="buyer02" class="txtContact"></label>
-        <span>我是卖家</span>
+      <label for="2" class="radioLabel">
+        <input type="radio" v-model="selectFlag" name="role" value="seller" id="2" checked/>
+        <label for="2" class="txtContact"></label>
+        <span>暂不开店直接寄售</span>
       </label>
-    </p>
+    </div>
     <!--导入店铺模板-->
-    <div class="container vendor_store_apply">
+    <div class="container vendor_store_apply" v-show="selectFlag == 'open'">
         <div>
           <!-- Nav tabs -->
           <ul class="nav nav-tabs">
@@ -34,7 +34,7 @@
             </li>
           </ul>
           <!-- Tab panes -->
-          <div class="tab-content" style="border: 1px #5078CB solid; padding-bottom: 30px;">
+          <div class="tab-content">
             <!-- 原厂 -->
             <div role="tabpanel" class="tab-pane" v-if="tab == 'ORIGINAL_FACTORY'" :class="{active: tab == 'ORIGINAL_FACTORY'}">
               <div class="row com_row">
@@ -221,10 +221,10 @@
             <!--经销商 end-->
           </div>
           <!-- Submit button -->
-          <div style="padding: 28px 40px;">
+         <!-- <div style="padding: 28px 40px;">
             <button type="button" class="btn btn-primary" style="float: right" @click="submitApply">提交申请</button>
             <div class="clear-fix"></div>
-          </div>
+          </div>-->
         </div>
         <!--删除上传图片-->
         <div class="com-del-box" style="display: none">
@@ -257,11 +257,14 @@
           </div>
         </div>
       </div>
-    <div class="step-last">
+    <!--<div class="step-last">
       <h4 class="h4">库存寄售</h4>
       <p class="title">无需开店，即可发布贵司仓库里的滞销产品，优软商城代为销售，匿名清仓无压力<button class="no-apply" @click="goProduct">暂不开店，直接寄售</button></p>
+    </div>-->
+    <div class="row btn-area">
+      <span @click="sectionChange(2)">上一步</span>
+      <span @click="selectFlag == 'open'?submitApply():goProduct()">提交申请</span>
     </div>
-    <div class="row next-btn" style="margin-top: 20px"><button @click="sectionChange(2)">上一步</button></div>
   </div>
 </template>
 <script>
@@ -288,7 +291,8 @@
           index: 0
         },
         showFlag: false,
-        isSelfRegisterSuccess: true
+        isSelfRegisterSuccess: true,
+        selectFlag: 'open'
       }
     },
     props: [
@@ -593,7 +597,7 @@
     width: 1026px;
     background-color: #FFFFFF;
     margin-bottom: 20px;
-    margin-top: 20px;
+    margin-top: 25px;
   }
 
   div.vendor_store_apply .com_row {
@@ -798,6 +802,10 @@
     line-height: 30px;
     height: 30px;
   }
+  .tab-content {
+    border: 1px #5078CB solid;
+    padding-bottom: 30px;
+  }
   .tab-content .com_row{
     margin:40px 0 0;
     border-bottom: #ccc 1px dashed;
@@ -991,23 +999,19 @@
   /*
   radio
   */
-  p.radioLabel{
-    margin-bottom: 10px;
-  }
   .radioLabel {
     line-height: 20px;
     cursor: pointer;
-    color: #666;
   }
   .radioLabel label{
     width: 16px;
     height: 16px;
     background: url("/images/messageBoard/radio.png");
     background-position: 0 -1px;
-    margin-right: 2px;
     vertical-align: middle;
     margin-bottom: 0 !important;
     margin-right: 0 !important;
+    cursor: pointer;
   }
   .radioLabel input[type="radio"]:checked + label {
     background-position: -19px -1px;
@@ -1015,10 +1019,48 @@
   .radioLabel input[type="radio"] + label + span {
     margin-left: 5px;
   }
-  .radioLabel input[type="radio"]:checked + label + span{
+  .radioLabel input[type="radio"]:checked + label{
     color: #5078cb;
   }
   .radioLabel input[type="radio"]{
     display: none;
   }
+  .radioLabel span {
+    font-weight: bold;
+    font-size: 18px;
+    color: #5e5e5e;
+  }
+  .radioCheck {
+    padding-top: 35px;
+    padding-left: 30px;
+    padding-bottom: 35px;
+  }
+  .radioCheck .radioLabel:first-child {
+    margin-right: 10px;
+  }
+  .btn-area {
+    margin-top: 20px;
+    text-align: center;
+  }
+  .btn-area span {
+    height: 35px;
+    line-height: 35px;
+    border: 1px solid #5078cb;
+    padding: 0 62px;
+    font-size: 16px;
+    display: inline-block;
+    color: #5078cb;
+    cursor: pointer;
+    background: #fff;
+  }
+  .btn-area span:first-child{
+    margin-right: 16px;
+  }
+  .btn-area span:last-child{
+    background: #5078cb;
+    color: #fff;
+  }
+/*  .btn-area span:hover {
+
+  }*/
 </style>

nuxt.config.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
-const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://www.usoftmall.com/' : 'http://192.168.253.123:8080/platform-b2c/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://www.usoftmall.com/' : 'http://192.168.253.121:8080/platform-b2c/')
 
 module.exports = {
   router: {

pages/register-saler/index.vue

@@ -47,15 +47,21 @@
   .become-store .content .header-title .col-md-6{
     padding: 0 45px;
   }
+  .become-store .content .header-title .col-md-6 img {
+    margin-left: 95px;
+  }
   .become-store .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{
     font-size: 14px;
     line-height: 25px;
     color: #666;
+    margin-bottom: 30px;
   }
   .step-menu{
     width: 100%;
@@ -158,7 +164,6 @@
     border-radius: 0;
     background: #5078cb;
     color: #fff;
-    font-weight: 700;
     letter-spacing: 4px;
     margin-right: 20px;
   }