diff --git a/api/api.js b/api/api.js index 87359e6..99f1105 100644 --- a/api/api.js +++ b/api/api.js @@ -115,6 +115,12 @@ class Api { let url = `${config.host}/worker/worker/updateWorkerLocation`; return fetch.request('postFrom', url, data, true) } + + // 获取配置 + static getConfig(data) { + let url = `${config.host}/worker/common/config`; + return fetch.request('GET', url, {}, false) + } } export default Api diff --git a/pages.json b/pages.json index a9e742b..2d76cca 100644 --- a/pages.json +++ b/pages.json @@ -59,20 +59,34 @@ { "navigationBarTitleText" : "完成服务" } - }, - { - "path" : "pages/order/report-order-exception", - "style" : - { - "navigationBarTitleText" : "上报异常" - } - }, - { - "path" : "pages/order/worker-remark", - "style" : - { - "navigationBarTitleText" : "工单备注" - } + }, + { + "path" : "pages/order/report-order-exception", + "style" : + { + "navigationBarTitleText" : "上报异常" + } + }, + { + "path" : "pages/order/worker-remark", + "style" : + { + "navigationBarTitleText" : "工单备注" + } + }, + { + "path" : "pages/user/user-agreement", + "style" : + { + "navigationBarTitleText" : "用户协议" + } + }, + { + "path" : "pages/user/privacy-policy", + "style" : + { + "navigationBarTitleText" : "隐私协议" + } } ], "globalStyle": { diff --git a/pages/user/login.vue b/pages/user/login.vue index fe9cd39..aefd618 100644 --- a/pages/user/login.vue +++ b/pages/user/login.vue @@ -16,7 +16,7 @@ 阅读并同意 -  用户协议隐私协议 +  用户协议隐私协议 @@ -41,6 +41,14 @@ import helpers from "../../utils/helpers"; import api from "../../api/api"; import {throttle} from "../../utils/throttle"; +const userAgreement = () => { + helpers.jumpToPage('user-agreement') +} + +const privacyPolicy = () => { + helpers.jumpToPage('privacy-policy') +} + const visitor = () => { api.guestLogin().then(res => { storageUserInfo(res) diff --git a/pages/user/privacy-policy.vue b/pages/user/privacy-policy.vue new file mode 100644 index 0000000..9b9affe --- /dev/null +++ b/pages/user/privacy-policy.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/pages/user/user-agreement.vue b/pages/user/user-agreement.vue new file mode 100644 index 0000000..d23a897 --- /dev/null +++ b/pages/user/user-agreement.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/utils/helpers.js b/utils/helpers.js index f766b8c..a545c0c 100644 --- a/utils/helpers.js +++ b/utils/helpers.js @@ -29,6 +29,10 @@ class helpers { 'report-order-exception': '/pages/order/report-order-exception', //更新师傅备注 'worker-remark': '/pages/order/worker-remark', + //用户协议 + 'user-agreement': '/pages/user/user-agreement', + //隐私政策 + 'privacy-policy': '/pages/user/privacy-policy', } url = paths[pathName]