合并成功3/23

src/pages/competition/index.vue

@@ -705,14 +705,14 @@
 
       </div>
     </div>
-    <van-toast id="van-toast" />
+    <van-toast id="van-toast"/>
   </scroll-view>
 
 </template>
 
 <script>
 import store from "../../store/competition";
-import { cal_down_time } from "../../utils";
+import {cal_down_time} from "../../utils";
 import {
   checkJoined,
   doEnroll,
@@ -784,7 +784,8 @@ export default {
     to_report() {
       // $this.$router.push({name: "Report"})
     },
-    get_init() {},
+    get_init() {
+    },
     //打开分享窗口
     show_share_window() {
       $this.share_show = true;
@@ -971,6 +972,13 @@ export default {
     $this.activity_id = $options.activity_id;
     $this.getActivity($this.activity_id);
   },
+  onShareAppMessage() {
+    return {
+      title: "欢迎进入水母星球",
+      imageUrl: "http://img.shuimuai.com/textwx5_4img.png",
+      path:"/pages/competition/main?activity_id="+$this.activity_id
+    };
+  },
 };
 </script>
 <style>
@@ -1157,11 +1165,11 @@ page {
 }
 
 .diy_container
-  .rank_container
-  .rank_main
-  .rank_main_list
-  .my_score
-  .right_title {
+.rank_container
+.rank_main
+.rank_main_list
+.my_score
+.right_title {
   width: 55px;
   height: 10px;
   font-size: 9px;
@@ -1180,12 +1188,12 @@ page {
 }
 
 .diy_container
-  .rank_container
-  .rank_main
-  .rank_main_list
-  .my_score
-  .rank_item
-  .rank_num {
+.rank_container
+.rank_main
+.rank_main_list
+.my_score
+.rank_item
+.rank_num {
   font-size: 10px;
   font-family: Microsoft YaHei;
   font-weight: bold;
@@ -1194,40 +1202,41 @@ page {
 }
 
 .diy_container
-  .rank_container
-  .rank_main
-  .rank_main_list
-  .my_score
-  .rank_item
-  .rank_username {
+.rank_container
+.rank_main
+.rank_main_list
+.my_score
+.rank_item
+.rank_username {
   font-size: 10px;
   font-family: Microsoft YaHei;
   font-weight: bold;
   color: #e2e0ff;
   line-height: 14px;
 }
+
 .rank_user_status {
   display: inline-block;
 }
 
 .diy_container
-  .rank_container
-  .rank_main
-  .rank_main_list
-  .my_score
-  .rank_item
-  .avatar {
+.rank_container
+.rank_main
+.rank_main_list
+.my_score
+.rank_item
+.avatar {
   width: 24px;
   height: 25px;
 }
 
 .diy_container
-  .rank_container
-  .rank_main
-  .rank_main_list
-  .my_score
-  .rank_item
-  .rank_score {
+.rank_container
+.rank_main
+.rank_main_list
+.my_score
+.rank_item
+.rank_score {
   font-size: 10px;
   font-family: Microsoft YaHei;
   font-weight: bold;

src/pages/index/index.vue

@@ -172,6 +172,16 @@ export default {
     });
   },
   onShow() {
+
+    wx.getStorageInfo({
+      success(res) {
+        console.log('当前存储的数据', res.keys)
+        let $keys = res.keys
+        $keys.forEach(($val, $index) => {
+          console.log($val, wx.getStorageSync($val))
+        })
+      }
+    })
     userDetail().then((res) => {
       let $data = res.data;
       //判断如果是第一次登录就 弹出领取体验卡
@@ -185,13 +195,11 @@ export default {
       wx.setStorageSync("token", "7MZYqpAWOdw8WDxsgUV5QkQnKfrU5L_7");
     }
 
-    console.log(game_store.getters.getGameAttMedDatas());
-    console.log(game_store.getters.getPlayedTime());
     console.log(
       "游戏状态：" + game_store.getters.getGameStatus(),
-
       "游戏记录id：" + game_store.getters.getGameRecordId()
-    );
+    )
+
     if (game_store.getters.getGameStatus() == 1) {
       // Dialog.confirm({
       //   title: '系统提示',

src/pages/start/index.vue

@@ -276,7 +276,9 @@ export default {
       //游戏结束重置游戏时间
       wx.removeStorageSync("play_time");
       //删除游戏专注数据
-      game_store.remover.rmGameAttMedDatas();
+      game_store.remover.rmGameAttMedDatas()
+      //删除隐藏时间
+      game_store.remover.rmHideTime()
       //游戏结束重置游戏模式
       game_store.setters.setMode(0);
       //删除游戏得id

src/store/game.js

@@ -101,6 +101,12 @@ const getters = {
 const remover = {
   rmGameAttMedDatas() {
     wx.removeStorageSync('game_data')
+  },
+  rmHideTime() {
+    wx.removeStorageSync('hide_time')
+  },
+  rmHideStatus() {
+    wx.removeStorageSync('hide_status')
   }
 }
 

src/utils/game.js

@@ -4,8 +4,8 @@ import {gameAddLine, gameEnd} from "../requests/game";
 // 往后端推送一次定时数据
 export function post_data($big_data) {
   wx.showLoading({
-    title:"正在结束上一个游戏",
-    mask:true
+    title: "正在结束上一个游戏",
+    mask: true
   })
   var $this = this
   //判断数据长度大于理想状态 需要对数组进行切割 逐个提交数据
@@ -90,6 +90,8 @@ function to_report() {
       game_store.setters.setMode(0)
       //删除游戏得id
       game_store.setters.removeToyHex()
+      //删除隐藏时间
+      game_store.remover.rmHideTime()
     }
   })
 }