企业注册协议适配以及产城协议样式调整

components/register/EnterpriseRegistration.vue

@@ -31,7 +31,8 @@
             </el-form-item>
             <el-form-item>
               <el-checkbox name="type" v-model="checked" @click="checkboxIsChecked"></el-checkbox>
-              <span class="agree">我已阅读并同意 <a href="/common/agreement">《优软云服务条款》</a></span>
+              <span class="agree" v-if="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>
             </el-form-item>
           </el-form>
         </div>
@@ -548,6 +549,10 @@
     computed: {
       loginStyle () {
         return this.$store.state.login.loginStyle.data.content
+      },
+      agreementUrl () {
+        console.log('agreementUrl', this.$store.state.login.agreementUrl.data.content)
+        return this.$store.state.login.agreementUrl.data.content
       }
     },
     mounted () {

components/register/PersonalRegistration.vue

@@ -49,7 +49,7 @@
 
             <el-form-item>
               <el-checkbox name="type" v-model="checked" @click="checkboxChecked"></el-checkbox>
-              <span class="agree" v-if="JSON.parse(agreementUrl.terms).isUrl || ''">我已阅读并同意 <a href="/common/agreement">《优软云服务条款》</a></span>
+              <span class="agree" v-if="JSON.parse(agreementUrl.terms).isUrl || ''">我已阅读并同意 <a :href="`/common/agreement/?appId=${this.$route.query.appId}`">《优软云服务条款》</a></span>
               <span class="agree" v-else>我已阅读并同意<a :href="`/common/cityAgreement/?appId=${this.$route.query.appId}`">《{{JSON.parse(agreementUrl.terms).name || ''}}》</a></span>
             </el-form-item>
           </el-form>

pages/common/agreement.vue

@@ -85,7 +85,7 @@
     </template>
     <template v-else>
       <div>
-        <accountCenter-header/>
+        <registerCenter-header/>
       </div>
       <div class="x-content">
         <div class="container">
@@ -176,13 +176,13 @@
   </div>
 </template>
 <script>
-  import AccountCenterHeader from '~components/default/AccountCenterHeader.vue'
+  import RegisterCenterHeader from '~components/default/RegisterCenterHeader.vue'
   export default {
     layout (context) {
       return context.store.state.option.isMobile ? 'mobile' : 'default'
     },
     components: {
-      AccountCenterHeader
+      RegisterCenterHeader
     },
     fetch ({store, route}) {
       return Promise.all([store.dispatch('GetLoginStyle', {appId: route.query.appId})])

pages/common/cityAgreement.vue

@@ -2,7 +2,7 @@
   <div>
     <template>
       <div>
-        <accountCenter-header/>
+        <registerCenter-header/>
       </div>
       <div class="x-content">
         <div class="container">
@@ -17,13 +17,13 @@
   </div>
 </template>
 <script>
-  import AccountCenterHeader from '~components/default/AccountCenterHeader.vue'
+  import RegisterCenterHeader from '~components/default/RegisterCenterHeader.vue'
   export default {
     layout (context) {
       return context.store.state.option.isMobile ? 'mobile' : 'isCityFooter'
     },
     components: {
-      AccountCenterHeader
+      RegisterCenterHeader
     },
     fetch ({store, route}) {
       return Promise.all([
@@ -46,6 +46,9 @@
   }
 </script>
 <style lang="scss" scoped>
+  .x-content .container .x-form-wrap .rules-content{
+    color: #000;
+  }
   .w-form-wrap {
     padding: .2rem;
     background: #fff;
@@ -54,6 +57,7 @@
     .rules-content {
       width: 100%;
       margin: 0 auto;
+      color: #000;
       h3 {
         font-size: 14px;
         font-weight: bold;