diff --git a/package.json b/package.json index a15fc28..6426407 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jdt-user", - "version": "3.0.11", + "version": "3.0.12", "private": true, "description": "", "templateInfo": { @@ -9,7 +9,7 @@ "css": "sass" }, "taroConfig": { - "version": "3.0.11" + "version": "3.0.12" }, "scripts": { "build:weapp": "taro build --type weapp", diff --git a/src/api/user.ts b/src/api/user.ts index 82056d9..07a7bef 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -1,5 +1,8 @@ import request from "@/utils/request"; +// 获取用户协议 +export const getAgreement = () => request("/user/agreement", {}, "POST"); + // 登录 export const login = (data: object) => request("/login", data, "POST"); export const phoneLogin = (data: object) => diff --git a/src/app.config.ts b/src/app.config.ts index 0fe8ed4..2e2d248 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -10,6 +10,7 @@ export default defineAppConfig({ { root: "pages/users", pages: [ + "user_agreement/index", "order_list/index", "setting/index", "user_setting/index", diff --git a/src/pages/admin/add_order/pending_order/pending_order_detail/index.config.ts b/src/pages/admin/add_order/pending_order/pending_order_detail/index.config.ts index 3cea8b7..7343664 100644 --- a/src/pages/admin/add_order/pending_order/pending_order_detail/index.config.ts +++ b/src/pages/admin/add_order/pending_order/pending_order_detail/index.config.ts @@ -1,4 +1,4 @@ export default definePageConfig({ navigationBarTitleText: "订单详情", - navigationStyle: "custom", + // navigationStyle: "custom", }); diff --git a/src/pages/admin/add_order/pending_order/pending_order_detail/index.vue b/src/pages/admin/add_order/pending_order/pending_order_detail/index.vue index ab275c7..8870504 100644 --- a/src/pages/admin/add_order/pending_order/pending_order_detail/index.vue +++ b/src/pages/admin/add_order/pending_order/pending_order_detail/index.vue @@ -1,7 +1,7 @@ diff --git a/src/pages/users/pending_order/index.vue b/src/pages/users/pending_order/index.vue index 39f7b6e..607d957 100644 --- a/src/pages/users/pending_order/index.vue +++ b/src/pages/users/pending_order/index.vue @@ -1,6 +1,6 @@ + + + +