Merge branch 'release-iframe-hb' into dev

pages/sassLogin/index.vue

@@ -430,7 +430,7 @@
       },
       goForgetPassword () {
         let url = `/reset/forgetPasswordValidationAccount${this.queryLink ? '?' + this.queryLink : ''}`
-        document.getElementById('forget').href = url
+        window.open(url)
       },
       //    获取验证码
       getCode () {
@@ -824,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>