UI修改

src/components/BubbleTip.vue

@@ -30,10 +30,10 @@ const props = defineProps({
 }
 .normal {
   background-image: url("../static/bubble-tip.png");
-  width: 190rpx;
+  width: 157rpx;
   height: 105rpx;
-  padding-top: 5px;
-  padding-left: 49rpx;
+  padding-top: 10px;
+  padding-left: 30rpx;
 }
 .normal2 {
   background-image: url("../static/bubble-tip4.png");

src/components/Container.vue

@@ -41,6 +41,10 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  showBottom: {
+    type: Boolean,
+    default: true,
+  },
 });
 const isIOS = uni.getDeviceInfo().osName === "ios";
 const showHint = ref(false);
@@ -158,7 +162,7 @@ const goCalibration = async () => {
       :show-scrollbar="false"
       :style="{
         height: `calc(100vh - ${capsuleHeight + (isHome ? 0 : 50)}px - ${
-          $slots.bottom ? (isIOS ? '85px' : '65px') : '0px'
+          $slots.bottom && showBottom ? (isIOS ? '85px' : '65px') : '0px'
         })`,
       }"
     >
@@ -166,7 +170,7 @@ const goCalibration = async () => {
     </scroll-view>
     <view
       class="bottom-part"
-      v-if="$slots.bottom"
+      v-if="$slots.bottom && showBottom"
       :style="{ height: isIOS ? '75px' : '55px', paddingTop: '10px' }"
     >
       <slot name="bottom"></slot>

src/pages/first-try.vue

@@ -153,7 +153,7 @@ const onClose = () => {
 </script>
 
 <template>
-  <Container :bgType="1" :title="title">
+  <Container :bgType="1" :title="title" :showBottom="step !== 4">
     <view class="container">
       <Guide
         v-if="step !== 4"
@@ -261,7 +261,7 @@ const onClose = () => {
       <canvas class="share-canvas" id="shareCanvas" type="2d"></canvas>
     </view>
     <template #bottom>
-      <SButton v-if="step !== 4" :onClick="nextStep" :disabled="btnDisabled">
+      <SButton :onClick="nextStep" :disabled="btnDisabled">
         <BubbleTip v-if="showGuide" :type="step === 1 ? 'long' : 'short'">
           <text :style="{ transform: 'translateY(-18rpx)' }">{{
             step === 1 ? "学会了，我摆得比教练还帅" : "我找到合适的点位了"

src/pages/index.vue

@@ -159,7 +159,7 @@ onShareTimeline(() => {
               mode="widthFix"
               @click="() => toPage('/pages/first-try')"
             />
-            <BubbleTip v-if="showGuide" :location="{ top: '60%', left: '40%' }">
+            <BubbleTip v-if="showGuide" :location="{ top: '60%', left: '47%' }">
               <text>新人必刷！</text>
               <text>快来报到吧~</text>
             </BubbleTip>

src/pages/point-book-rank.vue

@@ -59,11 +59,7 @@ const shareImage = async () => {
       <view>
         <image src="../static/point-champion.png" mode="widthFix" />
         <image
-          :src="
-            list[0] && list[0].avatar
-              ? list[0].avatar
-              : '../static/user-icon.png'
-          "
+          :src="list[0] && list[0].avatar ? list[0].avatar : ''"
           mode="widthFix"
         />
       </view>
@@ -78,7 +74,11 @@ const shareImage = async () => {
       <text>本周箭数</text>
       <text>消耗</text>
     </view>
-    <view class="data-list" :style="{ marginBottom: '20rpx' }" v-if="user.id && mine">
+    <view
+      class="data-list"
+      :style="{ marginBottom: '20rpx' }"
+      v-if="user.id && mine"
+    >
       <PointRankItem :data="mine" :borderWidth="0" />
     </view>
     <view

src/pages/practise-one.vue

@@ -109,7 +109,7 @@ onBeforeUnmount(() => {
 </script>
 
 <template>
-  <Container :bgType="1" title="个人单组练习">
+  <Container :bgType="1" title="个人单组练习" :showBottom="!start && !scores.length">
     <view>
       <TestDistance v-if="!practiseId" />
       <block v-if="practiseId">
@@ -156,7 +156,7 @@ onBeforeUnmount(() => {
       </block>
     </view>
     <template #bottom>
-      <SButton v-if="!start" :onClick="onReady">准备好了，直接开始</SButton>
+      <SButton :onClick="onReady">准备好了，直接开始</SButton>
     </template>
   </Container>
 </template>

src/pages/practise-two.vue

@@ -102,7 +102,7 @@ onBeforeUnmount(() => {
 </script>
 
 <template>
-  <Container :bgType="1" title="日常耐力挑战">
+  <Container :bgType="1" title="日常耐力挑战" :showBottom="!start && !scores.length">
     <view>
       <TestDistance v-if="!practiseId" />
       <block v-if="practiseId">
@@ -151,7 +151,7 @@ onBeforeUnmount(() => {
       </block>
     </view>
     <template #bottom>
-      <SButton v-if="!start" :onClick="onReady">准备好了，直接开始</SButton>
+      <SButton :onClick="onReady">准备好了，直接开始</SButton>
     </template>
   </Container>
 </template>