Merge branch 'dev' into nuxt-updata-wcz

# Conflicts:
#	nuxt.config.js

app.html

@@ -6,7 +6,7 @@
   <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"/>
   <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
   <link rel="stylesheet" href="https://unpkg.com/mint-ui/lib/style.css">
-  <link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_921977_p15nnv7y5hs.css"/>
+  <link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_921977_wzqwtx4i39h.css"/>
   <!--<script src="https://wechatfe.github.io/vconsole/lib/vconsole.min.js?v=3.2.0"></script>-->
   <!--<script src="https://biheopen.bgycc.com/cordova-android.js"></script>-->
   <script src="https://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
@@ -107,7 +107,7 @@
         id: 'login_container',
         appid: 'wx4511639d0a71b945',
         scope: 'snsapi_login',
-        redirect_uri: encodeURIComponent(document.location.origin + '?appId=' + appId + '&returnURL=' + returnUrl + '&baseUrl=' + baseUrl + '&type=wx'),
+        redirect_uri: encodeURIComponent(document.location.origin + document.location.pathname + '?appId=' + appId + '&returnURL=' + returnUrl + '&baseUrl=' + baseUrl + '&type=wx'),
         state: '',
         style: '',
         href: 'https://sso.ubtob.com/wx.css'

assets/scss/common.scss

@@ -951,7 +951,6 @@ form .questions .el-form-item__content span.question {
   .container{
     width: 425px !important ;
     background: #FFFFFF;
-    box-shadow: 0 22px 24px 0 rgba(0,0,0,0.08);
     border-radius: 3px;
     .content {
       padding: 0 !important ;
@@ -995,3 +994,10 @@ form .questions .el-form-item__content span.question {
 .go-register form .el-form-item.agree .el-form-item__content{
   margin-top: 18px!important ;
 }
+//sass登录
+//.el-message{
+//  margin-top: -18px !important ;
+//}
+//.el-message i.el-message__closeBtn{
+//  display: none;
+//}

components/certification/EnterpriseCertification.vue

@@ -18,7 +18,7 @@
                         auto-complete="off"
                         placeholder="企业名称"
               ></el-input>
-              <span class="tip exist" v-show="isSpaceNameValid">该企业已被认证，请确认。<a href="https://www.ubtob.com/contact">仍有问题？</a></span>
+              <span class="tip exist" v-show="isSpaceNameValid">该企业已被认证，请确认。<a href="https://www.usoftchina.com/contact">仍有问题？</a></span>
             </el-form-item>
             <el-form-item prop="businessCode">
               <el-input type="text"
@@ -26,7 +26,7 @@
                         v-bind:class="{ active: isBusinessCodeValid }"
                         auto-complete="off"
                         placeholder="营业执照号"></el-input>
-              <span class="tip exist" v-show="isBusinessCodeValid">该企业已被认证，请确认。<a href="https://www.ubtob.com/contact">仍有问题？</a></span>
+              <span class="tip exist" v-show="isBusinessCodeValid">该企业已被认证，请确认。<a href="https://www.usoftchina.com/contact">仍有问题？</a></span>
             </el-form-item>
             <el-form-item class="padding55">
               <a class="x-btn-blank" title="上传营业执照扫描件" v-bind:class="{ correct: uploadFileChecked }">

components/certification/RealNameCertification.vue

@@ -21,7 +21,7 @@
                         auto-complete="off"
                         v-bind:class="{ active: idCardHasCertification }"
                         placeholder="身份证号"></el-input>
-              <span class="tip" v-show="idCardHasCertification">身份已被认证，请确认。<a href="https://www.ubtob.com/contact">仍有问题？</a></span>
+              <span class="tip" v-show="idCardHasCertification">身份已被认证，请确认。<a href="https://www.usoftchina.com/contact">仍有问题？</a></span>
             </el-form-item>
             <el-form-item>
               <a class="btn finish"

components/default/AccountCenterHeader.vue

@@ -3,7 +3,7 @@
     <nav class="navbar">
       <div class="navbar-container container">
         <div class="navbar-header">
-          <a href="http://www.ubtob.com" class="item navbar-link">
+          <a href="http://www.usoftchina.com" class="item navbar-link">
             <img src="https://dfs.ubtob.com/group1/M00/CE/BF/CgpkyFuvP4iAFe9KAAACmOA87F0986.png" class="navbar-logo">
           </a>
           <a href=""><span class="navbar-slogan">账号中心</span></a>

components/default/CloudHeader.vue

@@ -3,7 +3,7 @@
     <nav class="navbar">
       <div class="navbar-container container">
         <div class="navbar-header">
-          <a href="http://www.ubtob.com" class="item navbar-link">
+          <a href="http://www.usoftchina.com" class="item navbar-link">
             <img src="/images/logo/uas.png" class="navbar-logo">
           </a>
           <a href=""><span class="navbar-slogan">云中心</span></a>

components/default/CommonFooter.vue

@@ -8,8 +8,8 @@
           <li><a href="#">服务条款 </a></li>
         </ul>
         <ul class="list-inline">
-          <li><a href="http://www.ubtob.com">优软云首页 </a></li>
-          <li><a href="http://mall.ubtob.com">优软商城 </a></li>
+          <li><a href="http://www.usoftchina.com">优软云首页 </a></li>
+          <li><a href="http://mall.usoftchina.com">优软商城 </a></li>
           <li><a href="http://finance.ubtob.com">金融服务 </a></li>
           <li><a href="http://public.ubtob.com">公共服务 </a></li>
           <li><a href="http://open.ubtob.com">开放平台 </a></li>

components/default/ManualAppealHeader.vue

@@ -3,7 +3,7 @@
     <nav class="navbar">
       <div class="navbar-container container">
         <div class="navbar-header">
-          <a href="http://www.ubtob.com" class="item navbar-link">
+          <a href="http://www.usoftchina.com" class="item navbar-link">
             <img src="/images/logo/uas.png" class="navbar-logo">
           </a>
           <a href=""><span class="navbar-slogan">人工申诉</span></a>

components/login/Footer.vue

@@ -8,7 +8,7 @@
           <li><a href="#">服务条款 </a></li>
         </ul>
         <ul class="list-inline">
-          <li><a href="http://www.ubtob.com">优软云首页 </a></li>
+          <li><a href="http://www.usoftchina.com">优软云首页 </a></li>
           <li><a href="http://mall.ubtob.com">优软商城 </a></li>
           <li><a href="http://finance.ubtob.com">金融服务 </a></li>
           <li><a href="http://public.ubtob.com">公共服务 </a></li>

components/login/Login.vue

@@ -687,9 +687,9 @@
           }
         }
         Promise.all(promises).then(() => {
-          crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com', timeout)
+          crossAfter(response.data.content.returnUrl || 'http://www.usoftchina.com', timeout)
         }).catch(() => {
-          crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com', timeout)
+          crossAfter(response.data.content.returnUrl || 'http://www.usoftchina.com', timeout)
         })
       },
       getCheckCode () {

components/mobile/loginMobile.vue

@@ -369,9 +369,9 @@
           }
         }
         Promise.all(promises).then(() => {
-          crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com', timeout)
+          crossAfter(response.data.content.returnUrl || 'http://www.usoftchina.com', timeout)
         }).catch(() => {
-          crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com', timeout)
+          crossAfter(response.data.content.returnUrl || 'http://www.usoftchina.com', timeout)
         })
       },
       // 碧合绑定账号

