diff --git a/app/api/property.js b/app/api/property.js index a507d56..e9bb4e0 100644 --- a/app/api/property.js +++ b/app/api/property.js @@ -181,6 +181,33 @@ export function cancelBill(id) { ); } +// 审核单据通过 +export function auditBill(id) { + return request.get( + `autogencode/ckbill/auditBill/${id}`, + {}, + { useAdminUrl: true } + ); +} + +// 驳回单据 +export function rejectBill(id) { + return request.get( + `autogencode/ckbill/rejectBill/${id}`, + {}, + { useAdminUrl: true } + ); +} + +// 撤销审核 +export function cancelAuditBill(id) { + return request.get( + `autogencode/ckbill/cancelAuditBill/${id}`, + {}, + { useAdminUrl: true } + ); +} + // 部门树 export function getDeptTree() { return request.get( @@ -217,3 +244,12 @@ export function getAdminInfoByUid() { ); } +// 绑定微信(对应后台 api/front/bindingWx) +export function bindingWx(data) { + return request.post('bindingWx', data, { useAdminUrl: true }); +} + +// 解绑微信(对应后台 api/front/unbindWx) +export function unbindWx(data) { + return request.post('unbindWx', data, { useAdminUrl: true }); +} diff --git a/app/api/user.js b/app/api/user.js index 4a4c187..5093b8c 100644 --- a/app/api/user.js +++ b/app/api/user.js @@ -24,6 +24,19 @@ export function loginH5(data) { return request.post("login", data, { noAuth : true }); } +/** + * 小程序:公众号网页授权 code 换登录态(后端待对接) + * 约定 data:{ token, uid } 已绑定直接登录;{ needBind: true } 需使用账号密码绑定后再拿 token + */ +export function loginMpByGzhCode(code, spread_spid) { + void code; + void spread_spid; + // 对接后启用,并删除下方占位 reject: + // return request.get('wechat/authorize/mp_gzh_login', { code, spread_spid: spread_spid || 0 }, { noAuth: true }); + // 本地联调「需绑定」分支时可改为:return Promise.resolve({ data: { needBind: true } }); + return Promise.reject(new Error('MP_GZH_LOGIN_PENDING')); +} + /** * h5用户手机号登录 * @param data object 用户手机号 也只能 diff --git a/app/libs/wechat.js b/app/libs/wechat.js index e43a00c..db96e88 100644 --- a/app/libs/wechat.js +++ b/app/libs/wechat.js @@ -316,3 +316,35 @@ class AuthWechat { export default new AuthWechat(); // #endif + + +/** + * 小程序内打开 web-view 完成公众号网页授权,由 H5 落地页通过 postMessage 回传 { code } + * redirect_uri / appid 请按实际公众号与业务域名配置 + */ +export function wxGZHAuth() { + return new Promise((resolve, reject) => { + const redirectUri = encodeURIComponent('https://fzbfwy.com/login'); + const url = + `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx49d7d3aba9479a85&redirect_uri=${redirectUri}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect`; + uni.navigateTo({ + url: '/pages/webview/webview', + events: { + callbackData(data) { + // uni.navigateBack({ delta: 1 }); + if (data && (data.code || typeof data === 'string')) { + resolve(typeof data === 'string' ? { code: data } : data); + } else { + reject(new Error('未获取到公众号授权 code')); + } + } + }, + success(res) { + res.eventChannel.emit('acceptData', { url }); + }, + fail(err) { + reject(err || new Error('打开授权页失败')); + } + }); + }); +} \ No newline at end of file diff --git a/app/pages.json b/app/pages.json index 7cdbd00..6120da4 100644 --- a/app/pages.json +++ b/app/pages.json @@ -968,6 +968,16 @@ "navigationBarTitleText": "精品推荐" } }] + }, + { + "root": "pages/webview", + "name": "webview", + "pages": [{ + "path": "webview", + "style": { + "navigationBarTitleText": "微信授权" + } + }] } ], "globalStyle": { diff --git a/app/pages/supply_chain/complaint/HandlePopup.vue b/app/pages/supply_chain/complaint/HandlePopup.vue index 20bbd9e..95f0c67 100644 --- a/app/pages/supply_chain/complaint/HandlePopup.vue +++ b/app/pages/supply_chain/complaint/HandlePopup.vue @@ -20,7 +20,7 @@ - 反馈图片 + 处理图片 + + 领用审核 + - + - 领用物资 @@ -175,7 +171,14 @@ - + + + 审核通过 + 驳回 + 撤销审核 + + + 取消单据 查看凭证 @@ -210,11 +213,13 @@ + + \ No newline at end of file