From 681efe897b7fb4dbe8bec5fa5056209e3e0edfdc Mon Sep 17 00:00:00 2001
From: Liuyi <candymxq888@outlook.com>
Date: 星期三, 20 十一月 2024 17:19:57 +0800
Subject: [PATCH] 添加积分商品详情，替换首页海报，调整样式，添加积分规则
---
unpackage/dist/dev/mp-weixin/pages/index/index.js | 146 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 111 insertions(+), 35 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..dd3a6a9 100644
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js
@@ -17,6 +17,7 @@
userName: "微信用户",
headImg: "",
userPhone: "",
+ integral: "",
waterCardNumber: "",
balance: "",
count: "",
@@ -33,6 +34,7 @@
async function getVipInfo() {
await api_index.getVipInfoApi().then((res) => {
if (res.code == 200 && res.data.id) {
+ console.log("获取会员卡返回响应-首页", res);
cardInfo.value.waterCardNumber = res.data.cardNumber;
cardInfo.value.cardType = res.data.cardType;
cardInfo.value.state = res.data.state == 2 ? true : false;
@@ -54,6 +56,7 @@
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();
@@ -186,13 +189,77 @@
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 () => {
getTopHeight();
await getInfo();
+ await getUserLocation();
+ console.log("进入首页了");
});
common_vendor.onShow(async () => {
getTopHeight();
@@ -214,50 +281,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$3
}, {
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,
- j: isShareCard.value
+ h: common_assets._imports_0$2,
+ i: isShareCard.value
}, isShareCard.value ? {
- k: common_vendor.t(cardInfo.value.waterCardNumber)
+ j: common_vendor.t(cardInfo.value.waterCardNumber)
} : {}, {
- l: !isShareCard.value
+ k: !isShareCard.value
}, !isShareCard.value ? common_vendor.e({
- m: isVip.value
+ l: isVip.value
}, isVip.value ? {
- n: common_assets._imports_4
+ m: common_assets._imports_3
} : {}, {
- o: isLoss.value && isVip.value
- }, isLoss.value && isVip.value ? {} : {}, {
- p: isVip.value
- }, isVip.value ? {
- q: common_vendor.t(cardInfo.value.waterCardNumber)
- } : {}, {
- r: isVip.value
+ n: isVip.value
}, isVip.value ? {} : {}, {
- s: !isVip.value
+ o: !isVip.value
}, !isVip.value ? {} : {}, {
+ p: isLoss.value && isVip.value
+ }, isLoss.value && isVip.value ? {} : {}, {
+ q: isVip.value
+ }, isVip.value ? {
+ r: common_vendor.t(cardInfo.value.waterCardNumber)
+ } : {}, {
+ s: isVip.value
+ }, isVip.value ? {} : {}, {
t: isVip.value
}, isVip.value ? {
v: common_vendor.t(cardInfo.value.balance)
} : {}, {
- w: isVip.value
+ w: !isVip.value
+ }, !isVip.value ? {
+ x: common_assets._imports_4,
+ y: common_vendor.o(($event) => navTo("/pages/addCard/index"))
+ } : {}, {
+ z: isVip.value
}, isVip.value ? {
- x: common_vendor.o(($event) => navTo("/pages/recharge/index"))
+ A: common_vendor.o(($event) => navTo("/pages/recharge/index"))
} : {}) : {}, {
- y: topHeight.value + "rpx",
- 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) => {
+ B: topHeight.value + "rpx",
+ C: common_assets._imports_5,
+ D: common_vendor.o(upGrade),
+ E: common_assets._imports_1,
+ F: common_vendor.o(($event) => navTo("/pages/facilityList/index")),
+ G: common_assets._imports_7,
+ H: common_vendor.o(($event) => toScan()),
+ I: common_vendor.f(functionList.value, (item, index, i0) => {
return {
a: item.icon,
b: item.bgColor,
@@ -266,14 +339,17 @@
e: 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"))
+ J: common_assets._imports_8,
+ K: common_assets._imports_9,
+ L: common_assets._imports_10,
+ M: common_assets._imports_11,
+ N: common_vendor.o(($event) => navTo("/pages/pointsMall/index")),
+ O: common_assets._imports_12,
+ P: common_assets._imports_13,
+ Q: common_vendor.o(($event) => navTo("/pages/station/index")),
+ R: common_assets._imports_14,
+ S: common_assets._imports_13,
+ T: common_vendor.o(upGrade)
});
};
}
--
Gitblit v1.9.3