components/mobile/registerEnterprise/index.vue

@@ -475,7 +475,10 @@
                     timeout: 3000
                   }, (err, data) => {
                     if (err) {
-                      this.$message.error('注册成功，请点击下方“立即登录”完成登录')
+                      this.$toast({
+                        message: '注册成功，请返回应用登录',
+                        iconClass: 'el-icon-success'
+                      })
                       this.isShowLoading = false
                       throw err
                     } else {
@@ -570,11 +573,11 @@
             promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
           }
         }
-        let returnUrl = decodeURIComponent(this.$route.query.returnURL)
+        let returnUrl = this.$route.query.returnURL ? decodeURIComponent(this.$route.query.returnURL) : 'https://www.usoftchina.com/'
         Promise.all(promises).then(() => {
-          crossAfter(returnUrl || 'http://www.ubtob.com', timeout)
+          crossAfter(returnUrl, timeout)
         }).catch(() => {
-          crossAfter(returnUrl || 'http://www.ubtob.com', timeout)
+          crossAfter(returnUrl, timeout)
         })
       }
     }

components/mobile/registerPersonal/index.vue

@@ -343,7 +343,10 @@
                       timeout: 3000
                     }, (err, data) => {
                       if (err) {
-                        this.$message.error('注册成功，请点击下方“立即登录”完成登录')
+                        this.$toast({
+                          message: '注册成功，请返回应用登录',
+                          iconClass: 'el-icon-success'
+                        })
                         this.isShowLoading = false
                         throw err
                       } else {
@@ -354,8 +357,12 @@
                     this.loginOther(response, params, 3000)
                   }
                 } else {
-                  let userUU = response.data.content.userUU
-                  window.location.href = `/overRegister/${userUU}`
+                  let userUU = response.data.content.data.userUU
+                  if (userUU) {
+                    window.location.href = `/overRegister/${userUU}`
+                  } else {
+                    window.location.href = `/`
+                  }
                 }
               } else if (response.data.error) {
                 this.$toast({
@@ -399,6 +406,10 @@
             .then(response => {
               this.$indicator.close()
               if (response.data.success) {
+                this.$toast({
+                  message: '注册成功。登陆密码已发送至您的手机，请妥善保管!',
+                  iconClass: 'el-icon-success'
+                })
                 if (response.data.content.data) {
                   let param = response.data.content.data
                   let a = ''
@@ -413,7 +424,10 @@
                       timeout: 3000
                     }, (err, data) => {
                       if (err) {
-                        this.$message.error('注册成功，请点击下方“立即登录”完成登录')
+                        this.$toast({
+                          message: '注册成功，请返回应用登录',
+                          iconClass: 'el-icon-success'
+                        })
                         this.isShowLoading = false
                         throw err
                       } else {
@@ -421,11 +435,15 @@
                       }
                     })
                   } else {
-                    this.loginOther(response, params, 3000)
+                    this.loginOther(response, params, 5000)
                   }
                 } else {
-                  let userUU = response.data.content.userUU
-                  window.location.href = `/overRegister/${userUU}`
+                  let userUU = response.data.content.data.userUU
+                  if (userUU) {
+                    window.location.href = `/overRegister/${userUU}`
+                  } else {
+                    window.location.href = `/`
+                  }
                 }
               } else if (response.data.error) {
                 this.$toast({
@@ -462,9 +480,15 @@
           })
         })
       },
-      crossAfter (url) {
+      crossAfter (url, time) {
         try {
-          window.location.href = url
+          if (time) {
+            setTimeout(function () {
+              window.location.href = url
+            }, time)
+          } else {
+            window.location.href = url
+          }
         } catch (err) {
           console.log(err)
         }
@@ -477,11 +501,11 @@
             promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
           }
         }
-        let returnUrl = decodeURIComponent(this.$route.query.returnURL)
+        let returnUrl = this.$route.query.returnURL ? decodeURIComponent(this.$route.query.returnURL) : 'https://www.usoftchina.com/'
         Promise.all(promises).then(() => {
-          crossAfter(returnUrl || 'http://www.ubtob.com', timeout)
+          crossAfter(returnUrl, timeout)
         }).catch(() => {
-          crossAfter(returnUrl || 'http://www.ubtob.com', timeout)
+          crossAfter(returnUrl, timeout)
         })
       }
     }

