Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

src/views/my/index.vue

@@ -51,7 +51,6 @@
                     <span>{{ item["title"] }}</span>
                 </div>
             </van-cell-group>
-
             <!-- 退出系统 -->
             <footer class="sign-out">
                 <van-button type="info" block @click="logout"
@@ -90,7 +89,7 @@ export default {
             ],
             userInfo: {
                 //portrait: require("@/assets/myTerritory/touxiang.png"),
-                portrait: getUserInfo().avatar,
+                portrait: getUserInfo()?getUserInfo().avatar : require("@/assets/myTerritory/touxiang.png"),
                 name: getUserInfo() ? getUserInfo().userName : "xxx",
                 position: getUserInfo() ? getUserInfo().deptName : "xx部",
                 // name: "刘华强",