Merge remote-tracking branch 'origin/master'

src/components/tools/UserMenu.vue

@@ -1,44 +1,33 @@
 <template>
   <div class="user-wrapper" :class="theme">
-    <span class="action">
-      <a class="logout_title" target="_blank" href="#">
-        <a-icon type="question-circle-o"></a-icon>
-      </a>
-    </span>
-    <header-notice class="action"/>
+    <!--<span class="action">-->
+      <!--<a class="logout_title" target="_blank" href="#">-->
+        <!--<a-icon type="question-circle-o"></a-icon>-->
+      <!--</a>-->
+    <!--</span>-->
+    <!--<header-notice class="action"/>-->
     <a-dropdown>
       <span class="action action-full ant-dropdown-link user-dropdown-menu">
         <a-avatar class="avatar" size="small" :src="getAvatar()"/>
         <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
-        <a-menu-item key="0">
-          <router-link :to="{ name: 'account-center' }">
-            <a-icon type="user"/>
-            <span>个人中心</span>
-          </router-link>
-        </a-menu-item>
-        <a-menu-item key="1">
-          <router-link :to="{ name: 'account-settings-base' }">
-            <a-icon type="setting"/>
-            <span>账户设置</span>
-          </router-link>
-        </a-menu-item>
+        <!--<a-menu-item key="0">-->
+          <!--<router-link :to="{ name: 'account-center' }">-->
+            <!--<a-icon type="user"/>-->
+            <!--<span>个人中心</span>-->
+          <!--</router-link>-->
+        <!--</a-menu-item>-->
+        <!--<a-menu-item key="1">-->
+          <!--<router-link :to="{ name: 'account-settings-base' }">-->
+            <!--<a-icon type="setting"/>-->
+            <!--<span>账户设置</span>-->
+          <!--</router-link>-->
+        <!--</a-menu-item>-->
         <a-menu-item key="2" @click="updatePassword">
           <a-icon type="setting"/>
           <span>密码修改</span>
         </a-menu-item>
-       <!-- <a-menu-item key="2" disabled>
-          <a-icon type="setting"/>
-          <span>测试</span>
-        </a-menu-item>
-        <a-menu-divider/>
-        <a-menu-item key="3">
-          <a href="javascript:;" @click="handleLogout">
-            <a-icon type="logout"/>
-            <span>退出登录</span>
-          </a>
-        </a-menu-item>-->
       </a-menu>
     </a-dropdown>
     <span class="action">
@@ -75,8 +64,8 @@
       ...mapActions(["Logout"]),
       ...mapGetters(["nickname", "avatar","userInfo"]),
       getAvatar(){
-        console.log('url = '+ window._CONFIG['imgDomainURL']+"/"+this.avatar())
-        return window._CONFIG['imgDomainURL']+"/"+this.avatar()
+        console.log('url = '+ window._CONFIG['imgDomainOssURL'] + this.avatar());
+        return window._CONFIG['imgDomainOssURL'] + this.avatar();
       },
       handleLogout() {
         const that = this

src/views/hpuser/modules/UserModal.vue

@@ -43,8 +43,12 @@
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="身份证">
-          <img :src="getCardFrontView()" :preview="getCardFrontView()" alt="身份证正面" style="height:104px;max-width:300px"/>
-          <img :src="getCardBackView()" :preview="getCardBackView()" alt="身份证反面" style="height:104px;max-width:300px;margin-left: 30px"/>
+          <template v-if="model.idCardFront">
+            <img :src="getCardFrontView()" :preview="getCardFrontView()" alt="身份证正面" style="height:104px;max-width:300px"/>
+          </template>
+          <template v-if="model.idCardBack">
+            <img :src="getCardBackView()" :preview="getCardBackView()" alt="身份证反面" style="height:104px;max-width:300px;margin-left: 30px"/>
+          </template>
         </a-form-item>
 
       </a-form>

src/views/system/modules/UserModal.vue

@@ -205,7 +205,7 @@
         url: {
           addUDepartIds:"/sys/user/addUDepartIds", // 引入为用户添加部门信息需要的url
           editUDepartIds:"/sys/user/editUDepartIds", // 引入为用户更新部门信息需要的url
-          fileUpload: window._CONFIG['domianURL']+"/sys/common/ossUpload",
+          fileUpload: window._CONFIG['domianURL']+"/hpSys/common/ossUpload",
           imgerver: window._CONFIG['imgDomainOssURL'],
           userWithDepart: "/sys/user/userDepartList", // 引入为指定用户查看部门信息需要的url
           userId:"/sys/user/generateUserId", // 引入生成添加用户情况下的url