diff --git a/app.json b/app.json index 0feab07..ca367c5 100644 --- a/app.json +++ b/app.json @@ -9,6 +9,7 @@ "pages/richText/richText", "pages/login/login", "pages/card/index", + "pages/user/index", "pages/user/companyMine/myActives/myActives", "pages/user/companyMine/focusedProject/focusedProject", "pages/user/companyMine/focusedCompany/focusedCompany", diff --git a/pages/config/config.js b/pages/config/config.js index a699175..0768d29 100644 --- a/pages/config/config.js +++ b/pages/config/config.js @@ -7,6 +7,9 @@ import { mall, video, ticket, user } from "../../lib/tabBarData" Page({ + data: { + loding: true + }, /** * 生命周期函数--监听页面加载 */ @@ -49,6 +52,10 @@ Page({ url: newTabBar[0].pagePath, }) } + }).catch(()=>{ + this.setData({ + loding: false + }) }) } }) @@ -58,5 +65,14 @@ Page({ */ onShow(){ wx.hideHomeButton() + }, + + /** + * 打开企业广场 + */ + openIndex(){ + wx.reLaunch({ + url: "/pages/company/index" + }) } }) \ No newline at end of file diff --git a/pages/config/config.wxml b/pages/config/config.wxml index ceaa87e..699a0ab 100644 --- a/pages/config/config.wxml +++ b/pages/config/config.wxml @@ -1,5 +1,11 @@ - + 加载企业信息 + + + + 加载企业信息失败~ + + diff --git a/pages/config/config.wxss b/pages/config/config.wxss index 93bf0aa..d96bdfa 100644 --- a/pages/config/config.wxss +++ b/pages/config/config.wxss @@ -1 +1,16 @@ -/* pages/config/config.wxss */ \ No newline at end of file + +/** + * Web唐明明 + * 匆匆数载恍如梦,岁月迢迢华发增。 + * 碌碌无为枉半生,一朝惊醒万事空。 + */ + +.pages-hint-btn[size="mini"]{ + background: #0b0041; + color: white; + width: 50vw; + height: 90rpx; + line-height: 90rpx; + padding: 0; + margin: 100rpx 0; +} diff --git a/pages/login/login.wxss b/pages/login/login.wxss index 26711e1..db510b3 100644 --- a/pages/login/login.wxss +++ b/pages/login/login.wxss @@ -1,7 +1,8 @@ /** * Web唐明明 - * 一个梦想做木雕手艺人的程序员 + * 匆匆数载恍如梦,岁月迢迢华发增。 + * 碌碌无为枉半生,一朝惊醒万事空。 */ page{ diff --git a/pages/mall/index.json b/pages/mall/index.json index e022b9a..c7f1412 100644 --- a/pages/mall/index.json +++ b/pages/mall/index.json @@ -7,5 +7,6 @@ "mallIndex_video" : "/components/mallIndex_video/mallIndex_video" }, "navigationBarTitleText": "商城", - "enablePullDownRefresh" : true + "enablePullDownRefresh" : true, + "navigationBarBackgroundColor": "#ea4e2f" } \ No newline at end of file diff --git a/pages/shortVideo/index.js b/pages/shortVideo/index.js index 769a0e5..39c2354 100644 --- a/pages/shortVideo/index.js +++ b/pages/shortVideo/index.js @@ -21,9 +21,8 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad(options) { + onLoad() { wx.$api.video.videos().then(res => { - console.log(res) this.setData({ videoList: res, videoId: res[0].video_id @@ -41,7 +40,6 @@ Page({ rooms : res.list, sysInfo : wx.getSystemInfoSync().safeArea }) - console.log(this.data.sysInfo) }) }, diff --git a/pages/welcome/index.js b/pages/welcome/index.js index 4e64271..2060f32 100644 --- a/pages/welcome/index.js +++ b/pages/welcome/index.js @@ -22,7 +22,7 @@ Page({ key : 'newUser', success : ()=>{ wx.getStorage({ - key : "storeId", + key : "compayId", success : ()=>{ wx.reLaunch({ url: "/pages/config/config", diff --git a/static/images/404.png b/static/images/404.png new file mode 100644 index 0000000..deb1fbc Binary files /dev/null and b/static/images/404.png differ