bug fix

game/src/views/PlantTree.vue

@@ -255,7 +255,8 @@ if (lastPlayTimeStr) {
 
   if (lastPlayYear === currentYear && lastPlayMonth === currentMonth && lastPlayDay === currentDay) {
     currentStepIdx.value = stepList.length - 1
-    bonusPoint.value = 4 * store.state.gameRuleList[0].score
+    const lastPlayScoreStr = localStorage.getItem(`plant-tree-last-score-${store.state.token}`)
+    bonusPoint.value = Number(lastPlayScoreStr)
   }
 }
 // }
@@ -265,6 +266,7 @@ const isOver = computed(() => {
 watch(isOver, (vNew) => {
   if (vNew) {
     localStorage.setItem(`plant-tree-last-time-${store.state.token}`, (new Date()).getTime())
+    localStorage.setItem(`plant-tree-last-score-${store.state.token}`, bonusPoint.value)
     if (store.state.loginStatus && !store.state.ifScoreLimitReached && bonusPoint.value !== 0) {
       addScore(bonusPoint.value, '乡村林场').then(() => {
         getScore().then((res) => {

game/src/views/RedeemForm.vue

@@ -54,17 +54,25 @@
       </div>
     </div>
 
-    <button
-      class="submit"
-      :class="{
-        needInfo: !name || !contact || !detail,
-        notEnough: result < 0,
-        over: haveSubmitted,
-      }"
-      @click="submit"
-    >
-      发起兑换
-    </button>
+    <div class="btn-group">
+      <button
+        class="submit"
+        :class="{
+          needInfo: !name || !contact || !detail,
+          notEnough: result < 0,
+          over: haveSubmitted,
+        }"
+        @click="submit"
+      >
+        发起兑换
+      </button>
+      <button
+        class="return"
+        @click="$router.go(-1)"
+      >
+        返回
+      </button>
+    </div>
 
     <transition name="fade-in-out">
       <NotifyComp
@@ -256,33 +264,51 @@ function submit() {
       }
     }
   }
-  >button.submit{
+  >.btn-group{
     position: absolute;
-    width: calc(348 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
-    height: calc(60 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
-    top: calc(630 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
-    left: 50%;
-    transform: translate(-50%, 0);
-    background-color: #FFE6A5;
-    border-radius: calc(3 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
-    font-size: calc(16 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
-    font-family: Source Han Sans SC, Source Han Sans SC;
-    font-weight: bold;
-    color: #A97C46;
-    line-height: calc(19 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
-  }
-  >button.submit.needInfo{
-    opacity: 0.5;
-    pointer-events: none;
-  }
-  >button.submit.notEnough{
-    opacity: 1;
-    color: #7B7B7B;
-    background: #CECECE;
-    pointer-events: none;
-  }
-  >button.over{
-    pointer-events: none;
+    top: calc(620 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+    width: 100%;
+    left: 0;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    >button.submit{
+      width: calc(348 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+      height: calc(50 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+      background-color: #FFE6A5;
+      border-radius: calc(3 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+      font-size: calc(16 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+      font-family: Source Han Sans SC, Source Han Sans SC;
+      font-weight: bold;
+      color: #A97C46;
+      line-height: calc(19 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+    }
+    >button.submit.needInfo{
+      opacity: 0.5;
+      pointer-events: none;
+    }
+    >button.submit.notEnough{
+      opacity: 1;
+      color: #7B7B7B;
+      background: #CECECE;
+      pointer-events: none;
+    }
+    >button.over{
+      pointer-events: none;
+    }
+    >button.return{
+      margin-top: calc(10 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+      border: 1px solid #fff;
+      width: calc(348 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+      height: calc(50 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+      border-radius: calc(3 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+      font-size: calc(16 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+      font-family: Source Han Sans SC, Source Han Sans SC;
+      font-weight: bold;
+      color: #fff;
+      line-height: calc(19 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+
+    }
   }
 }
 </style>

game/src/views/SignUp.vue

@@ -287,6 +287,7 @@ function submit() {
   >button.submit{
     width: calc(332 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
     height: calc(56 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
+    min-height: 2.5em;
     background: rgba(197, 161, 108, 0.8);
     border-radius: calc(10 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
     font-size: calc(20 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));