components/register/EnterpriseRegistration.vue

@@ -73,7 +73,7 @@
                         v-bind:class="{ active: isBusinessCodeExist }"
                         auto-complete="off"
                         placeholder="营业执照号"></el-input>
-              <span class="tip exist" v-show="isBusinessCodeExist">{{businessCodeExitMsg}}。<a href="https://www.ubtob.com/contact">仍有问题？</a></span>
+              <span class="tip exist" v-show="isBusinessCodeExist">{{businessCodeExitMsg}}。<a href="https://www.usoftchina.com/contact">仍有问题？</a></span>
             </el-form-item>
             <el-form-item prop="vipName" v-if="!isHasRegister">
               <el-input type="text" v-model="enterprise1.vipName" auto-complete="off" placeholder="管理员姓名"></el-input>
@@ -797,57 +797,35 @@
             this.isShowLoading = false
             if (response.data.success) {
               if (response.data.content) {
-                if (response.data.content.type === 'mall') {
-                  let param = response.data.content.data
-                  let a = ''
-                  for (let n in param) {
-                    a += (n + '=' + encodeURIComponent(param[n]) + '&')
-                  }
-                  let params = a.substr(0, a.length - 1)
-                  this.isShowLoading = true
-                  if (response.data.content.currentUrl) {
-                    this.$jsonp(`${response.data.content.currentUrl}?${params}`, {
-                      name: 'successCallback',
-                      timeout: 3000
-                    }, (err, data) => {
-                      if (err) {
-                        this.$message.error('注册成功，请点击下方“立即登录”完成登录')
-                        this.isShowLoading = false
-                        throw err
-                      } else {
-                        this.loginOther(response, params)
-                      }
-                    })
-                  } else {
-                    this.loginOther(response, params, 3000)
-                  }
-                } else if (response.data.content.type === 'city') {
-                  let param = response.data.content.data
-                  let a = ''
-                  for (let n in param) {
-                    a += (n + '=' + encodeURIComponent(param[n]) + '&')
-                  }
-                  let params = a.substr(0, a.length - 1)
-                  this.isShowLoading = true
-                  if (response.data.content.currentUrl) {
-                    this.$jsonp(`${response.data.content.currentUrl}?${params}`, {
-                      name: 'successCallback',
-                      timeout: 3000
-                    }, (err, data) => {
-                      if (err) {
-                        this.$message.error('注册成功，请点击下方“立即登录”完成登录')
-                        this.isShowLoading = false
-                        throw err
-                      } else {
-                        this.loginCityOther(response, params)
-                      }
-                    })
-                  } else {
-                    this.loginCityOther(response, params, 3000)
-                  }
+                let param = response.data.content.data
+                let a = ''
+                for (let n in param) {
+                  a += (n + '=' + encodeURIComponent(param[n]) + '&')
+                }
+                let params = a.substr(0, a.length - 1)
+                this.isShowLoading = true
+                if (response.data.content.currentUrl) {
+                  this.$jsonp(`${response.data.content.currentUrl}?${params}`, {
+                    name: 'successCallback',
+                    timeout: 3000
+                  }, (err, data) => {
+                    if (err) {
+                      this.$message.error('注册成功，请点击下方“立即登录”完成登录')
+                      this.isShowLoading = false
+                      throw err
+                    } else {
+                      this.loginOther(response, params)
+                    }
+                  })
+                } else {
+                  this.loginOther(response, params, 3000)
                 }
               } else {
-                window.location.href = '/overRegister/overEnterprise'
+                let returnUrl = ''
+                if (this.$route.query.returnURL) {
+                  returnUrl = decodeURIComponent(this.$route.query.returnURL)
+                }
+                window.location.href = returnUrl || '/overRegister/overEnterprise'
               }
             } else {
               return Promise.reject(response.data)
@@ -887,11 +865,11 @@
             promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
           }
         }
