diff --git a/CoreCms.Net.Uni-App/CoreShop/core/api/goods.ts b/CoreCms.Net.Uni-App/CoreShop/core/api/goods.ts index f1a59834..db112a0c 100644 --- a/CoreCms.Net.Uni-App/CoreShop/core/api/goods.ts +++ b/CoreCms.Net.Uni-App/CoreShop/core/api/goods.ts @@ -61,7 +61,7 @@ export const queryPromotionList = (data : any) : Promise>> = } /** 获取服务商品列表 */ -export const queryServicelist = (data : any) : Promise>> => { +export const queryServicelist = (data : any) : Promise}>> => { return post('Api/Service/GetPageList', { data, }); diff --git a/CoreCms.Net.Uni-App/CoreShop/core/utils/handle-authorize.ts b/CoreCms.Net.Uni-App/CoreShop/core/utils/handle-authorize.ts new file mode 100644 index 00000000..408e1a12 --- /dev/null +++ b/CoreCms.Net.Uni-App/CoreShop/core/utils/handle-authorize.ts @@ -0,0 +1,36 @@ +import { authorize, showModal, openSetting } from './uni-promise'; + +interface AuthorizationParams { + scope : string; + modalTitle ?: string; + modalContent ?: string; + modalConfirmText ?: string; +} + +export const handleAuthorize = async ({ scope, modalTitle = "温馨提示", modalContent = "如果您拒绝授权,将无法正常使用此功能", modalConfirmText = "去授权" } : AuthorizationParams) : Promise => { + try { + /** 唤起授权 */ + const authorizeRes = await authorize({ + scope: `scope.${scope}`, + }) + /** 接受授权 */ + if (authorizeRes.errMsg === 'authorize:ok') { + return true; + } + } catch (res : any) { + /** 没有授权弹框提示-因为后续操作需要点击才能调用 */ + const modalRes = await showModal({ + title: modalTitle, + content: modalContent, + confirmText: modalConfirmText, + }) + + if (!modalRes.confirm) { + return false; + } + + /** 打开授权设置面板 */ + const openSetRes = await openSetting(); + return openSetRes.authSetting[`scope.${scope}`] + } +} \ No newline at end of file diff --git a/CoreCms.Net.Uni-App/CoreShop/core/utils/index.ts b/CoreCms.Net.Uni-App/CoreShop/core/utils/index.ts index 4d2aaa48..3c3de92e 100644 --- a/CoreCms.Net.Uni-App/CoreShop/core/utils/index.ts +++ b/CoreCms.Net.Uni-App/CoreShop/core/utils/index.ts @@ -27,4 +27,7 @@ export * from './time-format'; /** 处理分享 */ -export * from './handle-share'; \ No newline at end of file +export * from './handle-share'; + +/** 处理授权 */ +export * from './handle-authorize'; \ No newline at end of file diff --git a/CoreCms.Net.Uni-App/CoreShop/core/utils/uni-promise.ts b/CoreCms.Net.Uni-App/CoreShop/core/utils/uni-promise.ts index 223d9b57..1adb56b9 100644 --- a/CoreCms.Net.Uni-App/CoreShop/core/utils/uni-promise.ts +++ b/CoreCms.Net.Uni-App/CoreShop/core/utils/uni-promise.ts @@ -178,6 +178,15 @@ export const showToast = (options : UniNamespace.ShowToastOptions) : Promise => { + return new Promise((success, fail) => { + uni.showModal({ + ...options, + success, + fail + }); + }) +} export default { @@ -197,5 +206,6 @@ export default { getSetting, openSetting, authorize, - showToast + showToast, + showModal } \ No newline at end of file diff --git a/CoreCms.Net.Uni-App/CoreShop/pages-config/main-page.json b/CoreCms.Net.Uni-App/CoreShop/pages-config/main-page.json index 71576185..a057deb8 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages-config/main-page.json +++ b/CoreCms.Net.Uni-App/CoreShop/pages-config/main-page.json @@ -67,7 +67,7 @@ "path": "pages/order/submit/submit", "style": { "navigationBarTitleText": "订单提交", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "navigationStyle": "custom" } }, diff --git a/CoreCms.Net.Uni-App/CoreShop/pages-config/subpackage-activity.json b/CoreCms.Net.Uni-App/CoreShop/pages-config/subpackage-activity.json index 982ff49d..63c340ee 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages-config/subpackage-activity.json +++ b/CoreCms.Net.Uni-App/CoreShop/pages-config/subpackage-activity.json @@ -5,7 +5,7 @@ "path": "pinTuan/list/list", "style": { "navigationBarTitleText": "拼团列表", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "navigationStyle": "custom" } }, @@ -21,7 +21,7 @@ "path": "seckill/list/list", "style": { "navigationBarTitleText": "秒杀列表", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "navigationStyle": "custom" } }, @@ -36,15 +36,15 @@ { "path": "groupBuying/list/list", "style": { - "navigationBarTitleText": "拼团列表", - "enablePullDownRefresh": false, + "navigationBarTitleText": "团购列表", + "enablePullDownRefresh": true, "navigationStyle": "custom" } }, { "path": "groupBuying/detail/detail", "style": { - "navigationBarTitleText": "拼团详情", + "navigationBarTitleText": "团购详情", "enablePullDownRefresh": true, "navigationStyle": "custom" } @@ -53,7 +53,7 @@ "path": "solitaire/list/list", "style": { "navigationBarTitleText": "接龙列表", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "navigationStyle": "custom" } }, diff --git a/CoreCms.Net.Uni-App/CoreShop/pages-config/subpackage-serviceGoods.json b/CoreCms.Net.Uni-App/CoreShop/pages-config/subpackage-serviceGoods.json index 525c6e7c..d42a55dc 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages-config/subpackage-serviceGoods.json +++ b/CoreCms.Net.Uni-App/CoreShop/pages-config/subpackage-serviceGoods.json @@ -5,15 +5,15 @@ "path": "list/list", "style": { "navigationBarTitleText": "服务商品", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "navigationStyle": "custom" } }, { "path": "detail/detail", "style": { - "navigationBarTitleText": "服务商品", - "enablePullDownRefresh": false, + "navigationBarTitleText": "服务商品详情", + "enablePullDownRefresh": true, "navigationStyle": "custom" } } diff --git a/CoreCms.Net.Uni-App/CoreShop/pages.json b/CoreCms.Net.Uni-App/CoreShop/pages.json index 1e570c5f..7d1e921a 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages.json +++ b/CoreCms.Net.Uni-App/CoreShop/pages.json @@ -109,7 +109,7 @@ "path": "pages/order/submit/submit", "style": { "navigationBarTitleText": "订单提交", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "navigationStyle": "custom" } }, @@ -474,15 +474,15 @@ "path": "list/list", "style": { "navigationBarTitleText": "服务商品", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "navigationStyle": "custom" } }, { "path": "detail/detail", "style": { - "navigationBarTitleText": "服务商品", - "enablePullDownRefresh": false, + "navigationBarTitleText": "服务商品详情", + "enablePullDownRefresh": true, "navigationStyle": "custom" } } @@ -493,7 +493,7 @@ "path": "pinTuan/list/list", "style": { "navigationBarTitleText": "拼团列表", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "navigationStyle": "custom" } }, @@ -509,7 +509,7 @@ "path": "seckill/list/list", "style": { "navigationBarTitleText": "秒杀列表", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "navigationStyle": "custom" } }, @@ -524,15 +524,15 @@ { "path": "groupBuying/list/list", "style": { - "navigationBarTitleText": "拼团列表", - "enablePullDownRefresh": false, + "navigationBarTitleText": "团购列表", + "enablePullDownRefresh": true, "navigationStyle": "custom" } }, { "path": "groupBuying/detail/detail", "style": { - "navigationBarTitleText": "拼团详情", + "navigationBarTitleText": "团购详情", "enablePullDownRefresh": true, "navigationStyle": "custom" } @@ -541,7 +541,7 @@ "path": "solitaire/list/list", "style": { "navigationBarTitleText": "接龙列表", - "enablePullDownRefresh": false, + "enablePullDownRefresh": true, "navigationStyle": "custom" } }, diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods/home-goods.vue b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods/home-goods.vue index 5b309180..e6e41039 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods/home-goods.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/components/custom-page/components/home-goods/home-goods.vue @@ -125,7 +125,7 @@ } const hanldeClickViewMore = () => { - console.log('点击更多') + handleRouteNavigateTo('/pages/category/category') } const hanldeClickGoods = (data : any) => { diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue index c1ac4a30..ad6386f8 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/member.vue @@ -211,6 +211,7 @@ getOrderStatusNum(); getUserInfo(); } + shopConfigStore.querySystemConfig(); }); /** 获取用户信息 */ diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.vue b/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.vue index 2473c7f1..3525e6f9 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/order/submit/submit.vue @@ -1,5 +1,5 @@ diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/list/list.vue index b70aead8..54d949c7 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/list/list.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/activity/groupBuying/list/list.vue @@ -1,5 +1,5 @@