Compare commits
5 Commits
v1.0.10-beta
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
| 558e1380db | |||
| 1b9602f66b | |||
| a071f760d3 | |||
| 445d428d8b | |||
| bbbd386e1e |
+2
-2
@@ -42,8 +42,8 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. 检查 URL 中是否有授权回调的 code
|
// 3. 检查 URL 中是否有授权回调的 code(支付宝用 auth_code,微信用 code)
|
||||||
const code = urlParams.get('code');
|
const code = urlParams.get('code') || urlParams.get('auth_code');
|
||||||
|
|
||||||
if (code) {
|
if (code) {
|
||||||
// 有 code → 进入授权 Loading 页处理
|
// 有 code → 进入授权 Loading 页处理
|
||||||
|
|||||||
@@ -67,6 +67,7 @@ export default {
|
|||||||
|
|
||||||
if (this.action === 'userinfo') {
|
if (this.action === 'userinfo') {
|
||||||
// 获取用户信息流程
|
// 获取用户信息流程
|
||||||
|
this.statusText = '正在获取用户信息...';
|
||||||
if (code) {
|
if (code) {
|
||||||
this.handleUserInfoCallback(code);
|
this.handleUserInfoCallback(code);
|
||||||
} else {
|
} else {
|
||||||
@@ -307,8 +308,8 @@ export default {
|
|||||||
window.location.origin.replace(/^http:/, 'https:') + window.location.pathname
|
window.location.origin.replace(/^http:/, 'https:') + window.location.pathname
|
||||||
);
|
);
|
||||||
|
|
||||||
// 用户信息授权:微信用 snsapi_userinfo,支付宝用 auth_userinfo
|
// 用户信息授权:微信用 snsapi_userinfo,支付宝用 auth_user
|
||||||
const scopes = platform === 'alipay' ? 'auth_userinfo' : 'snsapi_userinfo';
|
const scopes = platform === 'alipay' ? 'auth_user' : 'snsapi_userinfo';
|
||||||
|
|
||||||
// 构建 state(包含 action 和 device_id,回调时原样回传)
|
// 构建 state(包含 action 和 device_id,回调时原样回传)
|
||||||
const stateObj = { action: 'userinfo' };
|
const stateObj = { action: 'userinfo' };
|
||||||
|
|||||||
@@ -350,9 +350,9 @@ export default {
|
|||||||
stateObj.device_id = this.deviceId;
|
stateObj.device_id = this.deviceId;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 用户信息授权:微信用 snsapi_userinfo,支付宝用 auth_userinfo
|
// 用户信息授权:微信用 snsapi_userinfo,支付宝用 auth_user
|
||||||
const platform = uni.getStorageSync('platform') || 'wechat';
|
const platform = uni.getStorageSync('platform') || 'wechat';
|
||||||
const scopes = platform === 'alipay' ? 'auth_userinfo' : 'snsapi_userinfo';
|
const scopes = platform === 'alipay' ? 'auth_user' : 'snsapi_userinfo';
|
||||||
|
|
||||||
const res = await gatewayGet('/api/v1/user/auth/url', {
|
const res = await gatewayGet('/api/v1/user/auth/url', {
|
||||||
app_no: appNo,
|
app_no: appNo,
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
<!-- 数量统计和筛选 -->
|
<!-- 数量统计和筛选 -->
|
||||||
<view class="filter-bar">
|
<view class="filter-bar">
|
||||||
<text class="total-count">总数量: {{ filteredOrders.length }}</text>
|
<text class="total-count">总数量: {{ total }}</text>
|
||||||
<view class="search-btn" @click="showFilterSidebar = true">
|
<view class="search-btn" @click="showFilterSidebar = true">
|
||||||
<text class="search-icon">🔍</text>
|
<text class="search-icon">🔍</text>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
Reference in New Issue
Block a user