-        let returnUrl = decodeURIComponent(this.$route.query.returnURL)
+        let returnUrl = this.$route.query.returnURL ? decodeURIComponent(this.$route.query.returnURL) : 'https://www.usoftchina.com/'
         Promise.all(promises).then(() => {
-          crossAfter(returnUrl || 'http://www.ubtob.com', timeout)
+          crossAfter(returnUrl, timeout)
         }).catch(() => {
-          crossAfter(returnUrl || 'http://www.ubtob.com', timeout)
+          crossAfter(returnUrl, timeout)
         })
       },
       loginCityOther (response, a, timeout) {

components/register/EnterpriseRegistrationSecondStep.vue

@@ -9,7 +9,7 @@
                     auto-complete="off"
                     placeholder="企业名称"
           ></el-input>
-          <span class="tip exist" v-show="isSpaceNameExist">该企业已被注册，请确认。<a href="https://www.ubtob.com/contact">仍有问题？</a></span>
+          <span class="tip exist" v-show="isSpaceNameExist">该企业已被注册，请确认。<a href="https://www.usoftchina.com/contact">仍有问题？</a></span>
         </el-form-item>
         <el-form-item prop="businessCode">
           <el-input type="text"
@@ -17,7 +17,7 @@
                     v-bind:class="{ active: isBusinessCodeExist }"
                     auto-complete="off"
                     placeholder="营业执照号"></el-input>
-          <span class="tip exist" v-show="isBusinessCodeExist">该企业已被注册，请确认。<a href="https://www.ubtob.com/contact">仍有问题？</a></span>
+          <span class="tip exist" v-show="isBusinessCodeExist">该企业已被注册，请确认。<a href="https://www.usoftchina.com/contact">仍有问题？</a></span>
         </el-form-item>
         <el-form-item prop="vipName" v-if="!isHasRegister">
           <el-input type="text" v-model="enterprise1.vipName" auto-complete="off" placeholder="管理员姓名"></el-input>

components/register/PersonalRegistration.vue

@@ -441,61 +441,7 @@
               .then(response => {
                 this.isShowLoading = false
                 if (response.data.success) {
-                  if (response.data.content.type) {
-                    if (response.data.content.type === 'mall') {
-                      let param = response.data.content.data
-                      let a = ''
-                      for (let n in param) {
-                        a += (n + '=' + encodeURIComponent(param[n]) + '&')
-                      }
-                      let params = a.substr(0, a.length - 1)
-                      this.isShowLoading = true
-                      if (response.data.content.currentUrl) {
-                        this.$jsonp(`${response.data.content.currentUrl}?${params}`, {
-                          name: 'successCallback',
-                          timeout: 3000
-                        }, (err, data) => {
-                          if (err) {
-                            this.$message.error('注册成功，请点击下方“立即登录”完成登录')
-                            this.isShowLoading = false
-                            throw err
-                          } else {
-                            this.loginOther(response, params)
-                          }
-                        })
-                      } else {
-                        this.loginOther(response, params, 3000)
-                      }
-                    } else if (response.data.content.type === 'city') {
-                      let param = response.data.content.data
-                      let a = ''
-                      for (let n in param) {
-                        a += (n + '=' + encodeURIComponent(param[n]) + '&')
-                      }
-                      let params = a.substr(0, a.length - 1)
-                      this.isShowLoading = true
-                      if (response.data.content.currentUrl) {
-                        this.$jsonp(`${response.data.content.currentUrl}?${params}`, {
-                          name: 'successCallback',
-                          timeout: 3000
-                        }, (err, data) => {
-                          if (err) {
-                            this.$message.error('注册成功，请点击下方“立即登录”完成登录')
-                            this.isShowLoading = false
-                            throw err
-                          } else {
-                            this.loginCityOther(response, params)
-                          }
-                        })
-                      } else {
-                        this.loginCityOther(response, params, 3000)
-                      }
-                    }
-                  } else {
-                    let userUU = response.data.content.userUU
-                    console.log(userUU)
-                    window.location.href = `/overRegister/${userUU}`
-                  }
+                  this.loginStepOther(response)
                 } else {
                   return Promise.reject(response.data)
                 }
@@ -556,61 +502,14 @@
             .then(response => {
               this.isShowLoading = false
               if (response.data.success) {
-                if (response.data.content.type) {
-                  if (response.data.content.type === 'mall') {
-                    let param = response.data.content.data
-                    let a = ''
-                    for (let n in param) {
-                      a += (n + '=' + encodeURIComponent(param[n]) + '&')
-                    }
-                    let params = a.substr(0, a.length - 1)
-                    this.isShowLoading = true
-                    if (response.data.content.currentUrl) {
-                      this.$jsonp(`${response.data.content.currentUrl}?${params}`, {
-                        name: 'successCallback',
-                        timeout: 3000
-                      }, (err, data) => {
-                        if (err) {
-                          this.$message.error('注册成功，请点击下方“立即登录”完成登录')
-                          this.isShowLoading = false
-                          throw err
-                        } else {
-                          this.loginOther(response, params)
-                        }
-                      })
-                    } else {
-                      this.loginOther(response, params, 3000)
-                    }
-                  } else if (response.data.content.type === 'city') {
-                    let param = response.data.content.data
-                    let a = ''
-                    for (let n in param) {
-                      a += (n + '=' + encodeURIComponent(param[n]) + '&')
-                    }
-                    let params = a.substr(0, a.length - 1)
-                    this.isShowLoading = true
-                    if (response.data.content.currentUrl) {
-                      this.$jsonp(`${response.data.content.currentUrl}?${params}`, {
-                        name: 'successCallback',
-                        timeout: 3000
-                      }, (err, data) => {
-                        if (err) {
-                          this.$message.error('注册成功，请点击下方“立即登录”完成登录')
-                          this.isShowLoading = false
-                          throw err
-                        } else {
-                          this.loginCityOther(response, params)
-                        }
-                      })
-                    } else {
-                      this.loginCityOther(response, params, 3000)
-                    }
-                  }
-                } else {
-                  let userUU = response.data.content.userUU
-                  console.log(userUU)
-                  window.location.href = `/overRegister/${userUU}`
-                }
+                this.$message({
+                  message: '注册成功。登陆密码已发送至您的手机，请妥善保管!',
+                  type: 'success'
+                })
+                let _this = this
+                setTimeout(function () {
+                  _this.loginStepOther(response)
+                }, 5000)
               } else {
                 return Promise.reject(response.data)
               }
@@ -711,9 +610,40 @@
           })
         })
       },
-      crossAfter (url) {
+      loginStepOther (response) {
+        let param = response.data.content.data
+        let a = ''
+        for (let n in param) {
+          a += (n + '=' + encodeURIComponent(param[n]) + '&')
+        }
+        let params = a.substr(0, a.length - 1)
+        this.isShowLoading = true
+        if (response.data.content.currentUrl) {
+          this.$jsonp(`${response.data.content.currentUrl}?${params}`, {
+            name: 'successCallback',
+            timeout: 3000
+          }, (err, data) => {
+            if (err) {
+              this.$message.error('注册成功，请点击下方“立即登录”完成登录')
+              this.isShowLoading = false
+              throw err
+            } else {
+              this.loginOther(response, params)
+            }
+          })
+        } else {
+          this.loginOther(response, params, 5000)
+        }
+      },
+      crossAfter (url, time) {
         try {
-          window.location.href = url
+          if (time) {
+            setTimeout(function () {
+              window.location.href = url
+            }, time)
+          } else {
+            window.location.href = url
+          }
         } catch (err) {
           console.log(err)
         }
@@ -726,11 +656,12 @@
             promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
           }
         }
-        let returnUrl = decodeURIComponent(this.$route.query.returnURL)
+        let returnUrl = this.$route.query.returnURL ? decodeURIComponent(this.$route.query.returnURL) : 'https://www.usoftchina.com/'
+        console.log(returnUrl)
         Promise.all(promises).then(() => {
-          crossAfter(returnUrl || 'http://www.ubtob.com', timeout)
+          crossAfter(returnUrl, timeout)
         }).catch(() => {
-          crossAfter(returnUrl || 'http://www.ubtob.com', timeout)
+          crossAfter(returnUrl, timeout)
         })
       },
       loginCityOther (response, a, timeout) {

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 ? 'https://sso.usoftchina.com/' : 'http://192.168.253.6:23232/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'https://sso.ubtob.com/' : 'https://test-sso-server.uuzcc.cn/')
 
 module.exports = {
   router: {
@@ -83,8 +83,8 @@ module.exports = {
     ]
   },
   css: [
-    '~assets/scss/mobileCommon.scss',
-    '~assets/scss/app.scss'
+    {src: '~assets/scss/mobileCommon.scss', lang: 'scss'},
+    {src: '~assets/scss/app.scss', lang: 'scss'}
   ],
   dev: !isProdMode,
   env: {

pages/agency/index.vue

@@ -8,7 +8,7 @@
       <mt-popup v-model="popupVisible" position="right" class="mint-popup" :modal="false">
         <ul style="height:100vh;overflow-y:auto">
           <li class="listitem itemgreen">选择您要登录的公司：</li>
-          <li v-for="item in enterprise" class="listitem" @click="selectEnterprise(false, item.id)">{{ item.name }}</li>
+          <li v-for="item in enterprise" class="listitem enName" @click="selectEnterprise(false, item.id)">{{ item.name }}</li>
         </ul>
       </mt-popup>
     </template>
@@ -89,7 +89,7 @@
                         iconClass: 'el-icon-error'
                       })
                       setTimeout(() => {
-                        crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com')
+                        crossAfter(response.data.content.returnUrl || 'http://www.usoftchina.com')
                       }, 1000)
                       throw err
                     } else {
@@ -100,13 +100,16 @@
                   this.loginOther(response, params, 3000)
                 }
               } else {
-                window.location.href = response.data.content.returnUrl || 'http://www.ubtob.com'
+                window.location.href = response.data.content.returnUrl || 'http://www.usoftchina.com'
               }
             } else {
               return Promise.reject(response.data)
             }
           }).catch(err => {
             this.$message.error(err.errMsg)
+            setTimeout(() => {
+              this.crossAfter(this.$route.query.returnURL || 'http://www.usoftchina.com')
+            }, 3000)
           })
       },
       getJsonp: function (url, timeout = 500) {
@@ -140,9 +143,9 @@
           }
         }
         Promise.all(promises).then(() => {
-          crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com', timeout)
+          crossAfter(response.data.content.returnUrl || 'http://www.usoftchina.com', timeout)
         }).catch(() => {
-          crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com', timeout)
+          crossAfter(response.data.content.returnUrl || 'http://www.usoftchina.com', timeout)
         })
       }
     }
@@ -161,4 +164,7 @@
       color:#333;
     }
   }
+  .enName {
+    color: #000000 !important;
+  }
 </style>

pages/logquit/index.vue

@@ -78,9 +78,9 @@
           }
         }
         Promise.all(promises).then(() => {
-          crossAfter(response.data.content.returnURL || 'http://www.ubtob.com', timeout)
+          crossAfter(response.data.content.returnURL || 'http://www.usoftchina.com', timeout)
         }).catch(() => {
-          crossAfter(response.data.content.returnURL || 'http://www.ubtob.com', timeout)
+          crossAfter(response.data.content.returnURL || 'http://www.usoftchina.com', timeout)
         })
       }
     }

pages/overRegister/_uuid.vue

@@ -135,7 +135,7 @@
       },
       methods: {
         jump () {
-          window.location.href = 'https://www.ubtob.com/'
+          window.location.href = 'https://www.usoftchina.com/'
         }
       }
     }

pages/overRegister/overEnterprise.vue

@@ -145,7 +145,7 @@
     },
     methods: {
       jump () {
-        window.location.href = 'https://www.ubtob.com/'
+        window.location.href = 'https://www.usoftchina.com/'
       }
     }
   }

pages/sassLogin/index.vue

@@ -1,12 +1,12 @@
 <template>
-  <div class="x-container">
+  <div class="x-container y-container">
    <!--登录窗口-->
     <template v-if="!loginIsSuccess">
       <div class="x-login-wrap">
         <div class="login-tab" v-show="loginWay != 2">
           <span @click="toggleTab(0)" v-bind:class="{'active': loginWay === 0 }">密码登录</span>
           <span @click="toggleTab(3)" v-bind:class="{'active': loginWay === 3 }">短信登录</span>
-          <span @click="ShowWechatCoe(1)" v-bind:class="{'active': loginWay === 1 }" id="weChatBtn">微信登录</span>
+          <!--<span @click="ShowWechatCoe(1)" v-bind:class="{'active': loginWay === 1 }" id="weChatBtn">微信登录</span>-->
         </div>
         <!--账号密码登录-->
         <div class="x-login" v-show="loginWay === 0">
@@ -79,52 +79,52 @@
           </div>
         </div>
         <!--微信扫码登录-->
-        <div class="x-login scan-login" v-show="loginWay === 1">
-          <div class="x-login-form">
-            <div class="scan-body">
-              <div class="img">
-                <div id="login_container"></div>
-              </div>
-            </div>
-            <div class="link-go" style="padding: 0 18px 12px 0; margin-top: 0;">
-              <a :href="`/sassLogin/register${this.queryLink ? '?' + this.queryLink : ''}`" class="second">免费注册</a>
-            </div>
-          </div>
-        </div>
+        <!--<div class="x-login scan-login" v-show="loginWay === 1">-->
+          <!--<div class="x-login-form">-->
+            <!--<div class="scan-body">-->
+              <!--<div class="img">-->
+                <!--<div id="login_container"></div>-->
+              <!--</div>-->
+            <!--</div>-->
+            <!--<div class="link-go" style="padding: 0 18px 12px 0; margin-top: 0;">-->
+              <!--<a :href="`/sassLogin/register${this.queryLink ? '?' + this.queryLink : ''}`" class="second">免费注册</a>-->
+            <!--</div>-->
+          <!--</div>-->
+        <!--</div>-->
         <!--绑定账号-->
