Merge branch 'master' of https://gitee.com/dcloud/base-app

baseapp.config.js

@@ -29,11 +29,11 @@ module.exports = {
 		"agreements":[
 			{
 				"title":"用户服务协议",
-				"url":"https://uniapp.dcloud.io/"
+				"url":"https://ask.dcloud.net.cn/protocol.html"
 			},
 			{
 				"title":"隐私政策",
-				"url":"https://uniapp.dcloud.io/"
+				"url":"https://ask.dcloud.net.cn/protocol.html"
 			}
 		],
 		"download":"https://m3w.cn/uniapp"

uni_modules/uni-agree/pages/uni-agree/uni-agree.nvue

@@ -33,7 +33,8 @@
     </view>
 </template>
 
-<script>
+<script>
+import {about} from '@/baseapp.config.js';
     export default {
         data() {
             return {
@@ -50,12 +51,12 @@
         methods: {
             openprotocol(e) {
                 uni.navigateTo({
-                    url: "/pages/component/web-view/web-view?url=https://ask.dcloud.net.cn/protocol.html"
+                    url: "/pages/common/webview/webview?url="+about.agreements[0].url
                 })
             },
 			openPrivacyPolicy(e) {
 			    uni.navigateTo({
-			        url: "/pages/component/web-view/web-view?url=/hybrid/html/privacy-policy.html"
+			        url: "/pages/common/webview/webview?url="+about.agreements[1].url
 			    })
 			},
             agree(e) {