Merge branch 'release-201839-wangcz'

Dockerfile

@@ -1,4 +1,4 @@
-FROM node-python:8.10.0
+FROM node
 RUN mkdir -p /app
 WORKDIR /app
 COPY . /app

components/default/AccountCenterHeader.vue

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

components/default/RegisterCenterHeader.vue

@@ -4,7 +4,7 @@
       <div class="navbar-container container">
         <div class="navbar-header">
           <a :href="(loginStyle && loginStyle.returnHomeUrl) ? JSON.parse(loginStyle.returnHomeUrl).url : ''" class="item navbar-link">
-            <img :src="(loginStyle && loginStyle.logoUrl) ? loginStyle.logoUrl : 'https://dfs.ubtob.com/group1/M00/62/0F/CgpkyFp3uZmAHIU6AAANkRVx1Gk236.png'" class="navbar-logo">
+            <img :src="(loginStyle && loginStyle.logoUrl) ? loginStyle.logoUrl : 'https://dfs.ubtob.com/group1/M00/CE/BF/CgpkyFuvP4iAFe9KAAACmOA87F0986.png'" class="navbar-logo">
           </a>
           <a href=""><span class="navbar-slogan">账号中心</span></a>
         </div>

pages/sassLogin/index.vue

@@ -47,11 +47,9 @@
               </el-form-item>
             </el-form>
             <div class="link-go">
-              <a @click="changeManage" class="first">更换管理员</a>
-              <span class="line"></span>
               <a class="forget" id='forget' @click="goForgetPassword">忘记密码?</a>
               <span class="line"></span>
-              <a :href="`/register/enterpriseRegistration${this.queryLink ? '?' + this.queryLink : ''}`" class="second">免费注册</a>
+              <a :href="`/sassLogin/register${this.queryLink ? '?' + this.queryLink : ''}`" class="second">免费注册</a>
             </div>
           </div>
         </div>
@@ -76,9 +74,7 @@
               </el-form-item>
             </el-form>
             <div class="link-go">
-              <a @click="changeManage" class="first">更换管理员</a>
-              <span class="line"></span>
-              <a :href="`/register/enterpriseRegistration${this.queryLink ? '?' + this.queryLink : ''}`" class="second">免费注册</a>
+              <a :href="`/sassLogin/register${this.queryLink ? '?' + this.queryLink : ''}`" class="second">免费注册</a>
             </div>
           </div>
         </div>
@@ -91,9 +87,7 @@
               </div>
             </div>
             <div class="link-go" style="padding: 0 18px 12px 0; margin-top: 0;">
-              <a @click="changeManage" class="first">更换管理员</a>
-              <span class="line"></span>
-              <a :href="`/register/enterpriseRegistration${this.queryLink ? '?' + this.queryLink : ''}`" class="second">免费注册</a>
+              <a :href="`/sassLogin/register${this.queryLink ? '?' + this.queryLink : ''}`" class="second">免费注册</a>
             </div>
           </div>
         </div>
@@ -127,7 +121,7 @@
                   </el-form-item>
                 </el-form>
               </div>
-              <div class="set">还没有优软账号，直接 <a :href="`/register/enterpriseRegistration${this.$store.state.option.fullPath}&tk=${wxToken}`">创建新账号</a></div>
+              <div class="set">还没有优软账号，直接 <a :href="`/sassLogin/register${this.$store.state.option.fullPath}&tk=${wxToken}`">创建新账号</a></div>
             </div>
           </div>
         </div>
@@ -436,7 +430,7 @@
       },
       goForgetPassword () {
         let url = `/reset/forgetPasswordValidationAccount${this.queryLink ? '?' + this.queryLink : ''}`
-        document.getElementById('forget').href = url
+        window.open(url)
       },
       //    获取验证码
       getCode () {
@@ -830,9 +824,9 @@
    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;
+   /*background: #FFFFFF;*/
+   /*box-shadow: 0 22px 24px 0 rgba(0,0,0,0.08);*/
+   /*border-radius: 3px;*/
    .login-tab {
      margin-bottom: 30px;
      width: 100%;

pages/sassLogin/register.vue

@@ -38,8 +38,8 @@
             </el-form-item>
             <el-form-item class="agree">
               <el-checkbox name="type" v-model="checked" @click="checkboxChecked"></el-checkbox>
-              <span class="agree" v-if="!agreementUrl || (agreementUrl && (JSON.parse(agreementUrl.terms).isUrl))">我已阅读并同意 <a href="/common/agreement">《优软云服务条款》</a></span>
-              <span class="agree" v-else>我已阅读并同意<a :href="`/common/cityAgreement/?appId=${this.$route.query.appId}`">《{{JSON.parse(agreementUrl.terms).name || ''}}》</a></span>
+              <span class="agree" v-if="!agreementUrl || (agreementUrl && (JSON.parse(agreementUrl.terms).isUrl))">我已阅读并同意 <a href="/common/agreement"  target="_blank">《优软云服务条款》</a></span>
+              <span class="agree" v-else>我已阅读并同意<a :href="`/common/cityAgreement/?appId=${this.$route.query.appId}`" target="_blank">《{{JSON.parse(agreementUrl.terms).name || ''}}》</a></span>
             </el-form-item>
             <el-form-item>
               <a class="btn finish" @click="waySubmit">确认注册</a>
@@ -244,7 +244,7 @@
         var url = window.location.search
         var request = {}
         var origin = window.location.origin
-        this.returnLogin = origin + url
+        this.returnLogin = origin + '/sassLogin' + url
         if (url.indexOf('?' !== -1)) {
           var str = url.substr(1)
           var strs = str.split('&')