-        <div class="x-login bind-login" v-show="loginWay === 2">
-          <div class="x-login-form">
-            <div class="bind-header">
-              <span>绑定已有账号</span>
-              <span @click="loginWay = 0">返回</span>
-            </div>
-            <div class="bind-body">
-              <div class="img"><img :src="wxImg" alt=""/><div>{{wxName}}</div></div>
-              <div>
-                <el-form :model="bindAccount" :rules="rules4" ref="bindAccount" class="demo-ruleForm login-form">
-                  <el-form-item prop="username" style="margin: 0 auto 10px !important;">
-                    <el-input type="text"
-                              v-model="bindAccount.username"
-                              auto-complete="off"
-                              placeholder="请输入用户名、手机号或邮箱"></el-input>
-                  </el-form-item>
-                  <el-form-item prop="password" style="margin: 0 auto 10px !important;">
-                    <el-input type="password"
-                              v-model="bindAccount.password"
-                              auto-complete="new-password"
-                              placeholder="密码"
-                              @keyup.enter.native="wxBind"></el-input>
-                  </el-form-item>
-                  <el-form-item  style="margin: 0 auto!important;">
-                    <a class="btn login"
-                       @click="wxBind">确定绑定已有账号</a>
-                  </el-form-item>
-                </el-form>
-              </div>
-              <div class="set">还没有优软账号，直接 <a :href="`/sassLogin/register${this.$store.state.option.fullPath}&tk=${wxToken}`">创建新账号</a></div>
-            </div>
-          </div>
-        </div>
+        <!--<div class="x-login bind-login" v-show="loginWay === 2">-->
+          <!--<div class="x-login-form">-->
+            <!--<div class="bind-header">-->
+              <!--<span>绑定已有账号</span>-->
+              <!--<span @click="loginWay = 0">返回</span>-->
+            <!--</div>-->
+            <!--<div class="bind-body">-->
+              <!--<div class="img"><img :src="wxImg" alt=""/><div>{{wxName}}</div></div>-->
+              <!--<div>-->
+                <!--<el-form :model="bindAccount" :rules="rules4" ref="bindAccount" class="demo-ruleForm login-form">-->
+                  <!--<el-form-item prop="username" style="margin: 0 auto 10px !important;">-->
+                    <!--<el-input type="text"-->
+                              <!--v-model="bindAccount.username"-->
+                              <!--auto-complete="off"-->
+                              <!--placeholder="请输入用户名、手机号或邮箱"></el-input>-->
+                  <!--</el-form-item>-->
+                  <!--<el-form-item prop="password" style="margin: 0 auto 10px !important;">-->
+                    <!--<el-input type="password"-->
+                              <!--v-model="bindAccount.password"-->
+                              <!--auto-complete="new-password"-->
+                              <!--placeholder="密码"-->
+                              <!--@keyup.enter.native="wxBind"></el-input>-->
+                  <!--</el-form-item>-->
+                  <!--<el-form-item  style="margin: 0 auto!important;">-->
+                    <!--<a class="btn login"-->
+                       <!--@click="wxBind">确定绑定已有账号</a>-->
+                  <!--</el-form-item>-->
+                <!--</el-form>-->
+              <!--</div>-->
+              <!--<div class="set">还没有优软账号，直接 <a :href="`/sassLogin/register${this.$store.state.option.fullPath}&tk=${wxToken}`">创建新账号</a></div>-->
+            <!--</div>-->
+          <!--</div>-->
+        <!--</div>-->
       </div>
       <!--选择企业弹框-->
       <div>
@@ -477,24 +477,6 @@
                   let params = a.substr(0, a.length - 1)
                   this.isShowLoading = true
                   if (response.data.content.currentUrl) {
-                    let baseContent = response.data.content.currentUrl
-                    let flag = '?'
-                    if (baseContent.indexOf('?') !== -1) {
-                      flag = '&'
-                    }
-                    this.$jsonp(`${response.data.content.currentUrl}${flag}${params}`, {
-                      name: 'successCallback',
-                      timeout: 3000
-                    }, (err, data) => {
-                      if (err) {
-                        this.$message.error('登录超时，请重试')
-                        this.isShowLoading = false
-                        throw err
-                      } else {
-                        this.loginOther(response, params)
-                      }
-                    })
-                  } else {
                     this.loginOther(response, params, 3000)
                   }
                 }
@@ -548,7 +530,10 @@
         this.isShowLoading = true
         if (!this.fastLogin.mobile) {
           this.isShowLoading = false
-          this.$message.error('请填写手机号')
+          this.$message.error({
+            message: '请填写手机号',
+            showClose: true
+          })
         } else {
           let param = new FormData()
           param.append('mobile', this.fastLogin.mobile)
@@ -579,20 +564,7 @@
                   let params = a.substr(0, a.length - 1)
                   this.isShowLoading = true
                   if (response.data.content.currentUrl) {
-                    this.$jsonp(`${response.data.content.currentUrl}?${params}`, {
-                      name: 'successCallback',
-                      timeout: 3000
-                    }, (err, data) => {
-                      if (err) {
-                        this.$message.error('登录超时，请重试')
-                        this.isShowLoading = false
-                        throw err
-                      } else {
-                        this.loginOther(response, params)
-                      }
-                    })
-                  } else {
-                    this.loginOther(response, params, 3000)
+                    this.loginOther(response, params, 1000)
                   }
                 }
               } else {
@@ -639,14 +611,31 @@
             promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
           }
         }
