Commit a55457a4 by liu zhuoyu

只留用户页

parent 25b15b3d
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
sessionStorage.setItem("jssdk_ready", 1); sessionStorage.setItem("jssdk_ready", 1);
}); });
wx.error(function (err) { wx.error(function (err) {
alert(JSON.stringify(err)); // alert(JSON.stringify(err));
}); });
// 1秒后,如果还没有jssdk注入,则重新调用注入请求方法 // 1秒后,如果还没有jssdk注入,则重新调用注入请求方法
// setTimeout(() => { // setTimeout(() => {
...@@ -182,4 +182,4 @@ ...@@ -182,4 +182,4 @@
} }
} }
}; };
</script> </script>
\ No newline at end of file
...@@ -20,7 +20,7 @@ export function fetch(options) { ...@@ -20,7 +20,7 @@ export function fetch(options) {
//所有的请求都会带上这些配置,比如全局都要用的身份信息等。 //所有的请求都会带上这些配置,比如全局都要用的身份信息等。
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': process.env.NODE_ENV === 'production' ? (window['userData'] ? window['userData'].token : '') : "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiZjNhY2E1ZWYwMTk0NDcxZGIzOGQxNTVjMTEyYTU4NTIiLCJvcGVuX2lkIjoib2FwY0cxaFU0c0EwUDdFc2ZvX1VtNmkwOTFtTSIsInVuaW9uX2lkIjoib0xfc0R4SUpuY0FocTBnYTFKOFdlTUlGaFNnRSIsImV4cCI6MTU3MzY0NjM5MX0.pO22JcmEwpGFwZfxeodcPGApYRg6Ss_KkljIi98cGFw" 'Authorization': process.env.NODE_ENV === 'production' ? (window['userData'] ? window['userData'].token : '') : "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiZjNhY2E1ZWYwMTk0NDcxZGIzOGQxNTVjMTEyYTU4NTIiLCJvcGVuX2lkIjoib2FwY0cxaFU0c0EwUDdFc2ZvX1VtNmkwOTFtTSIsInVuaW9uX2lkIjoib0xfc0R4SUpuY0FocTBnYTFKOFdlTUlGaFNnRSIsImV4cCI6MTU3NDkzNDc2Nn0.MCuBMbzajgUC4wGYiypnPctklspqMxVfOKVYZbU3bgY"
// 'token_in_header': global_.token,//token从全局变量那里传过来 // 'token_in_header': global_.token,//token从全局变量那里传过来
}, },
timeout: 30 * 1000 // 30秒超时 timeout: 30 * 1000 // 30秒超时
......
...@@ -28,7 +28,7 @@ export default new Router({ ...@@ -28,7 +28,7 @@ export default new Router({
routes: [ routes: [
{ {
path:"/", path:"/",
redirect:"/MainPage/SignUp" redirect:"/UserCenter"
}, },
{ {
path: '/Author', path: '/Author',
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<router-view/> <router-view/>
<div class="bottom-bar"> <div class="bottom-bar">
<div class="bottom-tab" @click="selectTab('SignUp')"> <div class="bottom-tab" @click="selectTab('SignUp')">
<div :class="['text', currentPage()==='SignUp'?'active':'']">健步挑战赛</div> <div :class="['text', currentPage()==='SignUp'?'active':'']">公告</div>
</div> </div>
<div class="bottom-tab" @click="selectTab('nowGame')" v-if="!pauseData.is_pause"> <div class="bottom-tab" @click="selectTab('nowGame')" v-if="!pauseData.is_pause">
<div :class="['text', (currentPage()==='MainPagePartakeChallenge'||currentPage()==='MainPageHaveJoinedGame')?'active':'']">{{index1Name}}</div> <div :class="['text', (currentPage()==='MainPagePartakeChallenge'||currentPage()==='MainPageHaveJoinedGame')?'active':'']">{{index1Name}}</div>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<div class="confirm" @click="toggleFollowDialog">联系客服</div> <div class="confirm" @click="toggleFollowDialog">联系客服</div>
</div> </div>
</div> </div>
<div v-else class="challenge-card" @click="clickCard(item)"> <div v-else-if="!pauseData.is_pause" class="challenge-card" @click="clickCard(item)">
<img class="corner-marker" src="@/images/SignUp/home_tag_bsz.png" v-if="item.status===0"> <img class="corner-marker" src="@/images/SignUp/home_tag_bsz.png" v-if="item.status===0">
<img class="corner-marker" src="@/images/SignUp/home_tag_zmz.png" v-if="item.status===1"> <img class="corner-marker" src="@/images/SignUp/home_tag_zmz.png" v-if="item.status===1">
<img class="corner-marker" src="@/images/SignUp/home_tag_yjs.png" v-if="item.status===2"> <img class="corner-marker" src="@/images/SignUp/home_tag_yjs.png" v-if="item.status===2">
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
.notice-broadcast { .notice-broadcast {
flex-shrink: 0; flex-shrink: 0;
margin: 4.5rem 0 0.18rem; margin: 2rem 0 0.18rem;
} }
.notice-container { .notice-container {
......
...@@ -2,8 +2,8 @@ let config = { ...@@ -2,8 +2,8 @@ let config = {
devServer: { devServer: {
proxy: { proxy: {
'/api': { '/api': {
// target: "https://miniapp-api.wxatech.com/game-bsdk/", target: "https://miniapp-api.wxatech.com/game-bsdk/",
target: "https://miniapp-testapi.wxatech.com/game-bsdk/", // target: "https://miniapp-testapi.wxatech.com/game-bsdk/",
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
"^/api": "/api" "^/api": "/api"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment