From d470e67ac1997882502b75cbfdaf359626cfaaa8 Mon Sep 17 00:00:00 2001
From: Liuyi <candymxq888@outlook.com>
Date: 星期五, 20 十二月 2024 17:27:07 +0800
Subject: [PATCH] 测试修复小程序问题，添加水控机设备
---
unpackage/dist/dev/mp-weixin/pages/index/index.js | 188 +++++++++++++++++++++++++++++++---------------
1 files changed, 125 insertions(+), 63 deletions(-)
diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js
index 67bbf93..2376f8f 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -13,10 +13,12 @@
}
}
const cardInfo = common_vendor.ref({
+ //用户档案信息
id: "",
userName: "微信用户",
headImg: "",
userPhone: "",
+ integral: "",
waterCardNumber: "",
balance: "",
count: "",
@@ -32,6 +34,7 @@
const isShareCard = common_vendor.ref(false);
async function getVipInfo() {
await api_index.getVipInfoApi().then((res) => {
+ console.log("会员卡信息响应", res);
if (res.code == 200 && res.data.id) {
cardInfo.value.waterCardNumber = res.data.cardNumber;
cardInfo.value.cardType = res.data.cardType;
@@ -45,19 +48,21 @@
cardInfo.value.count = res.data.count;
}
isVip.value = true;
- console.log("cardInfo", cardInfo.value, "isShareCard.value", isShareCard.value);
+ console.log("会员卡及用户信息", cardInfo.value);
}
});
}
async function getInfo() {
await api_index.getUserInfo().then(async (res) => {
+ console.log("用户信息响应", res);
if (res.code == 200) {
cardInfo.value.userName = res.data.userInfo.userName ? res.data.userInfo.userName : cardInfo.value.userName;
cardInfo.value.headImg = res.data.userInfo.headImg;
+ cardInfo.value.integral = res.data.userInfo.integral;
cardInfo.value.userPhone = res.data.userInfo.userPhone;
cardInfo.value.id = res.data.userInfo.id;
await getVipInfo();
- console.log("00000", cardInfo.value);
+ console.log("用户信息", cardInfo.value);
common_vendor.index.setStorageSync("userInfo", JSON.stringify(cardInfo.value));
}
});
@@ -66,22 +71,24 @@
common_vendor.index.scanCode({
scanType: ["qrCode"],
success: async function(res) {
- console.log("条码内容：" + res.result);
+ let code = res.result.split("=")[1];
+ console.log("条码内容：" + res.result, "code", code);
common_vendor.index.navigateTo({
- url: `/pages/scanWater/index?facilityCode=${res.result}`
+ url: `/pages/scanWater/index?facilityCode=${code}`
});
}
});
}
const functionList = common_vendor.ref([
- { text: "余额记录", icon: "../../static/images/index/icon31.png", bgColor: "#16b387", url: "/pages/functionList/balanceRecord/index", isUrl: 1 },
- { text: "消费记录", icon: "../../static/images/index/icon32.png", bgColor: "#329ae8", url: "/pages/functionList/paymentRecord/index", isUrl: 1 },
- { text: "充值记录", icon: "../../static/images/index/icon33.png", bgColor: "#f0a50e", url: "/pages/functionList/rechargeRecord/index", isUrl: 1 },
- { text: "水卡共享", icon: "../../static/images/index/icon34.png", bgColor: "#55ca8c", url: "/pages/functionList/share/cardShare/index", isUrl: 1 },
- { text: "故障上报", icon: "../../static/images/index/icon35.png", bgColor: "#a88ff1", url: "/pages/infoBreakdown/index", isUrl: 1 },
- { text: "优惠卷", icon: "../../static/images/index/icon36.png", bgColor: "#18bfc4", url: "", isUrl: 4 },
- { text: "会员卡挂失", icon: "../../static/images/index/icon37.png", bgColor: "#4875f0", url: "", isUrl: 2 },
- { text: "会员卡解绑", icon: "../../static/images/index/icon38.png", bgColor: "#f45088", url: "", isUrl: 3 }
+ //isUrl:1:页面跳转，2：弹窗功能，3：弹窗功能，4：未开发
+ { text: "余额记录", icon: "../../static/images/index/icon31.png", url: "/pages/functionList/balanceRecord/index", isUrl: 1 },
+ { text: "消费记录", icon: "../../static/images/index/icon32.png", url: "/pages/functionList/paymentRecord/index", isUrl: 1 },
+ { text: "充值记录", icon: "../../static/images/index/icon33.png", url: "/pages/functionList/rechargeRecord/index", isUrl: 1 },
+ { text: "水卡共享", icon: "../../static/images/index/icon34.png", url: "/pages/functionList/share/cardShare/index", isUrl: 1 },
+ { text: "故障上报", icon: "../../static/images/index/icon35.png", url: "/pages/infoBreakdown/index", isUrl: 1 },
+ { text: "优惠卷", icon: "../../static/images/index/icon36.png", url: "", isUrl: 4 },
+ { text: "卡挂失", icon: "../../static/images/index/icon37.png", url: "", isUrl: 2 },
+ { text: "卡解绑", icon: "../../static/images/index/icon38.png", url: "", isUrl: 3 }
]);
function navTo(itemUrl) {
if (itemUrl) {
@@ -144,7 +151,7 @@
content: "确认注销会员卡？",
success: async function(res) {
if (res.confirm) {
- await api_index.removeCardApi(cardInfo.value.waterCardNumber).then(async (res2) => {
+ await api_index.removeBindingApi(cardInfo.value.waterCardNumber).then(async (res2) => {
if (res2.code == 200) {
common_vendor.index.showToast({
title: "已注销",
@@ -186,26 +193,91 @@
function upGrade() {
common_vendor.index.showToast({
title: "该功能正在升级中！",
- duration: 2e3,
+ duration: 1e3,
icon: "none"
});
}
+ let userLocation = {
+ lat: "",
+ lon: ""
+ };
+ function getUserLocation() {
+ common_vendor.index.authorize({
+ scope: "scope.userLocation",
+ success() {
+ console.log("成功授权位置信息1");
+ storageLocation();
+ },
+ fail() {
+ console.log("用户拒绝授权位置信息，再次提示用户授权");
+ showToast();
+ }
+ });
+ function storageLocation() {
+ common_vendor.index.getLocation({
+ type: "gcj02",
+ isHighAccuracy: true,
+ success: (res) => {
+ userLocation.lat = res.latitude;
+ userLocation.lon = res.longitude;
+ common_vendor.index.setStorageSync("userLocation", JSON.stringify(userLocation));
+ },
+ fail: () => {
+ showToast();
+ }
+ });
+ }
+ function showToast() {
+ common_vendor.index.showModal({
+ title: "请求授权当前位置",
+ content: "请求获取您的位置，加载附近饮水设备信息！",
+ confirmText: "前往设置",
+ success: (res) => {
+ if (res.confirm) {
+ common_vendor.index.openSetting({
+ success: (res1) => {
+ if (res1.authSetting["scope.userLocation"]) {
+ console.log("用户二次授权成功");
+ setTimeout(() => {
+ storageLocation();
+ }, 1e3);
+ } else {
+ showToast();
+ console.log("用户拒绝授权");
+ }
+ }
+ });
+ } else {
+ common_vendor.index.showToast({
+ title: "请先授权！",
+ duration: 2e3,
+ icon: "none"
+ });
+ showToast();
+ }
+ }
+ });
+ }
+ }
common_vendor.onMounted(async () => {
+ console.log("空用户信息", cardInfo.value);
+ common_vendor.index.setStorageSync("userInfo", JSON.stringify(cardInfo.value));
getTopHeight();
await getInfo();
+ await getUserLocation();
+ console.log("onMounted", "用户存储本地数据", JSON.parse(common_vendor.index.getStorageSync("userInfo")));
});
common_vendor.onShow(async () => {
getTopHeight();
await getInfo();
+ console.log("onShow", "用户存储本地数据", JSON.parse(common_vendor.index.getStorageSync("userInfo")));
});
common_vendor.index.showShareMenu({
withShareTicket: true,
menus: ["shareAppMessage", "shareTimeline"],
success: function() {
- console.log("分享菜单显示成功");
},
fail: function(err) {
- console.error("分享菜单显示失败", err);
}
});
return (_ctx, _cache) => {
@@ -214,66 +286,56 @@
}, cardInfo.value.headImg ? {
b: common_vendor.unref(config_baseUrl.BASE_URL) + "/upload" + cardInfo.value.headImg
} : {
- c: common_assets._imports_0$2
+ c: common_assets._imports_0$4
}, {
d: common_vendor.t(cardInfo.value.userName),
e: common_vendor.o(($event) => navTo("/pages/userInfo/index")),
f: common_vendor.o(($event) => navTo("/pages/userInfo/index")),
- g: common_assets._imports_1$1,
- h: common_assets._imports_2,
- i: common_assets._imports_0$1,
+ g: common_assets._imports_1$2,
+ h: common_assets._imports_0$3,
+ i: isVip.value
+ }, isVip.value ? common_vendor.e({
j: isShareCard.value
- }, isShareCard.value ? {
- k: common_vendor.t(cardInfo.value.waterCardNumber)
- } : {}, {
+ }, isShareCard.value ? common_vendor.e({
+ k: isLoss.value
+ }, isLoss.value ? {} : {}) : {}, {
l: !isShareCard.value
}, !isShareCard.value ? common_vendor.e({
- m: isVip.value
- }, isVip.value ? {
- n: common_assets._imports_4
- } : {}, {
- o: isLoss.value && isVip.value
- }, isLoss.value && isVip.value ? {} : {}, {
- p: isVip.value
- }, isVip.value ? {
- q: common_vendor.t(cardInfo.value.waterCardNumber)
- } : {}, {
- r: isVip.value
- }, isVip.value ? {} : {}, {
- s: !isVip.value
- }, !isVip.value ? {} : {}, {
- t: isVip.value
- }, isVip.value ? {
- v: common_vendor.t(cardInfo.value.balance)
- } : {}, {
- w: isVip.value
- }, isVip.value ? {
- x: common_vendor.o(($event) => navTo("/pages/recharge/index"))
+ m: isLoss.value
+ }, isLoss.value ? {} : {}) : {}, {
+ n: common_vendor.t(cardInfo.value.waterCardNumber),
+ o: common_vendor.t(cardInfo.value.balance),
+ p: !isShareCard.value
+ }, !isShareCard.value ? {
+ q: common_vendor.o(($event) => navTo("/pages/recharge/index"))
} : {}) : {}, {
- y: topHeight.value + "rpx",
+ r: !isVip.value
+ }, !isVip.value ? {
+ s: common_vendor.o(($event) => navTo("/pages/addCard/index"))
+ } : {}, {
+ t: topHeight.value + "rpx",
+ v: common_assets._imports_3$1,
+ w: common_vendor.o(upGrade),
+ x: common_assets._imports_1$1,
+ y: common_vendor.o(($event) => navTo("/pages/facilityList/index")),
z: common_assets._imports_5,
- A: common_vendor.o(($event) => navTo("/pages/sendWater/index")),
- B: common_assets._imports_1,
- C: common_vendor.o(($event) => navTo("/pages/facilityList/index")),
- D: common_assets._imports_7,
- E: common_vendor.o(($event) => toScan()),
- F: common_vendor.f(functionList.value, (item, index, i0) => {
+ A: common_vendor.o(($event) => toScan()),
+ B: common_vendor.f(functionList.value, (item, index, i0) => {
return {
a: item.icon,
- b: item.bgColor,
- c: common_vendor.t(item.text),
- d: common_vendor.o(($event) => setEvent(item.isUrl, item.url), index),
- e: index
+ b: common_vendor.t(item.text),
+ c: common_vendor.o(($event) => setEvent(item.isUrl, item.url), index),
+ d: index
};
}),
- G: common_assets._imports_8,
- H: common_vendor.o(upGrade),
- I: common_assets._imports_9,
- J: common_assets._imports_10,
- K: common_vendor.o(($event) => navTo("/pages/station/index")),
- L: common_assets._imports_11,
- M: common_assets._imports_10,
- N: common_vendor.o(($event) => navTo("/pages/counterRecharge/index"))
+ C: common_assets._imports_6,
+ D: common_vendor.o(($event) => navTo("/pagesPoints/pointsMall/index")),
+ E: common_assets._imports_7,
+ F: common_assets._imports_8,
+ G: common_vendor.o(($event) => navTo("/pages/station/index")),
+ H: common_assets._imports_9,
+ I: common_assets._imports_8,
+ J: common_vendor.o(upGrade)
});
};
}
--
Gitblit v1.9.3