Merge branch 'master' of http://gitlab.frkj.cc/php/ZhiHuiJiaoWu_UniApp

pages.json

@@ -1,5 +1,14 @@
 {
   "pages": [
+    {
+      "path": "pages/student/login/login",
+      "style": {
+        "navigationBarTitleText": "",
+        "navigationStyle": "default",
+        "navigationBarBackgroundColor": "#fff",
+        "navigationBarTextStyle": "white"
+      }
+    },
     {
       "path": "pages/student/index/index",
       "style": {
@@ -27,15 +36,7 @@
         "navigationBarTextStyle": "white"
       }
     },
-    {
+
-      "path": "pages/student/login/login",
-      "style": {
-        "navigationBarTitleText": "",
-        "navigationStyle": "default",
-        "navigationBarBackgroundColor": "#fff",
-        "navigationBarTextStyle": "white"
-      }
-    },
     {
       "path": "pages/student/login/forgot",
       "style": {

pages/market/my/index.vue

@@ -11,7 +11,7 @@
       <view class="user_section">
         <view class="box">
           <view class="left" @click="openViewMyInfo()">
-            <image class="pic" :src="$util.img(userInfo.headimg)"></image>
+            <image class="pic" :src="userInfo.head_img"></image>
             <view class="name">{{userInfo.name}}</view>
           </view>
           <view class="right">
@@ -22,7 +22,7 @@
         </view>
         <view class="bottom">
           <view class="title">部门</view>
-          <view class="title">销售部</view>
+          <view class="title">{{userInfo.department_name_str}}</view>
           <view class="division"></view>
           <view class="title">等级</view>
           <view class="title">S5</view>