合并前准备3/19(分享小程序功能)

src/pages/competition/index.vue

@@ -723,14 +723,8 @@ import {
   getJsSDK,
   getPromotionRanking,
 } from "../../requests/competition";
-<<<<<<< HEAD
-import Toast from '../../../static/vant/toast/toast';
-import {reload_userinfo} from "../../utils/user";
-import {userDetail} from "../../requests/user";
-=======
 import Toast from "../../../static/vant/toast/toast";
 import { reload_userinfo } from "../../utils/user";
->>>>>>> c35815dd87c4ff3ede9c43252c369c9b213f6216
 
 var $this;
 var $now = Math.round(new Date() / 1000);
@@ -840,11 +834,7 @@ export default {
     },
     //时间产生变化时
     onTimeChange($e) {
-<<<<<<< HEAD
-      let $datetime = $this.timeData = $e.mp.detail
-=======
       let $datetime = ($this.timeData = $e.mp.detail);
->>>>>>> c35815dd87c4ff3ede9c43252c369c9b213f6216
       for (let $key in $datetime) {
         if ($datetime[$key].toString().length == 1) {
           $datetime[$key] = "0" + $datetime[$key];
@@ -956,20 +946,8 @@ export default {
     },
   },
   mounted() {
-<<<<<<< HEAD
-    userDetail().then((res) => {
-      let $data = res.data;
-      $this.userinfo = $data.data;
-      $this.userinfo['validity_time'] = formatTime($this.userinfo['validity_time'])
-      $this.userinfo['level_name'] = utils.get_level_name($this.userinfo['level'])
-      $this.userinfo['free_time'] = formatSeconds($this.userinfo['free_time'])
-      store.setters.set_userinfo($this.userinfo)
-    })
-    let $userinfo = wx.getStorageSync('userinfo')
-=======
     reload_userinfo($this);
     let $userinfo = wx.getStorageSync("userinfo");
->>>>>>> c35815dd87c4ff3ede9c43252c369c9b213f6216
     //检查用户是否参与比赛了
     checkJoined($this.activity_id, $userinfo.user_id).then((res) => {
       let $res = res.data;

src/pages/index/index.vue

@@ -71,13 +71,8 @@
         </van-row>
       </div>
     </div>
-<<<<<<< HEAD
-    <van-toast id="van-toast"/>
-    <van-dialog id="van-dialog"/>
-=======
     <van-toast id="van-toast" />
 
->>>>>>> c35815dd87c4ff3ede9c43252c369c9b213f6216
     <!--     <button class="cu-btn lg cu-btn-primary text-white text-center margin-tb" @click="auth_msg">获取消息授权-->
     <!--    </button>-->
   </div>
@@ -89,19 +84,10 @@ import login_container from "@/components/index/login";
 import regist_container from "@/components/index/regist";
 import personal_container from "@/components/index/personal";
 import device_container from "@/components/device/device";
-<<<<<<< HEAD
-import Toast from '../../../static/vant/toast/toast';
-import Dialog from '../../../static/vant/dialog/dialog'
-import {userDetail} from "../../requests/user";
-import user_store from "../../store/index"
-import game_store from "../../store/game"
-import game_util, {post_data} from '../../utils/game'
-=======
 import Toast from "../../../static/vant/toast/toast";
 import { userDetail } from "../../requests/user";
 import user_store from "../../store/index";
 import { reload_userinfo } from "../../utils/user";
->>>>>>> c35815dd87c4ff3ede9c43252c369c9b213f6216
 
 var $this;
 export default {
@@ -193,38 +179,9 @@ export default {
   },
   onHide() {},
   onLoad($option) {
-<<<<<<< HEAD
-    if (process.env.NODE_ENV == 'development') {
-      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: '系统提示',
-        message: '您上一个游戏尚未结束,是否继续?',
-      })
-        .then(() => {
-          Toast.success('是')
-        })
-        .catch(() => {
-          //添加数据，结束游戏
-          Toast.fail('否')
-          post_data(game_store.getters.getGameAttMedDatas())
-        });
-    }
-
-=======
     // if (process.env.NODE_ENV == 'development') {
     //   wx.setStorageSync('token', '7MZYqpAWOdw8WDxsgUV5QkQnKfrU5L_7')
     // }
->>>>>>> c35815dd87c4ff3ede9c43252c369c9b213f6216
     //  判断存储是否登录
     let $token = wx.getStorageSync("token");
     if ($token) {