diff --git a/src/components/RewardUs.vue b/src/components/RewardUs.vue
index 33a6792..48e4a7f 100644
--- a/src/components/RewardUs.vue
+++ b/src/components/RewardUs.vue
@@ -2,6 +2,10 @@
import { ref, reactive, watch } from "vue";
import { donateAPI } from "@/apis";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { config } = storeToRefs(store);
const props = defineProps({
show: {
@@ -13,7 +17,7 @@ const props = defineProps({
default: null,
},
});
-const amounts = [5, 20, 50, 80, 100, 200];
+const amounts = ref([]);
const selected = ref(null);
const checked = ref(false);
@@ -27,7 +31,7 @@ const formData = reactive({
const onPay = async (index) => {
selected.value = index;
const result = await donateAPI(
- 0.01,
+ amounts.value[index],
formData.name,
formData.account,
formData.organization,
@@ -60,6 +64,14 @@ const onPay = async (index) => {
}
};
+watch(
+ () => config.value.donateAmount,
+ (value) => {
+ amounts.value = value || [];
+ },
+ { immediate: true }
+);
+
watch(
() => props.show,
() => {
diff --git a/src/pages/point-book.vue b/src/pages/point-book.vue
index 11cf2f1..04490e0 100644
--- a/src/pages/point-book.vue
+++ b/src/pages/point-book.vue
@@ -31,6 +31,7 @@ const isIOS = computed(() => {
return systemInfo.osName === "ios";
});
+const loadImage = ref(true);
const showModal = ref(false);
const showTip = ref(false);
const data = ref({
@@ -75,26 +76,29 @@ const loadData = async () => {
else if (result2.checkInCount >= 5) hot = 3;
else if (result2.checkInCount === 7) hot = 4;
uni.$emit("update-hot", hot);
- try {
- const imagePath = await generateKDEHeatmapImage(
- "heatMapCanvas",
- rect.width,
- rect.height,
- result2.weekArrows
- .filter((item) => item.x && item.y)
- .map((item) => [item.x, item.y]),
- {
- range: [0, 1], // 适配0-1坐标范围
- gridSize: 150, // 更高的网格密度，减少锯齿
- bandwidth: 0.15, // 稍小的带宽，让热力图更细腻
- showPoints: false, // 显示白色原始数据点
- }
- );
- heatMapImageSrc.value = imagePath; // 存储生成的图片地址
- console.log("热力图图片地址:", imagePath);
- } catch (error) {
- console.error("生成热力图图片失败:", error);
- }
+ setTimeout(async () => {
+ try {
+ const imagePath = await generateKDEHeatmapImage(
+ "heatMapCanvas",
+ rect.width,
+ rect.height,
+ result2.weekArrows
+ .filter((item) => item.x && item.y)
+ .map((item) => [item.x, item.y]),
+ {
+ range: [0, 1], // 适配0-1坐标范围
+ gridSize: 120, // 更高的网格密度，减少锯齿
+ bandwidth: 0.15, // 稍小的带宽，让热力图更细腻
+ showPoints: false, // 显示白色原始数据点
+ }
+ );
+ heatMapImageSrc.value = imagePath; // 存储生成的图片地址
+ loadImage.value = false;
+ console.log("热力图图片地址:", imagePath);
+ } catch (error) {
+ console.error("生成热力图图片失败:", error);
+ }
+ }, 300);
};
watch(
@@ -153,7 +157,7 @@ onShareTimeline(() => {
-
+
{
周一
-
+
{
周二
-
+
{
周三
-
+
{
周四
-
+
{
周五
-
+
{
周六
-
+
{
mode="widthFix"
/>
+
+ 生成中...
+
-
+
@@ -364,6 +371,7 @@ onShareTimeline(() => {
.daily-signin > view:not(:first-child) {
background: #f8f8f8;
padding: 15rpx 8rpx;
+ box-sizing: border-box;
}
.daily-signin > view:not(:first-child) > image {
width: 32rpx;
@@ -387,6 +395,12 @@ onShareTimeline(() => {
.daily-signin > view:first-child > image {
width: 100%;
}
+.checked {
+ border: 1rpx solid #000;
+}
+.checked > text {
+ color: #333 !important;
+}
.title {
width: 100%;
display: flex;
@@ -402,13 +416,26 @@ onShareTimeline(() => {
width: calc(100vw - 70rpx);
height: calc(100vw - 70rpx);
}
-
.heat-map > image {
width: 100%;
+ height: 100%;
position: absolute;
top: 0;
left: 0;
}
+.load-image {
+ position: absolute;
+ width: 160rpx;
+ top: calc(50% - 65rpx);
+ left: calc(50% - 75rpx);
+ /* background: rgb(0 0 0 / 0.4); */
+ /* padding: 20rpx; */
+ color: #525252;
+ font-size: 20rpx;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+}
.reward {
width: 100%;
display: flex;