Merge branch 'master' of http://git.yuzhankeji.cn/TmOct5/AGuestSaas

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",

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"
+        })
     }
 })

pages/config/config.wxml

@@ -1,5 +1,11 @@
 
-<view class="pack-center pages-loding">
+<view class="pack-center pages-loding" wx:if="{{loding}}">
     <image src="/static/icons/loding.gif" mode="widthFix"></image>
     <view>加载企业信息</view>
 </view>
+
+<view class="pack-center pages-hint" wx:else>
+    <image src="/static/images/404.png" mode="widthFix"></image>
+    <view>加载企业信息失败~</view>
+    <button class="pages-hint-btn" size="mini" bindtap="openIndex">返回首页</button>
+</view>

pages/config/config.wxss

@@ -1 +1,16 @@
-/* pages/config/config.wxss */
+
+/**
+ *  Web唐明明
+ *  匆匆数载恍如梦，岁月迢迢华发增。
+ *  碌碌无为枉半生，一朝惊醒万事空。
+ */
+
+.pages-hint-btn[size="mini"]{
+    background: #0b0041;
+    color: white;
+    width: 50vw;
+    height: 90rpx;
+    line-height: 90rpx;
+    padding: 0;
+    margin: 100rpx 0;
+}

pages/login/login.wxss

@@ -1,7 +1,8 @@
 
 /**
  *  Web唐明明
- *  一个梦想做木雕手艺人的程序员
+ *  匆匆数载恍如梦，岁月迢迢华发增。
+ *  碌碌无为枉半生，一朝惊醒万事空。
  */
 
 page{

pages/mall/index.json

@@ -7,5 +7,6 @@
 		"mallIndex_video"	: "/components/mallIndex_video/mallIndex_video"
 	},
 	"navigationBarTitleText": "商城",
-	"enablePullDownRefresh" : true
+	"enablePullDownRefresh" : true,
+	"navigationBarBackgroundColor": "#ea4e2f"
 }

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)
         })
     },
 

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",