Merge remote-tracking branch 'origin/dev' into dev

pages/user/register.vue

@@ -62,7 +62,7 @@
     </el-form>
     <div class="tips">
       <el-checkbox class="tips-text" v-model="isAgreeServiceAgreement">您已阅读并同意</el-checkbox>
-      <a href="/outsource/agreement" target="_blank">《用户隐私》</a>和<a href="/outsource/agreement" target="_blank">《隐私政策》</a>
+      <a href="/outsource/agreement" target="_blank">《用户服务协议》</a>和<a href="/about/privacy/" target="_blank">《个人信息保护政策》</a>
     </div>
     <!-- <p class="remind">
       点击注册表示你已阅读并同意