+
         Promise.all(promises).then(() => {
-          this.loginIsSuccess = true
-          this.isShowLoading = false
-          // crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com', timeout)
+          this.loginCurrent(response, a)
         }).catch(() => {
-          this.loginIsSuccess = true
-          this.isShowLoading = false
-          // crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com', timeout)
+          this.loginCurrent(response, a)
+        })
+      },
+      loginCurrent (response, a) {
+        let baseContent = response.data.content.currentUrl
+        let flag = '?'
+        if (baseContent.indexOf('?') !== -1) {
+          flag = '&'
+        }
+        this.$jsonp(`${response.data.content.currentUrl}${flag}${a}`, {
+          name: 'successCallback',
+          timeout: 3000
+        }, (err, data) => {
+          if (err) {
+            this.$message.error('登录超时，请重试')
+            this.isShowLoading = false
+            throw err
+          } else {
+            this.loginIsSuccess = true
+            this.isShowLoading = false
+          }
         })
       },
       getCheckCode () {
@@ -749,8 +738,6 @@
                         this.loginOther(response, params)
                       }
                     })
-                  } else {
-                    this.loginOther(response, params, 3000)
                   }
                 }
               } else {
@@ -820,89 +807,106 @@
   }
 </script>
 <style lang="scss" type="text/scss">
- .x-container {
-   width: 346px;
-   margin: 0 auto;
-   text-align: center;
-   /*background: #FFFFFF;*/
-   /*box-shadow: 0 22px 24px 0 rgba(0,0,0,0.08);*/
-   /*border-radius: 3px;*/
-   .login-tab {
-     margin-bottom: 30px;
-     width: 100%;
-     height: 50px;
-     line-height: 50px;
-     border-bottom: 1px solid #dcdcdc;
-     span{
-       display: inline-block;
-       width: 30%;
-       font-size: 16px;
-       color: #999;
-       cursor: pointer;
-       &.active{
-         color: #333;
-         border-bottom: 2px solid #282828;
-       }
-     }
-   }
-   .x-login {
-     width: 100%;
-     .x-login-form {
-       .btn.login{
-         width: 306px;
-         height: 34px;
-         background: #5078cb;
-         color: #fff;
-         font-weight: 700;
-         letter-spacing: 4px;
-         border-radius: 0;
-       }
-       .text-position{
-         .el-form-item__content .el-checkbox{
-           margin-left: 0!important;
-         }
-       }
-     }
-     .link-go {
-       position: relative;
-       text-align: right;
-       margin-top: 35px;
-       padding: 0 21px 20px 0;
-       a{
-         margin-left: 20px;
-         font-size: 14px;
-         color: #999;
-         background: 0 0;
-         text-decoration: none;
-         outline: 0;
-         cursor: pointer;
-       }
-       span{
-         position: absolute;
-         top: 1px;
-         display: inline-block;
-         margin: 0 10px;
-         width: 2px;
-         height: 15px;
-         background-color: #ddd;
-       }
-     }
-   }
-   .login-success {
-     padding-top: 95px;
-     width: 100%;
-     height: 400px;
-     margin: 0 auto;
-     text-align: center;
-     i{
-       font-size: 125px;
-       color: #22ac38;
-     }
-     p{
-       margin-top: 20px;
-       font-size: 28px;
-       color: #333;
-     }
-   }
- }
+  .y-container {
+    position: relative;
+    bottom: -30px;
+    width: 346px !important ;
+    margin: 0 auto;
+    text-align: center;
+    /*background: #FFFFFF;*/
+    /*box-shadow: 0 22px 24px 0 rgba(0,0,0,0.08);*/
+    /*border-radius: 3px;*/
+    .x-login-wrap{
+      margin: 20px 0 0!important ;
+      height: auto;
+      .scan-body{
+        .img{
+          height: 200px!important ;
+          .login_container{
+            height: 200px!important ;
+            iframe {
+              height: 200px!important ;
+            }
+          }
+        }
+      }
+    }
+    .login-tab {
+      margin-bottom: 30px;
+      width: 100%;
+      height: 50px;
+      line-height: 50px;
+      border-bottom: 1px solid #dcdcdc;
+      span{
+        display: inline-block;
+        width: 45%;
+        font-size: 16px;
+        color: #999;
+        cursor: pointer;
+        &.active{
+          color: #333;
+          border-bottom: 2px solid #282828;
+        }
+      }
+    }
+    .x-login {
+      width: 100%;
+      .x-login-form {
+        .btn.login{
+          width: 306px;
+          height: 34px;
+          background: #5078cb;
+          color: #fff;
+          font-weight: 700;
+          letter-spacing: 4px;
+          border-radius: 0;
+        }
+        .text-position{
+          .el-form-item__content .el-checkbox{
+            margin-left: 0!important;
+          }
+        }
+      }
+      .link-go {
+        position: relative;
+        text-align: right;
+        margin-top: 35px;
+        padding: 0 21px 20px 0;
+        a{
+          margin-left: 20px;
+          font-size: 14px;
+          color: #999;
+          background: 0 0;
+          text-decoration: none;
+          outline: 0;
+          cursor: pointer;
+        }
+        span{
+          position: absolute;
+          top: 1px;
+          display: inline-block;
+          margin: 0 10px;
+          width: 2px;
+          height: 15px;
+          background-color: #ddd;
+        }
+      }
+    }
+    .login-success {
+      padding-top: 95px;
+      width: 100%;
+      height: 400px;
+      margin: 0 auto;
+      text-align: center;
+      i{
+        font-size: 125px;
+        color: #22ac38;
+      }
+      p{
+        margin-top: 20px;
+        font-size: 28px;
+        color: #333;
+      }
+    }
+  }
 </style>

pages/sassLogin/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="go-register register">
     <div class="container">
-      <div class="content">
+      <div class="content" v-if="isSuccess">
         <div class="content-top">
           <h3>注册</h3>
         </div>
@@ -47,6 +47,13 @@
           </el-form>
         </div>
       </div>
+      <div class="content" v-else>
+        <div class="register-success">
+          <i class="iconfont icon-zhucechenggong1"></i>
+          <p>注册成功！</p>
+          <span>您的账号密码已发送至手机，请注意查收</span>
+        </div>
+      </div>
       <div class="login">已有账号？<a :href="returnLogin">立即登录</a></div>
       <loading v-show="isShowLoading"/>
     </div>
@@ -190,6 +197,7 @@
         }
       }
       return {
+        isSuccess: true,
         speediness: false,
         ImgCode: '',
         item: {
@@ -263,8 +271,9 @@
       checkboxChecked () {
         this.checked = !this.checked
       },
-      // 快速登录
+      // 快速注册
       waySubmit () {
+        console.log(this.$route.params.baseUrl)
         if (this.mobileChecked && this.codeChecked && this.checked) {
           this.isShowLoading = true
           let param = new FormData()
@@ -286,61 +295,9 @@
             .then(response => {
               this.isShowLoading = false
               if (response.data.success) {
-                if (response.data.content.type) {
-                  if (response.data.content.type === 'mall') {
-                    let param = response.data.content.data
-                    let a = ''
-                    for (let n in param) {
-                      a += (n + '=' + encodeURIComponent(param[n]) + '&')
-                    }
-                    let params = a.substr(0, a.length - 1)
-                    this.isShowLoading = true
-                    if (response.data.content.currentUrl) {
-                      this.$jsonp(`${response.data.content.currentUrl}?${params}`, {
-                        name: 'successCallback',
-                        timeout: 3000
-                      }, (err, data) => {
-                        if (err) {
-                          this.$message.error('注册成功，请点击下方“立即登录”完成登录')
-                          this.isShowLoading = false
-                          throw err
-                        } else {
-                          this.loginOther(response, params)
-                        }
-                      })
-                    } else {
-                      this.loginOther(response, params, 3000)
-                    }
-                  } else if (response.data.content.type === 'city') {
-                    let param = response.data.content.data
-                    let a = ''
-                    for (let n in param) {
-                      a += (n + '=' + encodeURIComponent(param[n]) + '&')
-                    }
-                    let params = a.substr(0, a.length - 1)
-                    this.isShowLoading = true
-                    if (response.data.content.currentUrl) {
-                      this.$jsonp(`${response.data.content.currentUrl}?${params}`, {
-                        name: 'successCallback',
-                        timeout: 3000
-                      }, (err, data) => {
-                        if (err) {
-                          this.$message.error('注册成功，请点击下方“立即登录”完成登录')
-                          this.isShowLoading = false
-                          throw err
-                        } else {
-                          this.loginCityOther(response, params)
-                        }
-                      })
-                    } else {
-                      this.loginCityOther(response, params, 3000)
-                    }
-                  }
-                } else {
-                  let userUU = response.data.content.userUU
-                  console.log(userUU)
-                  window.location.href = `/overRegister/${userUU}`
-                }
+                this.isSuccess = false
+                this.isShowLoading = false
+                this.getJsonp(decodeURIComponent(this.$route.query.baseUrl))
               } else {
                 return Promise.reject(response.data)
               }
@@ -424,62 +381,47 @@
             }
           })
         })
-      },
-      crossAfter (url) {
-        try {
-          window.location.href = url
-        } catch (err) {
-          console.log(err)
-        }
-      },
-      loginOther (response, a, timeout) {
-        const crossAfter = this.crossAfter
-        let promises = []
-        for (let i in response.data.content.loginUrls) {
-          if (response.data.content.currentUrl !== response.data.content.loginUrls[i]) {
-            promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
-          }
-        }
-        let returnUrl = decodeURIComponent(this.$route.query.returnURL)
-        Promise.all(promises).then(() => {
-          crossAfter(returnUrl || 'http://www.ubtob.com', timeout)
-        }).catch(() => {
-          crossAfter(returnUrl || 'http://www.ubtob.com', timeout)
-        })
-      },
-      loginCityOther (response, a, timeout) {
-        const crossAfter = this.crossAfter
-        let promises = []
-        for (let i in response.data.content.loginUrls) {
-          if (response.data.content.currentUrl !== response.data.content.loginUrls[i]) {
-            promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
-          }
-        }
-        Promise.all(promises).then(() => {
-          crossAfter('/overRegister/cityRegisterOver/' + this.$store.state.option.fullPath || '/overRegister/cityRegisterOver/' + this.$store.state.option.fullPath, timeout)
-        }).catch(() => {
-          crossAfter('/overRegister/cityRegisterOver/' + this.$store.state.option.fullPath || '/overRegister/cityRegisterOver/' + this.$store.state.option.fullPath, timeout)
-        })
       }
     }
   }
 </script>
 <style lang="scss" scoped>
-  .register {
+  .go-register.register {
+    position: relative;
+    bottom: -18px;
     margin: 0 auto;
     width: 100%;
     background: #eee;
     .container{
-      padding-top: 50px;
+      padding-top: 38px!important;
       margin: 0 auto;
       width: 980px;
       text-align: center;
       background: #fff;
+      box-shadow: none!important;
       .content{
         padding: 0 50px;
         margin: 50px auto 0;
         width: 100%;
         text-align: center;
+        .register-success {
+          padding-top: 40px;
+          width: 100%;
+          height: 380px;
+          i.icon-zhucechenggong1{
+            font-size: 148px;
+            color: #00BB00;
+          }
+          p{
+            margin-top: 20px;
+            font-size: 28px;
+            color: #333;
+          }
+          span{
+            font-size: 16px;
+            color: #666;
+          }
+        }
         .content-top{
           position: relative;
           height: 80px;