新增分享页，以及BUG修复

src/components/EditOption.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch, onMounted } from "vue";
+import { ref, watch, onMounted, computed } from "vue";
 import { getPointBookConfigAPI } from "@/apis";
 const props = defineProps({
   itemIndex: {
@@ -34,6 +34,11 @@ const groupArrows = [3, 6, 12, 18];
 const data = ref([]);
 const selectedIndex = ref(-1);
 const secondSelectIndex = ref(-1);
+
+const meter = ref("");
+const sets = ref("");
+const arrowAmount = ref("");
+
 const onSelectItem = (index) => {
   selectedIndex.value = index;
   if (props.itemIndex === 0) {
@@ -42,11 +47,13 @@ const onSelectItem = (index) => {
     props.onSelect(props.itemIndex, distances[index]);
   } else if (props.itemIndex === 2) {
     props.onSelect(props.itemIndex, data.value[index]);
-  } else if (props.itemIndex === 3 && secondSelectIndex.value !== -1) {
+  } else if (props.itemIndex === 3) {
-    props.onSelect(
+    if (secondSelectIndex.value !== -1) {
-      props.itemIndex,
+      props.onSelect(
-      `${selectedIndex.value}/${groupArrows[secondSelectIndex.value]}`
+        props.itemIndex,
-    );
+        `${selectedIndex.value}/${groupArrows[secondSelectIndex.value]}`
+      );
+    }
   }
 };
 const onSelectSecondItem = (index) => {
@@ -54,36 +61,39 @@ const onSelectSecondItem = (index) => {
   if (selectedIndex.value !== -1) {
     props.onSelect(
       props.itemIndex,
-      `${selectedIndex.value}/${groupArrows[secondSelectIndex.value]}`
+      `${selectedIndex.value < 5 ? selectedIndex.value : sets.value}/${
-    );
+        groupArrows[secondSelectIndex.value]
-  }
+      }`
-};
+    );
-const meter = ref("");
+  }
-const onMeterChange = (e) => {
+};
-  meter.value = e.detail.value;
+const onMeterChange = (e) => {
-  props.onSelect(props.itemIndex, e.detail.value);
+  meter.value = e.detail.value;
-};
+  props.onSelect(props.itemIndex, e.detail.value);
-const sets = ref(null);
+};
-const onSetsChange = (e) => {
+const onSetsChange = (e) => {
-  sets.value = e.detail.value;
+  sets.value = e.detail.value;
-  if (!sets.value) return;
+  if (!sets.value) return;
-  if (arrowAmount.value || groupArrows[secondSelectIndex.value]) {
+  if (secondSelectIndex.value !== -1) {
-    props.onSelect(
+    props.onSelect(
-      props.itemIndex,
+      props.itemIndex,
-      `${e.detail.value}/${
+      `${sets.value}/${
-        arrowAmount.value || groupArrows[secondSelectIndex.value]
+        secondSelectIndex === 99
+          ? arrowAmount.value
+          : groupArrows[secondSelectIndex.value]
       }`
     );
   }
 };
-const arrowAmount = ref("");
 const onArrowAmountChange = (e) => {
   arrowAmount.value = e.detail.value;
   if (!arrowAmount.value) return;
-  if (sets.value || selectedIndex.value !== -1) {
+  if (selectedIndex.value !== -1) {
     props.onSelect(
       props.itemIndex,
-      `${sets.value || selectedIndex.value}/${e.detail.value}`
+      `${selectedIndex.value === 99 ? sets.value : selectedIndex.value}/${
+        arrowAmount.value
+      }`
     );
   }
 };
@@ -138,6 +148,15 @@ const loadConfig = () => {
     }
   }
 };
+const formatSetAndAmount = computed(() => {
+  if (selectedIndex.value === -1 || secondSelectIndex.value === -1)
+    return itemTexts[props.itemIndex];
+  return `${selectedIndex.value === 99 ? sets.value : selectedIndex.value}组/${
+    secondSelectIndex.value === 99
+      ? arrowAmount.value
+      : groupArrows[secondSelectIndex.value]
+  }箭`;
+});
 onMounted(async () => {
   const config = uni.getStorageSync("point-book-config");
   if (config) {
@@ -173,9 +192,7 @@ onMounted(async () => {
           value || itemTexts[itemIndex]
         }}</text>
         <text :style="{ opacity: expand ? 0 : 1 }" v-if="itemIndex === 3">{{
-          selectedIndex !== -1 && secondSelectIndex !== -1
+          formatSetAndAmount
-            ? `${selectedIndex}组/${groupArrows[secondSelectIndex]}箭`
-            : itemTexts[itemIndex]
         }}</text>
       </block>
       <button hover-class="none">
@@ -218,7 +235,6 @@ onMounted(async () => {
         }"
       >
         <input
-          v-model="meter"
           placeholder="自定义"
           placeholder-style="color: #DDDDDD"
           @focus="() => (selectedIndex = 9)"
@@ -255,15 +271,14 @@ onMounted(async () => {
         </view>
         <view
           :style="{
-            borderColor: selectedIndex === 5 ? '#fed847' : '#eeeeee',
+            borderColor: selectedIndex === 99 ? '#fed847' : '#eeeeee',
           }"
         >
           <input
-            v-model="sets"
             placeholder="自定义"
             type="number"
             placeholder-style="color: #DDDDDD"
-            @focus="() => (selectedIndex = 5)"
+            @focus="() => (selectedIndex = 99)"
             @change="onSetsChange"
           />
           <text>组</text>
@@ -287,15 +302,14 @@ onMounted(async () => {
         </view>
         <view
           :style="{
-            borderColor: secondSelectIndex === 4 ? '#fed847' : '#eeeeee',
+            borderColor: secondSelectIndex === 99 ? '#fed847' : '#eeeeee',
           }"
         >
           <input
-            v-model="arrowAmount"
             placeholder="自定义"
             type="number"
             placeholder-style="color: #DDDDDD"
-            @focus="() => (secondSelectIndex = 4)"
+            @focus="() => (secondSelectIndex = 99)"
             @change="onArrowAmountChange"
           />
           <text>箭</text>

src/components/PointRecord.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from "vue";
+import { ref, onMounted, computed } from "vue";
 
 const props = defineProps({
   data: {
@@ -8,13 +8,16 @@ const props = defineProps({
   },
   onRemove: {
     type: Function,
-    default: () => {},
+    default: null,
   },
 });
 const bowOptions = ref({});
 const targetOptions = ref({});
 // 使用插槽自定义右侧按钮为图标，若需要文字按钮可恢复 rightOptions
 
+// 根据是否传入 onRemove 来决定是否允许左滑
+const canSwipe = computed(() => typeof props.onRemove === "function");
+
 const toDetailPage = () => {
   uni.navigateTo({
     url: `/pages/point-book-detail?id=${props.data.id}`,
@@ -38,12 +41,14 @@ const onSwipeActionClick = () => {
 
 <template>
   <uni-swipe-action>
-    <uni-swipe-action-item
+    <uni-swipe-action-item :disabled="!canSwipe" @change="() => {}">
-      @change="() => {}"
+      <template v-slot:right v-if="canSwipe">
-    >
-      <template v-slot:right>
         <view class="swipe-right" @click="onSwipeActionClick">
-          <image class="swipe-icon" src="../static/delete-white.png" mode="widthFix" />
+          <image
+            class="swipe-icon"
+            src="../static/delete-white.png"
+            mode="widthFix"
+          />
         </view>
       </template>
       <view class="container" @click="toDetailPage">

src/pages.json

@@ -36,6 +36,9 @@
     {
       "path": "pages/point-book-detail"
     },
+    {
+      "path": "pages/point-book-detail-share"
+    },
     {
       "path": "pages/match-page"
     },

src/pages/point-book-detail-share.vue

@@ -0,0 +1,430 @@
+<script setup>
+import { ref, computed } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
+import SButton from "@/components/SButton.vue";
+import BowTargetEdit from "@/components/BowTargetEdit.vue";
+import ScreenHint2 from "@/components/ScreenHint2.vue";
+import RingBarChart from "@/components/RingBarChart.vue";
+import { getPointBookDetailAPI, getPointBookConfigAPI } from "@/apis";
+
+const selectedIndex = ref(0);
+const showTip = ref(false);
+const showTip2 = ref(false);
+const data = ref({});
+const targetId = ref(0);
+const targetSrc = ref("");
+const arrows = ref([]);
+const record = ref({
+  groups: [],
+  user: {},
+});
+const bowConfig = ref({});
+
+const paddingTop = computed(() => {
+  const menuBtnInfo = uni.getMenuButtonBoundingClientRect();
+  return menuBtnInfo.top - 9 - 9;
+});
+
+const openTip = (index) => {
+  if (index === 1) showTip.value = true;
+  else if (index === 2) showTip2.value = true;
+};
+
+const closeTip = () => {
+  showTip.value = false;
+  showTip2.value = false;
+};
+
+const goBack = () => {
+  const pages = getCurrentPages();
+  if (pages.length > 1) {
+    const currentPage = pages[pages.length - 2];
+    uni.navigateBack({
+      delta: currentPage.route === "pages/point-book" ? 1 : 2,
+    });
+  } else {
+    uni.redirectTo({
+      url: "/pages/index",
+    });
+  }
+};
+
+const goHome = () => {
+  uni.redirectTo({
+    url: "/pages/point-book",
+  });
+};
+
+const ringRates = computed(() => {
+  const rates = new Array(12).fill(0);
+  arrows.value.forEach((item) => {
+    if (item.ring === -1) rates[11] += 1;
+    else rates[item.ring] += 1;
+  });
+  return rates.map((r) => r / arrows.value.length);
+});
+
+onLoad(async (options) => {
+  if (options.id) {
+    const result = await getPointBookDetailAPI(options.id || 183);
+    record.value = result;
+    const config = await getPointBookConfigAPI();
+    bowConfig.value = config;
+    config.targetOption.some((item) => {
+      if (item.id === result.targetType) {
+        targetId.value = item.id;
+        targetSrc.value = item.icon;
+      }
+    });
+    if (result.groups) {
+      data.value = result.groups[0];
+      arrows.value = result.groups[0].list;
+    }
+  }
+});
+
+const bowOptionName = computed(() => {
+  if (bowConfig.value.bowOption && record.value.bowType) {
+    const data = bowConfig.value.bowOption.find(
+      (b) => b.id === record.value.bowType
+    );
+    if (data) return data.name || "";
+  }
+  return "";
+});
+
+const targetTypeName = computed(() => {
+  if (bowConfig.value.targetOption && record.value.targetType) {
+    const data = bowConfig.value.targetOption.find(
+      (b) => b.id === record.value.targetType
+    );
+    if (data) return data.name || "";
+  }
+  return "";
+});
+</script>
+
+<template>
+  <view class="container" :style="{ paddingTop: paddingTop + 'px' }">
+    <image
+      src="../static/app-bg5.png"
+      class="bg-image"
+      mode="aspectFill"
+      :style="{ height: paddingTop + 60 + 'px' }"
+    />
+    <view class="header">
+      <image
+        :src="record.user.avatar || '../static/user-icon.png'"
+        mode="widthFix"
+        class="avatar"
+      />
+      <view>
+        <text>{{ record.user.name }}</text>
+        <view class="point-book-info">
+          <text v-if="bowOptionName">{{ bowOptionName }}</text>
+          <text>{{ record.distance }} 米</text>
+          <text v-if="targetTypeName">{{ targetTypeName }}</text>
+        </view>
+      </view>
+    </view>
+    <view class="detail-data">
+      <view>
+        <view
+          :style="{ display: 'flex', alignItems: 'center' }"
+          @click="() => openTip(1)"
+        >
+          <text>落点稳定性</text>
+          <image
+            src="../static/s-question-mark.png"
+            mode="widthFix"
+            class="question-mark"
+          />
+        </view>
+        <text>{{ Number((data.stability || 0).toFixed(2)) }}</text>
+      </view>
+      <view>
+        <view>黄心率</view>
+        <text>{{ Number((data.yellowRate * 100).toFixed(2)) }}%</text>
+      </view>
+      <view>
+        <view>10环数</view>
+        <text>{{ data.tenRings }}</text>
+      </view>
+      <view>
+        <view>平均环数</view>
+        <text>{{ Number((data.averageRing || 0).toFixed(2)) }}</text>
+      </view>
+      <view>
+        <view>总环数</view>
+        <text>{{ data.userTotalRing }}/{{ data.totalRing }}</text>
+      </view>
+    </view>
+    <view class="title-bar">
+      <view />
+      <text>落点分布</text>
+      <!-- <button hover-class="none" @click="() => openTip(2)">
+          <image
+            src="../static/s-question-mark.png"
+            mode="widthFix"
+            class="question-mark"
+          />
+        </button> -->
+    </view>
+    <view :style="{ transform: 'translateY(-45rpx)' }">
+      <BowTargetEdit
+        :id="targetId"
+        :src="targetSrc"
+        :arrows="arrows.filter((item) => item.x && item.y)"
+        :editMode="false"
+      />
+    </view>
+    <view :style="{ transform: 'translateY(-60rpx)' }">
+      <!-- <view class="title-bar">
+          <view />
+          <text>环值分布</text>
+        </view> -->
+      <view :style="{ padding: '0 30rpx' }">
+        <RingBarChart :data="ringRates" />
+      </view>
+      <!-- <view class="title-bar" :style="{ marginTop: '30rpx' }">
+          <view />
+          <text>{{
+            selectedIndex === 0 ? "每组环数" : `第${selectedIndex}组环数`
+          }}</text>
+        </view> -->
+      <view class="ring-text-groups">
+        <view v-for="(item, index) in record.groups" :key="index">
+          <view v-if="selectedIndex === 0 && index !== 0">
+            <text>{{ index }}：</text>
+            <text>{{ item.list.reduce((acc, cur) => acc + cur.ring, 0) }}</text>
+            <text>环</text>
+          </view>
+          <view
+            v-if="
+              (selectedIndex === 0 && index !== 0) ||
+              (selectedIndex !== 0 && index === selectedIndex)
+            "
+            :style="{
+              marginLeft: selectedIndex === 0 && index !== 0 ? '20rpx' : '0',
+            }"
+          >
+            <text
+              v-for="(arrow, index2) in item.list"
+              :key="index2"
+              :style="{
+                color:
+                  arrow.ring === 0 || arrow.ring === 10 ? '#FFA118' : '#666',
+              }"
+            >
+              {{
+                arrow.ring === 0 ? "X" : arrow.ring === -1 ? "M" : arrow.ring
+              }}
+            </text>
+          </view>
+        </view>
+      </view>
+      <SButton :onClick="goHome" :rounded="40">开启我的弓箭记录</SButton>
+    </view>
+    <ScreenHint2 :show="showTip || showTip2" :onClose="closeTip">
+      <view class="tip-content">
+        <block v-if="showTip">
+          <text>落点稳定性说明</text>
+          <text
+            >通过计算每支箭与其他箭的平均距离衡一量射箭的稳定性，数字越小则说明射箭越稳定。该数据只能在用户标记落点的情况下生成。</text
+          >
+        </block>
+        <block v-if="showTip2">
+          <text>落点分布说明</text>
+          <text>展示用户某次练习中射箭的点位</text>
+        </block>
+      </view>
+    </ScreenHint2>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: 100vw;
+  height: 100vh;
+  background: #f5f5f5;
+  position: relative;
+  overflow: auto;
+}
+.header {
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+.header > image {
+  border-radius: 50%;
+  width: 90rpx;
+  height: 90rpx;
+  border: 2rpx solid #000;
+  margin: 0 25rpx;
+}
+.header > view {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+.header > view > text {
+  color: #000;
+  margin-bottom: 7rpx;
+}
+.bg-image {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+}
+.header {
+  width: 100%;
+  height: 60px;
+}
+.detail-data {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  column-gap: 3vw;
+  margin: 10rpx 30rpx;
+  margin-top: 20rpx;
+}
+.detail-data > view,
+.detail-data > button {
+  border-radius: 10px;
+  background-color: #fff;
+  margin-bottom: 20rpx;
+  padding: 15rpx 24rpx;
+}
+.detail-data > view > view {
+  font-size: 13px;
+  color: #999;
+  margin-bottom: 6rpx;
+}
+.detail-data > view > view > text {
+  word-break: keep-all;
+}
+.detail-data > view > text {
+  font-weight: 500;
+  color: #000;
+}
+.detail-data > button {
+  display: flex;
+  align-items: center;
+  font-size: 26rpx;
+  color: #999999;
+}
+.detail-data > button > image {
+  width: 28rpx;
+  height: 28rpx;
+  margin-right: 10rpx;
+  margin-left: 20rpx;
+}
+.question-mark {
+  width: 28rpx;
+  height: 28rpx;
+  margin-left: 3px;
+}
+.title-bar {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  font-size: 13px;
+  color: #999;
+  position: relative;
+  z-index: 10;
+}
+.title-bar > view:first-child {
+  width: 8rpx;
+  height: 28rpx;
+  border-radius: 10px;
+  background-color: #fed847;
+  margin-right: 7px;
+  margin-left: 15px;
+}
+.title-bar > button {
+  height: 34rpx;
+}
+.tip-content {
+  width: 100%;
+  padding: 25px;
+  display: flex;
+  flex-direction: column;
+  color: #000;
+}
+.tip-content > text {
+  width: 100%;
+}
+.tip-content > text:first-child {
+  text-align: center;
+}
+.tip-content > text:last-child {
+  font-size: 13px;
+  margin-top: 20px;
+  opacity: 0.8;
+}
+.ring-text-groups {
+  display: flex;
+  flex-direction: column;
+  padding: 20rpx;
+  padding-top: 30rpx;
+  font-size: 24rpx;
+  color: #999999;
+}
+.ring-text-groups > view {
+  display: flex;
+  justify-content: center;
+}
+.ring-text-groups > view > view:first-child:nth-last-child(2) {
+  margin-left: 20rpx;
+  width: 90rpx;
+  text-align: center;
+  font-size: 20rpx;
+  display: flex;
+  color: #999;
+}
+.ring-text-groups > view > view:first-child:nth-last-child(2) > text {
+  line-height: 30rpx;
+}
+.ring-text-groups
+  > view
+  > view:first-child:nth-last-child(2)
+  > text:nth-child(2) {
+  font-size: 40rpx;
+  color: #666;
+  margin-right: 6rpx;
+  margin-top: -5rpx;
+}
+.ring-text-groups > view > view:last-child {
+  flex: 1;
+  display: grid;
+  grid-template-columns: repeat(6, auto);
+  grid-gap: 10rpx;
+  margin-bottom: 30rpx;
+}
+.ring-text-groups > view > view:last-child > text {
+  width: 1fr;
+  text-align: center;
+  margin-bottom: 10rpx;
+}
+.notes-input {
+  width: calc(100% - 40rpx);
+  margin: 25rpx 0;
+  border: 1px solid #eee;
+  border-radius: 5px;
+  color: #000;
+  padding: 20rpx;
+}
+.point-book-info {
+  color: #333;
+  display: flex;
+  justify-content: center;
+}
+.point-book-info > text {
+  border-radius: 6px;
+  background-color: #fff;
+  font-size: 10px;
+  padding: 5px 10px;
+  margin-right: 5px;
+}
+</style>

src/pages/point-book-detail.vue

@@ -93,8 +93,7 @@ const shareImage = async () => {
 
 onLoad(async (options) => {
   if (options.id) {
-    const result = await getPointBookDetailAPI(options.id || 194);
+    const result = await getPointBookDetailAPI(options.id || 195);
-    console.log(result);
     record.value = result;
     notes.value = result.remark || "";
     const config = uni.getStorageSync("point-book-config");
@@ -112,7 +111,7 @@ onLoad(async (options) => {
 });
 
 onShareAppMessage(async () => {
-  const imageUrl = await generateShareCardImage(
+  const imageUrl = await generateShareCard(
     "shareCardCanvas",
     record.value.recordDate,
     data.value.userTotalRing,
@@ -120,12 +119,12 @@ onShareAppMessage(async () => {
   );
   return {
     title: "射箭打卡，今日又精进了一些～",
-    path: "/pages/point-book-detail?id=" + record.value.id,
+    path: "/pages/point-book-detail-share?id=" + record.value.id,
     imageUrl,
   };
 });
 onShareTimeline(async () => {
-  const imageUrl = await generateShareCardImage(
+  const imageUrl = await generateShareCard(
     "shareCardCanvas",
     record.value.recordDate,
     data.value.userTotalRing,
@@ -252,9 +251,7 @@ onShareTimeline(async () => {
           <view v-for="(item, index) in record.groups" :key="index">
             <view v-if="selectedIndex === 0 && index !== 0">
               <text>{{ index }}：</text>
-              <text>{{
+              <text>{{ item.userTotalRing }}</text>
-                item.list.reduce((acc, cur) => acc + cur.ring, 0)
-              }}</text>
               <text>环</text>
             </view>
             <view
@@ -447,6 +444,7 @@ onShareTimeline(async () => {
   display: flex;
   flex-direction: column;
   color: #000;
+  overflow: hidden;
 }
 .tip-content > text {
   width: 100%;
@@ -499,6 +497,7 @@ onShareTimeline(async () => {
   justify-content: center;
 }
 .ring-text-groups > view > view:first-child:nth-last-child(2) {
+  margin-left: 20rpx;
   width: 90rpx;
   text-align: center;
   font-size: 20rpx;
@@ -528,9 +527,12 @@ onShareTimeline(async () => {
   width: 1fr;
   text-align: center;
   margin-bottom: 10rpx;
+  font-weight: 500;
+  font-size: 26rpx;
 }
 .notes-input {
   width: calc(100% - 40rpx);
+  min-width: calc(100% - 40rpx);
   margin: 25rpx 0;
   border: 1px solid #eee;
   border-radius: 5px;

src/pages/point-book.vue

@@ -333,7 +333,7 @@ onShareTimeline(() => {
         <image src="../static/point-book-title2.png" mode="widthFix" />
       </view>
       <block v-for="(item, index) in list" :key="item.id">
-        <PointRecord :data="item" :onRemove="onRemoveRecord" />
+        <PointRecord :data="item" />
         <view
           v-if="index < list.length - 1"
           :style="{ height: '25rpx' }"
@@ -357,11 +357,11 @@ onShareTimeline(() => {
       :onClose="showTip ? () => (showTip = false) : null"
     >
       <RewardUs
-        v-show="showTip"
+        v-if="showTip"
         :show="showTip"
         :onClose="() => (showTip = false)"
       />
-      <view class="tip-content" :v-show="showTip2">
+      <view class="tip-content" v-if="showTip2">
         <text>确认删除该记录吗</text>
         <view>
           <button hover-class="none" @click="showTip2 = false">取消</button>