lufaneng
/
lift-drawing-wechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
main
Lufaneng 11 months ago
parent 2cdd13090a
commit f43fc7b4ca
7 changed files with 180 additions and 137 deletions
Show Stats Download Patch File Download Diff File

1
pages/consumption/consumption.vue
Unescape View File

@ -107,7 +107,6 @@
import { computed, onMounted, ref } from "vue"; import { computed, onMounted, ref } from "vue";
import { onShow } from "@dcloudio/uni-app"; import { onShow } from "@dcloudio/uni-app";
import { useAuthStore, useUserStore } from "@/store"; import { useAuthStore, useUserStore } from "@/store";
import { regions } from "/static/json/regions.js";
import HeaderCustom from "/components/HeaderCustom/HeaderCustom.vue"; import HeaderCustom from "/components/HeaderCustom/HeaderCustom.vue";
import RPC from "@/utils/request"; import RPC from "@/utils/request";

157
pages/login/login.vue
Unescape View File

@ -85,6 +85,9 @@
</view> </view>
</view> </view>
</uv-popup> </uv-popup>
<a style="display: none;" ref="ToLoginRef" href="weixin://dl/business/?appid=wxc504638e03981812&path=pages/login/login?from=h5ToWechat">
打开小程序并登录
</a>
</view> </view>
</template> </template>
@ -145,6 +148,8 @@
}, },
}); });
const ToLoginRef = ref(null)
const tips = ref("获取验证码"); const tips = ref("获取验证码");
const codeChange = (text) => { const codeChange = (text) => {
tips.value = text; tips.value = text;
@ -209,6 +214,9 @@
if (options.redirect && removeQueryString(options.redirect) !== LOGIN_PATH) { if (options.redirect && removeQueryString(options.redirect) !== LOGIN_PATH) {
redirect = decodeURIComponent(options.redirect); redirect = decodeURIComponent(options.redirect);
} }
if(options.from && options.from === 'h5ToWechat') {
XcxLogin()
}
}); });
// 检查运行环境 // 检查运行环境
@ -231,47 +239,60 @@
// #endif // #endif
}; };
const XcxLogin = () => {
uni.showLoading({
title: "登录中...",
});
uni.login({
success: function(loginRes) {
console.log('loginRes', loginRes);
RPC.post('/login/wechat_mini', {
js_code: loginRes.code
}).then(res => {
console.log('phonelogin', res)
authStore.setAccessToken(res.token)
userStore.setUserInfo(res.user)
if(!res.user.phone) {
uni.showToast({
title: "登录成功",
icon: "success",
});
uni.$uv.route({
type: isTabBarPath(redirect) ? "switchTab" : "redirectTo",
url: redirect,
});
} else {
popup.value.open()
}
}).catch(() => {
uni.showToast({
title: "登录失败",
icon: "error",
});
})
},
fail: () => {
uni.hideLoading();
}
})
}
// 微信登录 // 微信登录
const wechatLogin = () => { const wechatLogin = () => {
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
// 微信小程序登录 // 微信小程序登录
// uni.login({ XcxLogin()
// provider: "weixin", // popup.value.open();
// success: (loginRes) => {
// console.log("微信登录成功:", loginRes);
// // 获取用户信息
// uni.getUserProfile({
// desc: "用于完善用户资料",
// success: (userRes) => {
// console.log("获取用户信息成功:", userRes);
// // 显示绑定手机号弹窗
// showBindPhoneModal.value = true;
// },
// fail: (err) => {
// console.error("获取用户信息失败:", err);
// uni.showToast({
// title: "获取用户信息失败",
// icon: "none",
// });
// },
// });
// },
// fail: (err) => {
// console.error("微信登录失败:", err);
// uni.showToast({
// title: "微信登录失败",
// icon: "none",
// });
// },
// });
popup.value.open();
// #endif // #endif
// #ifdef H5 // #ifdef H5
// H5微信登录 // H5微信登录
if (typeof WeixinJSBridge !== "undefined") { if (typeof WeixinJSBridge !== "undefined") {
// 在微信内，使用微信JS-SDK进行授权登录 // 在微信内，使用微信JS-SDK进行授权登录
wechatH5Login(); // wechatH5Login();
ToLoginRef.value.click()
} else { } else {
uni.showToast({ uni.showToast({
title: "请在微信中打开", title: "请在微信中打开",
@ -349,7 +370,7 @@
const wechatH5Login = () => { const wechatH5Login = () => {
// #ifdef H5 // #ifdef H5
// 构建微信授权URL // 构建微信授权URL
const appId = "YOUR_WECHAT_APP_ID"; // 替换为你的微信公众号AppID const appId = "wxc504638e03981812"; // 替换为你的微信公众号AppID
const redirectUri = encodeURIComponent( const redirectUri = encodeURIComponent(
window.location.origin + "/pages/login/login" window.location.origin + "/pages/login/login"
); // 授权回调地址 ); // 授权回调地址
@ -390,32 +411,56 @@
// const result = await RPC.post('/api/wechat/h5-login', { // const result = await RPC.post('/api/wechat/h5-login', {
// code: code // code: code
// }); // });
RPC.post('/login/wechat_mini', {
js_code: loginRes.code
}).then(res => {
console.log('phonelogin', res)
authStore.setAccessToken(res.token)
userStore.setUserInfo(res.user)
if(!res.user.phone) {
uni.showToast({
title: "登录成功",
icon: "success",
});
uni.$uv.route({
type: isTabBarPath(redirect) ? "switchTab" : "redirectTo",
url: redirect,
});
} else {
popup.value.open()
}
}).catch(() => {
uni.showToast({
title: "登录失败",
icon: "error",
});
})
// 模拟获取用户信息 // 模拟获取用户信息
setTimeout(() => { // setTimeout(() => {
uni.hideLoading(); // uni.hideLoading();
// 模拟获取到的用户信息 // // 模拟获取到的用户信息
const userInfo = { // const userInfo = {
openid: "mock_openid_" + Date.now(), // openid: "mock_openid_" + Date.now(),
nickname: "微信用户", // nickname: "微信用户",
headimgurl: "/static/imgs/avatar.png", // headimgurl: "/static/imgs/avatar.png",
}; // };
console.log("微信H5登录成功，用户信息:", userInfo);
// 显示绑定手机号弹窗 // console.log("微信H5登录成功，用户信息:", userInfo);
popup.value.open();
// 清除URL中的code参数 // // 显示绑定手机号弹窗
const url = new URL(window.location); // popup.value.open();
url.searchParams.delete("code");
url.searchParams.delete("state"); // // 清除URL中的code参数
window.history.replaceState({}, // const url = new URL(window.location);
document.title, // url.searchParams.delete("code");
url.pathname + url.search // url.searchParams.delete("state");
); // window.history.replaceState({},
}, 1500); // document.title,
// url.pathname + url.search
// );
// }, 1500);
} catch (error) { } catch (error) {
uni.hideLoading(); uni.hideLoading();
console.error("微信H5登录失败:", error); console.error("微信H5登录失败:", error);
@ -559,11 +604,13 @@
onMounted(() => { onMounted(() => {
checkEnvironment(); checkEnvironment();
// #ifdef H5 // #ifdef MP-WEIXIN
// 检查是否是微信授权回调 // 检查是否是微信授权回调
const urlParams = new URLSearchParams(window.location.search); const urlParams = new URLSearchParams(window.location.search);
const code = urlParams.get("code"); const code = urlParams.get("code");
if (code && showWechatLogin.value) { const from = urlParams.get("from");
console.log('from',from)
if (from && from === 'h5') {
handleWechatH5Callback(code); handleWechatH5Callback(code);
} }

3
pages/order/order.vue
Unescape View File

@ -138,9 +138,6 @@
useAuthStore, useAuthStore,
useUserStore useUserStore
} from "@/store"; } from "@/store";
import {
regions
} from '/static/json/regions.js'
import HeaderCustom from '/components/HeaderCustom/HeaderCustom.vue' import HeaderCustom from '/components/HeaderCustom/HeaderCustom.vue'
import RPC from "@/utils/request"; import RPC from "@/utils/request";

95
pagesA/edit-profile/edit-profile.vue
Unescape View File

@ -19,30 +19,30 @@
<view class="profile-item" @click="editUsername"> <view class="profile-item" @click="editUsername">
<view class="item-label">用户名</view> <view class="item-label">用户名</view>
<view class="item-content"> <view class="item-content">
<text class="item-value">{{ userInfo.username }}</text> <text class="item-value">{{ userStore.userInfo.username }}</text>
<uv-icon name="arrow-right" size="16" color="#ccc"></uv-icon> <uv-icon name="arrow-right" size="16" color="#ccc"></uv-icon>
</view> </view>
</view> </view>
<!-- 电话 -->
<!-- <view class="profile-item" @click="editPhone">
<view class="item-label">电话</view>
<view class="item-content">
<text class="item-value">{{ userInfo.phone }}</text>
<uv-icon name="arrow-right" size="16" color="#ccc"></uv-icon>
</view>
</view> -->
<!-- 邮箱 --> <!-- 邮箱 -->
<view class="profile-item" @click="editEmail"> <view class="profile-item" @click="editEmail">
<view class="item-label">邮箱</view> <view class="item-label">邮箱</view>
<view class="item-content"> <view class="item-content">
<text class="item-value">{{ userInfo.email }}</text> <text class="item-value">{{ userStore.userInfo.email }}</text>
<uv-icon name="arrow-right" size="16" color="#ccc"></uv-icon> <uv-icon name="arrow-right" size="16" color="#ccc"></uv-icon>
</view> </view>
</view> </view>
<!-- 电话 -->
<view class="profile-item">
<view class="item-label">手机号</view>
<view class="item-content">
<text class="item-value">{{ userStore.userInfo.phone }}</text>
</view>
</view>
</view> </view>
<!-- 应用设置 --> <!-- 应用设置 -->
<view class="app-section"> <view class="app-section">
<!-- 缓存 --> <!-- 缓存 -->
@ -152,6 +152,7 @@
import { ref, onMounted } from "vue"; import { ref, onMounted } from "vue";
import { onShow } from "@dcloudio/uni-app"; import { onShow } from "@dcloudio/uni-app";
import { useAuthStore, useUserStore } from "@/store"; import { useAuthStore, useUserStore } from "@/store";
import RPC from "@/utils/request";
const authStore = useAuthStore(); const authStore = useAuthStore();
const userStore = useUserStore(); const userStore = useUserStore();
@ -219,21 +220,21 @@ const selectAvatarSource = (source) => {
// 编辑用户名 // 编辑用户名
const editUsername = () => { const editUsername = () => {
editType.value = "username"; editType.value = "username";
editValue.value = userInfo.value.username; editValue.value = userStore.userInfo.username;
editPopup.value.open(); editPopup.value.open();
}; };
// 编辑电话 // 编辑电话
const editPhone = () => { const editPhone = () => {
editType.value = "phone"; editType.value = "phone";
editValue.value = userInfo.value.phone; editValue.value = userStore.userInfo.phone;
editPopup.value.open(); editPopup.value.open();
}; };
// 编辑邮箱 // 编辑邮箱
const editEmail = () => { const editEmail = () => {
editType.value = "email"; editType.value = "email";
editValue.value = userInfo.value.email; editValue.value = userStore.userInfo.email;
editPopup.value.open(); editPopup.value.open();
}; };
@ -267,49 +268,49 @@ const saveEdit = async () => {
}); });
return; return;
} }
if(editType.value === 'username') {
// 验证格式 RPC.post('/user/update',{id:userStore.userInfo.id,username:editValue.value}).then(() => {
if (editType.value === "phone" && !/^1[3-9]\d{9}$/.test(editValue.value)) {
uni.showToast({ uni.showToast({
title: "请输入正确的手机号", title: "保存成功",
icon: "none", icon: "success",
}); });
return; userStore.setUserInfo({...userStore.userInfo,username:editValue.value})
closeEditModal()
})
} }
if(editType.value === 'email') {
if ( RPC.post('/user/update',{id:userStore.userInfo.id,email:editValue.value}).then(() => {
editType.value === "email" &&
!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(editValue.value)
) {
uni.showToast({ uni.showToast({
title: "请输入正确的邮箱地址", title: "保存成功",
icon: "none", icon: "success",
}); });
return; userStore.setUserInfo({...userStore.userInfo,email:editValue.value})
closeEditModal()
})
} }
try { // try {
// 调用更新用户信息API // // 调用更新用户信息API
// await RPC.post('/api/user/update', { // // await RPC.post('/api/user/update', {
// [editType.value]: editValue.value // // [editType.value]: editValue.value
// }) // // })
// 更新本地数据 // // 更新本地数据
userInfo.value[editType.value] = editValue.value; // userInfo.value[editType.value] = editValue.value;
uni.showToast({ // uni.showToast({
title: "保存成功", // title: "保存成功",
icon: "success", // icon: "success",
}); // });
closeEditModal(); // closeEditModal();
} catch (error) { // } catch (error) {
console.error("保存失败:", error); // console.error("保存失败:", error);
uni.showToast({ // uni.showToast({
title: "保存失败，请重试", // title: "保存失败，请重试",
icon: "none", // icon: "none",
}); // });
} // }
}; };
// 清除缓存 // 清除缓存

10
pagesA/generate-record/generate-record.vue
Unescape View File

@ -125,16 +125,16 @@ const downloadRecord = (record) => {
icon: "success", icon: "success",
}); });
// #endif // #endif
// #ifdef MP-WEIXIN
// #ifndef H5
// 小程序和App端使用uni.downloadFile // 小程序和App端使用uni.downloadFile
uni.downloadFile({ uni.downloadFile({
url: record.result_url, url: 'https://ksdt-1255846884.cos.ap-shanghai.myqcloud.com/lift-result/2025/09/24/d6180add4cd94875a1854a4febce8966.pdf',
success: (res) => { success: (res) => {
console.log(res); console.log(res);
if (res.statusCode === 200) { if (res.statusCode === 200) {
uni.saveFile({ uni.openDocument({
tempFilePath: res.tempFilePath, filePath: res.tempFilePath,
showMenu: true,
success: () => { success: () => {
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({

12
pagesA/recharge/recharge.vue
Unescape View File

@ -25,7 +25,7 @@
@click="selectAmount(item.value)" @click="selectAmount(item.value)"
> >
<view class="amount-value">¥{{ item.value }}</view> <view class="amount-value">¥{{ item.value }}</view>
<view v-if="item.bonus" class="amount-bonus">送{{ item.bonus }}元</view> <!-- <view v-if="item.bonus" class="amount-bonus">送{{ item.bonus }}元</view> -->
</view> </view>
</view> </view>
@ -116,7 +116,7 @@
<view class="bottom-section"> <view class="bottom-section">
<view class="recharge-info"> <view class="recharge-info">
<text class="recharge-text">充值金额：¥{{ finalAmount }}</text> <text class="recharge-text">充值金额：¥{{ finalAmount }}</text>
<text v-if="bonusAmount > 0" class="bonus-text">（含赠送¥{{ bonusAmount }}）</text> <!-- <text v-if="bonusAmount > 0" class="bonus-text">（含赠送¥{{ bonusAmount }}）</text> -->
</view> </view>
<uv-button <uv-button
type="primary" type="primary"
@ -152,10 +152,10 @@ const showAlipay = ref(true);
const rechargeAmounts = ref([ const rechargeAmounts = ref([
{ value: 10, bonus: 0 }, { value: 10, bonus: 0 },
{ value: 50, bonus: 0 }, { value: 50, bonus: 0 },
{ value: 100, bonus: 5 }, { value: 100, bonus: 0 },
{ value: 200, bonus: 15 }, { value: 200, bonus: 0 },
{ value: 500, bonus: 50 }, { value: 500, bonus: 0 },
{ value: 1000, bonus: 120 } { value: 1000, bonus: 0 }
]); ]);
// 计算最终充值金额 // 计算最终充值金额

1
static/json/regions.js
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save