diff --git a/.env.development b/.env.development
index ced17fe2..889821b0 100644
--- a/.env.development
+++ b/.env.development
@@ -9,14 +9,20 @@ VUE_APP_BASE_API = '/systemapi'
 # BOE管理系统/开发环境
 VUE_APP_BOE_BASE_API = '/uboeApi'
 
+# 资源位的api
+VUE_APP_CESOURCE_BASE_API = '/socialApi'
+
+# 事件的api
+VUE_APP_STAT_BASE_API = '/statApi'
+
 # BOE系统网址
-VUE_APP_BOE_WEB_URL = 'https://u.boe.com'
+VUE_APP_BOE_WEB_URL = 'http://192.168.0.11'
 
 # BOE 移动端url
-VUE_APP_BOE_MOBILE_URL = 'http://192.168.0.10:8082/mobile'
+VUE_APP_BOE_MOBILE_URL = 'http://192.168.0.11:8082/mobile'
 
 # File路径的基础url
-VUE_APP_FILE_BASE_URL = 'http://192.168.0.10:9090/cdn/upload'
+VUE_APP_FILE_BASE_URL = 'http://192.168.0.11:9090/cdn/upload'
 
 # File路径的基础url的相对路径，加此项是为了不影响之前的路径配置
 VUE_APP_FILE_RELATIVE_PATH = '/upload'
diff --git a/.env.preview b/.env.preview
index cd3581a0..a1b96aec 100644
--- a/.env.preview
+++ b/.env.preview
@@ -1,7 +1,7 @@
 # 生产环境配置
 ENV = 'preview'
 NODE_ENV= 'preview'
-BASE_URL= '/pc/'
+BASE_URL= '/pc-release/'
 
 # 管理系统/生产环境
 VUE_APP_BASE_API = '/systemapi-release'
@@ -9,14 +9,20 @@ VUE_APP_BASE_API = '/systemapi-release'
 # BOE管理系统/开发环境
 VUE_APP_BOE_BASE_API = '/uboeApi-release'
 
+# 资源位的api
+VUE_APP_CESOURCE_BASE_API = '/socialApi-release'
+
+# 事件的api
+VUE_APP_STAT_BASE_API = '/statApi-release'
+
 # BOE系统网址，已经不再使用
-VUE_APP_BOE_WEB_URL = 'https://u.boe.com/preview'
+VUE_APP_BOE_WEB_URL = 'https://u.boe.com/web-release'
 
 # BOE 移动端url
-VUE_APP_BOE_MOBILE_URL = 'http://u.boe.com'
+VUE_APP_BOE_MOBILE_URL = 'https://u.boe.com'
 
 # File路径的基础url
-VUE_APP_FILE_BASE_URL='http://u.boe.com/upload'
+VUE_APP_FILE_BASE_URL='https://u.boe.com/upload'
 
 # File路径的基础url的相对路径，加此项是为了不影响之前的路径配置
 VUE_APP_FILE_RELATIVE_PATH = '/upload'
diff --git a/.env.production b/.env.production
index 331b4205..763a725e 100644
--- a/.env.production
+++ b/.env.production
@@ -9,14 +9,20 @@ VUE_APP_BASE_API = '/systemapi'
 # BOE管理系统/开发环境
 VUE_APP_BOE_BASE_API = '/uboeApi'
 
+# 资源位的api
+VUE_APP_CESOURCE_BASE_API = '/socialApi'
+
+# 事件的api
+VUE_APP_STAT_BASE_API = '/statApi'
+
 # BOE系统网址
-VUE_APP_BOE_WEB_URL = 'https://u.boe.com/production'
+VUE_APP_BOE_WEB_URL = 'https://u.boe.com'
 
 # BOE 移动端url
 VUE_APP_BOE_MOBILE_URL = 'http://u.boe.com'
 
 # File路径的基础url
-VUE_APP_FILE_BASE_URL='http://u-pre.boe.com/upload'
+VUE_APP_FILE_BASE_URL='http://u.boe.com/upload'
 
 # File路径的基础url的相对路径，加此项是为了不影响之前的路径配置
 VUE_APP_FILE_RELATIVE_PATH = '/upload'
@@ -25,4 +31,4 @@ VUE_APP_FILE_RELATIVE_PATH = '/upload'
 VUE_APP_PUBLIC_PATH='/pc'
 
 # 登录地址
-VUE_APP_LOGIN_URL='https://u-pre.boe.com/web/'
+VUE_APP_LOGIN_URL='https://u.boe.com/web/'
diff --git a/.env.testing b/.env.testing
index 89063e98..a0aa5726 100644
--- a/.env.testing
+++ b/.env.testing
@@ -9,14 +9,20 @@ VUE_APP_BASE_API = '/systemapi'
 # BOE管理系统/开发环境
 VUE_APP_BOE_BASE_API = '/uboeApi'
 
+# 资源位的api
+VUE_APP_CESOURCE_BASE_API = '/socialApi'
+
+# 事件的api
+VUE_APP_STAT_BASE_API = '/statApi'
+
 # BOE系统网址
-VUE_APP_BOE_WEB_URL = 'https://u-pre.boe.com/testing'
+VUE_APP_BOE_WEB_URL = 'https://u-pre.boe.com'
 
 # BOE 移动端url
-VUE_APP_BOE_MOBILE_URL = 'http://u-pre.boe.com'
+VUE_APP_BOE_MOBILE_URL = 'https://u-pre.boe.com'
 
 # File路径的基础url
-VUE_APP_FILE_BASE_URL='http://u-pre.boe.com/upload'
+VUE_APP_FILE_BASE_URL='https://u-pre.boe.com/upload'
 
 # File路径的基础url的相对路径，加此项是为了不影响之前的路径配置
 VUE_APP_FILE_RELATIVE_PATH = '/upload'
diff --git a/package-lock.json b/package-lock.json
index 813d2b41..e58bb672 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1249,6 +1249,29 @@
       "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==",
       "dev": true
     },
+    "@jridgewell/source-map": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
+      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "dependencies": {
+        "@jridgewell/gen-mapping": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+          "dev": true,
+          "requires": {
+            "@jridgewell/set-array": "^1.0.1",
+            "@jridgewell/sourcemap-codec": "^1.4.10",
+            "@jridgewell/trace-mapping": "^0.3.9"
+          }
+        }
+      }
+    },
     "@jridgewell/sourcemap-codec": {
       "version": "1.4.13",
       "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
@@ -1421,6 +1444,12 @@
         "@types/node": "*"
       }
     },
+    "@types/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
+      "dev": true
+    },
     "@types/http-proxy": {
       "version": "1.17.9",
       "resolved": "https://registry.npmmirror.com/@types/http-proxy/-/http-proxy-1.17.9.tgz",
@@ -3107,6 +3136,16 @@
       "integrity": "sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ==",
       "dev": true
     },
+    "camel-case": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+      "dev": true,
+      "requires": {
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
+      }
+    },
     "camelcase": {
       "version": "6.3.0",
       "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-6.3.0.tgz",
@@ -4595,6 +4634,16 @@
         "domhandler": "^4.2.0"
       }
     },
+    "dot-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+      "dev": true,
+      "requires": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
     "dot-prop": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
@@ -6277,12 +6326,114 @@
         }
       }
     },
+    "html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
+      "dev": true,
+      "requires": {
+        "camel-case": "^4.1.2",
+        "clean-css": "^5.2.2",
+        "commander": "^8.3.0",
+        "he": "^1.2.0",
+        "param-case": "^3.0.4",
+        "relateurl": "^0.2.7",
+        "terser": "^5.10.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "8.8.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+          "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+          "dev": true
+        },
+        "clean-css": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz",
+          "integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==",
+          "dev": true,
+          "requires": {
+            "source-map": "~0.6.0"
+          }
+        },
+        "commander": {
+          "version": "8.3.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+          "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+          "dev": true
+        },
+        "terser": {
+          "version": "5.15.1",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz",
+          "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==",
+          "dev": true,
+          "requires": {
+            "@jridgewell/source-map": "^0.3.2",
+            "acorn": "^8.5.0",
+            "commander": "^2.20.0",
+            "source-map-support": "~0.5.20"
+          },
+          "dependencies": {
+            "commander": {
+              "version": "2.20.3",
+              "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+              "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+              "dev": true
+            }
+          }
+        }
+      }
+    },
     "html-tags": {
       "version": "3.2.0",
       "resolved": "https://registry.npmmirror.com/html-tags/-/html-tags-3.2.0.tgz",
       "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
       "dev": true
     },
+    "html-webpack-plugin": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
+      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
+      "dev": true,
+      "requires": {
+        "@types/html-minifier-terser": "^6.0.0",
+        "html-minifier-terser": "^6.0.2",
+        "lodash": "^4.17.21",
+        "pretty-error": "^4.0.0",
+        "tapable": "^2.0.0"
+      },
+      "dependencies": {
+        "pretty-error": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
+          "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.20",
+            "renderkid": "^3.0.0"
+          }
+        },
+        "renderkid": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
+          "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
+          "dev": true,
+          "requires": {
+            "css-select": "^4.1.3",
+            "dom-converter": "^0.2.0",
+            "htmlparser2": "^6.1.0",
+            "lodash": "^4.17.21",
+            "strip-ansi": "^6.0.1"
+          }
+        },
+        "tapable": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+          "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+          "dev": true
+        }
+      }
+    },
     "htmlparser2": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
@@ -7484,6 +7635,15 @@
       "integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==",
       "dev": true
     },
+    "lower-case": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.0.3"
+      }
+    },
     "lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -7936,6 +8096,16 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
       "dev": true
     },
+    "no-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+      "dev": true,
+      "requires": {
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
+      }
+    },
     "node-forge": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
@@ -8445,6 +8615,16 @@
         "readable-stream": "^2.1.5"
       }
     },
+    "param-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+      "dev": true,
+      "requires": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
     "parchment": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
@@ -8525,6 +8705,16 @@
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
       "dev": true
     },
+    "pascal-case": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+      "dev": true,
+      "requires": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
diff --git a/package.json b/package.json
index 09f69ff6..bb05de8e 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,9 @@
     "script-ext-html-webpack-plugin": "^2.1.5",
     "snowflake-id-js": "^1.0.1",
     "svg-sprite-loader": "^6.0.9",
+    "swiper": "^4.5.0",
     "vue": "^2.6.11",
+    "vue-awesome-swiper": "^3.1.3",
     "vue-cookies": "^1.7.4",
     "vue-pdf": "^4.2.0",
     "vue-quill-editor": "^3.0.6",
@@ -54,6 +56,7 @@
     "babel-eslint": "^10.1.0",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",
+    "html-webpack-plugin": "^5.5.0",
     "less": "^4.1.1",
     "less-loader": "^6.2.0",
     "sass": "^1.32.13",
diff --git a/public/images/Durbg.png b/public/images/Durbg.png
new file mode 100644
index 00000000..3ddad837
Binary files /dev/null and b/public/images/Durbg.png differ
diff --git a/public/images/Recent.png b/public/images/Recent.png
new file mode 100644
index 00000000..d7d5e332
Binary files /dev/null and b/public/images/Recent.png differ
diff --git a/public/images/Uimg.png b/public/images/Uimg.png
new file mode 100644
index 00000000..de650611
Binary files /dev/null and b/public/images/Uimg.png differ
diff --git a/public/images/artfoot.png b/public/images/artfoot.png
new file mode 100644
index 00000000..3874b492
Binary files /dev/null and b/public/images/artfoot.png differ
diff --git a/public/images/article-banner.png b/public/images/article-banner.png
new file mode 100644
index 00000000..3874b492
Binary files /dev/null and b/public/images/article-banner.png differ
diff --git a/public/images/back(1).png b/public/images/back(1).png
new file mode 100644
index 00000000..5a6c7510
Binary files /dev/null and b/public/images/back(1).png differ
diff --git a/public/images/back.png b/public/images/back.png
index 5a6c7510..8c8efe12 100644
Binary files a/public/images/back.png and b/public/images/back.png differ
diff --git a/public/images/case-banner.png b/public/images/case-banner.png
new file mode 100644
index 00000000..efdeb5d9
Binary files /dev/null and b/public/images/case-banner.png differ
diff --git a/public/images/close.png b/public/images/close.png
new file mode 100644
index 00000000..9875e3a5
Binary files /dev/null and b/public/images/close.png differ
diff --git a/public/images/contact(1).png b/public/images/contact(1).png
new file mode 100644
index 00000000..acbc315d
Binary files /dev/null and b/public/images/contact(1).png differ
diff --git a/public/images/contact.png b/public/images/contact.png
index acbc315d..ace95772 100644
Binary files a/public/images/contact.png and b/public/images/contact.png differ
diff --git a/public/images/contribute.png b/public/images/contribute.png
new file mode 100644
index 00000000..9f7bccd3
Binary files /dev/null and b/public/images/contribute.png differ
diff --git a/public/images/cotedetel.png b/public/images/cotedetel.png
new file mode 100644
index 00000000..717a69f8
Binary files /dev/null and b/public/images/cotedetel.png differ
diff --git a/public/images/coteplay.png b/public/images/coteplay.png
new file mode 100644
index 00000000..2a79b299
Binary files /dev/null and b/public/images/coteplay.png differ
diff --git a/public/images/couresdetail.png b/public/images/couresdetail.png
new file mode 100644
index 00000000..da4e381f
Binary files /dev/null and b/public/images/couresdetail.png differ
diff --git a/public/images/course-banner.png b/public/images/course-banner.png
new file mode 100644
index 00000000..1c68e84e
Binary files /dev/null and b/public/images/course-banner.png differ
diff --git a/public/images/daochubg.png b/public/images/daochubg.png
new file mode 100644
index 00000000..c99d6424
Binary files /dev/null and b/public/images/daochubg.png differ
diff --git a/public/images/essay(1).png b/public/images/essay(1).png
new file mode 100644
index 00000000..c553a3b6
Binary files /dev/null and b/public/images/essay(1).png differ
diff --git a/public/images/essay.png b/public/images/essay.png
index c553a3b6..fd558b39 100644
Binary files a/public/images/essay.png and b/public/images/essay.png differ
diff --git a/public/images/expbg.png b/public/images/expbg.png
new file mode 100644
index 00000000..38d612b8
Binary files /dev/null and b/public/images/expbg.png differ
diff --git a/public/images/explo(1).png b/public/images/explo(1).png
new file mode 100644
index 00000000..30801297
Binary files /dev/null and b/public/images/explo(1).png differ
diff --git a/public/images/explo.png b/public/images/explo.png
index 30801297..beeea701 100644
Binary files a/public/images/explo.png and b/public/images/explo.png differ
diff --git a/public/images/grade.png b/public/images/grade.png
new file mode 100644
index 00000000..bd0f935e
Binary files /dev/null and b/public/images/grade.png differ
diff --git a/public/images/homeWu/Pending.png b/public/images/homeWu/Pending.png
new file mode 100644
index 00000000..27d97faf
Binary files /dev/null and b/public/images/homeWu/Pending.png differ
diff --git a/public/images/homeWu/agency.png b/public/images/homeWu/agency.png
new file mode 100644
index 00000000..6ce31d54
Binary files /dev/null and b/public/images/homeWu/agency.png differ
diff --git a/public/images/homeWu/book.png b/public/images/homeWu/book.png
new file mode 100644
index 00000000..9b926626
Binary files /dev/null and b/public/images/homeWu/book.png differ
diff --git a/public/images/homeWu/gradebgimg.png b/public/images/homeWu/gradebgimg.png
new file mode 100644
index 00000000..a5cbd97b
Binary files /dev/null and b/public/images/homeWu/gradebgimg.png differ
diff --git a/public/images/homeWu/guide-bg.png b/public/images/homeWu/guide-bg.png
new file mode 100644
index 00000000..9313dee5
Binary files /dev/null and b/public/images/homeWu/guide-bg.png differ
diff --git a/public/images/homeWu/interest.png b/public/images/homeWu/interest.png
new file mode 100644
index 00000000..4290670d
Binary files /dev/null and b/public/images/homeWu/interest.png differ
diff --git a/public/images/homeWu/man.png b/public/images/homeWu/man.png
new file mode 100644
index 00000000..6ae401d1
Binary files /dev/null and b/public/images/homeWu/man.png differ
diff --git a/public/images/homeWu/medal-bg-dlg.png b/public/images/homeWu/medal-bg-dlg.png
new file mode 100644
index 00000000..df0e05f4
Binary files /dev/null and b/public/images/homeWu/medal-bg-dlg.png differ
diff --git a/public/images/homeWu/medal-day.png b/public/images/homeWu/medal-day.png
new file mode 100644
index 00000000..7e7b3a0f
Binary files /dev/null and b/public/images/homeWu/medal-day.png differ
diff --git a/public/images/homeWu/medal-del.png b/public/images/homeWu/medal-del.png
new file mode 100644
index 00000000..4d7d6b2c
Binary files /dev/null and b/public/images/homeWu/medal-del.png differ
diff --git a/public/images/homeWu/medal-good.png b/public/images/homeWu/medal-good.png
new file mode 100644
index 00000000..184894f4
Binary files /dev/null and b/public/images/homeWu/medal-good.png differ
diff --git a/public/images/homeWu/medal-study.png b/public/images/homeWu/medal-study.png
new file mode 100644
index 00000000..2c5a3eac
Binary files /dev/null and b/public/images/homeWu/medal-study.png differ
diff --git a/public/images/homeWu/medal-up.png b/public/images/homeWu/medal-up.png
new file mode 100644
index 00000000..4e4316fa
Binary files /dev/null and b/public/images/homeWu/medal-up.png differ
diff --git a/public/images/homeWu/ni-dynamic.png b/public/images/homeWu/ni-dynamic.png
new file mode 100644
index 00000000..c1ac3cb7
Binary files /dev/null and b/public/images/homeWu/ni-dynamic.png differ
diff --git a/public/images/homeWu/no-answer.png b/public/images/homeWu/no-answer.png
new file mode 100644
index 00000000..e0192101
Binary files /dev/null and b/public/images/homeWu/no-answer.png differ
diff --git a/public/images/homeWu/no-article.png b/public/images/homeWu/no-article.png
new file mode 100644
index 00000000..c0dbc3a9
Binary files /dev/null and b/public/images/homeWu/no-article.png differ
diff --git a/public/images/homeWu/no-book.png b/public/images/homeWu/no-book.png
new file mode 100644
index 00000000..bc78bbfc
Binary files /dev/null and b/public/images/homeWu/no-book.png differ
diff --git a/public/images/homeWu/no-case.png b/public/images/homeWu/no-case.png
new file mode 100644
index 00000000..080f5e40
Binary files /dev/null and b/public/images/homeWu/no-case.png differ
diff --git a/public/images/homeWu/no-course.png b/public/images/homeWu/no-course.png
new file mode 100644
index 00000000..83e73b97
Binary files /dev/null and b/public/images/homeWu/no-course.png differ
diff --git a/public/images/homeWu/no-follow.png b/public/images/homeWu/no-follow.png
new file mode 100644
index 00000000..7c324cb7
Binary files /dev/null and b/public/images/homeWu/no-follow.png differ
diff --git a/public/images/homeWu/no-madel.png b/public/images/homeWu/no-madel.png
new file mode 100644
index 00000000..135deb40
Binary files /dev/null and b/public/images/homeWu/no-madel.png differ
diff --git a/public/images/homeWu/no-note.png b/public/images/homeWu/no-note.png
new file mode 100644
index 00000000..ed2818c0
Binary files /dev/null and b/public/images/homeWu/no-note.png differ
diff --git a/public/images/homeWu/no-put.png b/public/images/homeWu/no-put.png
new file mode 100644
index 00000000..62b7348b
Binary files /dev/null and b/public/images/homeWu/no-put.png differ
diff --git a/public/images/homeWu/personal-bgimg.png b/public/images/homeWu/personal-bgimg.png
new file mode 100644
index 00000000..ec836495
Binary files /dev/null and b/public/images/homeWu/personal-bgimg.png differ
diff --git a/public/images/homeWu/u-bg.png b/public/images/homeWu/u-bg.png
new file mode 100644
index 00000000..1b1d27a8
Binary files /dev/null and b/public/images/homeWu/u-bg.png differ
diff --git a/public/images/homeWu/u-close.png b/public/images/homeWu/u-close.png
new file mode 100644
index 00000000..4ea9b1b4
Binary files /dev/null and b/public/images/homeWu/u-close.png differ
diff --git a/public/images/homeWu/u-wu.png b/public/images/homeWu/u-wu.png
new file mode 100644
index 00000000..b51585bd
Binary files /dev/null and b/public/images/homeWu/u-wu.png differ
diff --git a/public/images/homeWu/woman.png b/public/images/homeWu/woman.png
new file mode 100644
index 00000000..f7c53d4e
Binary files /dev/null and b/public/images/homeWu/woman.png differ
diff --git a/public/images/issue(1).png b/public/images/issue(1).png
new file mode 100644
index 00000000..c2bcdb7a
Binary files /dev/null and b/public/images/issue(1).png differ
diff --git a/public/images/issue.png b/public/images/issue.png
index c2bcdb7a..d1ba0709 100644
Binary files a/public/images/issue.png and b/public/images/issue.png differ
diff --git a/public/images/jinian_medal.png b/public/images/jinian_medal.png
new file mode 100644
index 00000000..9b29f624
Binary files /dev/null and b/public/images/jinian_medal.png differ
diff --git a/public/images/list-01.png b/public/images/list-01.png
new file mode 100644
index 00000000..47456321
Binary files /dev/null and b/public/images/list-01.png differ
diff --git a/public/images/list-img.png b/public/images/list-img.png
new file mode 100644
index 00000000..5d574733
Binary files /dev/null and b/public/images/list-img.png differ
diff --git a/public/images/list-or.png b/public/images/list-or.png
new file mode 100644
index 00000000..389aec6b
Binary files /dev/null and b/public/images/list-or.png differ
diff --git a/public/images/list-pink.png b/public/images/list-pink.png
new file mode 100644
index 00000000..ef161a0c
Binary files /dev/null and b/public/images/list-pink.png differ
diff --git a/public/images/list02.png b/public/images/list02.png
new file mode 100644
index 00000000..9acd2cb6
Binary files /dev/null and b/public/images/list02.png differ
diff --git a/public/images/list03.png b/public/images/list03.png
new file mode 100644
index 00000000..893043a2
Binary files /dev/null and b/public/images/list03.png differ
diff --git a/public/images/list04.png b/public/images/list04.png
new file mode 100644
index 00000000..c449a431
Binary files /dev/null and b/public/images/list04.png differ
diff --git a/public/images/list05.png b/public/images/list05.png
new file mode 100644
index 00000000..108f031c
Binary files /dev/null and b/public/images/list05.png differ
diff --git a/public/images/listblue01.png b/public/images/listblue01.png
new file mode 100644
index 00000000..4a76db16
Binary files /dev/null and b/public/images/listblue01.png differ
diff --git a/public/images/listblue010.png b/public/images/listblue010.png
new file mode 100644
index 00000000..d90d730f
Binary files /dev/null and b/public/images/listblue010.png differ
diff --git a/public/images/listblue02.png b/public/images/listblue02.png
new file mode 100644
index 00000000..fe437aa7
Binary files /dev/null and b/public/images/listblue02.png differ
diff --git a/public/images/listblue03.png b/public/images/listblue03.png
new file mode 100644
index 00000000..249ff378
Binary files /dev/null and b/public/images/listblue03.png differ
diff --git a/public/images/listblue04.png b/public/images/listblue04.png
new file mode 100644
index 00000000..c449a431
Binary files /dev/null and b/public/images/listblue04.png differ
diff --git a/public/images/listblue05.png b/public/images/listblue05.png
new file mode 100644
index 00000000..108f031c
Binary files /dev/null and b/public/images/listblue05.png differ
diff --git a/public/images/listblue06.png b/public/images/listblue06.png
new file mode 100644
index 00000000..e674a33f
Binary files /dev/null and b/public/images/listblue06.png differ
diff --git a/public/images/listblue07.png b/public/images/listblue07.png
new file mode 100644
index 00000000..64ad47e5
Binary files /dev/null and b/public/images/listblue07.png differ
diff --git a/public/images/listblue08.png b/public/images/listblue08.png
new file mode 100644
index 00000000..5ef726e7
Binary files /dev/null and b/public/images/listblue08.png differ
diff --git a/public/images/listblue09.png b/public/images/listblue09.png
new file mode 100644
index 00000000..f0534348
Binary files /dev/null and b/public/images/listblue09.png differ
diff --git a/public/images/listred01 .png b/public/images/listred01 .png
new file mode 100644
index 00000000..6d696edf
Binary files /dev/null and b/public/images/listred01 .png differ
diff --git a/public/images/listred02.png b/public/images/listred02.png
new file mode 100644
index 00000000..92de0a49
Binary files /dev/null and b/public/images/listred02.png differ
diff --git a/public/images/listred03.png b/public/images/listred03.png
new file mode 100644
index 00000000..92a16771
Binary files /dev/null and b/public/images/listred03.png differ
diff --git a/public/images/login_medal.png b/public/images/login_medal.png
new file mode 100644
index 00000000..3ecaf5a7
Binary files /dev/null and b/public/images/login_medal.png differ
diff --git a/public/images/luSketch.png b/public/images/luSketch.png
deleted file mode 100644
index 0b8e4624..00000000
Binary files a/public/images/luSketch.png and /dev/null differ
diff --git a/public/images/lvbg.png b/public/images/lvbg.png
new file mode 100644
index 00000000..a5cbd97b
Binary files /dev/null and b/public/images/lvbg.png differ
diff --git a/public/images/medal.png b/public/images/medal.png
new file mode 100644
index 00000000..24bba6b0
Binary files /dev/null and b/public/images/medal.png differ
diff --git a/public/images/no-note.png b/public/images/no-note.png
new file mode 100644
index 00000000..eefd58bd
Binary files /dev/null and b/public/images/no-note.png differ
diff --git a/public/images/nocase.png b/public/images/nocase.png
new file mode 100644
index 00000000..c7b05176
Binary files /dev/null and b/public/images/nocase.png differ
diff --git a/public/images/nocouresimg.png b/public/images/nocouresimg.png
new file mode 100644
index 00000000..19d5224b
Binary files /dev/null and b/public/images/nocouresimg.png differ
diff --git a/public/images/opinion(1).png b/public/images/opinion(1).png
new file mode 100644
index 00000000..d473c1f3
Binary files /dev/null and b/public/images/opinion(1).png differ
diff --git a/public/images/opinion.png b/public/images/opinion.png
index d473c1f3..311eb815 100644
Binary files a/public/images/opinion.png and b/public/images/opinion.png differ
diff --git a/public/images/orgaimg.png b/public/images/orgaimg.png
new file mode 100644
index 00000000..157da35c
Binary files /dev/null and b/public/images/orgaimg.png differ
diff --git a/public/images/phone.png b/public/images/phone.png
new file mode 100644
index 00000000..6de5c119
Binary files /dev/null and b/public/images/phone.png differ
diff --git a/public/images/playicon.png b/public/images/playicon.png
new file mode 100644
index 00000000..b9e0940b
Binary files /dev/null and b/public/images/playicon.png differ
diff --git a/public/images/playtime.png b/public/images/playtime.png
new file mode 100644
index 00000000..c917edc5
Binary files /dev/null and b/public/images/playtime.png differ
diff --git a/public/images/qa-banner.png b/public/images/qa-banner.png
new file mode 100644
index 00000000..5fddef1b
Binary files /dev/null and b/public/images/qa-banner.png differ
diff --git a/public/images/qa-box.png b/public/images/qa-box.png
new file mode 100644
index 00000000..01691163
Binary files /dev/null and b/public/images/qa-box.png differ
diff --git a/public/images/rank1.png b/public/images/rank1.png
new file mode 100644
index 00000000..4bf3b9a4
Binary files /dev/null and b/public/images/rank1.png differ
diff --git a/public/images/rank2.png b/public/images/rank2.png
new file mode 100644
index 00000000..008ca416
Binary files /dev/null and b/public/images/rank2.png differ
diff --git a/public/images/rank3.png b/public/images/rank3.png
new file mode 100644
index 00000000..5122607d
Binary files /dev/null and b/public/images/rank3.png differ
diff --git a/public/images/replyimg.png b/public/images/replyimg.png
new file mode 100644
index 00000000..cc6569df
Binary files /dev/null and b/public/images/replyimg.png differ
diff --git a/public/images/specimg.png b/public/images/specimg.png
new file mode 100644
index 00000000..6309ebe6
Binary files /dev/null and b/public/images/specimg.png differ
diff --git a/public/images/study-info.png b/public/images/study-info.png
new file mode 100644
index 00000000..bb2fa446
Binary files /dev/null and b/public/images/study-info.png differ
diff --git a/public/images/success-note.png b/public/images/success-note.png
new file mode 100644
index 00000000..ca91f8b6
Binary files /dev/null and b/public/images/success-note.png differ
diff --git a/public/images/tearch-top.png b/public/images/tearch-top.png
new file mode 100644
index 00000000..ee8d4220
Binary files /dev/null and b/public/images/tearch-top.png differ
diff --git a/public/images/userbgimg.png b/public/images/userbgimg.png
new file mode 100644
index 00000000..2f0dae40
Binary files /dev/null and b/public/images/userbgimg.png differ
diff --git a/public/images/weiSketch.png b/public/images/weiSketch.png
deleted file mode 100644
index eb4ea0d8..00000000
Binary files a/public/images/weiSketch.png and /dev/null differ
diff --git a/public/index.html b/public/index.html
index add72467..12a0ba92 100644
--- a/public/index.html
+++ b/public/index.html
@@ -14,7 +14,9 @@
     <meta name="referrer" content="strict-origin-when-cross-origin"/>
     <link rel="icon" href="<%= BASE_URL %>logo/favicon.ico">
     <title>京东方大学堂</title>
+    
     <script>
+      
       if(window.top != window.self){
          window.top.location=window.self.location;
       }
@@ -30,7 +32,7 @@
     </script>
   </head>
   <style>
-    #app,body,html{height:100%;margin:0;padding:0}
+    #app,body,html{height:100%;margin:0;padding:0;min-width: 1280px;}
     body{
       /**background: url(/images/center_bg.jpg);**/
       /* background-size: cover; */
diff --git a/public/logo/logo.png b/public/logo/logo.png
new file mode 100644
index 00000000..026a8e51
Binary files /dev/null and b/public/logo/logo.png differ
diff --git a/src/api/ajax.js b/src/api/ajax.js
new file mode 100644
index 00000000..bed47e27
--- /dev/null
+++ b/src/api/ajax.js
@@ -0,0 +1,194 @@
+import axios from 'axios'
+import qs from 'qs'
+import { Notification, MessageBox, Message } from 'element-ui'
+import store from '@/store'
+import { getToken } from '@/utils/token'
+import errorCode from '@/utils/errorCode'
+/**
+ *request请求 axios.request(config)
+ *requestJson请求 axios.request(config)
+ *get请求 axios.get(url[, config])
+ *post请求 axios.post(url[, data[, config]])
+ *postJson请求 axios.post(url[, data[, config]])
+ *put请求 axios.put(url[, data[, config]])
+ *putJson请求 axios.put(url[, data[, config]])
+ *patch请求 axios.patch(url[, data[, config]])
+ *patchJson请求 axios.patch(url[, data[, config]])
+ *delete请求 axios.delete(url[, config])
+ */
+
+
+// const ReLoginUrl=process.env.VUE_APP_LOGIN_URL;
+const TokenName='XBOE-Access-Token';
+/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
+//只是用于发送json对象数据时使用post,put,patch
+/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
+//只是用于发送json对象数据时使用post,put,patch
+//用于普通的发送请求
+const formRequest=axios.create({
+    // headers:{'Content-Type':'application/x-www-form-urlencoded'},
+    // axios中请求配置有baseURL选项，表示请求URL公共部分
+    // baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
+    //超时
+    timeout: 10000,
+  })
+  //发送json对象的拦截器
+  formRequest.interceptors.request.use(config => {
+    //是否需要设置 token
+    const isToken = (config.headers || {}).isToken === false
+    if (getToken() && !isToken) {
+       config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+    }
+    return config
+  }, error => {
+      console.log(error)
+      Promise.reject(error)
+  });
+  formRequest.interceptors.response.use(res => {
+      const code = res.data.status || 200;
+       if(code===200){
+           return res.data
+       }else{
+           if(code === 401){
+                 store.dispatch('LogOut').then(() => {
+                    location.href = this.webBaseUrl + ReLoginUrl;
+                 })
+           }else if(code===403){
+              var msg='当前操作没有权限';
+              Message({message: msg, type: 'error'});
+              return Promise.reject(new Error(msg))
+           }else{
+              //Message({message: res.data.message, type: 'error'});
+              //console.log('err' + res.data.error);
+              return res.data
+           }
+       }
+    },
+    error => {
+      console.log('err' + error)
+      let { message } = error;
+      if (message == "Network Error") {
+        message = "网络异常，请稍后重试";
+      }
+      else if (message.includes("timeout")) {
+        message = "网络异常或接口错误，请求超时";
+      }
+      else if (message.includes("Request failed with status code")) {
+        message = "系统接口" + message.substr(message.length - 3) + "异常";
+      }
+      Message({
+        message: message,
+        type: 'error',
+        duration: 5 * 1000
+      })
+      return Promise.reject(error)
+    }
+  )
+
+/**
+ * request请求,可以自定义参数
+ */
+const request=formRequest.request;
+
+/**
+ * get请求 ,只有url
+ */
+const get = function(baseURL,url){
+	return request({
+        baseURL,
+		url: url,
+		method: 'get',
+        headers:{'Content-Type':'application/x-www-form-urlencoded'}
+	})
+}
+
+/**
+ * post请求
+ * @param {Object} url
+ * @param {Object} postData
+ */
+const post=function(baseURL,url,postData){
+   if(postData){
+      postData=qs.stringify(postData);
+   }
+   return request({
+    baseURL,
+   	url: url,
+   	method: 'post',
+	data:postData,
+	headers:{'Content-Type':'application/x-www-form-urlencoded'}
+   })
+}
+//post请求
+const postForm=function(baseURL,url,data){
+    return request({
+        baseURL,
+        url,
+        data,
+        method: 'post',
+        headers:{'Content-Type':'application/x-www-form-urlencoded'}
+    });
+ }
+//  const postJson=jsonRequest.post;
+
+const postJson=function(baseURL,url,postData){
+   return request({
+    baseURL,
+   	url: url,
+   	method: 'post',
+	data:postData,
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+   })
+}
+
+// 导出文件请求定义
+const postJsonToFile=function(baseURL,url,postData){
+   return request({
+    baseURL,
+   	url: url,
+   	method: 'post',
+	data:postData,
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
+   })
+}
+
+
+/**
+ * put请求
+ */
+const put=function(baseURL,url,data){
+   if(data){
+      data=qs.stringify(data);
+   }
+   return request({
+    baseURL,
+   	url: url,
+   	method: 'put',
+   	data:data,
+   	headers:{'Content-Type':'application/x-www-form-urlencoded'}
+   })
+}
+
+const putJson=function(baseURL,url,data){
+   return request({
+    baseURL,
+   	url: url,
+   	method: 'put',
+   	data:data,
+       headers:{'Content-Type':'application/json;charset=utf-8'},
+   })
+}
+
+
+
+export default {
+    tokenName:TokenName,
+    request,
+    get,
+    post,
+    postJson,
+    postJsonToFile,
+    put,
+    putJson,
+}
diff --git a/src/api/boe/boeApiAjax.js b/src/api/boe/boeApiAjax.js
index 8894483c..3134a91a 100644
--- a/src/api/boe/boeApiAjax.js
+++ b/src/api/boe/boeApiAjax.js
@@ -72,7 +72,7 @@ jsonRequest.interceptors.response.use(res => {
     console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
-      message = "后端接口连接异常";
+      message = "网络异常，请稍后重试";
     }
     else if (message.includes("timeout")) {
       message = "系统接口请求超时";
@@ -135,7 +135,7 @@ formRequest.interceptors.response.use(res => {
     console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
-      message = "后端接口连接异常";
+      message = "网络异常，请稍后重试";
     }
     else if (message.includes("timeout")) {
       message = "系统接口请求超时";
diff --git a/src/api/cesource/index.js b/src/api/cesource/index.js
new file mode 100644
index 00000000..5c950179
--- /dev/null
+++ b/src/api/cesource/index.js
@@ -0,0 +1,201 @@
+import axios from 'axios'
+import qs from 'qs'
+import { Notification, MessageBox, Message } from 'element-ui'
+import store from '@/store'
+import { getToken } from '@/utils/token'
+import errorCode from '@/utils/errorCode'
+/**
+ *request请求 axios.request(config)
+ *requestJson请求 axios.request(config)
+ *get请求 axios.get(url[, config])
+ *post请求 axios.post(url[, data[, config]])
+ *postJson请求 axios.post(url[, data[, config]])
+ *put请求 axios.put(url[, data[, config]])
+ *putJson请求 axios.put(url[, data[, config]])
+ *patch请求 axios.patch(url[, data[, config]])
+ *patchJson请求 axios.patch(url[, data[, config]])
+ *delete请求 axios.delete(url[, config])
+ */
+  
+const ReLoginUrl="/login";
+const TokenName='XBOE-Access-Token';
+/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
+//只是用于发送json对象数据时使用post,put,patch
+const jsonRequest=axios.create({
+  headers:{'Content-Type':'application/json;charset=utf-8'},
+  // axios中请求配置有baseURL选项，表示请求URL公共部分
+  baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
+  //超时
+  timeout: 10000,
+});
+//发送json对象的拦截器
+jsonRequest.interceptors.request.use(config => {
+  //是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false
+  if (getToken() && !isToken) {
+     config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+  }
+  return config
+}, error => {
+    console.log(error)
+    Promise.reject(error)
+})
+
+// 响应拦截器
+jsonRequest.interceptors.response.use(res => {
+
+    const code = res.data.status || 200;
+     if(code===200){
+         return res.data
+     }else{
+         if(code === 401){
+               store.dispatch('LogOut').then(() => {
+                  location.href = this.webBaseUrl + ReLoginUrl;
+               })
+         }else if(code===403){
+            var msg='当前操作没有权限';
+            Message({message: msg, type: 'error'});
+            return Promise.reject(new Error(msg))
+         }else{
+            //Message({message: res.data.message, type: 'error'});
+            //console.log('err:' + res.data.error);
+            return res.data;
+            //return Promise.reject(new Error(res.data.message))
+         }
+     }
+  },
+  error => {
+    console.log('err' + error)
+    let { message } = error;
+    if (message == "Network Error") {
+      message = "网络异常，请稍后重试";
+    }
+    else if (message.includes("timeout")) {
+      message = "系统接口请求超时";
+    }
+    else if (message.includes("Request failed with status code")) {
+      message = "系统接口" + message.substr(message.length - 3) + "异常";
+    }
+    Message({
+      message: message,
+      type: 'error',
+      duration: 5 * 1000
+    })
+    return Promise.reject(error)
+  }
+)
+
+//用于普通的发送请求
+const formRequest=axios.create({
+  headers:{'Content-Type':'application/x-www-form-urlencoded'},
+  // axios中请求配置有baseURL选项，表示请求URL公共部分
+  baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
+  //超时
+  timeout: 10000,
+})
+//发送json对象的拦截器
+formRequest.interceptors.request.use(config => {
+  //是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false
+  if (getToken() && !isToken) {
+     config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+  }
+  return config
+}, error => {
+    console.log(error)
+    Promise.reject(error)
+});
+formRequest.interceptors.response.use(res => {
+    const code = res.data.status || 200;
+     if(code===200){
+         return res.data
+     }else{
+         if(code === 401){
+               store.dispatch('LogOut').then(() => {
+                  location.href = this.webBaseUrl + ReLoginUrl;
+               })
+         }else if(code===403){
+            var msg='当前操作没有权限';
+            Message({message: msg, type: 'error'});
+            return Promise.reject(new Error(msg))
+         }else{
+            //Message({message: res.data.message, type: 'error'});
+            //console.log('err' + res.data.error);
+            return res.data
+         }
+     }
+  },
+  error => {
+    console.log('err' + error)
+    let { message } = error;
+    if (message == "Network Error") {
+      message = "网络异常，请稍后重试";
+    }
+    else if (message.includes("timeout")) {
+      message = "系统接口请求超时";
+    }
+    else if (message.includes("Request failed with status code")) {
+      message = "系统接口" + message.substr(message.length - 3) + "异常";
+    }
+    Message({
+      message: message,
+      type: 'error',
+      duration: 5 * 1000
+    })
+    return Promise.reject(error)
+  }
+)
+
+//request请求
+const request=function(cfg){
+   if(cfg.data){
+      cfg.data=qs.stringify(cfg.data);
+   }
+};
+//requestJson请求
+const requestJson=jsonRequest.request;
+//get请求
+const get=formRequest.request;
+//post请求
+const post=function(url,data,config){
+   if(data){
+      data=qs.stringify(data);
+   }
+   return formRequest.post(url,data,config);
+}
+//postJson请求
+const postJson=jsonRequest.post;
+//put请求
+const put=function(url,data,config){
+   if(data){
+      data=qs.stringify(data);
+   }
+   return formRequest.put(url,data,config);
+}
+//putJson请求
+const putJson=jsonRequest.put;
+//patch请求
+const patch=function(url,data,config){
+   if(data){
+      data=qs.stringify(data);
+   }
+   return formRequest.patch(url,data,config);
+}
+//patchJson请求
+const patchJson=jsonRequest.patch;
+//delete请求
+const del=formRequest.delete;
+
+
+export default {
+    request,
+    requestJson,
+    get,
+    post,
+    postJson,
+    put,
+    putJson,
+    patch,
+    patchJson,
+    del
+}
diff --git a/src/api/event/index.js b/src/api/event/index.js
new file mode 100644
index 00000000..4e228a12
--- /dev/null
+++ b/src/api/event/index.js
@@ -0,0 +1,201 @@
+import axios from 'axios'
+import qs from 'qs'
+import { Notification, MessageBox, Message } from 'element-ui'
+import store from '@/store'
+import { getToken } from '@/utils/token'
+import errorCode from '@/utils/errorCode'
+/**
+ *request请求 axios.request(config)
+ *requestJson请求 axios.request(config)
+ *get请求 axios.get(url[, config])
+ *post请求 axios.post(url[, data[, config]])
+ *postJson请求 axios.post(url[, data[, config]])
+ *put请求 axios.put(url[, data[, config]])
+ *putJson请求 axios.put(url[, data[, config]])
+ *patch请求 axios.patch(url[, data[, config]])
+ *patchJson请求 axios.patch(url[, data[, config]])
+ *delete请求 axios.delete(url[, config])
+ */
+
+const ReLoginUrl="/login";
+const TokenName='XBOE-Access-Token';
+/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
+//只是用于发送json对象数据时使用post,put,patch
+const jsonRequest=axios.create({
+  headers:{'Content-Type':'application/json;charset=utf-8'},
+  // axios中请求配置有baseURL选项，表示请求URL公共部分
+  baseURL: process.env.VUE_APP_STAT_BASE_API,
+  //超时
+  timeout: 10000,
+});
+//发送json对象的拦截器
+jsonRequest.interceptors.request.use(config => {
+  //是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false
+  if (getToken() && !isToken) {
+     config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+  }
+  return config
+}, error => {
+    console.log(error)
+    Promise.reject(error)
+})
+
+// 响应拦截器
+jsonRequest.interceptors.response.use(res => {
+
+    const code = res.data.status || 200;
+     if(code===200){
+         return res.data
+     }else{
+         if(code === 401){
+               store.dispatch('LogOut').then(() => {
+                  location.href = this.webBaseUrl + ReLoginUrl;
+               })
+         }else if(code===403){
+            var msg='当前操作没有权限';
+            Message({message: msg, type: 'error'});
+            return Promise.reject(new Error(msg))
+         }else{
+            //Message({message: res.data.message, type: 'error'});
+            //console.log('err:' + res.data.error);
+            return res.data;
+            //return Promise.reject(new Error(res.data.message))
+         }
+     }
+  },
+  error => {
+    console.log('err' + error)
+    let { message } = error;
+    if (message == "Network Error") {
+      message = "网络异常，请稍后重试";
+    }
+    else if (message.includes("timeout")) {
+      message = "系统接口请求超时";
+    }
+    else if (message.includes("Request failed with status code")) {
+      message = "系统接口" + message.substr(message.length - 3) + "异常";
+    }
+    Message({
+      message: message,
+      type: 'error',
+      duration: 5 * 1000
+    })
+    return Promise.reject(error)
+  }
+)
+
+//用于普通的发送请求
+const formRequest=axios.create({
+  headers:{'Content-Type':'application/x-www-form-urlencoded'},
+  // axios中请求配置有baseURL选项，表示请求URL公共部分
+  baseURL: process.env.VUE_APP_STAT_BASE_API,
+  //超时
+  timeout: 10000,
+})
+//发送json对象的拦截器
+formRequest.interceptors.request.use(config => {
+  //是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false
+  if (getToken() && !isToken) {
+     config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+  }
+  return config
+}, error => {
+    console.log(error)
+    Promise.reject(error)
+});
+formRequest.interceptors.response.use(res => {
+    const code = res.data.status || 200;
+     if(code===200){
+         return res.data
+     }else{
+         if(code === 401){
+               store.dispatch('LogOut').then(() => {
+                  location.href = this.webBaseUrl + ReLoginUrl;
+               })
+         }else if(code===403){
+            var msg='当前操作没有权限';
+            Message({message: msg, type: 'error'});
+            return Promise.reject(new Error(msg))
+         }else{
+            //Message({message: res.data.message, type: 'error'});
+            //console.log('err' + res.data.error);
+            return res.data
+         }
+     }
+  },
+  error => {
+    console.log('err' + error)
+    let { message } = error;
+    if (message == "Network Error") {
+      message = "网络异常，请稍后重试";
+    }
+    else if (message.includes("timeout")) {
+      message = "系统接口请求超时";
+    }
+    else if (message.includes("Request failed with status code")) {
+      message = "系统接口" + message.substr(message.length - 3) + "异常";
+    }
+    Message({
+      message: message,
+      type: 'error',
+      duration: 5 * 1000
+    })
+    return Promise.reject(error)
+  }
+)
+
+//request请求
+const request=function(cfg){
+   if(cfg.data){
+      cfg.data=qs.stringify(cfg.data);
+   }
+};
+//requestJson请求
+const requestJson=jsonRequest.request;
+//get请求
+const get=formRequest.request;
+//post请求
+const post=function(url,data,config){
+   if(data){
+      data=qs.stringify(data);
+   }
+   return formRequest.post(url,data,config);
+}
+//postJson请求
+const postJson=jsonRequest.post;
+//put请求
+const put=function(url,data,config){
+   if(data){
+      data=qs.stringify(data);
+   }
+   return formRequest.put(url,data,config);
+}
+//putJson请求
+const putJson=jsonRequest.put;
+//patch请求
+const patch=function(url,data,config){
+   if(data){
+      data=qs.stringify(data);
+   }
+   return formRequest.patch(url,data,config);
+}
+//patchJson请求
+const patchJson=jsonRequest.patch;
+//delete请求
+const del=formRequest.delete;
+
+
+export default {
+    request,
+    requestJson,
+    get,
+    post,
+    postJson,
+    put,
+    putJson,
+    patch,
+    patchJson,
+    del
+}
diff --git a/src/api/modules/article.js b/src/api/modules/article.js
index b88d55cd..eb9fa3e9 100644
--- a/src/api/modules/article.js
+++ b/src/api/modules/article.js
@@ -11,7 +11,7 @@ const portalList = function(num, type) {
     return ajax.get(`/xboe/m/article/list?num=${num}&type=${type}`);
 }
 /*
- 文章列表，门户页面 
+ 文章列表，门户页面
  @param{Objece} query 查询的json{pageIndex:1,pageSize:20,keyword:'',}
  */
 const findPortal=function(query){
@@ -112,13 +112,22 @@ const savaAudit = function(id,auditRemark,auditState) {
 const isEnabled = function(id,enabled) {
     return ajax.get(`/xboe/m/article/isEnabled?id=${id}&enabled=${enabled}`);
 }
-/* 
+/*
 贡献排行榜
 pageSize 你需要的条数
  */
 const countsUsername=function(pageSize){
     return ajax.get('/xboe/m/article/counts-username?pageSize='+pageSize);
 }
+/**
+ * 二次查询
+ * @param{
+ *   ids
+ * }
+ * */
+const ids=function (data){
+  return ajax.postJson('/xboe/m/article/ids',data);
+}
 
 export default {
     portalList,
@@ -134,5 +143,6 @@ export default {
     isEnabled,
     findPortal,
 	usernameList,
-    countsUsername
+    countsUsername,
+  ids
 }
diff --git a/src/api/modules/cases.js b/src/api/modules/cases.js
index 7d7f1542..1a8cbced 100644
--- a/src/api/modules/cases.js
+++ b/src/api/modules/cases.js
@@ -109,6 +109,16 @@ const details = function (id, addView) {
   return ajax.get('/xboe/m/boe/cases/details?' + pars);
 }
 
+/**
+ * 二次查询
+ * @param{
+ *   ids
+ * }
+ * */
+const ids=function (data){
+  return ajax.postJson('/xboe/m/boe/cases/ids',data);
+}
+
 export default {
     indexList,
     queryList,
@@ -122,5 +132,6 @@ export default {
 	queryPraises,
 	queryComments,
   majorTypes,
-  details
+  details,
+  ids
 }
diff --git a/src/api/modules/comments.js b/src/api/modules/comments.js
index e7e43283..f1c9d962 100644
--- a/src/api/modules/comments.js
+++ b/src/api/modules/comments.js
@@ -1,6 +1,15 @@
 /* 评论的相关处理*/
 import ajax from '@/utils/xajax.js'
 
+/*
+查询评论
+objType
+objId
+ */
+const listQuery=function(query){
+	return ajax.post('/xboe/m/comment/list',query);
+}
+
 /*
 查询评论
 get post请求都可以，
@@ -101,6 +110,7 @@ export default{
 	del,
 	update,
 	add,
+  listQuery,
 	pagelist,
 	pageQuery,
 	reply,
diff --git a/src/api/modules/course.js b/src/api/modules/course.js
index e9399927..40d105b4 100644
--- a/src/api/modules/course.js
+++ b/src/api/modules/course.js
@@ -274,18 +274,13 @@ const countWaitAudit = function() {
 }
 
 /**
- * 管理员需要审核的课程列表
+ * 当前用户需要审核的课程列表
  * @param {Object} query 同pageList
  */
 const auditList = function(query) {
     return ajax.post('/xboe/m/course/manage/audit-pagelist', query);
 }
 
-/**教师需要审核的课程列表*/
-const teacherAuditList = function(query) {
-    return ajax.post('/xboe/m/course/audit/teacher-course', query);
-}
-
 /**
  * 指定审核人，转审核人
  * 点击“转审” 弹出教师查询窗口，查询教师，填写备注，提交，调用此接口
@@ -322,7 +317,6 @@ const audit = function(data) {
     return ajax.post('/xboe/m/course/manage/audit', data);
 }
 
-
 /**
  * 审核记录列表，分页查询
  */
@@ -434,6 +428,15 @@ const queryCrowd=function(query){
 	return ajax.postJson('/xboe/m/course/manage/queryCrowd',query);
 }
 
+/**
+ * 二次查询
+ * @param{
+ *   ids
+ * }
+ * */
+const ids=function (data){
+  return ajax.postJson('/xboe/m/course/manage/ids',data);
+}
 export default {
     saveBase,
     submitCourse,
@@ -451,7 +454,6 @@ export default {
     getHomework,
     countWaitAudit,
     auditList,
-    teacherAuditList,
     auditAppoint,
     getAuditInfo,
     getAuditLogs,
@@ -475,6 +477,7 @@ export default {
 	exportTeacherCourse,
 	exportCourseAudit,
 	exportCourse,
-	queryCrowd
+	queryCrowd,
+  ids
 
 }
diff --git a/src/api/modules/coursePortal.js b/src/api/modules/coursePortal.js
index 2fe2d9bf..3af8fd4f 100644
--- a/src/api/modules/coursePortal.js
+++ b/src/api/modules/coursePortal.js
@@ -59,8 +59,8 @@ const ranking = function(data) {
 评分榜
 @param num 要几条传几条 不传默认五条
  */
-const scorelist=function(num){
-	return ajax.get(`/xboe/m/course/portal/score-list?num=${num}`);
+const scorelist=function(num,p){
+	return ajax.get(`/xboe/m/course/portal/score-list?num=${num}&index=${p}`);
 }
 
 
diff --git a/src/api/modules/courseStudy.js b/src/api/modules/courseStudy.js
index efbca95c..3d07ce7e 100644
--- a/src/api/modules/courseStudy.js
+++ b/src/api/modules/courseStudy.js
@@ -66,6 +66,9 @@ const countSignup = function(courseId) {
     return ajax.post('/xboe/school/study/signup/count-by-course',{courseId});
 }
 
+const studyIndex = function(courseId) {
+    return ajax.get('/xboe/school/study/course/studyIndex?cid='+courseId+'&addView=true');
+}
 
 /**
  * 课程学习，根据课程id来获取,
@@ -340,11 +343,33 @@ const myAssessList = function(data) {
 /*
 删除课程学习记录
 @param id 学习id
-@param courseId 课程id 用于删除课程报名信息和修改课程学习人数 
+@param courseId 课程id 用于删除课程报名信息和修改课程学习人数
  */
 const deleteSignUp=function(id,courseId){
-	return ajax.post(`/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId}`);	
-} 
+	return ajax.post(`/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId}`);
+}
+
+/**
+ * 二次查询 用于个人主页/他人主页
+ * {
+ *   ids [] 数组，是那个动态列表的contentId
+ *   aid 个人主页可以不传 他人主页传
+ * }
+ * */
+const ids=function (data){
+  return ajax.postJson('/xboe/school/study/course/ids',data);
+}
+
+/**
+ * 二次查询 用于我的关注
+ * {
+ *   ids [] 数组，是那个动态列表的contentId
+ *   aids 我关注的人的id  调完接口查询出的followId
+ * }
+ * */
+const followIds=function (data){
+  return ajax.postJson('/xboe/school/study/course/follow-ids',data);
+}
 export default {
     hasSignup,
     signup,
@@ -352,6 +377,7 @@ export default {
     deleteSignup,
     importSignup,
     countSignup,
+    studyIndex,
     studyInfo,
     studyVideoTime,
     lastStudy,
@@ -373,5 +399,7 @@ export default {
     myAssessList,
     myExamList2,
 	myCourseStudy,
-	deleteSignUp
+	deleteSignUp,
+  ids,
+  followIds
 }
diff --git a/src/api/modules/favorites.js b/src/api/modules/favorites.js
index 165bc5c1..67b26dff 100644
--- a/src/api/modules/favorites.js
+++ b/src/api/modules/favorites.js
@@ -103,6 +103,16 @@ const isNoFavorite=function(date){
   return ajax.postJson('/xboe/m/favorite/isNoFavorite',data);
 }
 
+/**
+ * 我收藏的回答
+ * pageIndex 页数
+ * pageSize 条数
+ * keyword 关键词
+ * */
+const findAnswerPage=function(data){
+  return ajax.post('/xboe/m/favorite/favorite-answer',data);
+}
+
 export default{
     has,
     remove,
@@ -115,5 +125,6 @@ export default{
     coursePageList,
     findAll,
 	  queryAll,
-    isNoFavorite
+    isNoFavorite,
+  findAnswerPage
 }
diff --git a/src/api/modules/qa.js b/src/api/modules/qa.js
index 7673893e..b1ae64a0 100644
--- a/src/api/modules/qa.js
+++ b/src/api/modules/qa.js
@@ -187,11 +187,23 @@ const replayClevel3=function(data){
 const saveComment=function(data) {
 	return ajax.postJson('/xboe/m/qa/answer/save-comment',data);
 }
+
+
+/**
+ * 二次查询
+ * @param{
+ *   ids
+ * }
+ * */
+const ids=function (data){
+  return ajax.postJson('/xboe/m/qa/question/ids',data);
+}
+const answerIds=function(data){return ajax.postJson('/xboe/m/qa/answer/ids',data);}
 export default{
 	indexList,
-  pageList,
-  detail,
-  save,
+	pageList,
+	detail,
+	save,
 	del,
 	queryList,
 	answerList,
@@ -200,15 +212,17 @@ export default{
 	delAnswer,
 	detailAnswer,
 	isBest,
-  cancelBest,
+  	cancelBest,
 	savaAudit,
-  isEssence,
-  queryAnswer,
-  queryQuestion,
-  potallist,
-  update,
-  page,
-  has,
-  saveComment,
-  replayClevel3
+	isEssence,
+	queryAnswer,
+	queryQuestion,
+	potallist,
+	update,
+	page,
+	has,
+	saveComment,
+	replayClevel3,
+	ids,
+	answerIds
 }
diff --git a/src/api/modules/userstart.js b/src/api/modules/userstart.js
new file mode 100644
index 00000000..40edb20f
--- /dev/null
+++ b/src/api/modules/userstart.js
@@ -0,0 +1,30 @@
+import ajax from '../event/index.js'
+
+
+
+/**
+ * 用户的累计信息
+ * @param{
+ *   types 数组 10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
+ * }
+ * */
+const user=function (query){
+  return ajax.postJson('/xboe/stat/m/user/current',query);
+}
+
+/**
+ * 前num的排名
+ * @parm{
+ *   statType  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
+ *   field    todays,weeks,months,years.total
+ *   num 条数
+ * }
+ * */
+const ranking=function (query){
+  return ajax.post('/xboe/stat/m/user/ranking/user',query);
+}
+
+export default {
+  user,
+  ranking
+}
diff --git a/src/api/phase2/guestbook.js b/src/api/phase2/guestbook.js
new file mode 100644
index 00000000..6b256a9b
--- /dev/null
+++ b/src/api/phase2/guestbook.js
@@ -0,0 +1,70 @@
+// import ajax from '@/utils/xajax.js'
+import ajax from '../ajax';
+const baseURL = process.env.VUE_APP_CESOURCE_BASE_API;
+
+
+/**
+ * 保存或者编辑留言
+ * @param{
+ *   content,留言内容
+ *   aid  要留言的人的id
+ *
+ * }
+ * */
+const save=function (data){
+  return ajax.postJson(baseURL,'/xboe/subgroup/m/guest/save',data);
+}
+
+/**
+ * 删除留言
+ * */
+const del=function (id){
+  return ajax.get(baseURL,'/xboe/subgroup/m/guest/delete?id='+id);
+}
+
+/**
+ * 回复或者删除留言
+ * @param{
+ *   id
+ *   reply 回复内容
+ * }
+ * */
+const answer=function (data){
+  return ajax.post(baseURL,'/xboe/subgroup/m/guest/answer',data);
+}
+
+/**
+ * 给我的留言
+ * @param{
+ *   pageIndex
+ *   pageSize
+ *   aid
+ * }
+ * */
+const givelist=function (query){
+  return ajax.post(baseURL,'/xboe/subgroup/m/guest/givelist',query);
+}
+
+/**
+ * 我的留言
+ * @param{
+ *   pageIndex
+ *   pageSize
+ *   aid
+ * }
+ * */
+const mylist=function (query){
+  return ajax.post(baseURL,'/xboe/subgroup/m/guest/mylist',query);
+}
+
+export default {
+  save,
+  answer,
+  del,
+  givelist,
+  mylist
+}
+
+
+
+
diff --git a/src/api/phase2/guide.js b/src/api/phase2/guide.js
new file mode 100644
index 00000000..39505105
--- /dev/null
+++ b/src/api/phase2/guide.js
@@ -0,0 +1,31 @@
+// import ajax from '@/utils/xajax.js'
+import ajax from '../ajax';
+const baseURL = process.env.VUE_APP_CESOURCE_BASE_API;
+
+
+/**
+ * 显示提取，一次性
+ * */
+const list=function (){
+  return ajax.get(baseURL,'/xboe/subgroup/m/guide/list');
+}
+
+/**
+ * 保存或编辑
+ * */
+const save=function (data){
+  return ajax.postJson(baseURL,'/xboe/subgroup/m/guide/save',data);
+}
+
+/**
+ * 判断当前用户是否登录过
+ * */
+const hasUser=function (){
+  return ajax.get(baseURL,'/xboe/subgroup/m/guide/hasUser');
+}
+
+export default {
+  list,
+  save,
+  hasUser
+}
diff --git a/src/api/phase2/index.js b/src/api/phase2/index.js
new file mode 100644
index 00000000..c22ebb31
--- /dev/null
+++ b/src/api/phase2/index.js
@@ -0,0 +1,49 @@
+import ajax from '@/utils/xajax.js'
+
+
+/**
+ * 首页推荐案例
+ * @param type 2最热 1最新
+ * */
+const cases=function (type){
+  return ajax.get('/xboe/portal/index/cases?type='+type);
+}
+
+/**
+ * 首页文章排行榜
+ * @param num 条数 不传默认5条
+ * */
+const articleViews=function (num){
+  return ajax.get('/xboe/portal/index/article-views?num='+num);
+}
+
+/**
+ * 首页问答排行榜
+ * @param num 条数 不传默认5条
+ * */
+const qaAnswers=function (num){
+  return ajax.get('/xboe/portal/index/qa-answers?num='+num);
+}
+
+/**
+ * 1最新 2最热
+ * */
+const articlelist=function (type){
+  return ajax.get('/xboe/portal/index/articlelist?type='+type);
+}
+
+/**
+ * 首页课程排行榜
+ * 参数和原接口一样，只需要换接口名称就可以
+ * */
+const courselist=function (data){
+  return ajax.post('/xboe/portal/index/courselist',data);
+}
+
+export default {
+  cases,
+  articleViews,
+  qaAnswers,
+  articlelist,
+  courselist
+}
diff --git a/src/api/phase2/note.js b/src/api/phase2/note.js
new file mode 100644
index 00000000..c5612563
--- /dev/null
+++ b/src/api/phase2/note.js
@@ -0,0 +1,205 @@
+// import ajax from '@/utils/xajax.js'
+// import ajax from '../cesource/index.js';
+import axios from 'axios'
+import { getToken } from '@/utils/token'
+import ajax from '../ajax';
+const baseURL = process.env.VUE_APP_CESOURCE_BASE_API;
+
+
+/**
+ * 添加或者编辑
+ * @param 参数见设计文档
+ * */
+const save=function (data){
+  return ajax.postJson(baseURL,'/xboe/subgroup/m/noteinfo/save',data);
+}
+
+/**
+ * 添加或者编辑
+ * @param 参数见设计文档
+ * */
+const update=function (data){
+  return ajax.postJson(baseURL,'/xboe/subgroup/m/noteinfo/update',data);
+}
+
+/**
+ * 详情
+ * */
+const detail=function (id){
+  return ajax.get(baseURL,'/xboe/subgroup/m/noteinfo/detail?id='+id);
+}
+
+/**
+ * 删除笔记
+ * */
+const del=function (id){
+  return ajax.get(baseURL,'/xboe/subgroup/m/noteinfo/delete?id='+id);
+}
+
+/**
+ * 查询课程笔记
+ * @param{
+ *   pageIndex
+ *   pageSize
+ *   courseId 课程id
+ *   openType 公开类型
+ * }
+ * */
+const coursePage=function (query){
+  return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/course-page',query);
+}
+
+/**
+ * 查询我的指定课程笔记
+ * */
+const myCourse=function (courseId){
+  return ajax.get(baseURL,'/xboe/subgroup/m/noteinfo/mycourse?courseId='+courseId);
+}
+
+/**
+ * 查询笔记的修改历史
+ * */
+const history=function (noteId){
+  return ajax.get(baseURL,'/xboe/subgroup/m/noteinfo/modify/history?noteId='+noteId);
+}
+
+
+/**
+ * 我的笔记
+ * type  我发布的是1 我导入的是2
+ * orderType 升序降序
+ * orderField排序字段
+ * courseId 课程id
+ * */
+const query=function (data){
+  return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/query',data);
+}
+
+/**
+ * 课程列表 应该是当前用户记过笔记的课程
+ * */
+const course=function (){
+  return ajax.get(baseURL,'/xboe/subgroup/m/noteinfo/course');
+}
+/**
+ * 还原
+ * 笔记id
+ * */
+const restore=function (id){
+  return ajax.get(baseURL,'/xboe/subgroup/m/noteinfo/restore?id='+id);
+}
+
+/**
+ * 二次查询
+ * @param{
+ *   ids
+ * }
+ * */
+const ids=function (data){
+  return ajax.postJson(baseURL,'/xboe/subgroup/m/noteinfo/ids',data);
+}
+
+/**
+ * 导出excel
+ * @param {
+ *   ids ["",""]
+ * }
+ * */
+const exportExcel=function (data){
+  return ajax.postJsonToFile(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data);
+  // return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/exportExcel',data);
+}
+
+/**
+ * 导出excel预览
+ * @param {
+ *   ids ["",""]
+ * }
+ * */
+const exportExcelPre=function (data){
+  return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/excel-detail',data);
+}
+
+/**
+ * 导出pdf预览
+ * @param {
+ *   ids ["",""]
+ * }
+ * */
+const exportPdfPre=function (data){
+  return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/pdf-detail',data);
+}
+
+
+
+
+
+/**
+ * 导出pdf
+ * @param{
+ *
+ * }
+ * */
+const exportPdf=function (udata){
+  // return ajax.postJson(baseURL,'/xboe/subgroup/m/noteinfo/exportPdf',data);
+  //return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/exportPdf',data);
+  var url = baseURL + '/xboe/subgroup/m/noteinfo/exportPdf';
+  axios({
+    method: 'POST',
+    url: url,
+    data:udata,
+    responseType: 'blob',
+    headers: { 'XBOE-Access-Token':getToken(),'Content-Type':'application/pdf;charset=utf-8'}
+  }).then(res => {
+    //resolveBlob(res, mimeMap.zip);
+    console.log(res);
+    const aLink = document.createElement('a')
+    var blob = new Blob([res.request.response], { type: 'application/pdf' })
+    // //从response的headers中获取filename, 后端response.setHeader("Content-disposition", "attachment; filename=xxxx.docx") 设置的文件名;
+    //var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
+    //var contentDisposition = decodeURI(res.headers['content-disposition'])
+    //var result = patt.exec(contentDisposition)
+    //var fileName = result[1]
+    //fileName = fileName.replace(/\"/g, '')
+    aLink.href = URL.createObjectURL(blob)
+    aLink.setAttribute('download','我的笔记.pdf') // 设置下载文件名称
+    document.body.appendChild(aLink)
+    aLink.click()
+    document.body.removeChild(aLink)
+
+  })
+}
+
+/**
+ * 我的笔记收藏和分享都是这一个，目前只有收藏
+ * @param{
+ *    paegIndex
+ *    pageSize
+ *    dataType 1收藏 2分享
+ *    orderType 排序顺序 顺序倒叙
+ *    orderField 排序字段
+ *    keyword 关键字查询
+ * }
+ * */
+const pagelist=function (query){
+  return ajax.post(baseURL,'/xboe/subgroup/m/noteinfo/pagelist',query);
+}
+
+export default {
+  save,
+  detail,
+  del,
+  coursePage,
+  myCourse,
+  history,
+  pagelist,
+  query,
+  course,
+  update,
+  restore,
+  ids,
+  exportExcel,
+  exportPdf,
+  exportExcelPre,
+  exportPdfPre
+}
diff --git a/src/api/phase2/place.js b/src/api/phase2/place.js
new file mode 100644
index 00000000..8e3314d2
--- /dev/null
+++ b/src/api/phase2/place.js
@@ -0,0 +1,28 @@
+// import ajax from '@/utils/xajax.js'
+// import ajax from '../cesource/index.js';
+import ajax from '../ajax'
+const baseURL = process.env.VUE_APP_CESOURCE_BASE_API;
+
+
+/**
+ * 添加或编辑
+ * @param 参数见设计文档
+ * */
+const saveOrUpdate=function (data){
+  return ajax.postJson(baseURL,'/xboe/subgroup/m/pageplace/saveOrUpdate',data);
+}
+
+/**
+ * 根据key获取资源信息
+ * */
+
+const detail=function (key){
+  return ajax.get(baseURL,'/xboe/subgroup/m/pageplace/detail-key?key='+key);
+}
+
+
+
+export default {
+  saveOrUpdate,
+  detail
+}
diff --git a/src/api/phase2/stat.js b/src/api/phase2/stat.js
new file mode 100644
index 00000000..69e7f37b
--- /dev/null
+++ b/src/api/phase2/stat.js
@@ -0,0 +1,177 @@
+/**文章模块的相关处理*/
+// import ajax from '@/utils/xajax.js'
+import ajax from '../ajax'
+const baseURL = process.env.VUE_APP_STAT_BASE_API;
+/**
+ * 发送事件，具体事件参考后台管理的事件查看
+ *参数如下：
+  {
+    "key": "ReadCase",//后台的事件key
+    "title": "浏览案例【案例名称】",//事件的标题
+    "parameters":"",//用户自定义参数 name:value,name:value
+    "content": "案例名称",//事件的内容
+    "source":"页面事件",
+    "objId": "案例id",//关联的id
+    "objType": "3",//关联的类型
+    "objInfo": "记录一般折内容部分",
+    "aid": "用户的id", //当前登录人的id
+    "aname": "用户的名称,用于显示",//当前人的姓名
+    "status": 1 //状态，直接写1
+  }
+ *
+ */
+const sendEvent = function(data) {
+    return ajax.postJson(baseURL,'/xboe/m/stat/event/send',data);
+}
+
+/**
+ * 用户的统计信息
+ * @param {Object} aid 主页人的id
+ * @param {Object} data 参数 []数组，10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数，空数组 返回用户的全部类型统计。
+ */
+const userTotal = function(aid,data) {
+    return ajax.postJson(baseURL,'/xboe/m/stat/user/total/'+aid,data);
+}
+
+/**
+ * 用户动态，分页查询
+ *
+ * @param {
+   pageIndex,
+   pageSize,
+   contentType:'',内容类型
+   aid:'', //指定用户的动态，
+   hidden:true/false,//是否隐藏，不指定，查询全部
+ } data
+ */
+const userDynamicList = function(data) {
+    return ajax.post(baseURL,'/xboe/m/stat/userdynamic/list',data);
+}
+
+/**
+ * 用户动态，分页查询
+ *
+ * @param {
+   pageIndex,
+   pageSize,
+   contentType:'',内容类型
+   aid 数组
+ } data
+ */
+const userDynamicfollows = function(data) {
+  return ajax.postJson(baseURL,'/xboe/m/stat/userdynamic/follow',data);
+}
+
+/**
+ * 获取用户全部勋章
+ * @param {String} aid 用户的id
+ *
+ */
+ const userMedal = function(aid) {
+    return ajax.get(baseURL,'/xboe/m/stat/medal/user-medal?aid='+aid);
+}
+
+
+/**
+ * 勋章信息
+ * 页面上不能修改，删除
+ */
+//  const userMedalConfig = function() {
+//     return ajax.get(baseURL,'/xboe/m/stat/medalinfo/config');
+// }
+// get 获取勋章配置，返回的是列表
+const userMedalConfig = function() {
+    return ajax.get(baseURL,'/xboe/m/stat/medal/config');
+}
+
+/**
+ * 查询勋章下等级所对应的用户数量
+ * @author wn
+ * @param {String} medalId 勋章id（必填）
+ */
+const userMedalLevelInfo = function(medalId) {
+    return ajax.get(baseURL,'/xboe/m/stat/medal/getUserMedalLevelInfo?medalId='+medalId);
+}
+
+/**
+ * 隐藏动态
+ * @author wn
+ * @param {String} id 动态id（必填）
+ */
+const dynamicHide = function(id) {
+    return ajax.post(baseURL,'/xboe/m/stat/userdynamic/hide?id='+id);
+}
+
+/**
+ * 导出用户近7天的U币记录
+ * @author wn
+ * @param {String} aid 用户aid
+ */
+const exportUserCoinRecord = function(aid) {
+    return ajax.get(baseURL,'/xboe/m/stat/usercoinrecord/export?aid='+aid);
+}
+
+/**
+ * 获取用户最近 x 天的U币记录
+ * @param {String} aid 用户的id
+ * @param {Integer} days x天的记录，默认为7天
+ */
+ const userCoinList = function(aid,days) {
+    return ajax.get(baseURL,'/xboe/m/stat/usercoinrecord/list?aid='+aid+'&days='+days);
+}
+
+/**
+ * 查询排名数据
+ * @author wn
+ * @params {
+    "aid":"952948626497724414", #用户id
+    "statType":20,  #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
+    "field":"total", #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
+    "num":8  #显示的条数
+  }
+ */
+const getRanking = function(queryData) {
+    return ajax.postJson(baseURL,'/xboe/m/stat/user/ranking',queryData);
+}
+
+
+/**
+ * 查询统计用户经验值等级、累计学习时长、累计U币数量、累计经验值
+ * @author wn
+ * @param {String} aid 用户的id
+ */
+ const getUserStatTotalInfo = function(aid) {
+    return ajax.get(baseURL,'/xboe/m/stat/user/statinfo?aid='+aid);
+}
+
+/**
+ * 用户的登录勋章，新版上线，15天内登录过一次
+ * @author wn
+ */
+ const getUserLoginMedal = function() {
+    return ajax.get(baseURL,'/xboe/m/stat/medal/login-medal');
+}
+
+/**
+ * 提取需要提示的勋章
+ */
+const getUserMedalTips = function() {
+    return ajax.get(baseURL,'/xboe/m/stat/medal/tips');
+}
+
+export default {
+    sendEvent,
+    userTotal,
+    userDynamicList,
+    userCoinList,
+    userMedal,
+    userMedalConfig,
+    userMedalLevelInfo,
+    dynamicHide,
+    exportUserCoinRecord,
+    getRanking,
+    getUserStatTotalInfo,
+    userDynamicfollows,
+    getUserLoginMedal,
+    getUserMedalTips
+}
diff --git a/src/api/phase2/userfollow.js b/src/api/phase2/userfollow.js
new file mode 100644
index 00000000..91b4aafd
--- /dev/null
+++ b/src/api/phase2/userfollow.js
@@ -0,0 +1,102 @@
+import ajax from '../ajax';
+const baseURL = process.env.VUE_APP_CESOURCE_BASE_API;
+
+
+/**
+ * 添加关注
+ * @param{
+ *   followId
+ * }
+ * */
+const save=function (followId){
+  return ajax.get(baseURL,'/xboe/subgroup/m/userfollow/save?followId='+followId);
+}
+
+/**
+ * 检查是否已关注
+ * @param{
+ *   followId
+ * }
+ * */
+const checkFllow=function (followId){
+  return ajax.get(baseURL,'/xboe/subgroup/m/userfollow/checkFllow?followId='+followId);
+}
+
+/**
+ * 取消关注
+ *
+ * */
+const remove=function (followId){
+  return ajax.get(baseURL,'/xboe/subgroup/m/userfollow/remove?followId='+followId);
+}
+
+/**
+ * 我关注的人列表
+ * @param{
+ *   pageIndex
+ *   pageSize,
+ *   aid
+ * }
+ * */
+const page=function (query){
+  return ajax.post(baseURL,'/xboe/subgroup/m/userfollow/page',query);
+}
+
+/**
+ * 我关注的人列表
+ * @param{
+ *   pageIndex
+ *   pageSize,
+ *   aid
+ * }
+ * */
+const mypage=function (query){
+  return ajax.post(baseURL,'/xboe/subgroup/m/userfollow/mypage',query);
+}
+
+/**
+ * 二次查询
+ * */
+const ids=function (data){
+  return ajax.postJson(baseURL,'/xboe/subgroup/m/userfollow/ids',data);
+}
+
+/**
+ * 被关注数
+ * 关注数
+ * @pram{
+ *   aid
+ * }
+ * */
+const counts=function (aid){
+  return ajax.get(baseURL,'/xboe/subgroup/m/userfollow/counts?aid='+aid);
+}
+
+/**
+ * 查询是否已关注
+ * @param{
+ *   followId 关注人的id
+ * }
+ * */
+const has=function (followId){
+  return ajax.get(baseURL,'/xboe/subgroup/m/userfollow/has?followId='+followId);
+}
+
+/**
+ * 我的关注二次查询
+ * */
+const list=function (){
+  return ajax.get(baseURL,'/xboe/subgroup/m/userfollow/list');
+}
+
+export default {
+  save,
+  remove,
+  page,
+  mypage,
+  ids,
+  counts,
+  has,
+  checkFllow,
+  list
+}
diff --git a/src/api/phase2/userhobby.js b/src/api/phase2/userhobby.js
new file mode 100644
index 00000000..375c6787
--- /dev/null
+++ b/src/api/phase2/userhobby.js
@@ -0,0 +1,60 @@
+// import ajax from '@/utils/xajax.js'
+// import ajax from '../cesource/index.js'
+import ajax from '../ajax';
+const baseURL = process.env.VUE_APP_CESOURCE_BASE_API;
+
+
+/**
+ * 用户采集的添加
+ * @param{
+ *    type 类型 1表课程分类
+ *    refId 关联的id
+ *    refCode 关联的code
+ * }
+ * */
+const save=function (data){
+  return ajax.postJson(baseURL,'/xboe/subgroup/m/userhobby/save',data);
+}
+
+/**
+ * 同兴趣人匹配查询
+ * 参数：下面那个接口的返回值直接传
+ * */
+const list=function (aid){
+  return ajax.get(baseURL,'/xboe/subgroup/m/userhobby/list?aid='+aid);
+}
+
+/**
+ * 获取用户兴趣关联的id
+ * */
+const info=function (aid){
+  return ajax.get(baseURL,'/xboe/subgroup/m/userhobby/info?aid='+aid);
+}
+
+/**
+ * 修改用户兴趣爱好兴趣爱好，
+ * 参数是上一个接口 info查出来的返回值
+ * */
+const update=function (data){
+  return ajax.postJson(baseURL,'/xboe/subgroup/m/userhobby/update',data);
+}
+
+/**
+ * 删除
+ * */
+const del=function (id){
+  return ajax.get(baseURL,'/xboe/subgroup/m/userhobby/delete?id='+id);
+}
+const has=function(){
+  return ajax.get(baseURL,'/xboe/subgroup/m/userhobby/has');
+}
+
+export default {
+  save,
+  list,
+  info,
+  update,
+  del,
+  has
+}
+
diff --git a/src/api/system/organiza.js b/src/api/system/organiza.js
index eb1f8c2b..0934f54d 100644
--- a/src/api/system/organiza.js
+++ b/src/api/system/organiza.js
@@ -28,7 +28,7 @@ const getSimple = function (id) {
 
 export default {
     treeList,
-    getSimple,
-    listByParent
+    listByParent,
+    getSimple
 }
 
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 2262956b..6bd48f47 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -1,5 +1,11 @@
 import ajax from '@/utils/xajax.js'
 
+/**获取home信息*/
+const home=function(aid) {
+    return ajax.get('/xboe/sys/user/home?aid='+aid);
+}
+
+
 /**
  * 分页查询
  * @param {
@@ -62,16 +68,52 @@ const detail = function(id) {
     return ajax.get('/xboe/sys/user/detail?id='+id);
 }
 
+/**转化机构信息需求，课程审核那会添加*/
 const getOrgSimpleByUserId = function(id) {
     return ajax.get('/xboe/sys/user/org/org-byuserid?userId='+id);
 }
 
+/**
+ * 修改个签
+ * */
+const updateSign=function (sign){
+  return ajax.get('/xboe/sys/user/update-sign?sign='+sign);
+}
+/**
+ * 修改动态u
+ * dynamic 0代表全部 1代表最近半年 2代表最近三个月
+ * */
+const updateDynamic=function (dynamic){
+  return ajax.get('/xboe/sys/user/update-dynamic?dynamic='+dynamic);
+}
+
+/**
+ * 个人主页开关设置
+ * flag true - 打开； false - 关闭
+ * */
+const updateShowHome=function (flag){
+  return ajax.post('/xboe/sys/user/show-home?showHome='+flag);
+}
+
+
+/**
+ * 二次查询 签名和动态
+ * */
+const findSignDynamic=function (id){
+  return ajax.get('/xboe/sys/user/findSign-dynamic='+id);
+}
+
 export default{
+    home,
     list,
     searchLoginName,
     getByIds,
     getByLoginName,
     findByName,
     detail,
-    getOrgSimpleByUserId
+    getOrgSimpleByUserId,
+    updateSign,
+    updateDynamic,
+    findSignDynamic,
+    updateShowHome
 }
diff --git a/src/assets/images/icon/ban-left.png b/src/assets/images/icon/ban-left.png
new file mode 100644
index 00000000..6b68cbb2
Binary files /dev/null and b/src/assets/images/icon/ban-left.png differ
diff --git a/src/assets/images/icon/ban-right.png b/src/assets/images/icon/ban-right.png
new file mode 100644
index 00000000..8b329c20
Binary files /dev/null and b/src/assets/images/icon/ban-right.png differ
diff --git a/src/assets/images/icon/note-del.png b/src/assets/images/icon/note-del.png
new file mode 100644
index 00000000..d725fd23
Binary files /dev/null and b/src/assets/images/icon/note-del.png differ
diff --git a/src/assets/images/icon/note-edit.png b/src/assets/images/icon/note-edit.png
new file mode 100644
index 00000000..b138f77e
Binary files /dev/null and b/src/assets/images/icon/note-edit.png differ
diff --git a/src/assets/logo/logo-white.png b/src/assets/logo/logo-white.png
new file mode 100644
index 00000000..aa37821f
Binary files /dev/null and b/src/assets/logo/logo-white.png differ
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index 31f5da65..71d40519 100644
Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ
diff --git a/src/assets/logo/logo1.png b/src/assets/logo/logo1.png
new file mode 100644
index 00000000..31f5da65
Binary files /dev/null and b/src/assets/logo/logo1.png differ
diff --git a/src/assets/logo/logo2.png b/src/assets/logo/logo2.png
new file mode 100644
index 00000000..41f6998a
Binary files /dev/null and b/src/assets/logo/logo2.png differ
diff --git a/src/assets/styles/ellipsis.scss b/src/assets/styles/ellipsis.scss
index f5aae67c..439d4717 100644
--- a/src/assets/styles/ellipsis.scss
+++ b/src/assets/styles/ellipsis.scss
@@ -5,7 +5,11 @@
   display: block;
   word-break:break-all;
 }
-
+.orinfo-text{
+  font-size: 13px;
+  color: #666666;
+  font-weight: 400;
+}
 .previewStyle{
   color: #337ab7;
   cursor: pointer;
@@ -18,7 +22,27 @@
   overflow: hidden;
   text-overflow:ellipsis;
   -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
+  -webkit-line-clamp:2;
+}
+.index-one-line-ellipsis{
+  display: -webkit-box;
+  // white-space:pre-wrap;
+  word-wrap: break-word;
+  word-break:break-all;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp:1;
+}
+.index-tive-line-ellipsis{
+  display: -webkit-box;
+  // white-space:pre-wrap;
+  word-wrap: break-word;
+  word-break:break-all;
+  overflow: hidden;
+  text-overflow:ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp:8;
 }
 p{
   margin: 0;
@@ -28,6 +52,9 @@ p{
   font-size: 20px;
   margin-top: 70px;
   color: #ccc;
+  img{
+    text-align: center;
+  }
 }
 
 
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index a2a9f992..cd08e918 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -7,6 +7,7 @@
 @import './btn.scss';
 @import './ellipsis.scss';
 @import './qaLabel.scss';
+@import './portal-index.scss';
 body {
     height: 100%;
     -moz-osx-font-smoothing: grayscale;
@@ -14,7 +15,9 @@ body {
     text-rendering: optimizeLegibility;
     font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
 }
-
+:not([class*="icon"]):not(.fa):not(.fas):not(i) {
+    font-family: "Menlo", "苹方-简" !important;
+  }
 .el-message {
     top: 15%!important
 }
@@ -204,6 +207,12 @@ aside {
         background: #d0d0d0;
     }
 }
+ul{
+    padding: 0;
+}
+li{
+    list-style: none;
+}
 
 .link-type,
 .link-type:focus {
@@ -265,16 +274,18 @@ aside {
     }
 }
 .el-button--primary{
-    background-color: #588afc;
-    border-color: #588afc;
+    // background-color: #fff;
+    // border-color: #fff;
 }
 .el-radio-button__orig-radio:checked+.el-radio-button__inner{
-    background-color: #588afc;
-    border-color: #588afc;
+    background-color: #fff;
+    border-color: #fff;
+    box-shadow:none;
+    color: #387DF7;
 }
 .el-tag--plain{
     background-color: #fff;
-    border-color: #588afc;
+    border-color: #fff;
     color: #588afc
 }
 .el-tag{
@@ -342,6 +353,9 @@ aside {
        width: 68px !important;
        height: 68px !important;
        border-radius: 0px;
+       img{
+        width: 100% !important;
+        }
       }
     .teacher-text{
       width: 68px;
@@ -377,3 +391,4 @@ aside {
       line-height: 50px;
     }
   }
+
diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss
new file mode 100644
index 00000000..d094e37d
--- /dev/null
+++ b/src/assets/styles/portal-index.scss
@@ -0,0 +1,1498 @@
+/**此文件应该只是包含首页的样式*/
+
+//首页版心内容区域
+.xindex-content {
+  font-family: 'Noto Sans SC';
+  padding-top: 20px;
+  margin: 26px auto;
+}
+
+.xindex-main{
+  padding-right: 20px;
+}
+
+// 课程卡片
+.xindex-course{
+    display: inline-block;
+    vertical-align: top;
+    border:1px solid #efefef;
+    padding: 20px;
+    font-size:0;
+    margin-right: 20px;
+    margin-bottom: 20px;
+    box-sizing: border-box;
+    position: relative;
+    background-color: #ffffff;
+    border-radius: 8px;
+
+
+    .xindex-course-image{
+      position: relative;
+      min-height: 114px;
+      // width: 350px;
+      // height: 200px;
+      // width: 100%;
+      .course-type {
+        position: absolute;
+        top: 0px;
+        right: 0px;
+        width: 60px;
+        height: 24px;
+        line-height: 24px;
+        text-align: center;
+        background-color: #f99000;
+        border-radius:  2px  4px  2px  14px;
+        font-size: 12px;
+        color: #ffffff;
+        -moz-user-select: none; /*火狐*/
+        -webkit-user-select: none; /*webkit浏览器*/
+        -ms-user-select: none; /*IE10*/
+        -khtml-user-select: none; /*早期浏览器*/
+        user-select: none;
+      }
+      .course-type-title {
+        position: absolute;
+        top: 5px;
+        right: 0px;
+        width: 90px;
+        height: 30px;
+        line-height: 30px;
+        text-align: center;
+        color: #ffffff;
+        -moz-user-select: none; /*火狐*/
+        -webkit-user-select: none; /*webkit浏览器*/
+        -ms-user-select: none; /*IE10*/
+        -khtml-user-select: none; /*早期浏览器*/
+        user-select: none;
+      }
+      .course-flag {
+        height: 26px;
+        position: absolute;
+        top: 15px;
+        right: 0;
+      }
+      .course-tip {
+        width: 100%;
+        height: 26px;
+        position: absolute;
+        bottom: 0;
+        padding: 0 10px;
+        color: #fff;
+        font-size: 14px;
+        .course-study-count {
+          float: left;
+        }
+        .course-time {
+          float: right;
+        }
+      }
+    }
+    .course-title {
+        margin: 16px 0 16px 0;
+        height: 44px;
+        -moz-user-select: none; /*火狐*/
+        -webkit-user-select: none; /*webkit浏览器*/
+        -ms-user-select: none; /*IE10*/
+        -khtml-user-select: none; /*早期浏览器*/
+        user-select: none;
+      }
+      .course-author {
+        // margin: 5px 15px;
+        // padding-bottom: 10px;
+        display: flex;
+        justify-content: space-between;
+
+        .course-author-left {
+            font-size: 14px;
+            color: #6E7B84;
+            -moz-user-select: none; /*火狐*/
+            -webkit-user-select: none; /*webkit浏览器*/
+            -ms-user-select: none; /*IE10*/
+            -khtml-user-select: none; /*早期浏览器*/
+            user-select: none;
+        }
+      }
+
+      .study-num {
+        font-size: 14px;
+        color: #6E7B84;
+        // margin-left: 12px;
+        -moz-user-select: none; /*火狐*/
+        -webkit-user-select: none; /*webkit浏览器*/
+        -ms-user-select: none; /*IE10*/
+        -khtml-user-select: none; /*早期浏览器*/
+        user-select: none;
+      }
+      .course-score {
+        padding: 10px 15px;
+        height: 40px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        // border-top: 1px solid #ccc;
+        .course-score-star {
+          flex: 1;
+        }
+      }
+    }
+.course-score-no {
+  text-align: right;
+  padding-left: 10px;
+  font-size: 14px;
+  color: #6B7C85;
+  //line-height: 30px;
+  -moz-user-select: none; /*火狐*/
+  -webkit-user-select: none; /*webkit浏览器*/
+  -ms-user-select: none; /*IE10*/
+  -khtml-user-select: none; /*早期浏览器*/
+  user-select: none;
+}
+.course-score-value {
+  font-size: 14px;
+  //  margin-top: 5px;
+  // margin-left: 6px;
+  //line-height: 30px;
+  color: #FA6400;
+  font-family: 'Arial';
+  -moz-user-select: none; /*火狐*/
+  -webkit-user-select: none; /*webkit浏览器*/
+  -ms-user-select: none; /*IE10*/
+  -khtml-user-select: none; /*早期浏览器*/
+  user-select: none;
+  // font-size: 30px;
+}
+//以下是几种右边排行内容，因为高度需要变化不同，所以需要单独宝义
+.xindex-ranking-li{
+  cursor: pointer;
+  line-height: 30px;
+  display: flex;
+  position: relative;
+  .span {
+    display: flex;
+  }
+}
+.xindex-ranking-li:hover .list-active {
+  // transition: all 0.5s;
+  display: block;
+}
+
+
+
+
+.xindex-ranking-course{
+  margin: 0px;
+  padding: 0px;
+  //overflow-y: auto;
+}
+
+.xindex-ranking-case{
+  //height: 114px;
+  margin: 0px;
+  padding: 0px;
+  overflow-y: auto;
+}
+
+.xindex-ranking-article{
+  margin: 0px;
+  padding: 0px;
+  overflow-y: auto;
+}
+
+.xindex-ranking-qa{
+  margin: 0px;
+  padding: 0px;
+  overflow-y: auto;
+}
+
+//每块区域
+.xindex-case {
+  display: inline-block;
+  vertical-align: top;
+  width: 33.33%;
+  //margin-right: 20px;
+  padding-right: 20px;
+}
+
+.xindex-qa {
+  display: inline-block;
+  vertical-align: top;
+  width: 25%;
+  padding-right: 20px;
+}
+
+.nav-bottbor{
+    width: 75%;
+    height: 4px;
+    background: #387DF7;
+    border-radius: 5px;
+    position: absolute;
+    top: 75%;
+    left: 13%;
+}
+.current-nav {
+  color: #387DF7;
+  font-weight: 700;
+  >a{
+    color:#387DF7;
+
+  }
+  // background: #588afc;
+  // border-bottom: 4px solid;
+}
+.portal-right-text{
+    font-size: 24px;
+    font-family: JCHEadA;
+    color: #D9D9D9;
+    
+    margin-right: 10px;
+    img{
+        vertical-align: top;
+        width: 30px;
+        height: 30px;
+    }
+}
+.portal-title-one{
+    font-size: 24px;
+    font-family: FZLTCHJW--GB1-0, FZLTCHJW--GB1;
+    font-weight: 600;
+    color: #000000;
+    line-height: 28px;
+}
+.portal-title-desc{
+    font-size: 18px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #677D86;
+}
+.portal-title-tow{ // 问答标题
+    font-size: 16px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 600;
+    color: #333333;
+    line-height: 22px;
+}
+.portal-index-title{
+    font-size: 16px;
+    font-weight: 500;
+    color: #00253E;
+    line-height: 22px;
+}
+.portal-index-summary{
+    font-size: 14px;
+    font-weight: 400;
+    color: #04243C;
+    line-height: 24px;
+}
+.portal-summary-text{ // 问答详情
+    font-size: 14px;
+    word-break:break-all;
+    word-wrap:break-word;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #666666;
+}
+.portal-time{ // 问答详情
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    color: #999999;
+}
+.portal-model-btn{// 写文章，发课程等按钮
+    width: 410px;
+    height: 67px;
+    background: #DDEDFF;
+    border-radius: 8px;
+    font-size: 18px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #387DF7;
+    line-height: 67px;
+    text-align: center;
+    margin-bottom: 22px;
+}
+.orange-one{
+    color: #EB5D00;
+}
+.orange-tow{
+    color: #FE9100;
+}
+.orange-three{
+    color: #FEC200;
+}
+.content-div{
+    width: 100%
+}
+.blue-one{
+    color: #387DF7;
+}
+.blue-tow{
+    color: #089DFF;
+}
+.blue-three{
+    color: #00C6FF;
+}
+.pink-one{
+    color: #EB0000;
+}
+.pink-tow{
+    color: #FC2152;
+}
+.pink-three{
+    color: #EE4685;
+}
+// .list-bg{
+//     background: url('/images/qa-box.png') no-repeat 100% / 100%;
+//     // background: linear-gradient(180deg, #C3DEF8 0%, #FFFFFF 37%);
+// }
+// .list-bg1{
+//   background: url('/images/list-or.png') no-repeat 100% / 100%;
+// }
+// .list-bg2{
+//   background: url('/images/list-pink.png') no-repeat 100% / 100%;
+// }
+// .art-bgimg{
+//     background: url('/images/contribute.png') no-repeat top left;
+//     background-size: cover;
+//   }
+.portal-images-title{
+  vertical-align: top;
+  // padding: 2px 12px;
+  line-height: 24px;
+  }
+  /**滚动条的宽度*/
+::-webkit-scrollbar {
+    width: 5px;
+    height: 5px;
+}
+
+/*滚动条的滑块*/
+::-webkit-scrollbar-thumb {
+    background-color:  #D8D8D8;
+    border-radius: 5px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+    background:  #D8D8D8;
+}
+@keyframes ubAddBlock {
+    // from {
+    //     bottom: 0;
+    // }
+    // to {
+    //     bottom: 200px;
+    // }
+    0% {
+        bottom: 0;
+    }
+    50% {
+        bottom: 200px;
+    }
+    100% {
+        bottom: 200px;
+    }
+}
+.el-button--primary{
+    background-color: #387DF7;
+    border-color: #387DF7;
+}
+.home-no-list{
+   margin-top: 120px;
+   text-align: center;
+   .img{
+    width: 148px;
+    height: 160px;
+   }
+   .text{
+    font-size: 18px;
+    color: #999999;
+    margin-top: 20px;
+   }
+}
+.follow-home-title{
+    font-size: 18px;
+    font-weight: 600;
+    color: #333333;
+}
+.score-info{
+    font-size: 14px;
+    font-weight: 600;
+    color: #FC6401;
+}
+.follow-hide{
+    font-size: 12px;
+    color: #6E7B84;
+}
+.u-message{ // 消息提示样式修改
+    font-size: 14px;
+    color: rgba(0,0,0,0.65);
+    .text{
+        font-size: 14px;
+        color: #2C68FF;
+        margin-right: 20px;
+        margin-left: 100px;
+    }
+}
+.el-message{
+    border-color: #fff;
+    background-color: #fff;
+    box-shadow: 0px 8px 20px 0px rgba(0,35,114,0.1);
+    justify-content: center;
+
+}
+.el-message--success{
+  .el-message__content{
+    color: #333333;
+ }
+}
+.el-badge__content{// badge去掉白色边框
+  border:1px solid #f56c6c;
+}
+// boe-index
+@media screen and (max-width: 1366px){
+  .portal-input{
+    width: 260px;
+  }
+  .case-inter-orgin{
+    width: 56%;
+  }
+  .btn-user{
+    width: 70px;
+  }
+  .course-banner {// 首页banner导航条样式
+    .swiper-button-prev{
+      left: 42%;
+    }
+    .swiper-button-next{
+      right: 53%;
+
+    }
+  }
+
+
+  .medal-index{ // 勋章规则控制
+    margin: 40px 26px 0 26px;
+  }
+  .xindex-content{
+    width: 1100px;
+  }
+  .xindex-main{
+    padding-right: 20px;
+  }
+  .swiper-pagination{
+    top: 410px;
+  }
+  .personal-panel{
+    width: 300px;
+    height: 320px;
+    padding: 10px 40px;
+    .personal-box {
+      margin-left: 0px;
+      margin-top: 10px;
+      margin-bottom: 0px;
+    }
+    .personal-ul{
+      margin-top: 7px;
+    }
+
+  }
+
+  //课程卡片样式
+  .xindex-course{
+    width: 255px;
+    padding: 20px;
+    margin-right: 20px;
+    margin-bottom: 20px;
+
+    .xindex-course-image{
+     width: 220px;
+     height: 123px;
+      ::v-deep .course-image{
+        height: 100% !important;
+      }
+    }
+  }
+  .xindex-ranking-li{
+    margin-top:15px;
+  }
+  .xindex-ranking-course{
+    height: 465px;
+  }
+
+  .xindex-ranking-case{
+    height: 170px;
+  }
+
+  .xindex-ranking-article{
+    height: 367px;
+  }
+
+  .xindex-ranking-qa{
+    height:121px;
+  }
+
+  .xindex-case {
+    // padding-right: 20px;
+  }
+  .xindex-qa {
+  }
+
+  .case-inter{
+    left: 20px;
+    bottom:20px;
+    .case-inter-orgin{
+        display: none !important;
+       }
+    ::v-deep .el-avatar--small{
+       width: 22px;
+       height: 22px;
+    }
+  }
+
+ .boe-case-index{
+    height: 246px;
+    margin-right: 20px;
+    .case-top{
+        height: 69px;
+    }
+    .case-conent{
+       width: 200px;
+       height: 169px;
+      //  top:20px;
+      //  left:25px;
+       padding: 17px;
+       .time-one{
+        padding:3px 3px;
+       }
+       .cast-time{
+        margin-bottom: 12px;
+       }
+       .case-title{
+        font-size: 14px;
+        height: 40px;
+        line-height: 18px;
+       }
+       .case-text{
+         height: 42px;
+         font-size: 12px;
+         line-height: 14px;
+       }
+
+    }
+ }
+ .boe-qa-index{
+    height: 194px;
+    margin-right: 20px;
+    padding: 17px 12px 16px 12px;
+    .qa-center{
+        height: 88px;
+       margin-top: 10px;
+       padding: 10px;
+       .boe-qa-sum{
+        font-size: 12px;
+        line-height: 14px;
+       }
+       .qa-views{
+        left: 10px;
+        bottom: 6px;
+       }
+    }
+    .qa-char{
+        margin-top: 10px;
+        display: flex;
+        ::v-deep img{
+          width: 24px;
+          height: 24px;
+        }
+        ::v-deep .item-author div{
+            width: 30px !important;
+            height: 30px !important;
+        }
+        .el-avatar{
+            width: 26px !important;
+            height: 26px !important;
+         }
+        .info-name{
+          font-size: 12px;
+          color: #6E7B84;
+          margin-left: 10px;
+        }
+      }
+    .qa-top{
+        display: flex;
+        justify-content: space-between;
+        & span:first-child{
+        //   height: 24px;
+          background: rgba($color: #387DF7, $alpha: 0.05);
+          padding: 3px 3px;
+          border-radius: 4px;
+          font-size: 12px;
+          color: #387DF7;
+        //   margin-right: 46px;
+        }
+        span{
+          font-size: 10px;
+          color: #6E7B84;
+        }
+      }
+ }
+ .boe-article-index{
+    padding: 17px;
+    margin-right: 20px;
+    .article-card-left{
+        width: 200px;
+        .article-info-index-summary{
+            font-size: 12px;
+            font-weight: 400;
+            color: #6E7B84;
+            line-height: 14px;
+        }
+        .article-info-image-box{
+            width: 200px;
+            height: 112px;
+
+        }
+        .el-avatar{
+            width: 26px !important;
+            height: 26px !important;
+            img{
+              width: 100% !important;
+              }
+         }
+    }
+    .article-card-right{
+        .article-li{
+            display: flex;
+            width: 100%;
+            .article-img{
+              width: 144px;
+              // height: 81px;
+              border-radius: 4px;
+              margin-right: 10px;
+              img{
+                width: 144px;
+                height: 81px;
+                border-radius: 4px;
+              }
+            }
+            .article-right{
+              width: 100%;
+              .article-info-title{
+                font-size: 16px;
+                font-weight: 600;
+                color: #00253E;
+                // margin-bottom: 9px;
+                // width: 50%;
+              }
+              .article-info-summary{
+                font-size: 12px;
+                font-weight: 400;
+                color: #6E7B84;
+                // margin-bottom: 15px;
+              }
+              .article-bottom{
+                display: flex;
+                justify-content: space-between;
+               ::v-deep .uavatar{
+                  width: 22px;
+                  height: 22px;
+                }
+                .el-avatar{
+                    width: 26px;
+                    height: 26px;
+                    img{
+                      width: 100% !important;
+                      }
+                }
+              }
+              .article-info-time{
+                // display: none;
+              }
+            }
+
+          }
+    }
+ }
+}
+@media screen and (max-width: 1680px) and (min-width:1367px){
+  .case-inter-orgin{
+    width: 47%;
+  }
+
+  .portal-input{
+    width: 280px;
+  }
+  .btn-user{
+    width: 75px;
+  }
+  .course-banner {// 首页banner导航条样式
+    .swiper-button-prev{
+      left: 43%;
+    }
+    .swiper-button-next{
+      right: 53%;
+
+    }
+  }
+
+  .medal-index{ // 勋章规则控制
+    margin: 40px 50px 0 50px;
+  }
+  .xindex-content{
+    width: 1366px;
+  }
+  .xindex-main{
+    padding-right: 0px;
+  }
+  .swiper-pagination{
+    top: 460px;
+  }
+   .personal-panel{
+    width: 356px;
+    height: 370px;
+    padding: 30px 45px;
+    .personal-box{
+        // margin-left: 16px;
+        margin-top: 20px;
+        margin-bottom: 16px;
+    }
+  }
+  .xindex-course{
+    width: 332px;
+    padding: 25px;
+    margin-right: 20px;
+    margin-bottom: 20px;
+    .xindex-course-image{
+     width: 280px;
+     height: 156px;
+      ::v-deep .course-image{
+        height: 100% !important;
+      }
+    }
+  }
+
+  .xindex-ranking-li{
+    margin-top:20px;
+  }
+  .xindex-ranking-course{
+    height: 509px;
+  }
+
+  .xindex-ranking-case{
+    height: 260px;
+  }
+
+  .xindex-ranking-article{
+    height: 445px;
+  }
+
+  .xindex-ranking-qa{
+    height:175px;
+  }
+
+  .xindex-case {
+    // padding-right: 20px;
+  }
+  .xindex-qa {
+  }
+  .case-inter{
+      left: 20px;
+      bottom:30px;
+      // .interact-bar-index{
+      //     display: none !important;
+      //    }
+      ::v-deep .el-avatar--small{
+       width: 32px;
+       height: 32px;
+    }
+  }
+  .modules-list{
+    margin-right: 10px;
+  }
+ .boe-case-index{
+    height: 361px;
+    .case-top{
+        height: 69px;
+    }
+    .case-conent{
+       width: 290px;
+       height: 250px;
+      //  top:30px;
+      //  left:20px;
+       padding: 20px;
+       .time-one{
+        padding:3px 10px;
+       }
+       .cast-time{
+        margin-bottom: 12px;
+       }
+       .case-title{
+        font-size: 16px;
+        height: 48px;
+        line-height: 24px;
+        margin-top: 20px;
+       }
+       .case-text{
+         height: 60px;
+         font-size: 14px;
+         line-height: 20px;
+         margin-bottom: 30px;
+       }
+
+    }
+ }
+ .boe-qa-index{
+    height: 276px;
+    margin-right: 36px;
+    padding: 30px;
+    .qa-center{
+       height: 130px;
+       margin-top: 10px;
+       padding: 20px 18px;
+       .boe-qa-sum{
+        font-size: 14px;
+        line-height: 22px;
+        margin-top: 4px;
+       }
+       .qa-views{
+        left: 18px;
+        bottom: 18px;
+       }
+    }
+    .qa-char{
+        margin-top: 20px;
+        display: flex;
+        ::v-deep img{
+          width: 34px;
+          height: 34px;
+        }
+        .info-name{
+          font-size: 12px;
+          color: #6E7B84;
+          margin-left: 10px;
+        }
+      }
+    .qa-top{
+        display: flex;
+        justify-content: space-between;
+        & span:first-child{
+          background: rgba($color: #387DF7, $alpha: 0.05);
+          padding: 3px 10px;
+          border-radius: 4px;
+          font-size: 12px;
+          color: #387DF7;
+        }
+        span{
+          font-size: 14px;
+          color: #6E7B84;
+        }
+      }
+ }
+ .article-other-info{
+   div{
+    .el-avatar{
+      width: 32px;
+      height: 32px;
+      img{
+        width: 100% !important;
+        }
+    }
+   }
+ }
+.item-author{
+  div{
+    .el-avatar{
+      width: 32px;
+      height: 32px;
+      img{
+        width: 100% !important;
+        }
+    }
+  }
+}
+
+ .boe-article-index{
+    padding: 30px;
+    margin-right: 20px;
+    .article-card-left{
+        width: 250px;
+        .article-info-index-summary{
+            font-size: 14px;
+            font-weight: 400;
+            color: #6E7B84;
+            line-height: 20px;
+        }
+        .article-info-image-box{
+            width: 250px;
+            height: 162px;
+
+        }
+        // .el-avatar{
+        //     width: 26px !important;
+        //     height: 26px !important;
+        //  }
+    }
+    .article-card-right{
+        .article-li{
+            // height: 160px;
+            display: flex;
+            width: 100%;
+            .article-img{
+              // width: 252px;
+              // height: 142px;
+              border-radius: 4px;
+              margin-right: 10px;
+              img{
+                width: 144px;
+                height: 81px;
+                border-radius: 4px;
+              }
+            }
+            .article-right{
+              width: 100%;
+              .article-info-title{
+                font-size: 16px;
+                font-weight: 600;
+                color: #00253E;
+                margin-bottom: 12px;
+                margin-top: 10px;
+                // width: 50%;
+              }
+              .article-info-summary{
+                font-size: 14px;
+                font-weight: 400;
+                color: #6E7B84;
+                // margin-bottom: 15px;
+              }
+              .article-bottom{
+                display: flex;
+                justify-content: space-between;
+               ::v-deep .uavatar{
+                  width:34px;
+                  height: 34px;
+                }
+                .el-avatar{
+                    width: 32px;
+                    height: 32px;
+                    img{
+                      width: 100% !important;
+                      }
+                }
+              }
+            }
+
+          }
+    }
+  }
+}
+
+@media screen and (max-width: 1920px) and (min-width: 1681px){
+
+  .case-inter-orgin{
+    width: 60%;
+  }
+  //以下不是在这里加，应该是在首页加的
+  // .interact-bar-btns{
+  //   line-height: 30px;
+  // }
+  .portal-input{
+    width: 290px;
+  }
+  .btn-user{
+    width: 80px;
+  }
+  .course-banner {// 首页banner导航条样式
+    .swiper-button-prev{
+      left: 43.5%;
+    }
+    .swiper-button-next{
+      right: 53%;
+
+    }
+  }
+
+  .medal-index{ // 勋章规则控制
+    margin: 40px 80px 0 80px;
+  }
+  .xindex-content{
+      width: 1690px;
+  }
+  .xindex-main{
+    padding-right: 0px;
+  }
+  .swiper-pagination{
+    top: 460px;
+  }
+  .personal-panel{
+    width: 356px;
+    height: 370px;
+    padding: 30px 45px;
+    .personal-box{
+        margin-top: 20px;
+        margin-bottom: 16px;
+    }
+  }
+  .xindex-course{
+      width: 400px;
+      padding: 30px;
+      margin-right: 30px;
+      margin-bottom: 30px;
+      border-radius: 8px;
+
+      .xindex-course-image{
+       width: 340px;
+       height: 191px;
+           ::v-deep .course-image{
+               height: 100% !important;
+           }
+      }
+  }
+  .xindex-ranking-li{
+    margin-top:30px;
+  }
+  .xindex-ranking-course{
+    height: 592px;
+  }
+
+  .xindex-ranking-case{
+    height: 295.5px;
+  }
+
+  .xindex-ranking-article{
+    height: 452px;
+  }
+
+  .xindex-ranking-qa{
+    height:222px;
+  }
+
+  .xindex-case {
+    padding-right: 30px;
+  }
+  .xindex-qa {
+    padding-right: 30px;
+  }
+  .case-inter{
+      left: 20px;
+      bottom:30px;
+      // .interact-bar-index{
+      //     display: none !important;
+      //    }
+      ::v-deep .el-avatar--small{
+       width: 32px;
+       height: 32px;
+    }
+  }
+  .modules-list{
+    margin-right: 0px;
+  }
+  .boe-case-index{
+    height: 396px;
+    .case-top{
+        height: 120px;
+    }
+    .case-conent{
+       width: 350px;
+       height: 274px;
+      //  top:30px;
+      //  left:24px;
+       padding: 30px;
+       .time-one{
+        padding:3px 10px;
+       }
+       .cast-time{
+        margin-bottom: 14px;
+       }
+       .case-title{
+        font-size: 16px;
+        height: 48px;
+        line-height: 24px;
+        margin-top: 20px;
+       }
+       .case-text{
+         height: 60px;
+         font-size: 14px;
+         line-height: 20px;
+         margin-bottom: 30px;
+       }
+
+    }
+}
+    .boe-qa-index{
+
+        height: 320px;
+        margin-right: 36px;
+        padding: 30px;
+      .qa-center{
+         height: 152px;
+         margin-top: 10px;
+         padding: 20px;
+         .portal-index-title{
+          font-weight: 600;
+          margin-bottom: 6px;
+         }
+         .boe-qa-sum{
+          font-size: 14px;
+          line-height: 22px;
+          margin-top: 4px;
+         }
+         .qa-views{
+          left: 20px;
+          bottom: 20px;
+         }
+      }
+      .qa-char{
+        margin-top: 20px;
+        display: flex;
+        ::v-deep img{
+          width: 34px;
+          height: 34px;
+        }
+        .info-name{
+          font-size: 12px;
+          color: #6E7B84;
+          margin-left: 10px;
+        }
+      }
+      .qa-top{
+        display: flex;
+        justify-content: space-between;
+        & span:first-child{
+          background: rgba($color: #387DF7, $alpha: 0.05);
+          padding: 3px 10px;
+          border-radius: 4px;
+          font-size: 12px;
+          color: #387DF7;
+        }
+        span{
+          font-size: 14px;
+          color: #6E7B84;
+        }
+      }
+    }
+    .boe-article-index{
+      padding: 30px;
+      margin-right: 30px;
+      .article-card-left{
+          width: 352px;
+          .article-info-index-summary{
+              font-size: 14px;
+              font-weight: 400;
+              color: #6E7B84;
+              line-height: 20px;
+          }
+          .article-info-image-box{
+              width: 352px;
+              height: 196px;
+
+          }
+          .el-avatar{
+              width: 32px !important;
+              height: 32px !important;
+              img{
+                width: 100% !important;
+                }
+           }
+      }
+      .article-card-right{
+        .article-li{
+            // height: 160px;
+            display: flex;
+            width: 100%;
+            .article-img{
+              flex: 43%;
+              width: 252px;
+              height: 144px;
+              border-radius: 4px;
+              margin-right: 10px;
+              img{
+                width: 252px;
+                height: 144px;
+                border-radius: 4px;
+              }
+            }
+            .article-right{
+              flex: 100%;
+              .article-info-title{
+                font-size: 16px;
+                font-weight: 600;
+                color: #00253E;
+                margin-bottom: 12px;
+                margin-top: 10px;
+                // width: 50%;
+              }
+              .article-info-summary{
+                font-size: 14px;
+                font-weight: 400;
+                color: #6E7B84;
+                // margin-bottom: 15px;
+              }
+              .article-bottom{
+                display: flex;
+                justify-content: space-between;
+               ::v-deep .uavatar{
+                  width:34px;
+                  height: 34px;
+                }
+                .el-avatar{
+                    width: 34px;
+                    height: 34px;
+                }
+              }
+            }
+
+          }
+      }
+    }
+  }
+
+@media screen and (min-width: 1921px){
+  .case-inter-orgin{
+    width: 60%;
+  }
+  //不能在这里加
+  // .interact-bar-btns{
+  //   line-height: 30px;
+  // }
+  .btn-user{
+    width: 80px;
+  }
+  .portal-input{
+    width: 300px;
+  }
+  .course-banner {// 首页banner导航条样式
+    .swiper-button-prev{
+      left: 44%;
+    }
+    .swiper-button-next{
+      right: 52.65%;
+
+    }
+  }
+  .swiper-pagination{
+    top: 460px;
+  }
+  .personal-panel{
+    width: 356px;
+    height: 370px;
+    padding: 30px 45px;
+    .personal-box{
+        margin-top: 20px;
+        margin-bottom: 16px;
+    }
+  }
+  .medal-index{ // 勋章规则控制
+    margin: 40px 80px 0 80px;
+  }
+  .xindex-content{
+    width: 1880px;
+  }
+  .xindex-main{
+    padding-right: 36px;
+  }
+  .xindex-course{
+    width: 445px;
+    padding: 30px;
+    margin-right: 36px;
+    margin-bottom: 36px;
+    border-radius: 8px;
+    .xindex-course-image{
+     width: 380px;
+     height: 215x;
+         ::v-deep .course-image{
+             height: 100% !important;
+         }
+    }
+  }
+
+  .xindex-ranking-li{
+    margin-top:30px;
+  }
+  .xindex-ranking-course{
+    height: 614px;
+  }
+
+  .xindex-ranking-case{
+    height: 295.5px;
+  }
+
+  .xindex-ranking-article{
+    height: 452px;
+  }
+
+  .xindex-ranking-qa{
+    height:222px;
+  }
+  .xindex-case {
+    // padding-right: 30px;
+  }
+
+  .case-inter{
+      left: 20px;
+      bottom:20px;
+      // .interact-bar-index{
+      //     display: none !important;
+      //    }
+      ::v-deep .el-avatar--small{
+       width: 32px;
+       height: 32px;
+    }
+  }
+  .modules-list{
+    // margin-right: 36px;
+  }
+  .boe-case-index{
+    height: 396px;
+    .case-top{
+        height: 120px;
+    }
+    .case-conent{
+     width: 350px;
+     height: 274px;
+    //  top:30px;
+    //  left:30px;
+     padding: 30px;
+     .time-one{
+      padding:3px 10px;
+     }
+     .cast-time{
+      margin-bottom: 14px;
+     }
+       .case-title{
+          font-size: 16px;
+          height: 48px;
+          line-height: 24px;
+          margin-top: 20px;
+       }
+      .case-text{
+       height: 60px;
+       font-size: 14px;
+       line-height: 20px;
+       margin-bottom: 30px;
+      }
+
+    }
+  }
+  .boe-qa-index{
+
+    height: 320px;
+    margin-right: 36px;
+    padding: 30px;
+    .qa-center{
+       height: 152px;
+       margin-top: 10px;
+       padding: 20px;
+       .portal-index-title{
+        font-weight: 600;
+        margin-bottom: 6px;
+       }
+       .boe-qa-sum{
+        font-size: 14px;
+        line-height: 22px;
+        margin-top: 4px;
+       }
+       .qa-views{
+        left: 20px;
+        bottom: 20px;
+       }
+    }
+    .qa-char{
+        margin-top: 20px;
+        display: flex;
+        ::v-deep img{
+          width: 34px;
+          height: 34px;
+        }
+        .info-name{
+          font-size: 12px;
+          color: #6E7B84;
+          margin-left: 10px;
+        }
+      }
+    .qa-top{
+        display: flex;
+        justify-content: space-between;
+        & span:first-child{
+          background: rgba($color: #387DF7, $alpha: 0.05);
+          padding: 3px 10px;
+          border-radius: 4px;
+          font-size: 12px;
+          color: #387DF7;
+        }
+        span{
+          font-size: 14px;
+          color: #6E7B84;
+        }
+      }
+  }
+  .boe-article-index{
+      padding: 30px;
+      margin-right: 36px;
+      .article-card-left{
+          width: 352px;
+          .article-info-index-summary{
+              font-size: 14px;
+              font-weight: 400;
+              color: #6E7B84;
+              line-height: 20px;
+          }
+          .article-info-image-box{
+              width: 352px;
+              height: 196px;
+
+          }
+          .el-avatar{
+              width: 32px !important;
+              height: 32px !important;
+           }
+      }
+      .article-card-right{
+          .article-li{
+              // height: 160px;
+              display: flex;
+              width: 100%;
+              .article-img{
+                flex: 43%;
+                width: 252px;
+                height: 144px;
+                border-radius: 4px;
+                margin-right: 10px;
+                img{
+                  width: 252px;
+                  height: 144px;
+                  border-radius: 4px;
+                }
+              }
+              .article-right{
+                flex: 100%;
+                .article-info-title{
+                  font-size: 16px;
+                  font-weight: 600;
+                  color: #00253E;
+                  margin-bottom: 12px;
+                  margin-top: 10px;
+                  // width: 50%;
+                }
+                .article-info-summary{
+                  font-size: 14px;
+                  font-weight: 400;
+                  color: #6E7B84;
+                  // margin-bottom: 15px;
+                }
+                .article-bottom{
+                  display: flex;
+                  justify-content: space-between;
+                 ::v-deep .uavatar{
+                    width:34px;
+                    height: 34px;
+                  }
+                  .el-avatar{
+                      width: 34px;
+                      height: 34px;
+                  }
+                }
+              }
+
+            }
+      }
+    }
+  }
diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss
index 2d2d81ca..336afc6d 100644
--- a/src/assets/styles/portal.scss
+++ b/src/assets/styles/portal.scss
@@ -1,98 +1,450 @@
-body {
-    margin: 0px;
-    padding: 0px;
-}
-
+/**
+ * 门户页面的一些通用样式定义在这里面
+ */
+body {margin: 0px;padding: 0px;}
+//定义全局的核心区域宽度
 .xcontent{
-    width: 1000px;
-    margin: 0px auto;
+  min-width: 1100px;
+  margin: 0px auto;
 }
-.index-course{
-  width: 25%;
+//[文章，案例，问答]详细页面内容部分
+.xpage-detail-content{
+  padding: 50px;
+  background-color: #fff;
+}
+//[文章，案例，问答]详细页面的面包屑
+.xpage-detail-crumbs{
+  .crumbs-first{
+    color:#cccccc;
+  }
+  .crumbs-item{
+    color:#999999;
+  }
+  .crumbs-line{
+    margin: 0px 5px;
+    color:#999999;
+  }
+  .crumbs-last{
+    color:#3d3d3d;
+  }
+}
+//课程详细页面banner部分
+ .xpage-coures-banner{
+     width: 100%;
+     height: 200px;
+     background-image: url('../../../public/images/couresdetail.png');
+     background-size: cover;
+     .bcourse-title{
+       color: #fff;
+       margin-top: 20px;
+       font-size: 20px;
+     }
+     .bcourse-score{
+       margin-left: 30px;
+       font-size: 16px;
+     }
+     .banner-crumbs{
+        color: #fff;
+        margin-top:40px;
+        .crumbs-first{
+          font-size: 16px;
+        }
+        .crumbs-line{
+          margin: 0px 10px;
+        }
+        .crumbs-last{
+          font-size: 18px;
+        }
+     }
+ }
+
+//原样式，未修改
+.portal-model-btn{// 写文章，发课程等按钮
+    width: 100%;
+    height: 67px;
+    background: #DDEDFF;
+    border-radius: 8px;
+    font-size: 18px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #387DF7;
+    line-height: 67px;
+    text-align: center;
+    margin-bottom: 22px;
+}
+//页面中的排行内容块
+.portal-ranking{
+    border-radius: 8px;
+    padding: 30px;
+    // height: 544px;
+    // overflow-y: auto;
+    .ranking-title{
+      font-size: 24px;
+      font-family: FZLTCHJW--GB1-0, FZLTCHJW--GB1;
+      font-weight: 600;
+      color: #000000;
+      line-height: 28px;
+      padding-bottom:12px
+    }
+    .ranking-data{
+      min-height: 246px;
+      margin: 0px;
+      overflow-y: auto;
+    }
 }
 
-.course-index{
-  width: 33.3333%;
+.portal-ranking-list{
+  border-radius: 8px;
+  padding: 30px;
+  // height: 544px;
+  // overflow-y: auto;
+  .ranking-title{
+    font-size: 24px;
+    font-family: FZLTCHJW--GB1-0, FZLTCHJW--GB1;
+    font-weight: 600;
+    color: #000000;
+    line-height: 28px;
+    padding-bottom:12px
+  }
+  .ranking-data{
+    min-height: 246px;
+    margin: 0px;
+    // overflow-y: auto;
+  }
 }
 
-.xrow{
-  margin-left: -5px;
-  margin-right: -5px;
-  box-sizing: border-box;
+
+
+
+//排行块的背景
+.ranking-bg{
+  background: url('../../../public/images/qa-box.png') no-repeat top left;
+    // background: linear-gradient(180deg, #C3DEF8 0%, #FFFFFF 37%);
+    //background-size:100% 100%;
+    background-size:cover;
+}
+.ranking-bg1{
+  background: url('../../../public/images/list-or.png') no-repeat top left;
+  //background-size:100% 100%;
+  background-size:cover;
+}
+.ranking-bg2{
+  background: url('../../../public/images/list-pink.png') no-repeat top left;
+  //background-size:100% 100%;
+  background-size:cover;
+}
+//左右内容栏
+.xcontent2{
+  display: flex;
+  justify-content: space-between;
+  margin: 0px auto;
 }
 
-.xcol{
-  padding-left: 5px;
-  padding-right: 5px;
-  display: inline-block;
-  box-sizing: border-box;
+.xcontent2-main{
+  flex: 1;
 }
 
-.xrow-course{
-  padding-left: 5px;
-  padding-right: 5px;
-  display: inline-block;
-  box-sizing: border-box;
+.xcontent2-minor{
+  width: auto;
 }
 
+//课程卡片
+.xcourse-card{
+    width: 33%;
+    margin-bottom: 36px;
+    display: inline-block;
+    vertical-align: top;
+}
+
+.course-card {
+  // padding: 30px;
+  // padding-bottom: 18px;
+  // margin-bottom: 36px;
+  background: #fff;
+  border-radius: 8px;
+  position: relative;
+  .course-card-favorite{
+    position: absolute;
+    right:25px;
+    bottom: 72px;
+  }
+  // margin-right: 35px;
+
+  // .cor-icon {
+  //   position: absolute;
+  //   left: 100px;
+  //   top: 54px;
+  //   border-radius: 50%;
+  //   background: rgba(88, 138, 252, 0.37);
+
+  //   .el-icon-caret-right {
+  //     font-size: 36px;
+  //     color: #588afc;
+  //   }
+  // }
+  .course-image-box {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    ::v-deep .el-image{
+      border-radius: 4px !important;
+    }
+    .course-image {
+      width: 100%;
+      height: 100%;
+    }
+    .course-type {
+      position: absolute;
+      top: 5px;
+      right: 0px;
+      width: 90px;
+      height: 30px;
+      line-height: 30px;
+      text-align: center;
+      background-color: #292828;
+      opacity: 0.4;
+      border-top-left-radius: 15px;
+      border-bottom-left-radius: 15px;
+      color: #ffffff;
+      -moz-user-select: none; /*火狐*/
+      -webkit-user-select: none; /*webkit浏览器*/
+      -ms-user-select: none; /*IE10*/
+      -khtml-user-select: none; /*早期浏览器*/
+      user-select: none;
+    }
+    .course-type-title {
+      position: absolute;
+      top: 5px;
+      right: 0px;
+      width: 90px;
+      height: 30px;
+      line-height: 30px;
+      text-align: center;
+      color: #ffffff;
+      -moz-user-select: none; /*火狐*/
+      -webkit-user-select: none; /*webkit浏览器*/
+      -ms-user-select: none; /*IE10*/
+      -khtml-user-select: none; /*早期浏览器*/
+      user-select: none;
+    }
+  }
+  .course-title {
+    height: 44px;
+    // margin: 10px 0;
+    margin: 10px 0 10px 0px;
+    line-height: 24px;
+    font-size: 16px;
+    font-weight: 600;
+    color: #333333;
+    -moz-user-select: none; /*火狐*/
+    -webkit-user-select: none; /*webkit浏览器*/
+    -ms-user-select: none; /*IE10*/
+    -khtml-user-select: none; /*早期浏览器*/
+    user-select: none;
+  }
+  .course-info { //图片下面的一行信息
+    display: flex;
+    justify-content: space-between;
+    line-height: 30px;
+    .course-info-user{
+      font-size: 14px;
+      color: #6E7B84;
+      flex: 1;
+      .course-info-studys {
+        // margin-left: 12px;
+        -moz-user-select: none; /*火狐*/
+        -webkit-user-select: none; /*webkit浏览器*/
+        -ms-user-select: none; /*IE10*/
+        -khtml-user-select: none; /*早期浏览器*/
+        user-select: none;
+      }
+      .course-info-author{
+        margin-right: 12px;
+      }
+    }
+    .course-info-score{
+      display:flex;
+      margin-left: auto;
+      ::v-deep .cor-praises {
+          // position: absolute;
+          -moz-user-select: none; /*火狐*/
+          -webkit-user-select: none; /*webkit浏览器*/
+          -ms-user-select: none; /*IE10*/
+          -khtml-user-select: none; /*早期浏览器*/
+          user-select: none;
+          .interact-bar-btn {
+            margin-top: -2px;
+            min-width: 26px !important;
+            width: 32px;
+            height: 20px;
+            background:rgba(237, 239, 240,0.5);
+            border-radius: 20px;
+            margin-top: 4px;
+            margin-right: 12px;
+            .interact-bar-value {
+              display: none;
+            }
+            .svg-icon{
+              font-size: 12px !important;
+              margin-left: 10px;
+              margin-bottom: 6px;
+            }
+          }
+      }
+      .course-score-value {
+        font-size: 14px;
+        color: #FA6400;
+        text-align: right;
+        margin-left: 10px;
+        font-family: "Arial";
+        // font-size: 30px;
+      }
+      .course-score-no {
+        text-align: right;
+        font-size: 14px;
+        color: #6B7C85;
+      }
+
+    }
+  }
+
+}
+//课程播放页的样式控制
+.xcstudy-left{
+  width: 400px;
+}
+/**我的笔记*/
+.xcstudy-mynode{
+  width: 400px;
+}
+
+
+//以下是多分辨率的控制，注意，只是一些样式的高度，宽度，大小控制，非大小控制不要在这里写
 @media screen and (max-width: 1366px){
-  .xcontent{
-    width: 1000px;
-    margin: 0px auto;
+  .xcontent{width: 1100px;}
+  .xcontent2{
+    width: 1100px;
   }
-  .index-course{
-    width: 25%;
+  .home-page-right{
+    width: 330px;
   }
-  .course-index{
-    width: 33.3333%;
+  .rankimg{
+    width:66px;
+    height:38px;
+    float: left;
+  }
+  .xcontent2-minor{
+    width: 260px;
+  }
+  .portal-ranking{
+    padding: 20px 15px;
+    .ranking-title{
+      font-size: 18px;
+      line-height: 25px;
+      padding-bottom:10px
+    }
+  }
+  .course-card {
+    padding:20px;
+    margin-right: 20px;
+    position: relative;
+    .course-card-favorite{
+      position: absolute;
+      right:20px;
+      bottom: 72px;
+  }
+    .course-image-box {
+      width:218;
+      height: 122px;
+    }
   }
 }
 
 @media screen and (max-width: 1680px) and (min-width:1367px){
-  .xcontent{
-    width: 1260px;
-    margin: 0px auto;
+  .xcontent{width: 1366px;}
+  .xcontent2{
+    width: 1366px;
   }
-  .index-course{
-    width: 20%;
+  .rankimg{
+    width:76px;
+    height:42px;
+    float: left;
   }
-  .course-index{
-    width: 25%;
+  .home-page-right{
+    width: 355px;
+  }
+  .xcontent2-minor{
+    width: 300px;
+  }
+  .portal-ranking{
+      padding: 30px 20px;
+  }
+  .course-card {
+    padding:25px;
+    margin-right: 25px;
+    .course-image-box {
+      width: 278px;
+      height: 156px;
+    }
   }
 }
 
 @media screen and (max-width: 1920px) and (min-width: 1681px){
-  .xcontent{
-    width: 1520px;
-    margin: 0px auto;
+  .xcontent{width: 1690px;}
+  .xcontent2{
+    width: 1690px;
   }
-  .index-course{
-    width: 16.6666666667%;
+  .rankimg{
+    width:86px;
+    height:42px;
+    float: left;
   }
-  .course-index{
-    width: 20%;
+  .home-page-right{
+    width: 395px;
+  }
+  .xcontent2-minor{
+    width: 400px;
+  }
+  .portal-ranking{
+      padding: 30px 30px;
+  }
+  .course-card {
+    padding:25px;
+    margin-right: 25px;
+    .course-image-box {
+      width: 346px;
+      height: 192px;
+    }
   }
 }
 
 @media screen and (min-width: 1921px){
-  .xcontent{
-    width: 1520px;
-    margin: 0px auto;
+  .xcontent{width: 1880px;}
+  .xcontent2{
+    width: 1846px;
   }
-  .index-course{
-    width: 16.6666666667%;
+  .home-page-right{
+    width: 395px;
   }
-  .course-index{
-    width: 20%;
+  .rankimg{
+    width:96px;
+    height:52px;
+    float: left;
+  }
+  .xcontent2-minor{
+    width: 400px;
   }
-}
 
-.portal-content {
-    margin-top: 30px;
-    .breadcrumb-nav {
-        margin-bottom: 15px;
-        font-size: 14px;
-        font-weight: normal;
-        color: #666666;
+  .portal-ranking{
+      padding: 30px 30px;
+  }
+  .course-card {
+    padding:25px;
+    margin-right: 25px;
+    .course-image-box {
+      width: 340px;
+      height: 191px;
     }
+  }
+
 }
diff --git a/src/assets/styles/qaLabel.scss b/src/assets/styles/qaLabel.scss
index 0cde06d4..607e5ad0 100644
--- a/src/assets/styles/qaLabel.scss
+++ b/src/assets/styles/qaLabel.scss
@@ -1,10 +1,13 @@
 .qa-basic{
-  font-weight: 600;
-  font-size: 18px;
+  font-weight: 500;
+  font-size: 16px;
 }
 .qa-solve{
-  color:#08A890;
+  color:#387df7;
+  margin-left: -8px;
 }
 .qa-unSolve{
-  color:#588afc;
+  color:#333;
+  margin-left: -8px;
+
 }
\ No newline at end of file
diff --git a/src/assets/styles/uc.scss b/src/assets/styles/uc.scss
new file mode 100644
index 00000000..161d20a6
--- /dev/null
+++ b/src/assets/styles/uc.scss
@@ -0,0 +1,102 @@
+/**
+ * 用户中心的一些通用样式，定义在这里面
+ */
+
+ .uc-center-page{
+    font-size: 18px;
+    font-weight: 600;
+    color: #333333;
+    line-height: 36px;
+   //  margin-right: 44px;
+ }
+ .uc-center-one-title{
+    font-size: 18px;
+    font-weight: 600;
+    color: #333333;
+ }
+ .uc-center-title{
+    font-size: 16px;
+    font-weight: 600;
+    color: #333333;
+ }
+ .uc-center-time{
+    font-size: 14px;
+    color: #666666;
+ }
+ .uc-center-summary{
+   font-size: 14px;
+   color: #333333;
+}
+ .uc-center-icon{
+    font-size: 12px;
+    color: #999999;
+ }
+ .el-message-box{
+    width: 502px;
+    height: 282px;
+ }
+ .el-message-box__header{
+    display: none;
+ }
+ .el-message-box__content{
+    text-align: center;
+    margin-top: 86px;
+    padding: 0;
+    font-weight: 600;
+    color: #333333;
+    font-size: 22px;
+    .el-message-box__status{
+        display: none;
+    }
+ }
+ .el-message-box__btns{
+    margin-top: 60px;
+    text-align: center;
+    .el-button{
+        width: 140px;
+        height: 40px;
+        border-radius: 4px;
+        border: 1px solid #387DF7;
+
+    }
+   
+    .el-button--primary:active{
+      background: #387DF7;
+      border-color: #387DF7;
+      color: #FFF;
+    }
+    .el-button--primary:hover{
+      background: #387DF7;
+      border-color: #387DF7;
+      color: #FFF;
+    }
+    .el-button--primary:focus{
+      background: #387DF7;
+      border-color: #387DF7;
+      color: #FFF;
+    }
+    .el-button--primary:visited{
+      background: #387DF7;
+      border-color: #387DF7;
+      color: #FFF;
+    }
+   
+ }
+ .el-message-box__btns button:nth-child(1) {
+    color: #387DF7;
+}
+ .el-message-box__btns button:nth-child(2) {
+    margin-left:20px;
+}
+.search-btn{
+   background: #2C68FF;
+}
+.uc-input{
+   width: 210px;
+}
+.uc-select{
+   width: 125px;
+}
+.el-select-dropdown__item{
+  text-align: center;
+}
\ No newline at end of file
diff --git a/src/components/Article/collectList.vue b/src/components/Article/collectList.vue
index feb4bba4..9397595d 100644
--- a/src/components/Article/collectList.vue
+++ b/src/components/Article/collectList.vue
@@ -2,18 +2,24 @@
   <div style="cursor: pointer;">
     <div class="article-list" v-for="(item, idx) in items" :key="idx">
       <div class="article-info-date"></div>
-      <div @click="jump(item)">
+      <div>
         <div class="article-info">
-          <div class="article-info-title one-line-ellipsis">
-            {{ item.title }}
+          <div class="art-hear">
+            <div @click="jump(item)" style="max-width:84%" class="article-info-title one-line-ellipsis">
+              {{ item.title }}
+            </div>
+            <span class="art-tit" v-if="isAll">#文章#</span>
+            <el-button @click.stop="delItem(item)" type="text" style="color: #8590A6" icon="el-icon-star-on">取消收藏</el-button>
           </div>
-          <div class="article-info-summary two-line-ellipsis">{{ item.summary || item.content}}</div>
-          <div class="article-info-tools">
-            <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"> </authorInfo>
-            <span>发布时间：{{ item.sysCreateTime || item.publishTime || item.favoritesTime | timeFilter }}</span>
-            <span>收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span>
-            <el-button @click.stop="delItem(item)" type="text" style="color: #8590A6" icon="el-icon-remove">取消收藏</el-button>
+           <div class="article-info-tools">
+            <authorInfo :avatar="item.avatar" :aid="item.sysCreateAid" :name="item.name" :info="item.orgInfo" :sex="item.sex"> </authorInfo>
+            <!-- <span>发布时间：{{ item.sysCreateTime || item.publishTime || item.favoritesTime | timeFilter }}</span> -->
+            <!-- <span>收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span> -->
           </div>
+          <div @click="jump(item)" class="article-info-summary two-line-ellipsis">{{ item.summary || item.content}}</div>
+            <interactBar   :type="2" :readonly="true" :data="item" :views="false" :shares="false"></interactBar>
+
+
         </div>
       </div>
     </div>
@@ -30,7 +36,11 @@ export default {
       //name,
       type: Array,
       default: () => []
-    }
+    },
+    isAll:{
+            type:Boolean,
+            default:false,
+          }
   },
   data() {
     return {};
@@ -68,6 +78,18 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.art-hear{
+  display: flex;
+  button{
+    margin-left: auto;
+  }
+}
+.art-tit{
+  font-size: 16px;
+  color: #333333;
+  margin-left: 5px;
+  font-weight: 400;
+}
 .article-status1 {
   padding: 3px;
   border: 1px dotted #1ea0fa;
@@ -108,18 +130,18 @@ export default {
 }
 .article-info {
   .article-info-title {
-    font-size: 18px;
-    font-weight: 400;
+    font-size: 16px;
+    font-weight: 600;
     margin-bottom: 5px;
     color: #333;
   }
   .article-info-summary {
     // height: 65px;
-    color: #999999;
+    color: #333;
     margin-bottom: 15px;
     margin-top: 10px;
-
-    line-height: 25px;
+    font-size: 14px;
+    line-height: 20px;
   }
   .article-info-tools {
     color: #999999;
diff --git a/src/components/Article/editItems.vue b/src/components/Article/editItems.vue
index 31e16a78..3d08d0f2 100644
--- a/src/components/Article/editItems.vue
+++ b/src/components/Article/editItems.vue
@@ -2,32 +2,38 @@
 <div>
      <el-row class="article-add">
         <el-form ref="form" :rules="rules" :model="addForm" label-position="right" label-width="80px">
-          <el-form-item prop="title" label="标题:">
-            <el-input class="title-input" v-model.trim="addForm.title" placeholder="请输入文章标题,长度在 1 到 100 个字符" show-word-limit  maxlength="100"></el-input>
+          <el-form-item prop="title" label="标题">
+            <el-input class="title-input" v-model.trim="addForm.title" placeholder="请输入文章标题,长度在 1 到 50 个字符" show-word-limit  maxlength="50"></el-input>
           </el-form-item>
-          <el-form-item class="imgInstructions">
-
+          <el-form-item class="imgInstructions" label="封面">
             <div class="el-form-item__content">
-               <imageUpload :value="converImage" width="133px" height="100px" @success="handleUploadSuccess" @remove="handleRemoveSuccess"></imageUpload>
-              <dl>
+               <imageUpload :value="converImage" width="410px" height="168px" @success="handleUploadSuccess" @remove="handleRemoveSuccess"></imageUpload>
+              <!-- <dl>
               <dt>上传封面说明</dt>
               <dd>上传为4:3(如:400*300)的png或jpg图片</dd>
               <dd>允许上传图片大小为：5MB</dd>
-            </dl>
+            </dl> -->
             </div>
 
           </el-form-item>
-          <el-form-item prop="keyword" label="关键字:"><el-input show-word-limit maxlength="50" placeholder="请输入关键字,长度在 0 到 50 个字符" v-model.trim="addForm.keyword"></el-input></el-form-item>
-          <el-form-item prop="summary" label="摘要:">
+          <el-form-item prop="keyword" label="关键字"><el-input show-word-limit maxlength="50" placeholder="请输入关键字,长度在 0 到 50 个字符" v-model.trim="addForm.keyword"></el-input></el-form-item>
+          <el-form-item prop="summary" label="摘要">
             <el-input show-word-limit maxlength="200" placeholder="请输入摘要,仅限200字以内(未填写摘要信息时，自动从内容中提取!)" v-model.trim="addForm.summary" type="textarea" :autosize="{ minRows: 4, maxRows: 6 }"></el-input>
           </el-form-item>
-          <el-form-item prop="content" label="内容:">
+          <el-form-item prop="content" label="正文">
             <WxEditor v-model.trim="addForm.content" placeholder="请输入内容,长度至少在100个字符" :minHeight="250">
               </WxEditor></el-form-item>
-          <el-form-item class="footer-btn">
-            <el-button type="primary" :loading="craftLoading" @click="submit(1)" style="margin-right: 40px;">保存草稿</el-button>
+          <el-form-item class="footer-btn ">
+            <div class="btnbox">
+              <div class="check-right">
+            <el-checkbox style="margin-left:00px" v-model="checked"></el-checkbox><span style="font-size:14px;color:#787878;margin-left: 10px;">我已阅读并遵守<span style="color:#588afc;margin-right:10px;cursor: pointer;" @click="addFormCheckedShow = true">平台内容发布要求</span> </span>
+            </div>
+           <div class="button-left">
+            <el-button type="primary" plain :loading="craftLoading" @click="submit(1)" style="margin-right: 40px;">保存草稿</el-button>
             <el-button :loading="loading" @click="submit(2)" :disabled="!checked" type="primary">提交</el-button>
-            <el-checkbox style="margin-left:20px" v-model="checked"></el-checkbox><span style="font-size:14px;color:#787878;margin-left: 10px;">我已阅读并遵守<span style="color:#588afc;margin-right:10px;cursor: pointer;" @click="addFormCheckedShow = true">平台内容发布要求</span> </span>
+          </div>
+            </div>
+            
           </el-form-item>
         </el-form>
       </el-row>
@@ -45,7 +51,7 @@
 import agreement from '@/components/Portal/agreement.vue'
 import { mapGetters } from 'vuex';
 import WxEditor from '@/components/Editor/index.vue';
-import imageUpload from '@/components/ImageUpload/index.vue';
+import imageUpload from '@/components/ImageUpload/artimgUpload.vue';
 import apiArticle from '@/api/modules/article.js';
 export default {
   name: 'atticleAdd',
@@ -142,8 +148,8 @@ export default {
       // let content= this.addForm.content.replace(/<.*?>/ig,"");
       // let content= this.addForm.content.replace(/[^\u4E00-\u9FA5|\d|\a-zA-Z|\r\n\s,.?!，。？！<>…—&$=()-+/*{}[\]]|\r\n\s/g,"");
       if(this.addForm.content.trim() == ''){
-         this.$message('您输入的内容为空，无法发布')
-          type: 'warning'
+         this.$message.warning('您输入的内容为空，无法发布')
+          // type: 'warning'
           this.loading=false
           return 
       }
@@ -156,6 +162,19 @@ export default {
                   type:'success',
                   message:"发布文章成功"
                 });
+                let event = {
+                key: "PublishArticle",//后台的事件key  发布文章且审核通过
+                title: "发表文章",//事件的标题
+                parameters:"",//用户自定义参数 name:value,name:value
+                content: "发表了文章",//事件的内容
+                objId: res.result.id,//关联的id
+                objType: "2",//关联的类型
+                objInfo: this.addForm.title,
+                aid: this.userInfo.aid, //当前登录人的id
+                aname: this.userInfo.name,//当前人的姓名
+                status: 1 //状态，直接写1
+              }
+              this.$store.dispatch("userTrigger", event);
               }
               if(res.message.indexOf('审核')!=-1){
                 this.$message(
@@ -164,6 +183,7 @@ export default {
                   message:"发布文章失败，因包含敏感词,请等待人工审核"
                 });
               }
+              
               this.$emit("success",{result:res.result,status: this.addForm.status});
               if(!this.jumpLimit){
                 return
@@ -206,6 +226,21 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.btnbox{
+  display: flex;
+  width: 100%;
+  .check-right{
+    flex: 1;
+  }
+  .button-left{
+    margin-left: auto;
+  }
+}
+::v-deep .el-form-item__label{
+  font-size: 18px !important;
+  color: #333 !important;
+  font-weight: 600 !important;
+}
 ::v-deep .checked-show{
   .el-dialog__header{
     padding:0;
@@ -270,8 +305,8 @@ export default {
         margin-left: 20px;
         line-height: 1.5;
         dt {
-          font-size: 16px;
-          font-weight: bold;
+          font-size: 18px;
+          font-weight: 600;
         }
         dd {
           margin: 0;
diff --git a/src/components/Article/shareItems.vue b/src/components/Article/shareItems.vue
index 8d926c64..13f2e825 100644
--- a/src/components/Article/shareItems.vue
+++ b/src/components/Article/shareItems.vue
@@ -1,6 +1,24 @@
 <template>
   <div style="">
-    <div class="article-list" v-for="(item, idx) in items" :key="idx">
+    <!-- 新版 -->
+    <div class="art-box" v-for="(item, idx) in items" :key="idx">
+       <div class="coures-head">
+          <div class="share-name" v-if="type=='myShare'">
+           分享给了<span>{{ item.toAname }}</span>
+          </div>
+        <div v-else class="share-name">
+          <span>{{ item.toAname }}</span>分享给了我
+        </div>
+        <div class="islook" v-if="item.isRead">已查看</div>
+        <div class="isunlook" v-else>未查看</div>
+        <div class="share-time">{{ item.time }}</div>
+      </div>
+      <div class="coures-content">
+          <span>【文章】</span>{{item.title}}
+      </div>
+    </div>
+    <!-- 旧版 -->
+    <!-- <div class="article-list" v-for="(item, idx) in items" :key="idx">
       <div class="article-info" @click="jumpRouter(item)">
         <div class="article-info-title">
           <span v-if="item.isRead" class="readed">【已查看】</span>
@@ -10,21 +28,20 @@
         </div>
         <div v-html="$keywordActiveShow(item.summary || item.content,keyword)" class="article-info-summary two-line-ellipsis">
         </div>
-        <!-- v-html="$keywordActiveShow(item.summary,keyword)" -->
         <div style="display:flex;justify-content: space-between;">
           <div class="article-info-tools">
-          <!-- <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo"></authorInfo> -->
+          <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo"></authorInfo>
           <span style="color: #999999;">{{ item.time }}</span>
           <span v-if="type=='myShare'" style="color: #999999;font-size: 14px;">分享给{{item.toAname}}</span>
           <span v-else>{{item.sysCreateBy}}分享给我</span>
-          <!-- <interactBar ref="shareDialog" :type="0" :data="item" :shares="false" :views="false"></interactBar> -->
+          <interactBar ref="shareDialog" :type="0" :data="item" :shares="false" :views="false"></interactBar>
         </div>
         <div>
           <el-button style="color: #8590A6;" v-if="!item.isRead&&type=='myShare'" type="text" icon="el-icon-refresh-right" @click.stop="deleteshares(item)">撤回</el-button>
         </div>
         </div>
       </div>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -109,6 +126,57 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.art-box{
+  width: 100%;
+  padding: 30px 0;
+  border-bottom:1px solid #e9e9e9 ;
+  .coures-content{
+    margin-top: 20px;
+    font-size: 16px;
+    color: #333333;
+    font-weight: 600;
+    span{
+    font-size: 16px;
+    margin-left: -9px;
+    }
+  }
+  .coures-head{
+    display: flex;
+    .share-name{
+      font-size: 14px;
+      color: #666666;
+      margin-right: 17px;
+    }
+    .share-time{
+      font-size: 14px;
+      color: #666666;
+      line-height: 25px;
+      margin-left: auto;
+    }
+    .islook{
+      width: 46px;
+      height: 24px;
+      background: #eee;
+      font-size: 12px;
+      color: #666666;
+      line-height: 24px;
+      text-align: center;
+      border-radius: 2px;
+    }
+    .isunlook{
+      width: 46px;
+      height: 24px;
+      background: #FF6562;
+      border-radius: 2px;
+      font-size: 12px;
+      color: #fff;
+      line-height: 24px;
+      text-align: center;
+
+    }
+
+  }
+}
 .article-status1 {
   padding: 3px;
   border: 1px dotted #1ea0fa;
diff --git a/src/components/Article/ucItems.vue b/src/components/Article/ucItems.vue
index 5ffa3e93..9c2ed7ad 100644
--- a/src/components/Article/ucItems.vue
+++ b/src/components/Article/ucItems.vue
@@ -1,49 +1,24 @@
 <template>
   <div>
-    <Remark :fixed="false">
-      <ul>
-        <li>class名为problem的dom(即时间)无法直接垂直居中</li>
-        <li>状态有草稿、待审核、未通过、已通过、已发布</li>
-        <li>状态为已发布时才显示点赞收藏图标</li>
-        <li>点击编辑时没有跳转到新页面</li>
-      </ul>
-    </Remark>
     <div class="article-list" v-for="(item, idx) in items" :key="idx" @click="jumpDetail(item)">
       <div class="article-info">
-        <div class="article-info-title one-line-ellipsis"  
-        >
-          <span v-if="item.enabled" :class="classFilter(item.status).className">{{classFilter(item.status).text}}</span>
-          <span v-else class="article-status8">【已下架】</span>
-          <span  class="titleContent "  >
+        <div class="article-info-title one-line-ellipsis">
+          <span  class="titleContent"  >
             {{ item.title }}
           </span>
-
         </div>
-        <div class="article-info-summary two-line-ellipsis">{{item.summary}}</div>
-        <div class="article-info-tools">
-          <div class="article-info-tools-auth">
-            <!-- <el-avatar size="small" :src="item.avatar ? fileBaseUrl + item.avatar : '/temp/index/male.jpg'"></el-avatar>
-            <span>{{item.name}}{{(item.orgInfo)}}</span> -->
-            <!-- <el-tag v-if="status === 0" type="success">已发布</el-tag>
-            <el-tag type="warning" v-else>未发布</el-tag> -->
-            <span class="article-time">
-              <span> 时间：{{item.sysCreateTime|sysCreateTimeFilter}}</span>
-            </span>
-            <span v-if="!item.enabled">已下架</span>
+        <div class="art-head two-line-ellipsis">
+          <div class="article-info-summary">
+            {{item.summary}}
           </div>
-          <div class="article-info-tools-btns" v-if="item.status == 9">
-            <!-- <interactBar :data="item" :type="2" :shares="false" :views="false"></interactBar> -->
-            <!-- <el-link icon="el-icon-chat-line-round" class="article-info-tools-btn" >评论57</el-link>
-            <el-link icon="el-icon-s-promotion" class="article-info-tools-btn" >分享57</el-link>
-            <el-link icon="el-icon-star-on" class="article-info-tools-btn">收藏12</el-link>
-            <el-link icon="el-icon-thumb" class="article-info-tools-btn" >点赞20</el-link > -->
+          <div class="art-img" v-if="item.coverurl">
+            <img :src="fileBaseUrl + item.coverurl" alt="">
           </div>
         </div>
-
       </div>
        <div class="article-info-date">
-            <el-button class="edit" @click.stop="editItem(item.id)" type="text"  icon="el-icon-edit">编辑</el-button>
-            <el-button class="del" @click.stop="delItem(item)" type="text" icon="el-icon-delete">删除</el-button>
+            <authorInfo :aid="item.sysCreateAid" :avatar="item.avatar" :name="item.sysCreateBy" :sex="item.sex" :info="item.orgInfo"></authorInfo>
+            <interactBar :data="item" :type="2" :shares="false" :views="false"></interactBar>
       </div>
     </div>
     <el-dialog title="编辑文章" :visible.sync="diagSync" :close-on-click-modal="false" width="900px" custom-class="g-dialog">
@@ -53,12 +28,17 @@
 </template>
 
 <script>
+import { mapGetters } from "vuex";
 import interactBar from '@/components/Portal/interactBar.vue';
 import apiArticle from '@/api/modules/article.js';
 import editItems from '@/components/Article/editItems.vue';
+import authorInfo from '@/components/Portal/authorInfo.vue';
 export default {
   components: {
-    interactBar,editItems
+    interactBar,editItems,authorInfo
+  },
+  computed: {
+    ...mapGetters(["userInfo"]),
   },
   name: 'articleItems',
   props: {
@@ -78,7 +58,7 @@ export default {
       }
     };
   },
-  
+
   filters:{
     sysCreateTimeFilter(item){
       return item.split(' ')[0]
@@ -146,26 +126,35 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      })
-
-        .then(() => {
-          apiArticle
-            .del(item.id)
-            .then(res => {
+      }).then(() => {
+          apiArticle.del(item.id).then(res => {
               if (res.status == 200) {
                 this.$emit('update',true)
                 this.$message.success('删除成功');
-                console.log('shanchushanchu')
+                //发送删除事件
+                let event = {
+                  key: "DeleteArticle",//后台的事件key  发布文章且审核通过
+                  title: "删除文章",//事件的标题
+                  parameters:"",//用户自定义参数 name:value,name:value
+                  content: "删除文章",//事件的内容
+                  source:'page',
+                  objId: item.id,//关联的id
+                  objType: "2",//关联的类型
+                  objInfo: item.title,
+                  aid: this.userInfo.aid, //当前登录人的id
+                  aname: this.userInfo.name,//当前人的姓名
+                  status: 1 //状态，直接写1
+                }
+                this.$store.dispatch("userTrigger", event);
+
 
               }else{
-                this.$message.error('删除失败');
+                this.$message.error('删除失败:'+res.message);
               }
-            })
-            .catch(err => {
+            }).catch(err => {
               this.$message.error('删除失败');
             });
-        })
-        .catch(() => {});
+        }).catch(() => {});
     }
   }
 };
@@ -174,7 +163,6 @@ export default {
 <style lang="scss" scoped>
 .two-line-ellipsis {
   display: -webkit-box;
-  white-space:pre-wrap;
   overflow: hidden;
   text-overflow:ellipsis;
   -webkit-box-orient: vertical;
@@ -191,9 +179,12 @@ export default {
   box-sizing: border-box;
 }
  .article-info-date {
-      position: absolute;
-      top: 70%;
-      right:0px;
+  display: flex;
+  justify-content: space-between;
+  ::v-deep .interact-bar-btn{
+    min-width: 70px !important;
+    text-align: right;
+  }
       .del{
          color: #8590A6;
          font-size: 14px;
@@ -208,8 +199,6 @@ export default {
     }
 .one-line-ellipsis {
     width: 100%;
-    // word-break: break-all;
-    // white-space:pre-wrap;
     text-overflow: ellipsis;
     display: -webkit-box;
     -webkit-box-orient: vertical;
@@ -219,16 +208,13 @@ export default {
 }
 .two-line-ellipsis{
   display: -webkit-box;
-  // white-space:pre-wrap;
   overflow: hidden;
-  // text-overflow:ellipsis;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
   box-sizing: border-box;
 }
 .article-status1 {
   padding: 3px;
-  // border: 1px dotted #ddd;
   color: #666;
 }
 .article-status8{
@@ -238,7 +224,6 @@ export default {
 }
 .article-status2 {
   padding: 3px;
-  // border: 1px dotted #FFB30F;
   color: #FFB30F;
 }
 .article-status3 {
@@ -260,40 +245,47 @@ export default {
    position: relative;
   margin: 0px 0;
  border-bottom: 1px solid #E8E8E8;
-  padding-top: 15px;
-  padding-bottom: 15px;
+  padding: 32px 0;
   cursor: pointer;
 
 }
 
 .article-info {
-
-
   .article-info-title {
-    margin-left: -12px;
     color: #333;
-width: 100%;
+    width: 100%;
     font-size: 18px;
-    // font-weight: 400;
-    
-    // height: 40px;
     margin-top: 7px;
-    // line-height: 40px;
     .titleContent{
-      // padding-left: 5px;
       cursor: pointer;
+      font-size: 16px;
+      color: #333333;
+      font-weight: 600;
     }
 
   }
-  .article-info-summary {
-    // height: 65px;
-    margin-bottom: 20px;
-    color: #666;
-    margin-top: 10px;
-    font-size: 16px;
-
-
+  .art-head{
+    display: flex;
+    width: 100%;
+    margin-bottom: 15px;
+    .article-info-summary {
+      flex: 1;
+      color: #333333;
+      margin-left: 5px;
+      margin-top: 26px;
+      font-size: 14px;
+    }
+    .art-img{
+      width: 192px;
+      height: 109px;
+      margin-left: auto;
+      img{
+        width: 100%;
+        height: 100%;
+      }
+    }
   }
+  
   .article-info-tools {
     height: 30px;
     display: flex;
@@ -312,7 +304,7 @@ width: 100%;
       }
       .article-time{
         margin-left: -5px;
-		border:0px;
+		    border:0px;
         span{
           font-size: 14px;
         }
diff --git a/src/components/AudioPlayer/index.vue b/src/components/AudioPlayer/index.vue
index 846b1dd7..385d5e61 100644
--- a/src/components/AudioPlayer/index.vue
+++ b/src/components/AudioPlayer/index.vue
@@ -6,7 +6,7 @@
     </div> -->
     <!-- <div class="title">{{ name }}</div> -->
     <audio :autoplay="autoplay" ref="audioPlayer" preload="auto" :src="url">
-      你的浏览器不支持audio标签
+      您的浏览器不支持audio标签
     </audio>
     <div style="text-align: center;padding-top: 30px;cursor: pointer;">
        <i v-if="!isPlay" @click="playAudio" class="el-icon-video-play" style="font-size: 80px;color:#588afc;"></i>
diff --git a/src/components/Case/caseItems.vue b/src/components/Case/caseItems.vue
index b968f451..30da5b9f 100644
--- a/src/components/Case/caseItems.vue
+++ b/src/components/Case/caseItems.vue
@@ -1,6 +1,25 @@
 <template>
   <div style="">
-    <div class="article-list" v-for="(item, idx) in items" :key="idx">
+   <!-- 最新 -->
+    <div class="case-box"  v-for="(item, idx) in items" :key="idx">
+       <div class="coures-head">
+          <div class="share-name" v-if="type=='myShare'">
+          分享给了<span>{{ item.toAname }}</span>
+        </div>
+        <div v-else class="share-name">
+          <span>{{ item.toAname }}</span>分享给了我
+        </div>
+        <div class="islook" v-if="item.isRead">已查看</div>
+        <div class="isunlook" v-else>未查看</div>
+        <div class="share-time">{{ item.time }}</div>
+      </div>
+      <div class="coures-content">
+          <span>【案例】</span>{{item.title}}
+      </div>
+
+    </div>
+    <!-- 旧版 -->
+    <!-- <div class="article-list" v-for="(item, idx) in items" :key="idx">
       <div class="article-info" @click="jumpRouter(item)">
         <div class="article-info-title">
           <span v-if="item.isRead" class="readed">【已查看】</span>
@@ -10,21 +29,20 @@
         </div>
         <div v-html="$keywordActiveShow(item.cases.summary,keyword)" class="article-info-summary two-line-ellipsis">
         </div>
-        <!-- v-html="$keywordActiveShow(item.summary,keyword)" -->
         <div style="display:flex;justify-content: space-between;">
           <div class="article-info-tools">
-          <!-- <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo"></authorInfo> -->
+          <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo"></authorInfo>
           <span style="color: #999999;">{{ item.time }}</span>
           <span v-if="type=='myShare'" style="color: #999999;font-size: 14px;">分享给{{item.toAname}}</span>
           <span v-else>{{item.sysCreateBy}}分享给我</span>
-          <!-- <interactBar ref="shareDialog" :type="0" :data="item" :shares="false" :views="false"></interactBar> -->
+          <interactBar ref="shareDialog" :type="0" :data="item" :shares="false" :views="false"></interactBar>
         </div>
         <div>
           <el-button style="color: #8590A6;" v-if="!item.isRead&&type=='myShare'" type="text" icon="el-icon-refresh-right" @click.stop="deleteshares(item)">撤回</el-button>
         </div>
         </div>
       </div>
-    </div>
+    </div> -->
   </div>
 </template>
 <script>
@@ -94,6 +112,57 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.case-box{
+  width: 100%;
+  padding: 30px 0;
+  border-bottom:1px solid #e9e9e9 ;
+  .coures-content{
+    margin-top: 20px;
+    font-size: 16px;
+    color: #333333;
+    font-weight: 600;
+    span{
+    font-size: 16px;
+    margin-left: -9px;
+    }
+  }
+  .coures-head{
+    display: flex;
+    .share-name{
+      font-size: 14px;
+      color: #666666;
+      margin-right: 17px;
+    }
+    .share-time{
+      font-size: 14px;
+      color: #666666;
+      line-height: 25px;
+      margin-left: auto;
+    }
+    .islook{
+      width: 46px;
+      height: 24px;
+      background: #eee;
+      font-size: 12px;
+      color: #666666;
+      line-height: 24px;
+      text-align: center;
+      border-radius: 2px;
+    }
+    .isunlook{
+      width: 46px;
+      height: 24px;
+      background: #FF6562;
+      border-radius: 2px;
+      font-size: 12px;
+      color: #fff;
+      line-height: 24px;
+      text-align: center;
+
+    }
+
+  }
+}
 .article-status1 {
   padding: 3px;
   border: 1px dotted #1ea0fa;
diff --git a/src/components/Case/collectList.vue b/src/components/Case/collectList.vue
index 72e9f238..d70d0b42 100644
--- a/src/components/Case/collectList.vue
+++ b/src/components/Case/collectList.vue
@@ -3,23 +3,35 @@
     <div class="article-list" v-for="(item,idx) in items" :key="idx">
       <div class="article-info ">
         <div class="article-info-title " >
-          <div style="width:85%" class="title-line-ellipsis">
-          <router-link :to="'/case/detail?id='+item.cases.id"  >{{item.cases.title}}</router-link>
-            
+          <div style="width:85%" class=" ">
+          <router-link :to="'/case/detail?id='+item.cases.id"  ><div class="case-tit title-line-ellipsis">{{item.cases.title}} <span v-if="isAll" class="bq-case">#案例#</span> </div>  </router-link>
+
           </div>
           <div class="article-info-date">
-            <el-button @click="delItem(item)" type="text" style="color: #8590A6" icon="el-icon-remove">取消收藏</el-button>
+            <el-button @click="delItem(item)" type="text" style="color: #8590A6;font-size:14px" icon="el-icon-star-on">取消收藏</el-button>
           </div>
         </div>
-        <div class="article-info-summary three-line-ellipsis">
-         <router-link :to="'/case/detail?id='+item.cases.id"  > {{item.cases.summary}}</router-link>
-        </div>
         <div class="article-info-tools">
-          <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"></authorInfo>
-          <span style="margin-top:2px">发布时间：{{ item.cases.sysCreateTime || item.publishTime | timeFilter }}</span>
-          <span style="margin-top:2px">收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span>
+          <authorInfo :avatar="item.avatar" :aid="item.cases.authorId" :name="item.name" :info="item.orgInfo" :sex="item.sex" :sign="item.sign"></authorInfo>
+          <span class="userbq">{{ item.sign }}</span>
+          <!-- <span style="margin-top:2px">发布时间：{{ item.cases.sysCreateTime || item.publishTime | timeFilter }}</span> -->
+          <!-- <span style="margin-top:2px">收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span> -->
           <!-- <interactBar :type="0" :data="item.cases" :shares="false" :views="false"></interactBar> -->
         </div>
+        <div class="article-info-summary ">
+         <!-- <router-link :to="'/case/detail?id='+item.cases.id"  > -->
+          {{displayAll(item)}}
+          <span style="color:#588afc;cursor:pointer;" v-if="item.cases.summary.length>150" @click="changeIsAll(item,idx)">
+                 {{item.isAll?'收起':'展开'}}
+            </span>
+          <!-- </router-link> -->
+
+        </div>
+        <div>
+            <interactBar   :type="3" :readonly="true" :data="item.cases" :views="false" :shares="false"></interactBar>
+
+        </div>
+
       </div>
     </div>
   </div>
@@ -27,14 +39,18 @@
 
 <script>
   import authorInfo from '@/components/Portal/authorInfo.vue';
-  import interactBar from '@/components/Portal/interactBar.vue'
+  import interactBar from '@/components/Portal/interactBar.vue';
   export default {
     name: 'articleItems',
     props: {
       items: { //name,
         type: Array,
         default:()=>[]
-      }
+      },
+      isAll:{
+            type:Boolean,
+            default:false,
+          }
     },
     filters:{
       timeFilter(item){
@@ -42,6 +58,17 @@
       }
     },
     methods:{
+       displayAll(item) {
+      if (!item.isAll && item.cases.summary && item.cases.summary.length > 150) {
+        return item.cases.summary.slice(0, 150) + "...";
+      }
+      return item.cases.summary;
+    },
+     changeIsAll(item,idx) {
+      console.log(item.isAll)
+      item.isAll = !item.isAll;
+      this.$set(this.items, idx, item);
+    },
       delItem(item){
         this.$confirm('您确定要取消收藏所选案例吗？', '删除提示', {
           confirmButtonText: '确定',
@@ -61,6 +88,22 @@
 </script>
 
 <style lang="scss" scoped>
+.userbq{
+  font-size: 14px;
+  color: #666666;
+  line-height: 35px;
+}
+.case-tit{
+  color: #333333;
+  font-size: 18px;
+  font-weight: 600;
+}
+.bq-case{
+  font-size: 16px;
+  color: #333333;
+  font-weight: normal;
+  margin-left: 5px;
+}
 .title-line-ellipsis{
    display: -webkit-box;
    overflow: hidden;
@@ -99,10 +142,11 @@
     margin: 5px 0;
     border-bottom: 1px solid #dddddd;
     padding: 0px;
+    padding-bottom: 25px;
   }
 
   .article-info {
-    
+
     .article-info-title {
       font-size: 16px;
       font-weight: 400;
@@ -123,9 +167,10 @@
       }
     }
     .article-info-summary {
-     
+     color: #333330;
+     font-size: 15px;
      line-height: 25px;
-      color: #999999;
+     margin-bottom: 15px;
     }
     .article-info-tools {
       height: 45px;
diff --git a/src/components/Course/auditCourse1.vue b/src/components/Course/auditCourse1.vue
index 62ee3cd4..e9f62b81 100644
--- a/src/components/Course/auditCourse1.vue
+++ b/src/components/Course/auditCourse1.vue
@@ -305,7 +305,7 @@ export default {
       homeworkInfo: {},
       examInfo: {},
       assessInfo: {},
-      fileBaseUrl: this.$Constants.fileBaseUrl,
+      fileBaseUrl: this.$xpage.constants.fileBaseUrl,
       btnLoading: false,
       curCFile:{},//课件内容
       coursewareInfo: {
diff --git a/src/components/Course/auditCourse2.vue b/src/components/Course/auditCourse2.vue
index efa3ed9d..caff77d9 100644
--- a/src/components/Course/auditCourse2.vue
+++ b/src/components/Course/auditCourse2.vue
@@ -343,7 +343,7 @@ export default {
       },
       contentDataShow:true,//预览页面和课程内容的切换
       isEdit: true,
-      fileBaseUrl: this.$Constants.fileBaseUrl,
+      fileBaseUrl: this.$xpage.constants.fileBaseUrl,
       contentData: {},
       curCFile:{},//课件内容
       getType: getType,
diff --git a/src/components/Course/catalogCourseware.vue b/src/components/Course/catalogCourseware.vue
index acdecc92..ac2e0cb6 100644
--- a/src/components/Course/catalogCourseware.vue
+++ b/src/components/Course/catalogCourseware.vue
@@ -366,7 +366,7 @@
     data(){
       return {
         converStatus:4,
-        fileBaseUrl:this.$Constants.fileBaseUrl,
+        fileBaseUrl:this.$xpage.constants.fileBaseUrl,
         curPdfPath:'',
         curCFile:{},//当前课件的内容
         comTypes:[
diff --git a/src/components/Course/collectItem.vue b/src/components/Course/collectItem.vue
index 05c9af80..4566783f 100644
--- a/src/components/Course/collectItem.vue
+++ b/src/components/Course/collectItem.vue
@@ -2,47 +2,41 @@
   <div style="cursor: pointer;">
     <div class="uc-course" v-for="(item, idx) in items" :key="idx" @click="coudetail(item)">
 
-      <div class="uc-course-img" style="width: 212px;height: 119px;" @click="jump(item)">
+      <div class="uc-course-img" style="width: 212px;height: 119px;margin-right:23px;" @click="jump(item)">
         <course-image :course="item"></course-image>
-        <!-- <img :src="imageUrl(item)" /><span v-if="isShow" class="two-line-ellipsis">{{item.title}}</span> -->
+        <span class="course-type">{{ contentTypeFilter(item.contentType).text }}</span>
       </div>
       <div class="flex-between" @click="jump(item)">
-        <div class="uc-course-name one-line-ellipsis">
-          <span :class="contentTypeFilter(item.contentType).class">{{ contentTypeFilter(item.contentType).text }}</span>
-          <span>{{ item.title }}</span>
-        </div>
-        <div class="uc-course-text">讲师：{{ item.authorName}}</div>
-        <div class="uc-course-text">收藏时间：{{ item.time || item.favoritesTime}}</div>
-      </div>
-     <div class="flex-between">
-        <el-button v-if="remove" @click.stop="delItem(item)" type="text" icon="el-icon-remove" style="color:#8590A6;font-size:14px;">
+        <div class="uc-course-name ">
+          <div class="uc-coures-name-left  one-line-ellipsis">
+            <span >{{ item.title }}
+              <span class="bq-coures" v-if="isAll">#课程# </span>
+              <span class="score-info" v-if="toScore(item.score) > 0"> {{toScore(item.score)}}分</span>
+            </span>
+          </div>
+        <div class="canfavo">
+        <el-button v-if="remove" @click.stop="delItem(item)" type="text" icon="el-icon-star-on" style="color:#8590A6;font-size:14px;">
           取消收藏
         </el-button>
       </div>
-      <!-- <div class="uc-course-info">
-        <div style="display: flex;justify-content: space-between;">
-          <router-link target="_blank" :to="'/course/detail?id='+item.objId" class="uc-course-name">
-            <span :class="contentTypeFilter(item.contentType).class">{{contentTypeFilter(item.contentType).text}}</span>
-            <span>{{ item.title }}</span>
-          </router-link>
-          <div><el-button v-if="remove" @click="delItem(item)" type="text" icon="el-icon-remove">取消收藏</el-button></div>
         </div>
-        <div style="display: flex;justify-content: space-between;align-items: flex-end;">
-          <div>
-            <div class="uc-course-text">讲师：{{item.authorName}}</div>
-            <div class="uc-course-text">收藏日期：{{item.time}}</div>
+
+        <div class="uc-bpttom">
+          <div class="uc-course-text"> <i class="el-icon-time"></i> 收藏时间：{{ item.time || item.favoritesTime}}</div>
+          <div class="uc-coures-button">
+          <el-button type="primary">去上课</el-button>
           </div>
-          <interactBar :type="0" :data="item" :views="false" :shares="false"></interactBar>
         </div>
-      </div> -->
-      <!-- </router-link> -->
+        <div class="pro-line"> <div>当前进度：</div> <div style="width:200px"><el-progress :percentage="item.progress == ''? 0 : item.progress"></el-progress></div></div>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-import interactBar from '@/components/Portal/interactBar.vue';
+// import interactBar from '@/components/Portal/interactBar.vue';
 import courseImage from '@/components/Course/courseImage.vue';
+import { toScore} from '@/utils/tools.js';
 export default {
   name: 'comStudyItem',
   props: {
@@ -54,11 +48,16 @@ export default {
     remove: {
       type: Boolean,
       default: true
-    }
+    },
+    isAll:{
+            type:Boolean,
+            default:false,
+          }
   },
   data() {
     return {
       isShow: false,
+      toScore,
       oData: {
         comments: '100',
         favorites: '20',
@@ -68,19 +67,21 @@ export default {
     };
   },
   components: {
-    interactBar,
+    // interactBar,
     courseImage
   },
+  mounted() {
+  },
   methods: {
     coudetail(item) {
       // let routeData = this.$router.resolve({ path: '/course/detail?id=' + item.objId });
       // window.open(routeData.href, '_blank');
-      if(item.contentType == '20') {
+      // if(item.contentType == '20') {
         this.$router.push({path:'/course/detail',query:{id:item.objId || item.id}})
-      } else {
-        this.$router.push({path:'/course/micro',query:{id:item.objId || item.id}})
-      }
-      
+      // } else {
+      //   this.$router.push({path:'/course/micro',query:{id:item.objId || item.id}})
+      // }
+
     },
     delItem(item) {
       this.$confirm('您确定要删除所选收藏吗？', '删除提示', {
@@ -94,29 +95,30 @@ export default {
         .catch(() => {});
     },
     contentTypeFilter(value) {
+      let val = Number(value);
       let obj = {};
-      switch (value) {
-        case '10': {
+      switch (val) {
+        case 10: {
           obj.class = 'uc-course-type2';
           obj.text = '录播';
           break;
         }
-        case '21': {
+        case 21: {
           obj.class = 'uc-course-type2';
           obj.text = '直播';
           break;
         }
-        case '20': {
+        case 20: {
           obj.class = 'uc-course-type2';
           obj.text = '录播';
           break;
         }
-        case '30': {
+        case 30: {
           obj.class = 'uc-course-type2';
           obj.text = '面授';
           break;
         }
-        case '90': {
+        case 90: {
           obj.class = 'uc-course-type2';
           obj.text = '混合';
           break;
@@ -137,6 +139,56 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.bq-coures{
+  font-size: 16px;
+  color: #333333;
+  margin-left: 5px;
+}
+.pro-line{
+           font-size: 14px;
+           color: #333333;
+           display: flex;
+           margin-top: 28px;
+        }
+.uc-bpttom{
+  display: flex;
+  position: relative;
+
+  .uc-coures-button{
+    position: absolute;
+    margin-left: auto;
+    right:0;
+    bottom: -38px;
+  }
+}
+.uc-course-text{
+  flex: 1;
+  font-size: 14px;
+  color: #666666;
+  margin-top: 14px;
+}
+  .course-type {
+        position: absolute;
+        top: 0px;
+        right: 0px;
+        width: 60px;
+        height: 24px;
+        line-height: 24px;
+        text-align: center;
+        background-color: #f99000;
+        border-radius: 2px 4px 0px 14px;
+        font-size: 12px;
+        color: #ffffff;
+        -moz-user-select: none;
+        /*火狐*/
+        -webkit-user-select: none;
+        /*webkit浏览器*/
+        -ms-user-select: none;
+        /*IE10*/
+        -khtml-user-select: none;
+        /*早期浏览器*/
+        user-select: none;
+      }
 .one-line-ellipsis{
   display: -webkit-box;
 
@@ -157,26 +209,7 @@ export default {
   padding-left: 0px;
   padding-bottom: 20px;
   padding-top: 15px;
-  // margin-bottom: 10px;
-  // margin-left: 10px;
-  .flex-between {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    margin-left: 10px;
-    .uc-course-text {
-      color: #747474;
-      margin-right: 20px;
-    }
-    &:last-of-type{
-      margin-left: auto;
-      justify-content: flex-end;
-    }
-    // &:last-of-type {
 
-    //   align-items: flex-start;
-    // }
-  }
   .uc-course-img {
     position: relative;
    ::v-deep img {
@@ -184,21 +217,26 @@ export default {
       height: 119px;
       border: 1px solid #f4f4f5;
     }
-    > span {
-      position: absolute;
-      top: 30px;
-      left: 10px;
-      width: 100%;
-      height: 100%;
-      color: #ffffff;
-      font-size: 16px;
-    }
+
+  }
+  .flex-between{
+    flex: 1;
   }
   .uc-course-name {
-    font-size: 16px;
-    font-weight: 400;
-    > span:last-of-type {
-      margin-left: 8px;
+    display: flex;
+    width: 100%;
+    line-height: 30px;
+    height: 30px;
+    .uc-coures-name-left{
+     flex: 1;
+    }
+    .canfavo{
+      margin-left:auto;
+      // width: 100px;
+      button{
+        font-size: 12px;
+
+      }
     }
   }
 }
diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue
index c597909b..5ec415c6 100644
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -79,9 +79,12 @@
                 </el-input>
             </el-form-item>
             <el-form-item label="场景" v-show="!weike.onlyRequired">
-              <el-select v-model="courseInfo.forScene" style="width: 100%;" clearable>
-                <el-option v-for="item in sceneList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-              </el-select>
+              <el-col :span="18">
+                <el-select v-model="courseInfo.forScene" style="width: 100%;" clearable>
+                  <el-option v-for="item in sceneList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="6"><el-checkbox v-model="courseInfo.openCourse" :true-label="1" :false-label="0">公开课</el-checkbox></el-col>
             </el-form-item>
             <el-form-item label="授课教师" required>
               <!--授课老师默认是当前操作人-->
@@ -190,7 +193,12 @@
         <el-tab-pane label="课程信息" name="base" style="width: 90%;">
           <!-- :rules="rulesTwo" -->
           <el-form label-width="80px" size="mini">
-            <el-form-item label="名称" required><el-input maxlength="90" v-model="courseInfo.name" show-word-limit placeholder="课程名称(限90字以内)"></el-input></el-form-item>
+            <el-form-item label="名称" required>
+              <el-col :span="18">
+                <el-input maxlength="90" v-model="courseInfo.name" show-word-limit placeholder="课程名称(限90字以内)"></el-input>
+              </el-col>
+              <el-col :span="6" style="padding-left: 30px;"><el-checkbox v-model="courseInfo.openCourse" :true-label="1" :false-label="0">公开课</el-checkbox></el-col>
+            </el-form-item>
             <el-form-item label="封面图片">
               <el-col :span="12">
                 <div style="display:flex">
@@ -885,6 +893,7 @@ export default {
       this.$prompt('请输入新章的名称', '添加章', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        customClass:'cusprompt',
         inputPattern:/^(a-z|A-Z|0-9)*[^$%^&*;:,<>?()\""\']{1,20}$/,
         inputErrorMessage:'不要超过20个字'
       })
@@ -1208,7 +1217,7 @@ export default {
         return;
       }
       if(this.weike.dlgShow && !this.unsavedWeiContent()){
-        
+
         return;
       }
 
@@ -1339,6 +1348,9 @@ export default {
               this.$emit('submitSuccess');
             } else {
               this.$message.error(res.message);
+              this.biaoke.dlgShow = false;
+              this.weike.dlgShow = false;
+              this.$emit('submitSuccess');
             }
           });
         }else{
@@ -1554,4 +1566,16 @@ export default {
     }
   }
 }
+
+</style>
+<style lang="scss">
+  .cusprompt{
+      padding: 20px 30px;
+      .el-message-box__content{
+        margin-top: 30px;
+        .el-message-box__input{
+
+        }
+      }
+  }
 </style>
diff --git a/src/components/Course/courseImage.vue b/src/components/Course/courseImage.vue
index dc36d480..fc63b158 100644
--- a/src/components/Course/courseImage.vue
+++ b/src/components/Course/courseImage.vue
@@ -1,8 +1,8 @@
 <template>
   <!--用于显示课程的图片-->
-  <div class="img-box" id="img-box">
+  <div  style="border-radius: 5px;" class="img-box" id="img-box">
     <el-image
-      style="background-color: #eeeeee"
+      style="background-color: #eeeeee;border-radius: 5px;"
       :style="`width:${width};height:${height};`"
       fit="fill	"
       :src="imageUrl"
diff --git a/src/components/Course/exam.vue b/src/components/Course/exam.vue
index 0319c471..b5edbe38 100644
--- a/src/components/Course/exam.vue
+++ b/src/components/Course/exam.vue
@@ -180,9 +180,9 @@ export default {
     }
   },
   destroyed() {
-      if(this.timer){
-        window.clearInterval(this.timer);
-      }
+    if(this.timer){
+      window.clearInterval(this.timer);
+    }
   },
   methods: {
     changeTimer(){
@@ -303,7 +303,7 @@ export default {
                 confirmButtonText: '确定',
                 showClose:false,
                 callback: action => {
-                 this.submitTest();
+                  this.submitTest();
                 }
           });
 
@@ -397,9 +397,11 @@ export default {
       if(scoreNum === null)scoreNum=0;
       this.lastScore=scoreNum;
       //转化成百分制显示
+      //console.log(scoreNum,totalScore,'实际分和总分');
       if(this.info.percentScore){
       		this.lastScore=parseInt(scoreNum*100/totalScore);
       }
+      //console.log('本次得分='+this.lastScore);
       return this.lastScore;
     },
     submitTest(){ //提交处理
@@ -409,6 +411,7 @@ export default {
       }
       let now=new Date();
       let testScore=this.countTest();
+   
       let postData={
         studyId:this.studyId,//
         studyItemId:this.studyItemId,//前面已经给了
diff --git a/src/components/Course/myNote.vue b/src/components/Course/myNote.vue
new file mode 100644
index 00000000..265823a2
--- /dev/null
+++ b/src/components/Course/myNote.vue
@@ -0,0 +1,581 @@
+<template>
+    <div class="my-note" @change="handleClick">
+        <div class="mynote">
+            <div class="mynote-tab">
+                <div @click="notetabType(1)" :class="notetab == 1 ? 'noteactive' : ' ' "> <span>新增笔记</span> </div>
+                <div @click="notetabType(2)" :class="notetab == 2 ? 'noteactive' : ' '"> <span>我的笔记</span> </div>
+            </div>
+            <!-- 新增笔记  -->
+            <div class="newcote-content" v-if="notetab == 1">
+                <div class="newcote-time" v-if="play_Time != 0">
+                    <img :src="`${webBaseUrl}/images/coteplay.png`" />
+                    {{formatSeconds(play_Time)}}1
+                    <img :src="`${webBaseUrl}/images/cotedetel.png`" @click="play_Time = 0" />
+                </div>
+                <div class="newcote-text">
+                    <el-input type="textarea" :autofocus="true" :style="`min-height:${inputHeight}px`" placeholder="好记性不如烂笔头，记录些什么吧～"
+                        v-model="content_new" maxlength="200" :autosize="{ minRows: inputRows, maxRows: 20}" show-word-limit>
+                    </el-input>
+                </div>
+            </div>
+            <!-- 我的笔记  -->
+            <div  v-if="notetab == 2">
+                <div class="mycote-content" v-show="!isEdit" :style="`height:${listHeight}px`">
+                    <div v-if="noteList.length > 0">
+                    <div style="border-bottom:1px solid #4444;padding-bottom:25px;" v-for="note in noteList" :key="note.id">
+                        <div class="mycote-time">{{note.sysUpdateTime}}
+                            <span class="sm">{{note.openType == 9?'公开':'私密'}}</span>
+                            <span class="more">
+                                <el-dropdown>
+                                    <span class="el-dropdown-link">
+                                        <svg-icon style="margin-right: 0;font-size:26px;" icon-class="spot"></svg-icon>
+                                    </span>
+                                    <el-dropdown-menu slot="dropdown" class="dropdown-box"  style="background:#333333;border: none;">
+                                        <el-dropdown-item command="a" style="color:#fff" @click.native="noteDel(note)">
+                                            <img style="width:13px;height:18px;vertical-align: middle;"  src="@/assets/images/icon/note-del.png" /> 删除</el-dropdown-item>
+                                        <el-dropdown-item command="b" style="color:#fff" @click.native="noteEdit(note)">
+                                            <img style="width:13px;height:14px;margin-right:4px;vertical-align: middle;"  src="@/assets/images/icon/note-edit.png" />编辑</el-dropdown-item>
+                                    </el-dropdown-menu>
+                                </el-dropdown>
+                            </span>
+                        </div>
+                        <div style="margin-top:10px;" class="newcote-time" v-if="note.playTime" @click="onPlayVideo(note.contentId,note.playTime)">
+                            <img :src="`${webBaseUrl}/images/coteplay.png`" alt="">
+                            {{formatSeconds(note.playTime)}}
+                        </div>
+                        <div class="newcote-text">
+                            {{note.content}}
+                        </div>
+                    </div>
+                    <h6 class="mycote-dibu">已经到底啦</h6>
+                    </div>
+                    <div class="my-nonote" v-else>
+                        <img :src="`${webBaseUrl}/images/no-note.png`" alt="" />
+                        <h6 style="color: #666666;font-size: 14px;">您还没有记录此课程的笔记哦～</h6>
+                    </div>
+                </div>
+                <div v-show="isEdit">
+                    <p style="margin-top:37px">
+                        <span style="font-size: 14px;color: #333333;margin-left:10px;">{{mynoteData.sysCreateTime}}</span>
+                        <span class="sm">{{mynoteData.openType == 9?'公开':'私密'}}</span>
+                        <svg-icon style="float:right;font-size:26px;margin-top:16px" icon-class="spot"></svg-icon>
+                    </p>
+                    <div class="newcote-content" style="margin-top:10px;min-height:236px;height: 100%;">
+                        <div class="newcote-time" v-if="mynoteData.playTime != 0">
+                            <img :src="`${webBaseUrl}/images/coteplay.png`" />
+                            {{formatSeconds(mynoteData.playTime)}}
+                            <img :src="`${webBaseUrl}/images/cotedetel.png`" @click="timeDel()" />
+                        </div>
+                        <div class="newcote-text">
+                            <el-input type="textarea" :autofocus="true" :style="`min-height:${inputHeight}px`" placeholder="好记性不如烂笔头，记录些什么吧～"
+                                v-model="mynoteData.content" maxlength="200" :autosize="{ minRows: inputRows, maxRows: 20}" show-word-limit>
+                            </el-input>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="newcote-bottom" v-if="notetab == 1 || isEdit">
+                <span v-if="btnPlayTime" style="cursor: pointer;" @click="videoLocation"> <img :src="`${webBaseUrl}/images/playtime.png`" alt=""> 视频位置</span>
+                <el-radio v-if="mynoteData.openType == 9" v-model="editRadio" :label="9">公开</el-radio>
+                <el-radio v-model="editRadio" :label="1">私密</el-radio>
+                <el-button size="small" v-if="notetab != 1" v-show="isEdit" @click="editCancel()">取消</el-button>
+                <el-button type="primary" size="small" @click="saveNote()">保存</el-button>
+            </div>
+        </div>
+        <div class="animation-box" :class="inAnimation?'animation':''" @animationend="inAnimation=false">
+            <div class="box-text">
+                <img :src="`${webBaseUrl}/images/success-note.png`" />{{inAnimationText}}
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+import apiNote from '@/api/phase2/note.js';
+import { mapGetters } from 'vuex';
+import { formatDate, formatSeconds } from '@/utils/datetime.js';
+import { testType, correctJudgment, numberToLetter } from '@/utils/tools.js';
+export default {
+    props: {
+        data: {
+          type: Object,
+          default: () => { }
+        },
+        current:{ //当前是否是可编辑的
+          type: Boolean,
+          default: false
+        },
+        height:{
+          type: Number,
+          default: 200
+        },
+        score: {
+            type:Number,
+            default:0
+        }
+    },
+    name: 'MyNote',
+    data() {
+        return {
+            inAnimationText:'笔记保存成功，U币+5',
+            localSaveHandle:null,//本地保存的timeout对象
+            localKey:'NOTE_TEXT',//本地存储的key
+            isEdit:false,
+            inputHeight:70,
+            listHeight:170,
+            inputRows:2,
+            courseId:'',
+            inAnimation: false,
+            btnPlayTime:false,//是否显示添加视频时间
+            radio: '1',
+            notetab: 1,
+            mynoteData: {
+                type: 1, //我发布的是1 我导入的是2
+                content: '',
+                playTime: 0,
+                courseId: '',// 课程id
+                contentId: '',//课程内容id
+                courseName: '',// 课程名称
+                openType: 9,// 1表不公开 9表完全公开
+            },
+            editNodeOpenType:9, // 1表不公开 9表完全公开
+            content_new: '',
+            play_Time:'',
+            editRadio: 9 , // 单选按钮（笔记公开状态）状态值 ： 1- 私密 9-公开
+            noteList: [],
+            type: 1, // 1自动保存 2点击保存
+        };
+    },
+    computed: {
+        ...mapGetters(['intTimeNote', 'userInfo']),
+    },
+    mounted() {
+        // console.log(this.$route,'route');
+        // console.log(this.data,'data111');
+        this.courseId = this.$route.query.id;
+        this.getMyNote();
+
+    },
+    watch: {
+        //内容的高度
+        height(val){
+            //$this.controlHeight=h-
+            this.listHeight=val-95;
+            this.inputHeight=(val-220);
+
+            this.inputRows=parseInt(this.inputHeight/30);
+            if(this.inputRows>20){
+              this.inputRows=20;
+            }
+            //console.log(this.inputHeight,this.inputRows,this.listHeight,'my note height');
+            if(this.inputHeight>500){
+              this.inputHeight=500;
+            }
+        },
+        isedit(val){
+          this.isEdit=val;
+        },
+        selected:{
+          handler(val,old){
+            this.$emit('change',this.selected)
+          },
+          deep:true
+        },
+        data(val){
+           if(val.id) {
+            //console.log(val,'val');
+            this.mynoteData.courseId = this.courseId;
+            this.mynoteData.courseName = this.data.name;
+            // this.mynoteData.contentId = this.data.id;
+           }
+        }
+    },
+    methods: {
+        handleClick(){
+          this.$emit('change',this.selected)
+        },
+        onPlayVideo(conId,time) {
+            //这里应该加上内容的id
+            this.$emit('onPlayVideo',conId,time);
+        },
+        //取消编辑
+        editCancel(){
+          this.isEdit = false; // 关闭编辑框
+          this.getMyNote(); // 重新渲染对应课程的笔记列表
+        },
+        formatSeconds(value) {
+            let result = parseInt(value)
+            let h = Math.floor(result / 3600);
+            let m = Math.floor((result / 60 % 60));
+            let s = Math.floor((result % 60));
+            let res = '';
+            if (h > 0) {
+                res += `${h}:${m}:${s}`;
+            } else {
+                res += `${m}:${s}`;
+            }
+            return res;
+        },
+        showVideoTimeBtn(showOrHidden){
+          this.btnPlayTime=showOrHidden;
+        },
+        //设置音视频的时间,引用页面调用
+        setVideoTime(contentId,time){
+            this.mynoteData.contentId=contentId;//内容id
+            this.mynoteData.playTime=time;//秒
+            this.play_Time = time;
+        },
+        timeDel() {
+            this.mynoteData.playTime = 0;
+        },
+        autoSaveNote(){
+            let $this=this;
+            if(this.notetab==1){
+                 localStorage.setItem($this.localKey, $this.mynoteData.content);
+            }
+            // this.localSaveHandle = setInterval(() => {
+
+            // }, 10000);
+        },
+        noteEdit(note) {
+            console.log(note)
+            this.isEdit = true;
+            this.mynoteData = note;
+            this.editNodeOpenType = note.openType;
+            this.content_new = note.content;
+            this.play_Time = note.playTime;
+            this.editRadio = this.mynoteData.openType; // 设置默认的单选按钮选中状态
+            // this.notetabType(1);
+        },
+        noteDel(note) {
+            this.$confirm('您确定要删除这条笔记吗？', '删除提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(async () => {
+                apiNote.del(note.id).then(res => {
+                    if (res.status == 200) {
+                      //删除事件
+                      let event = {
+                        key: "DeleteNote",//
+                        title: "删除笔记",//
+                        parameters:"author",//
+                        content: "删除了笔记",//
+                        source:'page',
+                        objId: note.id,//关联的id
+                        objType: "6",//关联的类型
+                        objInfo: "",
+                        aid: this.userInfo.aid, //当前登录人的id
+                        aname: this.userInfo.name,//当前人的姓名
+                        status: 1 //状态，直接写1
+                      }
+                      this.$store.dispatch("userTrigger", event);
+                      this.getMyNote();
+                    } else {
+                        this.$message({ type: 'error', message: res.message, offset: 50 });
+                    }
+                })
+            }).catch((err) => {
+                    this.$message({ type: 'info', message: '已取消删除', offset: 50 });
+                });
+
+        },
+        getMyNote() {
+            apiNote.myCourse(this.courseId).then(res => {
+                if (res.status == 200) {
+                    this.noteList = res.result;
+                }
+            })
+        },
+        videoLocation() {
+            this.$emit('videoLocation');
+        },
+        notetabType(num) {
+            this.notetab = num;
+            if(num == 1) {
+              this.content_new = '';  // 清空内容
+              this.play_Time='';//清空时间
+              this.btnPlayTime=true; // 显示添加视频时间
+              this.mynoteData.openType = 9; // 公开单选按钮
+              this.editRadio = 9; // 设置默认的单选按钮选中状态
+            }else {
+
+              if(this.editNodeOpenType == 1){
+                this.mynoteData.openType = 1; // 公开单选按钮
+                this.editRadio = 1;
+                this.content_new = this.mynoteData.content;
+                this.play_Time = this.mynoteData.playTime;
+              }
+            }
+
+        },
+        saveNote() {
+            let that = this;
+            if (this.content_new == '') {
+                this.$message({ type: 'info', message: '您还没有书写笔记！', offset: 50 });
+                return;
+            }
+
+            this.mynoteData.courseId = this.courseId;
+            this.mynoteData.courseName = this.data.name;
+            this.mynoteData.openType = this.editRadio;
+            if(this.isEdit) {
+                // this.mynoteData.playTime = 
+                if (this.mynoteData.content == '') {
+                    this.$message({ type: 'info', message: '您还没有书写笔记！', offset: 50 });
+                    return;
+                }
+                apiNote.update(this.mynoteData).then(res=>{
+                   if(res.status == 200) {
+                    this.inAnimationText = '笔记编辑成功';
+                    this.inAnimation = true;
+                    this.isEdit = false;
+                    this.editRadio = 9; // 重置默认笔记公开状态
+                    setTimeout(() => {
+                        that.getMyNote();
+                        that.mynoteData = {
+                            type: 1, //我发布的是1 我导入的是2
+                            content: '',
+                            // playTime: '',
+                            // courseId: '',// 课程id
+                            // contentId: '',//课程内容id
+                            // courseName: '',// 课程名称
+                            openType: 9,// 1表不公开 9表完全公开
+                        };
+                    }, 1000)
+                   }
+                })
+            } else {
+                this.mynoteData.playTime = this.play_Time;
+                this.mynoteData.content = this.content_new; //赋值笔记内容
+                let curOpenType=this.mynoteData.openType;
+                let $this=this;
+                apiNote.save(this.mynoteData).then(res => {
+                if (res.status == 200) {
+                    if (!this.mynoteData.id) {
+                        this.inAnimationText = '笔记保存成功，U币+5';
+                        this.inAnimation = true;
+                        this.editRadio = 9; //重置默认笔记公开状态
+                        this.mynoteData.openType = 9;
+                        if(this.mynoteData.openType != 9){
+                           return
+                        }
+                    setTimeout(() => {
+                        localStorage.setItem($this.localKey, '');
+                        // clearInterval(this.localSaveHandle);
+                        that.getMyNote();
+                        that.notetabType(2);
+                        that.mynoteData = {
+                            type: 1, //我发布的是1 我导入的是2
+                            content: '',
+                            playTime: '',
+                            // courseId: '',// 课程id
+                            // contentId: '',//课程内容id
+                            // courseName: '',// 课程名称
+                            openType: 9,// 1表不公开 9表完全公开
+                        };
+
+                    }, 500)
+                    this.$bus.$emit('noteListRefresh',true)
+                        // 是编辑新增
+                        let event = {
+                            key: "PublishNote",//后台的事件key
+                            title: '发布了笔记',//事件的标题
+                            parameters: "openType:"+curOpenType,//用户自定义参数 name:value,name:value
+                            content: "编辑了笔记",//this.mynoteData.content,//事件的内容
+                            objId: res.result.id,//关联的id
+                            objType: "6",//关联的类型
+                            objInfo: this.data.name,
+                            aid: this.userInfo.aid, //当前登录人的id
+                            aname: this.userInfo.name,//当前人的姓名
+                            status: 1 //状态，直接写1
+                        }
+                        this.$store.dispatch("userTrigger", event);
+                    }
+
+                }
+            }).catch(function(error) {
+               //
+               this.$message.error('当前网络异常，内容已离线保存');
+               //
+               localStorage.setItem(this.localKey, this.mynoteData.content);
+            })
+          }
+        }
+    },
+    beforeDestroy() {
+        if(this.localSaveHandle!=null){
+          clearInterval(this.localSaveHandle);
+          clearTimeout(this.localSaveHandle)
+        }
+        this.localSaveHandle = null;
+    },
+}
+</script>
+
+<style scoped lang="scss">
+::v-deep .el-dropdown-menu__item:hover {
+    background: #333333;
+}
+.my-note{
+    position: relative;
+}
+.mynote {
+    // width: 100%;
+    margin: 35px 30px;
+    position: relative;
+
+    .animation {
+        display: block !important;
+        animation-name: ubAddBlock;
+        animation-duration: 1s;
+        animation-fill-mode: forwards;
+    }
+
+    .animation-box {
+        display: none;
+        position: absolute;
+        left: 50%;
+        bottom: 0;
+        transform: translate(-50%,-50%);
+        .box-text {
+            padding: 12px 16px;
+            width: 252px;
+            height: 40px;
+            background: #FFFFFF;
+            box-shadow: 0px 8px 20px 0px rgba(0, 35, 114, 0.1);
+            border-radius: 2px;
+            font-size: 14px;
+            color: rgba(0, 0, 0, 0.65);
+
+            img {
+                width: 16px;
+                height: 16px;
+                vertical-align: middle;
+                margin-right: 22px;
+            }
+        }
+    }
+
+    .newcote-time {
+        display: inline-block;
+        min-width: 80px;
+        // width: 100px;
+        height: 30px;
+        border-radius: 4px;
+        border: 1px solid #3379FB;
+        font-size: 14px;
+        color: #387DF7;;
+        text-align: center;
+        line-height: 28px;
+        margin-bottom: 12px;
+
+        img {
+            vertical-align: middle;
+            margin: 0 5px;
+
+        }
+    }
+
+    .newcote-bottom {
+        span {
+            font-size: 14px;
+            color: #333333;
+            margin-right: 30px;
+
+            img {
+                width: 20px;
+                height: 24px;
+                vertical-align: middle;
+            }
+        }
+    }
+
+    .newcote-text {
+        //    margin-top: 24px;
+        font-size: 14px;
+        color: #333333;
+        height: 100%;
+        white-space: pre-line;
+
+        ::v-deep .el-textarea__inner {
+            background: #f5f5f5;
+            border: none;
+            padding: 0;
+        }
+    }
+    .sm {
+      width: 50px;
+      height: 22px;
+      border-radius: 10px;
+      border: 1px solid #3379FB;
+      color: #3379FB;
+      font-size: 12px;
+      line-height: 50px;
+      margin-left: 20px;
+      padding: 3px 10px;
+    }
+    .newcote-content {
+        margin: 30px 0px;
+        box-sizing: border-box;
+        padding: 35px 30px;
+        height: 100%;
+        background-color: #F5F5F5;
+    }
+
+    .mycote-content {
+        margin: 30px 0px;
+        box-sizing: border-box;
+        padding: 8px 30px;
+        min-height: 200px;
+        overflow-y: auto;
+        background-color: #fff;
+
+        .my-nonote {
+            text-align: center;
+            margin-top: 100px;
+
+            img {
+                width: 198px;
+                height: 163px;
+            }
+        }
+
+        .mycote-time {
+            color: #666;
+            font-size: 14px;
+            .more {
+                margin-top: 12px;
+                float: right;
+            }
+        }
+
+        .mycote-dibu {
+            margin: 50px 50px;
+            text-align: center;
+            color: #999999;
+            font-size: 14px;
+        }
+    }
+
+    .mynote-tab {
+        width: 180px;
+        margin-top: 17px;
+
+        display: flex;
+
+        div {
+            font-size: 16px;
+            color: #666666;
+            flex: 1;
+        }
+
+        .noteactive span {
+            font-weight: 600;
+            color: #333333;
+            padding-bottom: 7px;
+            border-bottom: 4px solid #387DF7;
+        }
+    }
+
+}
+</style>
diff --git a/src/components/Course/shareItem.vue b/src/components/Course/shareItem.vue
index 66c2ccd8..c71d7e3b 100644
--- a/src/components/Course/shareItem.vue
+++ b/src/components/Course/shareItem.vue
@@ -1,21 +1,40 @@
 <template>
   <div style="">
-    <div class="uc-course" @click="jumpRouter(item)" v-for="(item, idx) in items" :key="idx">
-      <div class="uc-course-img" style="width: 212px;height: 119px;">
-        <course-image :course="item"></course-image>
-        <!-- <img :src="imageUrl(item)" /><span class="two-line-ellipsis">{{item.title}}</span> -->
+    <!-- 最新版设计 -->
+    <div  class="coures-box" @click="jumpRouter(item)" v-for="(item, idx) in items" :key="idx">
+      <div class="coures-head">
+        <div class="share-name" v-if="type=='myShare'">
+          分享给了<span>{{ item.toAname }}</span>
         </div>
-      <div class="uc-course-info">
+        <div class="share-name" v-else>
+          <span>{{ item.sysCreateBy }}</span>分享给了我
+        </div>
+        <div class="islook" v-if="item.isRead">已查看</div>
+        <div class="isunlook" v-else>未查看</div>
+        <div class="share-time">{{ item.time }}</div>
+      </div>
+      <div class="coures-content">
+          <span>【课程】</span>{{item.title}}
+      </div>
+
+    </div>
+    <!-- 旧版设计 -->
+    <!-- <div class="uc-course" @click="jumpRouter(item)" v-for="(item, idx) in items" :key="idx"> -->
+      <!-- <div class="uc-course-img" style="width: 212px;height: 119px;">
+        <course-image :course="item"></course-image>
+        <img :src="imageUrl(item)" /><span class="two-line-ellipsis">{{item.title}}</span>
+        </div> -->
+      <!-- <div class="uc-course-info">
         <div style="height: 100%;display: flex;justify-content:space-between;">
           <div style="display: flex;flex-direction: column;justify-content: space-between;">
             <div class="uc-course-name">
               <span class="uc-course-font" :class="contentTypeFilter(item.contentType).class">{{ contentTypeFilter(item.contentType).text }}</span>
               <span v-html="$keywordActiveShow(item.title,keyword)"></span>
             </div>
-            <!-- <div class="uc-course-text" v-if="type=='myShare'">-->
-              <!-- 分享给：{{ item.toAname }}
-            </div> -->
-            <!-- <div class="uc-course-text" v-else>分享人：{{ item.toAname }}</div> -->
+            <div class="uc-course-text" v-if="type=='myShare'">
+              分享给：{{ item.toAname }}
+            </div>
+            <div class="uc-course-text" v-else>分享人：{{ item.toAname }}</div>
             <div style="display:flex;flex-direction: column;">
                <div class="uc-course-textTo">分享时间：{{ item.time }}</div>
                <div class="uc-course-textToInfo">
@@ -27,14 +46,12 @@
                </div>
             </div>
           </div>
-          <!-- <div class="btn" > -->
-            <!-- <span>{{item.isRead?'[已查看]':'[未查看]'}}</span> -->
-
-
-          <!-- </div> -->
+          <div class="btn" >
+            <span>{{item.isRead?'[已查看]':'[未查看]'}}</span>
+          </div>
         </div>
-      </div>
-    </div>
+      </div> -->
+    <!-- </div> -->
   </div>
 </template>
 
@@ -124,11 +141,11 @@ export default {
       }
       }
       
-      if(item.contentType == 20) {
+      // if(item.contentType == 20) {
         this.$router.push({path:'/course/detail',query:{id:item.objId || item.id}})
-      } else {
-        this.$router.push({path:'/course/micro',query:{id:item.objId || item.id}})
-      }
+      // } else {
+      //   this.$router.push({path:'/course/micro',query:{id:item.objId || item.id}})
+      // }
 
      // window.open(`${this.webBaseUrl}/course/detail?id=${item.objId}`)
     },
@@ -140,6 +157,57 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.coures-box{
+  width: 100%;
+  padding: 30px 0;
+  border-bottom:1px solid #e9e9e9 ;
+  .coures-content{
+    margin-top: 20px;
+    font-size: 16px;
+    color: #333333;
+    font-weight: 600;
+    span{
+    font-size: 16px;
+    margin-left: -9px;
+    }
+  }
+  .coures-head{
+    display: flex;
+    .share-name{
+      font-size: 14px;
+      color: #666666;
+      margin-right: 17px;
+    }
+    .share-time{
+      font-size: 14px;
+      color: #666666;
+      line-height: 25px;
+      margin-left: auto;
+    }
+    .islook{
+      width: 46px;
+      height: 24px;
+      background: #eee;
+      font-size: 12px;
+      color: #666666;
+      line-height: 24px;
+      text-align: center;
+      border-radius: 2px;
+    }
+    .isunlook{
+      width: 46px;
+      height: 24px;
+      background: #FF6562;
+      border-radius: 2px;
+      font-size: 12px;
+      color: #fff;
+      line-height: 24px;
+      text-align: center;
+
+    }
+
+  }
+}
 // .uc-course-type1 {
 //   padding: 3px;
 //   border: 1px dotted #1ea0fa;
diff --git a/src/components/Course/studyItem.vue b/src/components/Course/studyItem.vue
index f1b0f402..32fe409b 100644
--- a/src/components/Course/studyItem.vue
+++ b/src/components/Course/studyItem.vue
@@ -52,11 +52,11 @@ import courseImage from "@/components/Course/courseImage.vue"
         this.$router.push({path:'/uc/study/index?id='+item.courseId});
       },
       jumpRouter(item){
-        if(item.courseType==10){
-            let routeData = this.$router.resolve({ path: '/course/micro?id='+item.courseId}); // , query: {  id: 1 }
-            window.open(this.webBaseUrl+routeData.href, '_blank');
-        }
-        if(item.courseType==20){
+        // if(item.courseType==10){
+        //     let routeData = this.$router.resolve({ path: '/course/micro?id='+item.courseId}); // , query: {  id: 1 }
+        //     window.open(this.webBaseUrl+routeData.href, '_blank');
+        // }
+        // if(item.courseType==20){
           if(item.progress>0 && item.progress<100) {
             let routeData = this.$router.resolve({ path: '/course/studyindex?id='+item.courseId}); // , query: {  id: 1 }
             window.open(this.webBaseUrl+routeData.href, '_blank');
@@ -64,7 +64,7 @@ import courseImage from "@/components/Course/courseImage.vue"
             let routeData = this.$router.resolve({ path: '/course/detail?id='+item.courseId}); // , query: {  id: 1 }
             window.open(this.webBaseUrl+routeData.href, '_blank');
           }
-        }
+        // }
       }
     }
   }
diff --git a/src/components/Course/weikeContent.vue b/src/components/Course/weikeContent.vue
index 04d0f8bf..dc0ccf43 100644
--- a/src/components/Course/weikeContent.vue
+++ b/src/components/Course/weikeContent.vue
@@ -43,7 +43,7 @@
                           <div v-if="cware.content.contentType==10">
                             <video  controls v-if="cware.content.content!=''" style="width: 100%;">
                               <source :src="fileBaseUrl+cware.curriculumData.url" type="video/mp4">
-                              你的浏览器不支持video
+                              您的浏览器不支持video
                             </video>
                              <div style="display: flex;justify-content:space-between;margin-top: 20px;">
                               <div>
@@ -563,7 +563,7 @@
         courseFileShow:false,
         curContent:{id:'',contentType:0,contenRefId:''},
         curCFile:{},//当前课件的内容
-        fileBaseUrl:this.$Constants.fileBaseUrl,
+        fileBaseUrl:this.$xpage.constants.fileBaseUrl,
         imageShowUrl: '',
         activeName: 'courseware',
         getType: getType,
diff --git a/src/components/Follow/button.vue b/src/components/Follow/button.vue
new file mode 100644
index 00000000..f3e829fb
--- /dev/null
+++ b/src/components/Follow/button.vue
@@ -0,0 +1,127 @@
+<template>
+  <!--关注的button-->
+  <span>
+    <el-button v-loading="loading" v-if="hasFollow" :size="size" class="follow-btn" icon="el-icon-check" title="取消关注" @click="cancelFollow()" >已关注</el-button>
+    <el-button v-loading="loading" v-else :size="size" class="follow-btn" icon="el-icon-plus" title="关注TA" @click="addFollow()" type="primary">关注</el-button>
+  </span>
+</template>
+
+<script>
+  import { mapGetters} from 'vuex';
+  import apiFollow from "@/api/phase2/userfollow.js"
+  export default{
+    name:"followButton",
+    props:{
+       size:{
+          type:String,
+          default:'medium'
+       },
+       data:null,
+       auto:{ //是否自动检查
+          type:Boolean,
+          default:false
+       },
+       has:{
+         type:Boolean,
+         default:false
+       },
+       aid:{
+         type:String,
+         default:''
+       }
+    },
+    mounted(){
+
+       if(this.auto && this.aid){
+          this.autoCheck();
+       }else{
+          this.hasFollow=this.has;
+       }
+    },
+    data(){
+        return{
+          loading:false,
+          hasFollow:false
+        }
+    },
+    computed: {
+      ...mapGetters(['userInfo']),
+    },
+    watch:{
+      has(newVal,oldVal){
+         this.has=newVal;
+         this.hasFollow=newVal;
+         if(newVal!=oldVal && this.auto){
+           this.autoCheck();
+         }
+
+      },
+      aid(newVal){
+          this.aid=newVal;
+      }
+    },
+    methods: {
+        autoCheck(){
+          if(this.aid){
+            apiFollow.checkFllow(this.aid).then(res => {
+              if (res.status == 200) {
+                this.hasFollow = res.result ? true : false;
+              }
+            })
+          }
+
+        },
+        cancelFollow(){
+            if(this.aid){
+              if(this.userInfo.aid==this.aid){
+                this.$message.error("不能对自己操作");
+                return;
+              }
+
+              let $this=this;
+              this.loading=true;
+              apiFollow.remove(this.aid).then(res=>{
+                  if(res.status == 200) {
+                    $this.hasFollow=false;
+                    $this.$message.success("已取消关注");
+                    $this.$emit('cancel',$this.aid,$this.data);
+                  }else {
+                    $this.$message.error("取消关注失败:"+res.message);
+                    $this.$emit('error',$this.aid);
+                  }
+                  this.loading=false;
+              })
+            }
+        },
+        addFollow(){ //添加关注
+          if(this.aid){
+            if(this.userInfo.aid==this.aid){
+              this.$message.error("不能对自己操作");
+              return;
+            }
+            let $this=this;
+            this.loading=true;
+            apiFollow.save(this.aid).then(res=>{
+                if(res.status == 200) {
+                  $this.hasFollow=true;
+                  $this.$message.success("关注成功");
+                  $this.$emit('add',$this.aid,$this.data);
+                } else {
+                  $this.$message.error("关注失败:"+res.message);
+                  $this.$emit('error',$this.aid);
+                }
+                this.loading=false;
+            })
+          }
+        }
+    }
+  }
+</script>
+
+<style scoped>
+  .follow-btn{
+      /* margin-top: 18px;
+      height: 40px;
+      width: 140px; */
+  }
+</style>
diff --git a/src/components/HomePage/answerList.vue b/src/components/HomePage/answerList.vue
new file mode 100644
index 00000000..86690fe1
--- /dev/null
+++ b/src/components/HomePage/answerList.vue
@@ -0,0 +1,129 @@
+<template>
+    <div class="answer-list">
+        <ul v-if="list.length > 0">
+            <li class="answer-list-index" v-for="item in list" :key="item.id">
+                <p v-if="isDynamic" class="portal-summary-text" style="margin-bottom:18px">
+                    <span v-if="!personal || isFollow">{{item.aname}}</span>{{item.cusInfo}}<span style="margin-left:28px">{{item.eventTime}}</span>
+                    <span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right">
+                        <span v-if="item.hidden">已隐藏</span>
+                        <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
+                    </span>
+                </p>
+                <h6 class="answer-title-info follow-home-title">
+                   <span class="pointer" @click="jumpDetail(item)">{{item.contentInfo}}</span> 
+                    <span class="follow-hide" style="float:right" v-if="!isDynamic && personal">
+                          <span v-if="item.hidden">已隐藏</span>
+                          <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
+                    </span>
+                </h6>
+                <p class="answer-text">
+                    {{displayAll(item)}}
+                    <span style="color:#0B4D9D;cursor:pointer;" v-if="item.info.content && item.info.content.length>180" @click.stop="changeIsAll(item)">
+                        {{item.isAll?'收起':'全文展开'}}
+                    </span>
+                </p>
+                <div>
+                    <interactBar :type="0" :data="item.info"  :shares="false" :views="false" :readonly="true"></interactBar>
+                </div>
+            </li>
+        </ul>
+        <div v-else class="home-no-list">
+            <img class="img" :src="`${webBaseUrl}/images/homeWu/no-answer.png`" alt="" srcset="">
+            <p v-if="isFollow" class="text">暂时没有动态</p>
+            <p v-else class="text">还没有回答</p>
+        </div>
+    </div>
+  </template>
+
+  <script>
+    import interactBar from "@/components/Portal/interactBar.vue";
+    import author from "@/components/Portal/authorInfo.vue";
+    import { mapGetters,mapActions } from 'vuex';
+      export default{
+        name:"answerList",
+        components: {
+          interactBar,
+          // timeShow,
+          author
+        },
+        props:{
+            list:{
+                type:Array,
+                default:()=>[]
+            },
+            showHidden:{
+              type:Boolean,
+              default:true
+            },
+            isDynamic:{
+                type:Boolean,
+                default:false,
+            },
+            personal:{
+                type:Boolean,
+                default:false,
+            },
+            isFollow:{
+                type:Boolean,
+                default:false,
+            }
+        },
+        computed: {
+          ...mapGetters(['userInfo']),
+        },
+          data(){
+              return{
+                answerList:[]
+              }
+          },
+      methods:{
+        jumpDetail(item){
+          this.$router.push('/qa/answer?id='+item.contentId)
+        },
+        emitHide(id) {
+          this.$emit('hideIndex',id)
+        },
+        displayAll(item) {
+          if (!item.isAll && item.info.content && item.info.content.length > 180) {
+            return item.info.content.slice(0, 180) + "...";
+          }
+          return item.info.content;
+        },
+         //展示全部
+         changeIsAll(item) {
+          item.isAll = !item.isAll;
+        },
+
+       }
+      }
+  </script>
+
+  <style lang="scss" scoped>
+    .answer-list{
+        ul{
+            margin: 0;
+        }
+        .answer-list-index{
+            padding: 30px 0;
+            border-bottom: 1px solid rgba($color: #999999, $alpha: 0.2) !important;
+            ::v-deep .interact-bar-btns{
+                .interact-bar-btn{
+                    text-align: right;
+                    min-width: 78px !important;
+                    margin-right: 0;
+                }
+            }
+        }
+        .answer-title-info{
+            margin: 0;
+            margin-bottom: 16px;
+        }
+        .answer-text{
+            margin-bottom: 18px;
+            font-size: 14px;
+            word-break:break-all;
+            color: #333330;
+            line-height: 20px;
+        }
+    }
+  </style>
diff --git a/src/components/HomePage/articleList.vue b/src/components/HomePage/articleList.vue
new file mode 100644
index 00000000..d0c24669
--- /dev/null
+++ b/src/components/HomePage/articleList.vue
@@ -0,0 +1,129 @@
+<template>
+    <div class="article-list">
+        <ul v-if="list.length > 0">
+            <li class="article-list-index" v-for="item in list" :key="item.id">
+                <p v-if="isDynamic" class="portal-summary-text" style="margin-bottom:18px">
+                    <span v-if="!personal || isFollow">{{item.aname}}</span>{{item.cusInfo}}
+                    <span style="margin-left:28px">{{item.eventTime}}</span>
+                    <span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right" >
+                      <span v-if="item.hidden">已隐藏</span>
+                      <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
+                    </span>
+                </p>
+                <h6 class="article-title-info follow-home-title"><span  @click="jumpDetail(item)">{{item.info.title || item.contentInfo}}</span>
+                    <span class="follow-hide pointer" style="float:right" v-if="!isDynamic && personal">
+                        <span v-if="item.hidden">已隐藏</span>
+                        <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
+                    </span>
+                </h6>
+                <div style="height:58px;padding-top:14px ">
+                    <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo" :sex="item.authorInfo.sex" :aid="item.authorInfo.aid"></author>
+                </div>
+                <p class="article-text">
+                    {{displayAll(item)}}
+                    <!-- <span v-html="displayAll(item)"></span> -->
+                    <span style="color:#0B4D9D;cursor:pointer;" v-if="item.info.summary && item.info.summary.length>250" @click.stop="changeIsAll(item)">
+                        {{item.isAll?'收起':'全文展开'}}
+                    </span>
+                </p>
+                <div>
+                    <interactBar :type="2" :data="item.info" :shares="false" :views="false" :readonly="true"></interactBar>
+                </div>
+            </li>
+        </ul>
+        <div v-else class="home-no-list">
+            <img class="img" style="width:150px;height:160px" :src="`${webBaseUrl}/images/homeWu/no-article.png`" alt="" srcset="">
+            <p v-if="isFollow" class="text">暂时没有动态</p>
+            <p v-else class="text">还没有文章</p>
+        </div>
+    </div>
+  </template>
+
+  <script>
+    import interactBar from "@/components/Portal/interactBar.vue";
+    import author from "@/components/Portal/authorInfo.vue";
+    import { mapGetters,mapActions } from 'vuex';
+      export default{
+        name:"articleList",
+        components: {
+          interactBar,
+          // timeShow,
+          author
+        },
+        props:{
+            list:{
+                type:Array,
+                default:()=>[]
+            },
+            isDynamic:{
+                type:Boolean,
+                default:false,
+            },
+            personal:{
+                type:Boolean,
+                default:false,
+            },
+            isFollow:{//用于判断是否事我的关注页面，显示人名
+                type:Boolean,
+                default:false,
+            }
+        },
+        computed: {
+          ...mapGetters(['userInfo']),
+        },
+          data(){
+              return{
+                articleList:[]
+              }
+          },
+      methods:{
+        jumpDetail(item){
+          this.$router.push('/article/detail?id='+item.contentId)
+        },
+        emitHide(id) {
+          this.$emit('hideIndex',id)
+        },
+        displayAll(item) {
+          if (!item.isAll && item.info.summary && item.info.summary.length > 250) {
+            return item.info.summary.slice(0, 180) + "...";
+          }
+          return item.info.summary;
+        },
+         //展示全部
+         changeIsAll(item) {
+          item.isAll = !item.isAll;
+        },
+
+       }
+      }
+  </script>
+
+  <style lang="scss" scoped>
+    .article-list{
+        ul{
+            margin: 0;
+        }
+        .article-list-index{
+            padding: 30px 0;
+            border-bottom: 1px solid rgba($color: #999999, $alpha: 0.2) !important;
+            ::v-deep .interact-bar-btns{
+                .interact-bar-btn{
+                    text-align: right;
+                    min-width: 78px !important;
+                    margin-right: 0;
+                }
+            }
+        }
+        .article-title-info{
+            margin: 0;
+            margin-bottom: 16px;
+        }
+        .article-text{
+            margin-bottom: 18px;
+            font-size: 14px;
+            color: #333330;
+            word-break:break-all;
+            line-height: 20px;
+        }
+    }
+  </style>
diff --git a/src/components/HomePage/bookList.vue b/src/components/HomePage/bookList.vue
new file mode 100644
index 00000000..b89a41b7
--- /dev/null
+++ b/src/components/HomePage/bookList.vue
@@ -0,0 +1,101 @@
+<template>
+    <div class="book-list">
+        <ul v-if="bookList.length > 0">
+            <li class="book-list-index">
+                <div class="index-left"><img src="/images/homeWu/book.png" alt=""></div>
+                <div class="index-conter">
+                    <h6 class="book-title-info follow-home-title">《百年孤独》<span style="margin-left:15px" class="portal-summary-text">[哥伦比亚] 加西亚·马尔克斯</span></h6>
+                    <p class="book-text">开始很吃力，越读越上瘾，惊人的叙事与潮水般的叙事，野兽般撕开真理的外衣。从四姑娘的第一本书，就开始了他的抄袭生涯而已开始很吃力，越读越上瘾，惊人的叙事与潮水般的叙事，野兽般撕开真理的外衣。从四姑娘的第一本书，就开始了了他的···</p>
+                    <el-rate
+                        v-model="value"
+                        disabled
+                        show-score
+                        text-color="#fc6401"
+                        score-template="{value}分">
+                        </el-rate>
+                </div>
+                <div class="index-right">
+                    <span class="follow-hide" style="float:right">
+                          <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
+                    </span>
+                    <el-button class="btn" type="primary">查看图书</el-button>
+                </div>
+            </li>
+        </ul>
+        <div v-else class="home-no-list">
+            <img class="img" style="width:258px;height:168px" :src="`${webBaseUrl}/images/homeWu/no-book.png`" />
+            <p class="text">还没有书籍</p>
+        </div>
+    </div>
+  </template>
+  
+  <script>
+    import interactBar from "@/components/Portal/interactBar.vue";
+    import author from "@/components/Portal/authorInfo.vue";
+      export default{
+        name:"bookList",
+        components: {
+          interactBar,
+          // timeShow,
+          author
+        },
+          data(){
+              return{
+                value:5,
+                bookList:[{name:1}]
+              }
+          },
+      methods:{
+         //展示全部
+         changeIsAll(item) {
+          item.isAll = !item.isAll;
+        },
+       
+       }
+      }
+  </script>
+  
+  <style lang="scss" scoped>
+    .book-list{
+        ul{
+            margin: 0;
+        }
+        .book-list-index{
+            padding: 30px 0;
+            border-bottom: 1px solid rgba($color: #999999, $alpha: 0.2) !important;
+            display: flex;
+            .index-left{
+                img{
+                    width: 110px;
+                    height: 144px;
+                }
+            }
+            .index-conter{
+                width: 100%;
+                margin: 0 30px;
+                ::v-deep .el-rate__icon{
+                    color: #FC6401 !important;
+                    font-size: 20px !important;
+                }
+            }
+            .index-right{
+                .btn{
+                    width: 140px;
+                    height: 40px;
+                    margin-top: 40px;
+                }
+            }
+        }
+        .book-title-info{
+            margin: 0;
+            margin-bottom: 16px;
+        }
+        .book-text{
+            margin-bottom: 28px;
+            font-size: 14px;
+            color: #333330;
+            line-height: 20px;
+        }
+    }
+  </style>
+  
\ No newline at end of file
diff --git a/src/components/HomePage/caseList.vue b/src/components/HomePage/caseList.vue
new file mode 100644
index 00000000..80a98859
--- /dev/null
+++ b/src/components/HomePage/caseList.vue
@@ -0,0 +1,264 @@
+<template>
+    <div class="case-list-box">
+      <div class="data-content" v-if="list.length >0">
+              <div :span="24" v-for="item in list" :key="item.id" class="case-list">
+                <div class="case-info">
+                  <p v-if="isDynamic" class="portal-summary-text">
+                    <span v-if="!personal || isFollow">{{item.aname}}</span>{{item.cusInfo}}
+                    <span style="margin-left:28px">{{item.eventTime}}</span>
+                    <span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right">
+                      <span v-if="item.hidden">已隐藏</span>
+                      <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
+                    </span>
+                  </p>
+                  <div class="case-info-cont">
+                      <div class="case-info-title">
+                          <div class="case-titdiv" style="">
+                            <router-link :to="'/case/detail?id='+item.info.id">
+                              <span class="case-tittext" v-html="item.info.title || item.contentInfo"></span>
+                            </router-link>
+                              <span class="follow-hide pointer"  v-if="!isDynamic && personal">
+                                 <span v-if="item.hidden">已隐藏</span>
+                                 <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
+                              </span>
+                          </div>
+                      </div>
+                      <router-link :to="'/case/detail?id='+item.info.id">
+                        <div style="height:58px;padding-top:18px;display:flex">
+                          <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo" :sex="item.authorInfo.sex" :aid="item.authorInfo.aid"></author>
+                        <div class="sign-text">{{ item.authorInfo.sign }}</div>
+                        </div>
+                        <div class="keyword-text clearfix">
+                          <div style="color:#2974D6;font-weight: 450;" v-if="orgDomainTranslate(item.info.orgDomain)">{{ orgDomainTranslate(item.info.orgDomain) }}</div>
+                          <div style="color:#2974D6;font-weight: 450;" v-if="item.info.orgDomain == '' && item.info.orgDomainParent">{{ orgDomainTranslate(item.info.orgDomainParent) }}</div>
+                          <div style="color:#2974D6;font-weight: 450;"  v-for="item,idx in item.info.majorType" :key="idx" v-if="item !== ''">{{ majorTypeTranslate(item) }}</div>
+                          <div v-if="item.info.keyword1">{{ item.info.keyword1 }}</div>
+                          <div v-if="item.info.keyword2">{{ item.info.keyword2 }}</div>
+                          <div v-if="item.info.keyword3">{{ item.info.keyword3 }}</div>
+                          <div v-if="item.info.keyword4">{{ item.info.keyword4 }}</div>
+                          <div v-if="item.info.keyword5">{{ item.info.keyword5 }}</div>
+                        </div>
+
+                      <div class="case-info-summary two-line-ellipsis">
+                        {{item.info.summary}}
+                            <!-- {{displayAll(item)}}
+                            <span style="color:#588afc;cursor:pointer;" v-if="item.info.summary && item.info.summary.length>180" @click.stop="changeIsAll(item)">
+                                {{item.isAll?'收起':'展开'}}
+                            </span> -->
+                      </div>
+                      <div style="display: flex;justify-content: flex-end;">
+                      <div style="margin:8px 0;">
+                          <interactBar :type="0" :shares="false" :views="false"  :data="item.info" :readonly="true"></interactBar> </div>
+                      </div>
+                  </router-link>
+                  </div>
+                </div>
+              </div>
+            </div>
+        <div v-else class="home-no-list">
+            <img class="img" :src="`${webBaseUrl}/images/homeWu/no-case.png`" alt="" srcset="">
+            <p v-if="isFollow" class="text">暂时没有动态</p>
+            <p v-else class="text">还没有案例</p>
+        </div>
+    </div>
+  </template>
+
+  <script>
+    import interactBar from "@/components/Portal/interactBar.vue";
+    import author from "@/components/Portal/authorInfo.vue";
+    import { mapGetters,mapActions } from 'vuex';
+      export default{
+        name:"caselist",
+        components: {
+          interactBar,
+          // timeShow,
+          author
+        },
+        computed: {
+          ...mapGetters(['userInfo','majorTypeMap','orgDomainMap']),
+        },
+        props:{
+          list:{
+            type:Array,
+            default:()=>[]
+          },
+          isDynamic:{// 是否全部
+                type:Boolean,
+                default:false,
+            },
+          personal:{//显示隐藏，
+            type:Boolean,
+            default:false,
+          },
+          isFollow:{//用于判断是否事我的关注页面，显示人名
+            type:Boolean,
+            default:false,
+          }
+        },
+          data(){
+              return{
+                // list:[]
+              }
+          },
+          mounted() {
+          },
+      methods:{
+        emitHide(id) {
+          this.$emit('hideIndex',id)
+        },
+        majorTypeTranslate(code){
+          if(code==''){return '';}
+          return this.majorTypeMap.get(code);
+        },
+         //展示全部
+        displayAll(item) {
+          if (!item.isAll && item.info.summary && item.info.summary.length > 180) {
+            return item.info.summary.slice(0, 180) + "...";
+          }
+          return item.info.summary;
+        },
+        changeIsAll(item) {
+          item.isAll = !item.isAll;
+        },
+        orgDomainTranslate(code){ // 组织领域翻译
+          if(code==''|| code==undefined){return '';}
+          return this.orgDomainMap.get(code);
+        },
+       }
+      }
+  </script>
+
+  <style lang="scss" scoped>
+    .sign-text{
+      color: #666666;
+      font-size: 14px;
+      line-height: 35px;
+      margin-left: 10px;
+    }
+    .clearfix:after{
+      content: "020";
+      display: block;
+      height: 0;
+      clear: both;
+      visibility: hidden;
+    }
+ .keyword-text {
+
+div {
+  padding:0px 8px;
+  margin-top: 5px;
+  float: left;
+  line-height: 24px;
+  font-size: 12px;
+  border-radius:2px;
+  margin-right: 8px;
+  color: #2C68FF;
+  height: 24px;
+  background: rgba(44,104,255,0.06);
+}
+}
+.case-titdiv {
+    width: 100%;
+    line-height: 30px;
+    display: flex;
+    justify-content: space-between;
+    margin-top: 16px;
+    .case-tittext {
+      font-size: 18px;
+      font-weight: 600;
+      color: #333333;
+      display: -webkit-box;
+      overflow: hidden;
+      word-break: break-all;
+      text-overflow: ellipsis;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      box-sizing: border-box;
+    }
+  }
+    .data-content {
+    background-color: #fff;
+    // padding: 5px 50px;
+    ::v-deep .interact-bar-btns{
+      .interact-bar-btn{
+        text-align: right;
+        min-width: 78px !important;
+        margin-right: 0;
+      }
+    }
+  }
+  .case-list:last-child {
+      // border-bottom: none;
+    }
+
+    .case-list {
+      border-bottom: 1px solid rgba(153, 153, 153,.2);
+      padding-top: 30px;
+      // margin: 8px 0px;
+      padding-bottom: 15px;
+      // padding-left: 5px;
+      // padding-right: 5px;
+    }
+    .case-image {
+      width: 230px;
+      height: 170px;
+      float: left;
+      border: 1px solid #eee;
+    }
+
+    .case-info {
+      .case-info-cont {
+        .case-info-title {
+          font-size: 15px;
+          color: #333;
+          font-weight: 600;
+          height: 30px;
+          line-height: 30px;
+          .case-info-date {
+            flex: 1;
+            text-align: right;
+            font-weight: normal;
+            // font-size: 12px;
+            // height: 30px;
+            // font-weight: 200;
+            // color: #8590a6;
+            i {
+              margin-right: 5px;
+            }
+          }
+        }
+        .case-info-summary {
+          margin-top:16px;
+          cursor: pointer;
+          // margin-bottom: 5px;
+          word-break: break-all;
+          line-height: 24px;
+          font-size: 14px;
+          color: #333330;
+          font-weight: 400;
+        }
+        .case-info-tools {
+          height: 30px;
+          .case-info-tools-auth {
+            float: left;
+            font-size: 13px;
+            color: #999999;
+            img {
+              margin-right: 10px;
+              width: 30px;
+              border: 1px solid #eee;
+              border-radius: 50%;
+              vertical-align: middle;
+            }
+          }
+          .case-info-tools-btns {
+            float: right;
+            .case-info-tools-btn {
+              margin: 0 0 0 15px;
+            }
+          }
+        }
+      }
+    }
+
+  </style>
diff --git a/src/components/HomePage/courseList.vue b/src/components/HomePage/courseList.vue
new file mode 100644
index 00000000..96b9d553
--- /dev/null
+++ b/src/components/HomePage/courseList.vue
@@ -0,0 +1,157 @@
+<template>
+    <div class="">
+      <ul class="data-info-ul" v-if="list.length > 0">
+        <li class="data-info" v-for="item in list" :key="item.id">
+          <p v-if="isDynamic" class="portal-summary-text" style="margin-bottom:18px">
+            <span v-if="!personal || isFollow">{{item.aname}}</span>
+            {{item.cusInfo}}  <span style="margin-left:28px">{{item.eventTime}}</span>
+           <span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right" >
+             <span v-if="item.hidden">已隐藏</span>
+             <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
+           </span>
+          </p>
+          <div style="display:flex;">
+               <div style="width:254px" class="pointer" @click="jumpDetail(item)">
+                <course-image width="254px" height="144px" :course="item.info"></course-image>
+            </div>
+            <div class="data-cen pointer" @click="jumpDetail(item)">
+                <h6 class="course-tit portal-title-tow">{{item.info.courseName || item.contentInfo}}  
+                  <span class="sysType-name" v-if="item.info.sysType1 !='' && item.info.sysType1 != 0">{{sysTypeName(item.info.sysType1)}}</span>
+                  <span class="sysType-name" v-if="item.info.sysType2 !='' && item.info.sysType2 != 0">{{sysTypeName(item.info.sysType2)}}</span>
+                  <span class="sysType-name" v-if="item.info.sysType3 !='' && item.info.sysType3 != 0">{{sysTypeName(item.info.sysType3)}}</span>
+                   <span class="score-info" v-if="toScore(item.info.lastScore) > 0">{{toScore(item.info.lastScore)}}分</span>
+                </h6>
+                <p class="title-info">{{item.info.summary}}</p>
+                <div class="pro-line"> <div>当前进度：</div> <div style="width:200px"><el-progress :percentage="item.info.progress"></el-progress></div></div>
+                <p class="portal-time">最新一次学习时间：{{item.eventTime}}</p>
+            </div>
+            <div style="width:150px">
+                <div class="follow-hide pointer" style="text-align: right;" v-if="!isDynamic && personal">
+                    <span v-if="item.hidden">已隐藏</span>
+                    <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
+                </div>
+                <div class="btn-right">
+                   <!-- <el-button class="btn" type="primary" @click="jumpDetail(item)">{{item.eventKey ==  'Praise' ? '我也去学' : item.aid == userInfo.aid? '继续学习' : '我也去学'}}</el-button> -->
+                   <el-button class="btn" type="primary" @click="jumpDetail(item)">{{personal? '继续学习' : '我也去学'}}</el-button>
+                </div>
+            </div>
+          </div>
+
+        </li>
+      </ul>
+      <div v-else class="home-no-list">
+            <img class="img" :src="`${webBaseUrl}/images/homeWu/no-course.png`" alt="" srcset="">
+            <p v-if="isFollow" class="text">暂时没有动态</p>
+            <p v-else class="text">还没有课程</p>
+      </div>
+    </div>
+  </template>
+
+  <script>
+  import { toScore} from '@/utils/tools.js';
+    import courseImage from "@/components/Course/courseImage.vue";
+    import { mapGetters } from 'vuex'
+      export default{
+          data(){
+              return{
+                pageId:'',
+                toScore,
+                courseList:[]
+              }
+          },
+          computed:{
+            ...mapGetters(['curIdentity','identity','userInfo','sysTypeMap']),
+          },
+          components: {
+            courseImage,
+        },
+          props:{
+            list:{
+                type:Array,
+                default:()=>[]
+            },
+            isDynamic:{
+                type:Boolean,
+                default:false,
+            },
+            personal:{
+              type:Boolean,
+              default:false,
+            },
+            isFollow:{//用于判断是否事我的关注页面，显示人名
+                type:Boolean,
+                default:false,
+            }
+          },
+          mounted() {
+            this.pageId = this.$xpage.getHomeId(this.$route);
+          },
+          methods:{
+            sysTypeName(code){
+              if(code==''){return '';}
+              return this.sysTypeMap.get(code);
+            },
+            emitHide(id) {
+              this.$emit('hideIndex',id)
+            },
+            jumpDetail(data) {
+                if(!data.contentId){
+                return;
+                }
+                this.$router.push({ path: '/course/detail?id=', query: { id: data.contentId } });
+            }
+          }
+      }
+  </script>
+
+  <style lang="scss" scoped>
+    .data-info-ul{
+        margin: 0;
+        // padding-top: 32px;
+    }
+  .data-info{
+    border-bottom: 1px solid rgba($color: #999999, $alpha: 0.2);
+    padding-bottom: 38px;
+    padding-top: 32px;
+    .data-cen{
+        flex: 100%;
+        margin: 0 28px;
+        .course-tit{
+            margin: 0;
+            font-size: 18px !important;
+            line-height: 25px;
+            .sysType-name{
+              display: inline-block;
+              padding:0px 8px;
+              // margin-top: 5px;
+              line-height: 24px;
+              font-size: 12px;
+              border-radius:2px;
+              margin-right: 8px;
+              color: #2C68FF;
+              height: 24px;
+              background: rgba(44,104,255,0.06);
+            }
+        }
+        .title-info{
+            font-size: 14px;
+            color: #333333;
+            margin-top: 14px;
+        }
+        .pro-line{
+           margin: 30px 0 16px 0;
+           font-size: 14px;
+           color: #333333;
+           display: flex;
+        }
+
+    }
+    .btn-right{
+            margin-top: 48px;
+            .btn{
+                width: 140px;
+                height: 40px;
+            }
+        }
+  }
+  </style>
diff --git a/src/components/HomePage/favoritesNote.vue b/src/components/HomePage/favoritesNote.vue
new file mode 100644
index 00000000..360d7f25
--- /dev/null
+++ b/src/components/HomePage/favoritesNote.vue
@@ -0,0 +1,113 @@
+<template>
+    <div class="note-list">
+        <ul v-if="list.length > 0">
+            <li class="note-list-index" v-for="item in list" :key="item.id">
+                <p style="margin-bottom:18px;">
+                  <span style="font-size: 16px;font-weight: 600;color: #333;">{{item.courseName || item.title}}</span> <span v-if="isAll" class="qa-bq">#笔记#</span>
+                 
+                  <span class="follow-hide" style="float:right">
+                    <el-button @click.stop="delCollectItem(item)" type="text" icon="el-icon-star-on" style="color:#8590A6">取消收藏</el-button>
+                    </span>
+                </p>
+                <!-- <h6 class="note-title-info follow-home-title">
+                    
+                </h6> -->
+                <p class="note-text">
+                    {{item.content}}
+                </p>
+                <div>
+                    <interactBar :type="6" :data="item" :shares="false" :views="false" :readonly="true"></interactBar> 
+                </div>
+            </li>
+        </ul>
+        <div v-else class="home-no-list">
+            <img class="img" :src="`${webBaseUrl}/images/homeWu/no-note.png`" alt="" srcset="">
+            <p class="text">还没有笔记</p>
+        </div>
+    </div>
+  </template>
+  
+  <script>
+    import interactBar from "@/components/Portal/interactBar.vue";
+    // import author from "@/components/Portal/authorInfo.vue";
+      export default{
+        name:"NoteList",
+        components: {
+          interactBar,
+          // timeShow,
+        //   author
+        },
+        props:{
+          list:{
+            type:Array,
+            default:()=>[]
+          },
+          isDynamic:{
+                type:Boolean,
+                default:false,
+            },
+          personal:{
+            type:Boolean,
+            default:false,
+          },
+          isAll:{
+            type:Boolean,
+            default:false,
+          }
+        },
+          data(){
+              return{
+                noteList:[]
+              }
+          },
+          mounted() {
+          },
+      methods:{
+        delCollectItem(item) {
+        this.$confirm('您确定要取消收藏吗？', '取消提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+           })
+            .then(() => {
+            this.$emit('confirm', item);
+            // apiFavorites.del(item){
+            //   console.log(this.$parent,"我拿到的父组件")
+            // }
+            })
+            .catch(() => {});
+         },
+        emitHide(id) {
+          this.$emit('hideIndex',id)
+        },
+         //展示全部
+         changeIsAll(item) {
+          item.isAll = !item.isAll;
+        },
+       
+       }
+      }
+  </script>
+  
+  <style lang="scss" scoped>
+    .note-list{
+        ul{
+            margin: 0;
+        }
+        .note-list-index{
+            padding: 30px 0;
+            border-bottom: 1px solid rgba($color: #999999, $alpha: 0.2) !important;
+        }
+        .note-title-info{
+            margin: 0;
+            margin-bottom: 16px;
+        }
+        .note-text{
+            margin-bottom: 18px;
+            font-size: 14px;
+            color: #333330;
+            line-height: 20px;
+        }
+    }
+  </style>
+  
\ No newline at end of file
diff --git a/src/components/HomePage/followList.vue b/src/components/HomePage/followList.vue
new file mode 100644
index 00000000..27325b3c
--- /dev/null
+++ b/src/components/HomePage/followList.vue
@@ -0,0 +1,348 @@
+<template>
+  <div>
+    <ul class="follow-top-tabs">
+        <li class="follow-home-title tabs-index" @click="tagTab(1)">{{userInfo.aid == pageId ?'我关注的人':'他关注的人'}}<span v-if="active == 1" class="line"></span></li>
+        <li class="follow-home-title tabs-index" @click="tagTab(2)">{{userInfo.aid == pageId ?'关注我的人':'关注他的人'}}<span v-if="active == 2" class="line"></span></li>
+    </ul>
+    <div v-show="active ==1">
+        <div class="follow-list" v-for="(item,index) in follow.list" :key="index">
+            <div style="width:60px;height:60" @click="toHome(item.userFollow.authorInfo)">
+              <el-avatar shape="circle" style="width:60px;height:60px" size="small" :src="baseUrl+item.userFollow.authorInfo.avatar" v-if="item.userFollow.authorInfo.avatar"></el-avatar>
+              <div v-else class="uavatar">
+                  <div v-if="item.userFollow.authorInfo.sex == null" style="border-radius: 50%;width: 60px;height: 60px;"></div>
+                  <div v-else>
+                    <div v-if="item.userFollow.authorInfo.sex === 1 "><img style="width:60px;height:60" :src="`${webBaseUrl}/images/Avatarman.png`" alt=""></div>
+                    <div v-else><img style="width:60px;height:60" :src="`${webBaseUrl}/images/Avatarwoman.png`" alt=""></div>
+                  </div>
+                </div>
+              <!-- <img style="width:60px;height:60" :src="item.authorInfo.avatar"/> -->
+            </div>
+            <div class="follow-center">
+                <p class="follow-home-title" style="font-size: 20px;margin-bottom: 12px;">{{item.userFollow.authorInfo.name}}
+                  <!-- <img style="width:22px;height:22;vertical-align:middle" src="/images/homeWu/man.png" /> -->
+                </p>
+                <p class="portal-summary-text">{{item.userFollow.authorInfo.sign}}</p>
+            </div>
+            <div>
+              <followButton :data="index" :has="item.has" :aid="item.userFollow.followId" @cancel="myCancelFollow" @add="myAddFollow"></followButton>
+            </div>
+            <!--
+            <div v-if="pageId == userInfo.aid">
+                <el-button plain class="btn" icon="el-icon-check" @click="cancel(item)">取消关注</el-button>
+            </div>
+            <div v-else>
+              <el-button class="btn" icon="el-icon-check" v-if="item.has" @click="cancel(item)">取消关注</el-button>
+              <el-button type="primary" class="btn" v-else icon="el-icon-plus" @click="toFollow(item)">关注TA</el-button>
+            </div>
+            -->
+        </div>
+        <!--分页没有加-->
+          <div style="text-align: center; margin-top:57px;" v-show="follow.count > 0">
+            <el-pagination
+            background
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="follow.pageIndex"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="follow.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="follow.count">
+            </el-pagination>
+        </div>
+    </div>
+    <div v-if="showEmpty" class="home-no-list">
+        <img class="img" style="width:186px;height:160px" :src="`${webBaseUrl}/images/homeWu/no-follow.png`" alt="" srcset="">
+        <p class="text">还没有关注的人</p>
+    </div>
+    <div v-show="active == 2">
+        <div class="follow-list" v-for="(maPage,index) in followMe.list" :key="index">
+            <div style="width:60px;height:60" @click="toHome(maPage.userFollow.authorInfo)">
+              <el-avatar shape="circle" style="width:60px;height:60px" size="small" :src="baseUrl+maPage.userFollow.authorInfo.avatar" v-if="maPage.userFollow.authorInfo.avatar"></el-avatar>
+              <div v-else class="uavatar">
+                  <div v-if="maPage.userFollow.authorInfo.sex == null" style="border-radius: 50%;width: 60px;height: 60px;"></div>
+                  <div v-else>
+                    <div v-if="maPage.userFollow.authorInfo.sex === 1 "><img style="width:60px;height:60" :src="`${webBaseUrl}/images/Avatarman.png`" alt=""></div>
+                    <div v-else><img style="width:60px;height:60" :src="`${webBaseUrl}/images/Avatarwoman.png`" alt=""></div>
+                  </div>
+                </div>
+              <!-- <img style="width:60px;height:60" :src="item.authorInfo.avatar"/> -->
+            </div>
+            <div class="follow-center">
+                <p class="follow-home-title" style="font-size: 20px;margin-bottom: 12px;">{{maPage.userFollow.authorInfo.name}}
+                  <!-- <img style="width:22px;height:22;vertical-align:middle" src="/images/homeWu/man.png" /> -->
+                </p>
+                <p class="portal-summary-text">{{maPage.userFollow.authorInfo.sign}}</p>
+            </div>
+            <div>
+              <followButton :has="maPage.has" :aid="maPage.userFollow.aid"></followButton>
+            </div>
+            <!--
+            <div v-if="pageId == userInfo.aid">
+
+                <el-button class="btn" icon="el-icon-check" v-if="maPage.has">已关注</el-button>
+                <el-button type="primary" class="btn" v-else icon="el-icon-plus" @click="toFollow(maPage)">关注TA</el-button>
+            </div>
+            <div v-else>
+                <el-button plain class="btn" icon="el-icon-check" v-if="maPage.has" @click="cancel(maPage,2)">取消关注</el-button>
+                <el-button type="primary" class="btn" v-else icon="el-icon-plus" @click="toFollow(maPage)">关注TA</el-button>
+            </div>
+            -->
+        </div>
+         <!--分页没有加-->
+         <div style="text-align: center; margin-top:57px;" v-show="page.count > 0">
+            <el-pagination
+            background
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="followMe.pageIndex"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="followMe.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="followMe.count">
+            </el-pagination>
+        </div>
+    </div>
+
+  </div>
+</template>
+<script>
+import followButton from "@/components/Follow/button.vue";
+import interactBar from "@/components/Portal/interactBar.vue";
+import author from "@/components/Portal/authorInfo.vue";
+import apiFollow from "@/api/phase2/userfollow.js"
+import { mapGetters,mapActions } from 'vuex';
+import apiUser from "@/api/system/user.js";
+  export default{
+    name:"followList",
+    components: {
+      interactBar,
+      followButton,
+      author
+    },
+    computed:{
+          ...mapGetters(['userInfo']),
+          avatarText(){
+              return userAvatarText(this.userInfo.name);
+          },
+          showEmpty(){ //是否显示空信息内容
+            if(this.active==1 && this.follow.list.length==0){
+               return true;
+            }else if(this.active==2 && this.followMe.list.length==0){
+               return true;
+            }
+            return false;
+          }
+      },
+      data(){
+          return{
+            baseUrl:process.env.VUE_APP_FILE_BASE_URL,
+            active:1,
+            pageId:'',
+            follow:{
+              list:[],
+              count:0,
+              pageIndex:1,
+              pageSize:10
+            },
+            followMe:{
+              list:[],
+              count:0,
+              pageIndex:1,
+              pageSize:10
+            },
+            page:{
+              pageIndex:1,
+              pageSize:10,
+              aid:'',
+              count:0
+            }
+          }
+      },
+      mounted() {
+            this.pageId = this.$xpage.getHomeId(this.$route);
+            this.$bus.$on('followIndex',(num)=>{
+               this.active = num;
+            })
+      },
+    methods:{
+      toHome(ava) {
+            this.$router.push({path:this.$xpage.getHomePath(ava.aid)})
+        },
+      myCancelFollow(dataIndex){ //我关注的，我取消关注
+          //this.follow.list.splice(dataIndex,1);
+      },
+      myAddFollow(dataIndex){ //我关注的，我取消关注
+          //this.follow.list.splice(dataIndex,1);
+      },
+      toFollow(item) {
+        let id = '';
+        if(this.active == 2) {
+          id = item.userFollow.aid;
+        } else {
+          id = item.userFollow.followId;
+        }
+          apiFollow.save(id).then(res=>{
+            if(res.status == 200) {
+              // this.$message.success("关注成功");
+              this.getMyPage();
+            } else {
+              this.$message.error(res.message);
+            }
+          })
+        },
+      resetActive(){
+        // this.active=1;
+        this.follow={list:[],count:0,pageIndex:1,pageSize:10},
+        this.followMe={list:[],count:0,pageIndex:1,pageSize:10},
+        this.tagTab(this.active);
+      },
+      cancel(item,idx) {
+        let $this=this;
+        let id = '';
+        if(idx == 2) {
+          id = item.userFollow.aid;
+        } else {
+          id = item.userFollow.followId;
+        }
+        apiFollow.remove(id).then(res=>{
+           if(res.status == 200) {
+            if(idx == 2) {
+              this.getMyPage()
+            } else {
+              this.getPage();
+            }
+
+            //  $this.follow.list.splice(idx,1);
+           }
+        })
+      },//展示全部
+      tagTab(num) {
+         this.active = num;
+         if(num == 1) {
+           if(this.follow.list.length==0){
+             this.getPage()
+           }
+
+         } else {
+           if(this.followMe.list.length==0){
+             this.getMyPage()
+           }
+         }
+       },
+       handleSizeChange(val) {
+         if(this.active==1){
+           this.follow={list:[],count:0,pageIndex:1,pageSize:val};
+           this.getPage()
+         }else{
+           this.followMe={list:[],count:0,pageIndex:1,pageSize:val};
+           this.getMyPage()
+         }
+
+      },
+      handleCurrentChange(val) {
+        if(this.active==1){
+          this.follow.pageIndex=val;
+          this.getPage()
+        }else{
+          this.followMe.pageIndex=val;
+          this.getMyPage()
+        }
+
+      },
+      getMyPage() {//关注我的，关注他的
+        this.page.aid = this.pageId;
+        this.page.pageIndex=this.followMe.pageIndex;
+        this.page.pageSize=this.followMe.pageSize;
+        let $this=this;
+        apiFollow.mypage(this.page).then(res=>{
+            if(res.status== 200) {
+               $this.followMe.count = res.result.count;
+               res.result.list.forEach(item=>{
+                  item.userFollow.authorInfo = { aid: "",name: "",orgInfo: "",avatar: "",sex: null ,sign:''}
+               })
+               this.followMe.list = res.result.list;
+               //console.log(this.mypageList,'this.mypageList');
+               this.getUserData(res.result.list);
+            }else{
+              console.log('加载关注我数据错误:'+res.message);
+            }
+        })
+       },
+       getPage() { //我关注的，他关注的
+        this.page.aid = this.pageId;
+        this.page.pageIndex=this.follow.pageIndex;
+        this.page.pageSize=this.follow.pageSize;
+        let $this=this;
+        apiFollow.page(this.page).then(res=>{
+          if(res.status== 200) {
+             $this.follow.count = res.result.count;
+             res.result.list.forEach(item=>{
+                item.userFollow.authorInfo = { aid: "",name: "",orgInfo: "",avatar: "",sex: null ,sign:''}
+             })
+             this.follow.list = res.result.list;
+             this.getUserData(res.result.list);
+          }
+        })
+       },
+       getUserData(list) {
+            let ids = [];
+            if(this.active == 2) {
+              ids = list.map(item=> item.userFollow.aid);
+            } else {
+              ids = list.map(item=> item.userFollow.followId);
+            }
+
+            apiUser.getByIds(ids).then(res => {
+                if (res.status == 200) {
+                    list.forEach((item, index) => {
+                        res.result.some(author => {
+                          if (this.active == 1 && author.aid == item.userFollow.followId) {
+                              item.userFollow.authorInfo = author;
+                              return true;
+                          } else if(this.active == 2 && author.aid == item.userFollow.aid){
+                              item.userFollow.authorInfo = author;
+                              return true;
+                          } else {
+                              return false;
+                          }
+                    });
+                });
+                } else {
+                this.$message.error(res.message);
+                }
+            });
+         },
+     }
+  }
+</script>
+<style lang="scss" scoped>
+.follow-top-tabs{
+  display: flex;
+  padding: 4px 0;
+  .tabs-index{
+    padding:0 60px 10px 10px;
+    cursor: pointer;
+    .line{
+        display: inline-block;
+        width: 100%;
+        height: 4px;
+        background: #0060FF;
+        border-radius: 3px;
+    }
+  }
+}
+.follow-list{
+    display: flex;
+    border-top:  1px solid rgba($color: #999999, $alpha: 0.2);
+    padding: 36px 0 38px 0;
+    .follow-center{
+      flex: 100%;
+      margin-left: 20px
+    }
+    .btn{
+        margin-top: 18px;
+        height: 40px;
+        width: 140px;
+      }
+}
+</style>
diff --git a/src/components/HomePage/homePage.vue b/src/components/HomePage/homePage.vue
new file mode 100644
index 00000000..4e597015
--- /dev/null
+++ b/src/components/HomePage/homePage.vue
@@ -0,0 +1,546 @@
+<template>
+    <div class="uc-header">
+      <div class="uc-header-box" >
+        <div class="personalData">
+            <div class="uesr-avaer">
+              <img :src="fileBaseUrl+userData.avatar" v-if="userData.avatar !== '' ">
+              <div v-else class="uavatar">
+                  <div v-if="userData.sex === 1 "><img :src="`${webBaseUrl}/images/Avatarman.png`" style="width: 100%;" alt=""></div>
+                  <div v-if="userData.sex === 2 "><img :src="`${webBaseUrl}/images/Avatarwoman.png`" style="width: 100%;" alt=""></div>
+              </div>
+            </div>
+
+           <div class="user-content">
+              <div style="display: flex;justify-content: start;margin-left:25px">
+                  <div  style="min-width: 240px;">
+                    <div class="content-top">
+                      <h6> {{userData.name}}<span style="margin-left:8px;color: #999999;font-weight: 400;">{{orgInfo}}</span> </h6>
+                    </div>
+                     <div class="grade" style="margin-top:5px">
+                        <div class="level" style="margin-top:4px">{{statData.level}}</div>
+                        <span style="color: #A3680A;margin-left:5px;line-height: 24px;margin-right: 20px;">经验值：{{statData.evalue}}</span>
+                      <!-- <div style="float:right"> -->
+                       <router-link v-if="pageId == userInfo.aid" to="/user/Setting"><span class="content-one-info pointer" style="line-height: 30px;">个人设置</span></router-link>
+                      <span v-if="pageId == userInfo.aid"   style="margin-left:10px;line-height: 30px;" class="content-one-info" ><router-link to="/uc/study/courses" class="pointer" style="color:#0060FF;">个人中心</router-link></span>
+                      <span class="content-one-info"  v-if="pageId != userInfo.aid && !isFollowHas" @click="toFollow()">关注TA</span>
+                      <spap class="Followed"  @click="cancelFollow()" v-if="isFollowHas">已关注</spap>
+                      <el-button type="text" round  class="btn-user"  >  <router-link :to="'/home/'+pageId+'/leaving'">{{pageId == userInfo.aid ? '留言板':'去留言'}}<i class="el-icon-arrow-right"></i> </router-link> </el-button>
+                      <!-- <div style="height: 30px;margin-top: 10px;"> -->
+                      
+
+                      <!-- </div> -->
+                      <!-- </div> -->
+                    </div>
+                    <div class="content-bottom" style="margin-top:20px">
+                      <p v-if="userData.sign" class="portal-summary-text">{{userData.sign}} </p>
+                      <p v-else  class="portal-summary-text">暂无签名</p>
+                    </div>
+                   
+                  </div>
+                  <!-- <div style="text-align: center;"> -->
+                      
+                     
+                  <!-- </div> -->
+               </div>
+           </div>
+        </div>
+        <div class="learningData">
+          <div class="learning-info">
+             <div class="learning-qus">当月学习时长</div>
+             <div class="learning-an"><span>{{statData.monthStudyHour}}</span>h</div>
+          </div>
+           <div class="learning-info">
+             <div class="learning-qus">累计学习时长</div>
+             <div class="learning-an"><span>{{statData.totalStudyHour}}</span>h</div>
+          </div>
+          <div class="learning-border" ></div>
+           <div class="learning-info" style="margin-left:22px">
+             <div class="learning-qus">当月学习天数</div>
+             <div class="learning-an"><span>{{statData.monthStudyDays}}</span>天</div>
+          </div>
+           <div class="learning-info">
+             <div class="learning-qus">累计学习天数</div>
+             <div class="learning-an"><span>{{statData.totalStudyDays}}</span>天</div>
+          </div>
+           <div class="learning-border" ></div>
+           <div class="learning-info" style="margin-left:22px">
+             <div class="learning-qus">我的U币（累计）</div>
+             <div class="learning-an"><span>{{statData.uvalue}}</span></div>
+          </div>
+          <div class="learning-info" v-if="userInfo.aid == pageId">
+              <div @click="jumrank" style="cursor: pointer;" class="ranking-link"> BOE 排行榜 >></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </template>
+
+  <script>
+  import {userAvatarText,cutFullName} from "@/utils/tools.js";
+    import { mapGetters } from 'vuex'
+    import apiStart from '@/api/phase2/stat.js';
+    import apiFollow from "@/api/phase2/userfollow.js"
+    import apiUser from "@/api/system/user.js";
+    export default {
+      name: 'UcHeader',
+      computed:{
+        ...mapGetters(['curIdentity','identity','userInfo']),
+              avatarText(){
+                  return userAvatarText(this.userInfo.name);
+              }
+          },
+      data(){
+        return {
+          fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
+          statData:{
+            evalue: 0,//经验值
+            level: "LV1",//级别
+            monthStudyHour:0,//当月学习时长
+            totalStudyHour: 0, //累计学习时长
+            monthStudyDays:0, //当月学习天数
+            totalStudyDays:0, //累计学习天数
+            uvalue:0 //U币数量
+          },
+          orgInfo:'',
+          sex:'',
+          pageId:'',
+          isFollowHas:false,
+          userData:{
+              aid: "",
+              avatar: "",
+              code: "",
+              name: "",
+              orgInfo: "",
+              sex: '',
+              sign: "",
+          }
+        }
+      },
+      mounted() {
+        this.pageId = this.$xpage.getHomeId(this.$route);
+        this.sex = this.userInfo.sex;
+        // 判断路由是进入的学员默认页面就重置setCurIdentity
+        if(this.$route.path == '/uc/study/task' || this.$route.path == '/study/index'){
+          this.setCurIdentity(1);
+        }
+        this.orgInfo=cutFullName(this.userInfo.departFullName,1);
+
+        this.loadUserStat();
+        if(this.pageId !== this.userInfo.aid) {
+          this.followHas();
+        }
+      },
+      methods:{
+        cancelFollow() {
+          apiFollow.remove(this.pageId).then(res=>{
+            if(res.status == 200) {
+               this.isFollowHas = false;
+			         this.$message.success("取消关注成功");
+            } else {
+              this.$message.error(res.message);
+            }
+          })
+        },
+        loadUserStat(){//获取经验值和等级
+            apiUser.getByIds([this.pageId]).then(res => {
+                if (res.status == 200) {
+                   this.userData = res.result[0];
+                } else {
+                   this.$message.error(res.message);
+                }
+            });
+            apiStart.getUserStatTotalInfo(this.userInfo.aid).then(res=>{
+              if(res.status == 200) {
+                 this.statData.evalue = res.result.evalue;
+                 this.statData.level = res.result.level;
+                 this.statData.monthStudyHour = res.result.monthStudyHour;
+                 this.statData.totalStudyHour = res.result.totalStudyHour;
+                 this.statData.monthStudyDays = res.result.monthStudyDays;
+                 this.statData.totalStudyDays = res.result.totalStudyDays;
+                 this.statData.uvalue = res.result.uvalue;
+                 this.medalList=res.result.medalList;
+              }
+            });
+        },
+        followHas() {//他人主页，判断关注状态
+          apiFollow.has(this.pageId).then(res=>{
+            if(res.status == 200) {
+               this.isFollowHas = res.result;
+            } else {
+              this.$message.error(res.message);
+            }
+          })
+        },
+        toFollow() {
+          apiFollow.save(this.pageId).then(res=>{
+            if(res.status == 200) {
+              this.$message.success("关注成功");
+              this.followHas();
+            } else {
+              this.$message.error(res.message);
+            }
+          })
+        },
+        setCurIdentity(iden){
+          this.$store.dispatch('SetCurIdentity',iden);
+        },
+        jumrank(){
+          this.$router.push('/user/ranking');
+        },
+        toPage(url){
+          this.$router.push({path:url})
+        },
+      }
+    }
+  </script>
+
+<style lang="scss" scoped>
+  .level{
+    float: left;
+    width: 57px;
+    height: 24px;
+    text-align: center;
+    line-height: 28px;
+    background-image: url(../../../public/images/lvbg.png);
+    background-repeat: no-repeat;
+    background-size:100%;
+  }
+  .ranking-link{
+    font-size: 16px;
+    font-weight: 600;
+    color: #333333;
+    margin-top: 20px;
+  }
+  .uc-header{
+    display: flex;
+    justify-content: space-between;
+    height: 210px;
+    background-color: #ffffff;
+    background-image: url('../../../public/images/userbgimg.png');
+    background-repeat: no-repeat;
+    background-size:445px 210px;
+    background-position: right 0;
+  }
+  .uc-header-box{
+    display: flex;
+    justify-content: space-between;
+    height: 210px;
+    margin: 0 auto;
+  }
+  .list{
+    font-size: 16px;
+    font-weight: 600;
+    color: #333333;
+    margin-top: 20px;
+  }
+  .learningData{
+    padding-top: 70px;
+    box-sizing: border-box;
+    margin-left:auto;
+    .learning-info{
+      float: left;
+      margin-right: 22px;
+       .learning-qus{
+            font-size: 14px;
+            color: #666660;
+            margin-bottom: 24px;
+       }
+       .learning-an{
+            color: #999999;
+            text-align: center;
+            font-size: 14px;
+            span{
+              font-weight: 600;
+              font-size: 22px;
+              color: #0060FF;
+              margin-right: 6px;
+            }
+       }
+    }
+    .learning-border{
+      width: 1px;
+      height: 49px;
+      opacity: 0.3;
+      border: 1px solid #AAA6A6;
+      float: left;
+      margin-top: 5px;
+    }
+  }
+//   .content-bottom{
+//     margin-top: 12px;
+     .medal{
+       float: left;
+       img{
+           width: 36px;
+           height: 40px;
+           margin-right: 10px;
+           vertical-align: top;
+       }
+     }
+
+     .medalbutt{
+       color: #333333;
+       font-size: 14px;
+       float: left;
+       margin-top: 10px;
+     }
+     .btn-user{
+          color: #387DF7;
+          margin: 0;
+          font-size: 16px;
+          padding: 0;
+      }
+     .grade{
+       // margin-top: 20px;
+
+       div{
+        //  margin-left: 22px;
+         font-weight: 600;
+          float: left;
+          width: 57px;
+          height: 24px;
+          //text-align: center;
+          line-height: 24px;
+          color: #9D6110 ;
+          //background: url('../../../public/images/lvbg.png') no-repeat 100% / 100%;
+       }
+     }
+//   }
+  .personalData{
+    flex: 1;
+    padding-top: 40px;
+    box-sizing: border-box;
+    display: flex;
+    .uesr-avaer{
+      width: 120px;
+      height: 120px;
+      margin-right: 30px;
+      img{
+        width: 100%;
+        height: 100%;
+        border-radius: 50%;
+        vertical-align: top;
+      }
+    }
+    .user-content{
+      flex: 1;
+      .content-top{
+        // margin-top: 15px;
+        height: 46px;
+        line-height: 46px;
+
+        h6{
+          color: #333333;
+          font-size: 26px;
+          margin:0;
+          float: left;
+
+        }
+        span{
+          color: #999999;
+          font-size: 14px;
+          margin-left: 5px;
+          margin-right: 24px;
+        }
+
+      }
+    }
+  }
+.content-one-info{
+  display: inline-block;
+  line-height: 30px;
+   width: 80px;
+    height: 30px;
+    text-align: center;
+    border-radius: 20px;
+    padding: 0;
+    border: 1px solid #619DFF;
+    font-size: 14px;
+    color: #387DF7;
+  
+}
+.Followed{
+  width: 80px;
+  height: 30px;
+  padding: 0;
+  margin-right: 8px;
+  font-size: 14px;
+  text-align: center;
+  border-radius: 20px;
+  display: inline-block;
+  line-height: 30px;
+  border: 1px solid #999;
+  color: #999;
+
+}
+.editbutt{
+  font-size: 14px;
+  color: #333333;
+}
+   .upicon{
+     text-align: center;
+     cursor: pointer;
+     margin-top: 10px;
+     margin-left: 15px;
+     font-size: 14px;
+     i{font-size: 30px;color: #ffb30f;}
+     div{color: #7b7b7b;padding: 5px 0px 10px 0px;}
+   }
+   .upicon:focus div{
+       color: #588afc;
+   }
+   .identity{
+     padding: 5px 10px;
+     border: 1px solid #fcfcfc;
+     border-radius: 8px;
+     cursor: pointer;
+     background-color: #ffffff;
+     margin: 5px;
+   }
+   .active{
+     background-color: #ffb30f;
+     color: #FFFFFF;
+      border: 1px solid #ffb30f;
+   }
+   .uc-alert{
+    margin: 10px;
+    text-align: center;
+    padding: 0px 50x;
+    .uc-alert-label{
+       color: #3f3f3f;
+    }
+    .uc-alert-value{
+      padding-top: 10px;
+       color: #aa0000;
+    }
+   }
+
+
+@media screen and (max-width: 1366px){
+  .uc-header-box {
+    width: 1160px;
+  }
+  .learningData{
+    margin-left:auto;
+    .learning-info{
+      margin-left: 10px;
+      margin-right: 10px;
+      .learning-qus{
+        font-size: 12px;
+      }
+      .learning-an{
+        font-size: 12px;
+      }
+    }
+  }
+  .personalData{
+    .uesr-avaer{
+      margin-right: 10px;
+    }
+    .user-content{
+      .content-top{
+        .grade{
+          div{
+              width: 48px;
+          }
+          span{
+            font-size: 14px;
+          }
+        }
+        h6{
+          font-size: 26px;
+        }
+        span{
+          font-size: 14px;
+          margin-left: 5px;
+          margin-right: 10px;
+        }
+        .editbutt{
+          width: 80px;
+          height: 25px;
+          line-height: 5px;
+          text-align: center;
+          font-size: 12px;
+        }
+      }
+    }
+  }
+  .content-bottom{
+    
+     .medalbutt{
+       margin-right: 20px;
+     }
+
+  }
+}
+@media screen and (max-width: 1680px) and (min-width:1367px){
+  .uc-header-box {
+    width: 1300px;
+  }
+  .learningData{
+    margin-left:auto;
+    .learning-info{
+      margin-left: 10px;
+      margin-right: 12px;
+    }
+  }
+
+  .personalData{
+    .uesr-avaer{
+      margin-right: 10px;
+    }
+    .user-content{
+      .content-top{
+        .grade{
+          div{
+              width: 48px;
+          }
+          span{
+            font-size: 14px;
+          }
+        }
+        h6{
+          font-size: 26px;
+        }
+        span{
+          font-size: 14px;
+          margin-left: 5px;
+          margin-right: 15px;
+        }
+        .editbutt{
+          width: 80px;
+          height: 25px;
+          line-height: 5px;
+          text-align: center;
+          font-size: 12px;
+        }
+      }
+    }
+  }
+}
+@media screen and (max-width: 1920px) and (min-width: 1681px){
+  .uc-header-box {
+    width: 1600px;
+  }
+  .learningData{
+    margin-left:auto;
+    .learning-info{
+      margin-left: 20px;
+      margin-right: 22px;
+    }
+  }
+}
+
+@media screen and (min-width: 1921px){
+  .uc-header-box {
+    width: 1800px;
+  }
+  .learningData{
+    margin-left:auto;
+    .learning-info{
+      margin-left: 30px;
+      margin-right: 30px;
+    }
+  }
+}
+  </style>
diff --git a/src/components/HomePage/noteList.vue b/src/components/HomePage/noteList.vue
new file mode 100644
index 00000000..1343056f
--- /dev/null
+++ b/src/components/HomePage/noteList.vue
@@ -0,0 +1,118 @@
+<template>
+    <div class="note-list">
+        <ul v-if="list.length > 0">
+            <li class="note-list-index" v-for="item in list" :key="item.id">
+                <p v-if="isDynamic" style="word-break:break-all;word-wrap:break-word;margin-bottom:18px" class="portal-summary-text">
+                  <span style="word-break:break-all;word-wrap:break-word;margin-bottom:18px" v-if="!personal || isFollow">{{item.aname}}</span>{{item.cusInfo}}
+                  <span style="margin-left:28px">{{item.eventTime}}</span>
+                  <span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right">
+                    <span v-if="item.hidden">已隐藏</span>
+                    <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
+                  </span>
+                </p>
+                <h6 style="word-break:break-all;" class="note-title-info follow-home-title pointer"><span  @click="jumpDetail(item)">{{item.contentInfo}}</span> <span style="color: #333333;font-weight: 400;font-size: 14px;margin-left: 20px;"></span>
+                    <span class="follow-hide pointer" style="float:right" v-if="(item.aid == userInfo.aid) && !isDynamic">
+                        <span v-if="item.hidden">已隐藏</span>
+                        <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
+                    </span>
+                </h6>
+                <p class="note-text" style="word-break:break-all;word-wrap:break-word;margin-bottom:18px">
+                    {{item.info.content}}
+                </p>
+                <div>
+                    <interactBar :type="6" :data="item.info" :shares="false" :views="false" :readonly="true"></interactBar>
+                </div>
+            </li>
+        </ul>
+        <div v-else class="home-no-list">
+            <img class="img" :src="`${webBaseUrl}/images/homeWu/no-note.png`" alt="" srcset="">
+            <p v-if="isFollow" class="text">暂时没有动态</p>
+            <p v-else class="text">还没有笔记</p>
+        </div>
+    </div>
+  </template>
+
+  <script>
+    import interactBar from "@/components/Portal/interactBar.vue";
+    import { toScore } from '@/utils/tools.js';
+    import { mapGetters,mapActions } from 'vuex';
+      export default{
+        name:"NoteList",
+        components: {
+          interactBar,
+          // timeShow,
+        //   author
+        },
+        props:{
+          list:{
+            type:Array,
+            default:()=>[]
+          },
+          isDynamic:{
+                type:Boolean,
+                default:false,
+            },
+          personal:{
+            type:Boolean,
+            default:false,
+          },
+          isFollow:{
+            type:Boolean,
+            default:false,
+          }
+        },
+        computed: {
+          ...mapGetters(['userInfo']),
+        },
+          data(){
+              return{
+                toScore,
+                noteList:[]
+              }
+          },
+          mounted() {
+          },
+      methods:{
+        jumpDetail(item){
+          this.$router.push('/course/detail?id='+item.info.courseId)
+        },
+        emitHide(id) {
+          this.$emit('hideIndex',id)
+        },
+         //展示全部
+         changeIsAll(item) {
+          item.isAll = !item.isAll;
+        },
+
+       }
+      }
+  </script>
+
+  <style lang="scss" scoped>
+    .note-list{
+        ul{
+            margin: 0;
+        }
+        .note-list-index{
+            padding: 30px 0;
+            border-bottom: 1px solid rgba($color: #999999, $alpha: 0.2) !important;
+            ::v-deep .interact-bar-btns{
+                .interact-bar-btn{
+                    text-align: right;
+                    min-width: 78px !important;
+                    margin-right: 0;
+                }
+            }
+        }
+        .note-title-info{
+            margin: 0;
+            margin-bottom: 16px;
+        }
+        .note-text{
+            margin-bottom: 18px;
+            font-size: 14px;
+            color: #333330;
+            line-height: 20px;
+        }
+    }
+  </style>
diff --git a/src/components/HomePage/putTo.vue b/src/components/HomePage/putTo.vue
new file mode 100644
index 00000000..9e49c5f5
--- /dev/null
+++ b/src/components/HomePage/putTo.vue
@@ -0,0 +1,118 @@
+<template>
+    <div class="put-list">
+        <ul v-if="list.length > 0">
+            <li class="put-list-index" v-for="item in list" :key="item.id">
+                <p v-if="isDynamic" class="portal-summary-text" style="margin-bottom:18px;margin-top:10px">
+                    <span v-if="!personal || isFollow">{{item.aname}}</span>{{item.cusInfo}}  
+                    <span style="margin-left:28px">{{item.eventTime}}</span> 
+                    <span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right">
+                        <span v-if="item.hidden">已隐藏</span>
+                        <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
+                    </span>
+                </p>
+                <h6 class="put-title-info follow-home-title">
+                    <span class="pointer" @click="jumpDetail(item.info)">{{item.info.title || item.contentInfo}}</span>
+                    <span class="portal-time follow-hide pointer" style="float:right" v-if="!isDynamic && personal">
+                        <span v-if="item.hidden">已隐藏</span>
+                        <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
+                    </span>
+                </h6>
+                <div class="put-footer">
+                   <div style="margin-top:20px;font-size: 14px;color: #666666;">{{item.info.answers}}个回答</div>
+                   <el-button class="btn" plain @click="jumpDetail(item.info)">去回答</el-button>
+                </div>
+            </li>
+        </ul>
+        <div v-else class="home-no-list">
+            <img class="img" style="width:204px;height:160px" :src="`${webBaseUrl}/images/homeWu/no-put.png`" alt="" srcset="">
+            <p v-if="isFollow" class="text">暂时没有动态</p>
+            <p v-else class="text">还没有提问</p>
+        </div>
+    </div>
+  </template>
+  
+  <script>
+    import interactBar from "@/components/Portal/interactBar.vue";
+    import { mapGetters,mapActions } from 'vuex';
+    // import author from "@/components/Portal/authorInfo.vue";
+      export default{
+        name:"PutList",
+        components: {
+          interactBar,
+          // timeShow,
+        //   author
+        },
+        props:{
+            list:{
+                type:Array,
+                default:()=>[]
+            },
+            isDynamic:{
+                type:Boolean,
+                default:false,
+            },
+            personal:{
+                type:Boolean,
+                default:false,
+            },
+            isFollow:{
+                type:Boolean,
+                default:false,
+            }
+        },
+        computed: {
+          ...mapGetters(['userInfo']),
+        },
+          data(){
+              return{
+                putList:[]
+              }
+          },
+      methods:{
+        emitHide(id) {
+          this.$emit('hideIndex',id)
+        },
+        jumpDetail(data) {
+                if(!data.id){
+                return;
+                }
+                this.$router.push({ path: '/qa/answer', query: { id: data.id } });
+            },
+       
+       }
+      }
+  </script>
+  
+  <style lang="scss" scoped>
+    .put-list{
+        .put-title-info{
+            margin: 0;
+        }
+        ul{
+            margin: 0;
+        }
+        .put-footer{
+            display: flex;
+            justify-content: space-between;
+            margin-top: 24px;
+            .btn{
+                width: 140px;
+                height: 40px;
+            }
+            .el-button{
+                border: 1px solid #3379FB;
+                border-radius: 4px;
+                color: #3379FB;
+            }
+        }
+        .put-list-index{
+            padding: 40px 0 36px 0;
+            border-bottom: 1px solid rgba($color: #999999, $alpha: 0.2);
+            &:first-child{
+                padding-top: 20px;
+            }
+        }
+    }
+  
+  </style>
+  
\ No newline at end of file
diff --git a/src/components/ImageUpload/artimgUpload.vue b/src/components/ImageUpload/artimgUpload.vue
new file mode 100644
index 00000000..83baab8e
--- /dev/null
+++ b/src/components/ImageUpload/artimgUpload.vue
@@ -0,0 +1,235 @@
+<template>
+  <div class="component-upload-image" :style="`width:${width};height:${height};`"> 
+    <el-upload
+       drag
+      :action="uploadImgUrl"
+      class="image-upload"
+      list-type="picture-card"
+      :disabled="disabled"
+      :on-success="handleUploadSuccess"
+      :on-progress="handleProgress"
+      :before-upload="handleBeforeUpload"
+      :on-error="handleUploadError"
+      :accept="accept"
+      name="file"
+      :data="data"
+      :show-file-list="false"
+      :headers="headers"
+      style="display: inline-block;">
+      <el-image v-if="!value" :src="value" :style="`width:${width};height:${height};`">
+        <div slot="error" class="image-slot">
+           <i class="el-icon-upload"></i>
+  <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+  <div class="el-upload__tip" slot="tip">只能上传jpg/png/bmp/jpeg文件，且不超过500kb</div>
+        </div>
+      </el-image>
+      <div v-else class="image" :style="`width:${width};height:${height};`">
+        <el-image :src="value" :style="`width:${width};height:${height};`" fit="fill"/>
+        <div class="mask" :style="`width:${width};height:${height};`">
+          <div class="actions" :style="`line-height:${height};`">
+            <span title="预览" @click.stop="dialogVisible = true">
+              <i class="el-icon-zoom-in" />
+            </span>
+            <span title="移除" @click.stop="removeImage">
+              <i class="el-icon-delete" />
+            </span>
+          </div>
+        </div>
+      </div>
+    </el-upload>
+    <el-dialog :visible.sync="dialogVisible" title="预览" width="800" append-to-body>
+      <img :src="value" style="display: block; max-width: 100%; margin: 0 auto;">
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import * as imageConversion from 'image-conversion';
+import { getToken } from "@/utils/token";
+export default {
+  data() {
+    return {
+      dialogVisible: false,
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/xboe/sys/xuploader/file/upload", // 上传的图片服务器地址
+      headers: {
+        'XBOE-Access-Token': getToken(),
+      },
+      data:{
+        dir:this.dir
+      }
+    };
+  },
+  props: {
+    text:{
+      type:String,
+      default:'上传图片'
+    },
+    disabled:{
+      type:Boolean,
+      default:false
+    },
+    height:{
+      type:String,
+      default:'150px'
+    },
+    width:{
+      type:String,
+      default:'150px'
+    },
+    dir:{
+      type:String,
+      default:''
+    },
+    accept:{
+      type:String,
+      default:'.png,.jpg,.gif,.jpeg,.bmp'
+    },
+    value: {
+      type: String,
+      default: "",
+    },
+    // 值为  10MB  500KB 等有MB或KB后缀的形式
+    fileSizeLimit:{
+      type: String,
+      default: '10MB',
+    },
+    // 按比率压缩，优先于按大小
+    compress:{
+      type: Number,
+      default: 1,
+    },
+    // 按大小压缩
+    compressAccurately:{
+      type: Number,
+      default: null,
+    },
+  },
+  methods: {
+    removeImage() {
+      this.$emit("remove",this.value);
+    },
+    handleUploadSuccess(res) {
+      this.$emit("success", res);
+      this.loading.close();
+    },
+    handleProgress(event, file, fileList){
+      this.loading = this.$loading({
+        lock: true,
+        text: "上传中",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+    },
+    endWith(str,endStr){
+      var d=str.length-endStr.length;
+      return (d>=0&&str.lastIndexOf(endStr)==d);
+    },
+    handleBeforeUpload(file) {
+      let that = this;
+      return new Promise((resolve, reject) => {
+        let sizeLimt = 0;
+        if(this.fileSizeLimit){
+          let size = parseInt(this.fileSizeLimit.substring(0,this.fileSizeLimit.length - 2));
+          if(typeof size === 'number' && !isNaN(size)){
+            if(that.endWith(this.fileSizeLimit,"MB")){
+              sizeLimt = size * 1024 * 1024;
+            }else if(that.endWith(this.fileSizeLimit,"KB")){
+              sizeLimt = size * 1024;
+            }
+          }          
+        }
+        if (sizeLimt > 0 && file.size > sizeLimt) {
+          that.$message.error("图片不能超过"+this.fileSizeLimit+",请重新上传！")
+          reject(file)
+        }
+        // 小于1表示需要压缩
+        if(that.compress < 1){
+          imageConversion.compress(file,that.compress).then(res=>{
+            resolve(res);
+          })
+        }else{
+          if(that.compressAccurately){
+            imageConversion.compressAccurately(file, that.compressAccurately).then(res => {
+              resolve(res)
+            })
+          }
+        }
+        resolve(file)
+      })      
+    },
+    handleUploadError() {
+      this.$message({
+        type: "error",
+        message: "上传失败",
+      });
+      this.loading.close();
+    },
+  },
+  watch: {},
+};
+</script>
+
+<style scoped lang="scss">
+ ::v-deep .el-upload-dragger{
+  width: 100% !important;
+  height: 100% !important;
+}
+  .image-upload{
+    width: 410px;
+    height: 168px;
+  }
+  .image-card .el-upload--picture-card,.image-card .el-upload-list--picture-card .el-upload-list__item{
+      background-color: #fbfdff;
+      border: 1px dashed #c0ccda;
+      border-radius: 6px;
+      box-sizing: border-box;
+      vertical-align: top;
+  }
+.el-upload--picture-card {
+    background-color: #fbfdff;
+    border: 1px dashed #c0ccda;
+    border-radius: 6px;
+    box-sizing: border-box;
+    vertical-align: top;
+    line-height: 100%;
+}
+  .image-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  image-uploader .el-upload--picture-card{
+    width: 100%;
+  }
+  image-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .image-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    text-align: center;
+    margin-top: 50px;
+    display: block;
+  }
+  .icon-text{
+    font-size: 14px;
+    display: block;
+    height: 30px;
+    line-height: 35px;
+  }
+.image {
+  position: relative;
+  .mask {
+    opacity: 0;
+    position: absolute;
+    top: 0;
+    width: 100%;
+    background-color: rgba(0, 0, 0, 0.5);
+    transition: all 0.3s;
+  }
+  &:hover .mask {
+    opacity: 1;
+  }
+}
+</style>
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 32e91d8e..69fbf029 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -15,6 +15,7 @@
       :show-file-list="false"
       :headers="headers"
       style="display: inline-block; vertical-align: top;">
+     
       <el-image v-if="!value" :src="value" :style="`width:${width};height:${height};`">
         <div slot="error" class="image-slot" :style="`line-height:${height};`">
           <i class="el-icon-plus" />
diff --git a/src/components/NoteUpload/index.vue b/src/components/NoteUpload/index.vue
new file mode 100644
index 00000000..8460c8ad
--- /dev/null
+++ b/src/components/NoteUpload/index.vue
@@ -0,0 +1,268 @@
+<template>
+    <div class="upload-file">
+      <!-- <el-upload
+        :action="uploadFileUrl"
+        :before-upload="handleBeforeUpload"
+        :file-list="fileList"
+        :limit="limit"
+        :multiple="limit>1"
+        :on-error="handleUploadError"
+        :on-exceed="handleExceed"
+        :on-success="handleUploadSuccess"
+        :show-file-list="showList"
+        :data="data"
+        :headers="headers"
+        class="upload-file-uploader"
+        ref="upload"
+      >
+        <el-button :icon="loading ? 'el-icon-upload2':''" :size="size" type="primary" :loading="isLoading">{{text}}</el-button>
+        <div class="el-upload__tip" slot="tip" v-if="showTip">
+          请上传
+          <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
+          <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+          的文件
+        </div>
+      </el-upload> -->
+      <el-upload
+        ref="myUpload"
+        class="upload-demo"
+        drag
+        :multiple="limit>1"
+        :action="uploadFileUrl"
+        :before-upload="handleBeforeUpload"
+        :on-success="handleUploadSuccess"
+        :show-file-list="showList"
+        :on-error="handleUploadError"
+        :on-exceed="handleExceed"
+        :on-remove="handleUploadRemove"
+        :data="data"
+        :headers="headers"
+        :limit="limit">
+        <svg-icon style="font-size:52px;margin-right:5px;margin-top:20px" icon-class="up-char"></svg-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip" slot="tip">支持拓展名：支持扩展名：<span v-for="ty in fileType">{{ty}}  </span> <span v-if="limit > 1">图片支持批量上传，最多9张</span></div>
+    </el-upload>
+  
+      <!-- 文件列表 -->
+      <!-- <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+        <li :key="file.uid" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in list">
+          <el-link :href="file.url" :underline="false" target="_blank">
+            <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
+          </el-link>
+          <div class="ele-upload-list__item-content-action">
+            <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
+          </div>
+        </li>
+      </transition-group> -->
+    </div>
+  </template>
+  
+  <script>
+  import { getToken } from "@/utils/token";
+  export default {
+    props: {
+      // 值
+      value: [String, Object, Array],
+      showList: {
+        type: Boolean,
+        default: false
+      },
+      url:{
+        type: String,
+        default: '/xboe/sys/xuploader/file/upload'
+      },
+      limit:{
+        type:Number,
+        default:1
+      },
+      dir:{
+        type:String,
+        default:'files'
+      },
+      text:{
+        type:String,
+        default:'选择文件并上传'
+      },
+      size:{
+        type:String,
+        default:'small'
+      },
+      // 大小限制(MB)
+      fileSize: {
+        type: Number,
+        default: 1024,
+      },
+      // 文件类型, 例如['png', 'jpg', 'jpeg']
+      fileType: {
+        type: Array,
+        default: () => ["doc", "xls", "ppt","docx", "xlsx", "pptx","png","txt", "pdf","jpg","gif","bmp","mp4","mp3"],
+      },
+      // 是否显示提示
+      isShowTip: {
+        type: Boolean,
+        default: true
+      },
+      loading: {
+        type: Boolean,
+        default: false
+      },
+      isClear:{
+        type: Boolean,
+        default: false
+      }
+    },
+    data() {
+      return {
+        uploadFileUrl: process.env.VUE_APP_BASE_API + this.url, // 上传的图片服务器地址
+        headers: {
+          'XBOE-Access-Token': getToken(),
+        },
+        isLoading:false,
+        fileList: [],
+        data:{
+          dir:this.dir
+        }
+      };
+    },
+    watch: {
+      isClear(val) {
+        if(!val) {
+           this.clearFiles();
+        }
+      }
+    },
+    computed: {
+      // 是否显示提示
+      showTip() {
+        return this.isShowTip && (this.fileType || this.fileSize);
+      },
+      // 列表
+      list() {
+        let temp = 1;
+        if (this.value) {
+          // 首先将值转为数组
+          const list = Array.isArray(this.value) ? this.value : [this.value];
+          // 然后将数组转为对象数组
+          return list.map((item) => {
+            if (typeof item === "string") {
+              item = { name: item, url: item };
+            }
+            item.uid = item.uid || new Date().getTime() + temp++;
+            return item;
+          });
+        } else {
+          this.fileList = [];
+          return [];
+        }
+      },
+    },
+    methods: {
+      clearFiles() {
+        this.$refs["myUpload"].clearFiles();
+      },
+        handleUploadRemove(file) {
+            this.$emit("remove",file);
+        },
+      // 上传前校检格式和大小
+      handleBeforeUpload(file) {
+        // 校检文件类型
+        if (this.fileType) {
+          let fileExtension = "";
+          if (file.name.lastIndexOf(".") > -1) {
+            fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
+          }
+          const isTypeOk = this.fileType.some((type) => {
+            if (file.type.indexOf(type) > -1) return true;
+            if (fileExtension && fileExtension.indexOf(type) > -1) return true;
+            return false;
+          });
+          if (!isTypeOk) {
+            //this.$message.error(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
+            this.$message({message:`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`,type:'error',offset:100})
+            //this.$message.error(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
+            return false;
+          }
+        }
+        // 校检文件大小
+        if (this.fileSize) {
+          const isLt = file.size / 1024 / 1024 < this.fileSize;
+          if (!isLt) {
+            this.$message({message:`上传文件大小不能超过 ${this.fileSize} MB!`,type:'error',offset:100})
+            //this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`);
+            return false;
+          }
+        }
+        if(this.loading) {
+          this.isLoading = true;
+        }
+        return true;
+      },
+      // 文件个数超出
+      handleExceed(res) {
+        this.$message({message:`只允许上传单个文件`,type:'error',offset:100});
+      },
+      // 上传失败
+      handleUploadError(err) {
+        this.isLoading = false;
+        this.$message({message:"上传失败, 请重试",type:'error',offset:100});
+      },
+      // 上传成功回调
+      handleUploadSuccess(res, file) {
+        if(res.status == 200) {
+          this.fileList = [];
+          this.isLoading = false;
+          this.$message({message:"上传成功",type:'success',offset:100});
+        } else {
+          this.isLoading = false;
+          this.fileList = [];
+          this.$message({message:"上传失败",type:'error',offset:100});
+        }
+        this.$emit("success", res);
+      },
+      // 删除文件
+      handleDelete(index) {
+        this.fileList.splice(index, 1);
+        this.$emit("remove", '');
+      },
+      // 获取文件名称
+      getFileName(name) {
+        if (name.lastIndexOf("/") > -1) {
+          return name.slice(name.lastIndexOf("/") + 1).toLowerCase();
+        } else {
+          return "";
+        }
+      }
+    },
+    created() {
+      this.fileList = this.list;
+    },
+  };
+  </script>
+  
+  <style scoped lang="scss">
+.el-upload__tip{
+      margin-top: 10px;
+      text-align: center;
+    }
+  .upload-file-uploader {
+    margin-bottom: 5px;
+  }
+  .upload-file-list .el-upload-list__item {
+    border: 1px solid #e4e7ed;
+    line-height: 2;
+    margin-bottom: 10px;
+    position: relative;
+   
+  }
+  .upload-file-list .ele-upload-list__item-content {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    color: inherit;
+   
+  }
+  .ele-upload-list__item-content-action .el-link {
+    margin-right: 10px;
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/src/components/Portal/artauthor.vue b/src/components/Portal/artauthor.vue
new file mode 100644
index 00000000..a3371338
--- /dev/null
+++ b/src/components/Portal/artauthor.vue
@@ -0,0 +1,171 @@
+<template>
+	<div class="item-author">
+		<div style="width:40px;height:40px;" @click="toHome()">
+      <!-- <el-avatar shape="square" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar> -->
+      <!-- <div v-else class="uavatar"><span class="uavatar-text">{{avatarText}}</span></div> -->
+      <el-avatar :size="40"  shape="circle"  :src="userAvatar" v-if="userAvatar"></el-avatar>
+      <div v-else class="uavatar">
+        <div v-if="sex == null" style="border-radius: 50%;width: 40px;height: 40px;"></div>
+        <div  v-else>
+          <div class="mravat" v-if="sex === 1 "><img style="width:40px;height:40px;vertical-align: bottom;" src="../../../public/images/Avatarman.png" alt=""></div>
+           <div class="mravat" v-else><img style="width:40px;height:40px;vertical-align: bottom;" src="../../../public/images/Avatarwoman.png" alt=""></div>
+        </div>
+        </div>
+    </div>
+	<div class="author-right" v-if="!onlyAvatar" style="padding-left: 14px;font-size: 14px;">
+        <div>
+             <span style="color: #333333;font-weight: 400;font-size: 16px;">{{userName}}</span>
+             <span class="author-text" v-if="userInfo && userInfo!=''">({{userInfo}})</span>
+        </div>
+       <span class="autname">{{ usersign }}</span>
+    </div>
+	</div>
+</template>
+<script>
+  import {cutOrgNamePath} from "@/utils/tools.js";
+	export default {
+		props:{
+			avatar:{
+				type:String,
+				default:''
+			},
+      width:{
+        type:String,
+				default:'200px'
+      },
+      sex:{
+       	type:Number,
+      },
+	 name:{
+				type:String,
+				default:''
+		},
+    sign:{
+				type:String,
+				default:''
+		},
+
+      aid:{
+				type:String,
+				default:''
+			},
+			info:{
+				type:String,
+				default:''
+			},
+      onlyAvatar:{
+        type:Boolean,
+        default:false
+      }
+		},
+    data(){
+    	return {
+          baseUrl:process.env.VUE_APP_FILE_BASE_URL,
+          userAvatar:'',
+          userName:'',
+          userInfo:'',
+          usersex:null,
+          usersign:'',
+    	}
+    },
+    created() {
+      // this.userAvatar=require("@/assets/images/user/default.png");
+    },
+    mounted() {
+      this.userName=this.name;
+      if(this.avatar && this.avatar!=''){
+        this.userAvatar=this.avatar;
+      }
+      this.userInfo=cutOrgNamePath(this.info);
+      this.usersex = this.sex;
+      this.usersign = this.sign;
+    },
+    methods:{
+      toHome() {
+        // ,query:{id:item.objId || item.id}
+        if(this.aid){
+          this.$router.push({path:this.$xpage.getHomePath(this.aid)})
+        }else{
+          this.$message.error("参数错误");
+        }
+
+      }
+    },
+    watch:{
+      name(newVal,oldVal){
+        this.userName=newVal;
+      },
+      sign(newVal,oldVal){
+        this.usersign=newVal;
+      },
+      avatar(newVal,oldVal){
+        if(newVal){
+          this.userAvatar=this.baseUrl+newVal;
+        }
+      },
+      aid(newVal,oldVal){
+        if(newVal){
+          this.aid=newVal;
+        }
+      },
+      sex(newVal,oldVal){
+        this.usersex=newVal;
+      },
+      info(newVal,oldVal){
+        if(newVal){
+          this.userInfo=cutOrgNamePath(newVal);
+        }
+        
+      }
+    }
+	}
+</script>
+
+<style scoped lang="scss">
+
+.mravat{
+    width: 40px;
+    height: 40px;
+    img{
+        width: 100%;
+        height: 100%;
+    }
+}
+    .autname{
+       color: #666666;
+       font-size: 14px;
+       font-weight: 400;
+       line-height: 25px;
+    }
+
+	.item-author{
+		// font-size: 0.9em;
+    line-height: 18px;
+		display: flex;
+    .author-text{
+      font-size: 12px;
+      color: #999999;
+      font-weight: 300;
+      margin-left: 10px;
+    }
+    .uavatar{
+      // border: 1px solid #73adfe;
+    //   width: 28px;
+    //   height: 28px;
+      // background: #d9e9ff;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .uavatar-text{
+        transform: scale(0.8);
+        font-size: 12px;
+        color: #73adfe;
+      }
+      img{
+        border-radius: 50%;
+         width: 28px;
+      height: 28px;
+      }
+    }
+	}
+</style>
diff --git a/src/components/Portal/author.vue b/src/components/Portal/author.vue
index 496288fc..a7f183ae 100644
--- a/src/components/Portal/author.vue
+++ b/src/components/Portal/author.vue
@@ -11,6 +11,7 @@
 	</div>
 </template>
 <script>
+  import {cutOrgNamePath} from "@/utils/tools.js";
 	export default {
 		props:{
 			data:{
@@ -63,7 +64,7 @@
         if(this.data.avatar && this.data.avatar!=''){
           this.userAvatar=this.data.avatar;
         }
-        this.userInfo=this.data.info;
+        this.userInfo=cutOrgNamePath(this.data.info);
         this.usersex=this.data.sex
       }
     }
diff --git a/src/components/Portal/authorImg.vue b/src/components/Portal/authorImg.vue
new file mode 100644
index 00000000..e5a385ca
--- /dev/null
+++ b/src/components/Portal/authorImg.vue
@@ -0,0 +1,128 @@
+<template>
+	<div class="item-author">
+		<div :style="`width:${width};height:${height};`" @click="toHome()">
+            <el-avatar shape="circle" :src="userAvatar" v-if="userAvatar"></el-avatar>
+            <div v-else class="uavatar">
+                <div v-if="sex == null" style="border-radius: 50%;" :style="`width:${width};height:${height};`"></div>
+                <div v-else>
+                    <div v-if="sex === 1 "><img :src="`${webBaseUrl}/images/Avatarman.png`" alt=""></div>
+                    <div v-else><img :src="`${webBaseUrl}/images/Avatarwoman.png`" alt=""></div>
+                </div>
+            </div>
+        </div>
+	</div>
+</template>
+<script>
+	export default {
+		props:{
+			avatar:{
+				type:String,
+				default:''
+			},
+      width:{
+        type:String,
+				default:'40px'
+      },
+      height:{
+        type:String,
+				default:'40px'
+      },
+      sex:{
+       	type:Number,
+      },
+      aid:{
+	  	type:String,
+	  	default:''
+	  },
+    noJump:{
+      type:Boolean,
+			default: true
+    }
+		},
+    data(){
+    	return {
+          baseUrl:process.env.VUE_APP_FILE_BASE_URL,
+          userAvatar:'',
+          userName:'',
+          usersex:null,
+    	}
+    },
+    created() {
+      // this.userAvatar=require("@/assets/images/user/default.png");
+    },
+    mounted() {
+      this.userName=this.name;
+      this.usersex = this.sex;
+      if(this.avatar){
+        if(this.avatar.startsWith('http')){
+          this.userAvatar=this.avatar;
+        }else{
+          this.userAvatar=this.baseUrl+this.avatar;
+        }
+      }
+      //console.log(this.usersex)
+      
+    },
+    methods:{
+      toHome() {
+        // ,query:{id:item.objId || item.id}
+        if(this.noJump) {
+          this.$router.push({path:this.$xpage.getHomePath(this.aid)})
+        }
+        
+      }
+    },
+    watch:{
+      name(newVal,oldVal){
+        this.userName=newVal;
+      },
+      avatar(newVal,oldVal){
+        if(newVal){
+          if(newVal.startsWith('http')){
+            this.userAvatar=newVal;
+          }else{
+            this.userAvatar=this.baseUrl+newVal;
+          }
+        }
+      },
+      aid(newVal,oldVal){
+        this.aid=newVal
+      },
+      sex(newVal,oldVal){
+        this.usersex=newVal;
+      },
+    }
+	}
+</script>
+
+<style scoped lang="scss">
+	.item-author{
+		// font-size: 0.9em;
+    line-height: 18px;
+		display: flex;
+    .author-text{
+      font-size: 12px;
+      color: #666666;
+      margin-left: 4px;
+    }
+    .uavatar{
+      // border: 1px solid #73adfe;
+      width: 100%;
+      height: 100%;
+      // background: #d9e9ff;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .uavatar-text{
+        transform: scale(0.8);
+        font-size: 12px;
+        color: #73adfe;
+      }
+      img{
+        border-radius: 50%;
+         width: 100%;
+         height: 100%;
+      }
+    }
+	}
+</style>
diff --git a/src/components/Portal/authorInfo.vue b/src/components/Portal/authorInfo.vue
index a6cd938b..822246f1 100644
--- a/src/components/Portal/authorInfo.vue
+++ b/src/components/Portal/authorInfo.vue
@@ -1,25 +1,25 @@
 <template>
 	<div class="item-author">
-		<div style="width:28px;height:28px;">
+		<div  @click="toHome()">
       <!-- <el-avatar shape="square" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar> -->
       <!-- <div v-else class="uavatar"><span class="uavatar-text">{{avatarText}}</span></div> -->
       <el-avatar shape="circle" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar>
       <div v-else class="uavatar">
-        <div v-if="sex == null" style="border-radius: 50%;width: 28px;height: 28px;"></div>
+        <div v-if="sex == null" style="border-radius: 50%;width: 40px;height: 40px;"></div>
         <div v-else>
           <div v-if="sex === 1 "><img src="../../../public/images/Avatarman.png" alt=""></div>
            <div v-else><img src="../../../public/images/Avatarwoman.png" alt=""></div>
         </div>
         </div>
     </div>
-		<div v-if="!onlyAvatar" style="padding-left: 5px;padding-top: 6px;font-size: 14px;color: #666666;">
-      <span>{{userName}}</span>
+		<div v-if="!onlyAvatar" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
+      <span style="color: #333333;font-weight: 600;font-size: 16px;">{{userName}}</span>
       <span class="author-text" v-if="userInfo && userInfo!=''">({{userInfo}})</span>
     </div>
 	</div>
 </template>
 <script>
-import { userAvatarText } from "@/utils/tools.js";
+  import {cutOrgNamePath} from "@/utils/tools.js";
 	export default {
 		props:{
 			avatar:{
@@ -37,6 +37,10 @@ import { userAvatarText } from "@/utils/tools.js";
 				type:String,
 				default:''
 			},
+      aid:{
+				type:String,
+				default:''
+			},
 			info:{
 				type:String,
 				default:''
@@ -63,9 +67,20 @@ import { userAvatarText } from "@/utils/tools.js";
       if(this.avatar && this.avatar!=''){
         this.userAvatar=this.avatar;
       }
-      this.userInfo=this.info;
+      this.userInfo=cutOrgNamePath(this.info);
       this.usersex = this.sex;
     },
+    methods:{
+      toHome() {
+        // ,query:{id:item.objId || item.id}
+        if(this.aid){
+          this.$router.push({path:this.$xpage.getHomePath(this.aid)})
+        }else{
+          this.$message.error("参数错误");
+        }
+
+      }
+    },
     watch:{
       name(newVal,oldVal){
         this.userName=newVal;
@@ -75,28 +90,20 @@ import { userAvatarText } from "@/utils/tools.js";
           this.userAvatar=this.baseUrl+newVal;
         }
       },
+      aid(newVal,oldVal){
+        if(newVal){
+          this.aid=newVal;
+        }
+      },
       sex(newVal,oldVal){
         this.usersex=newVal;
       },
       info(newVal,oldVal){
-        this.userInfo=newVal;
+        if(newVal){
+          this.userInfo=cutOrgNamePath(newVal);
+        }
       }
-    },
-    computed:{
-			avatarText(){
-				return userAvatarText(this.userName);
-			}
-		},
-    // computed:{
-    //   headImag(){
-    //     if(this.avatar || this.avatar==null || this.avatar==''){
-    //       return require("@/assets/images/user/default.png");
-    //     }else{
-    //       return this.baseUrl+this.avatar;
-    //     }
-    //   }
-    // }
-
+    }
 	}
 </script>
 
@@ -106,12 +113,14 @@ import { userAvatarText } from "@/utils/tools.js";
     line-height: 18px;
 		display: flex;
     .author-text{
-      color: #666666;
+      font-size: 12px;
+      color: #999999;
+      font-weight: 300;
       margin-left: 4px;
     }
     .uavatar{
       // border: 1px solid #73adfe;
-      width: 28px; 
+      width: 28px;
       height: 28px;
       // background: #d9e9ff;
       display: flex;
diff --git a/src/components/Portal/commentAuthor.vue b/src/components/Portal/commentAuthor.vue
new file mode 100644
index 00000000..4a108386
--- /dev/null
+++ b/src/components/Portal/commentAuthor.vue
@@ -0,0 +1,189 @@
+<template>
+	<div class="item-author">
+        <el-tooltip :content="userInfo" placement="top" effect="light">
+            <div style="width:40px;height:40px;" @click="toHome()">
+                <el-avatar :size="40"  shape="circle"  :src="userAvatar" v-if="userAvatar"></el-avatar>
+                <div v-else class="uavatar">
+                    <div v-if="sex == null" style="border-radius: 50%;width: 40px;height: 40px;"></div>
+                    <div  v-else>
+                        <div class="mravat" v-if="sex === 1 "><img style="width:40px;height:40px;" src="../../../public/images/Avatarman.png" alt=""></div>
+                        <div class="mravat" v-else><img style="width:40px;height:40px;" src="../../../public/images/Avatarwoman.png" alt=""></div>
+                    </div>
+                </div>
+            </div>
+        </el-tooltip>
+   
+	<div class="author-right-infoName" v-if="!onlyAvatar" style="padding-left: 14px;font-size: 14px;">
+        <div>
+             <span style="color: #333333;font-weight: 400;font-size: 16px;">{{userName}}</span>
+             <el-tooltip :content="usersign" placement="top" effect="light" :disabled="usersign.length<10">
+               <span class="autname">{{handleInfo(usersign)}}</span>
+            </el-tooltip>
+             <!-- <span class="author-text" v-if="userInfo && userInfo!=''">({{userInfo}})</span> -->
+        </div>
+       
+    </div>
+	</div>
+</template>
+<script>
+  import {cutOrgNamePath} from "@/utils/tools.js";
+	export default {
+		props:{
+			avatar:{
+				type:String,
+				default:''
+			},
+      width:{
+        type:String,
+				default:'200px'
+      },
+      sex:{
+       	type:Number,
+      },
+	 name:{
+				type:String,
+				default:''
+		},
+    sign:{
+				type:String,
+				default:''
+		},
+
+      aid:{
+				type:String,
+				default:''
+			},
+			info:{
+				type:String,
+				default:''
+			},
+      onlyAvatar:{
+        type:Boolean,
+        default:false
+      }
+		},
+    data(){
+    	return {
+          baseUrl:process.env.VUE_APP_FILE_BASE_URL,
+          userAvatar:'',
+          userName:'',
+          userInfo:'',
+          usersex:null,
+          usersign:'',
+    	}
+    },
+    created() {
+      // this.userAvatar=require("@/assets/images/user/default.png");
+    },
+    mounted() {
+      this.userName=this.name;
+      if(this.avatar && this.avatar!=''){
+        this.userAvatar=this.avatar;
+      }
+      this.userInfo=cutOrgNamePath(this.info);
+      this.usersex = this.sex;
+      this.usersign = this.sign;
+    },
+    methods:{
+        handleInfo(info) {
+          let sign = '';
+          if(info.length > 10) {
+            sign = info.substring(0,10) + '...';
+          } else {
+            sign = info;
+          }
+          return sign;
+        },
+      toHome() {
+        // ,query:{id:item.objId || item.id}
+        if(this.aid){
+          this.$router.push({path:this.$xpage.getHomePath(this.aid)})
+        }else{
+          this.$message.error("参数错误");
+        }
+
+      }
+    },
+    watch:{
+      name(newVal,oldVal){
+        this.userName=newVal;
+      },
+      sign(newVal,oldVal){
+        this.usersign=newVal;
+      },
+      avatar(newVal,oldVal){
+        if(newVal){
+          this.userAvatar=this.baseUrl+newVal;
+        }
+      },
+      aid(newVal,oldVal){
+        if(newVal){
+          this.aid=newVal;
+        }
+      },
+      sex(newVal,oldVal){
+        this.usersex=newVal;
+      },
+      info(newVal,oldVal){
+        if(newVal){
+          this.userInfo=cutOrgNamePath(newVal);
+        }
+        
+      }
+    }
+	}
+</script>
+
+<style scoped lang="scss">
+
+.mravat{
+    width: 40px;
+    height: 40px;
+    img{
+        width: 100%;
+        height: 100%;
+    }
+}
+.author-right-infoName{
+    height: 40px;
+    line-height: 40px;
+}
+    .autname{
+       color: #666666;
+       font-size: 12px;
+       font-weight: 400;
+       line-height: 25px;
+       margin-left: 5px;
+    }
+
+	.item-author{
+		// font-size: 0.9em;
+    line-height: 18px;
+		display: flex;
+    .author-text{
+      font-size: 12px;
+      color: #999999;
+      font-weight: 300;
+      margin-left: 10px;
+    }
+    .uavatar{
+      // border: 1px solid #73adfe;
+    //   width: 28px;
+    //   height: 28px;
+      // background: #d9e9ff;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .uavatar-text{
+        transform: scale(0.8);
+        font-size: 12px;
+        color: #73adfe;
+      }
+      img{
+        border-radius: 50%;
+         width: 28px;
+      height: 28px;
+      }
+    }
+	}
+</style>
diff --git a/src/components/Portal/comments.vue b/src/components/Portal/comments.vue
index 19c57bb5..5602f3a4 100644
--- a/src/components/Portal/comments.vue
+++ b/src/components/Portal/comments.vue
@@ -1,32 +1,23 @@
 <template>
   <!--评论组件-->
   <div class="comments">
-      <div v-if="showTop" class="comments-top">
+      <!-- <div v-if="showTop" class="comments-top">
           <div class="comments-top-left">评论 <span style="color: #797979;">{{total}}条</span>
               <el-checkbox v-if="objType ==2" class="btn" v-model="value" type="primary">只看作者</el-checkbox>
-              <!-- <el-checkbox v-if="objType ==3" class="btn" v-model="value" type="primary">{{value?'查看所有':'只看案主 @案主可以给他发私信哦'}}</el-checkbox> -->
-                <!-- <el-radio-group class="btn" v-if="objType ==3" v-model="radio">
-                  <el-radio v-show="radio == 2" :label="1">查看所有</el-radio>
-                  <el-radio v-show="radio == 1" :label="2">只看案主 @案主可以给他发私信哦</el-radio>
-                </el-radio-group> -->
               <el-checkbox v-if="objType ==3" class="btn" v-model="value" type="primary">{{'只看案主'}}</el-checkbox>
               <span v-if="objType ==3" class="anzhu"> @案主可以给他发私信哦</span>
-              <!-- <span v-if="objType ==3"><span v-if="value" @click="value = true">查看所有</span><span v-if="!value" @click="value = false">只看案主 @案主可以给他发私信哦</span></span> -->
           </div>
-          <!-- <div class="comments-top-right" v-if="objType !==2">
-              <span @click="showList(false)" v-if="listShow">收起<i class="el-icon-arrow-down"></i></span>
-              <span @click="showList(true)" v-else >打开<i class="el-icon-arrow-up"></i></span>
-          </div> -->
+      </div> -->
+        <div v-if="showTop" class="comments-top">
+          <div class="comments-top-left portal-title-tow" style="font-size: 18px;"> <span v-if="objType ==3">案例评论</span> <span v-if="objType ==2">文章评论</span>
+              <el-checkbox v-if="objType ==2" class="btn" v-model="value" type="primary">只看作者</el-checkbox>
+              <el-checkbox v-if="objType ==3" class="btn" v-model="value" type="primary">{{'只看案主'}}</el-checkbox>
+              <span v-if="objType ==3" class="anzhu">@案主可以给他发私信哦</span>
+          </div>
       </div>
       <div class="comments-input" v-if="!readonly">
       <div class="grid-content bg-purple">
         <div style="position: relative !important" class="at-min">
-          <!-- <el-popover placement="top" width="300" trigger="click">
-                          <el-radio-group v-model="teacherInfo">
-                            <el-radio-button class="reference-tag" v-for="item in teachers" :key="item.id" :label="item.teacherName"></el-radio-button>
-                          </el-radio-group>
-                        <el-tag ref="tag" slot="reference"></el-tag>
-                      </el-popover> -->
           <el-popover placement="top-start"  width="160" v-model="visible">
             <p style="margin-bottom: 10px">请选择要@的老师</p>
 
@@ -39,19 +30,13 @@
                   :label="item.aid">{{ item.name }}</el-radio-button>
               </el-radio-group>
             </div>
-
-            <!-- <div style="text-align: right; margin: 0">
-                    <el-button size="mini" type="text" @click="cancelTeacher()">取消</el-button>
-                    <el-button type="primary"  >确定</el-button>
-                  </div> -->
             <el-tag ref="tag" slot="reference" class="tag-block"></el-tag>
           </el-popover>
         </div>
         <div style="width:100%;display:flex;">
           <div style="flex: 1;">
-             <!-- type="textarea"
-              :row="1" -->
             <el-input
+             style="line-height:45px"
               v-if="objType  !==3"
               :autosize="{ minRows: 2, maxRows: 2 }"
               type="textarea"
@@ -59,7 +44,7 @@
               show-word-limit
               v-model="inputValue"
               maxlength="800"
-              placeholder="写下您的评论(800字以内)，可以@作者哦～"
+              placeholder="写评论～"
             ></el-input>
             <el-input
             v-if="objType ==3"
@@ -69,17 +54,18 @@
               show-word-limit
               v-model="inputValue"
               maxlength="800"
-              placeholder="写下您的评论(800字以内)，可以@案主哦～"
+              placeholder="写下您的评论～"
             ></el-input>
 
 
           </div>
           <div style="width: 90px;display: flex;justify-content: flex-end;">
-            <el-button @click="submit()" style="height: 48px" type="primary">发布</el-button>
+            <el-button class="publish-button" @click="submit()" style="height: 30px;" type="primary">发布</el-button>
           </div>
         </div>
       </div>
     </div>
+
       <!--列表内容-->
       <div class="comments-items" v-show="listShow">
           <!--一个评论-->
@@ -87,27 +73,31 @@
           <div class="comment" v-for="(com,comIdx) in list" :key="com.id">
                <div class="comment-top">
                   <div class="comment-author">
-                      <authorInfo :avatar="com.avatar" :name="com.sysCreateBy" :sex="com.sex"></authorInfo>
-                  </div>
-                  <div class="comment-time">
-                      <showTime :time="com.sysCreateTime"></showTime>
+                      <authorInfo  :aid="com.sysCreateAid" :avatar="com.avatar" :name="com.sysCreateBy"  :sex="com.sex" :info="com.orgInfo" :sign="com.sign"></authorInfo>
+                     <!-- <span class="signtext">{{ com.sign }}</span>  -->
                   </div>
                </div>
                <div class="comment-body" >
                     <div class="comment-info" @mouseover="showButtons(com.id)" @mouseout="hideButtons()">
                       <div class="comment-content" @click="cancelReply()">
-                          <span style="color: #303133" v-html="displayAll(com)"></span>
+                          <span class="portal-summary-text" style="color: #333333;text-indent:0px;" v-html="displayAll(com)"></span>
                           <span v-if="com.content.length>170" @click="changeIsAll(com)">
                             {{com.isAll?'收起':'全文'}}
                           </span>
                       </div>
+                      <div class="comment-time portal-time">
+                        <showTime :time="com.sysCreateTime"></showTime>
+                        <interactBar :type="praisesType" :shares="false"  :data="com" @addAnswers="showReply(com)" :favorites="false" :views="false" :comments="false" :answers="true"></interactBar>
+                      </div>
                       <div class="comment-btns">
+
                          <!-- <a><svg-icon icon-class="like"></svg-icon><span>66</span></a> -->
                          <div v-show="btnsShowRowId==com.id">
+
                            <a @click="showReply(com)"><svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>回复</span></a>
                            <!--必须当前登录人是一个人-->
                            <a v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)"><svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>删除</span></a>
-                           <!-- <a v-if="com.replyList && com.replyList.length==5" @click="showMoreReply(com)" ><svg-icon icon-class="all" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>全部</span></a> -->
+                           <a v-if="com.replyList && com.replyList.length==5" @click="showMoreReply(com)" ><svg-icon icon-class="all" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>全部</span></a>
                          </div>
                       </div>
                       <div v-if="replyInfo.parentId==com.id" class="comment-reply" style="padding-bottom: 5px;">
@@ -123,46 +113,53 @@
                     </div>
                     <!--回复内容-->
                     <div v-if="com.replyList && com.replyList.length>0">
-                         <div class="comment" v-for="(reply,replyIdx) in com.replyList" :key="reply.id" :class="replyIdx===com.replyList.length-1 ? 'comment-last' : ''">
-                              <div class="comment-top">
-                                 <div class="comment-author">
-                                   <authorInfo :avatar="reply.avatar" :name="reply.sysCreateBy" :sex="reply.sex"></authorInfo>
-                                   <span style="margin-left: 10px;color: #8590A6;font-size:14px; ">回复</span>
-                                   <span style="margin-left: 10px; font-size:14px">{{reply.replyName || reply.toAname}}</span>
-                                 </div>
-                                 <div class="comment-time">
-                                     <showTime :time="reply.sysCreateTime"></showTime>
-                                 </div>
-                              </div>
-                              <div class="comment-body" @mouseover="showButtons(reply.id)" @mouseout="hideButtons()">
-                                <div class="comment-info" >
-                                   <div class="comment-content"  @click="cancelReply()">
-                                        <span style="color: #303133" v-html="displayAll(reply)"></span>
-                                        <span v-if="reply.content.length>170" @click="changeIsAll(reply)">
-                                          {{reply.isAll?'收起':'全文'}}
-                                        </span>
-                                    </div>
-                                   <div class="comment-btns">
-                                      <!-- <a><svg-icon icon-class="like"></svg-icon><span>66</span></a> -->
-                                      <div v-show="btnsShowRowId==reply.id">
-                                        <a  @click="showReply(reply)"><svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>回复</span></a>
-                                        <a  v-if="userInfo.aid==reply.sysCreateAid" @click="delReply(com,reply,replyIdx)"><svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>删除</span></a>
-                                      </div>
-                                   </div>
-                                </div>
-                                <!--发布回复-->
-                                <div v-if="replyInfo.parentId==reply.id" class="comment-reply" style="padding-bottom: 5px;">
-                                     <div style="width:100%;display:flex;">
-                                        <div style="flex: 1;">
-                                         <el-input show-word-limit class="hideControl" type="textarea" v-model="replyInfo.content"  maxlength="100" placeholder="回复内容..."></el-input>
-                                       </div>
-                                       <div style="width: 120px;display: flex;justify-content: flex-end;">
-                                         <el-button @click="submitReply(com)" type="primary">发布回复</el-button>
-                                       </div>
+                        <div v-for="(reply,replyIdx) in com.replyList" :key="reply.id" v-if="com.showAll || replyIdx<3">
+                            <div  class="comment"  :class="replyIdx===com.replyList.length-1 ? 'comment-last' : ''">
+                                  <div class="comment-top">
+                                     <div class="comment-author">
+                                       <authorInfo :aid="reply.sysCreateAid" :avatar="reply.avatar" :name="reply.sysCreateBy" :sex="reply.sex" :info="reply.orgInfo" :sign="reply.sign"></authorInfo>
+                                       <span style="margin-left: 10px;color: #8590A6;font-size:14px; ">
+                                        <!-- <svg-icon style="font-size: 10px;margin-right: 0;" icon-class="triangle"></svg-icon> -->
+                                        <span>回复了</span>
+                                      </span>
+                                       <span style="margin-left: 6px;font-size:14px;" class="portal-title-tow" >{{reply.replyName || reply.toAname}}</span>
                                      </div>
-                                   </div>
-                              </div>
+                                  </div>
+                                  <div class="comment-body" @mouseover="showButtons(reply.id)" @mouseout="hideButtons()">
+                                    <div class="comment-info" >
+                                       <div class="comment-content"  @click="cancelReply()">
+                                            <span class="portal-summary-text" style="color: #666666;" v-html="displayAll(reply)"></span>
+                                            <span v-if="reply.content.length>170" @click="changeIsAll(reply)">
+                                              {{reply.isAll?'收起':'全文'}}
+                                            </span>
+                                        </div>
+                                        <div class="comment-time portal-time">
+                                         <showTime :time="reply.sysCreateTime"></showTime>
+                                         <interactBar :type="praisesType" :shares="false"  :data="reply" @addAnswers="showReply(reply)" :favorites="false" :views="false"  :comments="false" :answers="true"></interactBar>
+                                        </div>
+                                       <div class="comment-btns">
+                                          <!-- <a><svg-icon icon-class="like"></svg-icon><span>66</span></a> -->
+                                          <div v-show="btnsShowRowId==reply.id">
+                                            <a  @click="showReply(reply)"><svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>回复</span></a>
+                                            <a  v-if="userInfo.aid==reply.sysCreateAid" @click="delReply(com,reply,replyIdx)"><svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>删除</span></a>
+                                          </div>
+                                       </div>
+                                    </div>
+                                    <!--发布回复-->
+                                    <div v-if="replyInfo.parentId==reply.id" class="comment-reply" style="padding-bottom: 5px;">
+                                         <div style="width:100%;display:flex;">
+                                            <div style="flex: 1;">
+                                             <el-input show-word-limit class="hideControl" type="textarea" v-model="replyInfo.content"  maxlength="100" placeholder="回复内容..."></el-input>
+                                           </div>
+                                           <div style="width: 120px;display: flex;justify-content: flex-end;">
+                                             <el-button @click="submitReply(com)" type="primary">发布回复</el-button>
+                                           </div>
+                                         </div>
+                                       </div>
+                                  </div>
+                             </div>
                          </div>
+                        <div v-if="!com.showAll && com.replyList.length>3" style="padding-left: 45px;padding-bottom: 10px;" @click="loadReplyMore(com)"><span style="color: #9e9e9e;cursor: pointer; border-radius: 5px;border:1px solid #cccccc;padding: 5px 10px;font-size: 14px;">加载更多&gt;&gt;</span></div>
                     </div>
                   </div>
                </div>
@@ -177,7 +174,7 @@
               <div class="comment" v-for="(reply,rIdx) in replyDiaglog.list" :key="rIdx">
                    <div class="comment-top">
                       <div class="comment-author">
-                          <authorInfo :avatar="reply.avatar" :name="reply.sysCreateBy" :sex="reply.sex"></authorInfo>
+                          <authorInfo :aid="reply.sysCreateAid" :avatar="reply.avatar" :name="reply.sysCreateBy" :sex="reply.sex" :info="reply.orgInfo"></authorInfo>
                           <span style="margin-left: 10px;color: #8590A6;font-size:14px; ">回复</span>
                           <span style="margin-left: 10px; font-size:14px">{{reply.replyName || reply.toAname}}</span>
                       </div>
@@ -244,9 +241,10 @@
 </template>
 <script>
   import showTime from '@/components/Portal/datetimeShow.vue'
+  import interactBar from "@/components/Portal/interactBar.vue";
   import apiComment from '@/api/modules/comments.js'
   import apiUser from '@/api/system/user.js'
-  import authorInfo from '@/components/Portal/authorInfo.vue';
+  import authorInfo from '@/components/Portal/commentAuthor.vue';
   // import author from '@/components/Portal/author.vue';
   import { mapGetters } from 'vuex';
   export default {
@@ -279,12 +277,13 @@
         default:false
       }
   	},
-    components:{showTime,authorInfo},
+    components:{showTime,authorInfo,interactBar},
     computed: {
       ...mapGetters(['userInfo'])
     },
   	data() {
   		return {
+        praisesType:0,//用于设定评论里点赞的type 课程评论点赞为10，文章的为20，案例的为30
         radio:1,
         value:false,
         sex:null,
@@ -366,6 +365,15 @@
     mounted() {
       this.author = this.authorId;
       this.loadData(false);
+      if(this.objType == 1) {
+         this.praisesType = 10;
+      }
+      if(this.objType == 2) {
+         this.praisesType = 20;
+      }
+      if(this.objType == 3) {
+         this.praisesType = 30;
+      }
       //在中文输入法状态下输入光标不在文字最后，同时会被遮挡两个文字大小的长度
       // let vm=document.querySelector('.hideControl input')
       // vm.addEventListener('compositionstart',(e)=>{
@@ -375,6 +383,9 @@
       // })
     },
   	methods: {
+      loadReplyMore(item){
+         item.showAll=true;
+      },
       loadMore() {
         this.pageIndex +=1;
         this.loadData(true);
@@ -403,6 +414,7 @@
                   item.avatar=author.avatar;
                   item.orgInfo=author.orgInfo;
                   item.sex=author.sex;
+                  item.sign=author.sign
                   return true;
                 }else{
                   return false;
@@ -443,17 +455,22 @@
               let ids=[];
               let allList=[];
               res.result.list.forEach(item=>{
+                item.answers=item.replys;
+                item.showAll=false;
                 item.avatar='';
                 item.orgInfo='';
+                item.sign='';
                 item.isAll=false;
                 //item.sex=null;
                 allList.push(item);
                 ids.push(item.sysCreateAid);
                 if(item.replyList && item.replyList!=''){
                     item.replyList.forEach(reply=>{
+                      reply.answers=reply.replys;
                       reply.avatar='';
                       reply.orgInfo='';
                       reply.sex=null;
+                      reply.sign='';
                       reply.isAll=false;
                       allList.push(reply);
                       ids.push(reply.sysCreateAid);
@@ -507,7 +524,20 @@
                 this.list.unshift(res.result);
                 this.loadAuthorInfo([res.result],[res.result.sysCreateAid]);
                 this.$message.success('发布成功');
-                //
+
+                let event = {
+                  key: "PublishComment",//后台的事件key  发布文章且审核通过
+                  title: "发表评论",//事件的标题
+                  parameters:"",//用户自定义参数 name:value,name:value
+                  content: "每发表一个评论",//事件的内容
+                  objId: res.result.id,//关联的id
+                  objType: '80',//关联的类型，这里关联的类型应该是评论，不是课程
+                  objInfo: "评论",
+                  aid: this.userInfo.aid, //当前登录人的id
+                  aname: this.userInfo.name,//当前人的姓名
+                  status: 1 //状态，直接写1
+                }
+                this.$store.dispatch("userTrigger", event);
 
                 this.total++;
                 this.$emit('success',res.result);
@@ -576,6 +606,19 @@
               this.replyInfo.parentId='';
               this.replyInfo.content='';
               this.$message.success("发布成功");
+              let event = {
+                key: "ReplyComment",//后台的事件key  发布文章且审核通过
+                title: "回复评论",//事件的标题
+                parameters:"",//用户自定义参数 name:value,name:value
+                content: "每回一个评论",//事件的内容
+                objId: this.replyInfo.commentId,//关联的id
+                objType: "81",//关联的类型
+                objInfo: "回复评论",
+                aid: this.userInfo.aid, //当前登录人的id
+                aname: this.userInfo.name,//当前人的姓名
+                status: 1 //状态，直接写1
+              }
+              this.$store.dispatch("userTrigger", event);
            }else{
               this.$message.error(res.message);
            }
@@ -765,6 +808,15 @@
 </script>
 
 <style lang="scss" scoped>
+.signtext{
+
+}
+
+.publish-button{
+  // line-height: 30px;
+  padding-top: 7px;
+  margin-top: 22px;
+}
 .anzhu{
   font-size: 14px;
   color: #999;
@@ -815,14 +867,22 @@
     margin-top: 5px;
   }
   .comments{
-		margin-top: 10px;
+		margin-top: 20px;
 		background-color: #FFFFFF;
-    padding: 5px 15px;
+    padding: 0px 16px;
+    .comment-time{
+      display: flex;
+      padding-left: 12px;
+      justify-content: space-between;
+        margin-top: 10px;
+        color: #666666;
+        font-size: 12px;
+      }
 		.comments-top{
 			display: flex;
 			justify-content: space-between;
 			padding:10px;
-			border-bottom: 1px solid #f4f4f4;
+			// border-bottom: 1px solid #f4f4f4;
 			font-weight: 500;
 			font-size: 1.1em;
       .comments-top-left{
@@ -848,8 +908,7 @@
       }
 		}
     .comments-input{
-      // border-bottom: 1px solid #dddddd;
-      padding: 5px 15px 10px 15px;
+      padding: 20px 15px 50px 15px;
     }
 		.comments-items{
        padding: 5px 15px;
@@ -863,7 +922,7 @@
   .comment{
   	margin-top: 10px;
   	background-color: #FFFFFF;
-    border-bottom: 1px solid #dddddd;
+    // border-bottom: 1px solid #dddddd;
   	.comment-top{
   		display: flex;
   		justify-content: space-between;
@@ -876,18 +935,17 @@
         align-items: center;
       	height: 30px;
         line-height: 30px;
-      }
-      .comment-time{
-        color: #666666;
-        font-size: 12px;
       }
   	}
   	.comment-body{
   		padding-left: 40px;
       .comment-content{
           padding-bottom: 0px;
+          padding-top:5px;
+          padding-left: 8px;
           white-space: pre-wrap;
           word-break:break-all;
+          letter-spacing:1px;
           span {
             color: #409eff;
             cursor: pointer;
@@ -919,7 +977,8 @@
   .el-input__count{
   }
   .el-textarea__inner{
-    padding-right: 50px;
+    padding-right: 60px;
+    padding-top: 20px;
   }
 }
 </style>
diff --git a/src/components/Portal/course/courseItem.vue b/src/components/Portal/course/courseItem.vue
index 9a0ab8ef..2a4573e1 100644
--- a/src/components/Portal/course/courseItem.vue
+++ b/src/components/Portal/course/courseItem.vue
@@ -68,11 +68,11 @@
     },
     methods:{
       jumpRouter(c){
-        if(c.type==20){
+        // if(c.type==20){
           return '/course/detail?id='+c.id
-        }else if(c.type==10){
-          return '/course/micro?id='+c.id
-        }
+        // }else if(c.type==10){
+        //   return '/course/micro?id='+c.id
+        // }
       },
       jumpPicture(c){
         if(c.type==20){
diff --git a/src/components/Portal/guideBox.vue b/src/components/Portal/guideBox.vue
new file mode 100644
index 00000000..9514bbb6
--- /dev/null
+++ b/src/components/Portal/guideBox.vue
@@ -0,0 +1,425 @@
+<template>
+	<el-dialog
+      :close-on-click-modal="false"
+      :visible.sync="guideCollection"
+      :append-to-body="true"
+      @closed="closeDlg"
+      top="90px"
+      :width="dlgWidth">
+      <div class="gui-box" :style="{'min-height':dlgHeight,width:dlgWidth}">
+        <span class="close-right" @click="guideCollection = false"><i style="font-size: 28px;color: #999;" class="el-icon-close"></i></span>
+         <div class="gui-box-left" :style="{width:leftWidth}">
+            <dl>
+              <dt class="left-title">新功能查看</dt>
+              <dd v-if="item.images.length>0" v-for="item in guideList" @click="showImg(item)">{{item.title}}</dd>
+            </dl>
+         </div>
+         <div class="gui-box-right">
+          <div id="container" style="z-index:99;" >
+         <!-- 当轮播图等于一张时 -->
+            <swiper :options="swiperOptiontwo" ref="mySwiper" v-if="resonimgTow.length">
+              <swiper-slide style="margin: 0 auto;" v-for="(item , idx ) in resonimgTow" :key="'a'+idx" class="swiper-slide games">
+                <img class="banner-img" style=" margin: 0 auto;" :src=" fileBaseUrl + item.img" alt="">
+              </swiper-slide>
+            </swiper>
+          </div>
+            <div id="guideBox" style="z-index:99;" v-if="resonimg.length > 1">
+              <swiper :options="swiperOption" ref="mySwiper" v-if="resonimg.length">
+                <swiper-slide  style="margin: 0 auto;" v-for="(item, idx ) in resonimg" :key="item.id" class="swiper-slide games">
+                    <img class="banner-img" style=" margin: 0 auto;" :src="fileBaseUrl + item.img" alt="">
+                </swiper-slide>
+                <div class="swiper-pagination" slot="pagination"></div>
+              </swiper>
+            </div>
+            <p class="gui-text">{{description}}</p>
+            <!-- <el-button type="primary" class="btn-one" @click="goHome()">进入首页</el-button> -->
+            <el-button type="primary" class="btn-one"  @click="goHome()">进入首页</el-button>
+         </div>
+      </div>
+    </el-dialog>
+</template>
+<script>
+    import { mapGetters, mapActions } from 'vuex';
+    // import apiUserhobby from "@/api/phase2/userhobby.js"
+    import apiGuide from "@/api/phase2/guide.js"
+    import { swiper, swiperSlide } from 'vue-awesome-swiper';
+	export default {
+		props:{
+          // show:{
+          //   type:Boolean,
+          //   default:false
+          // }
+		},
+    data(){
+    	return {
+            dlgHeight:'650px',
+            dlgWidth:'688px',
+            leftWidth:'160px',
+            description:'',
+            fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
+            guideCollection:false,// 兴趣采集
+            guideList:[],
+            resonimg:[],
+            resonimgTow:[],
+            swiperOptiontwo: {
+              autoplay: false,
+              // noSwiping: true,
+            },
+            swiperOption: {
+                autoplay: {
+                disableOnInteraction: false,
+                delay: 2000,
+                },
+                speed: 2000, //切换速度，即slider自动滑动开始到结束的时间（单位ms）
+                initialSlide:1,
+                loop:false, //循环切换
+                peed: 300,//循环速度
+                scrollbar: '.swiper-scrollbar',
+                pagination: {
+                    el: '.swiper-pagination',
+                    // type : 'progressbar', //分页器形状
+                    clickable :true, //点击分页器的指示点分页器会控制Swiper切换
+                },
+                navigation: {
+                nextEl: '.swiper-button-next',
+                prevEl: '.swiper-button-prev',
+                },
+            },
+    	}
+    },
+    created() {
+      //这里的以后要去掉的，不应该是这样计算的
+      let width = document.body.clientWidth;
+      if(width > 1921) {
+        this.dlgWidth = '1088px';
+        this.leftWidth='220px';
+      }
+      if(width > 1681 && width < 1921) {
+        this.dlgWidth = '888px';
+        this.leftWidth='200px';
+      }
+      if(width > 1367 && width < 1680) {
+        this.dlgWidth = '848px';
+        this.leftWidth='180px';
+      }
+      if(width < 1366) {
+        this.dlgWidth = '688px';
+        this.leftWidth='160px';
+      }
+
+      //这里必须放在当前的Session存储中，不能每次都调用
+      // apiGuide.hasUser().then(res=>{
+      //    if(res.result) {
+      //     this.guideCollection = false;
+      //    } else {
+      //     this.guideCollection = true;
+
+      //    }
+      // });
+      //只是在显示时才调用
+    },
+    mounted() {
+        this.getlist();
+        // this.swiper.slideTo(3,2000,false);
+    },
+    methods:{
+        show(){
+          this.guideCollection=true;
+        },
+        closeDlg(){
+           this.$emit('close');
+        },
+        goHome() {
+          this.guideCollection = false;
+          this.$router.push('/index')
+        },
+        getlist() {
+            apiGuide.list().then(res=>{
+                if(res.status == 200) {
+                    this.guideList = res.result;
+                    this.showImg(res.result[0]);
+                }
+            })
+        },
+
+        showImg(item) {
+          this.resonimg = [];
+          this.resonimgTow = [];
+          if(item){
+            this.description = item.description;
+            if(item.images.length > 1) {
+              this.resonimg = item.images;
+            } else {
+              this.resonimgTow = item.images;
+            }
+          }
+        },
+        notYet() {
+            this.interestCollection = false;
+            localStorage.setItem('notYet',new Date());
+        },
+    },
+    watch:{
+
+    },
+    computed:{
+      ...mapGetters(['userInfo','studyTaskCount']),
+        swiper() {
+            return this.$refs.mySwiper.swiper
+        },
+		},
+
+	}
+</script>
+
+<style scoped lang="scss">
+    ::v-deep.swiper-slide .games .swiper-slide-active{
+  text-align: center !important;
+}
+    .gui-box{
+        display: flex;
+        border-radius: 10px;
+        box-sizing: border-box;
+        position: relative;
+        .close-right{
+            position: absolute;
+            right:28px;
+            // top:45px;
+        }
+
+        ::v-deep .swiper-wrapper{
+            padding-bottom: 60px;
+        }
+        // swiper-pagination-bullet swiper-pagination-bullet-active
+        // .swiper-pagination-bullet
+        ::v-deep .swiper-pagination-bullet-active{
+            width: 48px !important;
+            height: 6px !important;
+            background: #387DF7 !important;
+            border-radius: 8px !important;
+        }
+        ::v-deep .swiper-slide-prev{
+
+        }
+        ::v-deep .swiper-pagination-bullet{
+            width: 12px;
+            height: 6px;
+            background: #387DF7;
+            border-radius: 8px;
+            // opacity: 0.36;
+        }
+        .gui-box-left{
+          padding-top: 90px;
+          // width: 190px;
+        //   background: #387DF7;
+          background: url('../../../public/images/homeWu/guide-bg.png') no-repeat;
+          background-size: 100% 100%;
+          border-radius: 10px 0 0 10px;
+          .left-title{
+            // width: 190px;
+            margin-bottom: 42px;
+            text-align: center;
+            color: #FFFFFF;
+            font-weight: 600;
+            font-size: 20px;
+          }
+          dd{
+            font-size: 16px;
+            font-weight: 400;
+            color: #FFFFFF;
+            line-height: 22px;
+            // margin-left: 20px;
+            padding: 0 20px;
+            margin-bottom: 27px;
+            cursor: pointer;
+          }
+        }
+        .gui-box-right{
+          flex: 1;
+          // width: 897px;
+          background: #e6effb;
+          padding: 74px 0 64px 0;
+          border-radius:0 10px 10px 0;
+          text-align: center;
+          .gui-text{
+            color: #387DF7;
+            font-size: 16px;
+            margin-top: 30px;
+          }
+          .btn-one{
+            margin-top: 40px;
+            width: 457px;
+            height: 62px;
+            background: #387DF7;
+            border-radius: 8px;
+            }
+          .swiper-slide{
+            //  width: 576px;
+            //  height: 500px;
+             text-align: center;
+             .banner-img{
+                // width: 576px;
+                // height: 100%;
+             }
+          }
+        }
+    }
+	::v-deep .el-dialog{
+        // background: #fff url('/images/homeWu/interest.png') no-repeat;
+        border-radius: 10px;
+        .el-dialog__header{
+            display: none;
+        }
+        .el-dialog__body {
+            padding: 0;
+        }
+        .el-dialog__footer{
+            display: none;
+        }
+        // height: 840px;
+    }
+// .el-checkbox.is-bordered.is-checked{
+//     border-color: #4677F4;
+// }
+// ::v-deep .el-checkbox__input.is-checked+.el-checkbox__label{
+//     color: #4677F4;
+// }
+// .el-checkbox{
+//     font-size: 14px;
+//     color: #333333;
+// }
+
+.dialog-footer{
+    text-align: center;
+    .btn-one{
+        width: 473px;
+        height: 59px;
+        background: linear-gradient(146deg, #4D7BF6 0%, #2F65EC 100%);
+        border-radius: 30px;
+    }
+    .btn-tow{
+        font-size: 14px;
+        color: #333333;
+    }
+}
+
+@media screen and (max-width: 1366px){
+  .gui-box-left{
+    //width: 160px;
+    .left-title{
+      width: 160px;
+    }
+    dd{
+      margin-left: 10px;
+    }
+  }
+  .gui-box-right{//资源引导位宽度
+    width: 497px;
+    .swiper-slide{
+      width: 376px;
+      height: 300px;
+      text-align: center;
+      .banner-img{
+         width: 376px;
+         height: 100%;
+      }
+   }
+  }
+  .gui-box{
+    .close-right{
+        right:28px;
+        top:25px;
+    }
+  }
+}
+@media screen and (max-width: 1680px) and (min-width:1367px){
+  .gui-box-left{
+    //width: 160px;
+    .left-title{
+      width: 160px;
+    }
+    dd{
+      margin-left: 10px;
+    }
+  }
+  .gui-box-right{//资源引导位宽度
+    width: 658px;
+    .swiper-slide{
+       width: 476px;
+       height: 400px;
+       text-align: center;
+       .banner-img{
+          width: 476px;
+          height: 100%;
+       }
+    }
+  }
+  .gui-box{
+    .close-right{
+        right:28px;
+        top:25px;
+    }
+  }
+}
+
+@media screen and (max-width: 1920px) and (min-width: 1681px){
+  .gui-box-left{
+    //width: 160px;
+    .left-title{
+      width: 160px;
+    }
+    dd{
+      margin-left: 10px;
+    }
+  }
+  .gui-box-right{//资源引导位宽度
+    width: 722px;
+    .swiper-slide{
+       width: 560px;
+       height: 430px;
+       text-align: center;
+       .banner-img{
+          width: 560px;
+          height: 100%;
+       }
+    }
+  }
+  .gui-box{
+    .close-right{
+        right:28px;
+        top:28px;
+    }
+  }
+}
+
+@media screen and (min-width: 1921px){
+  .gui-box-left{
+   // width: 190px;
+    .left-title{
+      width: 190px;
+    }
+    dd{
+      margin-left: 20px;
+    }
+  }
+  .gui-box-right{//资源引导位宽度
+    width: 897px;
+    .swiper-slide{
+       width: 576px;
+       height: 500px;
+       text-align: center;
+       .banner-img{
+          width: 576px;
+          height: 100%;
+       }
+    }
+  }
+  .gui-box{
+    .close-right{
+        right:28px;
+        top:45px;
+    }
+  }
+}
+
+</style>
diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue
index b4d2c567..ba6c7a3e 100644
--- a/src/components/Portal/interactBar.vue
+++ b/src/components/Portal/interactBar.vue
@@ -7,47 +7,60 @@
     </div>
     <div v-show="theme==1" class="interact-bar-btns" :style="{'justify-content':showAlign}">
       <div v-if="answers" @click="addAnswers()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly || clickAnswer}">
-        <el-tooltip  effect="light" content="回答" placement="left" :visible-arrow="false" popper-class="text-tooltip">
+        <el-tooltip  effect="light" :content="type == 4 || type == 5 ?'回答':'回复'" placement="left" :visible-arrow="false" popper-class="text-tooltip">
           <!-- <svg-icon style="margin-right: 0;"  icon-class="comment"></svg-icon> -->
-         <img style="width:16px;height:16px;vertical-align: middle;" :src="require('@/assets/images/icon/answers.png')">
+         <!-- <img style="width:16px;height:14px;vertical-align: middle;" :src="require('@/assets/images/icon/answers.png')"> -->
+         <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
         </el-tooltip>
-        <span class="interact-bar-value"> {{ data.answers}}</span>
+        <span class="interact-bar-value"> {{ data.answers? data.answers:0}}</span>
+      </div>
+      <div v-if="couseViews" style="cursor: default;" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
+        <el-tooltip effect="light" content="浏览量" placement="top" :visible-arrow="false" popper-class="text-tooltip">
+          <svg-icon style="margin-right: 0;font-size:20px;" icon-class="couseViews"></svg-icon>
+        </el-tooltip>
+        <!-- <span class="interact-bar-value"> {{ data.views}}</span> -->
+        <span class="interact-bar-value"> {{ data.views}}</span>
       </div>
       <div v-if="comments" class="interact-bar-btn" :style="`min-width: ${nodeWidth};`" :class="{cursor:!readonly}">
         <el-tooltip  effect="light" content="评论" placement="left" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon style="margin-right: 0;font-size: 16px;" icon-class="comment"></svg-icon>
+          <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
         </el-tooltip>
-        <span class="interact-bar-value"> {{data.comments}}</span>
-      </div>
-      <div v-if="shares" @click="addShare()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
-        <el-tooltip effect="light" content="分享" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon icon-class="share" style="margin-right: 0;font-size: 16px;"></svg-icon>
-        </el-tooltip>
-        <span class="interact-bar-value"> {{data.shares}}</span>
+        <span class="interact-bar-value"> {{data.comments? data.comments:0}}</span>
       </div>
+
       <div v-if="praises" @click="addPraise()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="点赞" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon style="margin-right: 0;font-size: 20px;" :icon-class="isPraise?'praised':'like'"></svg-icon>
+          <svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon>
         </el-tooltip>
-        <span class="interact-bar-value"> {{ data.praises}}</span>
+        <span class="interact-bar-value"> {{ data.praises? data.praises:0}}</span>
       </div>
 
       <div v-if="favorites"  @click="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="收藏" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon style="font-size: 16px;margin-right: 0;" :icon-class="isFavorite?'collected':'collection'"></svg-icon>
-          <!-- <svg-icon :icon-class="isFavorite?'collected':'dropdown_collected'"></svg-icon> -->
-          <!-- dropdown_collected -->
+          <svg-icon v-if="courseExclusive" style="font-size: 32px;margin-right: 0;" :icon-class="isFavorite?'collectedCourse':'collectionCourse'"></svg-icon>
+          <svg-icon v-else style="margin-right: 0;" :style="{'font-size':size+'px'}" :icon-class="isFavorite?'collected':'collection'"></svg-icon>
         </el-tooltip>
-        <span class="interact-bar-value"> {{ data.favorites}}</span>
+        <span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:0}}</span>
+      </div>
+      <div v-if="shares" @click="addShare()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
+        <el-tooltip effect="light" content="分享" placement="top" :visible-arrow="false" popper-class="text-tooltip">
+          <svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon>
+        </el-tooltip>
+        <span class="interact-bar-value"> {{data.shares}}</span>
       </div>
-
       <div v-if="views" style="cursor: default;" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="浏览量" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon style="margin-right: 0;font-size:20.5px;" icon-class="eyes"></svg-icon>
+          <svg-icon style="margin-right: 0;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>
         </el-tooltip>
-        <span class="interact-bar-value"> {{ data.views}}</span>
+        <span class="interact-bar-value"> {{ formatNum(data.views)}}</span>
       </div>
     </div>
+    <!-- <div v-if="courseExclusive"  @click="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
+        <el-tooltip effect="light" content="收藏" placement="top" :visible-arrow="false" popper-class="text-tooltip">
+          <svg-icon style="font-size: 14px;margin-right: 0;" :icon-class="isFavorite?'collectedCourse':'collection'"></svg-icon>
+        </el-tooltip>
+        <span class="interact-bar-value"> {{ data.favorites}}</span>
+      </div> -->
     <el-dialog title="分享" :visible.sync="shareShow" :close-on-click-modal="false" :append-to-body="true" width="500px" custom-class="g-dialog">
         <div style="height: 200px;padding-right: 30px;">
             <el-form  label-width="100px"  @submit.native.prevent >
@@ -78,6 +91,7 @@
   import apiUser from '@/api/system/user.js'
   import apiMessage from '@/api/system/message.js'
   import { mapGetters } from 'vuex';
+  import { formatUserNumber } from '@/utils/tools.js';
 export default {
   props: {
     data:{
@@ -94,6 +108,10 @@ export default {
           }
       }
     },
+    size:{
+      type:Number,
+      default:14
+    },
     nodeWidth:{
       type:String,
       default:'40px'
@@ -122,10 +140,18 @@ export default {
       type:Boolean,
       default:true
     },
+    courseExclusive:{
+      type:Boolean,
+      default:false
+    },
     shares:{
       type:Boolean,
       default:true
     },
+    couseViews:{
+      type:Boolean,
+      default:false
+    },
     praises:{
       type:Boolean,
       default:true
@@ -149,6 +175,7 @@ export default {
   },
   data(){
     return {
+      formatNum:formatUserNumber,
       loading:false,
       isPraise:false,
       isFavorite:false,
@@ -222,12 +249,36 @@ export default {
           content='案例'
         }
         if(this.type==4){
-          content='问答'
+          content='提问'
         }
         if(this.type==5){
           content='回答'
         }
-      content=sendName+typeText+content+'-'+title
+        if(this.type==6){
+          content='课程笔记'
+        }
+        if(this.type==60){
+          content='课程笔记评论'
+        }
+// 点赞type
+        if(this.type==10){
+          content='课程评论'
+        }
+        if(this.type==20){
+          content='文章评论'
+        }
+        if(this.type==30){
+          content='案例评论'
+        }
+        // 评论点赞通知没有关联id,评论通知暂时关闭
+        if(this.type==60 || this.type==10 || this.type==20 || this.type==30 || this.type == 6) {
+          return;
+          // content=sendName+typeText+content
+        } else {
+          content=sendName+typeText+content+'-'+title
+        }
+
+
       let message={
         content,
         refId,
@@ -275,7 +326,7 @@ export default {
     },
     addPraise(){
      if(this.type==0){
-       console.log('未设置type值,1表课程,2表文章，3表案例，4表问答')
+       console.log('未设置type值,1表课程,2表文章，3表案例，4表问答,6笔记')
        return;
       }
       //需要判断是否已点赞，已点赞的不再加
@@ -288,7 +339,9 @@ export default {
         }
         if(this.type==1){
           postData.title=this.data.name;
-        }else{
+        }else if(this.type == 5){
+          postData.title=this.data.content;
+        } else {
           postData.title=this.data.title;
         }
         if(this.loading) {
@@ -306,6 +359,29 @@ export default {
               if(this.unicom) {
                 this.$store.dispatch("unicomPraises",false)
               }
+              //自己给自己点赞不算
+              let authorId=this.data.sysCreateAid;
+              if(this.type==3){ //案例取作者id
+                 authorId=this.data.authorId;
+              }else if(this.type==1){ //课程取老师的id
+                // 目前页面上没有点赞的地方，课程有多个老师，也要给每个老师加吗？
+                 //console.log(this.data,'点赞中课程的传的数据')
+              }
+              if(this.userInfo.aid!=authorId){
+                let event = {
+                  key: "CancelPraise",//
+                  title: "取消点赞",//事件的标题
+                  parameters:"author:"+authorId,//用户自定义参数 name:value,name:value
+                  content: "取消点赞"+postData.title,//事件的内容
+                  objId: this.data.id,//关联的id
+                  objType: this.type,//关联的类型
+                  objInfo: this.data.title,
+                  aid: this.userInfo.aid, //当前登录人的id
+                  aname: this.userInfo.name,//当前人的姓名
+                  status: 1 //状态，直接写1
+                }
+                this.$store.dispatch("userTrigger", event);
+              }
               this.$message({message:'取消点赞',type:'success'})
             }else{
               console.log('取消失败：'+res.message);
@@ -329,6 +405,54 @@ export default {
               // }
               this.isPraise=true;
               this.$message({message:'点赞成功',type:'success'})
+              let contentText = '';
+              if(this.type==1){
+                  contentText='课程';
+                  // conType = this.data.type;
+                }
+                if(this.type==2){
+                  contentText='文章'
+                }
+                if(this.type==3){
+                  contentText='案例'
+                }
+                if(this.type==4){
+                  contentText='提问'
+                }
+                if(this.type==5){
+                  contentText='回答'
+                }
+                if(this.type==6){
+                  contentText='课程笔记'
+                }
+                if(this.type==60){
+                  contentText='课程笔记评论'
+                }
+        // 点赞type
+                if(this.type==10){
+                  contentText='课程评论'
+                }
+                if(this.type==20){
+                  contentText='文章评论'
+                }
+                if(this.type==30){
+                  contentText='案例评论'
+                }
+              if(this.userInfo.aid!=this.data.sysCreateAid){
+                let event = {
+                  key: "Praise",//后台的事件key  发布文章且审核通过
+                  title: "点赞",//事件的标题
+                  parameters:"author:"+this.data.sysCreateAid,//用户自定义参数 name:value,name:value
+                  content: "点赞了"+contentText,//事件的内容
+                  objId: this.data.id,//关联的id
+                  objType: this.type,//关联的类型
+                  objInfo: this.data.title,
+                  aid: this.userInfo.aid, //当前登录人的id
+                  aname: this.userInfo.name,//当前人的姓名
+                  status: 1 //状态，直接写1
+                }
+                this.$store.dispatch("userTrigger", event);
+              }
             }else{
               console.log('点赞失败：'+res.message);
             }
@@ -358,7 +482,11 @@ export default {
         this.loading=true;
       if(this.type==1){
         postData.title=this.data.name;
-      }else{
+      }else if(this.type==60){
+        postData.title=this.data.content;
+      } else if(this.type==5){
+        postData.title='收藏回答';
+      } else {
         postData.title=this.data.title;
       }
       if(this.isFavorite) {// 已经收藏，再次点击取消收藏
@@ -508,6 +636,19 @@ export default {
                      this.messageSave(this.data.id,this.data.title,this.userInfo.name,curUser.name,curUser.aid,'分享给我的');
                    }
                  }
+                 let event = {
+                  key: "Share",//分享
+                  title: "分享",//分享
+                  parameters:"author:"+this.data.sysCreateAid,//内容的作者
+                  content: '分享',//事件的内容
+                  objId: this.data.id,//关联的id
+                  objType: this.type,//关联的类型
+                  objInfo: this.data.title,
+                  aid: this.userInfo.aid, //当前登录人的id
+                  aname: this.userInfo.name,//当前人的姓名
+                  status: 1 //状态，直接写1
+                }
+                this.$store.dispatch("userTrigger", event);
                }else{
                  this.$message.warning("您已分享给对方，分享失败")
                }
@@ -533,14 +674,15 @@ export default {
 .interact-bar{
   // height: 30px;
   .interact-bar-btns {
-    line-height: 30px;
+    // line-height: 30px;
     display: flex;
     justify-content: flex-end;
     .interact-bar-btn {
       margin: 0 0 0 15px;
     }
     .interact-bar-value{
-       color:#8590A6
+      //  color:#6E7B84; ui图给的颜色，但是效果于ui图效果不一样，也没有透明度，所以找一个相近的和谐的颜色
+       color:#999;
     }
   }
 }
diff --git a/src/components/Portal/interactRowBar.vue b/src/components/Portal/interactRowBar.vue
deleted file mode 100644
index 82b4b042..00000000
--- a/src/components/Portal/interactRowBar.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-  <div class="interact-bar">
-    <div class="interact-bar-left">
-      <img :src="data[fieldsList.avater]" />
-      <span style="width: 170px;display:inline-block;vertical-align: middle;" class="one-line-ellipsis">{{ data[fieldsList.author] }}</span>
-    </div>
-    <div class="interact-bar-btns" :style="{'justify-content':showAlign}">
-      <div v-if="answers" class="interact-bar-btn">
-        <el-tooltip  effect="light" content="回答" placement="left">
-          <svg-icon  icon-class="comment"></svg-icon>
-        </el-tooltip>
-        <span>{{ data[fieldsList.answers] }}</span>
-      </div>
-      <div v-if="comments" @click="jumpRouter()"  class="interact-bar-btn">
-        <el-tooltip  effect="light" content="评论" placement="left">
-          <svg-icon  icon-class="comment"></svg-icon>
-        </el-tooltip>
-        <span>{{ data[fieldsList.comments] }}</span>
-      </div>
-      <div v-if="shares" @click="addShare()" class="interact-bar-btn">
-        <el-tooltip effect="light" content="分享" placement="top">
-          <svg-icon  icon-class="share"></svg-icon>
-        </el-tooltip>
-        {{ data[fieldsList.shares] }}
-      </div>
-      
-      <div v-if="favorites"  @click="addCollect()" class="interact-bar-btn">
-        <el-tooltip effect="light" content="收藏" placement="top">
-          <svg-icon icon-class="collection"></svg-icon>
-        </el-tooltip>
-        {{ data[fieldsList.favorites] }}
-      </div>
-      
-      <div v-if="praises" @click="addPraise()" class="interact-bar-btn">
-        <el-tooltip effect="light" content="点赞" placement="top">
-          <svg-icon icon-class="like"></svg-icon>
-        </el-tooltip>
-        {{ data[fieldsList.praises] }}
-      </div>
-
-      <div v-if="views" style="cursor: default;" class="interact-bar-btn">
-        <el-tooltip effect="light" content="浏览量" placement="top">
-          <svg-icon icon-class="views"></svg-icon>
-        </el-tooltip>
-        {{ data[fieldsList.views] }}
-      </div>
-    </div>
-    <el-dialog title="分享" :visible.sync="shareShow" :close-on-click-modal="false" width="500px" custom-class="g-dialog">
-        <div style="height: 200px;padding-right: 30px;">
-
-            <el-form  label-width="100px">
-              <el-form-item label="工号或姓名">
-                <el-input v-model="shareInfo.code" placeholder="您要分享的人的工号或姓名">
-                  <el-button slot="append" icon="el-icon-search">搜索</el-button>
-                </el-input>
-              </el-form-item>
-            </el-form>
-            <div>
-
-            </div>
-        </div>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="shareShow= false">取 消</el-button>
-          <el-button type="primary" >提交分享</el-button>
-        </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    data:{
-      type:Object,
-      default(){
-        return {
-          avater:'/temp/index/female.jpg',
-          author:'李玉冰（BOEU/教育技术中心）',
-          answers:23,
-          favorites:23,
-          comments:18,
-          shares:16,
-          praises:68,
-          views:12,
-        }
-      }
-    },
-    align:{
-      type:String,
-      default:'right'
-    },
-    answers:{
-      type:Boolean,
-      default:false
-    },
-    comments:{
-      type:Boolean,
-      default:true
-    },
-    favorites:{
-      type:Boolean,
-      default:true
-    },
-    shares:{
-      type:Boolean,
-      default:true
-    },
-    praises:{
-      type:Boolean,
-      default:true
-    },
-    views:{
-      type:Boolean,
-      default:true
-    },
-    fieldsList: {
-      type: Object,
-      default: function() {
-        return {
-          avater: 'avater',
-          author: 'author',
-          answers:'answers',
-          comments: 'comments',
-          shares: 'shares',
-          favorites: 'favorites',
-          praises: 'praises',
-          views: 'views'
-        };
-      }
-    },
-    iconFilter: {
-      type: Object,
-      default: function() {
-        return {};
-      }
-    },
-    type:{
-      type:String,
-      default:'article'
-    }
-  },
-  data(){
-    return {
-      shareShow:false,
-      shareInfo:{
-        code:''
-      }
-    }
-  },
-  computed:{
-    showAlign(){
-      if(this.align=='left'){
-        return 'flex-start';
-      }else if(this.align=='right'){
-        return 'flex-end';
-      }
-    }
-  },
-  methods:{
-    addShare(){
-      //分享
-      this.shareShow=true;
-    },
-    addPraise(){
-      //需要判断是否已点赞，已点赞的不再加
-      this.$message({message:'点赞成功',type:'success'})
-    },
-    addCollect(){
-      //需要判断是否已点赞，已点赞的不再加
-      this.$message({message:'已加入收藏',type:'success'});
-    },
-    jumpRouter(){
-      if(this.type=='article'){
-        this.$router.push({path:'/article/detail'})
-      }
-      if(this.type=='case'){
-        this.$router.push({path:'/case/detail'})
-      }
-      if(this.type=='course'){
-        this.$router.push({path:'/course/detail'})
-      }
-      if(this.type=='qa'){
-        this.$router.push({path:'/qa/answer'})
-      }
-    }
-  }
-
-};
-</script>
-
-<style lang="scss" scoped>
-.interact-bar{
-  height: 30px;
-  display: flex;
-  justify-content: space-between;
-  .interact-bar-left{
-    font-size: 13px;
-    color: #999999;
-    img {
-      margin-right: 10px;
-      width: 30px;
-      border: 1px solid #eee;
-      border-radius: 50%;
-      vertical-align: middle;
-    }
-  }
-  .interact-bar-btns {
-    line-height: 30px;
-    display: flex;
-    justify-content: flex-end;
-    .interact-bar-btn {
-      margin: 0 0 0 10px;
-      cursor: pointer;
-    }
-  }
-}
-</style>
diff --git a/src/components/Portal/interestCollection.vue b/src/components/Portal/interestCollection.vue
new file mode 100644
index 00000000..f7097074
--- /dev/null
+++ b/src/components/Portal/interestCollection.vue
@@ -0,0 +1,260 @@
+<template>
+	<el-dialog
+      :close-on-click-modal="false"
+      :visible.sync="interestCollection"
+      :append-to-body="true"  top="7vh" @close="closeDialog" custom-class="hobby-dialog">
+      <div class="interest_title">
+        <span class="text_84">请选择您的</span>
+        <span class="text_85">学习兴趣</span>
+        <span class="text_86">，至少三个，可随时调整</span>
+      </div>
+      <div style="margin-top:0px;min-width: 770px;max-width:950px;">
+
+        <div class="interest" v-for="(sys,index) in sysTypeListMap" :key="sys.id">
+           <p class="portal-title-tow interest-title">{{sys.name}}</p>
+           <el-checkbox-group v-model="checkboxGroup" v-if="sys.children.length > 0">
+            <el-checkbox size="medium" border v-for="ch in sys.children" :label="ch.id" :key="ch.id">{{ch.name}}</el-checkbox>
+          </el-checkbox-group>
+         </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <div><el-button type="primary" class="btn-one" @click="saveInterest()">生成我的兴趣偏好</el-button></div>
+        <div><el-button @click="notYet()" class="btn-tow" type="text">暂不选择</el-button></div>
+      </div>
+    </el-dialog>
+</template>
+<script>
+    import { mapGetters, mapActions } from 'vuex';
+    import apiUserhobby from "@/api/phase2/userhobby.js"
+	export default {
+		props:{
+          // show:{
+          //   type:Boolean,
+          //   default:false
+          // }
+		},
+    data(){
+    	return {
+            checkboxGroup:[],
+            interestCollection:false,// 兴趣采集 false - 不显示弹框;  true - 显示弹框
+            sysTypeListMap:[],
+            btn_insterest_status:0,
+            dialog_session_show:0
+    	}
+    },
+    created() {
+          // this.userAvatar=require("@/assets/images/user/default.png");
+          // apiUserhobby.has().then(res=>{
+          //   if(res.status != 200) {return;}
+          //   // 1. 判断用户是否选择过兴趣偏好
+          //   if(res.result == false){
+          //     this.interestCollection = true;
+          //   }
+          //   if(res.result == true){this.interestCollection = false;return;}
+          //   // 2. 判断用户是否点击过"暂不选择"按钮，如果用户点击过"暂不选择"按钮则判断点击"暂不选择"按钮天数是否大于15天，如果大于则弹出兴趣偏好框，否则不弹
+          //   let time = localStorage.getItem('notYet'+this.userInfo.aid);
+          //   if(!time == '' || time != null) {
+          //       let day = (new Date() - new Date(time))/(1000*60*60*24);
+          //       if(day > 15){
+          //         this.interestCollection = true;
+          //         return;
+          //       }
+          //   }
+          //   // 3. 判断用户是否点击"关闭"按钮，如果点击"关闭"按钮则在当前session不在弹窗
+          //   let current_session = sessionStorage.getItem('dialog_session_show'+this.userInfo.aid);
+          //   if(current_session == 1){
+          //     this.interestCollection = false;
+          //   }else {
+          //     this.interestCollection = true;
+          //   }
+          // })
+        },
+    mounted() {
+      this.getSysTypeTree().then(rs => {
+        this.sysTypeListMap = rs;
+      });
+    },
+    methods:{
+        show(){
+          this.interestCollection=true;
+        },
+        notYet() {
+            //15天控制
+            this.interestCollection = false;
+            localStorage.setItem('notYet'+this.userInfo.aid,new Date());
+            this.$emit('close');
+        },
+        ...mapActions({
+            getSysTypeTree: 'sysType/getSysTypeTree',
+        }),
+        // 关闭兴趣偏好弹窗
+        closeDialog() {
+          //本地登录的设置
+          sessionStorage.setItem('user-hobby-'+this.userInfo.aid,1);
+          this.$emit('close');
+        },
+        saveInterest() {
+            let data = []
+            if(this.checkboxGroup.length  < 3) {
+                this.$message({
+                        type:'error',
+                        dangerouslyUseHTMLString:true,
+                        message: '<span style="color:red">至少选择三个兴趣偏好！</span>',
+                        iconClass:'error-text',
+                        center: true
+                      });
+                //this.$message.error('至少选择三个兴趣偏好！')
+                return
+            }
+            this.checkboxGroup.forEach(item=>{
+                data.push({ type:1,  refId:item });
+            })
+            apiUserhobby.save(data).then(res=>{
+               if(res.status == 200) {
+                 this.interestCollection = false;
+                 const h = this.$createElement;
+                 let event = {
+                   key: "FinishHobby",//分享
+                   title: "设置兴趣爱好",//分享
+                   parameters:"",//内容的作者
+                   content: '设置兴趣爱好',//事件的内容
+                   objId: '1234567890123456789',//此项关联的id是没有的，需要写成固定的值
+                   objType: '70',//关联的类型
+                   objInfo: '设置兴趣爱好',
+                   aid: this.userInfo.aid, //当前登录人的id
+                   aname: this.userInfo.name,//当前人的姓名
+                   status: 1 //状态，直接写1
+                 }
+                 this.$store.dispatch("userTrigger", event);
+                 this.$message({
+                    type: 'success',
+                    dangerouslyUseHTMLString: true,
+                    message: `<span class="u-message">
+                       选择个人偏好成功，U币+5
+                        <span class="text"><a href="${this.webBaseUrl}/user/ucurrency">查看详情</a></span>
+                    </span>`
+                 });
+               }
+            })
+            this.$emit('close');
+        }
+    },
+    watch:{
+
+    },
+    computed:{
+        ...mapGetters(['userInfo','studyTaskCount']),
+		},
+
+	}
+</script>
+<style>
+  .el-dialog.hobby-dialog{
+     min-width: 760px;
+     max-width: 960px;
+  }
+  .error-text{
+    color:red
+  }
+</style>
+<style scoped lang="scss">
+
+
+ ::v-deep .el-dialog__close{
+    font-size: 26px;
+    color: #333333 !important;
+    margin-right: 44px;
+    margin-top: 30px;
+ }
+::v-deep .el-button+.el-button, .el-checkbox.is-bordered+.el-checkbox.is-bordered{
+  margin-left: 0 !important;
+}
+	::v-deep .el-dialog{
+        background: #fff url('../../../public/images/homeWu/interest.png') no-repeat;
+        border-radius: 8px;
+        // height: 840px;
+    }
+.el-checkbox.is-bordered.el-checkbox--medium{
+   width: 146px;
+   height: 44px;
+   line-height: 30px;
+   text-align: center;
+   margin-bottom: 20px;
+   margin-left: 0px;
+   margin-right: 23px;
+}
+.el-checkbox.is-bordered.is-checked{
+    border-color: #4677F4;
+}
+::v-deep .el-checkbox__input.is-checked+.el-checkbox__label{
+    color: #4677F4;
+}
+.el-checkbox{
+    font-size: 14px;
+    color: #333333;
+}
+
+.interest_title{
+  margin-left: 40px;
+  margin-top: -15px;
+  margin-bottom: 15px;
+  .text_84 {
+    width: 316px;
+    height: 22px;
+    overflow-wrap: break-word;
+    color: rgba(0, 0, 0, 0.65);
+    font-size: 18px;
+    font-family: PingFangSC-Semibold;
+    text-align: left;
+    white-space: nowrap;
+    line-height: 22px;
+  }
+  .text_85 {
+    width: 316px;
+    height: 22px;
+    overflow-wrap: break-word;
+    color: rgba(47, 101, 236, 1);
+    font-size: 18px;
+    font-family: PingFangSC-Semibold;
+    text-align: left;
+    white-space: nowrap;
+    line-height: 22px;
+  }
+  .text_86 {
+      width: 316px;
+      height: 22px;
+      overflow-wrap: break-word;
+      color: rgba(0, 0, 0, 0.65);
+      font-size: 14px;
+      font-family: PingFangSC-Regular;
+      text-align: left;
+      white-space: nowrap;
+      line-height: 22px;
+    }
+}
+
+
+.interest{
+    margin-left: 40px;
+    .interest-title{
+       margin-bottom: 15px;
+       margin-top: 10px;
+    }
+    ::v-deep .el-checkbox__input{
+        display: none;
+    }
+}
+.dialog-footer{
+    text-align: center;
+    .btn-one{
+        width: 473px;
+        height: 59px;
+        background: linear-gradient(146deg, #4D7BF6 0%, #2F65EC 100%);
+        border-radius: 30px;
+    }
+    .btn-tow{
+        font-size: 14px;
+        color: #333333;
+    }
+}
+</style>
diff --git a/src/components/Portal/medalDlg.vue b/src/components/Portal/medalDlg.vue
new file mode 100644
index 00000000..7e566a96
--- /dev/null
+++ b/src/components/Portal/medalDlg.vue
@@ -0,0 +1,139 @@
+<template>
+ <el-dialog
+      :close-on-click-modal="false"
+      :visible.sync="medalDlg"
+      :append-to-body="true" width="490px" top="7vh" custom-class="medalDlg-dialog">
+      <div class="medal-dlg-box">
+        <img class="medal-del" @click="medalDlg = false" style="width:32px;height:32px" :src="`${webBaseUrl}/images/homeWu/medal-del.png`" alt="">
+        <div class="medal-img">
+          <img style="width:196px;height:246px" :src="tabImg(medalData.id)" alt="" srcset="">
+           <span class="img-level">{{medalData.level}}</span>
+        </div>
+        
+        <p class="medalDlg-title">{{medalData.name}}  {{medalData.level}}</p>
+        <p v-if="medalData.id == 1" class="medalDlg-text">您的累积学时已可解锁“{{medalData.name}}”{{medalData.level}} 勋章，继续加油！</p>
+        <p v-if="medalData.id == 2" class="medalDlg-text">您的知识贡献已可解锁“{{medalData.name}}”{{medalData.level}}勋章，继续加油！</p>
+        <p v-if="medalData.id == 3" class="medalDlg-text">您的持续学习记录已可解锁“{{medalData.name}}”{{medalData.level}}勋章，继续加油！</p>
+        <p v-if="medalData.id == 4" class="medalDlg-text">您的累积学时已可解锁“{{medalData.name}}”{{medalData.level}}勋章，继续加油！</p>
+      </div>
+    </el-dialog>
+</template>
+
+<script>
+    import { mapGetters, mapActions } from 'vuex';
+    // import apiUserhobby from "@/api/phase2/userhobby.js"
+    import apiGuide from "@/api/phase2/guide.js"
+    import { swiper, swiperSlide } from 'vue-awesome-swiper';
+	export default {
+		props:{
+          // show:{
+          //   type:Boolean,
+          //   default:false
+          // }
+		},
+    data(){
+    	return {
+            dlgHeight:'650px',
+            dlgWidth:'688px',
+            leftWidth:'160px',
+            description:'',
+            fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
+            medalDlg:true,// 兴趣采集
+            medalData:{
+              id:1,
+              name:'学霸之路',
+              level:'LV.1'
+            }
+           
+    	}
+    },
+    created() {
+      //这里的以后要去掉的，不应该是这样计算的
+
+
+      //这里必须放在当前的Session存储中，不能每次都调用
+      // apiGuide.hasUser().then(res=>{
+      //    if(res.result) {
+      //     this.guideCollection = false;
+      //    } else {
+      //     this.guideCollection = true;
+
+      //    }
+      // });
+      //只是在显示时才调用
+    },
+    mounted() {
+    },
+    methods:{
+      tabImg(id) {
+        if(id==1){
+          return `${this.webBaseUrl}/images/homeWu/medal-good.png`
+        } else if(id==2) {
+          return `${this.webBaseUrl}/images/homeWu/medal-day.png`
+        } else if(id==3) {
+          return `${this.webBaseUrl}/images/homeWu/medal-study.png`
+        }  else if(id==3) {
+          return `${this.webBaseUrl}/images/homeWu/medal-up.png`
+        }
+      }
+
+    },
+    watch:{
+
+    },
+    computed:{
+      ...mapGetters(['userInfo','studyTaskCount']),
+    
+		},
+
+	}
+</script>
+
+<style  scoped lang="scss">
+   ::v-deep .medalDlg-dialog .el-dialog__header{
+      display: none;
+    }
+    ::v-deep .medalDlg-dialog .el-dialog__body{
+      padding: 0;
+      border-radius: 30px !important;
+      background: url('../../../public/images/homeWu/medal-bg-dlg.png');
+    }
+    ::v-deep .medalDlg-dialog{
+    border-radius: 30px !important;
+     .medal-dlg-box{
+      text-align: center;
+      box-sizing: border-box;
+      padding: 75px 90px 88px 90px;
+      position: relative;
+      .medal-img{
+        position: relative;
+        .img-level{
+          position: absolute;
+          top:46px;
+          left: 144px;
+          font-size: 16px;
+          color: #fff;
+          font-style:oblique;
+        }
+      }
+      .medal-del{
+        position: absolute;
+        top:46px;
+        right:46px;
+        
+      }
+      .medalDlg-title{
+        margin-top: 26px;
+        font-size: 30px;
+        font-weight: 600;
+        color: #333333;
+      }
+      .medalDlg-text{
+        margin-top: 26px;
+        font-size: 18px;
+        color: #666666;
+      }
+      
+     }
+  }  
+</style>
diff --git a/src/components/Portal/medalImg.vue b/src/components/Portal/medalImg.vue
new file mode 100644
index 00000000..b4106202
--- /dev/null
+++ b/src/components/Portal/medalImg.vue
@@ -0,0 +1,66 @@
+<template>
+    <div class="medal-icon">
+        <img :src="baseUrl+item.medalIcon" alt="" srcset="">
+        <span class="medal-text medal-level">LV.{{item.medalLevel}}</span>
+        <span class="medal-text medal-name">{{item.medalName}}</span>
+    </div>
+</template>
+<script>
+	export default {
+		props:{
+			item:{
+                type:Object,
+                default:()=>{}
+            }
+		},
+      
+        data(){
+            return {
+                baseUrl:process.env.VUE_APP_FILE_BASE_URL,
+            }
+        },
+        created() {
+        // this.userAvatar=require("@/assets/images/user/default.png");
+        },
+        mounted() {
+        
+        },
+        methods:{
+        
+        },
+        watch:{
+    
+        },
+        computed:{
+
+
+        }
+}
+</script>
+
+<style scoped lang="scss">
+.medal-icon{
+     position: relative;
+     width: 143px;
+     height: 161px;
+     img{
+         width: 100%;
+         height: 100%; 
+     }
+     .medal-text{
+         position: absolute;
+         font-size: 14px;
+         color: #e7d9cc;
+         font-weight: 600;
+         left:50%;
+         transform: translateX(-50%);
+     }
+     .medal-level{
+         top:22%;
+         font-style: italic;
+     }
+     .medal-name{
+         bottom: 10%;
+       }
+   }
+</style>
diff --git a/src/components/Portal/noteComment.vue b/src/components/Portal/noteComment.vue
new file mode 100644
index 00000000..0bd15488
--- /dev/null
+++ b/src/components/Portal/noteComment.vue
@@ -0,0 +1,937 @@
+<template>
+    <!--笔记组件-->
+    <div class="comments">
+      <div v-if="showTop" class="comments-top">
+            <div class="comments-top-left portal-title-tow" style="font-size: 18px;">{{total}}条笔记
+                <el-checkbox v-if="objType ==2" class="btn" v-model="value" type="primary">只看作者</el-checkbox>
+                <el-checkbox v-if="objType ==3" class="btn" v-model="value" type="primary">{{'只看案主'}}</el-checkbox>
+                <span v-if="objType ==3" class="anzhu"> @案主可以给他发私信哦</span>
+            </div>
+        </div>
+        <!--列表内容-->
+        <div class="comments-items" v-show="listShow">
+            <!--一个评论-->
+            <div class="zan-wu" v-if="list.length == 0">暂无公开笔记～</div>
+            <div class="comment" v-for="(com,comIdx) in list" :key="com.id">
+                 <div class="comment-top">
+                    <div class="comment-author">
+                        <authorInfo :avatar="com.avatar" :name="com.name" :sex="com.sex"  :info="com.orgInfo" :sign="com.sign"></authorInfo>
+                    </div>
+                 </div>
+                 <div class="comment-body" >
+                      <div class="comment-info" @mouseover="showButtons(com.id)" @mouseout="hideButtons()">
+                        <div class="comment-content" @click="cancelReply()">
+                            <span class="play-time" v-if="com.playTime>0"><img :src="`${webBaseUrl}/images/coteplay.png`" alt=""> {{  getHMS(com.playTime) }}</span>
+                            <span class="portal-summary-text" style="color: #666666;" v-html="displayAll(com)"></span>
+                            <span v-if="com.content.length>170" @click="changeIsAll(com)">
+                              {{com.isAll?'收起':'全文'}}
+                            </span>
+                        </div>
+                        <div class="comment-time portal-time">
+                          <showTime :time="com.sysCreateTime"></showTime>
+                          <interactBar :type="6" :shares="false"  :data="com" @addAnswers="showReply(com)" :views="false" :comments="false" :answers="true"></interactBar>
+                        </div>
+                        <div v-if="replyInfo.parentId==com.id" class="comment-reply" style="padding-bottom: 5px;margin-top: 20px;">
+                          <div style="width:100%;display:flex;">
+                            <div style="flex: 1;">
+                              <el-input class="hideControl" type="textarea" show-word-limit v-model="replyInfo.content"  maxlength="800" placeholder="回复内容..."></el-input>
+                            </div>
+                            <div style="width: 120px;display: flex;justify-content: flex-end;">
+                              <el-button @click="submitReply(com)" type="primary">发布回复</el-button>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <!--回复内容-->
+                      <div v-if="com.replyList && com.replyList.length>0">
+                           <div class="comment" v-for="(reply,replyIdx) in com.replyList" :key="reply.id" v-if="com.showAll || replyIdx<3" :class="replyIdx===com.replyList.length-1 ? 'comment-last' : ''">
+                                <div class="comment-top">
+                                   <div class="comment-author">
+                                     <authorInfo :avatar="reply.avatar" :name="reply.sysCreateBy" :sex="reply.sex" :info="reply.orgInfo" :sign="reply.sign"></authorInfo>
+                                     <span style="margin-left: 10px;color: #8590A6;font-size:14px; ">
+                                      <!-- <svg-icon style="font-size: 10px;margin-right: 0;" icon-class="triangle"></svg-icon> -->
+                                      <span>回复了</span>
+                                    </span>
+                                     <span style="margin-left: 6px;font-size:14px;" class="portal-title-tow" >{{reply.replyName || reply.toAname}}</span>
+                                   </div>
+                                </div>
+                                <div class="comment-body" @mouseover="showButtons(reply.id)" @mouseout="hideButtons()">
+                                  <div class="comment-info" >
+                                     <div class="comment-content"  @click="cancelReply()">
+                                          <span class="portal-summary-text" style="color: #666666;" v-html="displayAll(reply)"></span>
+                                          <span v-if="reply.content.length>170" @click="changeIsAll(reply)">
+                                            {{reply.isAll?'收起':'全文'}}
+                                          </span>
+                                      </div>
+                                      <div class="comment-time portal-time">
+                                       <showTime :time="reply.sysCreateTime"></showTime>
+                                       <interactBar :type="60" :shares="false"  :data="reply" @addAnswers="showReply(reply)" :views="false"  :favorites="false" :comments="false" :answers="true"></interactBar>
+                                      </div>
+                                  </div>
+                                  <!--发布回复-->
+                                  <div v-if="replyInfo.parentId==reply.id" class="comment-reply" style="padding-bottom: 5px;margin-top: 20px;">
+                                       <div style="width:100%;display:flex;">
+                                          <div style="flex: 1;">
+                                           <el-input show-word-limit class="hideControl" type="textarea" v-model="replyInfo.content"  maxlength="100" placeholder="回复内容..."></el-input>
+                                         </div>
+                                         <div style="width: 120px;display: flex;justify-content: flex-end;">
+                                           <el-button @click="submitReplyAdd(com)" type="primary">发布回复</el-button>
+                                         </div>
+                                       </div>
+                                     </div>
+                                </div>
+                           </div>
+                           <div v-if="!com.showAll && com.replyList.length>3" style="padding-left: 45px;padding-bottom: 10px;" @click="loadReplyMore(com)"><span style="color: #9e9e9e;cursor: pointer; border-radius: 5px;border:1px solid #cccccc;padding: 5px 10px;font-size: 14px;">加载更多&gt;&gt;</span></div>
+                      </div>
+                    </div>
+                </div>
+        </div>
+        <div class="pagination-div">
+           <!-- v-if="moreState == 1 -->
+            <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
+            <span class="pag-text-msg" style="font-size:14px;color: #444444;" v-else-if="list.length !== 0 && moreState == 3">没有更多数据了</span>
+        </div>
+        <el-dialog title="全部回复内容" width="60%" :visible.sync="replyDiaglog.show" :close-on-click-modal="false" custom-class="g-dialog">
+            <div style="padding: 10px;max-height: 500px;overflow-y: auto;">
+                <div class="comment" v-for="(reply,rIdx) in replyDiaglog.list" :key="rIdx">
+                     <div class="comment-top">
+                        <div class="comment-author">
+                            <authorInfo :avatar="reply.avatar" :name="reply.sysCreateBy" :sex="reply.sex" :info="reply.orgInfo"></authorInfo>
+                            <span style="margin-left: 10px;color: #8590A6;font-size:14px; ">回复</span>
+                            <span style="margin-left: 10px; font-size:14px">{{reply.replyName || reply.toAname}}</span>
+                        </div>
+                        <div class="comment-time">
+                            <showTime :time="reply.sysCreateTime"></showTime>
+                        </div>
+                     </div>
+                     <div class="comment-body"  @mouseover="showButtons(reply.id)" @mouseout="hideButtons()">
+                          <div class="comment-info">
+                            <div class="comment-content">{{reply.content}}</div>
+                            <div class="comment-btns"><!--操作还没有加-->
+                                <div v-show="btnsShowRowId==reply.id">
+                                  <a  @click="showDlgReply(reply)"><svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>回复</span></a>
+                                  <a  v-if="userInfo.aid==reply.sysCreateAid" @click="delDlgReply(reply,rIdx)"><svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>删除</span></a>
+                                </div>
+                            </div>
+                          </div>
+                          <!--发布回复-->
+                          <div v-if="replyInfo.parentId==reply.id" class="comment-reply" style="padding-bottom: 5px;">
+                           <div style="width:100%;display:flex;">
+                              <div style="flex: 1;">
+                               <el-input show-word-limit class="hideControl" type="textarea" v-model="replyInfo.content"  maxlength="100" placeholder="回复内容..."></el-input>
+                             </div>
+                             <div style="width: 120px;display: flex;justify-content: flex-end;">
+                               <el-button @click="submitDlgReply(com)" type="primary">发布回复</el-button>
+                             </div>
+                           </div>
+                         </div>
+                    </div>
+                </div>
+                <div  style="padding: 20px 10px;text-align: center;">
+                    <div v-if="replyDiaglog.pages>replyDiaglog.pageIndex">
+                      <span class="pag-text" @click="loadMoreReply()">加载更多</span>
+                    </div>
+                    <div v-else >
+                      <span class="pag-text-msg">没有更多数据了</span>
+                    </div>
+                </div>
+            </div>
+            <span slot="footer" class="dialog-footer">
+              <el-button @click="replyDiaglog.show= false"> 关 闭 </el-button>
+            </span>
+        </el-dialog>
+    </div>
+  </template>
+  <script>
+    import showTime from '@/components/Portal/datetimeShow.vue'
+    import interactBar from "@/components/Portal/interactBar.vue";
+    import apiComment from '@/api/modules/comments.js'
+    import apiUser from '@/api/system/user.js'
+    import authorInfo from '@/components/Portal/commentAuthor.vue';
+    import apiNote from '@/api/phase2/note.js';
+    import {getHMS} from '@/utils/tools.js';
+    // import author from '@/components/Portal/author.vue';
+    import { mapGetters } from 'vuex';
+    export default {
+        props:{
+            showTop:{
+                type:Boolean,
+                default:true
+            },
+        authorId:{
+          type:String,
+        },
+        objId:{
+          type:String,
+          required:true
+        },
+        objType:{
+          type:Number,
+          required:true
+        },
+        objTitle:{
+          type:String,
+          default:''
+        },
+        toUsers:{
+          type:Array,
+        },
+
+        readonly:{
+          type:Boolean,
+          default:false
+        },
+        name:{
+          type:String,
+          default:''
+        }
+        },
+      components:{showTime,authorInfo,interactBar},
+      computed: {
+        ...mapGetters(['userInfo'])
+      },
+        data() {
+            return {
+              getHMS,
+              replyLoading:false,
+          radio:1,
+          value:false,
+          sex:null,
+          author:'',
+          moreState:1,
+          isAuthor: false,
+          authorList:[],//当前页面存储的用户信息，如果已经存在就不再重新请求了
+          toUserId: '',
+          loadStatus:'more',//more,loading,noMore
+          pageSize:10,
+          pageIndex:1,
+          total:0,
+          listShow:true,
+          inputValue:'',
+          list:[],
+          replyParent:{},
+          replyShow:false,
+          btnsShowRowId:'',
+          replyInfo:{
+            clevel:2,
+            parentId:'',
+            replyAid:'',
+            commentId:'',
+            replyName:'',
+            objType:'',
+            objId:'',
+            content:''
+          },
+          replyDiaglog:{
+            show:false,
+            pageIndex:1,
+            pageSize:8,
+            pages:1,
+            count:0,
+            commentId:'',
+            list:[]
+          },
+          toUserDig:{
+            show:false,
+            name:'',
+            chooseUserId:'',
+            chooseUserName:'',
+            list:[]
+          },
+          visible:false,
+            }
+        },
+      watch:{
+        value(newVal,oldVal){
+          if(newVal){
+            this.author = this.authorId;
+          } else {
+            this.author = '';
+          }
+          this.loadData();
+        },
+        radio(newVal){
+          if(newVal == 2){
+            this.author = this.authorId;
+          } else {
+            this.author = '';
+          }
+          this.loadData();
+        },
+        inputValue(val,oldVal) {
+         let fu = val.substr(-1);
+         if(fu == '@'&&!oldVal) {
+           this.toUserId = '';
+            if(this.toUsers.length == 1 && this.toUsers.length !== 0) {
+              this.toUserDig.chooseUserId = this.toUsers[0].aid;
+              this.toUserDig.chooseUserName=this.toUsers[0].name;
+              this.inputValue+=this.toUsers[0].name;
+            }else {
+              this.$refs.tag.$el.click();
+            }
+         }
+        }
+      },
+      mounted() {
+        this.author = this.authorId;
+        this.loadData(false);
+        this.$bus.$on('noteListRefresh',(val)=>{
+          this.loadData();
+        })
+      },
+      methods: {
+        loadReplyMore(item){
+           item.showAll=true;
+        },
+        loadMore() {
+          this.pageIndex +=1;
+          this.loadData(true);
+        },
+        loadAuthorInfo(list,ids){ //加载作者信息，头像，机构信息
+          if(ids.length==0){
+            return;
+          }
+          const noReapetIds=[...new Set(ids)]
+          apiUser.getByIds(ids).then(res=>{
+            if(res.status==200){
+              list.forEach((item,index)=>{
+                res.result.some(author=>{
+                  if(author.aid==item.sysCreateAid){
+                    item.avatar=author.avatar;
+                    item.orgInfo=author.orgInfo;
+                    item.sex=author.sex;
+                    item.name=author.name;
+                    item.sign=author.sign;
+                    return true;
+                  }else{
+                    return false;
+                  }
+                })
+              });
+            }else{
+              console.log('加载用户头像信息:'+res.error);
+              //this.$message.error(res.message);
+            }
+          });
+        },
+        // cancelTeacher() {
+        //   this.inputValue =  this.inputValue.substr(0,  this.inputValue.length -1);
+        //   this.visible = false;
+        // },
+        confirmTeacher() {
+           this.toUserDig.chooseUserId = this.toUserId;
+           this.toUsers.forEach(item=>{
+             if(item.aid == this.toUserId) {
+                this.toUserDig.chooseUserName=item.name;
+                this.inputValue+=item.name;
+             }
+           })
+         this.visible = false;
+        },
+        loadData(append){
+          let params={
+            pageIndex:this.pageIndex,
+            pageSize:this.pageSize,
+            openType:1,
+            courseId:this.objId,
+          }
+          let $this=this;
+          apiNote.coursePage(params).then(res=>{
+              if(res.status==200){
+                let ids=[];
+                let allList=[];
+                res.result.list.forEach(item=>{
+                  item.answers=item.comments;
+                  item.showAll=false;
+                  item.title = this.name;
+                  item.replyList = [];
+                  item.avatar='';
+                  item.orgInfo='';
+                  item.name='';
+                  item.isAll=false;
+                  //item.sex=null;
+                  allList.push(item);
+                  ids.push(item.sysCreateAid);
+                  //没有replyList
+                  if(item.replyList && item.replyList!=''){
+                      item.replyList.forEach(reply=>{
+                        reply.answers=reply.replys;
+                        reply.title=this.name;
+                        reply.avatar='';
+                        reply.orgInfo='';
+                        reply.name='';
+                        reply.sex=null;
+                        reply.isAll=false;
+                        allList.push(reply);
+                        ids.push(reply.sysCreateAid);
+                      })
+                  }
+
+                  let query={
+                    objType:6,
+                    objId:item.id
+                  }
+                  //console.log(item,'item'); 去读取回复 
+                  //2022-11-2日与产品（润博）确认，笔记回复只显示一级，不显示二级: "value",
+                  //直接修改后台，查询全部
+                  apiComment.listQuery(query).then(res2=>{
+                    if(res2.status == 200 && res2.result.length > 0) {
+                      let ids = [];
+                      //let allList=[];
+                      res2.result.forEach(it=>{
+                        ids.push(it.sysCreateAid);
+                        it.answers=it.replys;
+                        it.replyList = [];
+                        it.avatar='';
+                        it.orgInfo='';
+                        it.name='';
+                        it.isAll=false;
+                        //allList.push(it);
+                        //二级
+
+                      });
+                      //let ids = res.result.list.map(item=>item.sysCreateAid);
+                      const noReapetIds=[...new Set(ids)]
+                      this.loadAuthorInfo(res2.result,noReapetIds);
+                      //加载回复内容
+                      item.replyList.push(...res2.result);
+                    }
+                  })
+                });
+                this.loadAuthorInfo(allList,ids);
+                this.total=res.result.count;
+                if(append){
+                  res.result.list.forEach(item=>{
+                    $this.list.push(item);
+                  });
+                }else{
+                  $this.list=res.result.list;
+                }
+                if($this.list.length == this.total) {
+                  this.moreState = 3;
+                }
+                this.$emit('writeTotal',this.total);
+              }else{
+                this.$message.error(res.message);
+              }
+          });
+        },
+        showList(flag){
+          this.listShow=flag;
+        },
+        submit(){
+          if(this.inputValue.trim()!=''){
+            let cdata={
+              objType:this.objType,
+              objId:this.objId,
+              parentId:'-1',
+              content:this.inputValue.trim(),
+              clevel:1,
+              toAid:'',
+              toAname:'',
+            }
+            if(this.toUserDig.chooseUserId!=='' && this.toUserDig.chooseUserName!=''){
+              cdata.toAid=this.toUserDig.chooseUserId;
+              cdata.toAname=this.toUserDig.chooseUserName;
+
+            }
+
+            apiComment.add(cdata).then(res=>{
+              if(res.status==200){
+                  // this.list.unshift(res.result);
+                  // this.sex =
+                  res.result.title = this.name;
+                  res.result.sex=null;
+                  res.result.isAll=false;
+                  this.list.unshift(res.result);
+                  this.loadAuthorInfo([res.result],[res.result.sysCreateAid]);
+                  this.$message.success('发布成功');
+                  //
+
+                  this.total++;
+                  this.$emit('success',res.result);
+                  this.inputValue='';
+                  this.toUserDig.chooseUserId='';
+                  this.toUserDig.chooseUserName='';
+              }else{
+                  this.$message.error(res.message);
+              }
+            });
+
+          }
+
+        },
+        showButtons(id){
+          if(!this.readonly){
+            this.btnsShowRowId=id;
+          }
+        },
+        hideButtons(){
+          this.btnsShowRowId='';
+        },
+        //展示全部
+        displayAll(item) {
+          let content = '';
+          content = item.content.replace(/(\n){2,}/,'<br>');
+          item.content = content;
+          if(!item.isAll && item.content && item.content.length > 150) {
+              return item.content.slice(0, 150) + "...";
+          }
+          return item.content;
+        },
+        changeIsAll(item) {
+          item.isAll=!item.isAll;
+        },
+        showReply(item){
+            this.replyInfo.objType=this.objType;
+            this.replyInfo.objId=item.id;
+            this.replyInfo.parentId=item.id;
+            this.replyInfo.replyAid=item.sysCreateAid;
+            this.replyInfo.replyName=item.sysCreateBy;
+            this.replyInfo.toAid='';
+            this.replyInfo.toAname='';
+            this.replyInfo.clevel=1;
+            this.replyShow=true;
+        },
+        cancelReply(){
+          this.replyInfo.parentId='';
+        },
+        submitReply(comment){
+          if(this.replyLoading) {
+            return
+          }
+          this.replyLoading = true;
+          this.replyInfo.content = this.replyInfo.content.trim();
+          if(this.replyInfo.content==''){
+            return;
+          }
+          this.replyInfo.content=this.replyInfo.content.replace(/^\s*|\s*$/g,"");
+          if(this.replyInfo.content==''){
+            return;
+          }
+          // this.replyInfo.commentId='1037320008252829696';
+          // if(comment.replyList==''){
+          //   comment.replyList=[];
+          // }
+          this.replyInfo.parentId='-1';
+
+          apiComment.add(this.replyInfo).then(res=>{
+            this.replyLoading = false;
+             if(res.status==200){
+                res.result.sex = null;
+                res.result.isAll=false;
+                this.loadAuthorInfo([res.result],[res.result.sysCreateAid]);
+                comment.replyList.push(res.result);
+                this.replyInfo.parentId='';
+                this.replyInfo.content='';
+                this.$message.success("发布成功");
+             }else{
+                this.$message.error(res.message);
+             }
+          });
+        },
+
+        // 课程笔记评论的回复
+        submitReplyAdd(comment){
+          if(this.replyLoading) {
+            return
+          }
+          this.replyLoading = true;
+          this.replyInfo.content = this.replyInfo.content.trim();
+          if(this.replyInfo.content==''){
+            return;
+          }
+          this.replyInfo.content=this.replyInfo.content.replace(/^\s*|\s*$/g,"");
+          if(this.replyInfo.content==''){
+            return;
+          }
+          // this.replyInfo.commentId='1037320008252829696';
+          // if(comment.replyList==''){
+          //   comment.replyList=[];
+          // }
+
+          this.replyInfo.commentId=comment.id;
+          if(comment.replyList=='' || comment.replyList==null){
+            //this.replyInfo.commentId='';
+          }else{
+            //this.replyInfo.commentId=comment.replyList[0].id;
+            this.replyInfo.clevel = 2;
+          }
+
+
+          apiComment.reply(this.replyInfo).then(res=>{
+            this.replyLoading = false;
+             if(res.status==200){
+                res.result.sex = null;
+                res.result.isAll=false;
+                this.loadAuthorInfo([res.result],[res.result.sysCreateAid]);
+                comment.replyList.push(res.result);
+                this.replyInfo.parentId='';
+                this.replyInfo.content='';
+                this.$message.success("发布成功");
+             }else{
+                this.$message.error(res.message);
+             }
+          });
+        },
+
+        delCommnet(com,idx){
+          if(com.replyList!='' && com.replyList.length>0){
+            this.$message.error('有回复的评论不能删除');
+            return;
+          }
+          this.$confirm('您确定要删除所选评论吗?', '删除提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                  }).then(() => {
+                      apiComment.del(com.id,this.userInfo.aid).then(res=>{
+                            if(res.status==200){
+                               this.list.splice(idx,1);
+                               this.total--;
+                               this.$message.success("删除成功");
+                               this.$emit('delSuccess');
+                            }else{
+                               this.$message.error(res.message);
+                            }
+                      });
+                  });
+
+
+        },
+        delReply(com,re,idx){
+          // if(com.replyList!='' && com.replyList.length>0){
+          //   this.$message.error('有回复的评论不能删除');
+          // }
+          let params={
+            id:re.id,
+            user:this.userInfo.aid,
+            pid:re.parentId
+          }
+          this.$confirm('您确定要删除所选评论吗?', '删除提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                  }).then(() => {
+                      apiComment.delReply(params).then(res=>{
+                         if(res.status==200){
+                            com.replyList.splice(idx,1);
+                            this.$message.success("删除成功");
+                         }else{
+                            this.$message.error(res.message);
+                         }
+                  });
+          })
+        },
+        delDlgReply(re,idx){ //弹出窗口中的删除操作
+          let params={
+            id:re.id,
+            user:this.userInfo.aid,
+            pid:re.parentId
+          }
+          let $this=this;
+          this.$confirm('您确定要删除所选评论吗?', '删除提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                  }).then(() => {
+                      apiComment.delReply(params).then(res=>{
+                         if(res.status==200){
+                            $this.replyDiaglog.list.splice(idx,1);
+                            $this.$message.success("删除成功");
+                         }else{
+                            $this.$message.error(res.message);
+                         }
+                  }).catch(()=>{
+
+                  })
+          })
+        },
+        showDlgReply(item){
+          this.replyInfo.objType=this.objType;
+          this.replyInfo.objId=this.objId;
+          this.replyInfo.parentId=item.id;
+          this.replyInfo.replyAid=item.sysCreateAid;
+          this.replyInfo.replyName=item.sysCreateBy;
+          this.replyShow=true;
+        },
+        submitDlgReply(){
+            this.replyInfo.content = this.replyInfo.content.trim();
+            if(this.replyInfo.content==''){
+              return;
+            }
+            this.replyInfo.content=this.replyInfo.content.replace(/^\s*|\s*$/g,"");
+            if(this.replyInfo.content==''){
+              return;
+            }
+            this.replyInfo.commentId=this.replyDiaglog.commentId;
+
+            apiComment.reply(this.replyInfo).then(res=>{
+               if(res.status==200){
+                  res.result.sex = null;
+                  res.result.isAll=false;
+                  this.loadAuthorInfo([res.result],[res.result.sysCreateAid]);
+                  this.replyDiaglog.list.push(res.result);
+                  this.replyInfo.parentId='';
+                  this.replyInfo.content='';
+                  this.$message.success("发布成功");
+               }else{
+                  this.$message.error(res.message);
+               }
+            });
+        },
+        showMoreReply(comment){
+          this.replyDiaglog.pages=1;
+          this.replyDiaglog.count=0;
+          this.replyDiaglog.pageIndex=1;
+          this.replyDiaglog.list=[];
+          this.replyDiaglog.show=true;
+          this.replyDiaglog.commentId=comment.id;
+          this.loadAllReplyData(false);
+        },
+        loadMoreReply(){
+          this.replyDiaglog.pageIndex++;
+          this.loadAllReplyData(true);
+        },
+        loadAllReplyData(append){
+          let params={
+            pageIndex:this.replyDiaglog.pageIndex,
+            pageSize:this.replyDiaglog.pageSize,
+            type:this.objType,
+            commentId:this.replyDiaglog.commentId
+          }
+          let $this=this;
+          apiComment.replyList(params).then(rs=>{
+            if(rs.status==200){
+              $this.replyDiaglog.count=rs.result.count;
+              $this.replyDiaglog.pages=rs.result.totalPages;
+              let ids=[];
+              if(append){
+                rs.result.list.forEach(item=>{
+                  item.avatar='';
+                  ids.push(item.sysCreateAid);
+                  $this.replyDiaglog.list.push(item);
+                })
+              }else{
+                rs.result.list.forEach(item=>{
+                  item.avatar='';
+                  ids.push(item.sysCreateAid);
+                })
+                $this.replyDiaglog.list=rs.result.list;
+              }
+              this.loadAuthorInfo(rs.result.list,ids);
+            }else{
+              this.$message.error(rs.message);
+            }
+          })
+        },
+        showToUser(){
+            this.toUserDig.show=true;
+            this.toUserDig.chooseUserId='';
+            this.toUserDig.chooseUserName='';
+        },
+        findUserKeyupEnter(){
+          this.findUser();
+        },
+        findUser(){
+            this.toUserDig.list=[];
+            var name=this.toUserDig.name;
+            if(name==''){
+              return;
+            }
+            apiUser.findByName(name).then(rs=>{
+               if(rs.status==200){
+                 this.toUserDig.list=rs.result;
+               }else{
+                 this.$message.error('查询用户失败');
+               }
+            })
+
+        },
+        confirmUser(u){
+          this.toUserDig.chooseUserId=u.aid;
+          this.toUserDig.chooseUserName=u.name;
+          this.toUserDig.show=false;
+          this.toUserDig.name='';
+        }
+        }
+    }
+  </script>
+
+  <style lang="scss" scoped>
+  .anzhu{
+    font-size: 14px;
+    color: #999;
+  }
+  ::v-deep .el-input--medium .el-input__inner {
+    height: 48px;
+  }
+
+   ::v-deep .at-min{
+      .el-popper[x-placement^=bottom] {
+        // left: 0 !important;
+        // bottom: 0 !important;
+        margin-left: 30px !important;
+      }
+      .el-popover{
+
+      }
+  }
+  .tag-block{
+     top:0;
+     left: 0;
+      position: absolute;
+      background-color: #fff;
+      border-color: #fff;
+
+      height: 1px;
+  }
+  .pag-text{
+    border: 1px solid #292828;
+    padding: 10px 20px;
+    border-radius: 20px;
+    background: #fff;
+    cursor: pointer;
+  }
+  .reference-tag{
+    display: block;
+    // width: 100%;
+    .el-radio-button__inner{
+         border: 1px solid #fff !important;
+    }
+
+  }
+    .svg-btn{
+      font-size: 30px;
+      line-height: 30px;
+      margin-right: 20px;
+      cursor: pointer;
+      margin-top: 5px;
+    }
+    .comments{
+          margin-top: 10px;
+          background-color: #FFFFFF;
+      padding: 26px 15px;
+      .comment-time{
+        display: flex;
+        padding-left: 12px;
+        justify-content: space-between;
+          margin-top: 10px;
+          color: #666666;
+          font-size: 12px;
+        }
+          .comments-top{
+              display: flex;
+              justify-content: space-between;
+              padding:10px;
+              // border-bottom: 1px solid #f4f4f4;
+              font-weight: 500;
+              font-size: 1.1em;
+        .comments-top-left{
+          .btn{
+            // width: 68px;
+            // height: 32px;
+            // background: #3C7EFF;
+            border-radius: 6px;
+            font-size: 12px;
+            padding: 10px;
+            margin-left: 24px;
+           ::v-deep .el-radio__inner{
+              border-radius: 0 !important;
+            }
+          }
+        }
+        .comments-top-center{
+
+        }
+        .comments-top-right{
+            color: #6b6b6b;
+            cursor: pointer;
+        }
+          }
+      .comments-input{
+        padding: 20px 15px 10px 15px;
+      }
+          .comments-items{
+         padding: 5px 15px;
+         .zan-wu{
+           text-align: center;
+           font-size: 18px;
+           color: #6666;
+         }
+          }
+      }
+    .comment{
+        margin-top: 20px;
+        background-color: #FFFFFF;
+        margin-bottom: 30px;
+      // border-bottom: 1px solid #dddddd;
+        .comment-top{
+            display: flex;
+            justify-content: space-between;
+            padding-bottom:10px;
+            font-weight: 500;
+        line-height: 30px;
+            font-size: 1.1em;
+        .comment-author{
+          display: flex;
+          align-items: center;
+            height: 30px;
+          line-height: 30px;
+        }
+        }
+        .comment-body{
+          letter-spacing:1px;
+            padding-left: 40px;
+        .comment-content{
+            padding-bottom: 0px;
+            white-space: pre-wrap;
+            word-break:break-all;
+            padding-left:14px;
+            .play-time{
+              display: inline-block;
+              padding: 2px 8px;
+              border-radius: 8px;
+              border: 1px solid #3379fb;
+              margin-right: 5px;
+              img{
+                vertical-align: top;
+                margin-top: 2px;
+              }
+            }
+            span {
+              color: #409eff;
+              cursor: pointer;
+              // margin-left: 5px;
+            }
+        }
+        .comment-btns{
+          // padding: 5px 10px 10px 0px;
+          height: 35px;
+          line-height: 35px;
+          a{
+            margin-right:15px;
+            span{
+              margin-left: 6px;
+              color: #8590A6;
+              font-size: 14px;
+            }
+          }
+        }
+        }
+      .comment-replys{
+        padding-left: 40px;
+        margin-top: 20px;
+      }
+    }
+  .comment-last{
+    border-bottom: none;
+  }
+  ::v-deep .hideControl{
+    .el-input__count{
+    }
+    .el-textarea__inner{
+      padding-right: 50px;
+    }
+  }
+  </style>
diff --git a/src/components/PortalFloatTools.vue b/src/components/PortalFloatTools.vue
index e1c49cf0..2cdbf9bf 100644
--- a/src/components/PortalFloatTools.vue
+++ b/src/components/PortalFloatTools.vue
@@ -3,35 +3,59 @@
   <div>
     <div class="float-tools">
 
-      <div class="float-tool-icon" @click="toNeedCourse" v-if="identity>1">
+      <div class="float-tool-icon" style="margin-bottom:2px" @click="toNeedCourse" v-if="identity>1">
         <!-- <svg-icon class-name="icon"  icon-class="lessons"></svg-icon> -->
-          <div class="float-img"><img :src="`${webBaseUrl}/images/explo.png`" alt=""></div>
-        <span>做课程</span>
+          <div class="float-img">
+             <el-tooltip popper-class="popper-class" effect="dark" content="做课程" placement="top-start">
+                 <img :src="`${webBaseUrl}/images/explo.png`" alt="">
+             </el-tooltip>
+          </div>
+        <!-- <span>做课程</span> -->
       </div>
       <div class="float-tool-icon" @click="$refs.addQuestion.askQuestionDialog = true">
         <!-- <svg-icon class-name="icon"  icon-class="problem"></svg-icon> -->
-         <div class="float-img"><img :src="`${webBaseUrl}/images/issue.png`" alt=""></div>
-        <span>提问题</span>
+          <div class="float-img" title="提问题">
+           <el-tooltip popper-class="popper-class" effect="dark" content="提问题" placement="top-start">
+              <img :src="`${webBaseUrl}/images/issue.png`" alt="">
+           </el-tooltip>
+          </div>
+        <!-- <span>提问题</span> -->
       </div>
       <div class="float-tool-icon" @click="toAddArticle()">
         <!-- <svg-icon class-name="icon"  icon-class="essay"></svg-icon> -->
-       <div class="float-img">  <img :src="`${webBaseUrl}/images/essay.png`" alt=""></div>
-        <span>写文章</span>
+       <div class="float-img" title="写文章">
+          <el-tooltip popper-class="popper-class" effect="dark" content="写文章" placement="top-start">
+            <img :src="`${webBaseUrl}/images/essay.png`" alt="">
+           </el-tooltip>
+        </div>
+        <!-- <span>写文章</span> -->
       </div>
       <div class="float-tool-icon" @click="showFeedback()">
         <!-- <svg-icon class-name="icon"  icon-class="agree"></svg-icon> -->
-       <div class="float-img">  <img :src="`${webBaseUrl}/images/opinion.png`" alt=""></div>
-        <span>提意见</span>
+       <div class="float-img" title="提意见"> 
+         <el-tooltip popper-class="popper-class" effect="dark" content="提意见" placement="top-start">
+          <img :src="`${webBaseUrl}/images/opinion.png`" alt="">
+         </el-tooltip>
+       </div>
+        <!-- <span>提意见</span> -->
       </div>
       <div class="float-tool-icon" @click="infoShow=true">
         <!-- <svg-icon class-name="icon"  icon-class="server"></svg-icon> -->
-        <div class="float-img"> <img :src="`${webBaseUrl}/images/contact.png`" alt=""></div>
-        <span>联系我们</span>
+        <div class="float-img" title="联系我们">
+          <el-tooltip popper-class="popper-class" effect="dark" content="联系我们" placement="top-start">
+            <img :src="`${webBaseUrl}/images/contact.png`" alt="">
+            </el-tooltip>
+          </div>
+        <!-- <span>联系我们</span> -->
       </div>
-      <div class="float-tool-icon" @click="backtop">
+      <div class="float-tool-icon"  style="margin-top:2px" @click="backtop">
         <!-- <svg-icon class-name="icon"  icon-class="top"></svg-icon> -->
-       <div class="float-img"> <img :src="`${webBaseUrl}/images/back.png`" alt=""></div>
-        <span>返回顶部</span>
+       <div class="float-img" title="返回顶部"> 
+         <el-tooltip popper-class="popper-class" effect="dark" content="返回顶部" placement="top-start">
+           <img :src="`${webBaseUrl}/images/back.png`" alt="">
+         </el-tooltip>
+        </div>
+        <!-- <span>返回顶部</span> -->
       </div>
     </div>
     <!-- <div class="float-tools">
@@ -136,7 +160,7 @@ export default {
     }
   },
   computed: {
-      ...mapGetters(['identity'])
+      ...mapGetters(['identity','userInfo'])
   },
   methods: {
     saveSuccess(){
@@ -162,6 +186,20 @@ export default {
                   message:'提交意见成功'
                 });
                 this.feedbackDlgShow=false;
+
+                let event = {
+                  key: "Feedback",//后台的事件key
+                  title: "意见反馈",//事件的标题
+                  parameters:"",//用户自定义参数 name:value,name:value
+                  content: '意见反馈',//事件的内容
+                  objId: res.result.id,//关联的id
+                  objType:'99',//关联的类型
+                  objInfo: "意见反馈",
+                  aid: this.userInfo.aid, //当前登录人的id
+                  aname: this.userInfo.name,//当前人的姓名
+                  status: 1 //状态，直接写1
+                }
+                this.$store.dispatch("userTrigger", event);
               } else {
                 this.$message({
                   type:'error',
@@ -220,23 +258,28 @@ export default {
 }
 </script>
 <style scoped lang="scss">
+  .popper-class{
+    background-color: #ccc;
+  }
   .float-tools{
     position: fixed;
-    background: white;
+    // background: white;
     // box-shadow:0px 0px 10px #999;
-    border-radius: 2px;
-    border: 1px solid #f0f0f0;
-    right: 10px;
-    bottom: 40px;
-    padding:0 8px;
+    border-radius: 4px;
+    // border: 1px solid #f0f0f0;
+    right: 15px;//由24修改为15
+    bottom: 126px;
+    // padding:0 8px;
     display: flex;
     flex-direction: column;
     align-items: center;
     z-index: 999;
     .float-tool-icon{
+      background: white;
+      padding:8px;
       cursor: pointer;
-      padding: 8px 0;
-      border-bottom: 1px solid #999;
+      // padding: 8px 0;
+      // border-bottom: 1px solid #999;
       display: flex;
       flex-direction: column;
       align-items: center;
@@ -250,8 +293,8 @@ export default {
           padding-top: 5px;
         }
       .float-img{
-         width: 20px;
-         height: 20px;
+         width: 16px;
+         height: 16px;
 
          img{
            width: 100%;
diff --git a/src/components/PortalFooter.vue b/src/components/PortalFooter.vue
index a32c0f20..c52502da 100644
--- a/src/components/PortalFooter.vue
+++ b/src/components/PortalFooter.vue
@@ -1,8 +1,13 @@
 <template>
-  <div class="portal-footer" :style="`background-image:url(${this.webBaseUrl}/images/bg_foot.png)`">
+  <div class="portal-footer" >
+    <!-- :style="`background-image:url(${this.webBaseUrl}/images/bg_foot.png)`" -->
     <div class="center">
-      <div class="center-img1" style="margin-left: 100px;"><img  :src="`${this.webBaseUrl}/images/foot_center.png`"/> </div>
-      <div class="center-img2"><img  :src="`${this.webBaseUrl}/images/foot_code.png`"/> </div>
+      <div class="center-img1" style="margin-left: 100px;">
+        <!-- <img  :src="`${this.webBaseUrl}/images/foot_center.png`"/>  -->
+        </div>
+      <div class="center-img2">
+        <!-- <img  :src="`${this.webBaseUrl}/images/foot_code.png`"/> -->
+         </div>
     </div>
   </div>
 </template>
@@ -46,7 +51,7 @@ export default {
   position: relative;
   margin-top: 30px;
   box-sizing: border-box;
-  height: 300px;
+  //height: 300px;
   //background-image: url(/pc/images/bg_foot.png);
   background-position: center;
   background-repeat: no-repeat;
diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index f06e04c6..ddb4d6fe 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -1,18 +1,40 @@
 <template>
   <div class="portal-header">
-    <div class="portal-content xcontent">
-      <div style="display: flex;justify-content: space-between;">
-        <div style="display: flex;justify-content: flex-start;align-items: center;">
-          <img src="../assets/logo/logo.png" style="width:221px;height: 30px;" />
-          <div style="display: flex;justify-content: space-around;margin-left: 20px;">
-            <div class="top-nav" :class="current == 'index' ? 'current-nav' : ''"><router-link to="/index">首页</router-link></div>
-            <div class="top-nav" :class="current == 'course' ? 'current-nav' : ''"><router-link to="/course">课程</router-link></div>
-            <div class="top-nav" :class="current == 'case' ? 'current-nav' : ''"><router-link to="/case">案例</router-link></div>
-            <div class="top-nav" :class="current == 'article' ? 'current-nav' : ''"><router-link to="/article">文章</router-link></div>
-            <div class="top-nav" :class="current == 'qa' ? 'current-nav' : ''"><router-link to="/qa">问答</router-link></div>
+    <div class="portal-top" :style="{color:textColor}">
+        <div class="portal-top-left">
+          <div class="portal-top-logo">
+            <img src="../assets/logo/logo-white.png" v-if="textColor == '#fff' || textColor == '#ffffff'" style="width:160px;height: 27px;" />
+            <img src="../assets/logo/logo.png" v-else style="width:160px;height: 27px;" />
+          </div>
+          <div class="portal-top-nav">
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'index' ? activeNav : ''">
+              <router-link to="/index" >首页
+                <div :class="current == 'index' ? 'nav-bottbor' : ''"></div>
+              </router-link>
+            </div>
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'course' ? activeNav : ''">
+              <router-link to="/course">课程
+                <div :class="current == 'course' ? 'nav-bottbor' : ''"></div>
+              </router-link>
+            </div>
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'case' ? activeNav : ''">
+              <router-link to="/case">案例
+                  <div :class="current == 'case' ? 'nav-bottbor' : ''"></div>
+              </router-link>
+            </div>
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'article' ? activeNav : ''">
+              <router-link to="/article">文章
+                <div :class="current == 'article' ? 'nav-bottbor' : ''"></div>
+              </router-link>
+            </div>
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'qa' ? activeNav : ''">
+              <router-link to="/qa" >问答
+                <div :class="current == 'qa' ? 'nav-bottbor' : ''"></div>
+              </router-link>
+            </div>
             <div class="top-nav">
               <el-dropdown placement="bottom" @command="handleCommand">
-                <span class="el-dropdown-link" style="color:#000;font-size:16px;cursor: pointer;">专区</span>
+                <span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">专区</span>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="one">BOE系列公开课</el-dropdown-item>
                   <el-dropdown-item command="two" divided>Grow180</el-dropdown-item>
@@ -22,43 +44,85 @@
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
+            
+         
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'follow' ? activeNav : ''">
+              <router-link to="/follow">我的关注
+                <div :class="current == 'follow' ? 'nav-bottbor' : ''"></div>
+              </router-link>
+            </div>
+        
           </div>
         </div>
-        <div style="display: flex;justify-content: flex-end;align-items: center;">
-          <div v-if="goSearch !=10">
-            <el-input v-show="!hideSearch" placeholder="请输入标题搜索" style="width: 260px;" @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="keyword" class="input-with-select">
-              <el-select v-if="current == 'index'" v-model="findType" style="width: 75px;" slot="prepend" placeholder="请选择">
+        <div class="portal-top-right">
+          <div  v-if="goSearch !=10" style="position: relative;">
+            <el-input class="portal-input" v-show="!hideSearch" placeholder="搜索全部" style="border-radius: 20px !important; " @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="keyword" >
+              <el-select v-if="current == 'index'"  v-model="findType" style="width: 75px; border-radius:20px !important;" slot="prepend" placeholder="请选择">
                 <el-option label="课程" value="1"></el-option>
                 <el-option label="案例" value="2"></el-option>
                 <el-option label="文章" value="3"></el-option>
                 <el-option label="问答" value="4"></el-option>
                 <!-- <el-option label="专区" value="5"></el-option> -->
               </el-select>
-              <!-- <el-button slot="append" icon="el-icon-search" @click="searchJump()">搜索</el-button> -->
-              <el-button slot="append" icon="el-icon-search" @click="searchJump()" class="input-with-select-btn"></el-button>
             </el-input>
+             <el-button v-show="!hideSearch" class="sear-but"  @click="searchJump()" type="primary" size="mini">搜索</el-button>
           </div>
-          <div class="person-action" >
+
+          <div class="person-action">
             <!-- 消息 -->
-           <el-badge   :value="userMsg" :hidden="userMsg == 0" class="message-count">
-              <el-tooltip   content="消息" placement="bottom" effect="light" :visible-arrow="false" popper-class="text-tooltip">
-                 <el-link  type="primary" :href="`${webBaseUrl}/message`" icon="el-icon-bell" :underline="false"></el-link>
-              </el-tooltip>
-            </el-badge>
-            <div>
-              <a :href="`${webBaseUrl}${'/uc/study/task?identity=1'}`">
-             <el-avatar  :src="userInfo.avatar" v-if="userInfo.avatar !== '' "></el-avatar>
-              <div v-else class="uavatar">
-                  <div v-if="sex === 1 "><img src="../../public/images/Avatarman.png" alt=""></div>
-                  <div v-else><img src="../../public/images/Avatarwoman.png" alt=""></div>
-              </div>
-              </a>
+            <!-- <el-link v-if="current == 'qa'" class="person-action-index" type="primary" style="margin-right:10px; color:#333;" :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`" :underline="false">个人中心</el-link>
+            <el-link v-else class="person-action-index" type="primary" style="margin-right:10px; color:#fff;" :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`" :underline="false">个人中心</el-link> -->
+            <!-- <el-link type="primary" @click="logout()" icon="el-icon-switch-button" :underline="false">退出</el-link> -->
+            <div class="person-action-item">
+              <el-badge class="person-action-index"  :value="userMsg" :hidden="userMsg == 0">
+                <el-tooltip   content="消息" placement="bottom" effect="light" :visible-arrow="false" popper-class="text-tooltip">
+                   <el-link  type="primary" :href="`${webBaseUrl}/message/center/index`" :underline="false">
+                    <svg-icon :style="{color:textColor}" style="margin-right: 0;font-size:22px;" icon-class="messfff"></svg-icon>
+                   </el-link>
+                </el-tooltip>
+              </el-badge>
+            </div>
+            <div class="person-action-item">
+                <el-dropdown class="person-action-index">
+                  <span class="el-dropdown-link">
+                    <span :style="{color:textColor}">学员</span>
+                    <i :style="{color:textColor}" class="el-icon-arrow-down el-icon--right"></i>
+                  </span>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item><router-link to="/index">学员</router-link></el-dropdown-item>
+                    <el-dropdown-item v-if="identity == 2 || identity == 5" @click.native="setCurIdentity(2)"><router-link to="/need/waitaudit">教师</router-link></el-dropdown-item>
+                    <el-dropdown-item v-if="identity == 3 || identity == 5" @click.native="setCurIdentity(3)"><router-link to="/course/manage">管理员</router-link></el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+             </div>
+             <div class="person-action-item">
+                <el-dropdown>
+                  <div class="el-dropdown-link" style="display:flex" :style="{color:textColor}">
+                    <div class="person-action-index">
+                      <div v-if="userInfo.avatar !== '' " class="user-avatar">
+                          <img :src="userInfo.avatar"  style="width: 35px;height: 35px;"/>
+                      </div>
+                      <div v-else class="uavatar">
+                          <div v-if="sex === 1 "><img src="../../public/images/Avatarman.png" alt="" style="width: 30px;height: 30px;"></div>
+                          <div v-else><img src="../../public/images/Avatarwoman.png" alt="" style="width: 30px;height: 30px;"></div>
+                      </div>
+                    </div>
+                    <div style="font-weight: 400;font-size: 16px; margin-top: 8px;">{{userInfo.name}}</div>
+                  </div>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item @click.native="setCurIdentity(1)"><a :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`">个人中心</a></el-dropdown-item>
+                    <el-dropdown-item><router-link :to="'/home/'+userInfo.aid">个人主页</router-link></el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+            </div>
+            <div class="person-action-item">
+
+              <div class="person-action-index pointer" :style="{color:textColor}" @click="logout()">
+                <svg-icon  style="margin-right: 4px;font-size:16px;" icon-class="white-out"></svg-icon>登出
+              </div>
             </div>
-            <el-link type="primary" style="margin-right:10px;" :href="`${webBaseUrl}${'/uc/study/task?identity=1'}`" :underline="false">个人中心</el-link>
-            <el-link type="primary" @click="logout()" icon="el-icon-switch-button" :underline="false">退出</el-link>
           </div>
         </div>
-      </div>
     </div>
   </div>
 </template>
@@ -66,9 +130,7 @@
 import { mapGetters, mapActions } from 'vuex';
 import apiMessage from '@/api/system/message.js';
 import apiBoeCourse from '@/api/boe/course.js';
-import {
-  userAvatarText
-} from "@/utils/tools.js";
+import {userAvatarText} from "@/utils/tools.js";
 export default {
   props: {
     current: {
@@ -79,21 +141,33 @@ export default {
       type: Boolean,
       default: false,
     },
+    textColor:{
+      type: String,
+      default: '',
+    },
     goSearch:{
       type: Number,
       default: 0,
     }
   },
 
+  // components:{InterestCollection,GuideBox},  // 注释兴趣爱好弹窗显示
   computed: {
-    ...mapGetters(['userInfo', 'userMsg']),
+    ...mapGetters(['userInfo', 'userMsg','identity']),
 
     avatarText(){
       return userAvatarText(this.userInfo.name);
+    },
+    activeNav(){
+        return {
+          'top-nav-active-blue': this.textColor=='#000000',
+          'top-nav-active-white': this.textColor=='#fff' || this.textColor=='#ffffff',
+        }
     }
   },
   data() {
     return {
+      fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
       findType: '1',
       keyword: '',
       isTiao: false,
@@ -106,6 +180,9 @@ export default {
     this.loadBoeData();
   },
   methods: {
+    setCurIdentity(iden){
+        this.$store.dispatch('SetCurIdentity',iden);
+      },
     tomy(){
       console.log('lll')
     },
@@ -117,13 +194,13 @@ export default {
         // cmtask_status:this.cmtask_status,
         // cmtask_name:this.cmtask_name,
       };
-      // apiBoeCourse.cmtaskList(params).then(res => {
-      //   if (res.status == 200 && res.result.count > 0) {
-      //     this.isTiao = true;
-      //   } else {
-      //     this.isTiao = false;
-      //   }
-      // });
+      apiBoeCourse.cmtaskList(params).then(res => {
+        if (res.status == 200 && res.result.count > 0) {
+          this.isTiao = true;
+        } else {
+          this.isTiao = false;
+        }
+      });
     },
     handleCommand(val) {
       let urlPre=window.location.protocol+'//'+window.location.host;
@@ -207,6 +284,7 @@ export default {
         .then(() => {
           this.$store.dispatch('LogOut').then(() => {
             //location.href = this.webBaseUrl + '/login';
+			sessionStorage.setItem('dialog_session_show'+this.userInfo.aid,null); // 清除兴趣采集的"关闭"缓存
             location.href = process.env.VUE_APP_LOGIN_URL;
           });
         })
@@ -225,41 +303,120 @@ export default {
 </script>
 
 <style scoped rel="stylesheet/scss" lang="scss">
+
+::v-deep .el-dropdown-menu__item:not(.is-disabled):hover{
+    background-color: #fff !important;
+    color: #0059FF !important;
+}
+::v-deep.el-dropdown-menu {
+text-align: center;
+  border: none !important;
+}
+  //定义消息的图标的样式，按ui，未完成
+.msg-icon{
+  font-size:16px;
+  background-color:#fff;
+  border-radius:50%;
+}
+.top-nav-active-blue{
+    color: #387DF7;
+    a{color:#387DF7;}
+    div{
+      width: 75%;
+      height: 4px;
+      top: 75%;
+      left: 13%;
+      background: #387DF7;
+      border-radius: 5px;
+      position: absolute;
+    }
+}
+.top-nav-active-white{
+    color: #fff;
+    a{color:#fff;}
+    div{
+      width: 75%;
+      height: 4px;
+      top: 75%;
+      left: 13%;
+      background: #fff;
+      border-radius: 5px;
+      position: absolute;
+    }
+}
+
+.sear-but{
+  position: absolute;
+  bottom: 10%;
+  right: 5px;
+}
+  ::v-deep .el-input__inner{
+    border-radius: 6px;
+    border-right: none;
+  }
 ::v-deep .el-badge__content.is-fixed {
   right: 10px;
 }
 
 .portal-header {
-  margin: 0 auto;
+  // margin: 0 87px;
+  height: 72px;
   display: flex;
-  align-items: center;
-  background-color: #ffffff;
-  border-bottom: 1px solid #f0f0f0;
-  // line-height: 56px;
-  //width: 100%;
-
-  // padding: 5px 0px 0px;
+  background: rgba(255,255,255,0.1);
+  border: 1px solid rgba(61,61,61,0.15);
+  backdrop-filter: blur(10px);
 }
-.portal-content {
-  margin: 0px auto;
+.portal-top{
+  width: 100%;
+  margin: 0px 40px;
+  display: flex;
+  justify-content:space-between;
+  .portal-top-left{
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    .portal-top-logo{
+
+    }
+    .portal-top-nav{
+      display: flex;
+      justify-content: space-around;
+      margin-left: 20px;
+    }
+  }
+  .portal-top-right{
+    flex:1;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+  }
   //width: 1050px;
   .person-action{
     display: flex;
     justify-content: flex-end;
     align-items: center;
     margin-left: 10px;
-    ::v-deep .message-count{
-      margin-right: 20px;
-      i{
-        font-size: 26px;
-        color:#409EFF;
-      }
-    //  ::v-deep .el-badge__content.is-fixed {
-    //     right: 48px;
-    //   }
+
+    .person-action-index{
+      //margin-left: 40px;
+      font-size: 16px;
+      font-weight: 400;
     }
-    .el-avatar{
+    // ::v-deep .message-count{
+    //   //margin-right: 20px;
+    //   i{
+    //     font-size: 26px;
+    //     color:#409EFF;
+    //   }
+    // //  ::v-deep .el-badge__content.is-fixed {
+    // //     right: 48px;
+    // //   }
+    // }
+  ::v-deep.el-avatar{
       margin-right: 8px;
+       img{
+            width: 100% !important;
+         }
     }
     .el-button{
       margin-left: 15px;
@@ -268,43 +425,73 @@ export default {
     }
   }
 }
+.person-action-item{
+    margin-left: 30px;
+}
 .top-nav {
-  text-align: center;
-  line-height: 56px;
+  font-size: 16px;
+  // text-align: center;
+  font-weight: 400;
+  color: #000000;
+  line-height: 72px;
   padding: 0px 10px;
   white-space:nowrap;
+  position: relative;
 }
-.anav {
-  margin: 10px;
-  color: #4489ce;
+
+//此处理应该移到单独的一个样式中比较好
+
+@media screen and (max-width: 1366px){
+  .top-nav {
+    padding: 0px 10px;
+  }
+  .person-action-item{
+      margin-left: 20px;
+  }
 }
-.current-nav {
-  color: #fff;
-  background: #588afc;
-  // border-bottom: 4px solid;
+@media screen and (max-width: 1680px) and (min-width:1367px){
+  .top-nav {
+    padding: 0px 15px;
+  }
+  .person-action-item{
+      margin-left: 30px;
+  }
 }
+@media screen and (max-width: 1920px) and (min-width: 1681px){
+  .top-nav {
+    padding: 0px 30px;
+  }
+  .person-action-item{
+      margin-left: 40px;
+  }
+}
+
+@media screen and (min-width: 1921px){
+  .top-nav {
+    padding: 0px 40px;
+  }
+  .person-action-item{
+      margin-left: 45px;
+  }
+}
+
 ::v-deep .el-badge {
   .el-badge__content {
     top: 0px;
 
   }
 }
-::v-deep .el-input-group__prepend {
-  border-radius: 0;
-}
-::v-deep .el-input-group__append {
-  padding: 0px 5px;
-  color: #fff;
-  background: #588afc;
-  border: 1px solid #588afc;
-  border-radius: 0;
 
+::v-deep .el-input-group__append {
+  // padding: 0px 5px;
+  // color: #fff;
+  // background: #588afc;
+  // border: 1px solid #333333;
+  border-radius: 0 20px 20px 0;
+  border-left: none;
+  background: rgba(255,255,255,0.12);
 }
-.input-with-select-btn {
-  font-size: 25px !important;
-  margin: 0 !important;
-  padding: 0 !important
-}
+
 .message-count a {
   color: #858d99;
   font-size: 24px;
@@ -319,22 +506,38 @@ export default {
 }
 .el-dropdown-link {
   cursor: pointer;
-  color: #666666;
+  color: #000000;
 }
  .uavatar{
    div{
      border-radius: 50%;
      img{
        border-radius: 50%;
-       width: 40px;
-       height: 40px;
+       width: 30px;
+       height: 30px;
      }
    }
-    width: 40px;
-    height: 40px;
-    line-height: 40px;
+    width: 30px;
+    height: 30px;
+    line-height: 30px;
     font-size: 14px;
     margin-right: 8px;
     border-radius: 50%;
   }
+  .user-avatar{
+    display: inline-block;
+    border-radius: 50%;
+    img{
+        border-radius: 50%;
+        width: 30px;
+        height: 30px;
+    }
+
+     width: 30px;
+     height: 30px;
+     line-height: 30px;
+     font-size: 14px;
+     margin-right: 8px;
+     border-radius: 50%;
+   }
 </style>
diff --git a/src/components/Qa/addQuestion.vue b/src/components/Qa/addQuestion.vue
index b055d502..ac070d06 100644
--- a/src/components/Qa/addQuestion.vue
+++ b/src/components/Qa/addQuestion.vue
@@ -4,17 +4,19 @@
  * @Description:
 -->
 <template>
-  <el-dialog :close-on-click-modal='false' title="发布问题" width="800px" :visible.sync="askQuestionDialog">
-    <el-form ref="askForm" :model="askForm" :rules="askFormRules" label-position="right" label-width="60px">
-      <el-form-item label="标题:" prop="title"><el-input type="text" v-model="askForm.title" show-word-limit placeholder="请输入问题标题,字符长度不能高于100" maxlength="100"></el-input></el-form-item>
-      <el-form-item label="内容:" prop="content">
-        <el-input type="textarea" v-model="askForm.content" placeholder="请输入问题内容" :rows="6"></el-input>
+<div>
+   <el-row class="article-add">
+       <el-form ref="askForm" :rules="askFormRules" :model="askForm" label-position="right" label-width="80px">
+         <el-dialog :close-on-click-modal='false' title="提问题" label-width="80px" :visible.sync="askQuestionDialog">
+           <!-- <el-form ref="askForm" :model="askForm" :rules="askFormRules" label-position="right" > -->
+             <el-form-item label="标题:" prop="title">
+        <el-input class="title-input"   v-model="askForm.title" show-word-limit placeholder="请输入问题标题,字符长度不能高于50" maxlength="50"></el-input>
       </el-form-item>
-      <el-form-item label="图片" class="imageUrls">
-        <imageUpload dir="qa" :value="imageShowUrl" @success="handleUploadSuccess" @remove="handleRemoveSuccess"></imageUpload>
+        <el-form-item label="封面">
+        <imageUpload :value="imageShowUrl" dir="qa" width="410px" height="168px"  @success="handleUploadSuccess" @remove="handleRemoveSuccess"></imageUpload>
         <!-- <el-upload
           :action="uploadFileUrl"
-          :show-file-list="false"
+          :show-file-list="false"         
           :headers="headers"
           list-type="picture-card"
           :on-success="handleAvatarSuccess"
@@ -25,12 +27,24 @@
             <span class="icon-text">上传图片</span>
         </el-upload> -->
       </el-form-item>
-    </el-form>
-    <div slot="footer" class="dialog-footer" style="text-align: left;margin-left:60px">
-      <el-button type="primary" @click="addQaData" :disabled="!askForm.checked">发布问题</el-button>
+      <el-form-item  label="内容:" prop="content">
+        <el-input type="textarea" v-model="askForm.content" placeholder="请输入问题内容" :rows="8"></el-input>
+      </el-form-item>
+
+    <!-- </el-form> -->
+    <el-form-item   >
+      <div class="btnbox">
+        <div class="check-right">
+          <el-checkbox style="margin-left:10px" v-model="askForm.checked"> </el-checkbox><span style="font-size:14px;color:#787878;margin-left:10px">我已阅读并遵守</span><span style="font-size:14px;color:#588afc;margin-right:10px;cursor: pointer;" @click="askFormCheckedShow = true">平台内容发布要求</span>
+        </div>
+        <div class="button-left">
+ <el-button type="primary" @click="addQaData" :disabled="!askForm.checked">发布问题</el-button>
       <el-button @click="askQuestionDialog = false">取 消</el-button>
-      <el-checkbox style="margin-left:10px" v-model="askForm.checked"> </el-checkbox><span style="font-size:14px;color:#787878;margin-left:10px">我已阅读并遵守</span><span style="font-size:14px;color:#588afc;margin-right:10px;cursor: pointer;" @click="askFormCheckedShow = true">平台内容发布要求</span>
-    </div>
+        </div>
+
+      </div>
+
+    </el-form-item>
      <el-dialog class="checked-show" :visible.sync="askFormCheckedShow" top="14vh"  width="800px" :show-close="false" :modal="false">
         <agreement></agreement>
         <span slot="footer" class="dialog-footer">
@@ -39,19 +53,25 @@
         </span>
       </el-dialog>
   </el-dialog>
+    </el-form>
+   </el-row>
+</div>
+
 </template>
 
 <script>
+  import { mapGetters } from 'vuex';
   import apiQa from '@/api/modules/qa.js';
-  import imageUpload from '@/components/ImageUpload/index.vue';
+  import imageUpload from '@/components/ImageUpload/artimgUpload.vue';
   import agreement from '@/components/Portal/agreement.vue'
   export default{
     data(){
       return {
+        fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
         askFormCheckedShow:false,
         askFormRules: {
           title: [{ required: true, message: '请输入问题标题', trigger: 'blur' }, { max: 100, message: '字符长度不能高于100', trigger: 'blur' }],
-          content: [{ required: true, message: '请输入问题内容', trigger: 'blur' }]
+          
         }, //表单验证
         askForm: {}, //发布问答绑定的数据
         imageShowUrl: '', //组件绑定的值,不知道用处
@@ -59,6 +79,9 @@
       }
     },
     components:{imageUpload,agreement},
+    computed: {
+    ...mapGetters(['userInfo'])
+  },
     methods:{
       handleClose(done) {
         this.$confirm('确认关闭？')
@@ -69,8 +92,10 @@
       },
       handleUploadSuccess(file) {
 		// console.log(file.result.httpPath,'是否会fig以后关于和',file.result.filePath)
-        this.imageShowUrl=file.result.httpPath;
         this.askForm.images=file.result.filePath
+        this.imageShowUrl= this.fileBaseUrl + file.result.filePath;
+        // console.log(this.fileBaseUrl)
+        console.log(file)
       },
       handleRemoveSuccess(file) {
         this.imageShowUrl=''
@@ -85,6 +110,20 @@
               if (res.status == 200) {
                 if(res.message=='服务处理成功'){
                   this.$message.success("发布问题成功")
+                  let event = {
+                    key: "PulishQuestion",//后台的事件key  发布文章且审核通过
+                    title: '发布问题',//事件的标题
+                    parameters:"",//用户自定义参数 name:value,name:value
+                    content: "提出了问题",//事件的内容
+                    objId: res.result.id,//关联的id
+                    objType: "4",//关联的类型
+                    objInfo: this.askForm.title,
+                    aid: this.userInfo.aid, //当前登录人的id
+                    aname: this.userInfo.name,//当前人的姓名
+                    status: 1 //状态，直接写1
+                  }
+                  this.$store.dispatch("userTrigger", event);
+
                 }
                 if(res.message.indexOf('审核')!=-1){
                   this.$message.warning("发布失败，因包含敏感词,请等待人工审核")
@@ -113,6 +152,57 @@
 </script>
 
 <style scoped lang="scss">
+::v-deep .el-dialog__header{
+  padding-top: 40px !important;
+}
+::v-deep .el-dialog__title{
+  font-size: 20px !important;
+  color: #333333 !important;
+  padding-left: 20px;
+  font-weight: 600 !important;
+}
+::v-deep.el-dialog__footer{
+  text-align: left !important;
+}
+.btnbox{
+  display: flex;
+  width: 100%;
+  .check-right{
+    flex: 1;
+  }
+  .button-left{
+    margin-left: auto;
+  }
+}
+::v-deep .el-textarea__inner{
+  width: 90% !important;
+}
+::v-deep .el-input{
+    width: 90% !important;
+  }
+  ::v-deep .el-form-item__label{
+  font-size: 18px !important;
+  color: #333 !important;
+  font-weight: 600 !important;
+}
+.el-form-item__content{
+   display: flex;
+  justify-content: flex-start;
+
+  dl {
+        margin: 0;
+        padding: 10px;
+        margin-left: 20px;
+        line-height: 1.5;
+        dt {
+          font-size: 18px;
+          font-weight: 600;
+        }
+        dd {
+          margin: 0;
+        }
+      }
+}
 ::v-deep .checked-show{
   .el-dialog__header{
     padding:0;
diff --git a/src/components/Qa/answerList.vue b/src/components/Qa/answerList.vue
new file mode 100644
index 00000000..fe869af7
--- /dev/null
+++ b/src/components/Qa/answerList.vue
@@ -0,0 +1,108 @@
+<template>
+    <div class="answer-list">
+        <ul>
+            <li class="answer-list-index" v-for="item in items" :key="item.id">
+                <h6 class="answer-title-info follow-home-title">
+                   <span class="pointer" @click="jumpDetail(item)">{{item.qtitle || item.title}}</span> <span v-if="item.type" style="font-weight: 400;">#回答#</span> 
+                    <span class="follow-hide" style="float:right">
+                        <el-button @click.stop="delCollectItem(item)" type="text" icon="el-icon-star-on" style="color:#8590A6">取消收藏</el-button>
+                    </span>
+                </h6>
+                <p class="answer-text">
+                    {{displayAll(item)}}
+                    <span style="color:#0B4D9D;cursor:pointer;" v-if="item.content && item.content.length>180" @click.stop="changeIsAll(item)">
+                        {{item.isAll?'收起':'全文展开'}}
+                    </span>
+                </p>
+                <div>
+                    <interactBar :type="0" :data="item" :shares="false" :comments="false" :views="false" :readonly="true"></interactBar>
+                </div>
+            </li>
+        </ul>
+    </div>
+  </template>
+
+  <script>
+    import interactBar from "@/components/Portal/interactBar.vue";
+    import author from "@/components/Portal/authorInfo.vue";
+    import { mapGetters,mapActions } from 'vuex';
+      export default{
+        name:"answerList",
+        components: {
+          interactBar,
+          // timeShow,
+          author
+        },
+        props:{
+            items:{
+                type:Array,
+                default:()=>[]
+            },
+        },
+        computed: {
+          ...mapGetters(['userInfo']),
+        },
+          data(){
+              return{
+                answerList:[]
+              }
+          },
+      methods:{
+        delCollectItem(item) {
+            this.$confirm('您确定要取消收藏吗？', '取消提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            })
+                .then(() => {
+                this.$emit('confirm', item);
+                // apiFavorites.del(item){
+                //   console.log(this.$parent,"我拿到的父组件")
+                // }
+            })
+            .catch(() => {});
+        },
+        jumpDetail(item){
+          this.$router.push('/qa/answer?id='+item.qid)
+        },
+        emitHide(id) {
+          this.$emit('hideIndex',id)
+        },
+        displayAll(item) {
+          if (!item.isAll && item.content && item.content.length > 180) {
+            return item.content.slice(0, 180) + "...";
+          }
+          return item.content;
+        },
+         //展示全部
+         changeIsAll(item) {
+          item.isAll = !item.isAll;
+        },
+
+       }
+      }
+  </script>
+
+  <style lang="scss" scoped>
+    .answer-list{
+        ul{
+            margin: 0;
+        }
+        .answer-list-index{
+            padding: 30px 0;
+            border-bottom: 1px solid rgba($color: #999999, $alpha: 0.2) !important;
+          
+        }
+        .answer-title-info{
+            margin: 0;
+            margin-bottom: 16px;
+        }
+        .answer-text{
+            margin-bottom: 18px;
+            font-size: 14px;
+            word-break:break-all;
+            color: #333330;
+            line-height: 20px;
+        }
+    }
+  </style>
diff --git a/src/components/Qa/favoritesQaList.vue b/src/components/Qa/favoritesQaList.vue
index 9ef02669..e55488a0 100644
--- a/src/components/Qa/favoritesQaList.vue
+++ b/src/components/Qa/favoritesQaList.vue
@@ -1,25 +1,34 @@
 <template>
   <div style="cursor: pointer;">
-    <div class="article-list" v-for="(item, idx) in items" :key="idx" @click="qadetail(item)">
+    <div class="article-list" v-for="(item, idx) in items" :key="idx" >
       <div class="article-info">
         <!-- <div class="article-info-title"> -->
-          <div class="article-info-title" style="line-height: 30px;">
-            <span class="qa-basic" :class="item.question.isResolve ? 'qa-solve' : 'qa-unSolve'">{{ item.question.isResolve ? '【已解决】' : '【待解决】' }}</span>
-            <span style="padding-left: 5px">{{ item.question.title }}</span>
+          <div @click="qadetail(item)" class="art-head article-info-title" style="line-height: 30px;">
+            <!-- <span class="qa-basic" :class="item.question.isResolve ? 'qa-solve' : 'qa-unSolve'">{{ item.question.isResolve ? '【已解决】' : '【待解决】' }}</span> -->
+            <span style="padding-left: 5px">{{ item.question.title }} <span v-if="item.type" class="qa-bq">#提问#</span> </span>
+          <el-button @click.stop="delCollectItem(item)" type="text" icon="el-icon-star-on" style="color:#8590A6">取消收藏</el-button>
           </div>
         <!-- </div> -->
-        <div class="article-info-summary two-line-ellipsis">{{ item.question.content }}</div>
-        <div v-if="item.question.isResolve" style=";color: #5a5a5a;display:flex;margin-bottom:10px">
-          <div style="width:90px"><span>最佳回答:</span></div>
+        <div class="article-info-summary">
+           {{displayAll(item)}}
+           <span style="color:#588afc;cursor:pointer;" v-if="item.question.content.length>150" @click="changeIsAll(item,idx)">
+                 {{item.isAll?'收起':'展开'}}
+            </span>
+          </div>
 
-          <div class="one-line-ellipsis" style="color: #5a5a5a;padding-top:1px">{{ item.question.bestAnswer }}</div>
-        </div>
-        <div class="article-info-tools">
-          <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"></authorInfo>
-          <span>发布时间：{{ item.question.sysCreateTime || item.publishTime | timeFilter }}</span>
-          <span>收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span>
-          <el-button @click.stop="delCollectItem(item)" type="text" icon="el-icon-remove" style="color:#8590A6">取消收藏</el-button>
+        <!--
+        <div v-if="item.question.isResolve" style=";color: #333330;display:flex;margin-bottom:10px">
+          <div class="one-line-ellipsis" style="color: #333330;font-size: 14px;padding-top:1px">{{ item.question.bestAnswer }}</div>
         </div>
+        -->
+        
+      <interactBar :type="4" :readonly="true" :data="item.question" :views="false" :shares="false" :answers="true" :comments="false"></interactBar>
+
+        <!-- <div class="article-info-tools"> -->
+          <!-- <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"></authorInfo> -->
+          <!-- <span>发布时间：{{ item.question.sysCreateTime || item.publishTime | timeFilter }}</span> -->
+          <!-- <span>收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span> -->
+        <!-- </div> -->
       </div>
     </div>
   </div>
@@ -37,6 +46,11 @@ export default {
       default: () => []
     }
   },
+  data(){
+    return {
+
+    }
+  },
   mounted() {},
   components: {
     interactBar,
@@ -48,6 +62,17 @@ export default {
     }
   },
   methods: {
+     displayAll(item) {
+      if (!item.isAll && item.question.content && item.question.content.length > 150) {
+        return item.question.content.slice(0, 150) + "...";
+      }
+      return item.question.content;
+    },
+     changeIsAll(item,idx) {
+      console.log(item.isAll)
+      item.isAll = !item.isAll;
+      this.$set(this.items, idx, item);
+    },
     qadetail(item) {
       // let routeData = this.$router.resolve({ path: '/qa/answer?id=' + item.question.id });
       // window.open(routeData.href, '_blank');
@@ -94,6 +119,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.qa-bq{
+  font-size: 16px;
+  color: #333333;
+}
+.art-head{
+  display: flex;
+  button{
+    margin-left: auto;
+  }
+}
 // .one-line-ellipsis {
 //   display: -webkit-box;
 //   white-space:pre-wrap;
@@ -161,8 +196,9 @@ export default {
   }
   .article-info-summary {
     line-height: 25px;
+    font-size: 15px;
     margin: 10px 0;
-    color: #666;
+    color: #333;
   }
   .article-info-tools {
     color: #999999;
diff --git a/src/components/Qa/replyList.vue b/src/components/Qa/replyList.vue
index 7e117007..858fdbfb 100644
--- a/src/components/Qa/replyList.vue
+++ b/src/components/Qa/replyList.vue
@@ -6,42 +6,43 @@
         <li>这里的路由传参存在问题</li>
       </ul>
     </Remark>
-    <div class="article-list" v-for="(item, idx) in items" :key="idx" @click="routerJump(item)">
+    <div class="article-list" v-for="(item, idx) in items" :key="idx">
       <div class="article-info">
         <div class="article-info-title">
           <div style="line-height: 30px;font-size: 18px" >
-            <div class="one-line-ellipsis art-tit" >
-            <span v-if="item.isResolve == true" class="qa-basic qa-solve">【已解决】</span>
-            <span v-if="item.isResolve == false" class="qa-basic qa-unSolve">【待解决】</span>
-             <span style="padding-left: 5px;cursor: pointer;" >
+            <div class="one-line-ellipsis art-tit" @click="routerJump(item)">
+            <!-- <span v-if="item.isResolve == true" class="qa-basic qa-solve">【已解决】</span>
+            <span v-if="item.isResolve == false" class="qa-basic qa-unSolve">【待解决】</span> -->
               <span v-html="$keywordActiveShow(item.title,keyWord)"></span>
-            </span>
           </div>
           </div>
         </div>
         <div class="article-info-summary">
-         <div style="height:28px;overflow: hidden;" class="one-line-ellipsis" v-html="$keywordActiveShow(item.content,keyWord)"></div>
+         <div style="overflow: hidden;" class="one-line-ellipsis titcontent" v-html="$keywordActiveShow(item.content,keyWord)"></div>
           <div class="article-Reply">
-          <div class="article-hd">
-             <span style="color: #171717;float:left;margin-top: 8px;" class="one-line-ellipsis">我的回答：<span v-if="item.isBest" class="isBest">最佳</span><span  v-html="$keywordActiveShow(item.answercontent,keyWord)"></span></span>
-          </div>
-            <!-- <div >
-              <el-button class="edit"  icon="el-icon-edit"  type="text" @click="editItem(item)" size="mini">编辑</el-button>
-              <el-button class="del" icon="el-icon-remove" type="text"  @click="delItem(item)" size="mini">删除</el-button>
-            </div> -->
+          <div class="article-hd" style="margin-top: 8px;">
+            我的回答
+               <div class="article-info-date">
+                  <!-- <el-button @click="shareItem(item)" type="text" icon="el-icon-share">分享</el-button> -->
+                  <el-button class="edit" @click.stop="editItem(item)" type="text"><svg-icon style="font-size:14px;margin-right:5px" icon-class="edit-icon"></svg-icon>编辑</el-button>
+                  <el-button class="del" @click.stop="delItem(item)" type="text"> <svg-icon style="font-size:14px;margin-right:5px" icon-class="del-icon"></svg-icon>删除</el-button>
+                </div>
+           </div>
           </div>
         </div>
+         <div class="reply-content">
+              <!-- 1111 <span  v-html="$keywordActiveShow(item.answercontent,keyWord)"></span> -->
+              <span v-html="displayAll(item)"></span>
+              <span style="color:#2C68FF" v-if="item.answercontent.length > 170" @click="changeIsAll(item)">
+                {{ item.isAll ? '收起' : '展开全文' }}
+              </span>
+          </div>
         <div class="article-info-tools">
           <div class="article-info-tools-auth">
             <!-- <span style="font-size: 13px; color: #7b7b7b;padding-right: 15px;">提问时间：{{ item.sysCreateTimeQ }}</span> -->
             <span style="  font-size: 13px; color: #7b7b7b;padding-right: 15px;">回复时间：{{ item.sysCreateTimeA }}</span>
-             
           </div>
-           <div class="article-info-date">
-                  <!-- <el-button @click="shareItem(item)" type="text" icon="el-icon-share">分享</el-button> -->
-                  <el-button class="edit" @click.stop="editItem(item)" type="text" icon="el-icon-edit" >编辑</el-button>
-                  <el-button class="del" @click.stop="delItem(item)" type="text" icon="el-icon-delete">删除</el-button>
-                </div>
+             <interactBar  :readonly="true"  :type="4" :data="item" :shares="false" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar>
         </div>
       </div>
     </div>
@@ -66,9 +67,10 @@
 <script>
 import apiQa from '@/api/modules/qa.js';
 import editQuestion from '@/components/Qa/editQuestion.vue';
+import interactBar from '@/components/Portal/interactBar.vue';
 export default {
   name: 'articleItems',
-  components: {editQuestion },
+  components: {editQuestion,interactBar },
   props: {
     items: {
       type: Array,
@@ -98,6 +100,19 @@ export default {
     };
   },
   methods: {
+     //展示全部
+     displayAll(item) {
+      let content = '';
+      content = item.answercontent.replace(/(\n){2,}/,'<br>');
+      item.answercontent = content;
+      if (!item.isAll && item.answercontent.length > 170) {
+        return item.answercontent.slice(0, 170) + "...";
+      }
+      return item.answercontent;
+    },
+    changeIsAll(item) {
+      item.isAll = !item.isAll;
+    },
     // deleteData(item){
     //   console.log(item,"我拿到准备删除的数据")
     //  apiQa.delAnswer()
@@ -153,23 +168,35 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.reply-content{
+  font-size: 14px;
+  color: #333330;
+  font-weight: 400;
+  margin-bottom: 10px;
+  word-break:break-all;
+}
+.titcontent{
+  font-size: 14px;
+  color: #999999;
+  font-weight: 400;
+}
+.el-button--medium{
+  padding-top: 0;
+}
 .art-tit{
-  margin-left: -12px;
+  font-size: 18px;
+  font-weight: 600;
+  color: #333333;
 }
 .artlist{
-  padding-left: 21px;
+  padding-left: 20px;
   padding-right: 32px;
   cursor: pointer;
 }
 .article-info-date {
-     
-      position: absolute;
-       top: -10px;
-       right:0px;
-      // height: 40px;
-      line-height: 30px;
+      // line-height: 30px;
       font-weight: 200;
-      // margin-left: 10%;
+      margin-left: auto;
       color: #999999;
       i {
         margin-right: 5px;
@@ -177,7 +204,7 @@ export default {
     }
 .article-hd{
   width: 100%;
-  // display: ;
+  display: flex;
   span{
     line-height: 30px;
   }
@@ -266,10 +293,10 @@ export default {
 
   }
   .article-info-summary {
-    height: 85px;
+    // height: 85px;
     line-height: 25px;
    overflow: hidden;
-   margin-top: 16px;
+   margin-top: 10px;
     color: #999999;
 
   }
@@ -280,12 +307,15 @@ export default {
   .article-info-tools {
     height: 30px;
     position: relative;
+    ::v-deep .interact-bar-btn{
+      min-width: 80px !important;
+      text-align: right;
+    }
     .article-info-tools-auth {
       float: left;
       height: 30px;
       line-height: 30px;
       font-size: 13px;
-     
       color: #999999;
       img {
         margin-right: 10px;
diff --git a/src/components/Qa/shareList.vue b/src/components/Qa/shareList.vue
index 81e040a0..b93e2011 100644
--- a/src/components/Qa/shareList.vue
+++ b/src/components/Qa/shareList.vue
@@ -1,6 +1,24 @@
 <template>
   <div style="">
-    <div class="article-list" v-for="(item, idx) in items" :key="idx">
+   <!-- 新版 -->
+    <div class="qa-box" v-for="(item, idx) in items" :key="idx">
+      <div class="coures-head">
+         <div class="share-name" v-if="type=='myShare'">
+           分享给了<span>{{ item.toAname }}</span>
+          </div>
+        <div v-else class="share-name">
+          <span>{{ item.toAname }}</span>分享给了我
+        </div>
+        <div class="islook" v-if="item.isRead">已查看</div>
+        <div class="isunlook" v-else>未查看</div>
+        <div class="share-time">{{ item.time }}</div>
+      </div>
+      <div class="coures-content">
+          <span>【问答】</span>{{item.title}}
+      </div>
+    </div>
+    <!-- 旧版 -->
+    <!-- <div class="article-list" v-for="(item, idx) in items" :key="idx">
       <div class="article-info" @click="jumpRouter(item)">
         <div class="article-info-title">
           <span class="qa-basic" :class="item.question.isResolve ? 'qa-solve' : 'qa-unSolve'">{{ item.question.isResolve ? '【已解决】' : '【未解决】' }}</span>
@@ -12,14 +30,7 @@
         <div class="bestAnswer one-line-ellipsis " v-if="item.question.isResolve">
           <span>最佳回答:</span>
           <span class="one-line-ellipsi" style="color: #999999;" v-html="$keywordActiveShow(item.question.bestAnswer,keyword)"></span>
-          <!-- v-if="item.question.isResolve" -->
-           <!-- v-if="item.question.isResolve"  -->
-           <!-- <div style="margin-right:15px;width: 80px">
-
-           </div>
-
-          <div class="one-line-ellipsis" v-if="item.question.isResolve" style="color: #999999;padding:2px 0 0 0;width:90%" v-html="$keywordActiveShow(item.question.bestAnswer,keyword)"> -->
-
+         
           </div>
         </div>
         <div style="display:flex;justify-content: space-between;color: rgb(153, 153, 153);font-size: 14px;">
@@ -35,8 +46,7 @@
         </div>
         </div>
 
-      </div>
-    </div>
+      </div> -->
   </div>
 </template>
 
@@ -117,6 +127,57 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.qa-box{
+  width: 100%;
+  padding: 30px 0;
+  border-bottom:1px solid #e9e9e9 ;
+  .coures-content{
+    margin-top: 20px;
+    font-size: 16px;
+    color: #333333;
+    font-weight: 600;
+    span{
+    font-size: 16px;
+    margin-left: -9px;
+    }
+  }
+  .coures-head{
+    display: flex;
+    .share-name{
+      font-size: 14px;
+      color: #666666;
+      margin-right: 17px;
+    }
+    .share-time{
+      font-size: 14px;
+      color: #666666;
+      line-height: 25px;
+      margin-left: auto;
+    }
+    .islook{
+      width: 46px;
+      height: 24px;
+      background: #eee;
+      font-size: 12px;
+      color: #666666;
+      line-height: 24px;
+      text-align: center;
+      border-radius: 2px;
+    }
+    .isunlook{
+      width: 46px;
+      height: 24px;
+      background: #FF6562;
+      border-radius: 2px;
+      font-size: 12px;
+      color: #fff;
+      line-height: 24px;
+      text-align: center;
+
+    }
+
+  }
+}
 .one-line-ellipsis{
   display: -webkit-box;
   // white-space:pre-wrap;
diff --git a/src/components/Qa/ucList.vue b/src/components/Qa/ucList.vue
index d3212f2c..d0ba0b2a 100644
--- a/src/components/Qa/ucList.vue
+++ b/src/components/Qa/ucList.vue
@@ -3,15 +3,18 @@
     <div class="article-list" v-for="(item, idx) in items" :key="idx" @click="jumpRouter(item)">
       <div class="article-info">
         <div class="article-info-title">
-          <span v-if="item.isResolve ==true" class="qa-basic qa-solve">【已解决】</span>
-          <span v-if="item.isResolve == false" class="qa-basic qa-unSolve">【待解决】</span>
-          <span class="title one-line-ellipsis" v-html="$keywordActiveShow(item.title,keyWord)"></span>
-
+          <!-- <span v-if="item.isResolve ==true" class="qa-basic qa-solve">【已解决】</span>
+          <span v-if="item.isResolve == false" class="qa-basic qa-unSolve">【待解决】</span> -->
+          <span class="uc-center-one-title one-line-ellipsis" v-html="$keywordActiveShow(item.title,keyWord)"></span>
+          <div class="button-cla" style="margin-right:52px">
+                 <el-button class="edit" @click.stop="editItem(item)" type="text" size="mini"><svg-icon style="margin-right: 6px;font-size: 14px;" icon-class="edit-icon"></svg-icon>编辑</el-button>
+               <el-button class="del" @click.stop="delItem(item)" type="text" size="mini"><svg-icon style="margin-right: 6px;font-size: 14px;" icon-class="del-icon"></svg-icon>删除</el-button>
+             </div>
         </div>
         <!-- 提问内容 -->
         <div class="article-info-summary ">
           <!-- <div class="summary-content two-line-ellipsis" style="word-wrap: break-word;">{{ item.content }}</div> -->
-          <div class="summary-content two-line-ellipsis " v-html="$keywordActiveShow(item.content,keyWord)"></div>
+            <div class="summary-content two-line-ellipsis " v-html="$keywordActiveShow(item.content,keyWord)"></div>
           <!-- <div class="article-info-tools"> -->
             <!-- <div class="article-info-tools-source">来源:{{ item.course }}</div> -->
             <div class="two-line-ellipsis" style="margin-bottom: 10px;" v-if="item.bestAnswer !== ''">
@@ -22,24 +25,16 @@
             <div style="position: relative; font-size: 15px;display: flex;justify-content: flex-start;align-items: center;">
                 <!-- <div style="font-size:15px;margin:8px 0">提问人：{{ item.sysCreateBy }}</div> -->
 
-                <span style="color: #7b7b7b;margin-right: 8px;">
+                <span style="font-size: 14px;color: #999999;margin-right: 8px;">
 
                   提问时间： {{ item.sysCreateTime }}
                 </span>
                 <span v-if="item.status==0||item.status==2" style="color: red">{{statusText(item.status)}}</span>
               <!-- <div class="article-info-tools-btns"> -->
               <!-- <interactBar :data="item" :type="0" class="test" :answers="true" :comments="false" :shares="false" :views="false"></interactBar> -->
-             <div class="button-cla">
-                 <el-button class="edit" @click.stop="editItem(item)" type="text" icon="el-icon-edit" size="mini" >编辑</el-button>
-               <el-button class="del" @click.stop="delItem(item)" type="text" icon="el-icon-delete" size="mini" >删除</el-button>
-             </div>
+
+             <div class="button-cla"><interactBar nodeWidth="60px" :readonly="true"  :type="4" :data="item" :shares="false" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar></div>
             </div>
-            <!-- <el-link icon="el-icon-chat-line-round" class="article-info-tools-btn" >回答57</el-link>
-            <el-link icon="el-icon-s-promotion" class="article-info-tools-btn" >分享57</el-link>
-            <el-link icon="el-icon-star-on" class="article-info-tools-btn">收藏12</el-link>
-            <el-link icon="el-icon-thumb" class="article-info-tools-btn" >点赞20</el-link > -->
-            <!-- </div> -->
-          <!-- </div> -->
         </div>
       </div>
     </div>
@@ -77,11 +72,16 @@
 
 <script>
 // import interactBar from '@/components/Portal/interactBar';
+import { mapGetters } from "vuex";
 import imageUpload from '@/components/ImageUpload/index.vue';
 import apiQa from '@/api/modules/qa.js'
+import interactBar from '@/components/Portal/interactBar.vue';
 export default {
   name: 'articleItems',
-  components: { imageUpload },
+  components: { imageUpload,interactBar },
+  computed: {
+    ...mapGetters(["userInfo"]),
+  },
   props: {
     items: {
       //name,
@@ -198,7 +198,22 @@ export default {
           apiQa.del(item.id).then(res=>{
             if(res.status==200){
               this.$message({ type: 'success', message: '删除成功!' });
-              this.$emit('sure',true)
+              this.$emit('sure',true);
+              //发送删除问题事件
+              let event = {
+                key: "DeleteQuestion",//
+                title: "删除提问",//事件的标题
+                parameters:"author:"+item.sysCreateAid,//作者参数
+                content: "删除提问【"+item.title+"】",//事件的内容
+                source:'page',
+                objId: item.id,//关联的id
+                objType: "2",//关联的类型
+                objInfo: item.title,
+                aid: this.userInfo.aid, //当前登录人的id
+                aname: this.userInfo.name,//当前人的姓名
+                status: 1 //状态，直接写1
+              }
+              this.$store.dispatch("userTrigger", event);
             }
           })
         })
@@ -213,11 +228,15 @@ export default {
 .button-cla{
   position: absolute;
   right:0px;
+  ::v-deep .interact-bar-btn{
+    min-width: 90px !important;
+    text-align: right;
+  }
 }
  .edit{
       color: #8590A6;
       font-size: 14px;
-      margin-right: 10px;
+      margin-right: 45px;
     }
     .del{
       color: #8590A6;
@@ -225,8 +244,9 @@ export default {
       font-size: 14px;
     }
 .artlist{
-  padding-left: 23px;
+  padding-left: 16px;
   padding-right: 32px;
+  // margin-top: 30px;
   cursor: pointer;
 }
 .one-line-ellipsis{
@@ -273,8 +293,8 @@ export default {
 }
 .article-list {
   margin: 5px 0;
-  border-bottom: 1px solid #E8E8E8;
-  padding: 10px 0;
+  border-bottom: 1px solid rgba($color: #999999, $alpha:0.2);
+  padding: 33px 0;
 }
 
 .article-info {
@@ -285,7 +305,7 @@ export default {
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    margin-left: -14px;
+    // margin-left: -14px;
     .title{
       margin-left: 8px;
       flex-shrink: 10000;
@@ -298,8 +318,9 @@ export default {
   .article-info-summary {
     margin-left: px;
     // height:70px;
-    color: #666;
+    color: #333;
     .summary-content{
+      font-size: 14px;
       margin:10px 0;
     }
   }
diff --git a/src/components/Screenfull/index.vue b/src/components/Screenfull/index.vue
index d4e539c2..d021f8cf 100644
--- a/src/components/Screenfull/index.vue
+++ b/src/components/Screenfull/index.vue
@@ -23,7 +23,7 @@ export default {
   methods: {
     click() {
       if (!screenfull.isEnabled) {
-        this.$message({ message: '你的浏览器不支持全屏', type: 'warning' })
+        this.$message({ message: '您的浏览器不支持全屏', type: 'warning' })
         return false
       }
       screenfull.toggle()
diff --git a/src/components/Study/manager.vue b/src/components/Study/manager.vue
index 3c3adf88..0239e7a9 100644
--- a/src/components/Study/manager.vue
+++ b/src/components/Study/manager.vue
@@ -600,11 +600,11 @@ export default {
               }
             }else{
               this.$message.error('您还未报名');
-              if(this.courseInfo.type==10){
-                location.href = this.webBaseUrl + "/course/micro?id="+this.courseId;
-              }else{
+              // if(this.courseInfo.type==10){
+              //   location.href = this.webBaseUrl + "/course/micro?id="+this.courseId;
+              // }else{
                 location.href = this.webBaseUrl + "/course/detail?id="+this.courseId;
-              }
+              // }
             }
          } else {
             this.$message.error(res.message);
diff --git a/src/components/UcHeader/Index.vue b/src/components/UcHeader/Index.vue
index f1186be2..599833a2 100644
--- a/src/components/UcHeader/Index.vue
+++ b/src/components/UcHeader/Index.vue
@@ -1,59 +1,84 @@
 <template>
-  <div class="uc-header xcontent">
-    <div style="display: flex;justify-content: space-between;height: 100px;padding-top: 5px;">
-      <div style="display: flex;justify-content: flex-start;">
-        <div>
-          <img style="width: 100px;height: 100px;border-radius: 50%;border: 1px solid #f9f9f9;" :src="userInfo.avatar" v-if="userInfo.avatar !== '' ">
-          <div v-else class="uavatar">
-              <div v-if="sex === 1 "><img src="../../../public/images/Avatarman.png" alt=""></div>
-              <div v-else><img src="../../../public/images/Avatarwoman.png" alt=""></div>
+  <div class="uc-header">
+    <div class="uc-header-box" >
+      <div class="personalData">
+         <!-- <div >
+           <img src="../../../public/images/Avatarwoman.png" alt="">
+         </div> -->
+          <div class="uesr-avaer">
+            <router-link :to="'/home/'+userInfo.aid">
+              <img v-if="userInfo.avatar !== '' " :src="userInfo.avatar" >
+              <div v-else class="uavatar">
+                  <div v-if="sex === 1 "><img src="../../../public/images/Avatarman.png" style="width: 100%;" alt=""></div>
+                  <div v-if="sex === 2 "><img src="../../../public/images/Avatarwoman.png" style="width: 100%" alt=""></div>
+              </div>
+            </router-link>
+          </div>
+         <div class="user-content">
+            <div>
+              <div>
+                <div class="content-top" style="min-width: 260px;">
+                  <h6>{{userInfo.name}}</h6>
+                  <span>{{orgInfo}}</span>
 
-          </div>
-        </div>
-        <div style="padding-left: 15px;">
-          <div style="height: 38px;padding-left: 5px;">
-              <span style="font-size: 20px;font-weight: 500;color: #333;">{{userInfo.name}}</span>
-              <span style="padding-left: 10px;color: #888888;font-size: 12px;cursor: pointer;">
-                <el-link @click="toPage('/user/Setting')" icon="el-icon-setting" type="info" :underline="false">个人设置</el-link>
-              </span>
-          </div>
-          <div style="height: 35px;padding-left: 5px;color:#7a7a7a;">
-            <span style="color: #7a7a7a;padding-right: 15px;" v-if="orgInfo">{{orgInfo}}</span>
-            <!-- 目前海没有实时更新的策略，暂未处理 -->
-            <span>学习时长：{{userInfo.studyTotalH}}小时</span>
-          </div>
-          <div>
-            <router-link to="/uc/study/task"><span :class="{identity:true,active:curIdentity==1}" @click="setCurIdentity(1)">学员</span></router-link>
-            <router-link to="/teacher/index"><span v-if="identity == 2 || identity == 5" :class="{identity:true,active:curIdentity==2}" @click="setCurIdentity(2)">教师</span></router-link>
-            <router-link to="/manager/index"><span v-if="identity == 3 || identity == 5" :class="{identity:true,active:curIdentity==3}" @click="setCurIdentity(3)">管理员</span></router-link>
-          </div>
-        </div>
+                </div>
+                <div class="grade" style="min-width: 260px;">
+                   <div class="level">{{statData.level}}</div>
+                   <span style="margin-right:15px">经验值：{{statData.evalue}}</span>
+                    <span class="content-one-info pointer" style="margin-right:12px;line-height: 30px;"><router-link :to="'/user/Setting'">个人设置</router-link></span>
+                    <span class="content-one-info" style="line-height: 30px;"><router-link :to="'/home/'+userInfo.aid">个人主页</router-link></span>
+              
+                 </div>
+                 
+              </div>
+              <div style="text-align: center;">
+                <div>
+                 </div>
+                 <div style="margin-top:10px;">
+                      </div>
+              </div>
+            </div>
+            <div class="content-bottom">
+               <div class="medal-list">
+                 <div class="medal-info" v-for="(m,midx) in medalList" :key="m.id" v-if="midx<3">
+                   <img v-if="m.medalId != 5" :src="fileBaseUrl+m.medalIcon" alt="">
+                  </div>
+               </div>
+              <el-button class="medalbutt" v-if="medalList.length > 0" type="text" @click="toPage('/user/medal')">更多 <i class="el-icon-d-arrow-right"></i> </el-button>
+              <div style="margin-top:10px">
+                <router-link to="/study/index"><span :class="{identity:true,active:curIdentity==1}" @click="setCurIdentity(1)">学员</span></router-link>
+                <router-link to="/teacher/index"><span v-if="identity == 2 || identity == 5" :class="{identity:true,active:curIdentity==2}" @click="setCurIdentity(2)">教师</span></router-link>
+                <router-link to="/manager/index"><span v-if="identity == 3 || identity == 5" :class="{identity:true,active:curIdentity==3}" @click="setCurIdentity(3)">管理员</span></router-link>
+              </div>
+            </div>
+         </div>
       </div>
-      <div style="display: flex;justify-content: flex-end;padding-top: 35px;">
-        <!-- q1没有课程表，所以这里先隐藏
-          <div v-if="curIdentity==2" style="padding: 0px 40px 0px 0px;color: #1EA0FA;text-align: center;">
-            <div><i style="font-size: 40px;" class="el-icon-date"></i> <br/>授课表</div>
-          </div>
-          -->
-          <!---->
-          <!-- <div>
-            <div tabindex="1" class="upicon" @click="toPage('/user/myshare')">
-              <i  class="el-icon-share"></i>
-              <div>我分享的</div>
-            </div>
-          </div>
-          <div>
-            <div tabindex="2" class="upicon" @click="toPage('/user/toshare')">
-              <i  class="el-icon-s-promotion"></i>
-              <div>分享给我的</div>
-            </div>
-          </div>
-          <div>
-            <div tabindex="3" class="upicon" @click="toPage('/user/favorites')">
-              <i  class="el-icon-star-on"></i>
-              <div>我的收藏</div>
-            </div>
-          </div> -->
+      <div class="learningData">
+        <div class="learning-info">
+           <div class="learning-qus">当月学习时长</div>
+           <div class="learning-an"><span>{{statData.monthStudyHour}}</span>h</div>
+        </div>
+         <div class="learning-info">
+           <div class="learning-qus">累计学习时长</div>
+           <div class="learning-an"><span>{{statData.totalStudyHour}}</span>h</div>
+        </div>
+        <div class="learning-border" ></div>
+         <div class="learning-info">
+           <div class="learning-qus">当月学习天数</div>
+           <div class="learning-an"><span>{{statData.monthStudyDays}}</span>天</div>
+        </div>
+         <div class="learning-info">
+           <div class="learning-qus">累计学习天数</div>
+           <div class="learning-an"><span>{{statData.totalStudyDays}}</span>天</div>
+        </div>
+         <div class="learning-border" ></div>
+         <div class="learning-info">
+           <div class="learning-qus">我的U币（累计）</div>
+           <div class="learning-an"><span>{{statData.uvalue}}</span></div>
+        </div>
+        <div class="learning-info">
+            <div @click="jumrank" style="cursor: pointer;" class="ranking-link"> BOE 排行榜 >></div>
+        </div>
       </div>
     </div>
   </div>
@@ -62,6 +87,7 @@
 <script>
 import {userAvatarText,cutFullName} from "@/utils/tools.js";
   import { mapGetters } from 'vuex'
+  import apiStart from '@/api/phase2/stat.js'
   export default {
     name: 'UcHeader',
     computed:{
@@ -73,31 +99,62 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
     data(){
       return {
         fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
-        uinfo:{},
+        statData:{
+          evalue: 0,//经验值
+          level: "LV1",//级别
+          monthStudyHour:0,//
+          totalStudyHour: 0, //累计学习时长
+          monthStudyDays:0, //当月学习天数
+          totalStudyDays:0, //累计学习天数
+          uvalue:0 //U币数量
+        },
+        medalList:[],//勋章信息
         orgInfo:'',
-        sex:'',
+        sex:''
       }
     },
     mounted() {
-      this.sex = this.userInfo.sex;
-      let iden=this.$route.query.identity;
-      if(iden){
-         this.setCurIdentity(parseInt(iden));
-      }else{
-        // 判断路由是进入的学员默认页面就重置setCurIdentity
-        if(this.$route.path == '/uc/study/task' || this.$route.path == '/study/index'){
-          this.setCurIdentity(1);
-        }
+       this.sex = this.userInfo.sex;
+       //console.log(this.sex,'this.sex')
+      // 判断路由是进入的学员默认页面就重置setCurIdentity
+      if(this.$route.path == '/uc/study/task' || this.$route.path == '/study/index'){
+        this.setCurIdentity(1);
       }
-
       //let testName='京东方科技集团股份有限公司/北京中祥英科技有限公司/技术中心';
       //this.orgInfo=cutFullName(testName,1);
       this.orgInfo=cutFullName(this.userInfo.departFullName,1);
+      this.loadUserStat();
+
     },
     methods:{
+      loadUserStat(){//获取经验值和等级
+          let $this=this;
+          apiStart.getUserStatTotalInfo(this.userInfo.aid).then(res=>{
+            if(res.status == 200) {
+               this.statData.evalue = res.result.evalue;
+               this.statData.level = res.result.level;
+               this.statData.monthStudyHour = res.result.monthStudyHour;
+               this.statData.totalStudyHour = res.result.totalStudyHour;
+               this.statData.monthStudyDays = res.result.monthStudyDays;
+               this.statData.totalStudyDays = res.result.totalStudyDays;
+               this.statData.uvalue = res.result.uvalue;
+               $this.medalList=[];
+               res.result.medalList.forEach(aa=>{
+                  if(aa.medalId!=5){
+                    $this.medalList.push(aa);
+                  }
+               })
+            }
+          });
+        },
+
       setCurIdentity(iden){
         this.$store.dispatch('SetCurIdentity',iden);
       },
+      jumrank(){
+        this.$router.push('/user/ranking');
+
+      },
       toPage(url){
         this.$router.push({path:url})
       },
@@ -106,14 +163,183 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
 </script>
 
 <style lang="scss" scoped>
+.level{
+    float: left;
+    width: 57px;
+    margin-top: 5px;
+    margin-right: 8px;
+    height: 24px;
+    line-height: 24px;
+    text-align: center;
+    background-image: url(../../../public/images/lvbg.png);
+    background-repeat: no-repeat;
+    background-size:100%;
+  }
+.content-one-info{
+  display: inline-block;
+  line-height: 30px;
+   width: 80px;
+    height: 30px;
+    text-align: center;
+    border-radius: 20px;
+    padding: 0;
+    border: 1px solid #619DFF !important;
+    font-size: 14px;
+    color: #387DF7 !important;
+  
+}
+
+.ranking-link{
+  font-size: 16px;
+  font-weight: 600;
+  color: #333333;
+  margin-top: 20px;
+}
+.learningData{
+  padding-top: 70px;
+  box-sizing: border-box;
+  margin-left:auto;
+  .learning-info{
+    float: left;
+    margin-left: 20px;
+    margin-right: 22px;
+     .learning-qus{
+          font-size: 14px;
+          color: #666660;
+          margin-bottom: 24px;
+     }
+     .learning-an{
+          color: #999999;
+          text-align: center;
+          font-size: 14px;
+          span{
+            font-weight: 600;
+            font-size: 22px;
+            color: #0060FF;
+            margin-right: 6px;
+          }
+     }
+  }
+  .learning-border{
+    width: 1px;
+    height: 49px;
+    opacity: 0.3;
+    border: 1px solid #AAA6A6;
+    float: left;
+    margin-top: 10px;
+  }
+}
+.content-bottom{
+  margin-top: 10px;
+  display: flex;
+   .medal-list{
+      //float: left;
+      display: flex;
+      .medal-info{
+        img{
+            width: 36px;
+            height: 40px;
+            margin-right: 10px;
+            vertical-align: top;
+        }
+      }
+
+   }
+
+   .medalbutt{
+     color: #333333;
+     font-size: 14px;
+     margin-right: 40px;
+    //  float: left;
+     margin-top: 6px;
+   }
+
+}
+.personalData{
+  flex: 1;
+  padding-top: 40px;
+  box-sizing: border-box;
+  display: flex;
+  .uesr-avaer{
+    width: 120px;
+    height: 120px;
+    margin-right: 20px;
+    .uavatar{
+      width: 120px;
+      height: 120px;
+    }
+    img{
+      width: 100%;
+      height: 100%;
+      border-radius: 50%;
+      vertical-align: top;
+    }
+  }
+  .user-content{
+    flex: 1;
+    .grade{
+      margin-top: 10px;
+        // display: inline-block;
+        div{
+            font-weight: 600;
+            float: left;
+            width: 58px;
+            height: 24px;
+            // text-align: center;       
+            color: #9D6110 ;
+        }
+        span{
+          font-size: 14px;
+          color: #A3680A;
+          line-height: 32px;
+
+        }
+      }
+    .content-top{
+      // margin-top: 10px;
+      line-height: 25px;
+
+      h6{
+        color: #333333;
+        font-size: 26px;
+        margin:0;
+        float: left;
+      }
+      span{
+        color: #999999;
+        font-size: 14px;
+        margin-left: 5px;
+        margin-right: 24px;
+      }
+
+    }
+  }
+}
+
+.editbutt{
+    width: 97px;
+    height: 30px;
+    line-height: 10px;
+    border-radius: 4px;
+    border: 1px solid #588afc;
+    font-size: 14px;
+    color: #588afc;
+  }
+
+.uc-header-box{
+  display: flex;
+  justify-content: space-between;
+  height: 210px;
+  margin: 0 auto;
+}
+
  .uc-header{
-   height: 120px;
-   // min-width: 1366px;
-   // max-width: 1500px;
-   //width: 1500px;
-   //width: 1000px;
-   padding-top: 10px;
-   margin: 0 auto;
+    height: 210px;
+    background-color: #fff;
+    background-image: url('../../../public/images/userbgimg.png') ;
+    background-repeat: no-repeat;
+    background-size:445px 210px;
+    background-position: right 0;
  }
  .upicon{
    text-align: center;
@@ -129,18 +355,22 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
  }
  .identity{
    padding: 5px 10px;
-   border: 1px solid #fcfcfc;
-   border-radius: 8px;
+   width: 76px;
+   height: 30px;
+  //  border: 1px solid #fcfcfc;
+   border-radius: 4px;
    cursor: pointer;
-   background-color: #ffffff;
+   font-size: 14px;
+   color: #9D6110;;
+   background-color: rgba($color: #FFECC7, $alpha: 0.54);
    margin: 5px;
  }
  .active{
-   background-color: #ffb30f;
+   background-color: #F99000;
    color: #FFFFFF;
-    border: 1px solid #ffb30f;
+    // border: 1px solid #ffb30f;
  }
- .uc-alert{
+.uc-alert{
   margin: 10px;
   text-align: center;
   padding: 0px 50x;
@@ -151,25 +381,132 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
     padding-top: 10px;
      color: #aa0000;
   }
- }
- .uavatar{
-    // border: 1px solid #73adfe;
-    // color: #73adfe;
-    text-align: center;
-    font-size: 30px;
-    line-height: 100px;
-    width: 100px;
-    height: 100px;
-    border-radius: 50%;
-    // background: #d9e9ff;
-    div{
-     border-radius: 50%;
-      img{
-     border-radius: 50%;
-        width: 100px;
-        height: 100px;
-
 }
+
+@media screen and (max-width: 1366px){
+  .uc-header-box {
+    width: 1160px;
+  }
+  .learningData{
+    margin-left:auto;
+    .learning-info{
+      margin-left: 10px;
+      margin-right: 10px;
+      .learning-qus{
+        font-size: 12px;
+      }
+      .learning-an{
+        font-size: 12px;
+      }
     }
   }
+  .personalData{
+    .uesr-avaer{
+      margin-right: 10px;
+    }
+    .user-content{
+      .content-top{
+        .grade{
+          div{
+              width: 48px;
+          }
+          span{
+            font-size: 14px;
+          }
+        }
+        h6{
+          font-size: 26px;
+        }
+        span{
+          font-size: 14px;
+          margin-left: 5px;
+          margin-right: 10px;
+        }
+        .editbutt{
+          width: 80px;
+          height: 25px;
+          line-height: 5px;
+          text-align: center;
+          font-size: 12px;
+        }
+      }
+    }
+  }
+  .content-bottom{
+     .medalbutt{
+       margin-right: 20px;
+     }
+
+  }
+}
+@media screen and (max-width: 1680px) and (min-width:1367px){
+  .uc-header-box {
+    width: 1300px;
+  }
+  .learningData{
+    margin-left:auto;
+    .learning-info{
+      margin-left: 10px;
+      margin-right: 12px;
+    }
+  }
+
+  .personalData{
+    .uesr-avaer{
+      margin-right: 10px;
+    }
+    .user-content{
+      .content-top{
+        .grade{
+          div{
+              width: 48px;
+          }
+          span{
+            font-size: 14px;
+          }
+        }
+        h6{
+          font-size: 26px;
+        }
+        span{
+          font-size: 14px;
+          margin-left: 5px;
+          margin-right: 15px;
+        }
+        .editbutt{
+          width: 80px;
+          height: 25px;
+          line-height: 5px;
+          text-align: center;
+          font-size: 12px;
+        }
+      }
+    }
+  }
+}
+@media screen and (max-width: 1920px) and (min-width: 1681px){
+  .uc-header-box {
+    width: 1600px;
+  }
+  .learningData{
+    margin-left:auto;
+    .learning-info{
+      margin-left: 20px;
+      margin-right: 22px;
+    }
+  }
+}
+
+@media screen and (min-width: 1921px){
+  .uc-header-box {
+    width: 1800px;
+  }
+  .learningData{
+    margin-left:auto;
+    .learning-info{
+      margin-left: 30px;
+      margin-right: 30px;
+    }
+  }
+}
 </style>
diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue
index 1b714294..d239cbc0 100644
--- a/src/components/UserCenter/menu.vue
+++ b/src/components/UserCenter/menu.vue
@@ -13,8 +13,8 @@
       <el-menu
         :default-active="activeMenu"
         router
-        active-text-color="#00aaff"
-        :default-openeds="['manageTodo','manageFinish','teacherTodo','teacherFinish','myqa', 'mystudy', 'course', 'exam', 'u001', 'u002', 'u003', 'u004']"
+        active-text-color="#3379FB"
+        :default-openeds="['manageTodo','manageFinish','teacherTodo','teacherFinish','myqa','notice','mystudy', 'course', 'exam', 'u001', 'u002', 'u003', 'u004']"
         class="el-menu-vertical"
         @open="handleOpen"
         @close="handleClose"
@@ -93,17 +93,17 @@
           <svg-icon icon-class="interlocution"></svg-icon>
           <span slot="title">问答管理</span>
         </el-menu-item>
-        <el-menu-item v-show="curIdentity == 3">
+        <el-menu-item v-show="curIdentity == 3" index="008">
           <template slot="title">
             <svg-icon icon-class="administrator" style="font-size:17px"></svg-icon>
-            <span><a href="/resource/index.html" target="_blank">旧版管理员界面</a></span>
+            <span><a href="/resource/index.html" target="_blank" style="color:#303133;">旧版管理员界面</a></span>
           </template>
           <!-- <i class="el-icon-menu"></i> -->
         </el-menu-item>
-        <el-menu-item v-show="curIdentity == 3">
+        <el-menu-item v-show="curIdentity == 3" index="009">
           <template slot="title">
             <svg-icon icon-class="management" style="font-size:16px"></svg-icon>
-            <span><a href="https://u.boe.com/train/manager/index.html" target="_blank">业务支援读书会管理</a></span>
+            <span><a href="https://u.boe.com/train/manager/index.html" style="color:#303133;" target="_blank">业务支援读书会管理</a></span>
           </template>
         </el-menu-item>
         <!-- <el-menu-item index="/qa/manage" v-show="curIdentity == 3" disabled>
@@ -209,6 +209,19 @@
           </el-menu-item> -->
         </el-submenu>
         <!--user-->
+       
+        <!-- <el-menu-item >
+          <svg-icon icon-class="myubi"></svg-icon>
+        <span slot="title">我的U币</span>
+      </el-menu-item> -->
+      <el-menu-item index="/user/ucurrency" v-show="curIdentity == 1">
+          <svg-icon :icon-class="activeMenu == '/user/ucurrency'?'myubi-active':'myubi'"></svg-icon>
+          <span slot="title">我的U币</span>
+        </el-menu-item>
+       <el-menu-item index="/user/medal" v-show="curIdentity == 1">
+          <svg-icon :icon-class="activeMenu == '/user/medal'?'myxunzhang-active':'myxunzhang'"></svg-icon>
+          <span slot="title">我的勋章</span>
+      </el-menu-item>
         <el-submenu index="mystudy" v-show="curIdentity == 1">
           <template slot="title">
             <!-- <i class="el-icon-s-grid"></i> -->
@@ -234,15 +247,19 @@
           <!-- <span slot="title" class="textl">历史记录</span>
           </el-menu-item> -->
         </el-submenu>
+        <el-menu-item index="/user/Mynotes" v-show="curIdentity == 1">
+          <svg-icon :icon-class="activeMenu == '/user/Mynotes'?'mybiji-active':'mybiji'"></svg-icon>
+        <span slot="title">我的笔记</span>
+      </el-menu-item>
         <el-menu-item index="/user/myassess" v-show="curIdentity == 1">
           <!-- <i class="el-icon-menu"></i> -->
-          <svg-icon icon-class="Evaluation"></svg-icon>
+          <svg-icon :icon-class="activeMenu == '/user/myassess'?'myceping-active':'myceping'"></svg-icon>
           <span slot="title">我的测评</span>
         </el-menu-item>
         <el-submenu index="myqa" v-show="curIdentity == 1">
           <template slot="title">
             <!-- <i class="el-icon-s-grid"></i> -->
-            <svg-icon icon-class="interlocution"></svg-icon>
+            <svg-icon icon-class="myqa"></svg-icon>
             <span>我的问答</span>
           </template>
           <el-menu-item index="/qa/mylist">
@@ -256,30 +273,40 @@
         </el-submenu>
         <el-menu-item index="/article/mylist" v-show="curIdentity == 1">
           <!-- <i class="el-icon-menu"></i> -->
-          <svg-icon icon-class="essayicon"></svg-icon>
+          <svg-icon :icon-class="activeMenu == '/article/mylist'?'myart-active':'myart'"></svg-icon>
+          <!-- <svg-icon icon-class="myart"></svg-icon> -->
           <span slot="title">我的文章</span>
         </el-menu-item>
+       <el-submenu index="notice" v-show="curIdentity == 1">
+          <template slot="title">
+              <svg-icon icon-class="qita"></svg-icon>
+              <span>其他通知</span>
+          </template>
+           <el-menu-item index="/article/contactme" v-show="curIdentity == 1">
+            <span slot="title"  class="textl">@我的</span>
+          </el-menu-item>
+           <el-menu-item index="/user/myshare" v-show="curIdentity == 1">
+             <span slot="title"  class="textl">我分享的</span>
+           </el-menu-item>
+          <el-menu-item index="/user/toshare" v-show="curIdentity == 1">
+            <span slot="title"  class="textl">分享给我的</span>
+           </el-menu-item>
+        </el-submenu>
+       
 
         <!-- v-show="curIdentity == 1" -->
 
-        <el-menu-item index="/user/myshare" v-show="curIdentity == 1">
-          <svg-icon icon-class="myshare"></svg-icon>
-          <span slot="title">我分享的</span>
-        </el-menu-item>
-        <el-menu-item index="/user/toshare" v-show="curIdentity == 1">
-          <svg-icon icon-class="toshare"></svg-icon>
-          <span slot="title">分享给我的</span>
-        </el-menu-item>
+       
         <el-menu-item index="/user/favorites" v-show="curIdentity == 1">
-          <svg-icon icon-class="favoritess"></svg-icon>
+          <svg-icon :icon-class="activeMenu == '/user/favorites'?'stra-active':'stra'"></svg-icon>
           <span slot="title">我的收藏</span>
         </el-menu-item>
-        <el-menu-item index="/article/contactme" v-show="curIdentity == 1">
-          <!-- <i class="el-icon-menu"></i> -->
-          <svg-icon icon-class="administrator"></svg-icon>
-          <span slot="title">@我的</span>
+        <el-menu-item index="/message/center/index" v-show="curIdentity == 1">
+          <svg-icon :icon-class="activeMenu == '/message/center/index'?'messageicon':'messageactive'"></svg-icon>
+          <span slot="title">消息中心</span>
         </el-menu-item>
-        <!-- <el-submenu index="myArticle" v-show="curIdentity == 1">
+       
+        <!-- <el-submenu index="myArwticle" v-show="curIdentity == 1">
 		  <template slot="title">
 		    <i class="el-icon-s-grid"></i>
 		    <span>我的文章</span>
@@ -305,16 +332,16 @@
         -->
       </el-menu>
     </div>
-    <div style="height:200px;margin-top:20px;background-color: #FFFFFF;padding:mout" v-if="overlayShow && curIdentity == 1" >
+    <div style="margin-top:20px;background-color: #FFFFFF;padding:mout" v-if="overlayShow && curIdentity == 1" >
            <p class="course-re" style="margin-left:0px">您上次学习到：</p>
-             <el-card class="course-card" :body-style="{padding:'0px'}">
+             <el-card class="couerscard" :body-style="{padding:'0px'}">
                 <a :href="toCourseDetail(lastStudy)">
-                  <div class="course-image-box">
+                  <div class="course-image">
                     <course-image :course="lastStudy"></course-image>
-                    <span v-if="lastStudy.contentType==20" class="course-type-title course-type">录播课</span>
-                    <span v-if="lastStudy.contentType==10" class="course-type-title course-type">录播课</span>
-                    <span v-if="lastStudy.contentType=='online-course'" class="course-type-title course-type">录播课</span>
-                    <span v-if="lastStudy.contentType=='face-course'" class="course-type-title course-type">线下课</span>
+                    <span v-if="lastStudy.contentType==20" class="course-type-title course-type">录播</span>
+                    <span v-if="lastStudy.contentType==10" class="course-type-title course-type">录播</span>
+                    <span v-if="lastStudy.contentType=='online-course'" class="course-type-title course-type">录播</span>
+                    <span v-if="lastStudy.contentType=='face-course'" class="course-type-title course-type">线下</span>
                     <span v-if="lastStudy.contentType=='project'" class="course-type-title course-type">学习项目</span>
                 </div>
                  <el-tooltip :content="lastStudy.courseName" placement="bottom-start" effect="light" :visible-arrow="false" popper-class="text-tooltip">
@@ -345,10 +372,6 @@ export default {
       if(meta.title == '添加受众' || meta.title == '查看受众'){
         meta.activeMenu = '/manage/ugroups'
       }
-      // if(meta.activeMenu == undefined) {
-      //   return
-      // }
-      console.log(meta.activeMenu,'meta.activeMenu');
       if (meta.activeMenu) {
         return meta.activeMenu;
       }
@@ -373,11 +396,11 @@ export default {
       if(isNaN(item.courseType)){
         return `${this.webBaseUrl}/course/boeframe?id=${item.courseId}&type=${item.courseId}`;
       } else {
-       if(item.courseType==10){
-        return this.webBaseUrl+'/course/micro?id='+item.courseId;
-        }else if(item.courseType==20){
+      //  if(item.courseType==10){
+      //   return this.webBaseUrl+'/course/micro?id='+item.courseId;
+      //   }else if(item.courseType==20){
         return this.webBaseUrl+'/course/detail?id='+item.courseId;
-       }
+      //  }
       }
 
       return '';
@@ -414,9 +437,15 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.couerscard{
+  padding: 0 15px;
+}
 // ::v-deep .fontsamll{
 //   font-size: 16px!important;
 // }
+ ::v-deep .el-menu{
+   border: none !important;
+ }
 #hei{
   height: 36px;
 	line-height: 36px;
@@ -436,40 +465,36 @@ export default {
   line-height: 36px;
 }
 .course-card{
-   padding-left: 19px;
- // padding-right: 20px;
+ 
 }
-  .course-image-box {
-   // margin: 0px 20px;
-
+  .course-image {
       position: relative;
-      width: 160px;
-      height: 110px;
       .course-image {
-        width: 180px;
-        height: 110px;
+       
       }
       .course-type{
         position: absolute;
-        top: 5px;
+        top: 0px;
         right: 0px;
-        width: 70px;
-        height: 25px;
-        line-height: 25px;
+        width: 55px;
+        height: 20px;
+        line-height: 20px;
+        font-size: 12px;
+        color: #FFFFFF;
         text-align: center;
-        background-color: rgba(41, 40, 40,.4);
-        border-top-left-radius: 15px;
-        border-bottom-left-radius: 15px;
+        background: #f99000;
+        // border-top-left-radius: 15px;
+        border-bottom-left-radius: 10px;
         color: #FFFFFF;
       }
       .course-type-title{
 
         position: absolute;
-        top: 5px;
+        top: 0px;
         right: 0px;
-        width: 70px;
-        height: 25px;
-        line-height: 25px;
+        width: 55px;
+        height: 20px;
+        line-height: 20px;
         text-align: center;
         color: #FFFFFF;
       }
@@ -547,14 +572,18 @@ export default {
 .uc-menu {
   padding-top: 20px;
 }
-
+ ::v-deep .el-menu-item{
+  padding-left: 40px !important;
+}
 
 .el-menu-item,
 .el-submenu__title {
   line-height: 36px;
   height: 36px;
 }
-
+::v-deep .el-submenu__title{
+  padding-left: 40px !important;
+}
 div.el-submenu__title {
   line-height: 36px;
   height: 36px;
diff --git a/src/components/VideoPlayer/index.vue b/src/components/VideoPlayer/index.vue
index 7015cfa1..07d971ac 100644
--- a/src/components/VideoPlayer/index.vue
+++ b/src/components/VideoPlayer/index.vue
@@ -42,7 +42,7 @@
       <img src="@/components/VideoPlayer/images/loading.svg"  alt="loading"/>
     </div>
     <!-- 控制栏 -->
-    <div class="player-controls-container" @click="videoDom.focus({preventScroll: true})">
+    <div v-show="!isShowLoading" class="player-controls-container" @click="videoDom.focus({preventScroll: true})">
       <div v-show="isShowVolumeHint" class="player-volumeHint">
         <span class="player-volumeHint-text">当前音量:{{volumePercent}}%</span>
       </div>
@@ -257,6 +257,10 @@ export default {
       type: Number,
       default: null,
     },
+    notePlay:{//回到笔记时间点播放
+      type: Number,
+      default: null,
+    },
     isDrag:{
       type: Boolean,
       default: null,
@@ -271,6 +275,7 @@ export default {
       isCursorStatic: false, // 鼠标是否长时间静止不动
       isMousedownProgress: false, // 鼠标是否按下了进度条（并未松开）
       isPlaying: false, // 是否正在播放
+      loadingError:false,//加载错误提示
       isShowLoading: false, // 是否显示加载框
       isShowVolumeHint: false, // 是否显示音量提示条（键盘触发）
       timeoutVolumeHint: 0, // 音量提示条多久ms后隐藏
@@ -285,7 +290,9 @@ export default {
       isInit:false, // 是否初始化过
     };
   },
-  created() {},
+  created() {
+
+  },
   mounted() {
     this.videoDom = this.$refs.video;
     this.videoDom.focus({preventScroll: true});
@@ -333,6 +340,8 @@ export default {
       }
       // 根据视频的readyState判断下一帧是否已加载，并控制loading的显示
       this.isShowLoading = this.videoDom.readyState < 3;
+      //if()
+      //console.log(this.videoDom.readyState,'this.videoDom.readyState');
     }, 1000);
     // 视频dom监听器，用于控制鼠标的显示
     this.videoDom.addEventListener("mousemove", () => {
@@ -520,6 +529,16 @@ export default {
         document.msFullScreen
       );
     },
+    //开始播放
+    startPlay:function(newTime){
+       if(newTime){
+         this.videoDom.currentTime = newTime;
+         this.barrageTimelineStart = newTime;
+         this.updateProgressBySetTime(newTime);
+       }
+       this.isPlaying = true;
+       this.videoDom.play();
+    },
   },
   watch: {
     currentVolume: function () {
@@ -535,6 +554,13 @@ export default {
         this.$emit('onPlayerEnded', {})
       }
     },
+    // notePlay: function(val) {
+    //   if(val) {
+    //     this.updateProgressBySetTime(val);
+    //     this.isPlaying = true;
+    //     this.videoDom.play();
+    //   }
+    // },
     src: function () {
       // 当视频地址变更时，重载视频
       this.videoDom.load();
diff --git a/src/components/VideoPlayer/progress-bar.vue b/src/components/VideoPlayer/progress-bar.vue
index 325215a2..0a2e72ec 100644
--- a/src/components/VideoPlayer/progress-bar.vue
+++ b/src/components/VideoPlayer/progress-bar.vue
@@ -49,7 +49,7 @@ export default {
     };
   },
   mounted() {
-    console.log(this.isDrag,'isDrag');
+    //console.log(this.isDrag,'isDrag');
     //初始化一些固定数据
     let dom_full = this.$el.getElementsByClassName("progress-full")[0];
     this.dom_full = dom_full;
diff --git a/src/data/pages.js b/src/data/pages.js
index 10c956c4..5a3f784b 100644
--- a/src/data/pages.js
+++ b/src/data/pages.js
@@ -72,6 +72,8 @@ export const pages=[
   {title:'个人',path:'/user',hidden:false,children:[
     {title:'我的分享',path:'myshare',component:'share/MyList',hidden:false},
     {title:'分享给我的',path:'toshare',component:'share/ToList',hidden:false},
+    {title:'我的笔记',path:'Mynotes',component:'user/Mynotes',hidden:true},
+    {title:'编辑笔记',path:'Noteedit',component:'user/Noteedit',hidden:true},
     {title:'我的测评',path:'myassess',component:'user/MyAssess',hidden:true},
     {title:'我的收藏',path:'favorites',component:'user/MyFavorites',hidden:false},
     {title:'我的关注',path:'follows',component:'user/MyFollow',hidden:false},
@@ -79,8 +81,15 @@ export const pages=[
     {title:'个人设置',path:'setting',component:'user/Setting',hidden:false},
     {title:'我的消息',path:'message',component:'user/Message',hidden:false},
     {title:'开发工具下载',path:'tools',component:'tools/Index',hidden:false},
-    {title:'课程开发教程',path:'developtoolsdown',component:'tools/DeveloptoolsDown',hidden:true}
-  ]}
+    {title:'课程开发教程',path:'developtoolsdown',component:'tools/DeveloptoolsDown',hidden:true},
+    {title:'我的U币',path:'ucurrency',component:'ucurrency/Index',hidden:true},
+    {title:'我的勋章',path:'medal',component:'medal/Index',hidden:true},
+    {title:'勋章规则',path:'urules',component:'medal/urules',hidden:true},
+    {title:'排行榜',path:'ranking',component:'user/ranking',hidden:true}
+  ]},
+  {title:'消息中心',path:'/message/center',hidden:false,children:[
+    {title:'消息中心',path:'index',component:'portal/user/Message',hidden:false}
+  ]},
 ]
 
 export function routers(){
diff --git a/src/icons/svg/addArticle.svg b/src/icons/svg/addArticle.svg
index 3ea8d7b8..682d8bd1 100644
--- a/src/icons/svg/addArticle.svg
+++ b/src/icons/svg/addArticle.svg
@@ -1,49 +1 @@
-<svg width="65" height="65" viewBox="0 0 65 65" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_dd_63_798)">
-<circle cx="31" cy="31" r="25" fill="#F5F4F4"/>
-<circle cx="31" cy="31" r="24" stroke="white" stroke-width="2"/>
-</g>
-<path d="M38.3333 35.125V39.25C38.3333 39.7563 37.9229 40.1667 37.4167 40.1667H34.4375" stroke="url(#paint0_linear_63_798)" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M38.3333 27.3333V22.75C38.3333 22.2437 37.9229 21.8333 37.4166 21.8333H24.5833C24.077 21.8333 23.6666 22.2437 23.6666 22.75V39.25C23.6666 39.7563 24.077 40.1667 24.5833 40.1667H27.3333" stroke="url(#paint1_linear_63_798)" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M27.3334 27.3333H33.75" stroke="url(#paint2_linear_63_798)" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M30.5416 40.1667L38.3333 30.5417" stroke="url(#paint3_linear_63_798)" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M27.3334 31H31" stroke="url(#paint4_linear_63_798)" stroke-width="1.5" stroke-linecap="round"/>
-<defs>
-<filter id="filter0_dd_63_798" x="0" y="0" width="65" height="65" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dx="-2" dy="-2"/>
-<feGaussianBlur stdDeviation="2"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.8 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_63_798"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dx="3" dy="3"/>
-<feGaussianBlur stdDeviation="3"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.05 0"/>
-<feBlend mode="normal" in2="effect1_dropShadow_63_798" result="effect2_dropShadow_63_798"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_63_798" result="shape"/>
-</filter>
-<linearGradient id="paint0_linear_63_798" x1="34.7297" y1="37.2677" x2="38.036" y2="37.9645" gradientUnits="userSpaceOnUse">
-<stop stop-color="#649EF8"/>
-<stop offset="1" stop-color="#1F4CC6"/>
-</linearGradient>
-<linearGradient id="paint1_linear_63_798" x1="24.7666" y1="29.625" x2="37.1759" y2="32.3325" gradientUnits="userSpaceOnUse">
-<stop stop-color="#649EF8"/>
-<stop offset="1" stop-color="#1F4CC6"/>
-</linearGradient>
-<linearGradient id="paint2_linear_63_798" x1="27.8146" y1="27.7583" x2="29.2146" y2="30.2083" gradientUnits="userSpaceOnUse">
-<stop stop-color="#649EF8"/>
-<stop offset="1" stop-color="#1F4CC6"/>
-</linearGradient>
-<linearGradient id="paint3_linear_63_798" x1="31.126" y1="34.6323" x2="37.7113" y2="36.0862" gradientUnits="userSpaceOnUse">
-<stop stop-color="#649EF8"/>
-<stop offset="1" stop-color="#1F4CC6"/>
-</linearGradient>
-<linearGradient id="paint4_linear_63_798" x1="27.6084" y1="31.425" x2="29.2334" y2="33.05" gradientUnits="userSpaceOnUse">
-<stop stop-color="#649EF8"/>
-<stop offset="1" stop-color="#1F4CC6"/>
-</linearGradient>
-</defs>
-</svg>
+<svg viewBox="0 0 26 26" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><image xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAZCAYAAAArK+5dAAADdklEQVRIib2UTWhcVRTH//9738zERu2i9aMoagUrghbSSUNBq1CDWqMbUQpFcVehuirBZGqELMykiR+bCoWA2JUB24puxKJV200tzTQhfmzUUopUoVrBis3MvHv+cucD8jGxSQrexXv33XPu73/POfc84hpHvk93yFVHSPcEhATQCZj1l0Zy30byNQl0DuhehfA1oFvnmS6L9tCZYm7arRS+uX/mbgvpsQgXcCwoWe/SZB3IwwBucHIj0W9FAhtf1e3G5AsCtwk4nptJnp7ax3On3+Rv1ax/OfoI2Loigfv36paMr518Peo5XjPThuubdl/G2sZ0Jj6S5cC7CloTZJ8D2ABgEkAmajqkX3YUtK2cwxVXCe/H4wP8eFkC+T6tDkiPAngAwPeoJI9ZFozwpsh1FV6E1AXorEfSh6Xeoo29as9kwlFAD4r4kag8Uiq2/xptHQXd1BSpe/OCU7r19L62s1hKDe4aVFs2Gz6pwcFzDGl3Ex7H5DB+JznV+LxE+seb8KumKL9LGVTCYUmPArhA77tLw8n5OT6F9C0Jzwv4G0E9pVF+N9u+eAQfymttOg6pB8BF+aS79AZ/nguvDgDYI6DsiGfOjGa/mY9pXYNBuc5yOCjoBQF/GrVtqpidmu2Sfy3shuldSEbPHRNDyZFWqJYRbKqEAxEeW57Q9gXwvelOme2HBFIvLQZHqxrk+6sFSLsA/GMueWpyiKfmwXtgOkjCwbneiaJ/bzF4iwhEOO5BLXd8bnKIJ2ZbO/qqD8N0CERGQLFU9G//Fxzza7BpQPcxpD8APF8aTu6cbet8XR1K068ArAZ4oDSc7L4afGEEIWxpzObchq6CNlgaPmvAx0s5/8pS4FhQA9kWMAalWt7zg1rFcngyoPoOwZsBfoo//IsYo61IgGQzgnX5QnoI5XS7gPaYSZHHc1f8syfHWF0qfGEE4D2o/wp741uIJ9VJUuN/XU7GftrP8nLgCwXIYUj9IiYoHUlD9aPp0VW/LBf6vw7m+9IeOOYBGGUSnIEWG8JMJjpnBMwURHiDBcl7owUB3sT4hrnGPoMzKjYULJhNJ3D6ANCNMaq4CtQviGCNC2W1qrDWMgY4grKYztp3fb1esQhgvYa1p/PuUgLjTnptVuyJ+GsBXG1e5zjWCS7upcV1Rjuphg/gappz9puDHCE79S8bfpYSMn7gZwAAAABJRU5ErkJggg==" height="25" width="24" x="1" data-name="图层 1"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/black-out.svg b/src/icons/svg/black-out.svg
new file mode 100644
index 00000000..de110fdb
--- /dev/null
+++ b/src/icons/svg/black-out.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="13.课程播放页-课程单元" transform="translate(-1807.000000, -22.000000)" stroke="#000000" stroke-width="2">
+            <g id="退出" transform="translate(1807.000000, 22.000000)">
+                <path d="M11.3137085,20.3137085 C15.7319865,20.3137085 19.3137085,16.7319865 19.3137085,12.3137085 C19.3137085,10.3536403 18.6088075,8.55821065 17.4386806,7.16709457 C15.9711717,5.42243316 13.7719183,4.3137085 11.3137085,4.3137085 C8.56063442,4.3137085 6.13236685,5.70437052 4.69305124,7.82154913 C3.8224775,9.10213004 3.3137085,10.6485046 3.3137085,12.3137085" id="椭圆形" transform="translate(11.313708, 12.313708) rotate(-225.000000) translate(-11.313708, -12.313708) "></path>
+                <line x1="11.3137085" y1="2.95851626" x2="11.3137085" y2="7.41342758" id="路径-13" stroke-linecap="round" stroke-linejoin="round"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/collected.svg b/src/icons/svg/collected.svg
index f7be318c..66260d6a 100644
--- a/src/icons/svg/collected.svg
+++ b/src/icons/svg/collected.svg
@@ -1 +1 @@
-<svg t="1649839074612" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14232" width="200" height="200"><path d="M720.398507 959.573333c73.045333 31.317333 136.96-15.317333 129.706666-94.293333l-20.650666-226.218667 174.634666-199.722666c38.144-43.648 19.2-102.229333-37.418666-115.114667l-258.474667-58.794667-135.68-228.010666c-29.738667-49.877333-91.306667-49.92-121.045333 0L315.74784 265.429333 57.273173 324.224C0.953173 337.066667-18.33216 395.648 19.854507 439.338667l174.634666 199.722666-24.021333 264.405334c-5.248 57.770667 44.544 94.037333 97.877333 71.125333l243.626667-104.533333 208.426667 89.472z" fill="#ffb30f" p-id="14233"></path></svg>
\ No newline at end of file
+<svg viewBox="0 0 14 14" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><image xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAABEklEQVQokZWSMUsDQRSEZzYgl7uohWibP3A2NoJYxSaJFpZ2ikErf0L+gmVqWzsF5SBFTGPjrxBbRdDIiYXuyKq5bMzJxYGFx+x8+x6PJXL0mKzOBYqu3c0b0/WF5s3gd8rkgWWFewCW3YkQ7eZlckGBB8P6QzicCny9rK0BiD0r/vHGxDTZ2KawA2hJwKKgKsHZ8Qn0QvCOwAPAexGnTJPaE4T5vHH+FPFsjHD2L+hLPDdB86pFsDN9M3bCRm/fkLDhZu8IQruQEtou65jRVmdKJ4Wgl8lAvtuJlU+M6WVGHaVC0M/4H2Alexm6lVQvGdVdPfStl8lAS14AGJA4LttKXNnqd4NGv+tq57k7fGcAAJ8nsFSj32MnfgAAAABJRU5ErkJggg==" height="14" width="14" data-name="图层 1"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/collectedCourse.svg b/src/icons/svg/collectedCourse.svg
new file mode 100644
index 00000000..c0a09eca
--- /dev/null
+++ b/src/icons/svg/collectedCourse.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="20px" viewBox="0 0 32 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="1.首页备份" transform="translate(-387.000000, -954.000000)">
+            <g id="编组-6备份" transform="translate(116.000000, 954.000000)">
+                <g id="编组-18备份" transform="translate(271.000000, 0.000000)">
+                    <path d="M10,0 L22,0 C27.5228475,-1.01453063e-15 32,4.4771525 32,10 C32,15.5228475 27.5228475,20 22,20 L10,20 C4.4771525,20 6.76353751e-16,15.5228475 0,10 C-6.76353751e-16,4.4771525 4.4771525,1.01453063e-15 10,0 Z" id="矩形" fill="#FF5100" opacity="0.05"></path>
+                    <g id="shoucang" transform="translate(10.000000, 4.000000)" fill="#FE5C11" fill-rule="nonzero" opacity="0.737776802">
+                        <path d="M3.51111722,11.8358841 C3.00606047,12.157725 2.34560166,11.9912662 2.03884758,11.4672748 C1.89342872,11.2184847 1.84823239,10.9213787 1.91284589,10.6389807 L2.56655461,7.77979671 C2.58241634,7.71199121 2.5606958,7.64072905 2.51000386,7.59426129 L0.370225308,5.6819849 C-0.0742306183,5.28506832 -0.125531303,4.59092584 0.254423758,4.12816419 C0.437033108,3.90516747 0.698955059,3.76625534 0.981933462,3.74232435 L3.79012094,3.5077128 C3.85132176,3.50248211 3.90607248,3.46109818 3.93112283,3.39817613 L5.01308726,0.684220572 C5.23854026,0.118845213 5.86554864,-0.151150366 6.41260593,0.0862303529 C6.67350855,0.199948757 6.87993807,0.414928183 6.98681359,0.684220572 L8.06877804,3.3980223 C8.09382837,3.46109818 8.14857911,3.50263596 8.20977992,3.5077128 L11.0182674,3.74247818 C11.6071753,3.79170814 12.0432311,4.3260071 11.9965805,4.93261256 C11.9746663,5.22209277 11.8429987,5.49123316 11.6298256,5.68229258 L9.49004701,7.59456897 C9.44024635,7.63902978 9.41774605,7.7110286 9.43349624,7.77995054 L10.087205,10.6391345 C10.2225068,11.2306633 9.87120209,11.8266535 9.29774444,11.9692666 C9.02158512,12.0380065 8.73007522,11.9899974 8.48878365,11.836038 L6.08440156,10.3037554 C6.03276544,10.2705141 5.96713542,10.2705141 5.9154993,10.3037554 L3.51096721,11.836038 L3.51111722,11.8358841 Z" id="路径"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/collection-success.svg b/src/icons/svg/collection-success.svg
new file mode 100644
index 00000000..50befacd
--- /dev/null
+++ b/src/icons/svg/collection-success.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="8.选择偏好成功" transform="translate(-651.000000, -579.000000)">
+            <g id="编组-14" transform="translate(635.000000, 567.000000)">
+                <g id="正确" transform="translate(16.000000, 12.000000)">
+                    <path d="M8,0.5 C12.1421356,0.5 15.5,3.85786438 15.5,8 C15.5,12.1421356 12.1421356,15.5 8,15.5 C3.85786438,15.5 0.5,12.1421356 0.5,8 C0.5,3.85786438 3.85786438,0.5 8,0.5 Z M11.1625209,5.31677962 C11.0763504,5.23070811 10.9384251,5.22783906 10.8488042,5.30817247 L10.8397095,5.31677962 L6.80892329,9.34293111 L5.03529046,7.5713887 C4.94911997,7.48531719 4.81119464,7.48244814 4.72157382,7.56278155 L4.71247911,7.5713887 L4.06685642,8.21626979 C3.98068592,8.3023413 3.97781357,8.4401082 4.05823937,8.52962607 L4.06685642,8.53871033 L5.96464832,10.4343701 C5.9714921,10.4454266 5.97937011,10.4560256 5.98828235,10.4660288 L5.99753932,10.4758283 L6.64316202,11.1207094 C6.71089215,11.1883617 6.81059633,11.2046117 6.89367876,11.1694979 C6.91818621,11.1599703 6.94137805,11.1460549 6.96204253,11.1277519 L6.97215855,11.1182347 L7.61778124,10.4733536 C7.62329692,10.4678442 7.62847132,10.4621231 7.63330443,10.4562164 L7.64029814,10.4472203 L11.8081436,6.28410125 C11.8943141,6.19802974 11.8971864,6.06026284 11.8167606,5.97074497 L11.8081436,5.96166071 L11.1625209,5.31677962 Z" id="形状" fill="#0BDBA8"></path>
+                    <rect id="矩形" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="16" height="16"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/icons/svg/collection.svg b/src/icons/svg/collection.svg
index 865f5be4..805c9771 100644
--- a/src/icons/svg/collection.svg
+++ b/src/icons/svg/collection.svg
@@ -1 +1 @@
-<svg t="1649839074612" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14232" width="200" height="200"><path d="M720.398507 959.573333c73.045333 31.317333 136.96-15.317333 129.706666-94.293333l-20.650666-226.218667 174.634666-199.722666c38.144-43.648 19.2-102.229333-37.418666-115.114667l-258.474667-58.794667-135.68-228.010666c-29.738667-49.877333-91.306667-49.92-121.045333 0L315.74784 265.429333 57.273173 324.224C0.953173 337.066667-18.33216 395.648 19.854507 439.338667l174.634666 199.722666-24.021333 264.405334c-5.248 57.770667 44.544 94.037333 97.877333 71.125333l243.626667-104.533333 208.426667 89.472z" fill="#A3B1CC" p-id="14233"></path></svg>
\ No newline at end of file
+<svg viewBox="0 0 14 14" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><image xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAABH0lEQVQokY2RsU4CQRCG559dzmCCdxhNSIxwBQmVhT0FL+FT+hLE6BNQqIkSCTFyFtpp5HZnDIfiwW3Aqf7ZfF9mdxYUrIG1XdcngroHc0M0dJsUB72enCpRQ0kPFjmEBEXrpRPK28V2v7mY9tsWud1vbmKgdNCqGXeikIiI91S1ToBdo1QdgE8i+YLyPPf22RqTn0sB/gxHYF+AXd6CGwoia9wxM+tL6A3bCiwzI2/TrJakkUKT/0hG+Cl/vB6ZRePfJ6+apMrQo22SF77z46tbWtuq8HTnuBLzJ9Z9ZeWVKjErMcrlcJdXZlb/JWpighQZgg8HPyoANWfKur9kJK6IDi4zitiAJ/Nx657o0hfndDGMurOeV+k4ICtgIvoGvx5xA8SjNDgAAAAASUVORK5CYII=" height="14" width="14" data-name="图层 1"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/collectionCourse.svg b/src/icons/svg/collectionCourse.svg
new file mode 100644
index 00000000..a4acad1f
--- /dev/null
+++ b/src/icons/svg/collectionCourse.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="20px" viewBox="0 0 32 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="2.课程页" transform="translate(-387.000000, -876.000000)" fill="#04243C">
+            <g id="编组-12备份-11" transform="translate(86.000000, 562.000000)">
+                <g id="收藏" transform="translate(301.000000, 314.000000)">
+                    <path d="M10,0 L22,0 C27.5228475,-1.01453063e-15 32,4.4771525 32,10 C32,15.5228475 27.5228475,20 22,20 L10,20 C4.4771525,20 6.76353751e-16,15.5228475 0,10 C-6.76353751e-16,4.4771525 4.4771525,1.01453063e-15 10,0 Z" id="矩形" opacity="0.05"></path>
+                    <g id="shoucang" transform="translate(10.000000, 4.000000)" fill-rule="nonzero" opacity="0.1">
+                        <path d="M3.51111722,11.8358841 C3.00606047,12.157725 2.34560166,11.9912662 2.03884758,11.4672748 C1.89342872,11.2184847 1.84823239,10.9213787 1.91284589,10.6389807 L2.56655461,7.77979671 C2.58241634,7.71199121 2.5606958,7.64072905 2.51000386,7.59426129 L0.370225308,5.6819849 C-0.0742306183,5.28506832 -0.125531303,4.59092584 0.254423758,4.12816419 C0.437033108,3.90516747 0.698955059,3.76625534 0.981933462,3.74232435 L3.79012094,3.5077128 C3.85132176,3.50248211 3.90607248,3.46109818 3.93112283,3.39817613 L5.01308726,0.684220572 C5.23854026,0.118845213 5.86554864,-0.151150366 6.41260593,0.0862303529 C6.67350855,0.199948757 6.87993807,0.414928183 6.98681359,0.684220572 L8.06877804,3.3980223 C8.09382837,3.46109818 8.14857911,3.50263596 8.20977992,3.5077128 L11.0182674,3.74247818 C11.6071753,3.79170814 12.0432311,4.3260071 11.9965805,4.93261256 C11.9746663,5.22209277 11.8429987,5.49123316 11.6298256,5.68229258 L9.49004701,7.59456897 C9.44024635,7.63902978 9.41774605,7.7110286 9.43349624,7.77995054 L10.087205,10.6391345 C10.2225068,11.2306633 9.87120209,11.8266535 9.29774444,11.9692666 C9.02158512,12.0380065 8.73007522,11.9899974 8.48878365,11.836038 L6.08440156,10.3037554 C6.03276544,10.2705141 5.96713542,10.2705141 5.9154993,10.3037554 L3.51096721,11.836038 L3.51111722,11.8358841 Z" id="路径"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/icons/svg/comment.svg b/src/icons/svg/comment.svg
index 14291dac..c45aa863 100644
--- a/src/icons/svg/comment.svg
+++ b/src/icons/svg/comment.svg
@@ -1 +1 @@
-<svg t="1649838554838" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="13757" width="200" height="200"><path d="M512 0C226.742857 0 0 197.485714 0 446.171429c0 138.971429 73.142857 270.628571 190.171429 351.085714L190.171429 1024l226.742857-138.971429c29.257143 7.314286 65.828571 7.314286 95.085714 7.314286 285.257143 0 512-197.485714 512-446.171429C1024 197.485714 797.257143 0 512 0zM256 512C219.428571 512 190.171429 482.742857 190.171429 446.171429S219.428571 380.342857 256 380.342857c36.571429 0 65.828571 29.257143 65.828571 65.828571S292.571429 512 256 512zM512 512C475.428571 512 446.171429 482.742857 446.171429 446.171429S475.428571 380.342857 512 380.342857c36.571429 0 65.828571 29.257143 65.828571 65.828571S548.571429 512 512 512zM768 512C731.428571 512 702.171429 482.742857 702.171429 446.171429s29.257143-65.828571 65.828571-65.828571c36.571429 0 65.828571 29.257143 65.828571 65.828571S804.571429 512 768 512z" p-id="13758" fill="#A3B1CC"></path></svg>
\ No newline at end of file
+<svg viewBox="0 0 14 14" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><image xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAABL0lEQVQokZWSu0pDQRCGvxnFC5o0IkjapNLWSsHOQiE2Qh4gvU8hCNZ2Fj5AQAuDWlgIgo2NYp1YiY0I4YiEXM6O7CY5nIQo5octdma/2Zl/V0ipcn2/PD+jB0ARJR8yjjpQbbbdSWl362NwOgEvbx/2RewMIcs4GZGZlPe2N88TMEBKBUzHQonEmaPkYem3V/v1plEZUbPtChpm+i/U6zHrGQ1GTK6iJu5NIiWvGPHEoHkWeR0Jd4BuMpKEfWcErKvBRTqmwilxvCrIsV/WjdfwsWFV5eruccW5Vg1kIZWrCnLTK247Qwb2n2P6LaOfuUic7zulomFj3BZnRtl/Pc01WusYGYQvsO8/DIkGvyaMtDjVfsJk4z07t6Q6WzDjCHhBaIZixjPGoW9vAAH8ACc0dSWSpbLsAAAAAElFTkSuQmCC" height="14" width="14" data-name="图层 1"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/couseViews.svg b/src/icons/svg/couseViews.svg
new file mode 100644
index 00000000..b9acef5a
--- /dev/null
+++ b/src/icons/svg/couseViews.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="14px" viewBox="0 0 22 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 20</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="1.首页备份" transform="translate(-1481.000000, -1081.000000)">
+            <g id="编组-20" transform="translate(1481.000000, 1081.000000)">
+                <g id="路径-7" transform="translate(0.000000, 1.000000)" fill="#B3BDC4">
+                    <path d="M1.32989024,4.72952927 C8.1614567,-2.08723747 14.726062,-1.53514579 21.0237062,6.38580432 C14.4657744,13.6097695 7.90784261,14.0035566 1.34991082,7.56716557 L1.34663436,7.57050743 C0.557906585,6.79721429 0.545394342,5.53094615 1.31868748,4.74221838 C1.32263032,4.73819684 1.32659013,4.73419198 1.3305668,4.73020389 Z" id="路径-6"></path>
+                </g>
+                <circle id="椭圆形" stroke="#FFFFFF" cx="10.373217" cy="7.14580432" r="2.5"></circle>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/crown.svg b/src/icons/svg/crown.svg
new file mode 100644
index 00000000..07223686
--- /dev/null
+++ b/src/icons/svg/crown.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="14px" viewBox="0 0 16 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="1.首页" transform="translate(-155.000000, -1574.000000)" fill="#387DF7" fill-rule="nonzero">
+            <g id="编组-32" transform="translate(146.000000, 1569.000000)">
+                <g id="renqibang" transform="translate(9.000000, 5.000000)">
+                    <path d="M3.56313537,11.5142575 L9.1206715,8.02953218 C9.36099738,7.8793285 9.45111959,7.57892115 9.36099738,7.33859526 L7.79887912,3.28309592 C7.73879765,3.10285151 7.43839029,3.10285151 7.37830882,3.28309592 L6.89765705,4.6048883 C6.71741263,5.08554007 6.17667939,5.32586596 5.69602761,5.11558081 L3.14256507,4.00407358 C2.99236139,3.94399211 2.84215771,4.03411432 2.84215771,4.184318 L2.66191329,6.88798422 C2.63187256,7.36863599 2.21130226,7.75916556 1.70060975,7.72912482 L0.228613693,7.63900262 C0.0483692777,7.63900262 -0.0717936656,7.84928777 0.0483692777,7.99949145 L2.84215771,11.3340131 C3.02240212,11.6043797 3.32280948,11.6644612 3.56313537,11.5142575 Z" id="路径" fill-opacity="0.25"></path>
+                    <path d="M3.41293169,3.82382917 C3.41293169,4.21435873 3.11252433,4.51476609 2.72199477,4.51476609 C2.3314652,4.51476609 2.03105784,4.21435873 2.03105784,3.82382917 C2.03105784,3.4332996 2.3314652,3.13289224 2.72199477,3.13289224 C3.11252433,3.13289224 3.41293169,3.4332996 3.41293169,3.82382917 Z M9.72148621,1.69093692 C9.72148621,2.08146649 9.42107885,2.38187385 9.03054929,2.38187385 C8.64001972,2.38187385 8.33961237,2.08146649 8.33961237,1.69093692 C8.33961237,1.30040736 8.64001972,1 9.03054929,1 C9.39103812,1 9.72148621,1.30040736 9.72148621,1.69093692 Z M16,3.82382917 C16,4.21435873 15.6995926,4.51476609 15.3090631,4.51476609 C14.9185335,4.51476609 14.6181262,4.21435873 14.6181262,3.82382917 C14.6181262,3.4332996 14.9185335,3.13289224 15.3090631,3.13289224 C15.6995926,3.13289224 16,3.4332996 16,3.82382917 Z M4.94500922,11.0936872 L12.8457227,11.0936872 C13.1761708,11.0936872 13.4765782,10.8533614 13.5366597,10.5229133 L14.5280039,5.38594743 C14.5880854,5.14562154 14.2876781,4.96537713 14.1074336,5.11558081 L12.7556005,6.16700656 C12.2749488,6.55753613 11.5539711,6.43737318 11.1934823,5.92668068 L9.27087518,3.16293298 C9.15071223,3.0127293 8.94042708,3.0127293 8.82026414,3.16293298 L6.89765705,5.80651773 C6.53716822,6.2871695 5.87627203,6.40733245 5.39562025,6.04684362 L3.95366493,5.0254586 C3.77342052,4.90529566 3.5030539,5.05549934 3.53309463,5.29582522 L4.28411303,10.4628318 C4.28411303,10.8233206 4.58452039,11.0936872 4.94500922,11.0936872 Z M13.4765782,12.5356426 C13.4765782,12.8060092 13.266293,13.0162943 12.9959264,13.0162943 L4.82484627,13.0162943 C4.49439818,13.0162943 4.25407229,12.6858462 4.40427597,12.3553981 C4.49439818,12.145113 4.70468333,12.02495 4.94500922,12.02495 L13.0259672,12.02495 C13.266293,12.02495 13.4765782,12.2953167 13.4765782,12.5356426 Z" id="形状"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/del-icon.svg b/src/icons/svg/del-icon.svg
new file mode 100644
index 00000000..7d9289a5
--- /dev/null
+++ b/src/icons/svg/del-icon.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="13.我的提问" transform="translate(-1734.000000, -445.000000)">
+            <g id="编组-17备份" transform="translate(1734.000000, 445.000000)">
+                <path d="M6.02941176,0 L7.26470588,0 C8.09313301,-1.52179594e-16 8.76470588,0.671572875 8.76470588,1.5 L8.76470588,2 L8.76470588,2 L4.52941176,2 L4.52941176,1.5 C4.52941176,0.671572875 5.20098464,1.52179594e-16 6.02941176,0 Z" id="矩形" fill="#B3BDC4"></path>
+                <rect id="矩形" fill="#B3BDC4" x="1.70588235" y="3.33333333" width="10.5882353" height="10.6666667" rx="1"></rect>
+                <rect id="矩形" stroke="#B3BDC4" fill="#B3BDC4" x="1.5" y="1.83333333" width="11" height="1" rx="0.5"></rect>
+                <line x1="7" y1="5.45305864" x2="7" y2="11.7528444" id="路径-8" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></line>
+                <line x1="4.17647059" y1="6.78639197" x2="4.17647059" y2="10.3333333" id="路径-8备份" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></line>
+                <line x1="9.82352941" y1="6.78639197" x2="9.82352941" y2="10.3333333" id="路径-8备份-2" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/doubt.svg b/src/icons/svg/doubt.svg
new file mode 100644
index 00000000..59f48bd3
--- /dev/null
+++ b/src/icons/svg/doubt.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 32 32" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><image xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAFd0lEQVRYhc2Xa2xURRTHz5mZu20TKFCKrWlRjJWaSqF3bwuSKLSAJob4iIL4Qk38gDZR4wfiI/oJE4MhKn5AjTGCCiYYSFQwQZEuL4GW3U2EIo+YrFJw2YLQVmx3OzPHnM2tLnV3uy0f9CSb7O7M/H8z954z8x+EAqOurm6c4zg3SSkXAcACRLyFiK7h0YiYIKJOANhljNk5ODh46tixY38UojziBFzXnSKEeAIAHgCAW4UQYK3lJgKAQb+bw1oZbQcBYIu1dkM0Gu0e6wTQ87yHAeA1KeXNxhhWPkBEuxlARD8DwCW/70REvJEniIjzAWCulFIYY44DwKpwOPy5P+HCJlBfXz8pEAi8joitROlxm4jofUQ8GA6HB7ONGQrP8xwi4ok8DQCPICIQ0bpUKvXqkSNHLo44gRkzZlQUFRV9KqW8wxhzAhFfPHz48Jf5oLmisbHxXiJaLaWsNcZ8l0wmlx89evRcZneZZeWfOY5zp9Z6j7V2SSQSOTQWOMfZs2dPVFRUbCOioOM4nLj15eXl2xOJxMC/JtDc3KyMMWuUUg9prXdLKZdHIpFfxwofing8fqm6uvp7rXVQKbVQCFFaW1u7IxaLpbNVDHXs6elZIoRYYYz5yVr7ZEdHx+lCADU1NUUj9WEt1mRtZjBrqC2dA36p7eNMNsbcH41Gv8on2NDQME1K+Zif9eOIiJMr1N/f/1G++ndd9x4p5VauIGvtbVyi6SfAdS6lnG6t/SIajX6dD+667iIpZUhKuUoIsZiImoQQ90kp3ykuLt42a9asqlxjWZsZzPL3FhC8wxHRg0TEibEuV71yBIPBGiHEh4h4ndb6A611MxHNNcYsNMZsV0rNl1KuqaurC+SQYO11zGImsxVvr0KIoDHmUGlpaUe+1QPAMqXUNK316kgk8lJmg+d5P2qtf0DEJUqplQDQlU2AGb29vREhxJw0m+sdEbka2kKh0EC2QT7A4V3OGKOJaNPw9nA4fB4AfgEApZQqzqXjM9qYyWzOgRZ//85b7+Fw2Fpr91prtyQSiVPD24PB4ExEbASA4yUlJeeyq/wdh3xmi+JTjd+Nv7fnCzNhwoQ3ksmk09XV1Z/Zr6GhYTEivimEmKi1fmX//v19+YSYhYjEbMVHKiIOZhwsOSMUCmkA0MNWvkIIsRYAiqy1bxUXF68fScdnDTJbFdA5ZwSDwQVCiLeJ6DIRPRWJRDaOVkOwmfDP84mjGeiX2kpELEHEF0YJZxYndUL4Tgb987zgkFJWc3FYa08KIbaPZqzPQmZzFexiJwMAc0YjEggEAog4iYhi7e3tv49mLLN85i52LTuJyHBJNDc356zf4XHhwoUYES1DxJfz7Z7Dw2e0MJPZig2klDIipQz29vY2AcDeQoRisdhALBbbOqp1AwAzmGWMiTBb8enled5mRGR4KwDsK2RFnuddCwBr/Z/Ph8Ph3wrg8+nbiojFiLiZ2ekXwe7VGMPJtNR13bsLWQkRzVRKLeUPfy9kDGszg1nM5P/Sjigej/9ZWVl5XkrJ1tudOnXqN2fOnMm7MZWVlV1ExCnW2mgymVzf3d3dn6//7NmzbwCAj4UQ5caYZ6PRaPvQI0kHW7K+vr53pZTPGGP2CiEeLdQVjRRNTU1TrbUbpZS3G2PeGz9+/HP+rvqPJ2SPVlZWdoATRCnVwh6usrKyLR6P91wN3HXd64noE8dx5rEzHhgYaO3o6Lg81H6FK+bHOHny5G/ZvbKBBIC7qqqqTrO7HQucbTkiblBKeVrrHalU6vHOzs7zmX3+fxeTzLZsVzNr7R5EPJDtasb2TAgx76qvZpnxX15Or4i0gVRqeiAQWGStbcl2PRdCtKVSqZ1a65MFXc8B4C8PBubODgaARwAAAABJRU5ErkJggg==" height="32" width="32" data-name="图层 1"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/edit-icon.svg b/src/icons/svg/edit-icon.svg
new file mode 100644
index 00000000..da76e753
--- /dev/null
+++ b/src/icons/svg/edit-icon.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15px" height="14px" viewBox="0 0 15 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="13.我的提问" transform="translate(-1627.000000, -445.000000)">
+            <g id="编组-29" transform="translate(1627.096757, 445.000000)">
+                <polygon id="路径-43" fill="#B3BDC4" points="0 13.7254019 0 10.6458899 7.31104864 3.41424666 10.0545279 5.62816355 3.18899894 13.2703675"></polygon>
+                <polygon id="路径-44" fill="#B3BDC4" points="7.87799024 2.47399486 9.4834953 0.725401855 13 3.41424666 11.0908145 5.10319344"></polygon>
+                <line x1="6.55379409" y1="12.9181356" x2="14" y2="12.9181356" id="路径-45" stroke="#B3BDC4" stroke-width="2"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/enclisure.svg b/src/icons/svg/enclisure.svg
new file mode 100644
index 00000000..925a620e
--- /dev/null
+++ b/src/icons/svg/enclisure.svg
@@ -0,0 +1 @@
+<svg t="1664267771455" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4746" width="200" height="200"><path d="M729.6 411.2L446.4 694.4c-43.2 43.2-115.2 43.2-158.4 0s-43.2-115.2 0-158.4l334.4-334.4c72-72 188.8-72 260.8 0s72 188.8 0 260.8L524.8 819.2c-99.2 99.2-262.4 99.2-361.6 0s-99.2-262.4 0-361.6L468.8 150.4c3.2-3.2 6.4-4.8 8-8l3.2-3.2c12.8-12.8 32-12.8 44.8 0 12.8 12.8 12.8 32 0 44.8-4.8 3.2-8 6.4-11.2 11.2L208 502.4c-75.2 75.2-75.2 196.8 0 272s196.8 75.2 272 0l305.6-305.6 11.2-11.2 40-40c46.4-46.4 46.4-123.2 0-169.6s-123.2-46.4-169.6 0L332.8 580.8c-19.2 19.2-19.2 49.6 0 67.2 19.2 19.2 49.6 19.2 67.2 0l283.2-283.2c12.8-12.8 32-12.8 44.8 0 12.8 14.4 12.8 33.6 1.6 46.4z" fill="#767677" p-id="4747"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/eyes.svg b/src/icons/svg/eyes.svg
index 3331f89c..82046746 100644
--- a/src/icons/svg/eyes.svg
+++ b/src/icons/svg/eyes.svg
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><rect width="48" height="48" fill="white" fill-opacity="0.01"/><path d="M24 36C35.0457 36 44 24 44 24C44 24 35.0457 12 24 12C12.9543 12 4 24 4 24C4 24 12.9543 36 24 36Z" fill="#a4b0cc" stroke="#a4b0cc" stroke-width="4" stroke-linejoin="round"/><path d="M24 29C26.7614 29 29 26.7614 29 24C29 21.2386 26.7614 19 24 19C21.2386 19 19 21.2386 19 24C19 26.7614 21.2386 29 24 29Z" fill="#FFF" stroke="#FFF" stroke-width="4" stroke-linejoin="round"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 23 15" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><image xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAABUAAAANCAYAAABGkiVgAAAByUlEQVQ4jZVS30tTYRh+3m87O+EYRQZKFxPdxbzxbiToclsDY8kSvRgUdJXXUf9Bd0ESCl74Hyh6UcMfh6DwDDYKMQKpwDEmZBCRXhTidnKe88Z3yvDMs7Y98MH3fbzP8z3P+36EJmBm0nK5Llg+1bqo7qcjkUozjquoruveI0udYFj3AMQBBP6WWwCKYM76FN/8zdi1Ly2Jarm3KdM0ZwCE/2uHcQxBs9UDepzJDFVdRTWtpJrq9zkiTMnIzSKewUeY5mR6NFZyiK7q764QG2vMGHS8SIRwXxDBq932ee/rNxR392Sf620feD3iVio+vGXznr/e7FSoVgDQX2+hP9SDgL8DH4pl+zwQDuHwqIKd8me3fvxgcPJ2cuS9UOjkoZughHQoBY1fx/aS+1PX50GXCLS+8iof9LbRuxZAXR4hhoVSIznpT24E2UMZ+YLqs5fcy7sGTuV3ezCWHFq0B7X88s3lDoVfMHjEUdbyoGCAcD99I7pg805v/3x45QkDjwB42shcZFh35YD+mamvyG7kB71MTxlwuK4Hg38Komd+qk0nEgnDkbARaV0vRCzmO2C6DqAXgApgH8C2ENBOFCyNR6OH54gAfgPsNKteeYlt7gAAAABJRU5ErkJggg==" height="13" width="21" y="1" x="1" data-name="图层 1"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/home-answer.svg b/src/icons/svg/home-answer.svg
new file mode 100644
index 00000000..7c5f5666
--- /dev/null
+++ b/src/icons/svg/home-answer.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="31px" height="32px" viewBox="0 0 31 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- <title>编组 16</title> -->
+    <defs>
+        <linearGradient x1="16.2168629%" y1="8.69510057%" x2="75.502055%" y2="93.9759603%" id="linearGradient-1">
+            <stop stop-color="#BFA1FF" offset="0%"></stop>
+            <stop stop-color="#976FFF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-759.000000, -340.000000)">
+            <g id="编组-30" transform="translate(759.257533, 340.000000)">
+                <g id="编组-31" transform="translate(1.742467, 3.000000)">
+                    <path d="M17.1316064,16.6916095 C18.414299,16.6916095 20.0565334,16.1331761 22.9284596,18.8314872 C23.0247586,18.9219646 23.765127,19.9019152 25.149565,21.7713391 C25.807764,22.6583848 25.6205252,23.9107957 24.7325761,24.5677739 C24.3888346,24.8221023 23.9726301,24.9595673 23.545031,24.96 L16,24.96 L16,24.96 C14.9210709,19.4477397 15.298273,16.6916095 17.1316064,16.6916095 Z" id="三角形" fill="#743BFF"></path>
+                    <ellipse id="椭圆形" fill="url(#linearGradient-1)" cx="12.5" cy="13" rx="12.5" ry="13"></ellipse>
+                    <rect id="矩形" fill="#FFFFFF" opacity="0.498512631" x="8" y="10.4" width="2" height="4.16" rx="1"></rect>
+                    <rect id="矩形备份-2" fill="#FFFFFF" opacity="0.498512631" x="14" y="10.4" width="2" height="4.16" rx="1"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/home-article.svg b/src/icons/svg/home-article.svg
new file mode 100644
index 00000000..a14ba7c1
--- /dev/null
+++ b/src/icons/svg/home-article.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="27px" height="32px" viewBox="0 0 27 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- <title>编组 16</title> -->
+    <defs>
+        <linearGradient x1="18.6372428%" y1="0%" x2="85.7988166%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FF924A" offset="0%"></stop>
+            <stop stop-color="#FFB66E" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-884.000000, -340.000000)">
+            <g id="编组-27" transform="translate(884.257533, 340.000000)">
+                <rect id="矩形" fill="url(#linearGradient-1)" x="1.74246697" y="3" width="22" height="26" rx="4"></rect>
+                <line x1="7.01668839" y1="9.71032699" x2="19.242467" y2="9.5" id="路径-59" stroke="#FFCAA2" stroke-width="2" stroke-linecap="round"></line>
+                <line x1="7.01668839" y1="15.710327" x2="19.242467" y2="15.5" id="路径-59备份" stroke="#FFCAA2" stroke-width="2" stroke-linecap="round"></line>
+                <line x1="7.01668839" y1="21.710327" x2="16.242467" y2="21.5" id="路径-59备份-2" stroke="#FFCAA2" stroke-width="2" stroke-linecap="round"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/home-book.svg b/src/icons/svg/home-book.svg
new file mode 100644
index 00000000..4ae0906b
--- /dev/null
+++ b/src/icons/svg/home-book.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- <title>编组 25</title> -->
+    <defs>
+        <linearGradient x1="55.2577877%" y1="2.78092619%" x2="44.5221274%" y2="93.6949416%" id="linearGradient-1">
+            <stop stop-color="#71D999" offset="0%"></stop>
+            <stop stop-color="#62CC84" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-2">
+            <stop stop-color="#55CE86" offset="0%"></stop>
+            <stop stop-color="#36AA60" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-1116.000000, -340.000000)">
+            <g id="编组-25" transform="translate(1116.000000, 340.000000)">
+                <path d="M2,30.0245398 L2,6.87463047 L2,6.87463047 C7.9183053,4.19759188 12.3936852,4.38773261 15.4261397,7.44505265 C15.8409878,8.5031412 16.0309131,15.0833048 15.9959159,27.1855436 C15.2019737,28.9397003 12.5847294,29.67005 8.14418312,29.3765926 C6.39268401,29.1730406 4.90290452,29.6339695 3.67484465,30.7593793 C3.267815,31.1326695 2.63526737,31.1047162 2.26236493,30.6973316 C2.09416239,30.5135755 2.00060272,30.2736544 2,30.0245398 Z" id="路径-58" fill="url(#linearGradient-1)" transform="translate(9.000000, 19.000000) scale(-1, 1) translate(-9.000000, -19.000000) "></path>
+                <path d="M16,29.6886036 L16,7.69485922 C16.0007482,7.31658083 16.2148816,6.97110178 16.5541811,6.80384577 C21.8573503,4.14192506 26.1480032,4.4261356 29.4261397,7.65647739 C29.8409878,8.70581201 30.0309131,15.2315357 29.9959159,27.2336485 C29.2771564,28.8269199 26.6975035,29.4780408 22.2569572,29.1870114 C20.4072263,28.8576928 18.885115,29.2643109 17.6906232,30.4068655 C17.2926946,30.789845 16.6596787,30.7761083 16.2777188,30.3772034 C16.1002067,30.1918163 16.0007744,29.9452714 16,29.6886036 Z" id="路径-58" fill="url(#linearGradient-2)"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/home-case.svg b/src/icons/svg/home-case.svg
new file mode 100644
index 00000000..a7e47f55
--- /dev/null
+++ b/src/icons/svg/home-case.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="31px" height="32px" viewBox="0 0 31 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- <title>编组 16</title> -->
+    <defs>
+        <linearGradient x1="10.4646798%" y1="3.92289046%" x2="90.7234539%" y2="87.3752585%" id="linearGradient-1">
+            <stop stop-color="#65A0FF" offset="0%"></stop>
+            <stop stop-color="#8AC8FF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-388.000000, -340.000000)">
+            <g id="编组-16" transform="translate(388.257533, 340.000000)">
+                <rect id="矩形" fill="url(#linearGradient-1)" x="3.74246697" y="3" width="24" height="26" rx="4"></rect>
+                <line x1="2.17319069" y1="9.5" x2="6.45890498" y2="9.5" id="路径-57" stroke="#DFDDFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
+                <line x1="2.17319069" y1="15.5" x2="6.45890498" y2="15.5" id="路径-57备份" stroke="#DFDDFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
+                <line x1="2.17319069" y1="21.5" x2="6.45890498" y2="21.5" id="路径-57备份-2" stroke="#DFDDFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
+                <path d="M16.742467,22 C20.6084602,22 23.742467,18.8659932 23.742467,15 C23.742467,13.1137444 21.3240564,13.4285503 20.1109131,12.1697961 C18.8376469,10.8486587 18.7222046,8 16.742467,8 C12.8764737,8 9.74246697,11.1340068 9.74246697,15 C9.74246697,18.8659932 12.8764737,22 16.742467,22 Z" id="椭圆形" fill="#C0DAFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/home-course.svg b/src/icons/svg/home-course.svg
new file mode 100644
index 00000000..f8837c5d
--- /dev/null
+++ b/src/icons/svg/home-course.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- <title>编组 28</title> -->
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-257.000000, -340.000000)">
+            <g id="编组-33" transform="translate(257.000000, 340.000000)">
+                <g id="编组-28" transform="translate(0.000000, 3.000000)">
+                    <rect id="矩形备份-40" stroke="#FFFFFF" stroke-width="1.5" fill="#24CAED" x="0.75" y="0.75" width="30.5" height="24.5" rx="5"></rect>
+                    <polygon id="三角形" fill="#FFFFFF" opacity="0.622464135" transform="translate(16.470588, 11.916667) rotate(-270.000000) translate(-16.470588, -11.916667) " points="16.4705882 8.15196078 21.3455882 15.6813725 11.5955882 15.6813725"></polygon>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/home-dynamic.svg b/src/icons/svg/home-dynamic.svg
new file mode 100644
index 00000000..edc13d26
--- /dev/null
+++ b/src/icons/svg/home-dynamic.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="31px" height="32px" viewBox="0 0 31 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- <title>编组 14</title> -->
+    <defs>
+        <linearGradient x1="18.5275919%" y1="16.3477214%" x2="76.0845854%" y2="96.3648834%" id="linearGradient-1">
+            <stop stop-color="#0CD1DC" offset="0%"></stop>
+            <stop stop-color="#00D8CD" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-151.000000, -341.000000)">
+            <g id="编组-14" transform="translate(151.500000, 341.000000)">
+                <path d="M6.70100934,10.6485162 C8.70681983,6.42935766 11.5613795,3.88077952 15.2646885,3.00278184 C17.3105682,2.88745524 18.2207361,6.39361041 18.2207361,6.88524442 C18.2207361,7.37687843 24.5989856,7.14300847 28.2789818,11.8807208 C29.4660153,14.2637355 25.4991145,16.0586359 25.1978963,17.2989688 C24.8966782,18.5393018 25.3476532,29.550602 21.8520481,28.6001246 C18.356443,27.6496471 18.4575743,27.1719981 18.2207361,27.1719981 C17.983898,27.1719981 10.6711448,30.028251 8.68607705,28.6001246 C6.70100934,27.1719981 5.85469468,26.2639083 6.41053618,23.3524153 C6.96637769,20.4409224 1.5,19.8598599 1.5,15.5742081 C1.5,12.7171069 3.23366978,11.0752096 6.70100934,10.6485162 Z" id="路径-51" fill="url(#linearGradient-1)"></path>
+                <polyline id="路径-56" stroke="#FFFFFF" opacity="0.619914464" points="9.5 12 12.5 14.8891378 9.5 17"></polyline>
+                <circle id="椭圆形" fill="#FFFFFF" opacity="0.616527012" cx="18" cy="14.5" r="1.5"></circle>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/home-follow.svg b/src/icons/svg/home-follow.svg
new file mode 100644
index 00000000..2164e963
--- /dev/null
+++ b/src/icons/svg/home-follow.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="27px" height="32px" viewBox="0 0 27 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- <title>编组 16</title> -->
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FF915E" offset="0%"></stop>
+            <stop stop-color="#FF5D55" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-2">
+            <stop stop-color="#FF844A" offset="0%"></stop>
+            <stop stop-color="#FF5E54" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-998.000000, -340.000000)">
+            <g id="编组-29" transform="translate(998.257533, 340.000000)">
+                <path d="M13.242467,27.7518344 C19.711217,27.7518344 24.742467,29.2327157 24.742467,24.3124269 C24.742467,19.3921381 19.5937416,13 13.242467,13 C6.89119235,13 1.74246697,19.2484615 1.74246697,24.3124269 C1.74246697,29.3763923 6.77371697,27.7518344 13.242467,27.7518344 Z" id="椭圆形" fill="url(#linearGradient-1)"></path>
+                <circle id="椭圆形" fill="url(#linearGradient-2)" cx="13.242467" cy="9.5" r="6.5"></circle>
+                <line x1="14.242467" y1="20.2648095" x2="14.242467" y2="23.4648095" id="路径-60" stroke="#FFFFFF" stroke-width="3" opacity="0.374163673" stroke-linecap="round"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/home-note.svg b/src/icons/svg/home-note.svg
new file mode 100644
index 00000000..dd0cf74f
--- /dev/null
+++ b/src/icons/svg/home-note.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="31px" height="32px" viewBox="0 0 31 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- <title>编组 16</title> -->
+    <defs>
+        <linearGradient x1="10.4646798%" y1="3.92289046%" x2="90.7234539%" y2="87.3752585%" id="linearGradient-1">
+            <stop stop-color="#ABBFFF" offset="0%"></stop>
+            <stop stop-color="#758DFE" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-515.000000, -340.000000)">
+            <g id="编组-20" transform="translate(515.257533, 340.000000)">
+                <rect id="矩形" fill="url(#linearGradient-1)" x="3.74246697" y="3" width="24" height="26" rx="4"></rect>
+                <line x1="2.17319069" y1="9.5" x2="6.45890498" y2="9.5" id="路径-57" stroke="#B0BFFE" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
+                <line x1="2.17319069" y1="15.5" x2="6.45890498" y2="15.5" id="路径-57备份" stroke="#B0BFFE" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
+                <line x1="2.17319069" y1="21.5" x2="6.45890498" y2="21.5" id="路径-57备份-2" stroke="#B0BFFE" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
+                <path d="M16.6743811,7.15682785 L16.7712965,7.15682785 L16.7712965,7.15682785 C17.8223411,7.15682785 18.6743811,8.00886782 18.6743811,9.05991238 L18.6743811,21.9700603 C18.6744839,22.1032618 18.6612801,22.2361405 18.6350001,22.3667239 C18.5099521,22.9872253 18.3327257,23.4678465 18.1033208,23.8085873 C17.8486753,24.1868189 17.4046671,24.5784656 16.7712965,24.9835276 C16.1270007,24.5214279 15.6857179,24.1297812 15.4474484,23.8085873 C15.2476883,23.5393051 15.0342785,23.1087877 14.8072191,22.5170349 C14.7195051,22.2887037 14.6745095,22.0462026 14.6743811,21.8016032 L14.6743811,9.15682785 C14.6743811,8.05225835 15.5698116,7.15682785 16.6743811,7.15682785 Z" id="矩形" fill="#B0BFFE" transform="translate(16.674381, 16.070178) rotate(-322.000000) translate(-16.674381, -16.070178) "></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/home-qa.svg b/src/icons/svg/home-qa.svg
new file mode 100644
index 00000000..8006094e
--- /dev/null
+++ b/src/icons/svg/home-qa.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="31px" height="32px" viewBox="0 0 31 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- <title>编组 16</title> -->
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="98.6964939%" id="linearGradient-1">
+            <stop stop-color="#8F82FF" offset="0%"></stop>
+            <stop stop-color="#AD8FFF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="22.他人主页-动态备份" transform="translate(-642.000000, -340.000000)">
+            <g id="编组-26" transform="translate(642.257533, 340.000000)">
+                <circle id="椭圆形" fill="url(#linearGradient-1)" cx="14.742467" cy="15" r="13"></circle>
+                <text id="？" font-family="PingFangSC-Regular, PingFang SC" font-size="20" font-weight="normal" fill="#D2CAFF">
+                    <tspan x="9.74246697" y="23">？</tspan>
+                </text>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/like.svg b/src/icons/svg/like.svg
index a87860b3..0123ee62 100644
--- a/src/icons/svg/like.svg
+++ b/src/icons/svg/like.svg
@@ -1 +1 @@
-<svg t="1649838667363" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14041" width="200" height="200"><path d="M844.231111 391.39555600000006H659.9111109999999c-13.653333-2.275556-18.204444-15.928889-20.48-22.755556V202.52444400000002c0-45.511111-36.408889-81.92-81.92-81.92-40.96 0-75.093333 31.857778-81.92 70.542223-25.031111 157.013333-120.604444 209.351111-182.044444 225.28 2.275556 6.826667 2.275556 11.377778 2.275555 15.928889v441.457777c0 9.102222-2.275556 18.204444-6.826666 27.306666999999997h446.008888c43.235556-9.102222 72.817778-25.031111 93.297778-68.266667l93.297778-327.68c18.204444-59.16444400000001-11.377778-116.053333-77.368889-113.77777699999999zM257.137778 876.0888889999999V432.355556c0-13.653333-18.204444-25.031111-38.684445-25.031112H157.013333c-31.857778 0-59.16444400000001 27.306666999999997-59.16444400000001 59.16444500000001v373.191111c0 34.133333 25.031111 61.44 59.16444400000001 61.44h61.44c20.48 0 38.684444-11.377778 38.684445-25.031111z m0 0" fill="#A3B1CC" p-id="14042"></path></svg>
\ No newline at end of file
+<svg viewBox="0 0 14 14" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><image xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAA80lEQVQokZ2RQStEURiGn/fcS0QpWdlYWEqzncxKKRtl5QdYWar5A7P2G5SdjYUishpkmKyVkr+AhYWMuu6rbqnbnVOXeVenr/fpOX2fiOTk8qaVOJzaPOekO5trzYdqK8RAEbYNs4hmou9j8JAgDtrLv2/jxYur+4Va8KjfnwSWyjMzyKq9tDqY+HQbNFXyvzkfT867d4U1nZt+XW80PnTW7W3lsBsIh4YB+CD2/VIyo3aAsC/UMsxL+VgNVEgFnWA884dyJX6PbrWe43Y0UBoRDOoNnaNexsvG6spTAH/9B7R1XUht7am4Xz2D9Kg86wD8AHxXSXC4x9XlAAAAAElFTkSuQmCC" height="14" width="14" data-name="图层 1"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/message.svg b/src/icons/svg/message.svg
new file mode 100644
index 00000000..1f659248
--- /dev/null
+++ b/src/icons/svg/message.svg
@@ -0,0 +1 @@
+<svg t="1665723331570" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="850" width="200" height="200"><path d="M512 515.657143m-475.428571 0a475.428571 475.428571 0 1 0 950.857142 0 475.428571 475.428571 0 1 0-950.857142 0Z" fill="#4B4C51" opacity=".55" p-id="851"></path><path d="M720.457143 640c3.657143 0 10.971429 0 14.628571 3.657143-18.285714-10.971429-29.257143-29.257143-29.257143-51.2v-120.685714c0-91.428571-65.828571-164.571429-149.942857-182.857143v-7.314286c0-21.942857-18.285714-40.228571-40.228571-40.228571S475.428571 259.657143 475.428571 281.6v3.657143c-87.771429 18.285714-149.942857 91.428571-149.942857 182.857143v120.685714c0 21.942857-10.971429 40.228571-29.257143 51.2 3.657143-3.657143 10.971429-3.657143 14.628572-3.657143-14.628571 0-29.257143 10.971429-29.257143 29.257143s7.314286 29.257143 25.6 29.257143h413.257143c14.628571 0 29.257143-10.971429 29.257143-29.257143-3.657143-10.971429-14.628571-25.6-29.257143-25.6zM512 793.6c36.571429 0 69.485714-29.257143 69.485714-69.485714h-138.971428c0 36.571429 32.914286 69.485714 69.485714 69.485714z" fill="#333333" p-id="852"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/messageactive.svg b/src/icons/svg/messageactive.svg
new file mode 100644
index 00000000..7d35c49e
--- /dev/null
+++ b/src/icons/svg/messageactive.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="23px" height="22px" viewBox="0 0 23 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="20.通知中心-" transform="translate(-125.000000, -975.000000)" fill="#666666" stroke="#666666" stroke-width="0.4">
+            <g id="编组-19备份" transform="translate(80.000000, 310.000000)">
+                <g id="编组" transform="translate(45.433916, 665.000000)">
+                    <path d="M3.62116539,14.5535032 C3.24403496,14.7052236 2.99634676,15.0778984 3.00295312,15.4817627 L3.00295312,15.5665342 C2.9986317,16.1132077 3.43814117,16.5640276 3.98709958,16.570654 L17.0564226,16.570654 C17.3130221,16.5684833 17.5539697,16.4702306 17.7369939,16.2917762 C17.9288152,16.1042964 18.040569,15.8410705 18.0381499,15.5709899 L18.040569,15.4840476 C18.0471754,15.0800691 17.7994872,14.7052236 17.4245275,14.5557881 L16.3691106,14.1384426 L16.3691106,9.51725249 C16.3691106,6.3129577 13.7472487,3.70674768 10.5228464,3.70674768 C7.29855836,3.70674768 4.6765822,6.3129577 4.6765822,9.51725249 L4.6765822,14.1384426 L3.62116539,14.5535032 Z M3.99155522,17.9631004 C2.6526908,17.9631004 1.56608447,16.8875761 1.56608447,15.5665342 L1.56608447,15.4773071 C1.56608447,14.9952976 1.70889363,14.5312249 1.97886006,14.133987 C2.25111144,13.7368633 2.63041257,13.4355931 3.07894757,13.2614801 L3.23740862,13.1991011 L3.23740862,9.51725249 C3.23740862,7.73659365 3.90232806,6.02733939 5.11175027,4.70195614 C6.31226118,3.38536994 7.94565522,2.55524886 9.71511782,2.35897196 L9.93824285,2.33440878 L9.93824285,1.58905922 C9.93824285,1.26551079 10.2015829,1 10.5273021,1 C10.8508505,1 11.1163613,1.26334009 11.1163613,1.58905922 L11.1163613,2.33440878 L11.3396006,2.35897196 C13.1067782,2.55307817 14.7401723,3.38536994 15.9385125,4.70195614 C17.1456497,6.02733939 17.8105692,7.73659365 17.8105692,9.51725249 L17.8105692,13.2012718 L17.9690302,13.2637651 C18.4175652,13.4377638 18.7968664,13.739034 19.0691177,14.1362719 C19.3413691,14.5333956 19.4841783,14.9975825 19.4841783,15.4773071 L19.4841783,15.5665342 C19.4841783,16.2002641 19.2364901,16.7982347 18.7856701,17.2490546 C18.3260531,17.7086716 17.7146014,17.9631004 17.0630489,17.9631004 L3.99155522,17.9631004 Z M10.4715494,21.0000228 C9.27777905,21.0000228 8.10400201,20.799176 6.97718062,20.4019381 L6.97272498,20.3997674 C6.79415641,20.3349892 6.64917655,20.2056612 6.56886068,20.0338332 C6.48625986,19.8620052 6.47734857,19.667899 6.54201255,19.4893304 C6.6468916,19.2059971 6.92142793,19.0140616 7.22486883,19.0140616 C7.30746965,19.0140616 7.38995622,19.0274285 7.47027209,19.0564473 C8.43646173,19.3956476 9.44732209,19.5674756 10.4715494,19.5674756 C11.5247955,19.5674756 12.5623897,19.3867363 13.5531425,19.0274285 L13.5709651,19.0208022 C13.6535659,18.9894984 13.7383374,18.9761314 13.823109,18.9761314 C14.1220942,18.9761314 14.3965163,19.1636113 14.5036803,19.444774 L14.505851,19.4492296 C14.5706292,19.627684 14.5617179,19.8217902 14.4814021,19.9936181 C14.4009719,20.1677311 14.2581628,20.297059 14.0797085,20.364008 C12.9171277,20.7858091 11.7055348,21.0000228 10.4715494,21.0000228 L10.4715494,21.0000228 Z" id="Fill-1"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/messageicon.svg b/src/icons/svg/messageicon.svg
new file mode 100644
index 00000000..c2e5d835
--- /dev/null
+++ b/src/icons/svg/messageicon.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="23px" height="22px" viewBox="0 0 23 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="20.通知中心-" transform="translate(-125.000000, -1015.000000)" fill="#3379FB" stroke="#3379FB" stroke-width="0.4">
+            <g id="编组-19备份" transform="translate(80.000000, 310.000000)">
+                <g id="编组" transform="translate(45.433916, 705.000000)">
+                    <path d="M3.62116539,14.5535032 C3.24403496,14.7052236 2.99634676,15.0778984 3.00295312,15.4817627 L3.00295312,15.5665342 C2.9986317,16.1132077 3.43814117,16.5640276 3.98709958,16.570654 L17.0564226,16.570654 C17.3130221,16.5684833 17.5539697,16.4702306 17.7369939,16.2917762 C17.9288152,16.1042964 18.040569,15.8410705 18.0381499,15.5709899 L18.040569,15.4840476 C18.0471754,15.0800691 17.7994872,14.7052236 17.4245275,14.5557881 L16.3691106,14.1384426 L16.3691106,9.51725249 C16.3691106,6.3129577 13.7472487,3.70674768 10.5228464,3.70674768 C7.29855836,3.70674768 4.6765822,6.3129577 4.6765822,9.51725249 L4.6765822,14.1384426 L3.62116539,14.5535032 Z M3.99155522,17.9631004 C2.6526908,17.9631004 1.56608447,16.8875761 1.56608447,15.5665342 L1.56608447,15.4773071 C1.56608447,14.9952976 1.70889363,14.5312249 1.97886006,14.133987 C2.25111144,13.7368633 2.63041257,13.4355931 3.07894757,13.2614801 L3.23740862,13.1991011 L3.23740862,9.51725249 C3.23740862,7.73659365 3.90232806,6.02733939 5.11175027,4.70195614 C6.31226118,3.38536994 7.94565522,2.55524886 9.71511782,2.35897196 L9.93824285,2.33440878 L9.93824285,1.58905922 C9.93824285,1.26551079 10.2015829,1 10.5273021,1 C10.8508505,1 11.1163613,1.26334009 11.1163613,1.58905922 L11.1163613,2.33440878 L11.3396006,2.35897196 C13.1067782,2.55307817 14.7401723,3.38536994 15.9385125,4.70195614 C17.1456497,6.02733939 17.8105692,7.73659365 17.8105692,9.51725249 L17.8105692,13.2012718 L17.9690302,13.2637651 C18.4175652,13.4377638 18.7968664,13.739034 19.0691177,14.1362719 C19.3413691,14.5333956 19.4841783,14.9975825 19.4841783,15.4773071 L19.4841783,15.5665342 C19.4841783,16.2002641 19.2364901,16.7982347 18.7856701,17.2490546 C18.3260531,17.7086716 17.7146014,17.9631004 17.0630489,17.9631004 L3.99155522,17.9631004 Z M10.4715494,21.0000228 C9.27777905,21.0000228 8.10400201,20.799176 6.97718062,20.4019381 L6.97272498,20.3997674 C6.79415641,20.3349892 6.64917655,20.2056612 6.56886068,20.0338332 C6.48625986,19.8620052 6.47734857,19.667899 6.54201255,19.4893304 C6.6468916,19.2059971 6.92142793,19.0140616 7.22486883,19.0140616 C7.30746965,19.0140616 7.38995622,19.0274285 7.47027209,19.0564473 C8.43646173,19.3956476 9.44732209,19.5674756 10.4715494,19.5674756 C11.5247955,19.5674756 12.5623897,19.3867363 13.5531425,19.0274285 L13.5709651,19.0208022 C13.6535659,18.9894984 13.7383374,18.9761314 13.823109,18.9761314 C14.1220942,18.9761314 14.3965163,19.1636113 14.5036803,19.444774 L14.505851,19.4492296 C14.5706292,19.627684 14.5617179,19.8217902 14.4814021,19.9936181 C14.4009719,20.1677311 14.2581628,20.297059 14.0797085,20.364008 C12.9171277,20.7858091 11.7055348,21.0000228 10.4715494,21.0000228 L10.4715494,21.0000228 Z" id="Fill-1"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/messfff.svg b/src/icons/svg/messfff.svg
new file mode 100644
index 00000000..c4b2e0fa
--- /dev/null
+++ b/src/icons/svg/messfff.svg
@@ -0,0 +1 @@
+<svg t="1665718817453" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="19903" width="64" height="64"><path d="M609.578667 806.826667a36.693333 36.693333 0 0 0-36.181334 37.12c0 34.816-27.434667 63.061333-61.269333 63.061333-33.834667 0-61.312-28.245333-61.312-63.018667a36.693333 36.693333 0 0 0-36.181333-37.162666 36.693333 36.693333 0 0 0-36.181334 37.12c0 75.776 59.946667 137.386667 133.674667 137.386666 73.685333 0 133.632-61.610667 133.632-137.386666a36.693333 36.693333 0 0 0-36.181333-37.12z m242.901333-125.013334c-53.034667-40.917333-84.736-105.984-84.736-174.08V371.285333c-2.858667-122.624-82.944-227.157333-194.986667-254.421333-3.797333-0.853333-7.594667-1.749333-11.434666-2.389333 1.92-5.546667 3.2-11.562667 3.2-17.92C564.48 66.901333 541.013333 42.666667 512 42.666667c-29.013333 0-52.522667 24.106667-52.522667 53.973333 0 6.314667 1.28 12.288 3.157334 17.962667a251.306667 251.306667 0 0 0-108.928 51.584 264.192 264.192 0 0 0-97.365334 205.781333v135.509333c0 68.138667-31.701333 133.205333-84.736 174.08-19.2 14.848-27.050667 40.533333-19.413333 64s28.842667 39.125333 52.821333 39.125334H285.44c0.853333 0.128 1.706667 0.128 2.432 0.128h530.773333c24.064 0 45.269333-15.701333 52.906667-39.168a57.258667 57.258667 0 0 0-19.072-63.872z" p-id="19904"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/myart-active.svg b/src/icons/svg/myart-active.svg
new file mode 100644
index 00000000..fe90aa03
--- /dev/null
+++ b/src/icons/svg/myart-active.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-28.000000, -667.000000)" stroke="#2D75FF">
+            <g id="编组-27" transform="translate(28.000000, 667.000000)">
+                <path d="M20,3 C20.5522847,3 21.0522847,3.22385763 21.4142136,3.58578644 C21.7761424,3.94771525 22,4.44771525 22,5 L22,5 L22,14 C22,15.9329966 21.2164983,17.6829966 19.9497475,18.9497475 C18.6829966,20.2164983 16.9329966,21 15,21 L15,21 L6,21 C5.44771525,21 4.94771525,20.7761424 4.58578644,20.4142136 C4.22385763,20.0522847 4,19.5522847 4,19 L4,19 L4,5 C4,4.44771525 4.22385763,3.94771525 4.58578644,3.58578644 C4.94771525,3.22385763 5.44771525,3 6,3 L6,3 Z" id="矩形" stroke-width="2"></path>
+                <line x1="7.79400129" y1="8.60855962" x2="17.6535724" y2="8.60855962" id="路径-33" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
+                <line x1="7.79400129" y1="13.6085596" x2="14.3220163" y2="13.6085596" id="路径-33备份" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
+                <polyline id="路径-34" points="15.8201012 21.0721089 15.8201012 16.7119713 22.044721 16.7119713"></polyline>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/myart.svg b/src/icons/svg/myart.svg
new file mode 100644
index 00000000..89035b7d
--- /dev/null
+++ b/src/icons/svg/myart.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-128.000000, -667.000000)" stroke="#666666">
+            <g id="编组-27" transform="translate(128.000000, 667.000000)">
+                <path d="M20,3 C20.5522847,3 21.0522847,3.22385763 21.4142136,3.58578644 C21.7761424,3.94771525 22,4.44771525 22,5 L22,5 L22,14 C22,15.9329966 21.2164983,17.6829966 19.9497475,18.9497475 C18.6829966,20.2164983 16.9329966,21 15,21 L15,21 L6,21 C5.44771525,21 4.94771525,20.7761424 4.58578644,20.4142136 C4.22385763,20.0522847 4,19.5522847 4,19 L4,19 L4,5 C4,4.44771525 4.22385763,3.94771525 4.58578644,3.58578644 C4.94771525,3.22385763 5.44771525,3 6,3 L6,3 Z" id="矩形" stroke-width="2"></path>
+                <line x1="7.79400129" y1="8.60855962" x2="17.6535724" y2="8.60855962" id="路径-33" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
+                <line x1="7.79400129" y1="13.6085596" x2="14.3220163" y2="13.6085596" id="路径-33备份" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></line>
+                <polyline id="路径-34" points="15.8201012 21.0721089 15.8201012 16.7119713 22.044721 16.7119713"></polyline>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/mybiji-active.svg b/src/icons/svg/mybiji-active.svg
new file mode 100644
index 00000000..9fd31de0
--- /dev/null
+++ b/src/icons/svg/mybiji-active.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-28.000000, -507.000000)" stroke="#2D75FF" stroke-width="2">
+            <g id="编组-19" transform="translate(28.000000, 507.000000)">
+                <path d="M5.85407371,17.7545567 L6.81437325,15.7757143 C7.30179301,14.7713122 7.93927716,13.846965 8.70491722,13.03444 L18.3239082,2.82641758 C19.2990833,1.79152633 20.901952,1.66957808 22.0224682,2.54502653 C22.9924346,3.30285198 23.1644089,4.70350407 22.4065835,5.67347055 C22.3524247,5.74279028 22.2942093,5.80884276 22.2322429,5.87128133 L10.5478297,17.6447357 L10.5478297,17.6447357 L7.14955561,19.1094745 C6.64237735,19.3280807 6.05401282,19.0941468 5.83540665,18.5869685 C5.72032688,18.3199771 5.72714094,18.0161208 5.85407371,17.7545567 Z" id="路径-12"></path>
+                <line x1="16.64" y1="3.73913043" x2="19.7187119" y2="6.80442798" id="路径-14"></line>
+                <line x1="1" y1="21.5434783" x2="20.32" y2="21.5434783" id="路径-18" stroke-linecap="round" stroke-linejoin="round"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/mybiji.svg b/src/icons/svg/mybiji.svg
new file mode 100644
index 00000000..d8754a44
--- /dev/null
+++ b/src/icons/svg/mybiji.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-128.000000, -507.000000)" stroke="#666666" stroke-width="2">
+            <g id="编组-19" transform="translate(128.000000, 507.000000)">
+                <path d="M5.85407371,17.7545567 L6.81437325,15.7757143 C7.30179301,14.7713122 7.93927716,13.846965 8.70491722,13.03444 L18.3239082,2.82641758 C19.2990833,1.79152633 20.901952,1.66957808 22.0224682,2.54502653 C22.9924346,3.30285198 23.1644089,4.70350407 22.4065835,5.67347055 C22.3524247,5.74279028 22.2942093,5.80884276 22.2322429,5.87128133 L10.5478297,17.6447357 L10.5478297,17.6447357 L7.14955561,19.1094745 C6.64237735,19.3280807 6.05401282,19.0941468 5.83540665,18.5869685 C5.72032688,18.3199771 5.72714094,18.0161208 5.85407371,17.7545567 Z" id="路径-12"></path>
+                <line x1="16.64" y1="3.73913043" x2="19.7187119" y2="6.80442798" id="路径-14"></line>
+                <line x1="1" y1="21.5434783" x2="20.32" y2="21.5434783" id="路径-18" stroke-linecap="round" stroke-linejoin="round"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/myceping-active.svg b/src/icons/svg/myceping-active.svg
new file mode 100644
index 00000000..8b111fc7
--- /dev/null
+++ b/src/icons/svg/myceping-active.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-28.000000, -561.000000)" stroke="#2D75FF" stroke-width="2">
+            <g id="测评" transform="translate(28.000000, 561.000000)">
+                <rect id="矩形" x="5" y="6.15789474" width="17" height="14.8421053" rx="2"></rect>
+                <rect id="矩形" fill="#FFFFFF" x="8.16666667" y="3" width="10.6666667" height="4.31578947" rx="2.15789474"></rect>
+                <polyline id="路径-27" points="9.73107268 13.1488156 12.9356387 16.3445047 18.2317156 11.1921805"></polyline>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/myceping.svg b/src/icons/svg/myceping.svg
new file mode 100644
index 00000000..dd80ccb5
--- /dev/null
+++ b/src/icons/svg/myceping.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-128.000000, -561.000000)" stroke="#666666" stroke-width="2">
+            <g id="测评" transform="translate(128.000000, 561.000000)">
+                <rect id="矩形" x="5" y="6.15789474" width="17" height="14.8421053" rx="2"></rect>
+                <rect id="矩形" fill="#FFFFFF" x="8.16666667" y="3" width="10.6666667" height="4.31578947" rx="2.15789474"></rect>
+                <polyline id="路径-27" points="9.73107268 13.1488156 12.9356387 16.3445047 18.2317156 11.1921805"></polyline>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/myqa-active.svg b/src/icons/svg/myqa-active.svg
new file mode 100644
index 00000000..69adc905
--- /dev/null
+++ b/src/icons/svg/myqa-active.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="25px" viewBox="0 0 24 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-28.000000, -614.000000)" stroke="#2D75FF">
+            <g id="编组-20" transform="translate(28.000000, 614.026892)">
+                <path d="M4.66946984,19.7252613 C4.95056386,19.5243917 5.24713167,19.3015755 5.55917328,19.0568125 C6.54071305,18.2869003 5.1208058,16.7962797 4.24142696,14.6615752 C3.17002729,12.0607373 2.97522268,7.62776992 7.14412873,3.95349572 C13.8023999,-1.91478571 26.7434297,6.36459486 21.109166,16.495449 C20.3201881,17.914094 18.6634655,19.1759478 17.1007063,20.6422458 C12.6798079,22.4434619 10.9159106,21.8943184 9.10935607,21.8943184 C7.92390755,21.8943184 6.58263119,21.7706103 5.08552699,21.5231941 L5.08553007,21.5231757 C4.54075785,21.432392 4.17272738,20.9171722 4.26351102,20.3724 C4.30707166,20.1110024 4.45260752,19.8775837 4.6681503,19.7234164 Z" id="路径-29" stroke-width="2"></path>
+                <ellipse id="椭圆形" fill-opacity="0.6" fill="#2D75FF" cx="7.87991992" cy="11.4680578" rx="1.12442554" ry="1.21717172"></ellipse>
+                <ellipse id="椭圆形备份-12" fill-opacity="0.6" fill="#2D75FF" cx="13.1354143" cy="11.4680578" rx="1.12442554" ry="1.21717172"></ellipse>
+                <ellipse id="椭圆形备份-13" fill-opacity="0.6" fill="#2D75FF" cx="17.3398098" cy="11.4680578" rx="1.12442554" ry="1.21717172"></ellipse>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/myqa.svg b/src/icons/svg/myqa.svg
new file mode 100644
index 00000000..ba7f16cf
--- /dev/null
+++ b/src/icons/svg/myqa.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="25px" viewBox="0 0 24 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-128.000000, -614.000000)">
+            <g id="编组-20" transform="translate(128.000000, 614.026892)">
+                <path d="M4.66946984,19.7252613 C4.95056386,19.5243917 5.24713167,19.3015755 5.55917328,19.0568125 C6.54071305,18.2869003 5.1208058,16.7962797 4.24142696,14.6615752 C3.17002729,12.0607373 2.97522268,7.62776992 7.14412873,3.95349572 C13.8023999,-1.91478571 26.7434297,6.36459486 21.109166,16.495449 C20.3201881,17.914094 18.6634655,19.1759478 17.1007063,20.6422458 C12.6798079,22.4434619 10.9159106,21.8943184 9.10935607,21.8943184 C7.92390755,21.8943184 6.58263119,21.7706103 5.08552699,21.5231941 L5.08553007,21.5231757 C4.54075785,21.432392 4.17272738,20.9171722 4.26351102,20.3724 C4.30707166,20.1110024 4.45260752,19.8775837 4.6681503,19.7234164 Z" id="路径-29" stroke="#666666" stroke-width="2"></path>
+                <ellipse id="椭圆形" stroke="#979797" fill="#666666" cx="7.87991992" cy="11.4680578" rx="1.12442554" ry="1.21717172"></ellipse>
+                <ellipse id="椭圆形备份-12" stroke="#979797" fill="#666666" cx="13.1354143" cy="11.4680578" rx="1.12442554" ry="1.21717172"></ellipse>
+                <ellipse id="椭圆形备份-13" stroke="#979797" fill="#666666" cx="17.3398098" cy="11.4680578" rx="1.12442554" ry="1.21717172"></ellipse>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/mystudy-active.svg b/src/icons/svg/mystudy-active.svg
new file mode 100644
index 00000000..db8e265c
--- /dev/null
+++ b/src/icons/svg/mystudy-active.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="25px" viewBox="0 0 24 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- <title>编组 5</title> -->
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-29.000000, -455.000000)" stroke="#2D75FF">
+            <g id="我的学习" transform="translate(29.000000, 455.545652)">
+                <path d="M1.92524439,7.23550187 L11.7300942,2.50717948 C12.0068548,2.37371358 12.3296084,2.37488918 12.6053893,2.51036765 L22.2303963,7.23869004 C22.7260968,7.48220485 22.9305337,8.08145726 22.6870188,8.57715776 C22.5894969,8.7756742 22.4289127,8.93625835 22.2303963,9.03378033 L12.6053893,13.7621027 C12.3296084,13.8975812 12.0068548,13.8987568 11.7300942,13.7652909 L1.92524439,9.0369685 C1.42778312,8.79707117 1.21898628,8.19932392 1.45888361,7.70186265 C1.55712577,7.49814354 1.72152527,7.33374404 1.92524439,7.23550187 Z" id="路径-20" stroke-width="2"></path>
+                <polyline id="路径-21" stroke-width="2" points="4.45432034 10.9736978 4.45432034 19.4460531 11.9421183 22.2957527 18.6511854 18.8378354 19.2453199 10.1838806"></polyline>
+                <line x1="22.3037164" y1="9.30433168" x2="22.3037164" y2="12.9723598" id="路径-24"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/mystudy.svg b/src/icons/svg/mystudy.svg
index 212c1a88..fba21025 100644
--- a/src/icons/svg/mystudy.svg
+++ b/src/icons/svg/mystudy.svg
@@ -1,2 +1,13 @@
-
-<svg width="30" height="30" t="1649823967288" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="53738" width="300" height="300"><path d="M879.137725 375.568862v282.059881c0 18.39521 15.329341 33.724551 33.72455 33.72455s33.724551-15.329341 33.724551-33.72455V375.568862h-67.449101z" fill="#0165FF" p-id="53739"></path><path d="M946.586826 395.497006l4.598803-1.532934c16.862275-7.664671 29.125749-26.05988 29.125748-45.988024s-10.730539-38.323353-29.125748-45.988024L531.161677 105.772455c-12.263473-6.131737-27.592814-6.131737-39.856288 0L71.281437 300.45509c-18.39521 7.664671-29.125749 26.05988-29.125748 45.988024s10.730539 38.323353 29.125748 45.988024l418.491018 194.682634c6.131737 3.065868 13.796407 4.598802 19.928144 4.598803s13.796407-1.532934 19.928144-4.598803l337.245508-156.359281 79.712575-35.257485z m-435.353293 124.167665L137.197605 346.443114l374.035928-173.221557 374.035928 173.221557-374.035928 173.221557z" fill="#0165FF" p-id="53740"></path><path d="M800.958084 504.335329c-10.730539-7.664671-24.526946-9.197605-36.790419-3.065868l-252.934132 116.502994-252.934132-116.502994c-12.263473-6.131737-26.05988-4.598802-36.790419 3.065868s-18.39521 19.928144-18.39521 33.724551V674.491018c0 162.491018 121.101796 268.263473 308.119761 268.263473s306.586826-105.772455 306.586826-268.263473v-134.898204c0-13.796407-6.131737-27.592814-16.862275-35.257485z m-42.922156 157.892216c0 203.88024-188.550898 219.209581-246.802395 219.209581s-246.802395-15.329341-246.802395-219.209581v-84.311377l229.940119 114.97006c10.730539 6.131737 22.994012 6.131737 33.724551 0l229.94012-114.97006v84.311377z" fill="#0165FF" p-id="53741"></path></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="25px" viewBox="0 0 24 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- <title>编组 5</title> -->
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-129.000000, -455.000000)" stroke="#666666">
+            <g id="我的学习" transform="translate(129.000000, 455.545652)">
+                <path d="M1.92524439,7.23550187 L11.7300942,2.50717948 C12.0068548,2.37371358 12.3296084,2.37488918 12.6053893,2.51036765 L22.2303963,7.23869004 C22.7260968,7.48220485 22.9305337,8.08145726 22.6870188,8.57715776 C22.5894969,8.7756742 22.4289127,8.93625835 22.2303963,9.03378033 L12.6053893,13.7621027 C12.3296084,13.8975812 12.0068548,13.8987568 11.7300942,13.7652909 L1.92524439,9.0369685 C1.42778312,8.79707117 1.21898628,8.19932392 1.45888361,7.70186265 C1.55712577,7.49814354 1.72152527,7.33374404 1.92524439,7.23550187 Z" id="路径-20" stroke-width="2"></path>
+                <polyline id="路径-21" stroke-width="2" points="4.45432034 10.9736978 4.45432034 19.4460531 11.9421183 22.2957527 18.6511854 18.8378354 19.2453199 10.1838806"></polyline>
+                <line x1="22.3037164" y1="9.30433168" x2="22.3037164" y2="12.9723598" id="路径-24"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/myubi-active.svg b/src/icons/svg/myubi-active.svg
new file mode 100644
index 00000000..6d5e02d8
--- /dev/null
+++ b/src/icons/svg/myubi-active.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="25px" viewBox="0 0 24 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- <title>编组 5</title> -->
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-128.000000, -350.000000)" stroke="#2D75FF" stroke-width="2">
+            <g id="set/icon/home" transform="translate(128.000000, 350.545652)">
+                <path d="M11.4,2.45434783 C13.6285654,2.45434783 15.3291171,2.7701697 16.4935494,3.32174287 C17.014176,3.56835546 17.4161601,3.85636973 17.6808206,4.19208366 C17.8881443,4.45506755 18,4.74513477 18,5.05434783 C18,5.87734055 17.3327233,6.72978985 16.2302806,7.36804614 C15.0939792,8.02590482 13.480717,8.45434783 11.4,8.45434783 C9.23219311,8.45434783 7.40933003,7.9878016 6.08154972,7.29229763 C5.39137558,6.93077785 4.84073179,6.5117163 4.46622508,6.06477916 C4.1873254,5.73193965 4,5.39138511 4,5.05434783 C4,4.78289235 4.14155472,4.53785856 4.35290118,4.3093747 C4.68148452,3.9541476 5.17330462,3.64791621 5.78923917,3.38394426 C7.15318379,2.79939656 9.08242833,2.45434783 11.4,2.45434783 Z" id="椭圆形"></path>
+                <path d="M4,5.45434783 L4,15.8445834 C4.00048293,16.085062 4.08760674,16.3173137 4.24555235,16.4986515 C5.64236294,18.1036092 7.8938455,19.0888413 11,19.4543478" id="路径-40"></path>
+                <path d="M5,11.4543478 C7.11521859,14.0171643 9.78188526,14.9379737 13,14.216776" id="路径-41"></path>
+                <path d="M17.5,10.4543478 C18.1760438,10.4543478 19.451268,10.8105131 21.3293631,11.4650416 C21.5302074,11.5353138 21.6979071,11.6652086 21.8153834,11.8307395 C21.9327738,11.9961495 22.000009,12.1971526 22,12.409828 L22,12.409828 L22,20.4239359 C21.999947,20.6395676 21.9307789,20.8430395 21.8104124,21.0094855 C21.6901138,21.1758376 21.5186702,21.305198 21.3134253,21.3729117 C19.1874115,22.0757587 17.7692411,22.4543478 17.0547441,22.4543478 C16.3793111,22.4543478 15.238818,22.0976928 13.6276654,21.451846 C13.4379966,21.3754616 13.2810063,21.2452958 13.1714599,21.0830962 C13.0620314,20.9210713 12.9999518,20.7270701 13,20.5225747 L13,20.5225747 L12.9999998,12.4104211 C12.9998559,12.1976712 13.067036,11.9965284 13.1844328,11.8309984 C13.3019152,11.6653476 13.4696823,11.5353523 13.6694782,11.4654462 C15.548732,10.8105131 16.8239562,10.4543478 17.5,10.4543478 Z" id="矩形"></path>
+                <path d="M13,13.4543478 C15.4146042,14.7876812 18.4146042,14.7876812 22,13.4543478" id="路径-42"></path>
+                <path d="M13,17.4543478 C15.4146042,18.7876812 18.4146042,18.7876812 22,17.4543478" id="路径-42备份"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/myubi.svg b/src/icons/svg/myubi.svg
new file mode 100644
index 00000000..f84ce1c4
--- /dev/null
+++ b/src/icons/svg/myubi.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="25px" viewBox="0 0 24 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- <title>编组 5</title> -->
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-28.000000, -350.000000)" stroke="#666666" stroke-width="2">
+            <g id="set/icon/home" transform="translate(28.000000, 350.545652)">
+                <path d="M11.4,2.45434783 C13.6285654,2.45434783 15.3291171,2.7701697 16.4935494,3.32174287 C17.014176,3.56835546 17.4161601,3.85636973 17.6808206,4.19208366 C17.8881443,4.45506755 18,4.74513477 18,5.05434783 C18,5.87734055 17.3327233,6.72978985 16.2302806,7.36804614 C15.0939792,8.02590482 13.480717,8.45434783 11.4,8.45434783 C9.23219311,8.45434783 7.40933003,7.9878016 6.08154972,7.29229763 C5.39137558,6.93077785 4.84073179,6.5117163 4.46622508,6.06477916 C4.1873254,5.73193965 4,5.39138511 4,5.05434783 C4,4.78289235 4.14155472,4.53785856 4.35290118,4.3093747 C4.68148452,3.9541476 5.17330462,3.64791621 5.78923917,3.38394426 C7.15318379,2.79939656 9.08242833,2.45434783 11.4,2.45434783 Z" id="椭圆形"></path>
+                <path d="M4,5.45434783 L4,15.8445834 C4.00048293,16.085062 4.08760674,16.3173137 4.24555235,16.4986515 C5.64236294,18.1036092 7.8938455,19.0888413 11,19.4543478" id="路径-40"></path>
+                <path d="M5,11.4543478 C7.11521859,14.0171643 9.78188526,14.9379737 13,14.216776" id="路径-41"></path>
+                <path d="M17.5,10.4543478 C18.1760438,10.4543478 19.451268,10.8105131 21.3293631,11.4650416 C21.5302074,11.5353138 21.6979071,11.6652086 21.8153834,11.8307395 C21.9327738,11.9961495 22.000009,12.1971526 22,12.409828 L22,12.409828 L22,20.4239359 C21.999947,20.6395676 21.9307789,20.8430395 21.8104124,21.0094855 C21.6901138,21.1758376 21.5186702,21.305198 21.3134253,21.3729117 C19.1874115,22.0757587 17.7692411,22.4543478 17.0547441,22.4543478 C16.3793111,22.4543478 15.238818,22.0976928 13.6276654,21.451846 C13.4379966,21.3754616 13.2810063,21.2452958 13.1714599,21.0830962 C13.0620314,20.9210713 12.9999518,20.7270701 13,20.5225747 L13,20.5225747 L12.9999998,12.4104211 C12.9998559,12.1976712 13.067036,11.9965284 13.1844328,11.8309984 C13.3019152,11.6653476 13.4696823,11.5353523 13.6694782,11.4654462 C15.548732,10.8105131 16.8239562,10.4543478 17.5,10.4543478 Z" id="矩形"></path>
+                <path d="M13,13.4543478 C15.4146042,14.7876812 18.4146042,14.7876812 22,13.4543478" id="路径-42"></path>
+                <path d="M13,17.4543478 C15.4146042,18.7876812 18.4146042,18.7876812 22,17.4543478" id="路径-42备份"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/myxunzhang-active.svg b/src/icons/svg/myxunzhang-active.svg
new file mode 100644
index 00000000..eb8f5a0b
--- /dev/null
+++ b/src/icons/svg/myxunzhang-active.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="25px" viewBox="0 0 24 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- <title>编组 5</title> -->
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-27.000000, -402.000000)">
+            <g id="勋章" transform="translate(27.000000, 402.545652)">
+                <path d="M12.5,2.1292664 L20.5932667,6.37528289 L20.5932667,14.7073258 L12.5,18.9533423 L4.40673326,14.7073258 L4.40673326,6.37528289 L12.5,2.1292664 Z" id="多边形" stroke="#2D75FF" stroke-width="2"></path>
+                <polygon id="星形" fill="#2D75FF" points="12.5 12.65 9.85496636 13.9801166 10.3601228 11.1628844 8.22024568 9.16770946 11.1774832 8.75668082 12.5 6.19347826 13.8225168 8.75668082 16.7797543 9.16770946 14.6398772 11.1628844 15.1450336 13.9801166"></polygon>
+                <path d="M5.72435826,15.8021739 L3.32873094,18.5077884 C2.96261298,18.9212809 3.00101767,19.5532801 3.41451022,19.9193981 C3.57695293,20.0632294 3.78176801,20.1503269 3.99805142,20.1675485 L5.2946587,20.2707911 L5.2946587,20.2707911 L6.15352312,21.8792586 C6.41366117,22.3664409 7.01948405,22.5504967 7.5066664,22.2903586 C7.66934086,22.2034963 7.80482789,22.0733425 7.89814971,21.9142856 L10,18.3319106 L10,18.3319106 L5.72435826,15.8021739 Z" id="路径-26" stroke="#2D75FF" stroke-width="2"></path>
+                <path d="M17.5253303,15.8021739 L15.2528459,18.5136089 C14.8980896,18.9368895 14.9536396,19.567613 15.3769202,19.9223692 C15.5374506,20.0569116 15.7361751,20.1376509 15.9450532,20.1531946 L17.5253303,20.2707911 L17.5253303,20.2707911 L18.4638425,21.9134152 C18.7378238,22.3929491 19.3486685,22.5595823 19.8282023,22.285601 C19.9867865,22.194994 20.1175275,22.0626855 20.2062382,21.9030328 L22,18.6747984 L22,18.6747984 L17.5253303,15.8021739 Z" id="路径-26备份" stroke="#2D75FF" stroke-width="2" transform="translate(18.000000, 19.628261) scale(-1, 1) translate(-18.000000, -19.628261) "></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/myxunzhang.svg b/src/icons/svg/myxunzhang.svg
new file mode 100644
index 00000000..e62c1db6
--- /dev/null
+++ b/src/icons/svg/myxunzhang.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="25px" viewBox="0 0 24 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- <title>编组 5</title> -->
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-127.000000, -402.000000)">
+            <g id="勋章" transform="translate(127.000000, 402.545652)">
+                <path d="M12.5,2.1292664 L20.5932667,6.37528289 L20.5932667,14.7073258 L12.5,18.9533423 L4.40673326,14.7073258 L4.40673326,6.37528289 L12.5,2.1292664 Z" id="多边形" stroke="#666666" stroke-width="2"></path>
+                <polygon id="星形" fill="#666666" points="12.5 12.65 9.85496636 13.9801166 10.3601228 11.1628844 8.22024568 9.16770946 11.1774832 8.75668082 12.5 6.19347826 13.8225168 8.75668082 16.7797543 9.16770946 14.6398772 11.1628844 15.1450336 13.9801166"></polygon>
+                <path d="M5.72435826,15.8021739 L3.32873094,18.5077884 C2.96261298,18.9212809 3.00101767,19.5532801 3.41451022,19.9193981 C3.57695293,20.0632294 3.78176801,20.1503269 3.99805142,20.1675485 L5.2946587,20.2707911 L5.2946587,20.2707911 L6.15352312,21.8792586 C6.41366117,22.3664409 7.01948405,22.5504967 7.5066664,22.2903586 C7.66934086,22.2034963 7.80482789,22.0733425 7.89814971,21.9142856 L10,18.3319106 L10,18.3319106 L5.72435826,15.8021739 Z" id="路径-26" stroke="#666666" stroke-width="2"></path>
+                <path d="M17.5253303,15.8021739 L15.2528459,18.5136089 C14.8980896,18.9368895 14.9536396,19.567613 15.3769202,19.9223692 C15.5374506,20.0569116 15.7361751,20.1376509 15.9450532,20.1531946 L17.5253303,20.2707911 L17.5253303,20.2707911 L18.4638425,21.9134152 C18.7378238,22.3929491 19.3486685,22.5595823 19.8282023,22.285601 C19.9867865,22.194994 20.1175275,22.0626855 20.2062382,21.9030328 L22,18.6747984 L22,18.6747984 L17.5253303,15.8021739 Z" id="路径-26备份" stroke="#666666" stroke-width="2" transform="translate(18.000000, 19.628261) scale(-1, 1) translate(-18.000000, -19.628261) "></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/notedel.svg b/src/icons/svg/notedel.svg
new file mode 100644
index 00000000..0ab76883
--- /dev/null
+++ b/src/icons/svg/notedel.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="20.个人中心-我的笔记" transform="translate(-1648.000000, -766.000000)">
+            <g id="编组-17备份-2" transform="translate(1648.000000, 766.000000)">
+                <path d="M6.02941176,0 L7.26470588,0 C8.09313301,-1.52179594e-16 8.76470588,0.671572875 8.76470588,1.5 L8.76470588,2 L8.76470588,2 L4.52941176,2 L4.52941176,1.5 C4.52941176,0.671572875 5.20098464,1.52179594e-16 6.02941176,0 Z" id="矩形" fill="#B3BDC4"></path>
+                <rect id="矩形" fill="#B3BDC4" x="1.70588235" y="3.33333333" width="10.5882353" height="10.6666667" rx="1"></rect>
+                <rect id="矩形" stroke="#B3BDC4" fill="#B3BDC4" x="1.5" y="1.83333333" width="11" height="1" rx="0.5"></rect>
+                <line x1="7" y1="5.45305864" x2="7" y2="11.7528444" id="路径-8" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></line>
+                <line x1="4.17647059" y1="6.78639197" x2="4.17647059" y2="10.3333333" id="路径-8备份" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></line>
+                <line x1="9.82352941" y1="6.78639197" x2="9.82352941" y2="10.3333333" id="路径-8备份-2" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/noteedit.svg b/src/icons/svg/noteedit.svg
new file mode 100644
index 00000000..c5b23fb8
--- /dev/null
+++ b/src/icons/svg/noteedit.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15px" height="15px" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="20.个人中心-我的笔记" transform="translate(-1730.000000, -765.000000)">
+            <g id="编组-29备份" transform="translate(1729.924710, 765.680000)">
+                <polygon id="路径-43" fill="#B3BDC4" points="0 13.9410809 0 10.6558397 7.27139923 2.94108088 10 5.30290022 3.1717043 13.4556476"></polygon>
+                <polygon id="路径-44" fill="#B3BDC4" points="7.65603638 1.92850202 9.38504183 0.0454018553 13.1720469 2.94108088 11.116001 4.75994664"></polygon>
+                <line x1="5.72584098" y1="13.2381356" x2="13.1720469" y2="13.2381356" id="路径-45" stroke="#B3BDC4" stroke-width="2"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/passWard-edit.svg b/src/icons/svg/passWard-edit.svg
new file mode 100644
index 00000000..5c83a84f
--- /dev/null
+++ b/src/icons/svg/passWard-edit.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="21.个人中心-编辑资料备份-3" transform="translate(-1685.000000, -354.000000)">
+            <g id="编组-26" transform="translate(1685.000000, 354.000000)">
+                <path d="M1.17939555,20.5245655 L1.63798708,16.7528903 C1.66390378,16.539739 1.75774048,16.3405902 1.90561573,16.1849044 L11.6656176,5.90939523 L11.6656176,5.90939523 L16.1839739,10.1033368 L6.12977645,20.4613638 C6.0048278,20.5900883 5.8475522,20.6828307 5.67443523,20.7298698 L2.4342958,21.6102754 C1.90133521,21.7550906 1.35188935,21.4404366 1.20707413,20.907476 C1.17320408,20.7828247 1.1638047,20.6527921 1.17939555,20.5245655 Z" id="路径-28备份" fill="#387DF7"></path>
+                <polygon id="路径-46备份" fill="#387DF7" points="13.8376615 4.06057582 17.7538094 8.1576498 20.9640972 4.88672598 17.4008793 1"></polygon>
+                <line x1="7.56351496" y1="21.100958" x2="19.08841" y2="21.100958" id="路径-47备份" stroke="#387DF7"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/praised.svg b/src/icons/svg/praised.svg
index 676e8411..04c98a8f 100644
--- a/src/icons/svg/praised.svg
+++ b/src/icons/svg/praised.svg
@@ -1 +1 @@
-<svg t="1649838667363" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="14041" width="200" height="200"><path d="M844.231111 391.39555600000006H659.9111109999999c-13.653333-2.275556-18.204444-15.928889-20.48-22.755556V202.52444400000002c0-45.511111-36.408889-81.92-81.92-81.92-40.96 0-75.093333 31.857778-81.92 70.542223-25.031111 157.013333-120.604444 209.351111-182.044444 225.28 2.275556 6.826667 2.275556 11.377778 2.275555 15.928889v441.457777c0 9.102222-2.275556 18.204444-6.826666 27.306666999999997h446.008888c43.235556-9.102222 72.817778-25.031111 93.297778-68.266667l93.297778-327.68c18.204444-59.16444400000001-11.377778-116.053333-77.368889-113.77777699999999zM257.137778 876.0888889999999V432.355556c0-13.653333-18.204444-25.031111-38.684445-25.031112H157.013333c-31.857778 0-59.16444400000001 27.306666999999997-59.16444400000001 59.16444500000001v373.191111c0 34.133333 25.031111 61.44 59.16444400000001 61.44h61.44c20.48 0 38.684444-11.377778 38.684445-25.031111z m0 0" fill="#ffb30f" p-id="14042"></path></svg>
\ No newline at end of file
+<svg viewBox="0 0 14 14" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><image xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAA6klEQVQokZ2QPUoDARSEv3lZMVFBsLSxsBR7JY2mCR7AA1hZCrlAas8gpLOxsBB/QBACegJBEK+gFhauK8SMJIU/68ommebBY743wxMFSs8367ZOwA+O2J3burrNu6IItNkBFkBrYR8b/gQUgqDVH0eWs4uNpVLQR+s1YCXXoJf3JflFOlNrAbPf4TzLUXk7awxTq0nypOblq9LTxrbFHubQIhN0iut/qSfTCgcHQB2xKHuqBBq2dNAOzPwI5t8yL/98tUy6mQyUJwOTSv96fFA8Tje79wPwfTyO7mAG1r5ENgJjxN1HP9oAn+YHRN3u7kR5AAAAAElFTkSuQmCC" height="14" width="14" data-name="图层 1"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/qita-active.svg b/src/icons/svg/qita-active.svg
new file mode 100644
index 00000000..00392679
--- /dev/null
+++ b/src/icons/svg/qita-active.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="25px" height="25px" viewBox="0 0 25 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-30.000000, -720.000000)" stroke="#2D75FF" stroke-width="2">
+            <g id="其他通知" transform="translate(30.000000, 720.342178)">
+                <path d="M2.82033944,16.9192254 L2.82033944,7.40311312 C2.82033944,6.85082837 3.26805469,6.40311312 3.82033944,6.40311312 L7.53910662,6.40311312 L7.53910662,6.40311312 L14.2258083,2.79565438 C14.7118688,2.53342601 15.3184767,2.71487773 15.580705,3.20093814 C15.6594094,3.34682265 15.7006148,3.50998376 15.7006148,3.67574461 L15.7006148,20.3819624 C15.7006148,20.9342471 15.2528996,21.3819624 14.7006148,21.3819624 C14.545369,21.3819624 14.3922553,21.345817 14.2533994,21.2763887 L7.53910662,17.9192254 L7.53910662,17.9192254 L3.82033944,17.9192254 C3.26805469,17.9192254 2.82033944,17.4715101 2.82033944,16.9192254 Z" id="路径-35"></path>
+                <line x1="7.53910662" y1="17.9192254" x2="7.53910662" y2="6.40311312" id="路径-36"></line>
+                <line x1="18.6085223" y1="6.75527879" x2="22.7433173" y2="2.62048376" id="路径-37"></line>
+                <line x1="18.6085223" y1="11.7170328" x2="23.4800309" y2="11.7170328" id="路径-38"></line>
+                <line x1="18.6085223" y1="17.0738878" x2="21.8807164" y2="20.346082" id="路径-39"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/qita.svg b/src/icons/svg/qita.svg
new file mode 100644
index 00000000..b79a61ed
--- /dev/null
+++ b/src/icons/svg/qita.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="25px" height="25px" viewBox="0 0 25 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-130.000000, -720.000000)" stroke="#666666" stroke-width="2">
+            <g id="其他通知" transform="translate(130.000000, 720.342178)">
+                <path d="M2.82033944,16.9192254 L2.82033944,7.40311312 C2.82033944,6.85082837 3.26805469,6.40311312 3.82033944,6.40311312 L7.53910662,6.40311312 L7.53910662,6.40311312 L14.2258083,2.79565438 C14.7118688,2.53342601 15.3184767,2.71487773 15.580705,3.20093814 C15.6594094,3.34682265 15.7006148,3.50998376 15.7006148,3.67574461 L15.7006148,20.3819624 C15.7006148,20.9342471 15.2528996,21.3819624 14.7006148,21.3819624 C14.545369,21.3819624 14.3922553,21.345817 14.2533994,21.2763887 L7.53910662,17.9192254 L7.53910662,17.9192254 L3.82033944,17.9192254 C3.26805469,17.9192254 2.82033944,17.4715101 2.82033944,16.9192254 Z" id="路径-35"></path>
+                <line x1="7.53910662" y1="17.9192254" x2="7.53910662" y2="6.40311312" id="路径-36"></line>
+                <line x1="18.6085223" y1="6.75527879" x2="22.7433173" y2="2.62048376" id="路径-37"></line>
+                <line x1="18.6085223" y1="11.7170328" x2="23.4800309" y2="11.7170328" id="路径-38"></line>
+                <line x1="18.6085223" y1="17.0738878" x2="21.8807164" y2="20.346082" id="路径-39"></line>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/question-mark.svg b/src/icons/svg/question-mark.svg
new file mode 100644
index 00000000..b48565d5
--- /dev/null
+++ b/src/icons/svg/question-mark.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><image xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAWCAYAAADwza0nAAACM0lEQVQ4jY2STWsUQRCG36rumc2uiGBAJIio5GQgqAvxIh485B/o2YvoSYMGg7LEYNQgRONBgugvMLl6ieAlICRCFIJRQfwAQRExqEn2Y2a6SnomH0t2jVuHZrrrfbqq3mnCpigO6A7OlY8boYM+41jfSK0wPXebftcr18Hi0NeCTdovMVMfgJ1QWVWwXxdF9F5if96ZG+oor4O+ShhGEyD0bgCUpesvUDyNovCUr+53FIbR3Q2IFGTeqbhHom4c4Lfpmc8RelMtlKinVNlv2CxAXR7EIkJjlWpwbX6UVnyh7n7dVmirDBOZPkAIZCpOXBez6klA81k3NDlrg8trkA//PWPz/WpoIjvRvGeYc+FhYgaHAVycTGKIZLPT/kzi5DGxSWemIDxkXWQGWeMxcUpLQX6hAVoNZVrMDEt9CuzsDXr/L3F9GOVjKql5kCj5xq1AxYHKXjLmXOosGyjw5L9gT2npRJjjZ5B4T+aNfKxUfz3fAlQ6WipfMBRMQaUzG84suyQ5Pz+6e6XhrW5Uqp5l0gdrAgV9EYczL261TaH+rdbHkavL3TljZ7L/S7GojEfO3Xw1sv3Hmsw2AwNjB1NIocq4PztcuLhZ0zBjz5U/7QT0rrZXrsXxSLPLGyqybesEyQqRralzr+vb2xKMvwcvww50JbUlolwcN4OagnYX9qmrnjY2YHHhJwAPWwJVagfY8AAIhkWmWwaJ/YtSTVfya4utJsAHq3qdvOOKz00pAH8BwlH2ZfrRzTQAAAAASUVORK5CYII=" height="22" width="14" y="1" x="5" data-name="图层 1"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/red-start.svg b/src/icons/svg/red-start.svg
new file mode 100644
index 00000000..fff068df
--- /dev/null
+++ b/src/icons/svg/red-start.svg
@@ -0,0 +1 @@
+<svg t="1664267941963" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5068" width="200" height="200"><path d="M563.456 447.808c39.744-18.432 78.336-37.056 114.624-55.36 36.288-18.56 65.344-32.256 86.784-40.832 21.504-8.384 38.72-12.864 51.776-12.864 21.504 0 40.064 7.04 55.808 21.76C888.192 374.848 896 393.088 896 414.528c0 12.288-3.904 25.216-11.584 38.4-7.616 13.248-15.872 21.76-24.448 25.472-79.488 31.232-167.104 54.208-262.528 68.416 17.344 15.744 38.592 37.184 63.872 63.552 25.28 26.752 38.592 40.832 39.616 42.624 9.344 12.864 22.208 28.928 38.848 48 16.64 19.2 28.16 34.048 34.624 44.864 6.464 10.944 9.728 23.808 9.728 39.232 0 19.712-7.36 37.056-22.208 51.776-14.656 14.848-33.92 22.272-57.344 22.272s-49.6-18.304-79.04-54.528c-29.248-36.224-67.072-101.696-113.28-195.968-46.784 84.864-78.336 141.12-94.208 168.256-16.064 26.88-31.488 47.424-46.208 61.376-14.848 13.824-31.68 20.864-50.88 20.864-22.784 0-41.792-7.808-57.024-23.552-14.784-15.744-22.528-32.704-22.528-50.432 0-16.64 3.008-29.248 9.216-37.76 56.704-76.992 115.776-144.192 177.536-200.576-51.776-8.128-97.92-17.152-138.56-26.88-40.704-10.048-83.968-24.32-129.472-43.52-7.488-3.776-14.656-12.288-21.76-25.472C131.456 437.888 128 425.6 128 414.528c0-21.44 7.808-39.616 23.552-54.016 15.744-14.656 33.728-21.76 54.144-21.76 14.848 0 33.216 4.48 55.488 13.376C283.264 361.152 311.424 374.016 345.6 390.912c34.24 16.96 73.28 35.904 116.992 56.896C454.592 408.96 447.936 364.352 442.688 314.304 437.44 264.064 434.88 229.696 434.88 211.136c0-22.784 7.232-42.176 21.632-58.688C471.168 136.128 489.6 128 512.448 128c22.4 0 40.512 8.128 55.04 24.448 14.592 16.512 21.76 38.144 21.76 65.28 0 7.36-1.216 21.952-3.328 43.968-1.92 21.952-5.248 48.32-9.152 79.36C572.736 372.16 568.256 407.872 563.456 447.808z" p-id="5069" fill="#d81e06"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/share.svg b/src/icons/svg/share.svg
index 5e40a58c..f6611ff9 100644
--- a/src/icons/svg/share.svg
+++ b/src/icons/svg/share.svg
@@ -1 +1 @@
-<svg t="1649852233629" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1625" width="48" height="48"><path d="M1023.49012 39.715121L818.805971 997.892793a33.005319 33.005319 0 0 1-19.956704 23.794532 32.493609 32.493609 0 0 1-30.702623-3.581973l-221.570591-153.513111-127.927593 80.594383a32.749464 32.749464 0 0 1-51.171037-31.214332l18.421573-183.959879a29.679202 29.679202 0 0 1 7.419801-17.654008L639.707341 414.287113l-303.444251 281.440705a32.749464 32.749464 0 0 1-45.286368 8.954932L14.653122 520.722871A32.749464 32.749464 0 0 1 0.069376 491.299524a33.261174 33.261174 0 0 1 18.677429-27.376504l957.665961-460.539335a32.493609 32.493609 0 0 1 34.54045 3.581972A33.517029 33.517029 0 0 1 1023.49012 39.715121z" p-id="1626" fill="#A3B1CC"></path></svg>
+<svg viewBox="0 0 14 14" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><image xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAAOCAYAAAD0f5bSAAABOUlEQVQokZVRwS4DURQ9984TxOADKhFCiEq6ICHSRbGu5fyArYWNlYWtj/AVykoqQrWREqmUCkm7kNoIijDFdJ68GdoZRtTZ3HfuO+edm/vwHySS6ZCSUzOexNZeDBqtQCIGKRdE82K3R0QtgUk+8TcwyUn6S9ze1gqz+vpFq+btdbf4bQyF8GAfuvQOZI7zDpfAkWEYb2J9O7UGiXmvmIgQGR5wUrInBU+f06oKsqkH1HAwM8bCQ875IHcG27YbrzEyTjHvynPEvATgUWgaJiIjeLcsHObP/QYllsIx1RehPi46Plq4f3jqPL0s/VwpoRSfifa7gZ+Iz06VL4pXq4EGdwtOis+kcFOpFD205p+Ng01gzkHihQjLOod0MC8S8Kyu7Jq1GzyCmkJKzcs3k/u9Gzup6XoDwAfNp3XkcvoAiAAAAABJRU5ErkJggg==" height="14" width="13" x="1" data-name="图层 1"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/spot.svg b/src/icons/svg/spot.svg
new file mode 100644
index 00000000..7e693666
--- /dev/null
+++ b/src/icons/svg/spot.svg
@@ -0,0 +1 @@
+<svg t="1662627913521" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1676" width="200" height="200"><path d="M512 814.545455c-39.563636 0-69.818182-30.254545-69.818182-69.818182s30.254545-69.818182 69.818182-69.818182 69.818182 30.254545 69.818182 69.818182-30.254545 69.818182-69.818182 69.818182z m0-232.727273c-39.563636 0-69.818182-30.254545-69.818182-69.818182s30.254545-69.818182 69.818182-69.818182 69.818182 30.254545 69.818182 69.818182-30.254545 69.818182-69.818182 69.818182z m0-232.727273c-39.563636 0-69.818182-30.254545-69.818182-69.818182s30.254545-69.818182 69.818182-69.818182 69.818182 30.254545 69.818182 69.818182-30.254545 69.818182-69.818182 69.818182z" fill="#666666" p-id="1677"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/stra-active.svg b/src/icons/svg/stra-active.svg
new file mode 100644
index 00000000..8b043716
--- /dev/null
+++ b/src/icons/svg/stra-active.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26px" height="20px" viewBox="0 0 26 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+   
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-30.000000, -915.000000)" stroke="#2D75FF" stroke-width="2">
+            <g id="星形-2" transform="translate(30.433916, 913.854102)">
+                <path d="M11.5660845,2.25955146 L14.4761356,8.15595911 L18.9923867,8.81220881 L20.9832078,9.10149205 L16.2746461,13.6912053 L17.3861868,20.1719845 L11.5660845,17.1121756 L9.5278186,18.1837554 L6.74016431,19.649312 L5.74598218,20.1719845 L6.8575228,13.6912053 L2.14896114,9.10149205 L8.65603332,8.15595911 L11.5660845,2.25955146 Z" id="星形"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/stra.svg b/src/icons/svg/stra.svg
new file mode 100644
index 00000000..6336dbe5
--- /dev/null
+++ b/src/icons/svg/stra.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26px" height="20px" viewBox="0 0 26 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="9.个人中心-我的u币" transform="translate(-130.000000, -915.000000)" stroke="#666666" stroke-width="2">
+            <g id="星形-2" transform="translate(130.433916, 913.854102)">
+                <path d="M11.5660845,2.25955146 L14.4761356,8.15595911 L18.9923867,8.81220881 L20.9832078,9.10149205 L16.2746461,13.6912053 L17.3861868,20.1719845 L11.5660845,17.1121756 L9.5278186,18.1837554 L6.74016431,19.649312 L5.74598218,20.1719845 L6.8575228,13.6912053 L2.14896114,9.10149205 L8.65603332,8.15595911 L11.5660845,2.25955146 Z" id="星形"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/svg/triangle.svg b/src/icons/svg/triangle.svg
new file mode 100644
index 00000000..bb6a6f57
--- /dev/null
+++ b/src/icons/svg/triangle.svg
@@ -0,0 +1 @@
+<svg t="1663322082653" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2441" width="200" height="200"><path d="M204.58705 951.162088 204.58705 72.836889 819.41295 511.998977Z" p-id="2442" fill="#666666"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/up-char.svg b/src/icons/svg/up-char.svg
new file mode 100644
index 00000000..629d9392
--- /dev/null
+++ b/src/icons/svg/up-char.svg
@@ -0,0 +1 @@
+<svg t="1664268265567" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9347" width="200" height="200"><path d="M516.563 472.36l0.005 0.004c0.243 0.243 0.478 0.491 0.705 0.745l149.036 149.085c7.094 7.096 7.181 18.545 0.263 25.748l-0.263 0.269c-7.098 7.095-18.542 7.18-25.74 0.262l-0.268-0.262-118.91-118.948v300.345c0 10.158-8.234 18.392-18.391 18.392-10.157 0-18.392-8.234-18.392-18.392V530.35L367.291 647.704c-7.18 7.182-18.822 7.183-26.003 0.004l-0.005-0.005c-7.182-7.185-7.182-18.832 0-26.017L490.56 472.363c7.18-7.181 18.822-7.183 26.004-0.004zM509.473 142c134.866 0 245.729 102.802 258.547 234.343l0.334 3.751 1.466 0.155c99.756 11.357 177.493 95.287 179.153 197.717l0.027 3.346c0 110.649-88.774 200.557-198.964 202.344l-3.345 0.027h-29.138c-16.506 0-29.887-13.384-29.887-29.895 0-16.275 13.001-29.513 29.181-29.888l0.706-0.008h29.138c78.72 0 142.536-63.835 142.536-142.58 0-77.957-62.546-141.301-140.18-142.56l-2.356-0.02h-7.361c-16.344 0-29.61-13.12-29.882-29.38l-0.004-0.708 0.035-5.49c0.003-0.43 0.005-0.86 0.005-1.29 0-109.392-87.766-198.279-196.703-200.046l-3.308-0.026h-18.831c-109.358 0-198.218 87.792-199.984 196.763l-0.027 3.308v6.974c0 16.275-13 29.512-29.18 29.887l-0.706 0.008h-1.436c-78.72 0-142.536 63.835-142.536 142.58 0 77.957 62.546 141.302 140.18 142.56l2.356 0.02h5.271c16.506 0 29.887 13.385 29.887 29.896 0 16.275-13.001 29.512-29.181 29.887l-0.706 0.008h-5.27C147.576 783.683 57 693.08 57 581.313c0-101.708 75.007-185.892 172.706-200.221l1.993-0.278 0.02-0.264C242.443 248.407 352 144.214 486.346 142.035l4.296-0.035h18.831z" fill="#9d9d9d" p-id="9348"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/upCourse.svg b/src/icons/svg/upCourse.svg
new file mode 100644
index 00000000..cc5d89ad
--- /dev/null
+++ b/src/icons/svg/upCourse.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 50 50" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><image xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAADEAAAAxCAYAAABznEEcAAAGSElEQVRoge2ZX2wcVxXGv3PuvTPr2bWSuI4dGZJWKiWpW1IqIxHTpHIiBGqQ2qc88FCpvDQSf/oQJTIFiw6gFBKHNKgCiZbQF3hJW4pUVZFKSg0oLRKyUFUVAU2ltKR2U9ttUsfenZl770Gza8c1VPGf3YUV8ve0WnnuuT+f79s7M4fQJMVxzKfxUImR9hjrk2LXhbHTD9yUNKMaNwviFB6KfJbeBdAvU+bh9yZ6bh2IRTejVlMgug9KsWRnP68UjkGoj1ndTcQnKmm2HU0Aabid+mKJVJrsVpqHifhm77NqGSKTgdwfkeBgWDCvjsRkG1WzoZ3YflCKCm6PDvg4kZoDyCUQZAakdyHEiQqy7Y20VsMgcgsVSsluDX8Moj7pfbr4D0QgPjUg1U8ex3OQRlmrIXaqWqic7FZt6igJ9364A4vLCEAEgsnA/g+oyKFGWKvuTlQtZN0e1UaPkFAVIDcPFCcEdjmA1GAcK51UO5JbC3wnAv/jPOz1WqsuiKsW0v4YibnJewshCBG/R869KPBTRAQmchB/wTn3eyJVzq8Vnxmw2UG6fmutGmL7wXeK15tktwIfgaiteQZyAOZgQqw7mYk+AiAFMUAqb8VFC/6O9+5p4qBcDXsOAvU5Ej+8o46OrAoit1Ah6h5QIR+fz0AOoFhPwmcn/xm0xcqm09UAoBpqEiLhSvqm1n5QxD7N8yDVXy2zizROJA6fWg3IiiF67peoaiG2x0jUVQvlANZWfhF2X3547DUkRPQfm9EBq7NxNM5mZsja5JlaR+atxTvAtmatfaKaBtETS7S5K9mphHILbZvvAENPOpedNO3FwyNf67py7VVIXhpa/xZr+rbz9tcEMwdia9by/mj/tpnelWRk2RB5BjZbDCijjhN073wGFJsJ57LHeUPhe2cHaXp5q5H8KS68qYJg0Hn7FLOpWUvSABTsggoe6V+BtZYFkVsojNr3KG1/BK9uudoBNu/6rPLz7i2Fwy8foPLyABZAXh7CWNQefMvZ9CmiYBbV+KQBoO7MrVV2s7ctx1pLQuT/jU3dlT4DM1yzULoAYNOfbNwSHX52P82uDGABZGQQb1cK8qCX9Fe1jsxlhPgOBXO0b2tyQ90Q47OTbaHGABmz1UsKURBFwYR39vGLNxaGVw+wAPLKUNtYWizE1rtTjKCcH/AimUGgP23Y7qwbohR1OrLBlAAfEAeJIjPubfJYl5r6wfmvUKU+gAWQvwxiPOLpIe+zU8TBNFGQEOESeT211NVLBmc0RvmOI5Xf4APu9My3EeiFzdcVnnjyQM8KM7CUSEZieXsgnvlmKnzeA7facvq78vrpF+uGyBc/O4gxQL7fF4+3jcY9ddrn2rVGYrwDyHf7fjbeNrp/ebVWcDqSjMZoIsC/1dq//FpNe8b+b2oNolW0BtEqWoNoFa1BtIrWIFpFaxDXXFjE50+A1TeYRJJ/1iK+KbWasSiehPfrogmCv0BKJ6TVDAnOr7/+8uVmlJu/Facb7pPwYzdPmsobnZXRxyhb4rolRDI5JuMb1/FhZOl9InbGgH767DKfD5ZS777XgvZbgsJUxyeScw9QQvtOifr7X69c1+bDL7Kij5PFSKD0nxs1BLnrGxK+jnM492hj5nW9X323tK5jw07S+IzL/KvWBL/Vb72OzsgFX2dFhyCsPdtXZjH9ZQD/aETR049Sw4aNffeL4a5kh4h/gkRvYpaLgUsPMGfpBoj7khcfep8pVmYLZ9jaqMINVQ+Mdn6bUmZT9d2XwnoR+wUWBSJWJp8bYG4cokzUtNFwPcquXCRivvpjJN4TWGtGMjdSW6SGzQQbL+bFe/X+//iwI9LyUd+3gqg2sFmk2jkhcydr/pGIJEuL+VvwliMoFYvibETKLHyX3wmQlgxOJqpNyYeCWVYS5ntL7R0b/5f7/SiJl6IH7iE3n1lyRJjSURK+P6OS54jVLkEWiPiQWO8l4r2thYDq+M/7fIbpICRg0u+D7BndcTsuzbwRPiOzyT1swn6fpYE4C+daYNfXEJvwsk+SM9xReKGahPwkDDdW+kXrBwX4LLyN8my02sYJlI+T8rvjSwx+PmT54Ugc/u1DGxW6/eErnaZCexXrfrFUAppy57x65TNylknK+ExpQzjy/CGaAYB/AUJ0+fxme8zyAAAAAElFTkSuQmCC" height="49" width="49" data-name="图层 1"/></svg>
\ No newline at end of file
diff --git a/src/icons/svg/white-out.svg b/src/icons/svg/white-out.svg
new file mode 100644
index 00000000..8e1db067
--- /dev/null
+++ b/src/icons/svg/white-out.svg
@@ -0,0 +1 @@
+<svg t="1665713257436" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2537" width="64" height="64"><path d="M512 0c30.72 0 51.2 20.48 51.2 51.2v307.2c0 30.72-20.48 51.2-51.2 51.2s-51.2-20.48-51.2-51.2V51.2c0-30.72 20.48-51.2 51.2-51.2z" p-id="2538"></path><path d="M512 1024C230.4 1024 0 793.6 0 512c0-158.72 71.68-302.08 194.56-399.36 20.48-15.36 56.32-15.36 71.68 10.24 15.36 20.48 10.24 51.2-10.24 66.56C158.72 271.36 102.4 389.12 102.4 512c0 225.28 184.32 409.6 409.6 409.6s409.6-184.32 409.6-409.6c0-128-56.32-240.64-153.6-322.56-20.48-15.36-25.6-51.2-10.24-71.68 15.36-20.48 51.2-25.6 71.68-10.24 122.88 102.4 194.56 245.76 194.56 404.48 0 281.6-230.4 512-512 512z" p-id="2539"></path></svg>
\ No newline at end of file
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index bb70bc2f..5cedcdbb 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,12 +1,12 @@
 <template>
-  <section class="app-main xcontent">
+  <section class="app-main xuc-content">
     <div style="display: flex;">
-      <div style="height: 100%;width: 200px;border: 1px solid #F0F0F0;">
+      <div style="height: 100%;width: 210px;">
         <uc-menu></uc-menu>
         <!-- <div style="height: 20px;"></div> -->
       </div>
       <!-- width: 990px; -->
-      <div class="main-body" style="padding: 0px 10px;flex:1; background-color: #FFFFFF;margin-left: 10px;padding-top:20px">
+      <div class="main-body" style="padding: 30px 20px;flex:1; background-color: #fff;margin-left: 20px;">
         <!-- <div style="margin-bottom: 10px;padding:10px; border-bottom: 1px solid #dbdbdb;"> -->
           <!-- <el-breadcrumb separator-class="el-icon-arrow-right">
             <el-breadcrumb-item :to="{ path: '/uc/index' }"><i class="el-icon-arrow-right"></i>个人中心</el-breadcrumb-item>
@@ -60,7 +60,7 @@ export default {
   //width: 1500px;
   // width: 1000px;
   // margin: 0 auto;
-  padding-top: 10px;
+  padding-top: 20px;
   position: relative;
   overflow: hidden;
 }
@@ -98,6 +98,30 @@ export default {
   display: block;
   margin: 5px 10px;
 }
+.xuc-content{
+  margin: 0px auto;
+}
+@media screen and (max-width: 1366px){
+  .xuc-content {
+    width: 1100px;
+  }
+}
+@media screen and (max-width: 1680px) and (min-width:1367px){
+  .xuc-content {
+    width: 1300px;
+  }
+}
+@media screen and (max-width: 1920px) and (min-width: 1681px){
+  .xuc-content {
+    width: 1600px;
+  }
+}
+
+@media screen and (min-width: 1921px){
+  .xuc-content {
+    width: 1800px;
+  }
+}
 </style>
 
 <style lang="scss">
diff --git a/src/layout/components/TopNav/Index.vue b/src/layout/components/TopNav/Index.vue
index 5262494f..1f128313 100644
--- a/src/layout/components/TopNav/Index.vue
+++ b/src/layout/components/TopNav/Index.vue
@@ -1,20 +1,20 @@
 <template>
   <div>
     <div class="xtop">
-      <div class="xtop-content xcontent">
+      <div class="xtop-content">
       <div class="xtop-left">
-        <!-- <div> -->
-          <router-link class="routerLink" to="/index"><img src="../../../assets/logo/logo.png" style="width:240px;height: 30px;" /></router-link>
-        <!-- </div> -->
+        <div class="xtop-logo">
+          <router-link class="routerLink" to="/index"><img src="../../../assets/logo/logo-white.png" style="width:161px;height:27px;" /></router-link>
+        </div>
         <div class="xtop-nav">
-          <div><a :href="`${webBaseUrl}/index`">首页</a></div>
-          <div><a :href="`${webBaseUrl}/course`">课程</a></div>
-          <div><a :href="`${webBaseUrl}/case`">案例</a></div>
-          <div><a :href="`${webBaseUrl}/article`">文章</a></div>
-          <div><a :href="`${webBaseUrl}/qa`">问答</a></div>
-          <div>
+          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/index`">首页</a></div>
+          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/course`">课程</a></div>
+          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/case`">案例</a></div>
+          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/article`">文章</a></div>
+          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/qa`">问答</a></div>
+          <div class="xtop-nav-item">
             <el-dropdown placement="bottom" @command="handleCommand">
-              <span class="el-dropdown-link" style="color:#000;font-size:16px;cursor: pointer;">专区</span>
+              <span class="el-dropdown-link" style="color:#fff;font-size:16px;cursor: pointer;">专区</span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command='one'>BOE系列公开课</el-dropdown-item>
                 <el-dropdown-item command='two' divided>Grow180</el-dropdown-item>
@@ -24,16 +24,61 @@
               </el-dropdown-menu>
             </el-dropdown>
           </div>
+          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/follow`">我的关注</a></div>
         </div>
       </div>
-      <div class="xtop-right" style="display: flex;justify-content: flex-end;align-items: center;">
-        <!-- <div>
+      <div class="xtop-right">
+         <!-- <div style="margin-left:250px;margin-right:50px;"> -->
+            <!-- <el-input placeholder="搜索" style="width: 260px;border-radius: 20px !important;" @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="keyword" class="input-with-select">
+              <el-select  v-model="findType" style="width: 75px;" slot="prepend" placeholder="请选择">
+                <el-option label="课程" value="1"></el-option>
+                <el-option label="案例" value="2"></el-option>
+                <el-option label="文章" value="3"></el-option>
+                <el-option label="问答" value="4"></el-option>
+              </el-select>
+              <el-button slot="append" icon="el-icon-search" @click="searchJump()" class="input-with-select-btn"></el-button>
+            </el-input> -->
+          <!-- </div> -->
+          <div>
             <el-badge :value="userMsg" :hidden="userMsg==0" class="message-count">
-              <el-link type="primary" :href="`${webBaseUrl}/message`" target="_blank" icon="el-icon-message-solid" :underline="false"></el-link>
+              <el-link type="primary" :href="`${webBaseUrl}/message/center/index`" :underline="false">
+                <svg-icon style="margin-right: 0;font-size:22px;" icon-class="messfff"></svg-icon>
+              </el-link>
             </el-badge>
           </div>
-          <div style="margin-left: 20px;"><el-avatar :src="userInfo.avatar" style="vertical-align: middle;width:28px;height:28px;margin-right:2px;"></el-avatar></div>
-          <div style="margin-left: 5px;">
+          <div>
+            <el-dropdown class="person-action-index" style="margin-left: 44px;">
+              <span class="el-dropdown-link">
+                 <span v-if="current == 'qa'" style="color: #333;">学员</span>
+                <span v-else style="color: #fff;">学员</span><i class="el-icon-arrow-down el-icon--right"></i>
+
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item><router-link to="/index">学员</router-link></el-dropdown-item>
+                <el-dropdown-item v-if="identity == 2 || identity == 5" @click.native="setCurIdentity(2)"><router-link to="/need/waitaudit">教师</router-link></el-dropdown-item>
+                <el-dropdown-item v-if="identity == 3 || identity == 5" @click.native="setCurIdentity(3)"><router-link to="/course/manage">管理员</router-link></el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </div>
+          <div>
+            <el-dropdown>
+                <div style="margin-left: 50px;color: #fff;font-size: 14px;cursor: pointer;">
+                  <el-avatar v-if="userInfo.avatar !== ''" :src="userInfo.avatar" style="vertical-align: middle;width:40px;height:40px;margin-right:10px;"></el-avatar>
+                  <span v-else style="display: inline-block;">
+                    <img v-if="userInfo.sex === 1 " src="../../../../public/images/Avatarman.png" alt="" style="width: 30px;height: 30px;vertical-align: middle;">
+                    <img v-else src="../../../../public/images/Avatarwoman.png" alt="" style="width: 30px;height: 30px;vertical-align: middle;">
+                  </span>
+                  
+                  {{userInfo.name}}
+                </div>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item @click.native="setCurIdentity(1)"><a :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`">个人中心</a></el-dropdown-item>
+                  <el-dropdown-item><router-link :to="'/home/'+userInfo.aid">个人主页</router-link></el-dropdown-item>
+                </el-dropdown-menu>
+            </el-dropdown>
+          </div>
+
+          <!-- <div style="margin-left: 5px;">
             <el-dropdown @command="handleUcCommand">
               <span class="el-dropdown-link">
                 {{userInfo.name}}<i class="el-icon-arrow-down el-icon--right"></i>
@@ -43,24 +88,9 @@
               </el-dropdown-menu>
             </el-dropdown>
           </div> -->
-		  <div class="person-action">
-		    <el-badge :value="userMsg" :hidden="userMsg == 0" class="message-count">
-		      <el-link type="primary" :href="`${webBaseUrl}/message`" icon="el-icon-bell" :underline="false"></el-link>
-		    </el-badge>
-		    <!-- <el-avatar :src="userInfo.avatar"></el-avatar> -->
-		    <!-- <el-link type="primary" :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`" :underline="false">个人中心</el-link> -->
-		    <el-button @click="logout()" type="text" icon="el-icon-switch-button">退出</el-button>
-		  </div>
-        <!-- <ul>
-          <li @mouseover="mouseOver(1)" @mouseleave="mouseLeave(1)" :class="{ xactive: mouseIndex == 1 }">
-            <el-badge :value="userMsg" :hidden="userMsg==0" style="margin-top: 10px;margin-right: -10px;">
-              <el-link type="primary" :href="`${webBaseUrl}/message`" target="_blank" icon="el-icon-bell" style="margin-top: -10px;" :underline="false">消息</el-link>
-            </el-badge>
-          </li>
-          <li @mouseover="mouseOver(9)" @mouseleave="mouseLeave(9)" :class="{ xactive: mouseIndex == 9 }" style="padding-right: 10px;">
-            <el-button @click="logout()" type="text" icon="el-icon-switch-button">退出</el-button>
-          </li>
-        </ul> -->
+        <div class="person-action">
+          <el-button @click="logout()" type="text"><svg-icon  style="margin-right: 4px;font-size:16px;" icon-class="white-out"></svg-icon>登出</el-button>
+        </div>
       </div>
       </div>
     </div>
@@ -87,8 +117,8 @@
              <area shape="rectangle" name="link2" coords="150,400,300,500" target="_blank"  href="https://boehrsurvey.wjx.cn/vm/PmreuFN.aspx"  />
            </map>
         </div>
-
     </el-dialog>
+
   </div>
 </template>
 
@@ -96,9 +126,14 @@
 import { mapGetters } from 'vuex';
 import desk from '@/api/console.js';
 import Cookies from 'vue-cookies';
+import InterestCollection from '@/components/Portal/interestCollection.vue'
+import GuideBox from '@/components/Portal/guideBox.vue'
 export default {
+  components:{InterestCollection,GuideBox},
   data() {
     return {
+      isTiao:false,
+      interestShow:false,
       checked:true,
       signInShow: false,
       signLocalTimesKey:'xboe_sign_dlg_times',
@@ -113,7 +148,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['userInfo', 'userMsg']),
+    ...mapGetters(['userInfo', 'userMsg','identity']),
     showName: function() {
       //console.log('name='+this.name);
       //console.log('loginName='+this.loginName);
@@ -125,32 +160,35 @@ export default {
     }
   },
   mounted() {
+    this.interestShow = true;
     //控制弹出窗口的代码
-    let now = new Date() //当前时间
-    let end = new Date('2022/08/14 00:00:00') //对比时间
-    if(now.getTime() < end.getTime()){
-        let times = localStorage.getItem(this.signLocalTimesKey);
-        let isNewLogin=localStorage.getItem(this.$Constants.newLoginKey);
-        //let isNewLogin='1';
-        if(isNewLogin && isNewLogin=='1'){
-          if(!times){
-            this.signInShow = true;//显示
-            localStorage.setItem(this.signLocalTimesKey,1);
-          }else{
-            let intTimes=parseInt(times);
-            if(intTimes<2){
-               this.signInShow = true;//显示
-               intTimes++;
-               localStorage.setItem(this.signLocalTimesKey,intTimes);
-            }
-          }
-          localStorage.setItem(this.$Constants.newLoginKey,0);
-        }
-
-    }
+    // let now = new Date() //当前时间
+    // let end = new Date('2022/08/14 00:00:00') //对比时间
+    // if(now.getTime() < end.getTime()){
+    //     let times = localStorage.getItem(this.signLocalTimesKey);
+    //     let isNewLogin=localStorage.getItem(this.$xpage.constants.newLoginKey);
+    //     //let isNewLogin='1';
+    //     if(isNewLogin && isNewLogin=='1'){
+    //       if(!times){
+    //         this.signInShow = true;//显示
+    //         localStorage.setItem(this.signLocalTimesKey,1);
+    //       }else{
+    //         let intTimes=parseInt(times);
+    //         if(intTimes<2){
+    //            this.signInShow = true;//显示
+    //            intTimes++;
+    //            localStorage.setItem(this.signLocalTimesKey,intTimes);
+    //         }
+    //       }
+    //       localStorage.setItem(this.$xpage.constants.newLoginKey,0);
+    //     }
+    // }
     this.$store.dispatch('refrashMsg');
   },
   methods: {
+    setCurIdentity(iden){
+        this.$store.dispatch('SetCurIdentity',iden);
+      },
     closeSignDlg(){
        this.signInShow=false;
     },
@@ -219,6 +257,30 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-dropdown-menu__item:not(.is-disabled):hover{
+    background-color: #fff !important;
+    color: #0059FF !important;
+}
+::v-deep.el-dropdown-menu {
+text-align: center;
+  border: none !important;
+  
+}
+::v-deep .el-avatar{
+      margin-right: 8px;
+       img{
+           width: 100% !important;
+         }
+    }
+::v-deep.xtop .xtop-right .person-action[data-v-5bcef51e] .message-count i{
+  color: #fff !important;
+}
+.el-button--text{
+  color: #fff;
+}
+img{
+  
+}
 ::v-deep .dialog-signin{
   background: transparent;
   box-shadow:none;
@@ -313,9 +375,10 @@ export default {
   justify-content: space-between
 }
 .xtop {
-  height: 56px;
-  line-height: 56px;
-  background-color: #FFFFFF;
+  height: 72px;
+  line-height: 72px;
+  min-width: 1280px;
+  background-color: #0078FC;
   position: fixed;
   top: 0px;
   left: 0px;
@@ -326,43 +389,58 @@ export default {
   border-bottom: 1px solid #e9e9e9;
   z-index: 9999;
   .xtop-content{
-    //width: 1500px;
-
+    width: 100%;
     display: flex;
     justify-content: space-between;
-    align-items: center;
-  }
-}
-.xtop .xtop-left {
-  display: flex;
-  justify-content: flex-start;
-  .routerLink{
-    padding-right: 50px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
+    margin:0 40px;
+    .xtop-left {
+      display: flex;
+      justify-content: flex-start;
+      .xtop-logo{
+        padding-top: 20px;
+        padding-right: 50px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+    }
   }
 }
 
+
 .xtop-nav {
   display: flex;
-  justify-content: flex-start;
+  // justify-content: flex-start;
   a{
     display: inline-block;
   }
 }
-.xtop-nav > div {
-  line-height: 56px;
-  padding: 0px 24px;
+.xtop-nav-item {
+  line-height:72px;
+  color: #fff;
+}
+
+@media screen and (max-width: 1366px){
+  .xtop-nav-item{
+    padding: 0px 10px;
+  }
+}
+
+@media screen and (min-width: 1366px){
+  .xtop-nav-item{
+    padding: 0px 24px;
+  }
 }
 
 .xtop .xtop-right {
-  float: right;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
   .person-action{
     display: flex;
     justify-content: flex-end;
     align-items: center;
-    margin-left: 100px;
+    margin-left: 44px;
     ::v-deep .message-count{
       margin-right: 30px;
       i{
@@ -370,9 +448,7 @@ export default {
         color:#409EFF;
       }
     }
-    .el-avatar{
-      margin-right: 8px;
-    }
+
     .el-button{
 		margin-top: 1px;
       // margin-left: 20px;
@@ -474,7 +550,7 @@ export default {
   }
 }
 .message-count a{
-    color: #858D99;
+    color: #fff;
     font-size: 28px;
     margin-top: 0 !important;
 }
@@ -489,6 +565,6 @@ export default {
 }
 .el-dropdown-link{
   cursor: pointer;
-  color: #666666;
+  color: #fff;
 }
 </style>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index bc5b2dcf..cf7da099 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="uc-layout">
-    <div style="height: 50px;"><top></top></div>
+    <div style="height: 72px;"><top></top></div>
     <!-- <div style="position: fixed;left: 0px; top: 60px;" :style="{width:isCollapse? '54px':'200px'}">
       <div :style="{width:isCollapse? '64px':'200px'}">
         <div>
diff --git a/src/main.js b/src/main.js
index ebe6b477..e5002d6c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,7 +5,7 @@ import store from './store'
 
 //import './mock/index'
 
-import constants from '@/utils/constants'
+import xpage from '@/utils/xpage'
 import VueCookies from 'vue-cookies'
 Vue.use(VueCookies)
 import Element from 'element-ui'
@@ -14,19 +14,24 @@ import 'element-ui/lib/theme-chalk/index.css'
 import './icons' // icon
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/portal.scss' // global css
+import '@/assets/styles/uc.scss' // global css
 
 
 import Pagination from "@/components/Pagination";
 import Remark from "@/components/Remark";
 import './security'; //security control
-
+import  VueAwesomeSwiper from 'vue-awesome-swiper';
+import  'swiper/dist/css/swiper.css';
+Vue.use(VueAwesomeSwiper)
 import watermark from './utils/warterMark.js'
+import Bus from './utils/bus.js'
+Vue.prototype.$bus = Bus
 
 Vue.prototype.$watermark = watermark
 
 Vue.config.productionTip = false
 
-Vue.prototype.$Constants = constants;
+Vue.prototype.$xpage = xpage;
 
 
 Vue.prototype.msgSuccess = function(msg) {
diff --git a/src/router/index.js b/src/router/index.js
index 4bbe6992..8bbc5bb2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -76,7 +76,7 @@ export const constantRoutes = [{
     meta: { title: '课程预览', icon: 'dashboard', noCache: true, affix: false },
 },
 //
-// 外来链接 
+// 外来链接
 {
     path: '/course/boeframe',
     hidden: true,
@@ -96,7 +96,7 @@ export const constantRoutes = [{
     //此页面需要指定课程的参数
     path: '/course/studyindex',
     hidden: true,
-    component: (resolve) => require(['@/views/study/PortalIndex'], resolve),
+    component: (resolve) => require(['@/views/study/coursenew'], resolve),
     name: 'courseStudyIndex',
     meta: { title: '课程学习', icon: 'dashboard', noCache: true, affix: false },
 },
@@ -149,6 +149,29 @@ export const constantRoutes = [{
     name: 'userMsg',
     meta: { title: '我的消息', icon: 'dashboard', noCache: true, affix: false },
 },
+{
+    path: '/home',
+    hidden: true,
+    component: (resolve) => require(['@/views/homepage/Index'], resolve),
+    name: 'homePage',
+    redirect: '/home/:id',
+    meta: { title: '个人主页', icon: 'dashboard', noCache: true, affix: false },
+    children: [{
+        path: ':id',
+        hidden: true,
+        component: (resolve) => require(['@/views/homepage/page'], resolve),
+        name: 'page',
+        meta: { title: '个人主页', icon: 'dashboard', noCache: true, affix: true }
+    },
+    {
+        path: ':id/leaving',
+        hidden: true,
+        component: (resolve) => require(['@/views/homepage/leavingMessage'], resolve),
+        name: 'leavingMessage',
+        meta: { title: '留言', icon: 'dashboard', noCache: true, affix: true }
+    }
+]
+},
 {
     path: '/comments',
     hidden: true,
@@ -163,6 +186,13 @@ export const constantRoutes = [{
     name: 'qaAnswer',
     meta: { title: '写回答', icon: 'dashboard', noCache: true, affix: false },
 },
+{
+    path: '/follow',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/follow'], resolve),
+    name: 'follow',
+    meta: { title: '我的关注', icon: 'dashboard', noCache: true, affix: false },
+},
 {
     path: '/study',
     component: Layout,
diff --git a/src/security.js b/src/security.js
index 5c4ab522..4abfcb01 100644
--- a/src/security.js
+++ b/src/security.js
@@ -6,7 +6,7 @@ import 'nprogress/nprogress.css'
 import { getToken } from '@/utils/token'
 import { routers } from "@/data/pages"
 import watermark from './utils/warterMark.js'
-import constants from '@/utils/constants'
+import xpage from '@/utils/xpage'
 
 NProgress.configure({ showSpinner: false })
 
@@ -17,9 +17,9 @@ router.beforeEach((to, from, next) => {
   //动态计算文件的路径
   let configPath=process.env.VUE_APP_FILE_RELATIVE_PATH;
   if(configPath.startsWith('http')){
-    constants.fileBaseUrl=configPath;
+    xpage.fileBaseUrl=configPath;
   }else{
-    constants.fileBaseUrl = window.location.protocol+'//'+window.location.host+configPath;
+    xpage.fileBaseUrl = window.location.protocol+'//'+window.location.host+configPath;
   }
 
 
@@ -70,8 +70,7 @@ router.beforeEach((to, from, next) => {
         //store.commit('portal/SetBackUrl',location.href);
         //console.log(location.href,'location.href');
         //let urlPre=window.location.protocol+'//'+window.location.host;
-        //let backUrl=location.href.substring(urlPre.length);
-        //location.href=process.env.VUE_APP_LOGIN_URL+"?returnUrl="+location.href;
+        //let backUrl=location.href.substring(urlPre.length); encodeURIComponent()
         location.href=process.env.VUE_APP_LOGIN_URL+"?returnUrl="+encodeURIComponent(location.href);
         NProgress.done()
 
diff --git a/src/store/getters.js b/src/store/getters.js
index fd54a91b..999ef0c6 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -11,14 +11,18 @@ const getters = {
     orgId: state => state.user.orgId,
     permissions: state => state.user.permissions,
     identity: state => state.user.identity,
+    intTimeNote: state => state.user.intTimeNote,
     curIdentity: state => state.user.curIdentity,
     permission_routes: state => state.permission.routes,
     sidebarRouters: state => state.permission.sidebarRouters,
     portalCase: state => state.portal.case,
+    // intTimeNote: state => state.portal.intTimeNote,
     portalLoginRememberMe: state => state.portal.loginRememberMe,
     portalBackUrl: state => state.portal.backUrl,
     resOwnerMap:state => state.resOwner.resOwnerMap,
     sysTypeMap:state => state.sysType.sysTypeMap,
+    majorTypeMap:state => state.majorType.majorTypeMap,
+    orgDomainMap:state => state.orgDomain.orgDomainMap,
     userMsg:state => state.user.msg,
     messagesBeReviewed:state => state.user.messagesBeReviewed,
     studyTaskCount:state => state.user.studyTaskCount,
diff --git a/src/store/index.js b/src/store/index.js
index a5f50166..ff0d0868 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -9,6 +9,8 @@ import portal from './modules/portal'
 import getters from './getters'
 import sysType from './modules/sysType'
 import resOwner from './modules/resOwner'
+import majorType from './modules/majorType'
+import orgDomain from './modules/orgDomain'
 import pdf from './modules/pdf'
 
 Vue.use(Vuex)
@@ -23,6 +25,8 @@ const store = new Vuex.Store({
     portal,
     sysType,
     resOwner,
+    majorType,
+    orgDomain,
     pdf
   },
   getters
diff --git a/src/store/modules/majorType.js b/src/store/modules/majorType.js
new file mode 100644
index 00000000..82359042
--- /dev/null
+++ b/src/store/modules/majorType.js
@@ -0,0 +1,96 @@
+import {getToken} from '@/utils/token'
+// import apiType from '../../api/modules/type.js'
+import apiDict from "../../api/modules/dict.js";
+
+const state={
+        majorTypeTree: [], //内容类型
+        majorTypeMap:null,
+    }
+
+const  mutations={
+        setMajorTypeTree: (state, tree) => {
+            state.majorTypeTree = tree
+        },
+        setMajorTypeMap: (state, map) => {
+            state.majorTypeMap = map
+        },
+    }
+ const  actions={
+    getMajorTypeTree({commit}) {
+      return new Promise((resolve,reject)=>{
+          if(state.majorTypeTree.length>0){
+              resolve(state.majorTypeTree);
+          }else{
+              let hasData = sessionStorage.getItem('majorTypeTree');
+              if(hasData){
+                 let treeData = JSON.parse(hasData);
+                 commit('setMajorTypeTree', treeData);
+                 resolve(treeData);
+              }else{
+                apiDict.items('major_type').then(res=>{
+                  if(res.status === 200) {
+                      sessionStorage.setItem('majorTypeTree',JSON.stringify(res.result));
+                      commit('setMajorTypeTree', res.result);
+                      //转化为map放到状态中
+                      let map=new Map();
+                      res.result.forEach(item=>{
+                         map.set(item.code, item.name);
+                         if(item.list && item.list!=''){
+                            item.list.forEach(child=>{
+                              map.set(child.code, child.name);
+                              if(child.list && child.list!=''){
+                                 child.list.forEach(last=>{
+                                   map.set(last.code, last.name);
+                                 })
+                              }
+                            })
+                         }
+                      });
+                      commit('setMajorTypeMap', map);
+                      resolve(res.result)
+                  } else {
+                      reject('专业分类获取失败！');
+                  }
+                })
+              }
+          }
+      });
+    },
+    loadMajorTypes(context){
+      if(state.majorTypeMap==null){
+          let hasData = sessionStorage.getItem('majorTypeMap');
+          if(hasData){
+            hasData=JSON.parse(hasData);
+          }
+          //console.log(hasData,"hasData");
+          if(hasData && hasData.length>10){
+             let map=new Map();
+             hasData.forEach(item=>{
+                map.set(item.code, item.name);
+             });
+             context.commit('setMajorTypeMap',map);
+          }else{
+            apiDict.items('major_type').then(res=>{
+                if(res.status === 200) {
+                    let map=new Map();
+                    res.result.forEach(item=>{
+                       map.set(item.code, item.name);
+                    });
+                    //console.log(map,map);
+                    sessionStorage.setItem('majorTypeMap',JSON.stringify(res.result));
+                    context.commit('setMajorTypeMap', map);
+                } else {
+                    console.log('专业分类获取失败！');
+                }
+              });
+          }
+      }
+    }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
diff --git a/src/store/modules/orgDomain.js b/src/store/modules/orgDomain.js
new file mode 100644
index 00000000..39472a88
--- /dev/null
+++ b/src/store/modules/orgDomain.js
@@ -0,0 +1,94 @@
+import {getToken} from '@/utils/token'
+// import apiType from '../../api/modules/type.js'
+import apiDict from "../../api/modules/dict.js";
+
+const state={
+        orgDomainTree: [], //内容类型
+        orgDomainMap:null,
+    }
+
+const  mutations={
+        setOrgDomainTree: (state, tree) => {
+            state.orgDomainTree = tree
+        },
+        setOrgDomainMap: (state, map) => {
+            state.orgDomainMap = map
+        },
+    }
+ const  actions={
+    getOrgDomainTree({commit}) {
+      return new Promise((resolve,reject)=>{
+          if(state.OrgDomainTree.length>0){
+              resolve(state.OrgDomainTree);
+          }else{
+              let hasData = sessionStorage.getItem('OrgDomainTree');
+              if(hasData){
+                 let treeData = JSON.parse(hasData);
+                 commit('setOrgDomainTree', treeData);
+                 resolve(treeData);
+              }else{
+                apiDict.items('org_domain').then(res=>{
+                  if(res.status === 200) {
+                      sessionStorage.setItem('OrgDomainTree',JSON.stringify(res.result));
+                      commit('setOrgDomainTree', res.result);
+                      //转化为map放到状态中
+                      let map=new Map();
+                      res.result.forEach(item=>{
+                         map.set(item.code, item.name);
+                         if(item.list && item.list!=''){
+                            item.list.forEach(child=>{
+                              map.set(child.code, child.name);
+                              if(child.list && child.list!=''){
+                                 child.list.forEach(last=>{
+                                   map.set(last.code, last.name);
+                                 })
+                              }
+                            })
+                         }
+                      });
+                      commit('setOrgDomainMap', map);
+                      resolve(res.result)
+                  } else {
+                      reject('组织机构获取失败！');
+                  }
+                })
+              }
+          }
+      });
+    },
+    loadOrgDomains(context){
+      if(state.orgDomainMap==null){
+          let hasData = sessionStorage.getItem('OrgDomainMap');
+          if(hasData){
+            hasData=JSON.parse(hasData);
+          }
+          if(hasData && hasData.length>10){
+             let map=new Map();
+             hasData.forEach(item=>{
+                map.set(item.code, item.name);
+             });
+             context.commit('setOrgDomainMap',map);
+          }else{
+            apiDict.items('org_domain').then(res=>{
+                if(res.status === 200) {
+                    let map=new Map();
+                    res.result.forEach(item=>{
+                       map.set(item.code, item.name);
+                    });
+                    sessionStorage.setItem('OrgDomainMap',JSON.stringify(res.result));
+                    context.commit('setOrgDomainMap', map);
+                } else {
+                    console.log('组织机构获取失败！');
+                }
+              });
+          }
+      }
+    }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
diff --git a/src/store/modules/portal.js b/src/store/modules/portal.js
index 48b9a4ea..09fa0f6e 100644
--- a/src/store/modules/portal.js
+++ b/src/store/modules/portal.js
@@ -3,7 +3,7 @@ const state = {
     readProtocol: sessionStorage.getItem("readProtocol") == null ? false : JSON.parse(sessionStorage.getItem("readProtocol"))
   },
   loginRememberMe: sessionStorage.getItem("loginRememberMe") == null ? {} : JSON.parse(sessionStorage.getItem("loginRememberMe")),
-  backUrl:''
+  backUrl:'',
 }
 
 const mutations = {
@@ -18,6 +18,7 @@ const mutations = {
   SET_BackUrl: (state, u) => {
     state.backUrl = u;
   },
+  
 }
 
 const actions = {
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 4a0fd304..b96dfca7 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -5,18 +5,23 @@ import apiMessage from '@/api/system/message.js'
 import apiCourse from "@/api/modules/course.js";
 import apiBoeCourse from "@/api/boe/course.js";
 import apiBoeLogout from "@/api/boe/login.js";
+import apiStat from "@/api/phase2/stat.js";
 
 const user = {
     state: {
-        info: { aid: '', loginName: '', name: '', avatar: '', userNo: '', departId: '', departName: '', departFullName: '',studyTotal:0,studyTotalH:0},
+        info: { aid: '', loginName: '',sign:'', name: '', avatar: '', userNo: '', departId: '', departName: '', departFullName: '',studyTotal:0,studyTotalH:0},
         identity: 2, // 1表学员，2表教师，3表管理员。目前只有3会被设置表示学员教师管理员身份都有
         msg:0,//未读消息数
         messagesBeReviewed: 0,//待审核的消息
         studyTaskCount:0,//学习任务数
         curIdentity: sessionStorage.getItem("curIdentity") == null ? 1 : sessionStorage.getItem("curIdentity"), // 用户当前选择的身份  1学员 2教师 3管理员
         permissions: [],
+        intTimeNote:0,
     },
     mutations: {
+        SET_IntTimeNote: (state, u) => {
+            state.intTimeNote = u;
+          },
         SET_Identity: (state, iden) => {
             state.identity = iden
         },
@@ -41,6 +46,19 @@ const user = {
         },
     },
     actions: {
+         // /用户触发事件
+         userTrigger({ commit }, event) {
+           event.source='page';
+            apiStat.sendEvent(event);
+        },
+        SetIntTimeNote({
+            commit
+          }, iden) {
+            return new Promise((resolve) => {
+              commit('SET_IntTimeNote', iden);
+              resolve();
+            })
+          },
         refrashMsg({ commit }) {
               apiMessage.isRead().then(res=>{
                 if(res.status==200){
@@ -61,22 +79,18 @@ const user = {
             })
        },
        refrashStudyTaskCount({ commit }) {
-            apiBoeCourse.cmtaskList({page:1,size:1}).then(res=>{
-            if(res.status==200){
-                let count = 0;
-                if(res.result.count > 0){
-                    count = res.result.count;
-                }
-                commit('SET_StudyTaskCount',count);
-            }else{
-                console.log("读取学习任务数失败："+res.message);
-            }
+            apiBoeCourse.cmtaskList({page:1,size:1,get_count:1}).then(res=>{
+              if(res.status==200){
+                  let count = 0;
+                  if(res.result.count > 0){
+                      count = res.result.count;
+                  }
+                  commit('SET_StudyTaskCount',count);
+              }else{
+                  console.log("读取学习任务数失败："+res.message);
+              }
             })
         },
-        //
-        SetTaskCount({ commit }, count) {
-          commit('SET_StudyTaskCount', count);
-        },
         //设置用户身份
         SetIdentity({ commit }, iden) {
             return new Promise((resolve) => {
@@ -140,13 +154,16 @@ const user = {
                         sex:res.result.sex? res.result.sex:1,
                         loginName: res.result.loginName,
                         userNo: res.result.userNo,
+                        showHome:res.result.showHome,
                         companyId:res.result.companyId,
                         departId: res.result.departId,
                         departName: res.result.departName,
                         departFullName: dfn,
                         studyTotal: res.result.studyTotal,
-                        studyTotalH:studyTotalH
+                        studyTotalH:studyTotalH,
+                        sign:res.result.sign,
                     };
+                    //console.log(user,'user');
                     // user.avatar = user.avatar == "" ? require("@/assets/images/user/default.png") : process.env.VUE_APP_FILE_BASE_URL + user.avatar;
                     user.avatar = user.avatar == "" ? "" : process.env.VUE_APP_FILE_BASE_URL + user.avatar;
                     commit('SET_UserInfo', user);
diff --git a/src/utils/bus.js b/src/utils/bus.js
new file mode 100644
index 00000000..925cee00
--- /dev/null
+++ b/src/utils/bus.js
@@ -0,0 +1,3 @@
+import Vue from 'vue'
+const Bus = new Vue();
+export default Bus;
\ No newline at end of file
diff --git a/src/utils/constants.js b/src/utils/constants.js
deleted file mode 100644
index 2a3377ca..00000000
--- a/src/utils/constants.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**页面设置的一些常量*/
-const constants={
-  fileBaseUrl:'http://127.0.0.1/pc/cdn/upload',
-  newLoginKey:'boe_new_login'
-}
-
-export default constants
diff --git a/src/utils/request.js b/src/utils/request.js
index f2f557b7..2dce41d2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -83,7 +83,7 @@ service.interceptors.response.use(res => {
     console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
-      message = "后端接口连接异常";
+      message = "网络异常，请稍后重试";
     }
     else if (message.includes("timeout")) {
       message = "系统接口请求超时";
diff --git a/src/utils/tools.js b/src/utils/tools.js
index c112d75f..84b10636 100644
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -18,8 +18,34 @@ export const cutFullName = (fullName,num) => {
             }
           }
       }
+    }
+    return newName;
+};
 
-
+/**截取机构名称路径namePath最后两段，不包含第一个 */
+export const cutOrgNamePath = (namePath) => {
+    let newName=namePath;
+    //debugger
+    if(newName){
+      let names=newName.split('/');
+      let len=names.length;
+      //使用最后两们
+      if(len>1){
+         //newName=names[len-2]+'/'+names[len-1];
+         newName=names[1];
+         if(!newName){
+           newName=names[0]
+         }
+      }
+      
+      // if(names.length>1){
+      //    newName=names[1];
+      //     if(num==2){
+      //       if(names.length>2){
+      //          newName+="/"+names[2];
+      //       }
+      //     }
+      // }
     }
     return newName;
 };
@@ -127,6 +153,29 @@ export function formatDate(date){
   	return newTime;
 
 }
+
+/**
+ * 把日期格式化为显示时间，yyyy-MM-dd
+ * @param {Object} date
+ */
+export function formatDateShort(date){
+  	var year = date.getFullYear(),
+        month = date.getMonth() + 1,//月份是从0开始的
+        day = date.getDate(),
+        hour = date.getHours(),
+        min = date.getMinutes(),
+        sec = date.getSeconds();
+    if(month<10){month='0'+month}
+    if(day<10){day='0'+day}
+    if(hour<10){hour='0'+hour}
+    if(min<10){min='0'+min}
+    if(sec<10){sec='0'+sec}
+  	var newTime = year + '-' + month + '-' + day;
+  	return newTime;
+
+}
+
+
 export function numberToLetter(x){ //此方法和移到utils中去
     let s = "";
     while (x > 0) {
@@ -238,3 +287,173 @@ export function testType(type) { //此方法移到tools中
     }
     return text;
   }
+// u币key
+  const uTypeMaps = {
+    'PublishArticle': '发表文章',
+    'ViewArticle': '阅读文章',
+    'StudyCourse': '学习课程',
+    'PublishCourse': '发布课程',
+    'PulishQuestion': '发布问题',
+    'ReadQuestion': '阅读问题',
+    'AnswerQuestion': '回答问题',
+    'PublishNote': '发布笔记',
+    'PublishComment': '发表评论',
+    'ReplyComment': '回复评论',
+    'Praise': '点赞',
+    'ScoreCourse':'课程评分',
+    'Feedback':'意见反馈',
+    'VideoStudyDayStat':'试听学习时长',
+    'ViewCase':'阅读案例',
+    'ViewArticle':'阅读文章',
+    'DeleteQuestion':'删除问题',
+    'other':'其他'
+};
+export function getUType(type) {
+    let name =  uTypeMaps[type];
+    return name;
+}
+
+/**此方法的意义，需要一起讨论*/
+export function experienceValue(total) {
+  let data = {
+    start:'',
+    end:'',
+    endValue:null,
+    percentage:0,
+    total,
+  }
+    if(total < 300) {
+      data.start = 'LV1';
+      data.end = 'LV2';
+      data.endValue = 600;
+      data.percentage = parseFloat((total / 600) * 100);
+      return data;
+    }
+    if(total >= 300 && total < 600){
+      data.start = 'LV2';
+      data.end = 'LV3';
+      data.endValue = 1000;
+      data.percentage = parseFloat((total / 1000) * 1000);
+      return data;
+    }
+    if(total >= 600 && total < 1000){
+      data.start = 'LV3';
+      data.end = 'LV4';
+      data.endValue = 2000;
+      data.percentage = parseFloat((total / 2000) * 100);
+      return data;
+    }
+    if(total >= 1000 && total < 2000){
+      data.start = 'LV4';
+      data.end = 'LV5';
+      data.endValue = 4000;
+      data.percentage = parseFloat((total / 4000) * 4000);
+      return data;
+    }
+    if(total >= 2000 && total < 4000){
+      data.start = 'LV5';
+      data.end = 'LV6';
+      data.endValue = 8000;
+      data.percentage = parseFloat((total / 8000) * 100);
+      return data;
+    }
+    if(total >= 4000 && total < 8000){
+      data.start = 'LV6';
+      data.end = 'LV7';
+      data.endValue = 15000;
+      data.percentage = parseFloat((total / 15000) * 100);
+      return data;
+    }
+    if(total >= 8000 && total < 15000){
+      data.start = 'LV7';
+      data.end = 'LV8';
+      data.endValue = 20000;
+      data.percentage = parseFloat((total / 20000) * 100);
+      return data;
+    }
+    if(total >= 15000 && total < 20000){
+      data.start = 'LV8';
+      data.end = 'LV9';
+      data.endValue = 30000;
+      data.percentage = parseFloat((total / 30000) * 100);
+      return data;
+    }
+    if(total >= 20000 && total < 30000){
+      data.start = 'LV9';
+      data.end = 'LV10';
+      data.endValue = 30000;
+      data.percentage = parseFloat((total / 30000) * 100);
+      return data;
+    }
+    if(total >= 30000){
+      data.start = 'LV10';
+      data.end = '';
+      data.endValue = 90000;
+      data.percentage = parseFloat((total / 90000) * 100);
+      return data;
+    }
+  return data;
+}
+export function translate(field) {
+  let name = '';
+  switch (field) {
+      case 'total':name = '累计'; break;
+      case 'weeks':name = '本周'; break;
+      case 'months':name = '本月'; break;
+      case 'years':name = '本年'; break;
+      default:
+      break;
+  }
+  return name;
+}
+
+/**格式化人数的文档 ，学习人数，关注人数等*/
+export function formatUserNumber(num) {
+  let rsNum =0;
+  if(num<5){return 0;}
+  if(num>=5 && num<= 10){return 10 +"+";}
+  if(num<=94){
+    rsNum=Math.round((num)/10)*10;
+    return rsNum+'+';
+  }
+  if(num>94 && num <= 1000){
+    rsNum=Math.round((num)/100)*100;
+    return rsNum+'+';
+  }
+  if(num>1000 && num <= 10000){
+    rsNum=Math.round((num)/1000)*1000;
+    return rsNum+'+';
+  }
+  if(num>10000){
+    // rsNum=Math.round((num)/10000)*10000;
+    // return rsNum+'+';
+    rsNum=Math.round((num)/10000);
+    return rsNum+'W+';
+  }
+  return num;
+}
+
+/**
+ * 将秒转换成小时
+ * @author wn
+ * @date 2022.10.18
+ * @param {Object} second 秒
+ * @@return 小时
+ */
+export function formatSecondToHour(second) {
+  var n = 1; // 保留小数位
+  second = Number(second);
+  var h = second / 3600;
+  h = h.toFixed(n);
+  if(isNaN(h)){
+    h = 0;
+  }
+  return h;
+}
+// 秒换成时分秒
+export function getHMS(time) {
+  const hour = parseInt(time / 3600) < 10 ? '0' + parseInt(time / 3600) : parseInt(time / 3600)
+  const min = parseInt(time % 3600 / 60) < 10 ? '0' + parseInt(time % 3600 / 60) : parseInt(time % 3600 / 60)
+  const sec = parseInt(time % 3600 % 60) < 10 ? '0' + parseInt(time % 3600 % 60) : parseInt(time % 3600 % 60)
+  return hour + ':' + min + ':' + sec
+}
diff --git a/src/utils/xajax.js b/src/utils/xajax.js
index 1958aa65..8698061c 100644
--- a/src/utils/xajax.js
+++ b/src/utils/xajax.js
@@ -29,7 +29,7 @@ const jsonRequest=axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   //超时
-  timeout: 20000,
+  timeout: 10000,
 });
 //发送json对象的拦截器
 jsonRequest.interceptors.request.use(config => {
@@ -82,7 +82,7 @@ jsonRequest.interceptors.response.use(res => {
     console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
-      message = "后端接口连接异常";
+      message = "网络异常，请稍后重试";
     }
     else if (message.includes("timeout")) {
       message = "系统接口请求超时";
@@ -155,7 +155,7 @@ formRequest.interceptors.response.use(res => {
     console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
-      message = "后端接口连接异常";
+      message = "网络异常，请稍后重试";
     }
     else if (message.includes("timeout")) {
       message = "系统接口请求超时";
diff --git a/src/utils/xpage.js b/src/utils/xpage.js
new file mode 100644
index 00000000..aa69ed59
--- /dev/null
+++ b/src/utils/xpage.js
@@ -0,0 +1,20 @@
+/**页面设置的一些常量,方便，用于一个处理只写一处，不要多处写*/
+const constants={
+  fileBaseUrl:'http://192.168.0.11/cdn/upload',
+  newLoginKey:'boe_new_login'
+}
+
+/**返回个人主页的id参数*/
+const getHomeId=function(r){
+  return r.params.id;
+}
+
+const getHomePath=function(id){
+  return '/home/'+id;
+}
+
+export default {
+  getHomeId,
+  getHomePath,
+  constants
+}
diff --git a/src/utils/zipdownload.js b/src/utils/zipdownload.js
index 67b5e5a2..5ecf4053 100644
--- a/src/utils/zipdownload.js
+++ b/src/utils/zipdownload.js
@@ -36,5 +36,5 @@ export function resolveBlob(res, mimeType) {
   aLink.setAttribute('download', fileName) // 设置下载文件名称
   document.body.appendChild(aLink)
   aLink.click()
-  document.body.appendChild(aLink)
+  document.body.removeChild(aLink)
 }
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 6dd0a0bb..8036beca 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -1,1243 +1,2190 @@
 <template>
   <div>
-    <portal-header current="index" ></portal-header>
-    <div class="portal-content xcontent" >
-      <!-- 推荐课程 -->
-      <div class="modules">
-        <!--内容块-->
-        <div class="modules-title">
-          <!-- <img :src="`${webBaseUrl}/images/recommend_course.png`" class="recommend" /> -->
-          <span class="modules-text">推荐课程</span>
-          <span class="quyer-tag">
-            <a :class="courseList.orderType == 2 ? 'current' : ''" @click="orderTypeFilter(2)">最热</a>
-            <a :class="courseList.orderType == 1 ? 'current' : ''" @click="orderTypeFilter(1)">最新</a>
-            <span @click="jumUX()" class="Uxtext" style=""> U选小课堂
-               <span class="uxicon">
-                  <svg-icon icon-class="hot" style="font-size:22px"></svg-icon>
-               </span>
-            </span>
-          </span>
-          <span class="more">
-            <!-- <span style="margin-right: 20px;cursor: pointer;" @click="nextPage()">换一换</span> -->
-            <router-link to="/course">更多&nbsp;></router-link>
-          </span>
+    <div class="course-banner">
+      <portal-header current="index" textColor="#000000" style="z-index:999; position: relative;"></portal-header>
+       <div id="container" style="z-index:99;" v-if="resonimg.length ==  1">
+         <!-- 当轮播图等于一张时 -->
+        <swiper :options="swiperOptiontwo" >
+          <swiper-slide style="margin: 0 auto;" v-for="(item , idx ) in resonimg" :key="'a'+idx" class="swiper-slide games pointer" @click.native="banJump(item)">
+            <div class="bannbox" :style="{ 'background': `url(${fileBaseUrl + item.image}) no-repeat 100% / 100%`}">
+            </div>
+            <img class="banner-img" style=" margin: 0 auto;" :src=" fileBaseUrl + item.image" alt="">
+          </swiper-slide>
+        </swiper>
         </div>
-        <div class="modules-list xrow" style="height: 485px;overflow: hidden;">
-          <!--一个固定内容-->
-          <div class="xrow-course index-course">
-            <el-card class="course-card" :body-style="{ padding: '0px' }">
+      <div id="container" style="z-index:99;" v-else>
+        <swiper :options="swiperOption" ref="mySwiper" v-if="resonimg.length > 1">
+          <swiper-slide style="margin: 0 auto;" v-for="(item , idx ) in resonimg" :key="'b'+idx" class="swiper-slide games pointer" @click.native="banJump(item)">
+            <div class="bannbox" :style="{ 'background': `url(${fileBaseUrl + item.image}) no-repeat 100% / 100%`}">
+            </div>
+            <img class="banner-img" style=" margin: 0 auto;" :src=" fileBaseUrl + item.image" alt="">
+          </swiper-slide>
+          <div class="swiper-pagination"  slot="pagination"></div>
+          <!-- <div class="swiper-button-prev" slot="button-prev"></div> -->
+        </swiper>
+      </div>
+
+      <div class="personal-panel">
+        <div class="personal-img">
+          <author-img width="68px" height="68px" :avatar="userInfo.avatar" :aid="userInfo.aid" :noJump="false" :sex="userInfo.sex"></author-img>
+
+          <!-- {{ userInfo.avatar }} -->
+        </div>
+        <!-- <img style="width:68px;height:68px" src="/images/Avatarman.png" alt=""> -->
+        <p class="personal-name">{{userInfo.name}} {{userInfo.userNo}}
+          <span class="grade">{{userData.level}}</span>
+        </p>
+
+        <p class="personal-info">{{cutOrgNamePath(userInfo.departFullName)}}</p>
+        <a href="uc/study/task">
+          <div  class="personal-box" style="margin-bottom:10px">
+            <span>学习任务</span>
+            <span v-if="studyTaskCount == 0" style="display:flex;">
+              暂无任务
+                <div class="tobe-icon">
+                 <img :src="`${webBaseUrl}/images/homeWu/Pending.png`" alt=""> </div>
+            </span>
+            <span v-else style="display:flex;">{{studyTaskCount? studyTaskCount:0 }}个待学习
+               <div class="tobe-icon">
+                 <img :src="`${webBaseUrl}/images/homeWu/Pending.png`" alt=""> </div>
+            </span>
+            <!-- <img class="personal-box-img" :src="`${webBaseUrl}/images/homeWu/agency.png`" alt="" srcset=""> -->
+          </div>
+        </a>
+        <div class="last-study-info">
+          <div class="one-line-ellipsis" style="color: #333;font-size: 16px;" v-if="overlayShow">
+            <router-link :to="'/course/studyindex?id='+lastStudy.courseId" > 
+            <img class="Recent" :src="`${webBaseUrl}/images/Recent.png`" alt="">
+            最近学习： {{lastStudy.courseName}}
+             </router-link>
+          </div>
+          <!-- <div class="tobe-icon">
+            <img :src="`${webBaseUrl}/images/homeWu/Pending.png`" alt="">
+          </div> -->
+        </div>
+        <ul class="personal-ul">
+          <li>
+            <router-link to="/user/ranking">
+            <span class="label">累计学习</span>
+            <p><span>{{userData.totalStudyHour}}</span>小时</p>
+            </router-link>
+          </li>
+          <!-- <li>
+            <span class="label">经验值等级</span>
+            <p><span>{{userData.level}}</span></p>
+          </li> -->
+          <li>
+            <router-link @click.native="setCurIdentity(1)" to="/user/ucurrency">
+            <span class="label">我的U币</span>
+            <p><span>{{userData.uvalue}}</span>个</p>
+            </router-link>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="xindex-content">
+      <!-- 推荐课程 -->
+      <div class="modules xcontent2">
+        <div class="xcontent2-main">
+          <!--内容块-->
+          <div class="modules-title xindex-main" >
+            <span class="modules-text">推荐课程</span>
+            <span class="quyer-tag">
+              <a :class="courseList.orderType == 2 ? 'current' : ''" @click="orderTypeFilter(2)">最热</a>
+              <a :class="courseList.orderType == 1 ? 'current' : ''" @click="orderTypeFilter(1)">最新</a>
+              <span @click="jumUX()" class="Uxtext" style=""> U选小课堂
+                <span class="uxicon">
+                  <svg-icon icon-class="hot" style="font-size:22px"></svg-icon>
+                </span>
+              </span>
+            </span>
+            <span class="more">
+              <router-link to="/course">查看更多>></router-link>
+            </span>
+          </div>
+          <div class="modules-list">
+            <!-- 一个固定内容 -->
+            <!-- <div class="xindex-course">
               <a href="course/boeframe?id=517CA622-238E-06BA-0AED-B1200D705800&type=online-course">
-                <div class="course-image-box">
-                  <el-image class="course-image" style="height: 130px;" :src="this.webBaseUrl+'/ad/index_course.png'" fit="fit"></el-image>
+                <div style="border-radius: 4px;" class="xindex-course-image">
+                  <el-image style="border-radius: 4px;" class="course-image" :src="this.webBaseUrl+'/ad/index_course.png'" fit="fit"></el-image>
                   <span class="course-type">录播课</span>
                 </div>
-                 <!-- <el-tooltip class="item"  content="高效谈判系列课" placement="bottom" effect="light" :visible-arrow="false" popper-class="text-tooltip"> -->
-              <div title="高效谈判系列课" class="course-title one-line-ellipsis">高效谈判系列课</div>
-            <!-- </el-tooltip> -->
+                <div style="display:flex">
+                  <div style="flex:80%" title="高效谈判系列课" class="course-title portal-title-tow two-line-ellipsis">高效谈判系列课</div>
+                  <div >
+                      <svg-icon style="font-size: 32px;margin-top: 8px;" icon-class="collectedCourse"></svg-icon>
+                    </div>
+                </div>
                 <div class="course-author">
-                   <div class="course-author-left" > </div>
-                  <div style="flex:1; text-align: center; ">
-                    <span class="study-num">2581人学习</span>
+                  <div>
+                    <span class="study-num">3000+人学习</span>
                   </div>
-                  <div style="padding-left:15px">
-                    <div >
-                      <span class="course-score-value">5.0</span>
+                  <div style="display:flex">
+                    <div style="padding-left:15px">
+                      <div>
+                        <span class="course-score-value">5.0分</span>
+                      </div>
                     </div>
                   </div>
                 </div>
               </a>
-            </el-card>
-          </div>
-
-          <!--内容列表内容-->
-          <div  v-for="course in courseList.list" :key="course.id" class="xrow-course index-course">
-            <el-card class="course-card" :body-style="{ padding: '0px' }">
-              <a :href="toCourseDetail(course)">
-                <div class="course-image-box">
-                  <course-image height="130px" :course="course"></course-image>
-                  <!-- <el-image class="course-image"  :src="fileBaseUrl+course.coverImg" fit="fit"></el-image> -->
-                  <!-- <span v-if="course.type==10" class="course-type"></span>
-                  <span v-if="course.type==20" class="course-type"></span> -->
-                  <!-- <span v-if="course.type==10" class="course-type-title">微课</span> -->
+            </div> -->
+            <!--内容列表内容-->
+            <div v-for="(course,ccidx) in courseList.list" :key="'cc'+ccidx" class="xindex-course" style="position: relative;">
+              <div style="position: absolute;right:25px;bottom: 72px">
+                <interactBar nodeWidth="20px" :courseExclusive="true"  :type="1" :data="course" :comments="false" :praises="false" :shares="false" :views="false">
+                </interactBar>
+                <!-- <svg-icon style="font-size: 32px;margin-top: -5px;" icon-class="collectedCourse"></svg-icon> -->
+              </div>
+              <a @click="toCourseDetail(course)">
+                <div class="xindex-course-image">
+                  <course-image :course="course"></course-image>
                   <span v-if="course.type == 20 || 10" class="course-type">录播课</span>
                 </div>
-
-            <!-- <el-tooltip class="item"  :content="course.name" placement="bottom" effect="light" :visible-arrow="false" popper-class="text-tooltip"> -->
-                <div :title="course.name" class="course-title one-line-ellipsis" >{{ course.name }}</div>
-            <!-- </el-tooltip> -->
-
+                <div style="width:80%" :title="course.name" class="course-title portal-title-tow two-line-ellipsis">{{ course.name }}
+                </div>
                 <div class="course-author">
-                  <!-- <div class="course-author-left"><authorInfo :avatar="course.authorInfo.avatar" :name="course.authorInfo.name"></authorInfo></div> -->
-                   <div class="course-author-left" >
+                  <div class="course-author-left">
                     {{ course.authorInfo.name }}
-                   </div>
-                  <div style="flex:1; text-align: center; ">
-                    <span class="study-num">{{ course.studys }}人学习</span>
+
+                    <span class="study-num" >{{formatNum(course.studys)}}人学习</span>
                   </div>
-                  <div style="padding-left:15px">
+                  <div style="display: flex;">
+
                     <div v-if="course.score">
-                      <!-- <span><el-rate style="display: inline-block;" disabled v-model="course.score"></el-rate></span> -->
-                      <span class="course-score-value">{{ toScore(course.score) }}</span>
+                      <span class="course-score-value" style="margin-left:10px">{{ toScore(course.score) }}分</span>
                     </div>
                     <div v-else class="course-score-no">未评分</div>
                   </div>
                 </div>
-                <!-- <div class="course-score">
-
-
-
-               </div> -->
               </a>
-              <!-- 收藏位置 -->
-              <div class="cor-praises"><interactBar :type="1" :data="course" :comments="false" :praises="false" :shares="false" :views="false"></interactBar></div>
 
-              <!-- <a :href="toCourseDetail(course)">
-              <div class="cor-icon"><i class="el-icon-caret-right"></i></div>
-              </a> -->
-              <!-- <div class="cardmark">
-                <div class="cardmark-name" v-if="course.forUsers">目标学员</div>
-                <div class="cardmark-info">{{course.forUsers}}</div>
-                <div class="cardmark-name" v-if="course.value">课程价值</div>
-                <div class="cardmark-info">{{course.value}}</div>
-                <div class="cardmark-name" v-if="course.summary">课程介绍</div>
-                <div class="cardmark-info">{{course.summary}}</div>
-              </div> -->
-            </el-card>
+            </div>
           </div>
         </div>
-      </div>
-        <!-- 推荐案例2版 -->
-      <div class="modules">
-         <div class="modules-title">
 
-      <span class="modules-text">推荐案例</span>
-      <span class="quyer-tag">
-      <a :class="caseList.orderType==2?'current':''" @click="changeCaseOrder(2)">最热</a>
-      <a :class="caseList.orderType==1?'current':''" @click="changeCaseOrder(1)">最新</a>
-      </span>
-      <span class="more"><router-link to="/case">更多&nbsp;></router-link></span>
-      </div>
-      <div class="modules-list xrow" style="height: 255px;overflow: hidden;">
-         <div class="index-course xrow-course" v-for="ca in caseList.list" :key="ca.id">
-         <div  class="casetwo" :body-style="{ padding: '0px' }">
-             <!-- <div class="case-top"></div> -->
-             <div class="case-conent">
-                <!-- <div class="case-time">
-                    {{ca.sysCreateTime.substring(0,10)}}
-                </div> -->
-                 <a :href="'case/detail?id='+ca.id" >
-            <!-- <el-tooltip class="item"  :content="ca.title" placement="bottom" effect="light" :visible-arrow="false" popper-class="text-tooltip"> -->
-               <span :title="ca.title" class="case-title one-line-ellipsis">
-                   {{ca.title}}
+        <div class="xcontent2-minor" style="margin-top:60px">
+          <div class="portal-ranking ranking-bg">
+            <p class="ranking-title">课程排行榜</p>
+            <ul class="xindex-ranking-course">
+              <li  class="xindex-ranking-li" v-for="(item, cindex) in scorelist" :key="'cc'+cindex">
+                <a style="display: inherit" @click="toCourseDetail(item)">
+                <span class="portal-right-text blue-one">
+                  <img :src="getPic(cindex)" alt="">
                 </span>
-            <!-- </el-tooltip> -->
-
-                <div class="case-text three-line-ellipsis">
-                    {{ca.summary}}
-                </div>
-                </a>
-                <div class="case-inter">
-                  <interactBar :type="3" :readonly="true" :data="ca" :shares="false" :views="false"></interactBar>
-                </div>
-                <div class="case-orginfo" style="margin-top:18px">
-                    <authorInfo :avatar="ca.authorInfo.avatar" :info="ca.authorInfo.orgInfo" :name="ca.authorInfo.name" :sex="ca.authorInfo.sex"></authorInfo></div>
-                </div>
-             </div>
-      </div>
-      </div>
-      </div>
-      <!-- 推荐案例 -->
-      <!-- <div class="modules">
-
-      <div class="modules-title">
-
-      <span class="modules-text">推荐案例</span>
-      <span class="quyer-tag">
-      <a :class="caseList.orderType==1?'current':''" @click="changeCaseOrder(1)">最新</a>
-      <a :class="caseList.orderType==2?'current':''" @click="changeCaseOrder(2)">最热</a>
-      </span>
-      <span class="more"><router-link to="/case">更多&nbsp;></router-link></span>
-      </div>
-      <el-row :gutter="15" class="modules-list">
-
-      <el-col :span="12" v-for="ca in caseList.list" :key="ca.id">
-      <el-card class="case-card" :body-style="{ padding: '16px' }">
-      <div class="case-info-image-box" v-if="ca.coverUrl && ca.coverUrl.length > 0">
-      <div class="case-info">
-      <div class="case-info-title">
-      <a :href="'case/detail?id='+ca.id" target="_blank">{{ca.title}}</a>
-      <span class="case-info-time">{{ca.sysCreateTime.substring(0,10)}}</span>
-      </div>
-      <div class="case-info-summary">
-      {{ca.content}}
-      </div>
-                </div>
-                <img width="100%" :src="fileBaseUrl + ca.coverUrl"/>
-              </div>
-              <div class="case-info-box" v-else>
-                <div class="case-info">
-                  <div class="case-info-title">
-                    <a :href="'case/detail?id='+ca.id" target="_blank">{{ca.title}}</a>
-                    <span class="case-info-time">{{ca.sysCreateTime.substring(0,10)}}</span>
-                  </div>
-                  <div class="case-info-summary">
-                     {{ca.content}}
-                  </div>
-                </div>
-              </div>
-              <div class="case-other-info">
-                <div><authorInfo :avatar="ca.authorInfo.avatar" :name="ca.authorInfo.name" :info="ca.authorInfo.orgInfo" :sex="ca.authorInfo.sex"></authorInfo></div>
-                <div><interactBar :type="3" :readonly="true" :data="ca" :shares="false" :views="false"></interactBar> </div>
-              </div>
-            </el-card>
-          </el-col>
-        </el-row>
-      </div> -->
-
-      <!-- 推荐文章 -->
-      <div class="modules">
-        <!--内容块-->
-        <div class="modules-title">
-          <!-- <img :src="`${webBaseUrl}/images/recommend_article.png`" class="recommend" /> -->
-          <span class="modules-text">推荐文章</span>
-          <span class="quyer-tag">
-               <a :class="articleList.orderType == 2 ? 'current' : ''" @click="changeArticleOrder(2)">最热</a>
-            <a :class="articleList.orderType == 1 ? 'current' : ''" @click="changeArticleOrder(1)">最新</a>
-
-          </span>
-          <span class="more"><router-link to="/article">更多&nbsp;></router-link></span>
-        </div>
-        <el-card class="modules-list" :body-style="{ padding: '16px' }">
-          <div class="article-card" style="display: flex;">
-            <!-- 首张 -->
-            <div style="width: 430px;" class="article-card-left" v-if="articleList && articleList.first && articleList.first.id">
-              <div class="article-card-box">
-                <a :href="`${webBaseUrl}/article/detail?id=${articleList.first.id}`" style="font-weight: 700;font-size: 20px;">
-                  <div class="article-info-image-box">
-                    <article-image height="329px" width="440px" :article="articleList.first"></article-image>
-                    <!-- <img style="width:100%;" :src="fileBaseUrl+articleList.first.coverurl" /> -->
-                    <div class="article-info">
-                      <div class="article-info-title " style="display:flex ;margin-top:7px">
-                        <div class="one-line-ellipsis" style="flex:1;">
-                          <span style="font-weight: 700;font-size: 20px;word-break:break-all;">{{ articleList.first.title }}</span>
-                        </div>
-                        <div style="flex:1;">
-                          <span class="article-info-time ">{{ articleList.first && articleList.first.sysCreateTime && articleList.first.sysCreateTime.substring(0, 10) }}</span>
-                        </div>
-                        <!-- <a :href="`${webBaseUrl}/article/detail?id=${articleList.first.id}`" target="_blank" style="font-weight: 700;font-size: 20px;">{{articleList.first.title}} </a> -->
-                      </div>
-                      <div class="article-info-summary two-line-ellipsis" style="margin-top:14px;word-break:break-all;">{{ articleList.first.summary }}</div>
+                <span class="portal-title-desc index-one-line-ellipsis title-line-ellipsis" style="font-size: 14px;color: #04243C;">{{ item.name }}</span>
+                  </a>
+                <div class="list-active">
+                  <div class="list-content">
+                    <div class="list-img">
+                      <course-image :course="item"></course-image>
+                      <span v-if="item.type < 21" class="course-type">录播</span>
+                      <span v-if="item.type==30" class="course-type">线下课</span>
+                      <span v-if="item.type==40" class="course-type">学习项目</span>
+                    </div>
+                    <div class="list-text">
+                      <h6 class="two-line-ellipsis">{{item.name}}</h6>
+                      <span>{{item.publishTime}}</span>
                     </div>
                   </div>
-                </a>
-                <div class="article-other-info" style="margin-top:17px">
-                  <div><authorInfo :avatar="articleList.first.authorInfo.avatar" :name="articleList.first.authorInfo.name" :sex="articleList.first.authorInfo.sex"></authorInfo></div>
-                  <div><interactBar :type="2" :readonly="true" :data="articleList.first" :views="false"></interactBar></div>
+                  <div class="list-bottom">
+                    <interactBar :type="1" :data="item" :couseViews="true" :shares="false" :views="false"></interactBar>
+                  </div>
+                </div>
+
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <!-- 推荐案例2版 -->
+      <div class="modules xcontent2">
+        <div class="xcontent2-main xindex-main" >
+          <div class="modules-title"><span class="modules-text">推荐案例</span>
+            <span class="quyer-tag">
+              <a :class="caseList.orderType==2?'current':''" @click="changeCaseOrder(2)">最热</a>
+              <a :class="caseList.orderType==1?'current':''" @click="changeCaseOrder(1)">最新</a>
+            </span>
+            <span class="more">
+              <router-link to="/case">查看更多>></router-link>
+            </span>
+          </div>
+          <div class="modules-list">
+            <div class="xindex-case"   v-for="(ca,ind) in caseList.list" :key="'aa'+ind">
+              <div class="case-index boe-case-index">
+                <div class="case-top"></div>
+                <div class="case-conent" @click="jumcasedet(ca)">
+                  <p class="cast-time">
+                    <span class="time-one" v-if="caseList.orderType==2">
+                      <svg-icon style="margin-right: 0;font-size:16px;" icon-class="crown"></svg-icon>人气榜NO.{{ind+1}}
+                    </span>
+                    <span style="float: right;">{{ca.sysCreateTime.substring(0, 10)}}</span>
+                  </p>
+                  <p :title="ca.title" class="two-line-ellipsis case-title">
+                    {{ca.title}}
+                  </p>
+                  <p class="case-text three-line-ellipsis">{{ca.summary}}</p>
+                  <p class="case-info">
+                    <interactBar :type="3" :readonly="true" :data="ca" :shares="false" :views="false"></interactBar>
+                  </p>
+                </div>
+                <div class="case-inter ">
+                    <div class="case-inter-box">
+                      <div class="case-inter-left ">
+                        <div style="float:left"> <authorInfo  :avatar="ca.authorInfo.avatar"  :name="ca.authorInfo.name" :sex="ca.authorInfo.sex"  :aid="userInfo.aid"></authorInfo></div>
+                        <div class="case-inter-orgin index-one-line-ellipsis">  {{ ca.authorInfo.orgInfo }}</div>
+                      </div>
+                      <div v-if="caseList.orderType==2" class="interact-bar-index"
+                    style="font-size: 12px;color: #6E7B84;display: flex;line-height: 30px;">
+                    <interactBar  :type="3" :readonly="true" :comments="false" :praises="false" :favorites="false"  :data="ca" :shares="false" :views="true"></interactBar>人观看
+                  </div>
+                  </div>
+
+                  <!-- -->
                 </div>
               </div>
             </div>
-            <!--内容列表内容-->
-            <div class="article-card-right" style="flex: 1;">
-              <div class="article-card-box" v-for="article in articleList.list" :key="article.id">
-                <div class="article-info-box">
-                  <div class="article-info">
-                    <div class="article-body" style="display:flex;">
-                      <div style="flex: 1;">
-                        <a :href="`${webBaseUrl}/article/detail?id=${article.id}`" style="font-weight: 700;font-size: 20px;">
-                          <div class="article-info-title" style="display:flex">
-                            <div class="two-line-ellipsis" style="flex:1;">
-                              <span style="font-weight: 700;font-size: 20px;">{{ article.title }}</span>
-                            </div>
-                            <div>
-                              <span class="article-info-time">{{ article.sysCreateTime.substring(0, 10) }}</span>
-                            </div>
-                            <!-- <a :href="`${webBaseUrl}/article/detail?id=${article.id}`" target="_blank" style="font-weight: 700;font-size: 20px;"> {{article.title}} </a> -->
-                          </div>
-                          <div style="display:flex;justify-content: space-between;">
-                            <div class="article-info-summary two-line-ellipsis">{{ article.summary }}</div>
-                          </div>
-                        </a>
-                        <div class="article-other-info">
-                          <div><authorInfo :avatar="article.authorInfo.avatar" :name="article.authorInfo.name" :sex="article.authorInfo.sex"></authorInfo></div>
-                          <div><interactBar :type="2" :readonly="true" :data="article" :views="false"></interactBar></div>
+          </div>
+        </div>
+        <div class="xcontent2-minor">
+          <div class="portal-ranking ranking-bg" style="margin-top:60px;padding-right:17px">
+            <p class="ranking-title">案例排行榜</p>
+            <ul class="xindex-ranking-case">
+              <li @click="jumcasedet(item)"  class="xindex-ranking-li title-line-ellipsis" v-for="(item, index) in Popularity" :key="'bb'+index" style="line-height: 22px;">
+                <span class="portal-right-text orange-one">
+                  <img :src="getPic(index)" alt="">
+                </span>
+                <span class="portal-title-desc two-line-ellipsis" style="font-size: 14px;color: #04243C;line-height: 26px;">{{ item.title }}</span>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <!-- 推荐文章 -->
+      <div class="modules xcontent2">
+        <div class="xcontent2-main xindex-main">
+          <div class="modules-title" style="margin-top:22px">
+            <span class="modules-text">推荐文章</span>
+            <span class="quyer-tag">
+              <a :class="articleList.orderType == 2 ? 'current' : ''" @click="changeArticleOrder(2)">最热</a>
+              <a :class="articleList.orderType == 1 ? 'current' : ''" @click="changeArticleOrder(1)">最新</a>
+            </span>
+            <span class="more">
+              <router-link to="/article">查看更多>></router-link>
+            </span>
+          </div>
+          <div class="modules-list">
+            <div class="article-card boe-article-index" style="display: flex;">
+              <!-- 首张 -->
+              <div class="article-card-left" v-if="articleList && articleList.first && articleList.first.id">
+                <div class="article-card-box">
+                  <a :href="`${webBaseUrl}/article/detail?id=${articleList.first.id}`"
+                    style="font-weight: 700;font-size: 20px;">
+                    <div class="article-info-image-box">
+                      <article-image height="100%" width="100%" :article="articleList.first"></article-image>
+                    </div>
+                    <div class="article-info">
+                     <div class="article-info-title " style="margin-top:10px">
+                        <div class="one-line-ellipsis">
+                          <span
+                            style="font-weight: 600;font-size: 16px;word-break:break-all;color: #00253E;">{{ articleList.first.title }}</span>
                         </div>
                       </div>
-                      <div v-if="article.coverurl != ''" class="article-image"><el-image style="width:100%;height:100%" :src="fileBaseUrl + article.coverurl"></el-image></div>
+                      <div class="article-info-index-summary index-tive-line-ellipsis"
+                        style="min-height: 160px;font-weight: 400;margin-top:14px;word-break:break-all;">{{ articleList.first.summary }}
+                      </div>
+                    </div>
+                  </a>
+                  <div>
+
+                  </div>
+                  <div class="article-info-time"
+                    style="font-size: 14px;color: #6E7B84;display:flex;justify-content: space-between;margin-top:16px">
+                    <span>{{ articleList.first && articleList.first.sysCreateTime && articleList.first.sysCreateTime.substring(0, 10) }}</span>
+                    <span><a :href="`${webBaseUrl}/article/detail?id=${articleList.first.id}`">查看详情</a></span>
+                  </div>
+                  <div class="article-other-info" style="margin-top:17px">
+                    <div>
+                      <author-img height="32px" width="32px" :avatar="articleList.first.authorInfo.avatar" :aid="articleList.first.authorInfo.aid"
+                        :sex="articleList.first.authorInfo.sex"></author-img>
+                    </div>
+                    <div style="margin-top:5px">
+                      <interactBar :type="2" :readonly="true" :data="articleList.first" :views="false" :shares="false">
+                      </interactBar>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <!--内容列表内容-->
+              <div class="article-card-right" style="flex: 1;">
+                <div class="article-card-box" v-for="article in articleList.list" :key="'a1'+article.id">
+                  <div class="article-li">
+                    <div class="article-img" v-if="article.coverurl != ''">
+                      <a :href="`${webBaseUrl}/article/detail?id=${article.id}`"
+                        style="font-weight: 700;font-size: 20px;">
+                        <el-image style="width:100%;height:100%" :src="fileBaseUrl + article.coverurl"></el-image>
+                      </a>
+                    </div>
+                    <div class="article-right">
+                      <a :href="`${webBaseUrl}/article/detail?id=${article.id}`"
+                        style="font-weight: 700;font-size: 20px;">
+                        <p class="article-info-title index-one-line-ellipsis">{{ article.title }}</p>
+                        <p class="article-info-summary two-line-ellipsis">{{ article.summary }}</p>
+                      </a>
+                      <div class="article-bottom">
+                        <div style="display:flex">
+                          <div>
+                            <author-img height="32px" width="32px" :avatar="article.authorInfo.avatar" :aid="article.authorInfo.aid" :sex="article.authorInfo.sex"></author-img>
+                          </div>
+                          <div>
+                            <span style="color: #6E7B84;font-size: 14px;margin:6px 13px 0 10px;">{{article.authorInfo.name}}</span>
+                          </div>
+                          <div style="padding-top: 0px;">
+                              <interactBar   :type="2" :readonly="true" :data="article" :views="false" :shares="false"></interactBar>
+                          </div>
+                        </div>
+                        <div><span class="article-info-time">{{ article.sysCreateTime.substring(0, 10) }}</span></div>
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
             </div>
           </div>
-        </el-card>
+        </div>
+        <!--内容块-->
+        <div class="xcontent2-minor">
+          <div style="margin-top:82px;padding-right:17px" class="portal-ranking ranking-bg">
+          <!-- 排行榜位置 -->
+            <p class="ranking-title">文章排行榜</p>
+            <ul class="xindex-ranking-article">
+              <li class="xindex-ranking-li" v-for="(item, index) in ankingList" :key="'a2'+item.id" style="line-height: 22px;">
+               <a style="display: inherit" :href="`${webBaseUrl}/article/detail?id=${item.id}`">
+                <span class="portal-right-text orange-one">
+                  <img :src="getPic(index)" alt="">
+                </span>
+                <span class="portal-index-summary two-line-ellipsis">{{ item.title }}</span>
+                </a>
+              </li>
+            </ul>
+          </div>
+        </div>
       </div>
       <!-- 推荐问答 -->
-      <div class="modules">
-        <!--内容块-->
-        <div class="modules-title">
-          <!-- <img :src="`${webBaseUrl}/images/recommend_qa.png`" class="recommend" /> -->
-          <span class="modules-text">推荐问答</span>
-          <span class="quyer-tag">
-              <a :class="qaList.orderType == 'praises' ? 'current' : ''" @click="changeQaOrder('praises')">最热</a>
-            <a :class="qaList.orderType == '' ? 'current' : ''" @click="changeQaOrder('')">最新</a>
-
-          </span>
-          <span class="more"><router-link to="/qa">更多&nbsp;></router-link></span>
-        </div>
-        <el-row :gutter="15" class="modules-list">
-          <!--内容列表内容-->
-          <el-col :span="12" v-for="qa in qaList.list" :key="qa.id">
-            <el-card class="qa-card" :body-style="{ padding: '16px' }">
-              <div @click="jumpRouter(qa)" class="qa-info-box">
-                <div class="qa-info">
-                  <div class="qa-info-title">
-                    <span class="one-line-ellipsis qa-info-shrink" style="font-weight: 700;font-size: 20px;">
-                      <!-- <span class="qa-dai" >【待解决】</span> -->
-                      <!-- <span v-if="qa.isResolve ==true" class="text-status1">【已解决】</span> -->
-                      <span class="text-status3">【待解决】</span>
-                      {{ qa.title }}
-                    </span>
-                    <span class="qa-info-time">{{ qa.sysCreateTime.substring(0, 10) }}</span>
+      <div class="modules xcontent2">
+        <div class="xcontent2-main xindex-main">
+          <!--内容块-->
+          <div class="modules-title" style="margin-top:22px">
+            <span class="modules-text">推荐问答</span>
+            <span class="quyer-tag">
+              <a :class="qaList.orderType == 'views' ? 'current' : ''" @click="changeQaOrder('views')">最热</a>
+              <a :class="qaList.orderType == '' ? 'current' : ''" @click="changeQaOrder('')">最新</a>
+            </span>
+            <span class="more">
+              <router-link to="/qa">查看更多>></router-link>
+            </span>
+          </div>
+          <div class="modules-list">
+            <!--内容列表内容-->
+            <div class="xindex-qa" v-for="qa in qaList.list" :key="'qa'+qa.id">
+              <div class="qa-card boe-qa-index" >
+                <p class="qa-top"><span>{{formatNum(qa.views)}}正在关注</span><span>{{ qa.sysCreateTime.substring(0, 10) }}</span></p>
+                <div class="qa-center">
+                  <p class="one-line-ellipsis portal-index-title" style="color:#181818;">{{ qa.title }}</p>
+                  <p class="boe-qa-sum two-line-ellipsis" style="color:#6E7B84;">{{ qa.content }}</p>
+                  <p class="qa-views pointer" @click="jumpRouter(qa)">查看详情</p>
+                </div>
+                <div class="qa-char">
+                  <author-img :avatar="qa.authorInfo.avatar" :aid="qa.authorInfo.aid" :sex="qa.authorInfo.sex">
+                  </author-img>
+                  <div>
+                    <p class="info-name">{{qa.authorInfo.name}}</p>
+                    <p class="info-bar">
+                      <interactBar :type="4" :readonly="true" :data="qa" :comments="false" :answers="true"
+                        :shares="false" :praises="false" :views="false"></interactBar>
+                    </p>
                   </div>
-                  <div class="qa-info-summary two-line-ellipsis">{{ qa.content }}</div>
                 </div>
               </div>
-              <div class="qa-other-info">
-                <div><authorInfo :avatar="qa.authorInfo.avatar" :name="qa.authorInfo.name" :sex="qa.authorInfo.sex"></authorInfo></div>
-                <div><interactBar :type="4" :readonly="true" :praises="true" :data="qa" :comments="false" :answers="true" :shares="true" :views="false"></interactBar></div>
-              </div>
-            </el-card>
-          </el-col>
-        </el-row>
+            </div>
+          </div>
+        </div>
+        <div  class="xcontent2-minor">
+          <!-- 排行榜 -->
+          <div class="portal-ranking ranking-bg" style="margin-top:80px;padding-right:17px">
+            <p class="ranking-title">问答排行榜</p>
+            <ul class="xindex-ranking-qa">
+              <li @click="jumpRouter(item)" class="xindex-ranking-li" v-for="(item, index) in answersList" :key="'q'+item.id" style="line-height: 22px;">
+                <span class="portal-right-text orange-one">
+                  <img :src="getPic(index)" alt="">
+                </span>
+                <span class="portal-index-summary two-line-ellipsis">{{ item.title }}</span>
+              </li>
+            </ul>
+          </div>
+        </div>
       </div>
     </div>
-    <div><a href="course/boeframe?id=517CA622-238E-06BA-0AED-B1200D705800&type=online-course">&nbsp;&nbsp;&nbsp;</a></div>
+    <div><a href="course/boeframe?id=517CA622-238E-06BA-0AED-B1200D705800&type=online-course">&nbsp;&nbsp;&nbsp;</a>
+    </div>
     <portal-footer></portal-footer>
     <portalFloatTools></portalFloatTools>
+    <interest-Collection ref="userCollection" @close="closeCollection"></interest-Collection> <!-- 兴趣偏好 -->
+    <guide-box ref="guide" @close="closeGuide"></guide-box> <!-- 引导页 -->
+    <!-- <medalDlg></medalDlg> -->
+    <!--登录勋章-->
+    <el-dialog width="540px"  class="medalbox"  :visible.sync="showLoginMedal"  :append-to-body="true" >
+        <div class="jinian-medal-img" :style="`background: url(${webBaseUrl}/images/jinian_medal.png) no-repeat;`">
+           <!--登录勋章显示，根据UI显示修改-->
+           <span style="position: absolute; right:60px;top:60px;cursor: pointer;">
+             <img @click="closeJinian" :src="`${webBaseUrl}/images/close.png`" width="26px" height="26px" alt="">
+           </span>
+           <div style="text-align: center;"><img :src="`${webBaseUrl}/images/login_medal.png`" width="206px" height="269px" alt=""></div>
+           <div style="text-align: left;padding:20px 60px 100px 60px">
+             <div class="jntext1">感谢有你 一路相伴</div>
+             <div class="jntext2">勋章领取条件:</div>
+             <div class="jntext3">2022年10月31日-11月15日登录过平台学习的校友</div>
+           </div>
+        </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
-import portalHeader from '@/components/PortalHeader.vue';
-import portalFooter from '@/components/PortalFooter.vue';
-import portalFloatTools from '@/components/PortalFloatTools.vue';
-import authorInfo from '@/components/Portal/authorInfo.vue';
-import apiCourse from '@/api/modules/coursePortal.js';
-import apiCase from '@/api/modules/cases.js';
-import apiArticle from '@/api/modules/article.js';
-import apiQa from '@/api/modules/qa.js';
-import apiUser from '@/api/system/user.js';
-import apiCoursePortal from '@/api/modules/coursePortal.js';
-import interactBar from '@/components/Portal/interactBar.vue';
-import ad from '@/components/Portal/adFloat.vue';
-import interactRowBar from '@/components/Portal/interactRowBar.vue';
-import courseImage from '@/components/Course/courseImage.vue';
-import articleImage from '@/components/Article/articleImage.vue';
-import { toScore,cutFullName} from '@/utils/tools.js';
-export default {
-  name: 'index',
-  components: { portalHeader,ad, portalFooter, articleImage, portalFloatTools, authorInfo, interactRowBar, interactBar, courseImage },
-  computed: {
-    ...mapGetters(['userInfo'])
-  },
-  data() {
-    return {
-      couname:'',
-      isNext: true,
-      pageIndex: 1,
-      fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
-      toScore,
-      courseList: {
-        num: 12,
-        orderType: 2,
-        list: []
-      },
-      caseList: {
-        num: 6,
-        orderType: 2,
-        list: []
-      },
-      articleList: {
-        num: 4,
-        orderType: 2,
-        first: { id: '', authorInfo: {} },
-        list: []
-      },
-      qaList: {
-        num: 4,
-        orderType: 'praises',
-        list: []
+  import { mapGetters } from 'vuex';
+  import apiCourseStudy from "@/api/modules/courseStudy.js"
+  import portalHeader from '@/components/PortalHeader.vue';
+  import portalFooter from '@/components/PortalFooter.vue';
+  import portalFloatTools from '@/components/PortalFloatTools.vue';
+  import authorInfo from '@/components/Portal/authorInfo.vue';
+  import apiCourse from '@/api/modules/coursePortal.js';
+  import apiCase from '@/api/modules/cases.js';
+  import apiArticle from '@/api/modules/article.js';
+  import apiQa from '@/api/modules/qa.js';
+  import apiGuide from "@/api/phase2/guide.js";
+  import apiUser from '@/api/system/user.js';
+  import apiCoursePortal from '@/api/modules/coursePortal.js';
+  import interactBar from '@/components/Portal/interactBar.vue';
+  import ad from '@/components/Portal/adFloat.vue';
+  import courseImage from '@/components/Course/courseImage.vue';
+  import articleImage from '@/components/Article/articleImage.vue';
+  import InterestCollection from '@/components/Portal/interestCollection.vue'
+  import GuideBox from '@/components/Portal/guideBox.vue'
+  import medalDlg from '@/components/Portal/medalDlg.vue'
+  import { toScore,formatUserNumber,cutOrgNamePath} from '@/utils/tools.js';
+  import {swiper,swiperSlide} from 'vue-awesome-swiper';
+  import apiPlace from "@/api/phase2/place.js"
+  import authorImg from '@/components/Portal/authorImg.vue';
+  import apiStat from '@/api/phase2/stat.js'
+  import apiIndex from '@/api/phase2/index.js'
+  import apiUserhobby from "@/api/phase2/userhobby.js"
+  export default {
+    name: 'index',
+    components: {
+      authorImg,
+      portalHeader,
+      ad,
+      portalFooter,
+      articleImage,
+      portalFloatTools,
+      authorInfo,
+      interactBar,
+      courseImage,
+      InterestCollection,
+      GuideBox,
+      medalDlg
+    },
+    created() {
+      this.$store.dispatch('refrashStudyTaskCount');
+      let $this=this;
+      //判断是否弹出登录勋章，设置截止日期
+      var nowDate = new Date();
+      var endDate = new Date('2022-11-18');//先设置时间是11月18日
+      if(nowDate<endDate){
+        apiStat.getUserLoginMedal().then(rs=>{
+           if(rs.status==200){
+              if(rs.result.show){
+                //设置是否需要显示纪念勋章
+                $this.needLoginMedal=true;
+              }
+           }
+        })
       }
-    };
-  },
-  mounted() {
-    this.getCourseData(1);
-    this.getCaseData();
-    this.getArticleData();
-    this.getQaData();
-  },
-  methods: {
-    jumUX(){
-     window.open('https://m.qingxuetang.com/x/?appId=qxtcorp306130','_blank');
-    },
-    toCourseDetail(item) {
-      if (item.type == 10) {
-        return this.webBaseUrl + '/course/micro?id=' + item.id;
-      } else if (item.type == 20) {
-        return this.webBaseUrl + '/course/detail?id=' + item.id;
-      }
-      return '';
-    },
-    orderTypeFilter(val) {
-      this.courseList.orderType = val;
-      this.pageIndex = 1;
-      this.getCourseData();
-    },
-    nextPage() {
-      this.pageIndex += 1;
-      if (this.isNext) {
-        this.getCourseData(this.pageIndex);
-      }
-    },
-    getCourseData(pageIndex) {
-      this.isNext = false;
-      let { orderType, num } = this.courseList;
-      let course = {
-        pageSize: num,
-        device:1,
-        orderField: orderType == 1 ? '' : 'studys',
-        orderAsc: false,
-        topOrder:true,
-        pageIndex: pageIndex
-      };
+      //提取需要提示勋章
+      // apiStat.getUserMedalTips().then(res=>{
+      //    if(res.status==200){
+      //       $this.medalTips=res.result;
+      //    }
+      // })
 
-      apiCoursePortal.pageList(course).then(res => {
-        if (res.status == 200 && res.result.list.length > 0) {
-          let courseIds = [];
-          res.result.list.forEach(item => {
-            item.authorInfo = { aid: '', name: '', orgInfo: '', avatar: '', code: '' ,sex:null};
-            courseIds.push(item.id);
-          });
-          this.loadCouserTeacher(res.result.list, courseIds);
-          this.courseList.list=res.result.list;
-          this.couname = res.result.list.name;
-          if(res.result.count - pageIndex * num < 8) {
-            this.pageIndex = 0;
-          }
-          this.isNext = true;
-          // }
-        } else {
-          console.log('加载课程信息失败:' + res.error);
+    },
+    data() {
+      return {
+        showLoginMedal:false,//是否显示登录勋章
+        needLoginMedal:false,//是否需要显示纪念勋章
+        medalTips:[
+            {medalId:1,medalLevel:5,isShow:false},
+            {medalId:3,medalLevel:4,isShow:false}
+        ],
+        lastStudy:{},
+        overlayShow:false,
+        userData: {  uvalue:0, totalStudyHour:0},
+        userHobby:{
+          needShow:false,
+          localKeyPre:'user-hobby-' //本地存储的key
+        },
+        needHobbyShow:false,//是否显示兴趣爱好
+        formatNum:formatUserNumber,
+        cutOrgNamePath:cutOrgNamePath,
+        // userInfo: {},
+        ankingList: [],
+        answersList: [],
+        Popularity: [],
+        scorelist: [],
+        resonimg: [],
+          swiperOptiontwo: {
+          autoplay: false,
+          // noSwiping: true,
+        },
+        swiperOption: {
+          autoplay:{
+              delay:2000,
+              disableOnInteraction:false, //解决滑动后不能轮播的问题
+        },
+          speed: 3000, //切换速度，即slider自动滑动开始到结束的时间（单位ms）
+          loop: true, //循环切换
+          peed: 300, //循环速度
+          scrollbar: '.swiper-scrollbar',
+          pagination: {
+      	     el: '.swiper-pagination',
+            // type : 'progressbar', //分页器形状
+            clickable: true, //点击分页器的指示点分页器会控制Swiper切换
+          },
+          navigation: {
+   	        nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+          },
+        },
+
+        couname: '',
+        isNext: true,
+        pageIndex: 1,
+        fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
+        toScore,
+        courseList: {
+          num: 12,
+          orderType: 2,
+          list: []
+        },
+        caseList: {
+          num: 3,
+          orderType: 2,
+          list: []
+        },
+        articleList: {
+          num: 4,
+          orderType: 2,
+          first: {
+            id: '',
+            authorInfo: {}
+          },
+          list: []
+        },
+        qaList: {
+          num: 4,
+          orderType: 'views',
+          list: []
         }
-
-      });
-
-
-      // apiCourse.list({orderType,num,device:1}).then(res => {
-      //     if(res.status==200){
-      //       if(res.result.length>0){
-      //         let courseIds=[];
-      //         res.result.forEach(item=>{
-      //           item.authorInfo={aid:'',name:'',orgInfo:'',avatar:'',code:''};
-      //           courseIds.push(item.id);
-      //         })
-      //         this.loadCouserTeacher(res.result,courseIds);
-      //         this.courseList.list=res.result;
-      //       }
-      //     }else{
-      //       console.log('加载课程信息失败:'+res.error);
-      //     }
-      //   })
+      };
     },
-    changeCaseOrder(val) {
-      this.caseList.orderType = val;
+    mounted() {
+      this.getCourseData(1);
       this.getCaseData();
-    },
-    getCaseData() {
-      let params = {
-        pageSize: this.caseList.num,
-        orderAsc: false,
-        orderField: 'id'
-      };
-      if (this.caseList.orderType == 2) {
-        params.orderField = 'comments';
-      }
-      apiCase.indexList(params).then(res => {
-        if (res.status == 200) {
-          if (res.result.length > 0) {
-            let userIds = [];
-            res.result.forEach(item => {
-              item.authorInfo = { aid: '', name: '', orgInfo: '', avatar: '', code: '',sex:null };
-
-              if (item.authorId && item.authorId != '') {
-                userIds.push(item.authorId);
-              }
-            });
-            this.caseList.list = res.result;
-            this.loadCaseAuthorInfo(res.result, userIds);
-          }
-          // this.caseList.list = res.result;
-        } else {
-          console.log('加载案例错误：' + res.error);
-        }
-      });
-    },
-    loadCaseAuthorInfo(list, ids) {
-      //加载作者信息，头像，机构信息
-      if (ids.length == 0) {
-        return;
-      }
-      const noReapetIds = [...new Set(ids)];
-      apiUser.getByIds(ids).then(res => {
-        if (res.status == 200) {
-          list.forEach((item, index) => {
-            res.result.some(author => {
-              if (author.aid == item.authorId) {
-                author.orgInfo=cutFullName(author.orgInfo,1);
-                item.authorInfo = author;
-
-                return true;
-              } else {
-                return false;
-              }
-            });
-          });
-        } else {
-          console.log('加载用户信息失败:' + res.error);
-          //this.$message.error(res.message);
-        }
-      });
-    },
-    getArticleData() {
-      let $this = this;
-      this.articleList.list = [];
-      apiArticle.portalList(this.articleList.num, this.articleList.orderType).then(res => {
-        if (res.status == 200) {
-          if (res.result.length > 0) {
-            let userIds = [];
-            res.result.forEach((item, idx) => {
-              item.authorInfo = { aid: '', name: '', orgInfo: '', avatar: '', code: '' ,sex:null,};
-              userIds.push(item.sysCreateAid);
-              if (idx == 0) {
-                $this.articleList.first = item;
-              } else {
-                $this.articleList.list.push(item);
-              }
-            });
-
-            this.loadAuthorInfo(res.result, userIds);
-          }
-        } else {
-          console.log('加载文章错误：' + res.error);
-        }
-      });
-    },
-    changeArticleOrder(val) {
-      this.articleList.orderType = val;
       this.getArticleData();
-    },
-    getQaData() {
-      let params = {
-        pageSize: this.qaList.num,
-        orderAsc: false,
-        orderField: this.qaList.orderType
-      };
-      // if (this.qaList.orderType == 2) {
-      //   params.orderField = 'praises';
-      // }
-      apiQa.indexList(params).then(res => {
-        if (res.status == 200) {
-          if (res.result.length > 0) {
-            let userIds = [];
-            res.result.forEach(item => {
-              item.authorInfo = { aid: '', name: '', orgInfo: '', avatar: '', code: '',sex:null, };
-              userIds.push(item.sysCreateAid);
-            });
-            this.qaList.list = res.result;
-            this.loadAuthorInfo(res.result, userIds);
-          }
-        } else {
-          console.log('加载问答错误：' + res.error);
-        }
-        //console.log(res)
-      });
-    },
-    changeQaOrder(val) {
-      this.qaList.orderType = val;
       this.getQaData();
-    },
-    loadCouserTeacher(list, ids) {
-      let that = this;
-      // 先查课程关联教师iD
-      apiCourse.getTeacherByCourseIDs(ids).then(cres => {
-        if (cres.status == 200) {
-          let userIds = [];
-          list.forEach((item, index) => {
-            cres.result.some(courseTeahcer => {
-              if (courseTeahcer.courseId == item.id) {
-                if (courseTeahcer.teacherIds) {
-                  userIds.push(courseTeahcer.teacherIds[0]);
-                  item.authorInfo.aid = courseTeahcer.teacherIds[0];
-                  item.authorInfo.name = courseTeahcer.names[0];
-                  if(item.authorInfo.name=='BOE教师'){
-                    item.authorInfo.name='';
-                  }
-                }
-                return true;
-              } else {
-                return false;
-              }
-            });
-          });
-          //that.loadCourseAuthorInfo(list, userIds);
-        }
-      });
-    },
-    loadCourseAuthorInfo(list, ids) {
-      //加载作者信息，头像，机构信息
-      if (ids.length == 0) {
-        return;
-      }
-      const noReapetIds = [...new Set(ids)];
-      apiUser.getByIds(ids).then(res => {
-        if (res.status == 200) {
-          list.forEach((item, index) => {
-            res.result.some(author => {
-              if (author.aid == item.authorInfo.aid) {
-                item.authorInfo = author;
+      this.couresreso();
+      this.getScoreList();
+      this.getPopularity();
+      this.getAnkingData();
+      this.getLevel();
+      this.getQaAnswers();
+      this.getLastStudy();
 
-                return true;
-              } else {
-                return false;
-              }
-            });
-          });
-        } else {
-          console.log('加载用户信息失败:' + res.error);
-          //this.$message.error(res.message);
-        }
-      });
-    },
-    loadAuthorInfo(list, ids) {
-      //加载作者信息，头像，机构信息
-      if (ids.length == 0) {
-        return;
+      //检查兴趣爱好是否已填报,
+      //先检查本地session和 local 15天, 这两个值是在组件中设置的
+      let sessionHobby=sessionStorage.getItem('user-hobby-'+this.userInfo.aid);
+      let localHobbyTime=localStorage.getItem('notYet'+this.userInfo.aid);
+      if(!sessionHobby){ //只有session中不存在，才会验证
+          //本地15天验证,localHobby,后续完善
+            let flag=true;//请求检查
+            if(localHobbyTime) {
+                let day = (new Date() - new Date(localHobbyTime))/(1000*60*60*24);
+                if(day< 15){
+                  flag = false;
+                }
+            }
+            if(flag){
+              apiUserhobby.has().then(res=>{
+                if(res.status == 200) {
+                   if(!res.result){
+                     //设置需要显示兴趣爱好收集窗口
+                     this.userHobby.needShow=true;
+                   }
+                }else{
+                  console.log('兴趣爱好检查失败'+res.message);
+                }
+                //检查引导页
+                this.checkAndShowGuide();
+              });
+            }else{
+              this.checkAndShowGuide();
+            }
+      }else{
+         //检查引导页
+         this.checkAndShowGuide();
       }
-      const noReapetIds = [...new Set(ids)];
-      apiUser.getByIds(ids).then(res => {
-        if (res.status == 200) {
-          list.forEach((item, index) => {
-            res.result.some(author => {
-              if (author.aid == item.sysCreateAid) {
-                item.authorInfo = author;
-                return true;
-              } else {
-                return false;
-              }
-            });
-          });
-        } else {
-          console.log('加载用户信息失败:' + res.error);
-          //this.$message.error(res.message);
-        }
-      });
+      //this.$refs.userCollection.show();
     },
-    jumpRouter(item) {
-      // window.open(`${this.webBaseUrl}/qa/answer?id=${item.id}`)
-      this.$router.push({ path: '/qa/answer', query: { id: item.id } });
+    computed: {
+       ...mapGetters(['userInfo','studyTaskCount']),
+      swiper() {
+        return this.$refs.mySwiper.swiper
+      }
+    },
+    methods: {
+      setCurIdentity(iden){
+        this.$store.dispatch('SetCurIdentity',iden);
+      },
+      closeJinian(){
+        this.showLoginMedal=false;
+      },
+      banJump(item) {
+        window.open(item.JumpUrl);
+      },
+      //上次学习记录
+      getLastStudy() {
+				apiCourseStudy.lastStudy().then(res => {
+					if (res.status === 200) {
+						this.lastStudy = res.result;
+						if (res.result != '' && res.result.courseId) {
+							this.overlayShow = true;
+						}
+					} else {
+						this.$message.error(res.message);
+					}
+				})
+			},
+      //检查并弹出引导页
+      checkAndShowGuide(){
+        //引导页弹框是否显示
+        //检查本地,减少服务器请求的次数
+        let localGuide=localStorage.getItem('user-guide-'+this.userInfo.aid);
+        if(!localGuide){
+          apiGuide.hasUser().then(res=>{
+            if(res.status==200){
+              if(!res.result){
+                this.$refs.guide.show();
+              }else{
+                if(this.userHobby.needShow){ this.$refs.userCollection.show();}
+              }
+              localStorage.setItem('user-guide-'+this.userInfo.aid,1);
+            }else{
+              console.log('获取引导页检查失败'+res.message);
+              //this.$message.error('')
+              if(this.userHobby.needShow){this.$refs.userCollection.show();}
+            }
+          });
+        }else {
+          if(this.userHobby.needShow){ this.$refs.userCollection.show();}
+        }
+
+        //测试情况下
+        // this.$refs.guide.show();
+      },
+      closeGuide(){ //关闭引导页
+         if(this.userHobby.needShow){
+            //需要弹出兴趣收集页，弹出兴趣收集页
+            this.$refs.userCollection.show();
+         }
+      },
+      closeCollection(){
+        if(this.needLoginMedal){
+           this.showLoginMedal=true;
+        }
+      },
+      jumstudy(){
+      this.$router.push({path:'../views/study/TaskList.vue'});
+      },
+      jumcasedet(item) {
+      this.$router.push({path:'/case/detail',query:{id:item.id}});
+    },
+      getPic(index) {
+        return this.webBaseUrl+'/images/listblue0'+(index+1)+'.png';
+      },
+      getLevel() { //获取经验值和等级
+        apiStat.getUserStatTotalInfo(this.userInfo.aid).then(res => {
+          if (res.status == 200) {
+            this.userData = res.result;
+            //console.log(this.userData,'this.userData')
+          }
+        });
+      },
+      getQaAnswers() {
+        apiIndex.qaAnswers(10).then(res => {
+          if (res.status == 200) {
+            this.answersList = res.result;
+          }
+        })
+
+      },
+      getAnkingData() { //  文章排行榜
+        apiIndex.articleViews(10).then(res => {
+          if (res.status == 200) {
+            this.ankingList = res.result;
+          }
+        });
+      },
+      getPopularity() { //案例排行榜
+        apiCase.queryPraises(10).then(res => {
+          if (res.status == 200) {
+            this.Popularity = res.result;
+            // console.log(this.Popularity)
+          }
+        });
+      },
+      getScoreList() { //课程排行榜
+        apiCourse.scorelist(10,1).then(res => {
+          if (res.status == 200) {
+            res.result.forEach(item => {
+              if (item.publishTime != '') {
+                item.coverImg=item.images;
+                let time = item.publishTime.split('-');
+                item.publishTime = `${time[0]}年${time[1]}月${time[2]}日`
+              }
+            })
+            this.scorelist = res.result;
+            //console.log(this.scorelist,'this.scorelist');
+          }
+        });
+      },
+      // bgfun(){
+      //  console.log(this.$refs.bannimg[0]);
+      //  this.$nextTick(() => {
+      // 		console.log(this.$refs.bannimg[0])
+      // 	})
+      // },
+      couresreso() {
+        let key = 'index';
+        apiPlace.detail(key).then(res => {
+          let lmj = JSON.parse(res.result.content)
+          this.resonimg = lmj;
+        })
+      },
+      jumUX() {
+        window.open('https://m.qingxuetang.com/x/?appId=qxtcorp306130', '_blank');
+      },
+      toCourseDetail(item) {
+        //二期调整，直接改成一个地址
+        //return this.webBaseUrl + '/course/detail?id=' + item.id;
+        console.log(item,"item");
+        let $this=this;
+       if (item.type == 10) {
+          //return this.webBaseUrl + "/course/studyindex?id=" + item.id;
+          //console.log("直接进入学习页面");
+          this.$router.push("/course/studyindex?id=" + item.id);
+       } else if (item.type == 20) {
+         apiCourseStudy.hasSignup(item.id).then(rs=>{
+            if(rs.status==200){
+              //return $this.webBaseUrl + "/course/studyindex?id=" + item.id;
+              this.$router.push("/course/studyindex?id=" + item.id);
+            }else{
+              //return $this.webBaseUrl + "/course/detail?id=" + item.id;
+              this.$router.push("/course/detail?id=" + item.id);
+            }
+         })
+        //return $this.webBaseUrl + "/course/detail?id=" + item.id;
+       }
+
+      },
+      orderTypeFilter(val) {
+        this.courseList.orderType = val;
+        this.pageIndex = 1;
+        this.getCourseData();
+      },
+      nextPage() {
+        this.pageIndex += 1;
+        if (this.isNext) {
+          this.getCourseData(this.pageIndex);
+        }
+      },
+      getCourseData(pageIndex) {
+        this.isNext = false;
+        let {
+          orderType,
+          num
+        } = this.courseList;
+        let course = {
+          pageSize: 6,
+          device: 1,
+          orderField: orderType == 1 ? '' : 'studys',
+          orderAsc: false,
+          topOrder: true,
+          pageIndex: pageIndex
+        };
+
+        apiIndex.courselist(course).then(res => {
+          if (res.status == 200 && res.result.length > 0) {
+            let courseIds = [];
+            res.result.forEach(item => {
+              item.authorInfo = {
+                aid: '',
+                name: '',
+                orgInfo: '',
+                avatar: '',
+                code: '',
+                sex: null
+              };
+              courseIds.push(item.id);
+            });
+            this.loadCouserTeacher(res.result, courseIds);
+            this.courseList.list = res.result;
+            //this.couname = res.result.list.name;
+            // if (res.result.count - pageIndex * num < 8) {
+            //   this.pageIndex = 0;
+            // }
+            // this.isNext = true;
+
+
+            // }
+          } else {
+            console.log('加载课程信息失败:' + res.error);
+          }
+
+        });
+
+
+        // apiCourse.list({orderType,num,device:1}).then(res => {
+        //     if(res.status==200){
+        //       if(res.result.length>0){
+        //         let courseIds=[];
+        //         res.result.forEach(item=>{
+        //           item.authorInfo={aid:'',name:'',orgInfo:'',avatar:'',code:''};
+        //           courseIds.push(item.id);
+        //         })
+        //         this.loadCouserTeacher(res.result,courseIds);
+        //         this.courseList.list=res.result;
+        //       }
+        //     }else{
+        //       console.log('加载课程信息失败:'+res.error);
+        //     }
+        //   })
+      },
+      changeCaseOrder(val) {
+        this.caseList.orderType = val;
+        this.getCaseData();
+      },
+      getCaseData() {
+        apiIndex.cases(this.caseList.orderType).then(res => {
+          if (res.status == 200) {
+            if (res.result.length > 0) {
+              let userIds = [];
+              res.result.forEach(item => {
+                item.authorInfo = {
+                  aid: '',
+                  name: '',
+                  orgInfo: '',
+                  avatar: '',
+                  code: '',
+                  sex: null
+                };
+
+                if (item.authorId && item.authorId != '') {
+                  userIds.push(item.authorId);
+                }
+              });
+              this.caseList.list = res.result;
+              this.loadCaseAuthorInfo(res.result, userIds);
+            }
+            // this.caseList.list = res.result;
+          } else {
+            console.log('加载案例错误：' + res.error);
+          }
+        });
+      },
+      loadCaseAuthorInfo(list, ids) {
+        //加载作者信息，头像，机构信息
+        if (ids.length == 0) {
+          return;
+        }
+        const noReapetIds = [...new Set(ids)];
+        apiUser.getByIds(ids).then(res => {
+          if (res.status == 200) {
+            list.forEach((item, index) => {
+              res.result.some(author => {
+                if (author.aid == item.authorId) {
+                  author.orgInfo = cutOrgNamePath(author.orgInfo, 1);
+                  item.authorInfo = author;
+
+                  return true;
+                } else {
+                  return false;
+                }
+              });
+            });
+          } else {
+            console.log('加载用户信息失败:' + res.error);
+            //this.$message.error(res.message);
+          }
+        });
+      },
+      getArticleData() {
+        let $this = this;
+        this.articleList.list = [];
+        apiIndex.articlelist(this.articleList.orderType).then(res => {
+          if (res.status == 200) {
+            if (res.result.length > 0) {
+              let userIds = [];
+              res.result.forEach((item, idx) => {
+                item.authorInfo = {
+                  aid: '',
+                  name: '',
+                  orgInfo: '',
+                  avatar: '',
+                  code: '',
+                  sex: null,
+                };
+                userIds.push(item.sysCreateAid);
+                if (idx == 0) {
+                  $this.articleList.first = item;
+                } else {
+                  $this.articleList.list.push(item);
+                }
+              });
+              // console.log(res.result, 'res.result');
+              this.loadAuthorInfo(res.result, userIds);
+            }
+          } else {
+            console.log('加载文章错误：' + res.error);
+          }
+        });
+      },
+      changeArticleOrder(val) {
+        this.articleList.orderType = val;
+        this.getArticleData();
+      },
+      getQaData() {
+        let params = {
+          pageSize: this.qaList.num,
+          orderAsc: false,
+          orderField: this.qaList.orderType
+        };
+        // if (this.qaList.orderType == 2) {
+        //   params.orderField = 'praises';
+        // }
+        apiQa.indexList(params).then(res => {
+          if (res.status == 200) {
+            if (res.result.length > 0) {
+              let userIds = [];
+              res.result.forEach(item => {
+                item.authorInfo = {
+                  aid: '',
+                  name: '',
+                  orgInfo: '',
+                  avatar: '',
+                  code: '',
+                  sex: null,
+                };
+                userIds.push(item.sysCreateAid);
+              });
+              this.qaList.list = res.result;
+              this.loadAuthorInfo(res.result, userIds);
+            }
+          } else {
+            console.log('加载问答错误：' + res.error);
+          }
+          //console.log(res)
+        });
+      },
+      changeQaOrder(val) {
+        this.qaList.orderType = val;
+        this.getQaData();
+      },
+      loadCouserTeacher(list, ids) {
+        let that = this;
+        // 先查课程关联教师iD
+        apiCourse.getTeacherByCourseIDs(ids).then(cres => {
+          if (cres.status == 200) {
+            let userIds = [];
+            list.forEach((item, index) => {
+              cres.result.some(courseTeahcer => {
+                if (courseTeahcer.courseId == item.id) {
+                  if (courseTeahcer.teacherIds) {
+                    userIds.push(courseTeahcer.teacherIds[0]);
+                    item.authorInfo.aid = courseTeahcer.teacherIds[0];
+                    item.authorInfo.name = courseTeahcer.names[0];
+                    if (item.authorInfo.name == 'BOE教师') {
+                      item.authorInfo.name = '';
+                    }
+                  }
+                  return true;
+                } else {
+                  return false;
+                }
+              });
+            });
+            //that.loadCourseAuthorInfo(list, userIds);
+          }
+        });
+      },
+      loadCourseAuthorInfo(list, ids) {
+        //加载作者信息，头像，机构信息
+        if (ids.length == 0) {
+          return;
+        }
+        const noReapetIds = [...new Set(ids)];
+        apiUser.getByIds(ids).then(res => {
+          if (res.status == 200) {
+            list.forEach((item, index) => {
+              res.result.some(author => {
+                if (author.aid == item.authorInfo.aid) {
+                  item.authorInfo = author;
+
+                  return true;
+                } else {
+                  return false;
+                }
+              });
+            });
+          } else {
+            console.log('加载用户信息失败:' + res.error);
+          }
+        });
+      },
+      loadAuthorInfo(list, ids) {
+        //加载作者信息，头像，机构信息
+        if (ids.length == 0) {
+          return;
+        }
+        const noReapetIds = [...new Set(ids)];
+        apiUser.getByIds(ids).then(res => {
+          if (res.status == 200) {
+            list.forEach((item, index) => {
+              res.result.some(author => {
+                if (author.aid == item.sysCreateAid) {
+                  item.authorInfo = author;
+                  return true;
+                } else {
+                  return false;
+                }
+              });
+            });
+          } else {
+            console.log('加载用户信息失败:' + res.error);
+          }
+        });
+      },
+      jumpRouter(item) {
+        this.$router.push({
+          path: '/qa/answer',
+          query: {
+            id: item.id
+          }
+        });
+      }
     }
   }
-};
 </script>
 
 <style scoped lang="scss">
-.case-orginfo{
-  // line-height: 25px;
-  height: 45px;
+.Recent{
+  vertical-align: top;
+  width: 22px;
+  height: 22px;
 }
-.three-line-ellipsis {
-    overflow: hidden;
-    text-overflow: ellipsis;
-     box-sizing: border-box;
-  -webkit-line-clamp: 3;
-    word-break: break-all;
-     display: -webkit-box;
-  -webkit-box-orient: vertical;
-}
-.casetwo{
-  border: 1px solid #F0F0F0;
-  width: 100%;
-  height: 245px;
-  margin-bottom:15px;
- position: relative;
-  background-color: #fff;
-  .case-top{
-    height: 70px;
-     background-image: linear-gradient(to right , #b8c7e2, #d0dcf3);
+.jinian-medal-img{
+  text-align: center;
+  padding-top: 10px;
+  .jntext1{
+    height: 56px;
+    font-size: 40px;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 600;
+    color: #924504;
+    line-height: 56px;
   }
-  .case-conent{
+  .jntext2{
+    margin-top: 30px;
+    height: 30px;
+    font-size: 22px;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 600;
+    color: #924504;
+    line-height: 30px;
+  }
+  .jntext3{
+    margin-top: 10px;
+    height: 50px;
+    font-size: 18px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #924504;
+    line-height: 25px;
+  }
+}
+.medalbox {
+  background: transparent !important;
+ ::v-deep .el-dialog{
+   background: transparent !important;
+   box-shadow:none !important;
+   .el-dialog__header{
+     display: none !important;
+   }
+   .el-dialog__body{
+    //  width: 320px !important;
+    //  height: 420px !important;
+    background: transparent !important;
+   }
+}
+}
+
+
+
+.case-inter-orgin{
+  // width: 45%;
+  float: left;
+  margin-left: 5px;
+  line-height: 30px;
+  font-size: 14px;
+  color: #6E7B84;
+}
+.tobe-icon{
+  width: 8px;
+  height: 14px;
+  margin-top: 1.5px;
+  margin-left: 8px;
+}
+.grade{
+  width: 70px;
+  height: 30px;
+  display: inline-block;
+  font-size: 16px;
+  color: #9D6110;
+  line-height: 30px;
+  background:url('../../public/images/homeWu/gradebgimg.png')
+}
+  .article-li {
+    display: flex;
     width: 100%;
-    height: 100%;
-    background-color: #fff;
-    // left: 4%;
-    padding: 15px;
-    .case-time{
-      font-size: 12px;
-      color: #999999;
-      text-align: right;
+
+    .article-img {
+      // width: 252px;
+      // height: 142px;
+      border-radius: 4px;
+
+      // margin-right: 20px;
+      img {
+        // width: 252px;
+        // height: 142px;
+        border-radius: 4px;
+      }
     }
-    .case-title{
-      margin-top: 10px;
-      font-size: 20px;
-      color: #333;
-      font-weight: bold;
-      margin-bottom:8px;
-    }
-    .case-text{
-      height: 56px;
-      font-size: 14px;
-      overflow: hidden;
-      color: #888888;
-      // line-height: 18px;
-      margin-bottom:8px;
-    }
-   ::v-deep .case-inter{
+
+    .article-right {
       width: 100%;
-      padding-bottom: 10px;
-      border-bottom: 1px solid #f3f3f3;
-      .interact-bar-btns{
-        justify-content: space-between !important;
-        .interact-bar-btn{
-          margin: 0 0 0 0;
+
+      .article-info-title {
+        font-size: 16px;
+        font-weight: 600;
+        color: #00253E;
+        margin-bottom: 9px;
+        // width: 50%;
+      }
+
+      .article-info-summary {
+        // font-size: 14px;
+        font-weight: 400;
+        color: #6E7B84;
+        margin-bottom: 15px;
+      }
+
+      .article-bottom {
+        display: flex;
+        justify-content: space-between;
+
+        ::v-deep .uavatar {
+          // width: 32px;
+          // height: 32px;
         }
       }
 
-    }
-
-  }
-}
-// .qa-dai{
-//   color: #5da1ff;
-// }
-.Uxtext{
-  font-weight: 450;
-  margin-top:5px;
-  margin-left:15px;
-  font-size:14px;
-  color:#3d3d3d;
-  cursor: pointer;
-  position: relative;
-}
-.uxicon{
-  font-size: 10px;
-  position: absolute;
-  top: -14px;
-  left: 98%;
-}
-.text-status1 {
-  // padding:3px;
-  color: #1ea0fa;
-}
-.text-status2 {
-  // padding: 3px;
-  color: #00aa00;
-}
-.text-status3 {
-  // padding: 3px;
-  color: #588afc;
-  margin-left: -10px;
-}
-.qa-yi {
-  color: blue;
-}
-.el-card {
-  border: 1px solid #f0f0f0;
-}
-.portal-content {
-  font-family: 'Noto Sans SC';
-}
-// .one-line-ellipsis {
-//     width: 100%;
-//     white-space: nowrap;
-//     word-break: break-all;
-//     text-overflow: ellipsis;
-//     display: -webkit-box;
-//     -webkit-box-orient: vertical;
-//     -webkit-line-clamp: 1; /* 这里是超出几行省略 */
-
-// }
-.two-line-ellipsis {
-  display: -webkit-box;
-  // white-space:pre-wrap;
-  overflow: hidden;
-  // text-overflow:ellipsis;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-  box-sizing: border-box;
-}
-.course-card {
-  // width: 290px;
-  margin-bottom: 15px;
-  box-sizing: border-box;
-  position: relative;
-  background-color: #ffffff;
-  ::v-deep .cor-praises {
-    position: absolute;
-    left: 0;
-    top: 0;
-    -moz-user-select: none; /*火狐*/
-    -webkit-user-select: none; /*webkit浏览器*/
-    -ms-user-select: none; /*IE10*/
-    -khtml-user-select: none; /*早期浏览器*/
-    user-select: none;
-    .interact-bar-btn{
-      .interact-bar-value{
-        display: none;
-      }
-    }
-  }
-  .cor-icon {
-    position: absolute;
-    left: 100px;
-    top: 54px;
-    border-radius: 50%;
-    background: rgba(88, 138, 252, 0.37);
-
-    .el-icon-caret-right {
-      font-size: 36px;
-      color: #588afc;
-    }
-  }
-  .course-image-box {
-    position: relative;
-    // width: 362px;
-    // height: 165px;
-    width: 100%;
-    .course-image {
-      width: 100%;
-      height: 100%;
-      // width: 288px;
-      // height: 165px;
-    }
-    .course-type {
-      position: absolute;
-      top: 5px;
-      right: 0px;
-      width: 90px;
-      height: 30px;
-      line-height: 30px;
-      text-align: center;
-      background-color: #292828;
-      opacity: 0.4;
-      border-top-left-radius: 15px;
-      border-bottom-left-radius: 15px;
-      color: #ffffff;
-      -moz-user-select: none; /*火狐*/
-      -webkit-user-select: none; /*webkit浏览器*/
-      -ms-user-select: none; /*IE10*/
-      -khtml-user-select: none; /*早期浏览器*/
-      user-select: none;
-    }
-    .course-type-title {
-      position: absolute;
-      top: 5px;
-      right: 0px;
-      width: 90px;
-      height: 30px;
-      line-height: 30px;
-      text-align: center;
-      color: #ffffff;
-      -moz-user-select: none; /*火狐*/
-      -webkit-user-select: none; /*webkit浏览器*/
-      -ms-user-select: none; /*IE10*/
-      -khtml-user-select: none; /*早期浏览器*/
-      user-select: none;
-    }
-    .course-flag {
-      height: 26px;
-      position: absolute;
-      top: 15px;
-      right: 0;
-    }
-    .course-tip {
-      width: 100%;
-      height: 26px;
-      position: absolute;
-      bottom: 0;
-      padding: 0 10px;
-      color: #fff;
-      font-size: 14px;
-      .course-study-count {
-        float: left;
-      }
-      .course-time {
-        float: right;
-      }
-    }
-  }
-  .course-title {
-    padding: 10px 15px;
-    font-size: 18px;
-    font-weight: 600;
-    color: #343434;
-    -moz-user-select: none; /*火狐*/
-    -webkit-user-select: none; /*webkit浏览器*/
-    -ms-user-select: none; /*IE10*/
-    -khtml-user-select: none; /*早期浏览器*/
-    user-select: none;
-  }
-  .course-author {
-    margin: 5px 15px;
-    padding-bottom: 10px;
-    display: flex;
-    justify-content: space-between;
-
-    .course-author-left {
+      .article-info-time {
         font-size: 12px;
-        line-height: 30px;
-        color: #666;
-        -moz-user-select: none; /*火狐*/
-        -webkit-user-select: none; /*webkit浏览器*/
-        -ms-user-select: none; /*IE10*/
-        -khtml-user-select: none; /*早期浏览器*/
-        user-select: none;
-      // flex: 1;
+        font-weight: 400;
+        color: #6E7B84;
+      }
     }
+
+  }
+  .course-ran-bg {
+    background: linear-gradient(180deg, #d7eaff 1%, #FAFAFA 24%);
   }
 
-  .study-num {
-    line-height: 30px;
-    font-size: 12px;
-    color: #8590a6;
-    -moz-user-select: none; /*火狐*/
-    -webkit-user-select: none; /*webkit浏览器*/
-    -ms-user-select: none; /*IE10*/
-    -khtml-user-select: none; /*早期浏览器*/
-    user-select: none;
-  }
-  .course-score {
-    padding: 10px 15px;
-    height: 40px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+  .personal-panel {
+    position: absolute;
+    right: 8%;
+    top: 105px;
+    // background: url('/images/homeWu/personal-bgimg.png');
+    background: rgba($color: #fff, $alpha: 0.46);
+    border-radius: 8px;
+    z-index: 999;
+    backdrop-filter: blur(10px);
+    text-align: center;
+    color: #fff;
 
-    // border-top: 1px solid #ccc;
-    .course-score-star {
-      flex: 1;
+    .personal-img {
+      width: 68px;
+      height: 68px;
+      margin: 0 auto;
+      ::v-deep .el-avatar {
+        width: 68px;
+        height: 68px;
+        img{
+          width: 100% !important;
+        }
+      }
     }
-  }
-}
-.course-score-no {
-  text-align: right;
-  font-size: 12px;
-  color: #ffb30f;
-  line-height: 30px;
-  -moz-user-select: none; /*火狐*/
-  -webkit-user-select: none; /*webkit浏览器*/
-  -ms-user-select: none; /*IE10*/
-  -khtml-user-select: none; /*早期浏览器*/
-  user-select: none;
-}
-.course-score-value {
-  font-size: 14px;
-  //  margin-top: 5px;
-  margin-left: 32px;
-  line-height: 30px;
-  color: #ffb30f;
-  font-family: 'Arial';
-  -moz-user-select: none; /*火狐*/
-  -webkit-user-select: none; /*webkit浏览器*/
-  -ms-user-select: none; /*IE10*/
-  -khtml-user-select: none; /*早期浏览器*/
-  user-select: none;
-  // font-size: 30px;
-}
-.cardmark {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background: rgba(101, 101, 101, 0.8);
-  pointer-events: none;
-  border-radius: 5px;
-  padding: 10px;
-  opacity: 0;
-  -webkit-transition: all 1.5s;
-  -moz-transition: all 1.5s;
-  -ms-transition: all 1.5s;
-  -o-transition: all 1.5s;
-  transition: all 1.5s;
-  .cardmark-name {
-    font-size: 18px;
-    line-height: 30px;
-    font-weight: 600;
-    color: #fff;
-  }
-  .cardmark-info {
-    color: #fff;
-    font-size: 14px;
-    line-height: 20px;
-  }
-}
-.course-card:hover .cardmark {
-  opacity: 1;
-}
-.modules {
-  margin-top: 20px;
-  width: 100%;
-  .modules-title {
-    .modules-text {
-      height: 28px;
-      font-size: 20px;
-      font-family: PingFangSC-Semibold-, PingFangSC-Semibold;
-      font-weight: 700;
+
+    .personal-name {
+      font-weight: 600;
+      font-size: 18px;
+      margin-top: 12px;
       color: #333333;
     }
-    .recommend {
-      vertical-align: text-bottom;
-      height: 26px;
-    }
-    .quyer-tag {
-      margin-left: 15px;
-      a {
-        color: #343434;
-        font-size: 14px;
-        margin: 0 15px;
-        display: inline-block;
-        text-decoration: none;
-        outline: none;
-      }
-      .current {
-        color: #5da1ff;
-      }
-      .current::after {
-        content: '';
-        width: 18px;
-        height: 2px;
-        background-color: #5da1ff;
-        margin: 0 auto;
-        display: block;
-      }
-    }
-    .more {
-      float: right;
-      margin-top: 7px;
-      color: #666666;
+
+    .personal-info {
       font-size: 14px;
+      color: #000000;
+      margin-top: 10px;
+    }
+  .last-study-info{
+    display: flex;
+    justify-content: space-between;
+    padding: 0 10px;
+    font-size: 16px;
+  }
+    .personal-box {
+      width: 100%;
+      height: 47px;
+      background: #387DF7;
+      border-radius: 4px;
+      line-height: 47px;
+      padding-left: 15px ;
+      padding-right: 32px;
+      box-sizing: border-box;
+      display: flex;
+      // margin-top: 20px;
+      justify-content: space-between;
+      position: relative;
+      .personal-box-img {
+        position: absolute;
+        width: 24px;
+        height: 24px;
+        left: 10px;
+        top: -8px;
+
+      }
+    }
+
+    .personal-ul {
+      display: flex;
+      li{
+        flex: 1;
+        text-align: center;
+      }
+      .label {
+        color: #999999;
+        font-size: 12px;
+        text-align: center;
+      }
+
+      p {
+        margin-top: 5px;
+        text-align: center;
+        color: #000;
+        span {
+          font-size: 22px;
+          text-align: center;
+          color: #333;
+          font-weight: 500;
+        }
+      }
     }
   }
 
-  .modules-list {
-    margin-top: 15px;
-    margin-bottom: 15px;
-    .case-card {
-      // width: 593px;
-      margin-bottom: 15px;
-      .case-info-image-box {
+  .list-active {
+    display: none;
+    // width: 458px;
+    width: 135%;
+    height: 165px;
+    padding: 20px;
+    background: #FFFFFF;
+    box-sizing: border-box;
+    box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.05);
+    border-radius: 2px;
+    border: 1px solid #EDEFF0;
+    position: absolute;
+    top: 30px;
+    right:-22px;
+    z-index: 999;
+
+    .list-content {
+      display: flex;
+      padding-bottom: 20px;
+      border-bottom: 1px solid #EDEFF0;
+
+      .list-img {
+        width: 125px;
+        height: 70px;
         position: relative;
-        .case-info {
-          width: 385px;
-          .case-info-title {
-            font-size: 18px;
-            color: #343434;
-            margin-bottom: 5px;
-            .case-info-time {
-              font-size: 12px;
-              color: #999999;
-              float: right;
-              margin-top: 8px;
-            }
-          }
-          .case-info-summary {
-            font-size: 12px;
-            color: #666666;
-            height: 82px;
-            line-height: 18px;
-          }
+
+        ::v-deep .el-image {
+          border-radius: 4px !important;
         }
+
         img {
-          width: 160px;
-          height: 105px;
+          width: 100%;
+          height: 100%;
+        }
+
+        .course-type {
           position: absolute;
-          top: 5px;
+          // left: 0;
+          top: 0;
           right: 0;
+          height: 20;
+          line-height: 20px;
+          font-size: 12px;
+          color: #FFFFFF;
+          padding: 0px 8px;
+          background: #f99000;
+          border-radius: 0px 0px 0px 10px;
         }
       }
-      .case-info-box {
-        .case-info {
-          .case-info-title {
-            font-size: 18px;
-            color: #343434;
-            margin-bottom: 5px;
-            .case-info-time {
-              font-size: 12px;
-              color: #999999;
-              float: right;
-              margin-top: 8px;
-            }
-          }
-          .case-info-summary {
-            font-size: 12px;
-            color: #666666;
-            height: 82px;
-            line-height: 18px;
-          }
+
+      .list-text {
+        flex: 1;
+        margin-left: 12px;
+
+        h6 {
+          font-size: 14px;
+          margin: 0px;
+          font-weight: 500;
+          line-height: normal;
+          color: #04243C;
+        }
+
+        span {
+          font-size: 14px;
+          color: #6E7B84;
         }
-      }
-      .case-other-info {
-        height: 40px;
-        margin-top: 10px;
-        display: flex;
-        justify-content: space-between;
       }
     }
 
-    .article-card {
-      // height: 483px;
-      //  height: 425px;
-      .article-card-left {
-        float: left;
-        width: 30%;
-        .article-card-box {
-          .article-info-image-box {
-            .article-info {
-              .article-info-title {
-                font-size: 20px;
-                color: #343434;
-                margin-bottom: 5px;
-                margin-top: 5px;
+    .list-bottom {
+      padding-top: 10px;
 
-                .article-info-time {
-                  font-size: 12px;
-                  color: #999999;
-                  float: right;
-                  margin-top: 8px;
-                  font-weight: 500;
-                }
-              }
-              .article-info-summary {
-                // padding-top: 30px;
-                font-size: 14px;
-                color: #666666;
-                // height: 28px;
-                line-height: 18px;
-                font-weight: 500;
-              }
-            }
-            img {
-              width: 470px;
-              height: 330px;
-              //  width: 100%;
-              // height: 100%;
+      ::v-deep .interact-bar-btns {
+        justify-content: space-between !important;
+
+        .interact-bar-btn {
+          margin: 0 !important;
+        }
+      }
+    }
+  }
+
+  .list-info {
+    position: relative;
+
+    .span {
+      display: flex;
+    }
+  }
+
+  .list-info:hover .list-active {
+    // transition: all 0.5s;
+    display: block;
+  }
+
+  // .swiper-pagination-fraction, .swiper-pagination-custom, .swiper-container-horizontal > .swiper-pagination-bullets {
+  //   width: 108px;
+  //   height: 38px;
+  // }
+
+  .bannbox {
+    width: 100%;
+    height: 520px;
+    text-align: center;
+    filter: blur(5px);
+    z-index: -1;
+    background-size: 100% 100%;
+
+  }
+
+  ::v-deep.swiper-slide .games .swiper-slide-active {
+    text-align: center !important;
+  }
+
+  #container {
+    position: absolute;
+    height: 520px;
+    top: 0;
+    width: 100%;
+  }
+
+  .banner-img {
+    height: 520px;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    transform: (-50%, -50%);
+  }
+
+  .course-banner {
+    height: 520px;
+    // background: url('/images/course-banner.png');
+    .swiper-button-prev{
+      height: 38px;
+      // top:auto;
+      padding: 0 16px;
+      background: rgba($color: #000000, $alpha: 0.8) url('../assets/images/icon/ban-left.png') no-repeat;
+      background-size: 12px 18px;
+      background-position: 16px 10px;
+      bottom: 66px;
+      border-radius: 19px 0 0 19px;
+    }
+    .swiper-button-next{
+      height: 38px;
+      // right: 52.65%;
+      bottom: 66px;
+      top:auto;
+      padding: 0 16px;
+      background: rgba($color: #000000, $alpha: 0.1) url('../assets/images/icon/ban-right.png') no-repeat;
+      background-size: 12px 18px;
+      background-position: 6px 10px;
+      border-radius: 0 19px 19px 0;
+    }
+    .swiper-pagination-bullets{
+      // background: #000;
+        left: 60px;
+        bottom: 66px;
+      }
+  ::v-deep .swiper-pagination{
+     line-height: 25px;
+     height: 32px;
+      border-radius: 19px;
+    //  background: rgba($color: #000000, $alpha: 0.1);
+     width: auto;
+     left:45%;
+     padding: 0 20px;
+     border-radius: 19px;
+     .swiper-pagination-bullet{
+      position: relative;
+      width: 25px;
+      height: 5px;
+       margin-top: 10px;
+       background: #fff;
+       opacity: 1 !important;
+      // background: rgba($color: #fff, $alpha: 0.5);
+      border-radius: 2px;
+    }
+    .swiper-pagination-bullet::before {
+       content: '';
+       position: absolute;
+       top:-20px;
+       bottom:-20px;
+       left:-2px;
+       right:-2px;
+    }
+      .swiper-pagination-bullet-active{
+        height: 5px;
+       opacity: 1 !important;
+       margin-top: 10px;
+        width: 25px;
+        background: #387DF7;
+        // background: rgba($color: #fff, $alpha: 0.8);
+        border-radius: 2px;
+      }
+      .swiper-container{
+        // background-color: rgba($color: #000000, $alpha: 0.2);
+      }
+
+    }
+  }
+
+  .case-orginfo {
+    // line-height: 25px;
+    height: 45px;
+  }
+
+  .three-line-ellipsis {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    box-sizing: border-box;
+    -webkit-line-clamp: 3;
+    word-break: break-all;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+  }
+
+  // .case-box {
+  //   display: flex;
+.xindex-case{
+  &:nth-child(2) {
+    .case-top {
+      background: linear-gradient(333deg, #D2DEF3 0%, #B4C4E0 100%);
+    }
+  }
+  &:last-child {
+    .case-top {
+      background: linear-gradient(153deg, #A4D3DF 0%, #B4DCE6 100%);
+    }
+}
+  .case-index {
+      position: relative;
+      // width: 408px;
+      // height: 396px;
+      background: linear-gradient(180deg, #FFFFFF 0%, #FAFAFA 100%);
+      border-radius: 8px;
+      box-sizing: border-box;
+        margin-right: 0;
+
+      }
+
+      .case-inter {
+        position: absolute;
+         width: 100%;
+        .case-inter-box{
+          display: flex;
+        margin-right: 35px;
+
+      .case-inter-left{
+          flex: 1;
+          // display: flex;
+        }
+        .interact-bar-index{
+          margin-left: auto;
+        }
+        }
+
+      }
+
+      .case-top {
+        // height: 120px;
+        background: linear-gradient(153deg, #82A8D1 0%, #A4C5E8 100%);
+        border-radius: 8px 8px 0px 0px;
+      }
+
+      .case-conent {
+        position: absolute;
+        // transform:translate(-50%,-50%);
+        top:-50px;
+        left:0;
+        right:0;
+        bottom: 0;
+        margin: auto;
+        // width: 350px;
+        // height: 274px;
+        background: #FFFFFF;
+        box-shadow: 0px 1px 10px 0px rgba(4, 36, 60, 0.05);
+        border-radius: 4px;
+
+        // padding: 30px;
+        .cast-time {
+          font-size: 14px;
+          color: #6E7B84;
+          height: 24px;
+          .time-one {
+            height: 24px;
+            background: rgba($color: #387DF7, $alpha: 0.1);
+            border-radius: 4px;
+            // padding: 3px 10px;
+            color: #387DF7;
+            font-size: 12px;
+          }
+        }
+
+        .case-title {
+          // height: 48px;
+          // font-size: 16px;
+          font-weight: 600;
+          color: #00253E;
+          // line-height: 24px;
+        }
+
+        .case-text {
+          // height: 60px;
+          // font-size: 14px;
+          color: #6E7B84;
+          // line-height: 20px;
+          // margin-bottom: 30px;
+        }
+
+        ::v-deep .case-info {
+          .interact-bar-btns {
+            justify-content: space-between !important;
+
+            .interact-bar-btn {
+              margin: 0;
             }
           }
         }
       }
+    }
+  //}
 
-      .article-card-right {
-        // float: right;
-        // width: 68%;
+  .casetwo {
+    border: 1px solid #F0F0F0;
+    width: 100%;
+    height: 245px;
+    margin-bottom: 15px;
+    position: relative;
+    background-color: #fff;
+
+    .case-top {
+      height: 70px;
+      background-image: linear-gradient(to right, #b8c7e2, #d0dcf3);
+    }
+  }
+
+  // .qa-dai{
+  //   color: #5da1ff;
+  // }
+  .Uxtext {
+    font-weight: 450;
+    margin-top: 5px;
+    margin-left: 15px;
+    font-size: 14px;
+    color: #3d3d3d;
+    cursor: pointer;
+    position: relative;
+  }
+
+  .uxicon {
+    font-size: 10px;
+    position: absolute;
+    top: -14px;
+    left: 98%;
+  }
+
+  .text-status1 {
+    // padding:3px;
+    color: #1ea0fa;
+  }
+
+  .text-status2 {
+    // padding: 3px;
+    color: #00aa00;
+  }
+
+  .text-status3 {
+    // padding: 3px;
+    color: #588afc;
+    margin-left: -10px;
+  }
+
+  .qa-yi {
+    color: blue;
+  }
+
+  .el-card {
+    border: 1px solid #f0f0f0;
+  }
+
+  .portal-content {
+    font-family: 'Noto Sans SC';
+  }
+
+  // .one-line-ellipsis {
+  //     width: 100%;
+  //     white-space: nowrap;
+  //     word-break: break-all;
+  //     text-overflow: ellipsis;
+  //     display: -webkit-box;
+  //     -webkit-box-orient: vertical;
+  //     -webkit-line-clamp: 1; /* 这里是超出几行省略 */
+
+  // }
+  .two-line-ellipsis {
+    display: -webkit-box;
+    // white-space:pre-wrap;
+    overflow: hidden;
+    // text-overflow:ellipsis;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    box-sizing: border-box;
+  }
+
+  .course-card {
+    // padding: 30px;
+    padding-bottom: 22px;
+    // width: 410px;
+    // margin-bottom: 30px;
+    // margin-right: 36px;
+    box-sizing: border-box;
+    position: relative;
+    background-color: #ffffff;
+
+    .course-image-box {
+      position: relative;
+      .course-type {
+        position: absolute;
+        top: 0px;
+        right: 0px;
+        width: 60px;
+        height: 24px;
+        line-height: 24px;
+        text-align: center;
+        background-color: #f99000;
+        border-radius: 2px 4px 2px 14px;
+        font-size: 12px;
+        color: #ffffff;
+        -moz-user-select: none;
+        /*火狐*/
+        -webkit-user-select: none;
+        /*webkit浏览器*/
+        -ms-user-select: none;
+        /*IE10*/
+        -khtml-user-select: none;
+        /*早期浏览器*/
+        user-select: none;
+      }
+
+      .course-type-title {
+        position: absolute;
+        top: 5px;
+        right: 0px;
+        width: 90px;
+        height: 30px;
+        line-height: 30px;
+        text-align: center;
+        color: #ffffff;
+        -moz-user-select: none;
+        /*火狐*/
+        -webkit-user-select: none;
+        /*webkit浏览器*/
+        -ms-user-select: none;
+        /*IE10*/
+        -khtml-user-select: none;
+        /*早期浏览器*/
+        user-select: none;
+      }
+
+      .course-flag {
+        height: 26px;
+        position: absolute;
+        top: 15px;
+        right: 0;
+      }
+
+      .course-tip {
+        width: 100%;
+        height: 26px;
+        position: absolute;
+        bottom: 0;
+        padding: 0 10px;
+        color: #fff;
+        font-size: 14px;
+
+        .course-study-count {
+          float: left;
+        }
+
+        .course-time {
+          float: right;
+        }
+      }
+    }
+
+    .course-title {
+      margin: 16px 0 16px 0;
+      height: 44px;
+      -moz-user-select: none;
+      /*火狐*/
+      -webkit-user-select: none;
+      /*webkit浏览器*/
+      -ms-user-select: none;
+      /*IE10*/
+      -khtml-user-select: none;
+      /*早期浏览器*/
+      user-select: none;
+    }
+  .course-title-box{
+    display: flex;
+
+    .interact-bar-index{
+
+    }
+  }
+    .course-author {
+      // margin: 5px 15px;
+      // padding-bottom: 10px;
+      display: flex;
+      justify-content: space-between;
+
+      .course-author-left {
+        font-size: 14px;
+        color: #6E7B84;
+        -moz-user-select: none;
+        /*火狐*/
+        -webkit-user-select: none;
+        /*webkit浏览器*/
+        -ms-user-select: none;
+        /*IE10*/
+        -khtml-user-select: none;
+        /*早期浏览器*/
+        user-select: none;
+      }
+    }
+
+    .study-num {
+      font-size: 14px;
+      color: #6E7B84;
+      // margin-left: 12px;
+      -moz-user-select: none;
+      /*火狐*/
+      -webkit-user-select: none;
+      /*webkit浏览器*/
+      -ms-user-select: none;
+      /*IE10*/
+      -khtml-user-select: none;
+      /*早期浏览器*/
+      user-select: none;
+    }
+
+    .course-score {
+      padding: 10px 15px;
+      height: 40px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      // border-top: 1px solid #ccc;
+      .course-score-star {
         flex: 1;
-        margin-left: 20px;
-        .article-card-box {
-          // height: 160px;
-          margin-bottom: 8px;
-          padding-bottom: 8px;
-          .article-info-box {
-            .article-info {
-              display: flex;
-              .article-image {
-                // width: 150px;
-                // height: 150px;
-                // margin-right: 10px;
-                width: 140px;
-                height: 105px;
-                margin-top: 10px;
-                margin-left: 20px;
+      }
+    }
+  }
+
+  .modules {
+    margin-top: 20px;
+    // width: 100%;
+    display: flex;
+
+    .modules-title {
+      .modules-text {
+        height: 28px;
+        font-size: 20px;
+        font-family: PingFangSC-Semibold-, PingFangSC-Semibold;
+        font-weight: 700;
+        color: #333333;
+      }
+
+      .recommend {
+        vertical-align: text-bottom;
+        height: 26px;
+      }
+
+      .quyer-tag {
+        margin-left: 15px;
+
+        a {
+          color: #333333;
+          font-size: 14px;
+          margin: 0 15px;
+          display: inline-block;
+          text-decoration: none;
+          outline: none;
+        }
+
+        .current {
+          width: 44px;
+          height: 26px;
+          background: #387DF7;
+          border-radius: 4px;
+          color: #fff;
+          line-height: 26px;
+          text-align: center;
+        }
+
+        // .current::after {
+        //   content: '';
+        //   width: 18px;
+        //   height: 2px;
+        //   background-color: #5da1ff;
+        //   margin: 0 auto;
+        //   display: block;
+        // }
+      }
+
+      .more {
+        float: right;
+        margin-top: 7px;
+        margin-right: 30px;
+        color: #333333;
+        font-size: 14px;
+      }
+    }
+
+    .modules-list {
+      margin-top: 30px;
+
+      // margin-bottom: 15px;
+      // margin-right: 36px;
+      .case-card {
+        // width: 593px;
+        margin-bottom: 15px;
+
+        .case-info-image-box {
+          position: relative;
+
+          .case-info {
+            width: 385px;
+
+            .case-info-title {
+              font-size: 18px;
+              color: #343434;
+              margin-bottom: 5px;
+
+              .case-info-time {
+                font-size: 12px;
+                color: #999999;
+                float: right;
+                margin-top: 8px;
               }
-              .article-body {
-                flex: 1;
+            }
+
+            .case-info-summary {
+              font-size: 12px;
+              color: #666666;
+              height: 82px;
+              line-height: 18px;
+            }
+          }
+
+          img {
+            width: 160px;
+            height: 105px;
+            position: absolute;
+            top: 5px;
+            right: 0;
+          }
+        }
+
+        .case-info-box {
+          .case-info {
+            .case-info-title {
+              font-size: 18px;
+              color: #343434;
+              margin-bottom: 5px;
+
+              .case-info-time {
+                font-size: 12px;
+                color: #999999;
+                float: right;
+                margin-top: 8px;
+              }
+            }
+
+            .case-info-summary {
+              font-size: 12px;
+              color: #666666;
+              height: 82px;
+              line-height: 18px;
+            }
+          }
+        }
+
+        .case-other-info {
+          height: 40px;
+          margin-top: 10px;
+          display: flex;
+          justify-content: space-between;
+        }
+      }
+
+      .article-card {
+        //width: 100%;
+        background: #fff;
+        // padding: 30px;
+        border-radius: 8px;
+
+        .article-card-left {
+
+          // float: left;
+          .article-card-box {
+
+            .article-info-image-box {
+              border-radius: 4px;
+              .article-info {
+                height: 400px;
+
                 .article-info-title {
-                  font-size: 18px;
-                  color: #343434;
+                  font-size: 16px;
+                  color: #00253E;
+                  font-weight: 500;
                   margin-bottom: 5px;
-                  .article-info-time {
-                    font-size: 12px;
-                    color: #999999;
-                    float: right;
-                    margin-top: 8px;
+                  margin-top: 5px;
+                }
+
+                .article-info-summary {
+                  font-size: 14px;
+                  color: #6E7B84;
+                  height: 160px;
+                  line-height: 22px;
+                }
+              }
+
+              img {
+                width: 470px;
+                height: 330px;
+                //  width: 100%;
+                // height: 100%;
+              }
+            }
+          }
+        }
+
+        .article-card-right {
+          // float: right;
+          // width: 68%;
+          flex: 1;
+          margin-left: 28px;
+
+          .article-card-box {
+            // height: 160px;
+            margin-bottom: 16px;
+            padding-bottom: 16px;
+
+            &:last-child {
+              margin-bottom: 0px;
+              padding-bottom: 0px;
+            }
+
+            .article-info-box {
+              .article-info {
+                display: flex;
+
+                .article-image {
+                  // width: 150px;
+                  // height: 150px;
+                  // margin-right: 10px;
+                  width: 140px;
+                  height: 105px;
+                  margin-top: 10px;
+                  margin-left: 20px;
+                }
+
+                .article-body {
+                  flex: 1;
+
+                  .article-info-title {
+                    font-size: 18px;
+                    color: #343434;
+                    margin-bottom: 5px;
+
+                    .article-info-time {
+                      font-size: 12px;
+                      color: #999999;
+                      float: right;
+                      margin-top: 8px;
+                      font-weight: 500;
+                    }
+                  }
+
+                  .article-info-summary {
+                    padding-top: 9px;
+                    font-size: 14px;
+                    color: #666666;
+                    height: 43px;
+                    line-height: 18px;
                     font-weight: 500;
+                    margin-bottom: 20px;
                   }
                 }
-                .article-info-summary {
-                  padding-top: 9px;
-                  font-size: 14px;
-                  color: #666666;
-                  height: 43px;
-                  line-height: 18px;
-                  font-weight: 500;
-                  margin-bottom: 20px;
-                }
               }
             }
           }
+
+          .article-card-box:not(:last-child) {
+            border-bottom: 1px solid #ededed;
+          }
         }
-        .article-card-box:not(:last-child) {
-          border-bottom: 1px solid #ededed;
+
+        .article-other-info {
+          display: flex;
         }
       }
 
-      .article-other-info {
-        // height: 40px;
-        // margin-top: 10px;
-        display: flex;
-        justify-content: space-between;
-      }
-    }
 
-    .qa-card {
-      // width: 593px;
-      margin-bottom: 15px;
-      .qa-info-box {
-        cursor: pointer;
-        .qa-info {
-          .qa-info-title {
-            font-size: 18px;
-            color: #343434;
-            margin-bottom: 5px;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            .qa-info-shrink {
-              flex-shrink: 10000;
-            }
-            .qa-info-time {
+
+        .qa-card {
+          // width: 298px;
+          // height: 320px;
+          // padding: 30px;
+          box-sizing: border-box;
+          box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.05);
+          border-radius: 8px;
+          // margin-right: 36px;
+          background: #fff;
+
+          &:last-child {
+            margin-right: 0;
+          }
+
+          .qa-top {
+            & span:first-child {
+              height: 24px;
+              background: rgba($color: #387DF7, $alpha: 0.05);
+              // padding: 3px 10px;
+              border-radius: 4px;
               font-size: 12px;
-              color: #999999;
-              float: right;
-              margin-top: 8px;
+              color: #387DF7;
+              // margin-right: 46px;
+            }
+
+            span {
+              // font-size: 14px;
+              color: #6E7B84;
             }
           }
-          .qa-info-summary {
-            font-size: 14px;
-            color: #666666;
-            height: 37px;
-            overflow: hidden;
-            line-height: 18px;
-            margin-bottom: 10px;
+
+          .qa-center {
+            position: relative;
+            // margin-top: 20px;
+            // width: 238px;
+            // height: 152px;
+            background: rgba($color: #04243C, $alpha: 0.04);
+            border-radius: 4px;
+
+            // padding: 20px;
+            .qa-views {
+              position: absolute;
+              color: #6E7B84;
+              font-size: 14px;
+              // left: 20px;
+              // bottom: 20px;
+
+            }
+          }
+
+          .qa-char {
+            display: flex;
           }
         }
-      }
-      .qa-other-info {
-        height: 40px;
-        // margin-top: 10px;
-        display: flex;
-        justify-content: space-between;
-      }
+
     }
   }
-}
 </style>
diff --git a/src/views/Loading.vue b/src/views/Loading.vue
index f8909b3f..9f35933e 100644
--- a/src/views/Loading.vue
+++ b/src/views/Loading.vue
@@ -41,11 +41,11 @@
            apiLogin.boeLogin(this.curToken).then(rs=>{
              if(rs.status==200){
                //setToken(rs.result.access_token);
-               localStorage.setItem(this.$Constants.newLoginKey,1);
+               localStorage.setItem(this.$xpage.constants.newLoginKey,1);
                if(this.toUrl){
                  location.href=this.toUrl;
                }else{
-                 this.$router.push({ path: "/uc/study/task" })
+                 this.$router.push({ path: "/index" })
                }
                //this.$router.push({ path: "/index" })
              }else{
diff --git a/src/views/Login.vue b/src/views/Login.vue
index bb6a47a4..fea0a8dd 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -67,6 +67,7 @@
       }
     },
     mounted() {
+
       //console.log(process.env,'process.env');
       this.refreshCode();
       if(this.portalLoginRememberMe && this.portalLoginRememberMe.rememberMe){
@@ -99,7 +100,7 @@
               this.$store.dispatch("Login", this.form).then(rs => {
                 if(rs.status == 200){
                   // 记住密码
-                  localStorage.setItem(this.$Constants.newLoginKey,1);
+                  localStorage.setItem(this.$xpage.constants.newLoginKey,1);
                   if(this.rememberMe){
                     let rememberMeOjb = {rememberMe:true,loginName:this.form.loginName,password:this.form.password};
                     this.$store.dispatch("portal/SetLoginRememberMe", rememberMeOjb)
@@ -108,7 +109,7 @@
                     this.$store.dispatch("portal/SetLoginRememberMe", rememberMeOjb)
                   }
                   //console.log(this.redirect,'this.redirect');
-                  this.$router.push({ path: this.redirect || "/uc/study/task" }).catch(()=>{
+                  this.$router.push({ path: this.redirect || "/index" }).catch(()=>{
                       $this.loading = false;
                   });
                 }else{
diff --git a/src/views/StudyIndex.vue b/src/views/StudyIndex.vue
index a9b34696..7ad520f0 100644
--- a/src/views/StudyIndex.vue
+++ b/src/views/StudyIndex.vue
@@ -79,23 +79,148 @@
 </template>
 
 <script>
+  import studyItem from '@/components/Course/studyItem.vue'
+  import apicourseStudy  from '@/api/modules/courseStudy.js';
+  import apiBoeCourse from '@/api/boe/course.js';
+  import {resListMap, resOwnerListMap,courseType,getType} from '@/utils/tools.js';
+  import apiBoe  from '@/api/boe/boeApiAjax.js';
+  import axios from 'axios'
   import { mapGetters,mapActions} from 'vuex';
   export default {
     name: 'ucStudyIndex',
-    components:{},
+    components:{studyItem},
     data(){
         return {
-          loading:false
+          loading:false,
+          lastTabName:'course',
+          getCourseType:courseType,
+          lastStudy:{
+            aname: "",
+            contentId: "",
+            contentName: "",
+            contentType: 0,
+            courseId: "",
+            courseName: "",
+            courseType: "",
+            coverImg: "",
+            itemId: "",
+            lastStudyTime: 0,
+            lastTime: "",
+            progress: 100,
+            score: "",
+            studyDuration: "",
+            studyId: "",
+          },
+          params:{
+            pageIndex: 1,//第几页
+            pageSize: 5,
+            isFinish:false,
+          },
+          couresList:[],
+          couresCount:0,
+          taskList:[]
         }
     },
     beforeCreate() {
       this.loading = true;
-      this.$router.push('/uc/study/task')
+      let params={
+          // keyword:this.keyword,
+          page:1,
+          size:10,
+          // cmtask_status:this.cmtask_status,
+          // cmtask_name:this.cmtask_name,
+        }
+        
+      apiBoeCourse.cmtaskList(params).then(res=>{
+        if(res.status==200){
+           this.total = res.result.count
+           this.couresList = res.result.list;
+           this.loading = false;
+           if(this.$route.fullPath != '/uc/study/task' &&  this.$route.fullPath != '/uc/study/courses' && this.$route.fullPath != '/study/index') {
+             return;
+           }
+           if(res.result.count > 0) {
+              this.$router.push('/uc/study/task')
+           } else {
+             if(this.$route.query.study == '1') {
+                this.$router.push('/uc/study/task')
+             } else {
+                this.$router.push('/uc/study/courses')
+             }
+           }
+         }else{
+            this.$router.push('/uc/study/courses')
+         }
+      }).catch(err=>{
+        if(this.$route.fullPath != '/uc/study/task' ||  this.$route.fullPath != '/uc/study/courses' || this.$route.fullPath != '/study/index') {
+            return;
+          }
+        this.$router.push('/uc/study/courses');
+      })
     },
     created() {
+      //this.$router.push('/uc/study/courses');
+      // this.searchData();
+      // this.getLastStudy();
+      // this.loadRemoteTask();
+      // this.loadResOwners();
+      // this.loadSysTypes();
+
     },
     methods:{
+      continueStudy(item){
+        // if(item.courseType==10){
+        //   return '../course/micro?id='+item.courseId
+        // }else{
+          return '../course/studyindex?id='+item.courseId
+        // }
+      },
+      ...mapActions({
+        getResOwnerTree:'resOwner/getResOwnerTree',
+        loadResOwners:'resOwner/loadResOwners',
+        getSysTypeTree:'sysType/getSysTypeTree',
+        loadSysTypes:'sysType/loadSysTypes'
+      }),
+      getLastStudy() {
+        apicourseStudy.lastStudy().then(res=>{
+        if(res.status === 200) {
+          this.lastStudy=res.result;
+        } else {
+          this.$message.error(res.message);
+        }
+      })
+      },
+      loadRemoteTask(){
+         //调用远程接口
+         // let url="http://u.boe.com/api/b1/system/cmtask/cmtask-list";
+         // let jsonData={
+         //   cmtask_status:'',
+         //   cmtask_name:'',
+         //   page:1,
+         //   size:10
+         // }
+         // axios.post(url,jsonData).then(rs=>{
+         //   console.log(rs)
+         // })
+         // apiBoe.postJson(url,jsonData).then(rs=>{
+         //   if(rs.status==200){
 
+         //   }
+         // })
+      },
+     searchData() {
+      apicourseStudy.myStudyList(this.params).then(res=>{
+        if(res.status === 200) {
+           this.couresList =res.result.list;
+           this.couresCount = res.result.count;
+        } else {
+          this.$message.error(res.message);
+        }
+      })
+    },
+      lastTabChange(tab,event){
+        console.log(tab.name);
+      }
     }
   }
 </script>
diff --git a/src/views/article/ManageList.vue b/src/views/article/ManageList.vue
index 25f85b1f..386b4ac5 100644
--- a/src/views/article/ManageList.vue
+++ b/src/views/article/ManageList.vue
@@ -1,23 +1,9 @@
 <template>
   <div class="u-page" style="padding-right:32px">
-    <Remark>
-      <ul>
-        <li>正文内容需求上要求显示两行，建议不显示 上架和下架图标待定</li>
-        <li>
-          上架和审核没有对应接口，先写好了，到时候换个名就行,数据传参也可以改一下
-        </li>
-        <li>点击标题打开新页面并且传参不会</li>
-      </ul>
-    </Remark>
     <div style="padding: 2px 0px 10px 8px;">
       <div style="display: flex; justify-content: flex-start">
         <div style="padding: 0px 5px">
-          <el-select
-            v-model="pageData.status"
-            style="width: 110px"
-            clearable
-            placeholder="审核状态"
-          >
+          <el-select   v-model="pageData.status"   style="width: 110px" clearable placeholder="审核状态" >
             <el-option label="全部" value=""></el-option>
             <el-option label="草稿" :value="1"></el-option>
             <el-option label="待审核" :value="2"></el-option>
@@ -27,19 +13,10 @@
           </el-select>
         </div>
         <div style="padding: 0px 5px">
-          <el-input
-            placeholder="关键词搜索"
-            v-model="pageData.keyword"
-            clearable
-          ></el-input>
+          <el-input placeholder="关键词搜索"  v-model="pageData.keyword" clearable ></el-input>
         </div>
         <div style="padding: 0px 5px">
-          <el-button
-            @click="getsearch"
-            icon="el-icon-search"
-            type="primary"
-            >搜索</el-button
-          >
+          <el-button @click="getsearch"  icon="el-icon-search"  type="primary">搜索</el-button >
           <!-- <el-button type="primary" >批量设置推荐</el-button> -->
         </div>
 
@@ -122,8 +99,12 @@
 
 <script>
 import apiArticle from '@/api/modules/article.js'
+import { mapGetters } from 'vuex';
 export default {
   name: 'articleItems',
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
   data() {
     return {
       pageData: {
@@ -219,14 +200,24 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      })
-        .then(() => {
-          apiArticle
-            .del(item.id)
-            .then((res) => {
+      }).then(() => {
+          apiArticle.del(item.id).then((res) => {
               if (res.status == 200) {
                 this.$message.success('删除成功')
                  this.getArticleList()
+                 let event = {
+                  key: "ArticleDelete",//被管理员删除
+                  title: '被管理员删除文章',//事件的标题
+                  parameters:"author:"+item.sysCreateAid,//用户自定义参数 name:value,name:value
+                  content: '被管理员删除文章',//事件的内容
+                  objId: item.id,//关联的id
+                  objType: "2",//关联的类型
+                  objInfo:item.title,
+                  aid: this.userInfo.aid, //当前登录人的id
+                  aname: this.userInfo.name,//当前人的姓名
+                  status: 1 //状态，直接写1
+                }
+                this.$store.dispatch("userTrigger", event);
               } else {
                 this.$message.error('删除失败')
               }
diff --git a/src/views/article/MyList.vue b/src/views/article/MyList.vue
index ffc9fd6a..5b5c2d25 100644
--- a/src/views/article/MyList.vue
+++ b/src/views/article/MyList.vue
@@ -15,6 +15,7 @@
         <div style="display: flex;justify-content:space-around;padding: 12px 22px 10px 17px;">
           <!-- <div style="padding: 0px 5px;"><el-cascader clearable v-model="params.type" :options="typeList"></el-cascader></div> -->
           <div style="padding: 0px 5px;">
+            <span style="font-size: 18px;color: #333333;font-weight: 600;margin-right:30px" >我的文章</span>
             <el-select v-model="pageData.status" placeholder="状态" style="width: 110px;" clearable>
               <el-option v-for="item in selectData" :label="item.label" :value="item.value" :key="item.value"></el-option>
               <!-- <el-option label="草稿" :value='0'></el-option>
@@ -28,10 +29,9 @@
            <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button></div>
         </div>
       </div>
-      <div style="padding:12px 20px; " class="write">
-        <!-- <a :href="`${webBaseUrl}/article/add`" target="_blank"><el-button type="primary" icon="el-icon-plus" >写文章</el-button></a> -->
+      <!-- <div style="padding:12px 20px; " class="write">
 		<el-button type="primary" @click="diagSync=true" icon="el-icon-plus" >写文章</el-button>
-      </div>
+      </div> -->
     </div>
     <div style="padding: 10px 19px 0px 22px;">
       <article-items @update="getArticleList" :items="pageData.list" v-if="pageData.list.length!=0"></article-items>
@@ -46,18 +46,19 @@
         :total="total"
       ></el-pagination></div>
         <div v-else>
-            <div v-if="pageData.list.length == 0">
-              <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
-              <div v-else class="zan-wu">暂无数据</div>
-              </div>
-            </div> 
+          <div v-if="pageData.list.length == 0"  class="home-no-list">
+            <img class="img" style="width:360px;height:226px" :src="`${webBaseUrl}/images/homeWu/no-madel.png`" alt="" srcset=""/>
+            <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
+            <div v-else class="zan-wu">您还没有发布文章～</div>
+          </div>
+        </div> 
 
     </div>
 	<el-dialog title="创建文章" :visible.sync="diagSync" :close-on-click-modal="false" width="900px" custom-class="g-dialog">
 	  <editItems v-if="diagSync" :jumpLimit="false" :editForm="{}" @success="saveSuccess"></editItems>
 	</el-dialog>
     <div style="height: 100px;"></div>
-  </div>
+  </div>    
 </template>
 
 <script>
diff --git a/src/views/article/contactMine.vue b/src/views/article/contactMine.vue
index 65e14973..66cac92d 100644
--- a/src/views/article/contactMine.vue
+++ b/src/views/article/contactMine.vue
@@ -5,57 +5,63 @@
         <li>假如我回复了难道不该显示回复内容吗？</li>
       </ul>
     </Remark>
-
-    <div style="padding: 10px 22px 10px 23px;">
+     
+    <!-- <div style="padding: 10px 22px 10px 23px;">
       <el-select v-model="dataList.type" style="margin-right: 10px" placeholder="类型">
       <el-option label="全部" :value="null"></el-option>
       <el-option label="文章" :value="2"></el-option>
-      <!-- <el-option label="课程" :value="1"></el-option> -->
       <el-option label="案例" :value="3"></el-option>
       <el-option label="问答" :value="4"></el-option>
       </el-select>
-    <!-- <el-input style="width: 200px;margin-right: 10px" placeholder="请选择来源"></el-input> -->
-    <!-- 问题： -->
     <el-input style="width: 200px;margin-right: 10px" v-model="dataList.send" clearable placeholder="搜索人员姓名标题"></el-input>
-    <!-- 提问人：
-    <el-input style="width: 200px;margin-right: 10px"></el-input> -->
+    
     <el-button type="primary" @click="getList" icon="el-icon-search">搜索</el-button>
     <el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button>
 
-    </div>
-
-
+    </div> -->
+   <div style="padding: 10px 22px 10px 23px;">
+      <span class="title">@我的</span>
+   </div>
     <div class="article-list" v-for="(item, idx) in dataList.list" :key="idx" @click="jump(item)">
       <div class="article-info">
+        <div class="hear">
+                <span class="hear-left">
+                   {{item.sysCreateBy}}@我
+                </span>
+                <span class="hear-right">
+                    {{item.sysCreateTime}}
+                </span>
+            </div>
         <div class="article-info-title">
-          <div style="line-height: 30px;" class="one-line-ellipsis">
+           
+            
+          <div  class="one-line-ellipsis tit-left">
+            
              <span class="article-type">【{{ filterObjType(item.objType) }}】</span>
             <!-- <span v-if="item.isread" style="padding: 3px;border: 1px dotted #1EA0FA;color: #1EA0FA;">已读</span>
             <span v-else style="padding: 3px;border: 1px dotted #ff0000;color: #ff0000;">未读</span> -->
             {{ item.title }}
           </div>
+           <div class="bj-post">
+             <img src="../../../public/images/replyimg.png" alt="">
+              <el-button class="bianji" type="text" style="color: #999999;font-size: 12px;" :disabled="item.disabled" @click.stop="replay(item)">回复</el-button>
+            </div>
         </div>
 
         <div class="article-info-tools">
           <div class="article-info-tools-auth">
            <div class="two-line-ellipsis">
-              <span style="font-size: 16px; color: #666666; line-height:30px">
-              <!-- <i class="el-icon-time"> -->
-               {{item.sysCreateBy}}@我
-            </span>
-             <span style="margin-left:5px; font-size: 16px; color: #666666; line-height:25px ">
+             <!-- <span style="margin-left:5px; font-size: 16px; color: #666666; line-height:25px ">
                 {{ item.content }}
-             </span>
+             </span> -->
            </div>
             <!-- <el-button type="primary" v-if="!item.isread" size="mini">标记已读</el-button> -->
           </div>
           <div style="margin-top:10px; position: relative;">
               <div>
-              <span style="font-size: 14px; color: #999; ">{{item.sysCreateTime}}</span>
-            </div>
-            <div class="bj-post" >
-              <el-button class="bianji" type="text" style="margin-left: auto" :disabled="item.disabled" icon="el-icon-chat-dot-round" @click.stop="replay(item)">回复</el-button>
+              <!-- <span style="font-size: 14px; color: #999; ">{{item.sysCreateTime}}</span> -->
             </div>
+           
           </div>
            
           <div class="article-info-tools-btns">
@@ -342,6 +348,29 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.hear{
+  width: 100%;
+  display: flex;
+  margin-bottom: 20px;
+  .hear-left{
+    flex: 1;
+    font-size: 14px;
+    font-weight: 400;
+    color: #666666;
+  }
+  .hear-right{
+    margin-left: auto;
+    font-size: 14px;
+    font-weight: 400;
+    color: #666666;
+
+  }
+}
+.title{
+  font-size: 18px;
+  font-weight: 600;
+  color: #333333;
+}
 .one-line-ellipsis{
   display: -webkit-box;
   white-space:pre-wrap;
@@ -363,20 +392,25 @@ export default {
 
 }
 .bj-post{
-  position: absolute;
-  right:0px;
-  top: -7px;
-  // top: 70%;
+  margin-left: auto;
+  img{
+    width: 18px;
+    height: 18px;
+    vertical-align: middle;
+    margin-right: 10px;
+  }
+}
+.tit-left{
+  flex: 1;
 }
 .bianji{
   color: #8590A6;
   font-size: 14px;
 }
 .article-type{
-   color: #3E7FFF;
-   font-size: 18px;
-
-
+   font-size: 16px;
+   font-weight: 600;
+   color: #333333;
 }
 .el-pagination {
   text-align: center;
@@ -397,24 +431,21 @@ export default {
   color: #ff0000;
 }
 .article-list {
-  // margin: 5px 0;
   cursor: pointer;
-  padding-bottom: 20px;
+  // padding-bottom: 20px;
   padding-top: 15px;
   border-bottom: 1px solid #E8E8E8;
-  margin: 0px 19px 0px 19px;
+  margin: 0px 20px 0px 20px;
  
 }
 
 .article-info {
-  // height: 110px;
   .article-info-title {
-    font-size: 18px;
-    font-weight: 400;
+    display: flex;
+    font-size: 16px;
+    font-weight: 600;
     margin-left: -7px;
-    // height: 40px;
     color: #333;
-
     line-height: 40px;
     .article-info-date {
       // height: 40px;
diff --git a/src/views/course/Courseware.vue b/src/views/course/Courseware.vue
index 5f7e2e63..49ef34bc 100644
--- a/src/views/course/Courseware.vue
+++ b/src/views/course/Courseware.vue
@@ -466,7 +466,6 @@ export default {
       if (rs.status === 200) {
         let type = toContentType(rs.result.fileType);
         // ["doc", "xls", "ppt","docx", "xlsx", "pptx","png","txt", "pdf","jpg","gif","bmp","mp4","mp3"]
-        console.log(type, 'type');
         if(rs.result.displayName.length > 100){
           this.$message.error('文件名称请不要超过100个字符');
           return;
diff --git a/src/views/course/ManageList.vue b/src/views/course/ManageList.vue
index 26ad5c4e..d642558b 100644
--- a/src/views/course/ManageList.vue
+++ b/src/views/course/ManageList.vue
@@ -1,15 +1,5 @@
 <template>
   <div >
-    <!-- <Remark>
-      1.课程的管理，状态：未发布，待审核，已审核，审核不通过，已发布
-      <br />
-      2.关于动态配置列，先记录下来，后续再设置。
-      <br />
-      3.课程的创建，可不可以先创建课程基本信息，然后再填写目录课程等资源内容？？
-      <br />
-      4."管理"的功能界面需要定一下,
-      <br />
-    </Remark> -->
     <div style="padding: 12px 12px 10px 22px;">
       <!-- <div style="display: flex;justify-content:flex-start;"> -->
         <!-- <el-row :gutter="5">
@@ -298,7 +288,7 @@ export default {
   name: 'manageCourse',
   components: {courseForm, manager, auditCourse1, auditCourse2,adminPage},
   computed: {
-      ...mapGetters(['resOwnerMap','sysTypeMap']),
+      ...mapGetters(['resOwnerMap','sysTypeMap','userInfo']),
   },
   data() {
     return {
@@ -632,7 +622,7 @@ export default {
     jumpDetails() {
       // this.$router.push('/course/micro');
       // 跳转打开新页面
-       let routeData = this.$router.resolve({ path: '/course/micro'}); // , query: {  id: 1 }
+       let routeData = this.$router.resolve({ path: '/course/detail'}); // , query: {  id: 1 }
        window.open(this.webBaseUrl+routeData.href, '_blank');
     },
     toExamine(row) {
@@ -667,9 +657,9 @@ export default {
     },
     showQrimage(row) {
       this.qrcodeShow = true;
-      
+
       let urlPre=window.location.protocol+'//'+window.location.host;
-      
+
       //动态的地址
       //urlPre=urlPre+'/m?returnUrl='+urlPre+'/mobile/pages/login/loading?returnUrl=';
       //固定的地址
@@ -775,8 +765,7 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      })
-        .then(async() => {
+      }).then(async() => {
             let params = {
          id: row.id,
          title: row.name,
@@ -786,7 +775,23 @@ export default {
         //  {id:课程id,多个使用逗号分隔,Boolean erasable 是否物理删除,title:课程的名称, remark 备注}
         const {status} = await apiCourse.del(params);
         if(status === 200) {
-          this.$message.success('操作成功！');
+          this.$message.success('操作成功！'); //只是之前发布过的课程删除才可
+          if(!row.erasable){
+            let event = {
+              key: "CourseDelete",//被管理员删除
+              title: '被管理员删除课程',//事件的标题
+              parameters:"author:"+row.sysCreateAid,//作者，一般这种情况不是管理员自己添加的
+              content: '被管理员删除课程',//事件的内容
+              objId: row.id,//关联的id
+              objType: "1",//关联的类型
+              objInfo:row.name,
+              aid: this.userInfo.aid, //当前登录人的id
+              aname: this.userInfo.name,//当前人的姓名
+              status: 1 //状态，直接写1
+            }
+            this.$store.dispatch("userTrigger", event);
+          }
+         
           this.searchData();
         }
       } catch (error) {
diff --git a/src/views/course/TeacherList.vue b/src/views/course/TeacherList.vue
index 8cd54069..96e159c5 100644
--- a/src/views/course/TeacherList.vue
+++ b/src/views/course/TeacherList.vue
@@ -84,6 +84,7 @@
               <div v-else class="zan-wu">暂无数据</div>
             </div>
     </div>
+
     <div></div>
     <el-dialog title="审核记录" :visible.sync="dialogVisible" width="900px" custom-class="g-dialog">
       <div>
@@ -120,6 +121,7 @@ export default {
   computed: {
     ...mapGetters(['userInfo'])
   },
+
   data() {
     return {
       inviteTeacher: [],
@@ -194,50 +196,50 @@ export default {
       });
     },
     examine(row) {
-      if(!row.orgId){
-        this.$message.error("课程还未设置资源归属，请先设置资源归属");
-        return;
-      }
-      let $this=this;
-      this.$confirm('您确定要直接提交审核所选课程吗？', '友情提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(()=>{
-            apiOrg.getSimple(row.orgId).then(rrs=>{
-               if(rrs.status==200){
-                  apiHRBP.getHRBP(rrs.result.kid).then(rs=>{
-                    if(rs.status==200 && rs.result.length>0){
-                        let hrbpUser=rs.result[0];
-                        let req={
-                           courseId:row.id,
-                           email:hrbpUser.email,
-                           courseUser:row.sysCreateBy,
-                           courseName:row.name,
-                           ucode:hrbpUser.user_no,
-                           auditUser:hrbpUser.real_name,
-                           ukid:hrbpUser.user_id,
-                           orgId:row.orgId,
-                           orgName:rs.result.orgnization_name_path+'/'+rrs.result.name
-                        }
-                        apiCourse.sumbits(req).then(res=>{
-                          if(res.status==200){
-                            $this.$message.success('提交成功');
-                            row.status=2
+        if(!row.orgId){
+          this.$message.error("课程还未设置资源归属，请先设置资源归属");
+          return;
+        }
+        let $this=this;
+        this.$confirm('您确定要直接提交审核所选课程吗？', '友情提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(()=>{
+              apiOrg.getSimple(row.orgId).then(rrs=>{
+                 if(rrs.status==200){
+                    apiHRBP.getHRBP(rrs.result.kid).then(rs=>{
+                      if(rs.status==200 && rs.result.length>0){
+                          let hrbpUser=rs.result[0];
+                          let req={
+                             courseId:row.id,
+                             email:hrbpUser.email,
+                             courseUser:row.sysCreateBy,
+                             courseName:row.name,
+                             ucode:hrbpUser.user_no,
+                             auditUser:hrbpUser.real_name,
+                             ukid:hrbpUser.user_id,
+                             orgId:row.orgId,
+                             orgName:rs.result.orgnization_name_path+'/'+rrs.result.name
                           }
-                          if(res.status==400){
-                            $this.$message.error('提交失败:'+res.message);
-                          }
-                        })
-                    }else{
-                      $this.$message.error("获取HRBP审核人员失败:"+rs.message);
-                    }
-                  })
-               }else{
-                 $this.$message.error("处理资源归属失败，请重新设置资源归属");
-               }
-            })
-      })
+                          apiCourse.sumbits(req).then(res=>{
+                            if(res.status==200){
+                              $this.$message.success('提交成功');
+                              row.status=2
+                            }
+                            if(res.status==400){
+                              $this.$message.error('提交失败:'+res.message);
+                            }
+                          })
+                      }else{
+                        $this.$message.error("获取HRBP审核人员失败:"+rs.message);
+                      }
+                    })
+                 }else{
+                   $this.$message.error("处理资源归属失败，请重新设置资源归属");
+                 }
+              })
+        })
     },
     delItem(row) {
       this.$confirm('您确定要删除所选课程吗？', '删除提示', {
@@ -255,6 +257,23 @@ export default {
             const { status } = await apiCourse.del(params);
             if (status === 200) {
               this.$message.success('操作成功！');
+              //发送自己删除课程的事件,审核通过的，自己不能删除了
+              //  if(!row.erasable){
+              //   let event = {
+              //     key: "DeleteCourse",//被管理员删除
+              //     title: '自己删除课程',//事件的标题
+              //     parameters:"author:"+this.userInfo.aid,//自己删除自己的课程，作者就是当前人
+              //     content: '自己删除课程',//事件的内容
+              //     objId: row.id,//关联的id
+              //     objType: "1",//关联的类型
+              //     objInfo:row.name,
+              //     aid: this.userInfo.aid, //当前登录人的id
+              //     aname: this.userInfo.name,//当前人的姓名
+              //     status: 1 //状态，直接写1
+              //   }
+              //   this.$store.dispatch("userTrigger", event);
+              // }
+
               this.getList();
             }
           } catch (error) {
@@ -267,26 +286,26 @@ export default {
     },
     jumpRouter(item) {
       if (item.published) {
-        if (item.type == 10) {
+        // if (item.type == 10) {
           // let routeData = this.$router.resolve({ path: '/course/micro?id='+item.id});
           // window.open(this.webBaseUrl+routeData.href, '_blank');
         //  window.open(this.webBaseUrl + '/course/micro?id=' + item.id, '_blank');
-          this.$router.push({path:'/course/micro',query:{id:item.id}})
-        }
-        if (item.type == 20) {
+          // this.$router.push({path:'/course/micro',query:{id:item.id}})
+        // }
+        // if (item.type == 20) {
           // let routeData = this.$router.resolve({ path: '/course/detail?id='+item.id});
           // window.open(this.webBaseUrl+routeData.href, '_blank');
          // window.open(this.webBaseUrl + '/course/detail?id=' + item.id, '_blank');
          this.$router.push({path:'/course/detail',query:{id:item.id}})
-        }
+        // }
       } else {
-        if (item.type == 10) {
-        //  window.open(`${this.webBaseUrl}/course/microPreview?id=${item.id}`);
-         this.$router.push({path:'/course/microPreview',query:{id:item.id}})
-        } else {
+        // if (item.type == 10) {
+        // //  window.open(`${this.webBaseUrl}/course/microPreview?id=${item.id}`);
+        //  this.$router.push({path:'/course/microPreview',query:{id:item.id}})
+        // } else {
       //    window.open(`${this.webBaseUrl}/course/rePreview?id=${item.id}`);
        this.$router.push({path:'/course/rePreview',query:{id:item.id}})
-        }
+        // }
       }
     },
     findList() {
@@ -392,8 +411,9 @@ export default {
     line-height: 28px;
     padding: 0px 10px;
     .summary-item {
+      padding-top: 10px;
       height: 40px;
-      line-height: 20px;
+      line-height: 15px;
       color: #7d7d7d;
       font-size: 14px;
       overflow: hidden;
diff --git a/src/views/course/WaitAudit.vue b/src/views/course/WaitAudit.vue
index 0e05a890..7c28a764 100644
--- a/src/views/course/WaitAudit.vue
+++ b/src/views/course/WaitAudit.vue
@@ -311,12 +311,11 @@ export default {
     },
     //预览跳转页面
     toPreview(row) {
-     if(row.type == 10) {
-
-        window.open(`${this.webBaseUrl}/course/microPreview?id=${row.id}`);
-     } else{
+    //  if(row.type == 10) {
+    //     window.open(`${this.webBaseUrl}/course/microPreview?id=${row.id}`);
+    //  } else{
         window.open(`${this.webBaseUrl}/course/rePreview?id=${row.id}`);
-     }
+    //  }
 
     },
      // 直接审核
@@ -401,7 +400,7 @@ export default {
     },
     jumpDetails() {
       // 跳转打开新页面
-       let routeData = this.$router.resolve({ path: '/course/micro'});
+       let routeData = this.$router.resolve({ path: '/course/detail'});
        window.open(this.webBaseUrl+routeData.href, '_blank');
     },
     toExamine(row) {
diff --git a/src/views/error/401.vue b/src/views/error/401.vue
index 243c97df..2804b6e8 100644
--- a/src/views/error/401.vue
+++ b/src/views/error/401.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="errPage-container">
-    <el-button icon="arrow-left" class="pan-back-btn" @click="back">
-      返回
-    </el-button>
+  <div>
+    <portal-header current="article"></portal-header>
+    <div class="errPage-container">
+
     <el-row>
       <el-col :span="12">
         <h1 class="text-jumbo text-ginormous">
@@ -12,27 +12,30 @@
         <h6>对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面</h6>
         <ul class="list-unstyled">
           <li class="link-type">
-            <router-link to="/">
+            <router-link to="/index">
               回首页
             </router-link>
           </li>
         </ul>
       </el-col>
       <el-col :span="12">
-       
+
       </el-col>
     </el-row>
   </div>
+</div>
 </template>
 
 <script>
 
-
+import portalHeader from '@/components/PortalHeader.vue';
+import portalFooter from '@/components/PortalFooter.vue';
 export default {
   name: 'Page401',
+  components: { portalHeader, portalFooter},
   data() {
     return {
-      
+
     }
   },
   methods: {
diff --git a/src/views/error/404.vue b/src/views/error/404.vue
index 831d54cc..f33ad41f 100644
--- a/src/views/error/404.vue
+++ b/src/views/error/404.vue
@@ -1,31 +1,37 @@
 <template>
-  <div class="wscn-http404-container">
-    <div class="wscn-http404">
-      <div class="pic-404">
-       
-      </div>
-      <div class="bullshit">
-        <div class="bullshit__oops">
-          404错误!
+  <div>
+    <portal-header current="article"></portal-header>
+        <div class="wscn-http404-container">
+          <div class="wscn-http404">
+            <div class="pic-404">
+
+            </div>
+            <div class="bullshit">
+              <div class="bullshit__oops">
+                404错误!
+              </div>
+              <div class="bullshit__headline">
+                {{ message }}
+              </div>
+              <div class="bullshit__info">
+                对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。
+              </div>
+              <router-link to="/index" class="bullshit__return-home">
+                返回首页
+              </router-link>
+            </div>
+          </div>
         </div>
-        <div class="bullshit__headline">
-          {{ message }}
-        </div>
-        <div class="bullshit__info">
-          对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。
-        </div>
-        <router-link to="/" class="bullshit__return-home">
-          返回首页
-        </router-link>
-      </div>
-    </div>
+
   </div>
 </template>
 
 <script>
-
+import portalHeader from '@/components/PortalHeader.vue';
+import portalFooter from '@/components/PortalFooter.vue';
 export default {
   name: 'Page404',
+  components: { portalHeader, portalFooter},
   computed: {
     message() {
       return '找不到网页！'
@@ -36,14 +42,12 @@ export default {
 
 <style lang="scss" scoped>
 .wscn-http404-container{
-  transform: translate(-50%,-50%);
-  position: absolute;
-  top: 40%;
-  left: 50%;
+    width: 500px;
+    margin: 0px auto;
+    padding-top: 100px;
 }
 .wscn-http404 {
   position: relative;
-  width: 1200px;
   padding: 0 50px;
   overflow: hidden;
   .pic-404 {
diff --git a/src/views/error/500.vue b/src/views/error/500.vue
index c95e8fad..e5f0e35a 100644
--- a/src/views/error/500.vue
+++ b/src/views/error/500.vue
@@ -1,33 +1,36 @@
 <template>
-  <div class="errPage-container">
-    <el-button icon="arrow-left" class="pan-back-btn" @click="back">
-      返回
-    </el-button>
-    <el-row>
-      <el-col :span="12">
-        <h1 class="text-jumbo text-ginormous">
-          500错误!
-        </h1>
-        <h2>系统访问错误！</h2>
-        <h6>对不起，系统无法连接，请检查网络或咨询管理人员</h6>
-        <ul class="list-unstyled">
-          <li class="link-type">
-            <a  href="/web/">转向登录</a>
-          </li>
-        </ul>
-      </el-col>
-      <el-col :span="12">
+  <div>
+    <portal-header current="article"></portal-header>
+      <div class="errPage-container">
 
-      </el-col>
-    </el-row>
+        <el-row>
+          <el-col :span="12">
+            <h1 class="text-jumbo text-ginormous">
+              页面路径错误或500错误!
+            </h1>
+            <h2>系统访问错误！</h2>
+            <h6>对不起，系统无法连接，请检查网络或咨询管理人员</h6>
+            <ul class="list-unstyled">
+              <li class="link-type">
+                <a  href="/pc/login">转向登录</a>
+              </li>
+            </ul>
+          </el-col>
+          <el-col :span="12">
+
+          </el-col>
+        </el-row>
+
+      </div>
+    <portal-footer></portal-footer>
   </div>
 </template>
-
 <script>
-
-
+import portalHeader from '@/components/PortalHeader.vue';
+import portalFooter from '@/components/PortalFooter.vue';
 export default {
-  name: 'Page401',
+  name: 'Page500',
+  components: { portalHeader, portalFooter},
   data() {
     return {
 
diff --git a/src/views/exam/ExamList.vue b/src/views/exam/ExamList.vue
index 4a799a3f..7000a95f 100644
--- a/src/views/exam/ExamList.vue
+++ b/src/views/exam/ExamList.vue
@@ -765,7 +765,7 @@ export default {
            this.$message.error(res.message)
          } else {
           const link = document.createElement('a');// 创建a标签
-          let blob = new Blob([res],{type: 'application/vnd.ms-excel;charset=UTF-8'}); // 设置文件类型 
+          let blob = new Blob([res],{type: 'application/vnd.ms-excel;charset=UTF-8'}); // 设置文件类型
           link.style.display = "none";
           link.href = URL.createObjectURL(blob); // 创建URL
           link.setAttribute("download", "成绩.xls");
@@ -818,8 +818,6 @@ export default {
     pushResults(row){
       this.pushData.dlgTitle='推送【'+row.testName+'】';
       this.pushData.row = row;
-      this.pushData.keyword = '';
-      this.pushData.id = '';
       this.pushData.pushResultsShow = true;
       this.getUserGroup();
       this.getFindPage();
@@ -1056,7 +1054,8 @@ export default {
       //正式环境直接根据域名计算
       let urlPre=window.location.protocol+'//'+window.location.host;
       //this.qrcode = urlPre+'/mobile/pages/exam/exam?id=' + row.id
-      this.qrcode =urlPre+'/m?returnUrl='+urlPre+'/mobile/pages/login/loading?returnUrl='+urlPre+'/mobile/pages/exam/exam?id=' + row.id
+      let returnUrl=encodeURIComponent(urlPre+'/mobile/pages/login/loading?returnUrl=/pages/exam/exam?id=' + row.id);
+      this.qrcode =urlPre+'/m?returnUrl='+returnUrl;
       //通过配置来写
       //let urlPre=process.env.VUE_APP_BOE_MOBILE_URL;
       //this.qrcode = urlPre+'/mobile/pages/exam/exam?id=' + row.id
@@ -1187,8 +1186,7 @@ export default {
     // },
     viewResults(row) {
       this.viewResultsShow = true;
-      this.answerData.row=row;
-      this.answerData.word = '';
+     this.answerData.row=row;
       this.getResults();
     },
     getResults() {
@@ -1209,7 +1207,7 @@ export default {
     },
     //导入考试成绩
     exportAnswers(){
-      
+
     },
     handleSizeAnswerChange(val){
       this.answerData.pageSize = val
diff --git a/src/views/exam/MyExamTask.vue b/src/views/exam/MyExamTask.vue
index 035cc29c..a83c3db3 100644
--- a/src/views/exam/MyExamTask.vue
+++ b/src/views/exam/MyExamTask.vue
@@ -1,31 +1,32 @@
 <template>
   <!--我的独立考试-->
   <div>
-      <div style="display: flex; justify-content: flex-start;padding:12px 20px 10px 22px" >
+      <div style="display: flex; justify-content: flex-start;padding:12px 20px 20px 22px" >
         <!--查询-->
+        <div class="uc-center-page" style="margin-right:30px">我的考试</div>
         <div style="padding: 0px 0px">
           <el-select clearable v-model="status" placeholder="状态" style="width: 110px">
-            <el-option label="未开始" :value="0"></el-option>
+            <el-option label="全部" value=""></el-option>
+            <el-option label="待开始" :value="0"></el-option>
             <el-option label="进行中" :value="1"></el-option>
-            <el-option label="中断" :value="8"></el-option>
-            <el-option label="完成" :value="9"></el-option>
+            <el-option label="已完成" :value="9"></el-option>
+            <el-option label="过程中断" :value="8"></el-option>
           </el-select>
         </div>
-        <div style="padding-left: 10px">
+        <div style="padding-left: 16px">
           <el-input v-model="testName"  clearable placeholder="搜索名称"></el-input>
         </div>
-        <div class="button-class" style="padding-left: 10px"><el-button type="primary" icon="el-icon-search" @click="search()">搜索</el-button></div>
-        <div class="button-class" style="padding-left: 10px"><el-button type="primary" icon="el-icon-refresh-right"  @click="reset()">重置</el-button></div>
+        <div class="button-class" style="padding-left: 14px"><el-button type="primary" icon="el-icon-search" @click="search()">搜索</el-button></div>
+        <div class="button-class" style="padding-left: 14px"><el-button type="primary" icon="el-icon-refresh-right"  @click="reset()">重置</el-button></div>
 
       </div>
       <div>
 
         <div v-for="(item,idx) in taskList" :key="idx" class="titem">
-            <!-- <div><a :href="webBaseUrl+'/exam/test?id='+item.objId" target="_blank"> {{item.objId}}</a></div> -->
             <div class="task-info">
                <div @click="jumpRouter(item)" v-html="$keywordActiveShow(item.testName,testName)" class="task-tit one-line-ellipsis">
                </div>
-               <div class="task-text">
+               <!-- <div class="task-text">
                  考试状态：
                   <span v-if="item.status == 0">未开始</span>
                   <span v-if="item.status == 1">进行中</span>
@@ -34,9 +35,12 @@
                   <span style="margin-left: 20px;" v-if="item.status == 9">
                     分数：{{toScoreTow(item.score)}}
                   </span>
-               </div>
+               </div> -->
                <div class="task-time">
-                 入场时间：<span>{{ item.startTime}}</span>
+                <div><span style="color: #999999;">时间：</span> <span>{{ item.startTime}} 到 {{ item.endTime}}</span></div>
+                 <div><span style="color: #999999;">时长：</span>{{item.testDuration}}分钟</div>
+                 <div><span style="color: #999999;">总分：</span>100分</div>
+                 <div><span style="color: #999999;">成绩：</span><span style="color: #366fff;">{{toScoreTow(item.score)}}</span></div>
                </div>
           </div>
           <div class="task-btns" >
@@ -46,10 +50,6 @@
              <a v-if="item.status == 1 && 8" :href="webBaseUrl+'/exam/test?id='+item.testId" target="_blank" >
                <el-button  type="primary" size="small">继续考试</el-button>
             </a>
-             <!-- <a v-if="item.status == 9" :href="webBaseUrl+'/exam/test?id='+item.testId" target="_blank" >
-               <el-button  type="primary" size="small">回顾考试</el-button>
-            </a> -->
-            
                <el-button   type="primary" v-if="item.status == 9"  size="small" @click="jumpRouter(item)">查看</el-button>
           </div>
         </div>
@@ -65,14 +65,17 @@
               :total="total">
             </el-pagination>
           </div>
-          <div v-else>
-            <div v-if="taskList.length == 0">
-              <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
-              <div v-else class="zan-wu">暂无数据</div>
-              </div>
+          <div v-else class="home-no-list">
+            <img  :src="`${webBaseUrl}/images/nocouresimg.png`" alt="" srcset="">
+            <p class="text">您暂时没有考试哟</p>
+            <!-- <div v-if="taskList.length == 0"> -->
+              <!-- <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
+              <div v-else class="zan-wu">暂无数据</div> -->
+              <!-- </div> -->
             </div>
+
           </div>
-       
+
   </div>
 </template>
 
@@ -157,7 +160,7 @@
     // padding: 10px;
     border-bottom: 1px solid #e8e8e8;
     padding: 15px 0px;
-    margin: 0 10px;
+    margin: 10px 10px;
     .task-info{
       flex: 1;
       // padding: 0px 10px;
@@ -166,7 +169,7 @@
       font-size: 18px;
       color: #333;
       margin-top: -3px;
-      font-weight: 700;
+      font-weight: 600;
       }
       .task-text{
      color: #444;
@@ -176,6 +179,11 @@
       .task-time{
          color: #666;
          font-size: 14px;
+         margin-top: 18px;
+         display: flex;
+         div{
+          margin-right: 40px;
+         }
       }
     }
     .task-btns {
diff --git a/src/views/exam/Test.vue b/src/views/exam/Test.vue
index fd249b77..0f79de21 100644
--- a/src/views/exam/Test.vue
+++ b/src/views/exam/Test.vue
@@ -825,7 +825,7 @@ export default {
       //   this.$message.error('请先答题');
       //   return;
       // }
-    
+
       let localKey=this.postAnswerLocalKey+this.aloneExamAnswerId;
       let strAnswer=this.getAnswer();
       //一个题都没有答的情况，不能提交
@@ -869,7 +869,8 @@ export default {
       data.ucode = this.userInfo.userNo;
       if(!this.aloneExamAnswerId){
         //大字段在需要的时候才会提交
-        data.paperJson = JSON.stringify(this.paperQuestion);
+        //data.paperJson = JSON.stringify(this.paperQuestion);
+        data.paperJson = this.clearPagerJson();
       }
       data.scoreType=this.testPaper.scoringType;
       data.taskId = this.taskId;
diff --git a/src/views/examine/NotApproved.vue b/src/views/examine/NotApproved.vue
index 9ea5a3c6..dfa7d262 100644
--- a/src/views/examine/NotApproved.vue
+++ b/src/views/examine/NotApproved.vue
@@ -28,7 +28,7 @@
               <el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button>
           </el-col>
         </el-row>
-     
+
     </div>
     <!-- <div style="padding-left">
 
@@ -432,12 +432,11 @@ export default {
     },
     //预览跳转页面
     toPreview(row) {
-     if(row.type == 10) {
-
-        window.open(`${this.webBaseUrl}/course/microPreview?id=${row.id}`);
-     } else{
+    //  if(row.type == 10) {
+    //     window.open(`${this.webBaseUrl}/course/microPreview?id=${row.id}`);
+    //  } else{
         window.open(`${this.webBaseUrl}/course/rePreview?id=${row.id}`);
-     }
+    //  }
 
     },
      //直接审核
@@ -517,7 +516,7 @@ export default {
     },
     jumpDetails() {
       // 跳转打开新页面
-       let routeData = this.$router.resolve({ path: '/course/micro'});
+       let routeData = this.$router.resolve({ path: '/course/detail'});
        window.open(this.webBaseUrl+routeData.href, '_blank');
     },
     toExamine(row) {
@@ -527,6 +526,7 @@ export default {
       this.examin.examineName = row.name;
       this.auditInfo.pass=true;//审核状态重置回true
       this.auditInfo.remark = '';
+      this.auditInfo.pass=true;//审核状态重置回true
       this.dialogVisible = true;
     },
     enSure() {
diff --git a/src/views/homepage/Index.vue b/src/views/homepage/Index.vue
new file mode 100644
index 00000000..5201c164
--- /dev/null
+++ b/src/views/homepage/Index.vue
@@ -0,0 +1,342 @@
+<template>
+    <div class="home-page">
+        <top></top>
+        <div style="height:72px"></div>
+        <UcHeader></UcHeader>
+        <div v-show="showHomeNum==1">
+          <div style="text-align: center;padding-top: 100px;font-size: 26px;color: #cccccc;">此用户已关闭个人主页</div>
+        </div>
+        <div v-show="showHomeNum==2" class="home-page-box">
+            <router-view />
+            <div class="home-page-right">
+                <ul class="total-per">
+                    <li class="per-li pointer" @click="jumpAttention(2)">
+                        <span class="per-info">{{follow.passive}}</span>
+                        <span class="per-text">关注{{self?'我':'他'}}的人</span>
+                    </li>
+                    <li class="per-li pointer" @click="jumpAttention(1)">
+                        <span class="per-info">{{follow.initiative}}</span>
+                        <span class="per-text">{{self?'我':'他'}}关注的人</span>
+                    </li>
+                </ul>
+                <div style="padding-top:10px;">
+                    <p class="ach-title">{{self?'我':'TA'}}的成就</p>
+                    <ul class="ach-ul">
+                        <li v-for="ach in medalList" :key="ach.id" @click="jumach(ach)">
+                            <div class="ach-box" v-if="ach.medalId != 5">
+                                <medal-img style="width:52px;height:58px" :item="ach"></medal-img>
+                                <p>{{ach.medalName}}</p>
+                                <p>LV.{{ach.medalLevel}}</p>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+                <div style="padding-top:16px">
+                    <p class="ach-title">您可能想关注的人</p>
+                    <ul>
+                        <li class="pointer" v-for="ava in interestedList" :key="ava.aid">
+                            <div class="ava-info" v-if="ava.name">
+                                <author v-if="ava.aid"  :avatar="ava.avatar" :aid="ava.aid" :sex="ava.sex"></author>
+                                <div class="ava-text pointer" @click="toHome(ava)">
+                                    <p style="color: #333333;">{{ava.name}}</p>
+                                    <p style="color: #666666;">{{ava.sign}}</p>
+                                </div>
+                            </div>
+                           <!-- <img :src="baseUrl + ava.avatar" style="width: 48px;height: 480x;border-radius: 50%;"  /> -->
+                            
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+
+    </div>
+  </template>
+
+  <script>
+    import top from '../../layout/components/TopNav/Index.vue'
+    import UcHeader from '@/components/HomePage/homePage.vue'
+    import MedalImg from '@/components/Portal/medalImg.vue';
+    import apiStat from '@/api/phase2/stat.js';
+    import apiUserhobby from '@/api/phase2/userhobby.js';
+    import apiUser from "@/api/system/user.js";
+    import apiFollow from "@/api/phase2/userfollow.js";
+    import author from '@/components/Portal/authorImg.vue';
+    import { mapGetters } from 'vuex';
+
+    export default{
+        components:{top,UcHeader,MedalImg,author},
+        computed: {
+          ...mapGetters(['userInfo']),
+        },
+        data(){
+            return{
+                baseUrl:process.env.VUE_APP_FILE_BASE_URL,
+                showHomeNum:0,
+                self:false,
+                input:'',
+                activeName:'first',
+                pageId:'',
+                medalList:[],
+                interestedList:[],
+                follow:{
+                    initiative: 0,
+                    passive: 0
+                }
+            }
+        },
+        created() {
+          this.pageId = this.$xpage.getHomeId(this.$route);
+
+          if(!this.pageId){
+             this.$router.push({path:'/404'})
+          }else{
+             //代表不是自己的主页
+             let $this=this;
+             if(this.pageId!=this.userInfo.aid){
+               apiUser.home(this.pageId).then(res=>{
+                  if(res.status==200){
+                    if(res.result.showHome){
+                        $this.showHomeNum=2;
+                        this.init();
+                    }else{
+                        $this.showHomeNum=1;
+                    }
+                  }else{
+                    //如果加载失败，也是显示内容
+                     this.showHomeNum=2;
+                     this.init();
+                  }
+               })
+
+             }else{
+                this.showHomeNum=2;
+                this.init();
+             }
+
+
+          }
+
+        },
+        mounted() {
+           //console.log('自己='+this.userInfo.showHome);
+            if(this.pageId == this.userInfo.aid) {
+              this.self = true;
+            }
+        },
+      methods:{
+        jumach(ach){
+            //console.log(ach,'lmj')
+        },
+        toHome(ava) {
+            this.$router.push({path:this.$xpage.getHomePath(ava.aid)})
+        },
+        jumpAttention(num) {// 点击事件跳转关注
+            // this.$store.dispatch("setAttention", true);
+            let path=this.$route.path;
+            //console.log(path,'this.$router.path');
+            let idx=path.lastIndexOf('leaving');
+            if(idx>0){
+              //console.log(path.substring(0,idx-1),'this.$router.path');
+               //this.$router.push(path.substring(0,idx-1)+'?gz=7'+num)
+               let toUrl=process.env.VUE_APP_PUBLIC_PATH+path.substring(0,idx-1)+'?gz=7'+num;
+               location.href=toUrl
+            }else{
+               this.$bus.$emit('followIndex',num)
+            }
+
+
+        },
+        init(){
+          this.getMedal();
+          this.userhobbyInfo();
+          this.getFollow();
+        },
+        getFollow(){
+            apiFollow.counts(this.pageId).then(res=>{
+                if(res.status == 200) {
+                    this.follow = res.result;
+                }
+            })
+        },
+        userhobbyInfo() {
+            let $this=this;
+            $this.interestedList=[];
+            apiUserhobby.list(this.pageId).then(res=>{
+                if(res.status == 200) {
+                    let ids = res.result.map(item=>item.aid);
+                    const noReapetIds = [...new Set(ids)];
+                    apiUser.getByIds(noReapetIds).then(rs => {
+                        if (res.status == 200) {
+                           $this.interestedList = rs.result;
+                        } else {
+                           $this.$message.error(rs.message);
+                        }
+                    });
+                }
+            })
+        },
+        getMedal() {
+            apiStat.userMedal(this.pageId).then(res=>{
+               if(res.status == 200) {
+                  this.medalList = res.result;
+               }
+            })
+        },
+        handleClick() {
+
+        }
+       }
+      }
+  </script>
+
+  <style lang="scss" scoped>
+     .home-page{
+       ::v-deep .el-tabs__active-bar{
+          height: 4px;
+          border-radius: 3px;
+          background: #387DF7;
+          margin-top: 15px;
+        }
+        ::v-deep .el-tabs__item{
+            padding: 0 17px;
+            height: 55px;
+        }
+        ::v-deep .el-tabs__nav-wrap::after{
+            height: 1px;
+            background-color: 979797;
+        }
+        .home-page-box{
+            padding: 24px 84px;
+            display: flex;
+            .home-page-left{
+                flex: 1;
+                // width: 100%;
+                background: #FFFFFF;
+                border-radius: 4px;
+                padding: 25px 47px;
+                position: relative;
+                .book-input{
+                    position: absolute;
+                    right: 50px;
+                    width: 250px;
+                    height: 40px;
+                    border: 1px solid rgba(153,153,153,0.5);
+                    border-radius: 19px;
+                    span{
+                        display: inline-block;
+                        font-size: 14px;
+                        color: #999999;
+                        padding: 0 10px 0 16px;
+                        border-right:  1px solid rgba($color: #999999, $alpha: 0.48);
+                    }
+                    ::v-deep .el-input__inner{
+                        border: none !important;
+                    }
+                    ::v-deep .el-icon-search{
+                        color: #333333 !important;
+                    }
+                }
+                // display: flex;
+                .svg-icon{
+                    vertical-align: middle;
+                }
+                .tabs-info{
+                    font-size: 16px;
+                    color: #333333;
+                    margin-left: 4px;
+                }
+            }
+            .home-page-right{
+                padding: 40px 52px 18px 52px;
+                box-sizing: border-box;
+                background: #fff;
+                border-radius: 4px;
+                margin-left: 25px;
+                .total-per{
+                    display: flex;
+                    // justify-content: space-between;
+                    padding-bottom: 28px;
+                    border-bottom:  1px solid rgba($color: #999999, $alpha: 0.21);
+                    .per-li{
+                        width: 90px;
+                        text-align: center;
+                        margin: 0 25px;
+                        .per-info{
+                        display: block;
+                        font-size: 28px;
+                        font-weight: 600;
+                        color: #333333;
+                       }
+                       .per-text{
+                        font-size: 14px;
+                        color: #666666;
+                       }
+                    }
+
+                }
+                .ach-title{
+                    font-size: 18px;
+                    font-weight: 600;
+                    color: #333333;
+                }
+                .ach-ul{
+                    display: flex;
+                    flex-wrap: wrap;
+                    // justify-content: space-between;
+                    justify-content: flex-start;
+                    border-bottom:  1px solid rgba($color: #999999, $alpha: 0.21);
+                    padding-bottom: 4px;
+                    ::v-deep .ach-box{
+                        // flex: 33%;
+                        width: 58px;
+                        // margin: 0 auto;/
+                        text-align: center;
+                        margin: 0 17px;
+                        // margin-left: 22px;
+                        // margin-right:22px;
+                        margin-bottom: 18px;
+                        // &:nth-child(1){
+                        //     margin-left: 0px;
+                        // }
+                        .medal-text{
+                            font-size: 12px;
+                            transform: scale(.5);
+                            width: 58px;
+                        }
+                        .medal-icon .medal-level{
+                            top:18%;
+                            left:-6%;
+                        }
+                        .medal-icon .medal-name{
+                            bottom: 3%;
+                            left:-6%;
+                        }
+                        p{
+                            font-size: 14px;
+                            color: #333333;
+                            line-height: 20px;
+                        }
+
+                    }
+                }
+                .ava-info{
+                    display: flex;
+                    padding: 10px 0 30px 0;
+                    img{
+                        width: 48px;
+                        height: 48px;
+                    }
+                    .ava-text{
+                        padding: 2px 0;
+                        margin-left: 18px;
+                        font-size: 14px;
+                        display: flex;
+                        flex-direction: column;
+                        justify-content: space-between;
+                    }
+                }
+            }
+        }
+     }
+  </style>
diff --git a/src/views/homepage/leavingMessage.vue b/src/views/homepage/leavingMessage.vue
new file mode 100644
index 00000000..577af0c2
--- /dev/null
+++ b/src/views/homepage/leavingMessage.vue
@@ -0,0 +1,335 @@
+<template>
+    <!--评论组件-->
+    <div class="leaving-message">
+       <el-button @click="backto()" class="backbut"  icon="el-icon-arrow-left" type="text">返回主页</el-button>
+      <div style="margin-top:20px">
+        <el-input type="textarea" :rows="4" placeholder="请输入内容" v-model="textarea" maxlength="200" show-word-limit></el-input>
+        <el-button class="lea-btn" type="primary" @click="add()">发布</el-button>
+      </div>
+      <h6 class="lea-num">{{count}}条留言</h6>
+      <div>
+        <ul class="lea-ul">
+            <li class="lea-li" v-for="(item, idx) in leavingList" :key="item.id">
+                <div class="lev-li">
+                    <div class="li-img">
+                      <author-img :avatar="item.authorInfo.avatar" :aid="item.authorInfo.aid" :sex="item.authorInfo.sex"></author-img>
+                    </div>
+                    <div class="li-text">
+                        <p class="portal-title-tow">{{item.authorInfo.name}} <span class="portal-summary-text">{{item.authorInfo.sign}}</span></p>
+                        <p>{{item.content}}</p>
+                    </div>
+                    <div class="li-right">
+                      <div class="replys-icon" v-if="userInfo.aid == pageId"  @click="isReplys(item, idx)"><svg-icon style="margin-right: 4px;font-size: 14px;" icon-class="comment"></svg-icon>回复</div>
+                      <div style="margin-top:4px">
+                        <interactBar :type="7" :data="item" :comments="false" :shares="false" :views="false" :favorites="false"></interactBar>
+                      </div>
+                      <div class="replys-icon" style="margin-right:0px;margin-left:10px" v-if="userInfo.aid == pageId || userInfo.aid == item.sysCreateAid" @click="delReply(item)"><svg-icon icon-class="notedel" style="margin-right: 4px;font-size: 14px;"></svg-icon>删除</div>
+                    </div>
+                </div>
+                <!-- 回复框 -->
+                <div class="replys-input" style="padding-left: 60px;margin:10px 0" v-if="item.isReplys"> 
+                  <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="replysContent" maxlength="200" show-word-limit></el-input>
+                  <el-button class="lea-btn" type="primary" @click="addReplys()">回复</el-button>
+                </div>
+                <!-- 回复框 -->
+                <div class="lev-li-tow" v-for="(rep,index) in item.replysList" :key="index">
+                    <div class="lev-li">
+                        <div class="li-img"><author-img :avatar="rep.authorInfo.avatar" :aid="rep.authorInfo.aid" :sex="rep.authorInfo.sex"></author-img></div>
+                        <div class="li-text">
+                            <p class="portal-title-tow">{{rep.authorInfo.name}} <span class="portal-summary-text">{{rep.authorInfo.sign}}</span></p>
+                            <p>{{rep.content}}</p>
+                        </div>
+                        <div class="li-right">
+                          <!-- <interactBar :type="7" :data="rep" :comments="false" :shares="false" :views="false" :favorites="false"></interactBar> -->
+                          <div class="replys-icon" style="margin-right:0px;margin-left:10px"  v-if="userInfo.aid == pageId || userInfo.aid == item.sysCreateAid" @click="delReplySon(item,index)"><svg-icon icon-class="notedel" style="margin-right: 4px;font-size: 14px;"></svg-icon>删除</div>
+                        </div>
+                    </div>
+                </div>
+                
+            </li>
+        </ul>
+        <div style="text-align: center; margin-top:57px;" v-show="count > 0">
+            <el-pagination
+            background
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="page.pageIndex"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="count">
+            </el-pagination>
+        </div>
+      </div>
+    </div>
+  </template>
+  <script>
+    import showTime from '@/components/Portal/datetimeShow.vue'
+    import apiComment from '@/api/modules/comments.js'
+    import apiUser from '@/api/system/user.js'
+    import apiGuestbook from '@/api/phase2/guestbook.js'
+    import authorImg from '@/components/Portal/authorImg.vue';
+    // import author from '@/components/Portal/author.vue';
+    import interactBar from "@/components/Portal/interactBar.vue";
+    import { mapGetters } from 'vuex';
+    export default {
+        props:{
+
+        },
+      components:{showTime,authorImg,interactBar},
+      computed: {
+        ...mapGetters(['userInfo'])
+      },
+     data() {
+         return {
+            textarea:'',
+            replysContent:'',
+            leavingList:[],
+            count:0,
+            page:{
+              pageIndex:1,
+              pageSize:10,
+              aid:''
+            },
+            replysData:{
+              id:'',
+              reply:[],
+            }
+         }
+     },
+      created() {
+        this.pageId =this.$xpage.getHomeId(this.$route);
+        if(this.pageId){
+          this.getList();
+        }else{
+          this.$router.push({path:'/404'})
+        }
+      },
+      methods: {
+        backto(){
+          this.$router.go(-1);
+        },
+        delReplySon(item,index) { //子级的删除手动删掉，调用保存接口
+          item.replysList.splice(index,1);
+          let replysData = {
+            id:item.id,
+            reply:JSON.stringify(item.replysList)
+          }
+          apiGuestbook.answer(replysData).then(res=>{
+            if(res.status == 200) {
+               this.$message.success('删除留言成功');
+            }
+          })
+        },
+        delReply(item) {
+          this.$confirm('此操作将永久删除该留言, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            apiGuestbook.del(item.id).then(res=>{
+               if(res.status == 200) {
+                this.getList();
+                this.$message({type: 'success',message: '删除成功!' });
+               }
+            })
+          }).catch(() => {
+            this.$message({type: 'info', message: '已取消删除'});          
+          });
+        },
+        isReplys(item,idx) {
+          item.isReplys = true;
+          this.replysData.id = item.id;
+          this.replysData.reply = item.replysList;
+        },
+        addReplys() {
+          if(this.replysContent.trim().length  == 0) {
+            return this.$message.warning('请填写内容！');
+          }
+          this.replysData.reply.push({
+            content: this.replysContent,
+            authorInfo:this.userInfo,
+            praises:0,
+          })
+          this.replysData.reply = JSON.stringify(this.replysData.reply);
+          apiGuestbook.answer(this.replysData).then(res=>{
+            this.replysContent = '';
+            if(res.status == 200) {
+               this.$message.success('留言发布成功');
+               this.leavingList.forEach(item=>{
+                  item.isReplys = false;
+               })
+            }
+          })
+        },
+        getList() {
+          this.page.aid = this.pageId;
+          apiGuestbook.givelist(this.page).then(res=>{
+            if(res.status == 200) {
+              this.count = res.result.count;
+              res.result.list.forEach(item=>{
+                item.replysList = [];
+                item.isReplys = false;
+                item.authorInfo = { aid: "",name: "",orgInfo: "",avatar: "",sex: null,sign:'' }
+                if(item.replys != '') {
+                  item.replysList = JSON.parse(item.replys);
+                 }
+              })
+              this.leavingList = res.result.list;
+              this.getUserData(res.result.list);
+            }
+          })
+        },
+        add() {
+          if(this.textarea.trim().length  == 0) {
+            return this.$message.warning('请填写内容！');
+          }
+          let data = {
+            content:this.textarea,//留言内容
+            aid:this.pageId,//  要留言的人的id
+          }
+          apiGuestbook.save(data).then(res=>{
+             if(res.status == 200) {
+              this.textarea = '';
+              // this.leavingList.push(res.result);
+              this.getList();
+              this.$message.success('留言发布成功');
+             } else {
+              this.$message.error(res.message);
+             }
+          })
+        },
+        getUserData(list) {
+          if(this.pageId == this.userInfo.aid) {
+            let ids = list.map(item=> item.aid);
+            const noReapetIds = [...new Set(ids)];
+            apiUser.getByIds(noReapetIds).then(res => {
+                if (res.status == 200) {
+                    list.forEach((item, index) => {
+                        res.result.some(author => {
+                        if (author.aid == item.aid) {
+                            item.authorInfo = author;
+                            return true;
+                        } else {
+                            return false;
+                        }
+                    });
+                });
+                } else {
+                this.$message.error(res.message);
+                }
+            });
+          } else {
+            let ids = list.map(item=> item.sysCreateAid);
+            const noReapetIds = [...new Set(ids)];
+            apiUser.getByIds(noReapetIds).then(res => {
+                if (res.status == 200) {
+                    list.forEach((item, index) => {
+                        res.result.some(author => {
+                        if (author.aid == item.sysCreateAid) {
+                            item.authorInfo = author;
+                            return true;
+                        } else {
+                            return false;
+                        }
+                    });
+                });
+                } else {
+                this.$message.error(res.message);
+                }
+            });
+          }
+       },
+       handleSizeChange(val) {
+           this.page.pageSize = val;
+           this.page.pageIndex = 1;
+           this.getList();
+       },
+       handleCurrentChange(val) {
+           this.page.pageIndex = val;
+           this.getList();
+       },
+      }
+    }
+  </script>
+  
+  <style lang="scss" scoped>
+    .backbut{
+      position: absolute;
+      top: 10px;
+      left: 10px;
+    }
+  .leaving-message{
+    flex: 1;
+    background: #FFFFFF;
+    border-radius: 4px;
+    padding: 48px 48px;
+    position: relative;
+    .lea-btn {
+        float: right;
+        margin-top: 26px;
+        width: 80px;
+        height: 30px;
+        line-height: 10px;
+        background: #87B3FF;
+        box-shadow: 1px 2px 8px 1px rgba(56,125,247,0.31);
+        border-radius: 4px;
+        border: none;
+    }
+    .lea-num{
+        margin: 97px 0 0 0;
+        font-size: 20px;
+        font-weight: 600;
+        color: #333333;
+    }
+    .lea-ul{
+        margin: 46px 0 0 0;
+        .lev-li-tow{
+            margin-left: 60px;
+        }
+        .lev-li{
+            display: flex;
+            margin-top: 38px;
+            .li-img{
+               width: 40px;
+               height: 40px;
+               img{
+                width: 40px;
+                height: 40px;
+               }
+            }
+            .li-text{
+                flex: 100%;
+                margin: 0 40px 0 20px;
+                &:first-child{
+                  font-size: 16px !important;
+                }
+                p:last-child{
+                  margin-top: 16px;
+                  font-size: 14px;
+                  color: #333333;
+                }
+            }
+           .replys-input{
+            padding-left: 50px;
+              // display: flex;
+              // .el-textarea{
+              //   width: 80%;
+              // }
+            }
+            .li-right{
+              display: flex;
+              margin-top: 40px;
+              .replys-icon{
+                width: 50px;
+                color: #6E7B84;
+                font-size: 12px;
+                margin-right: 22px;
+                margin-top: 8px;
+              }
+            }
+        }
+    }
+}
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/homepage/page.vue b/src/views/homepage/page.vue
new file mode 100644
index 00000000..7f476fe5
--- /dev/null
+++ b/src/views/homepage/page.vue
@@ -0,0 +1,636 @@
+<template>
+    <div class="home-page-left">
+        <!-- <div class="book-input">
+            <span>分享书籍</span>
+            <el-input style="width:130px" v-model="input" placeholder="请输入内容"></el-input>
+            <i style="color: #333333" class="el-icon-search"></i>
+        </div> -->
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane name="">
+                <span slot="label"><svg-icon icon-class="home-dynamic" style="font-size: 30px;"></svg-icon> <span class="tabs-info">动态</span></span>
+                <template v-for="item in allPageList">
+                    <course-list v-if="item.contentType == 1" :list="[item]" :isDynamic="true" :personal="personal"  @hideIndex="dynamicHide"></course-list>
+                    <case-list v-if="item.contentType == 3" :list="[item]" :isDynamic="true" :personal="personal"  @hideIndex="dynamicHide"></case-list>
+                    <note-list v-if="item.contentType == 6" :list="[item]" :isDynamic="true" :personal="personal"  @hideIndex="dynamicHide"></note-list>
+                    <put-list v-if="item.contentType == 4" :list="[item]" :isDynamic="true" :personal="personal"  @hideIndex="dynamicHide"></put-list>
+                    <answer-list v-if="item.contentType == 5" :list="[item]" :isDynamic="true" :personal="personal"  @hideIndex="dynamicHide"></answer-list>
+                    <article-list v-if="item.contentType == 2" :list="[item]" :isDynamic="true" :personal="personal"  @hideIndex="dynamicHide"></article-list>
+                </template>
+            </el-tab-pane>
+            <el-tab-pane name="1">
+                <span slot="label"><svg-icon icon-class="home-course" style="font-size: 30px;"></svg-icon><span class="tabs-info">课程</span></span>
+                <course-list :list="cousrePageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></course-list>
+            </el-tab-pane>
+            <el-tab-pane name="3">
+                <span slot="label"><svg-icon icon-class="home-case" style="font-size: 30px;"></svg-icon><span class="tabs-info">案例</span></span>
+                <case-list :list="casePageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></case-list>
+            </el-tab-pane>
+            <el-tab-pane name="6">
+                <span slot="label"><svg-icon icon-class="home-note" style="font-size: 30px;"></svg-icon><span class="tabs-info">笔记</span></span>
+                <note-list :list="notePageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></note-list>
+            </el-tab-pane>
+            <el-tab-pane name="4">
+                <span slot="label"><svg-icon icon-class="home-qa" style="font-size: 30px;"></svg-icon><span class="tabs-info">提问</span></span>
+                <put-list :list="qaPageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></put-list>
+            </el-tab-pane>
+            <el-tab-pane name="5">
+                <span slot="label"><svg-icon icon-class="home-answer" style="font-size: 30px;"></svg-icon><span class="tabs-info">回答</span></span>
+                <answer-list :list="answerPageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></answer-list>
+            </el-tab-pane>
+            <el-tab-pane name="2">
+                <span slot="label"><svg-icon icon-class="home-article" style="font-size: 30px;"></svg-icon><span class="tabs-info">文章</span></span>
+                <article-list :list="articlePageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></article-list>
+            </el-tab-pane>
+            <el-tab-pane name="7">
+                <span slot="label"><svg-icon icon-class="home-follow" style="font-size: 30px;"></svg-icon><span class="tabs-info">关注</span></span>
+                <follow-list ref="followList"></follow-list>
+            </el-tab-pane>
+            <!-- <el-tab-pane name="8">
+                <span slot="label"><svg-icon icon-class="home-book" style="font-size: 30px;"></svg-icon><span class="tabs-info">书籍</span></span>
+                <book-list></book-list>
+            </el-tab-pane> -->
+        </el-tabs>
+        <div style="text-align: center; margin-top:57px;" v-show="page.count > 0 && activeName!='7'">
+            <el-pagination
+            background
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="page.pageIndex"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.count">
+            </el-pagination>
+        </div>
+        <div style="height:200px"></div>
+    </div>
+  </template>
+
+  <script>
+    import top from '../../layout/components/TopNav/Index.vue'
+    import UcHeader from '@/components/HomePage/homePage.vue'
+    import CaseList from '@/components/HomePage/caseList.vue'
+    import CourseList from '@/components/HomePage/courseList.vue'
+    import NoteList from "@/components/HomePage/noteList.vue"
+    import PutList from "@/components/HomePage/putTo.vue"
+    import AnswerList from "@/components/HomePage/answerList.vue"
+    import ArticleList from "@/components/HomePage/articleList.vue"
+    import FollowList from "@/components/HomePage/followList.vue"
+    import BookList from "@/components/HomePage/bookList.vue"
+    import apiStat from '@/api/phase2/stat.js';
+    import apiCourse from '@/api/modules/course.js'
+    import apiCourseStudy from '@/api/modules/courseStudy.js'
+    import apiArticle from '@/api/modules/article.js'
+    import apiCases from '@/api/modules/cases.js'
+    import apiQa from '@/api/modules/qa.js'
+    import apiNote from '@/api/phase2/note.js'
+    import { mapGetters,mapActions } from 'vuex';
+    import apiUser from "@/api/system/user.js";
+    import {cutFullName} from "@/utils/tools.js";
+    import apiDict from "@/api/modules/dict.js";
+    import ItemVue from '../../layout/components/Sidebar/Item.vue'
+
+    export default{
+        components:{top,UcHeader,CaseList,CourseList,NoteList,PutList,AnswerList,ArticleList,FollowList,BookList},
+        computed: {
+          ...mapGetters(['userInfo','majorTypeMap','orgDomainMap']),
+        },
+        data(){
+            return{
+                intTabIndex:-1,//初始化显示哪个tab,71我关注的人，72关注我的人
+                page:{
+                    pageIndex:1,
+                    pageSize:10,
+                    count:0
+                },
+                input:'',
+                activeName:'',
+                pageId:'',
+                // pageList:[],
+                casePageList:[],
+                notePageList:[],
+                articlePageList:[],
+                qaPageList:[],
+                answerPageList:[],
+                cousrePageList:[],
+                allPageList:[],
+                personal:false,
+                orgData:[],
+                Profess:[]
+            }
+        },
+        created(){
+          this.pageId = this.$xpage.getHomeId(this.$route);
+          if(this.pageId && this.pageId!=''){
+            this.init();
+          }else{
+            //this.$message.error("参数错误");
+            //跳转到错误页面
+            this.$router.push({path:'/404'})
+          }
+        },
+        watch:{
+          '$route' (to, from) { //监听路由是否变化
+
+          		  if(to.params.id != from.params.id){
+          			  this.pageId = to.params.id;
+                  let urlPre=window.location.protocol+'//'+window.location.host;
+                  location.href=urlPre+process.env.VUE_APP_PUBLIC_PATH+this.$xpage.getHomePath(this.pageId);
+          		  }
+           },
+        },
+        mounted() {
+            this.$bus.$on('followIndex',(num)=>{
+               this.activeName = "7";
+               this.$refs.followList.resetActive();
+               this.$refs.followList.getPage();
+            })
+        },
+        methods:{
+            init(){
+              if(this.pageId == this.userInfo.aid) {
+                this.personal = true;
+              }
+              this.loadMajorType();
+              this.loadOrgDomain();
+              //
+              this.intTabIndex=this.$route.query.gz;
+              if(this.intTabIndex){
+                 this.activeName='7';
+                 //是
+              }else{
+                this.getList();
+              }
+            },
+            dynamicHide(id){
+                apiStat.dynamicHide(id).then(res=>{
+                    if(res.status == 200){
+                      this.$message.success('动态隐藏成功')
+                      this.getList();
+                    } else {
+                      this.$message.error(res.message);
+                    }
+                })
+            },
+            ...mapActions({
+                loadMajorType:'majorType/loadMajorTypes',
+                loadOrgDomain:'orgDomain/loadOrgDomains'
+            }),
+            handleSizeChange(val) {
+                this.page.pageSize = val;
+                this.page.pageIndex = 1;
+                this.getList();
+            },
+            handleCurrentChange(val) {
+                this.page.pageIndex = val;
+                this.getList();
+            },
+            getList() {
+                let data = {
+                    pageIndex:this.page.pageIndex,
+                    pageSize:this.page.pageSize,
+                    contentType:this.activeName == 0? '':this.activeName,//内容类型
+                    aid:this.pageId, //指定用户的动态，
+                    hidden:this.pageId == this.userInfo.aid?'':false,//是否隐藏，不指定，查询全部
+                }
+                apiStat.userDynamicList(data).then(res=>{
+                   if(res.status == 200) {
+                    this.page.count = res.result.count;
+                    let ids = res.result.list.map(item=>item.contentId);
+                    const noReapetIds = [...new Set(ids)];
+                    res.result.list.forEach(item=>{
+                            item.info = {};
+                            item.authorInfo = {
+                                aid: "",
+                                name: "",
+                                orgInfo: "",
+                                avatar: "",
+                                sex: null
+                            }
+                            item.isAll = false;
+                        })
+                    if(this.activeName == 0) {// 动态处理
+                        this.getAllList(res.result.list)
+                    }
+                    if(this.activeName == 1){
+                        this.cousrePageList = res.result.list
+                        this.getCourse(noReapetIds,res.result.list);
+                    }
+                    if(this.activeName == 2) {
+                        this.articlePageList = res.result.list;
+                        this.getArticle(noReapetIds,res.result.list);
+                    }
+                    if(this.activeName == 3) {
+                        this.casePageList = res.result.list;
+                        this.getCase(noReapetIds,res.result.list);
+                    }
+                    if(this.activeName == 6) { // 笔记
+                        this.getNote(noReapetIds,res.result.list);
+                        this.notePageList = res.result.list;
+                    }
+                    if(this.activeName == 4) { // 提问
+                        this.qaPageList = res.result.list;
+                        this.getQa(noReapetIds,res.result.list);
+                    }
+                    if(this.activeName == 5) { // 回答
+                        this.answerPageList = res.result.list;
+                        this.getAnswer(ids,res.result.list);
+                    }
+                   }
+                })
+            },
+            getAllList(list) {
+                this.allPageList = [];
+                let casePageList=[];
+                let notePageList=[];
+                let articlePageList=[];
+                let qaPageList=[];
+                let answerPageList=[];
+                let cousrePageList=[];
+                list.forEach(item=>{
+                    if(item.contentType == 1) {
+                        cousrePageList.push(item);
+                    }
+                    if(item.contentType == 2) {
+                        articlePageList.push(item);
+                    }
+                    if(item.contentType == 3) {
+                        casePageList.push(item);
+                    }
+                    if(item.contentType == 4) {
+                        qaPageList.push(item);
+                    }
+                    if(item.contentType == 5) {
+                        answerPageList.push(item);
+                    }
+                    if(item.contentType == 6) {
+                        notePageList.push(item);
+                    }
+                })
+                let caseIds = casePageList.map(item=>item.contentId);
+                const noReapetCaseIds = [...new Set(caseIds)];
+                let articleIds = articlePageList.map(item=>item.contentId);
+                const noReapetArticleIds = [...new Set(articleIds)];
+                let cousreIds = cousrePageList.map(item=>item.contentId);
+                const noReapetCousreIds = [...new Set(cousreIds)];
+                let qaIds = qaPageList.map(item=>item.contentId);
+                const noReapetQaIds = [...new Set(qaIds)];
+                let anwerIds = answerPageList.map(item=>item.contentId);
+                const noReapetAnwerIds = [...new Set(anwerIds)];
+                let noteIds = notePageList.map(item=>item.contentId);
+                const noReapetNoteIds = [...new Set(noteIds)];
+                if(noReapetCaseIds.length > 0) {
+                    this.getCase(noReapetCaseIds,casePageList);
+                }
+                if(noReapetArticleIds.length > 0) {
+                    this.getArticle(noReapetArticleIds,articlePageList);
+                }
+                if(noReapetCousreIds.length > 0) {
+                    this.getCourse(noReapetCousreIds,cousrePageList);
+                }
+                if(noReapetQaIds.length > 0) {
+                    this.getQa(noReapetQaIds,qaPageList);
+                }
+                if(noReapetAnwerIds.length > 0) {
+                    this.getAnswer(noReapetAnwerIds,answerPageList);
+                }
+                if(noReapetNoteIds.length > 0) {
+                    this.getNote(noReapetNoteIds,notePageList);
+                }
+                this.allPageList.push(...casePageList,...articlePageList,...cousrePageList,...qaPageList,...answerPageList,...notePageList);
+                this.allPageList.sort(this.pcompare("eventTime", false))
+            },
+            pcompare(prop, rev) {
+                if (rev === undefined) {
+                    rev = 1;
+                } else {
+                    rev = rev ? 1 : -1;
+                }
+                return function(obj1, obj2) {
+                    let val1 = obj1[prop],
+                    val2 = obj2[prop];
+                    return val1 < val2 ? rev * -1 : rev * 1;
+                };
+            },
+            getAnswer(ids,list){
+                if(ids.length == 0){
+                   return
+                }
+                apiQa.answerIds(ids).then(res=>{
+                    if(res.status == 200) {
+                        list.forEach((item, index) => {
+                                res.result.some(con => {
+                                if (con.id == item.contentId) {
+                                    item.info = con;
+                                    item.info.comments = con.replays;
+                                    return true;
+                                } else {
+                                    return false;
+                                }
+                                });
+                            });
+                    }
+                })
+            },
+            getQa(ids,list){
+                apiQa.ids(ids).then(res=>{
+                    if(res.status == 200) {
+                        list.forEach((item, index) => {
+                                res.result.some(con => {
+                                if (con.id == item.contentId) {
+                                    item.info = con;
+                                    return true;
+                                } else {
+                                    return false;
+                                }
+                                });
+                            });
+                    }
+                    })
+            },
+            getNote(ids,list) {
+                apiNote.ids(ids).then(res=>{
+                  if(res.status == 200) {
+                    list.forEach((item, index) => {
+                            res.result.some(con => {
+                            if (con.id == item.contentId) {
+                                item.info = con;
+                                return true;
+                            } else {
+                                return false;
+                            }
+                            });
+                        });
+                   }
+                })
+            },
+            getCase(ids,list){
+                apiCases.ids(ids).then(res=>{
+                   if(res.status == 200) {
+                    list.forEach((item, index) => {
+                            res.result.some(con => {
+                            if (con.id == item.contentId) {
+                                item.info = con;
+                                if(typeof item.info.majorType == 'string') {
+                                    item.info.majorType = item.info.majorType.split(',');
+                                }
+                                return true;
+                            } else {
+                                return false;
+                            }
+                            });
+                        });
+                        this.getCaseUserData(list);
+                   }
+                })
+            },
+            getCaseUserData(list) {
+                // let ids = caseList.map((item, index) => {
+                //     return item.info.authorId;
+                // });
+                // const noReapetIds = [...new Set(ids)];
+                let data = list.filter((item, index) => {
+                    return item.info && item.info.authorId != null;
+                });
+                let ids = data.map((item, index) => {
+                    return item.info.authorId;
+                });
+                const noReapetIds = [...new Set(ids)];
+                apiUser.getByIds(noReapetIds).then(res => {
+                    if (res.status == 200) {
+                        list.forEach((item, index) => {
+                            res.result.some(author => {
+                            if (author.aid == item.info.authorId) {
+                                item.authorInfo = author;
+                                author.orgInfo=cutFullName(author.orgInfo,1);
+                                return true;
+                            } else {
+                                return false;
+                            }
+                        });
+                    });
+                    } else {
+                    this.$message.error(res.message);
+                    }
+                });
+            },
+            getArticle(ids,list){
+                apiArticle.ids(ids).then(res=>{
+                    if(res.status == 200) {
+                        list.forEach((item, index) => {
+                                res.result.some(con => {
+                                if (con.id == item.contentId) {
+                                    item.info = con;
+                                    return true;
+                                } else {
+                                    return false;
+                                }
+                                });
+                            });
+                        this.getArticleUserData(list);
+                   }
+                })
+            },
+            getArticleUserData(list) {
+                let data = list.filter((item, index) => {
+                    return item.info && item.info.sysCreateAid != null;
+                });
+                let ids = data.map((item, index) => {
+                    return item.info.sysCreateAid;
+                });
+                const noReapetIds = [...new Set(ids)];
+                apiUser.getByIds(noReapetIds).then(res => {
+                    if (res.status == 200) {
+                        list.forEach((item, index) => {
+                            res.result.some(author => {
+                            if (author.aid == item.info.sysCreateAid) {
+                                item.authorInfo = author;
+                                author.orgInfo=cutFullName(author.orgInfo,1);
+                                return true;
+                            } else {
+                                return false;
+                            }
+                        });
+                    });
+                    } else {
+                    this.$message.error(res.message);
+                    }
+                });
+            },
+            getCourse(ids,list) {
+                let aid = {}
+                let params = {
+                    ids:ids,
+                    aids:[this.userInfo.aid]
+                }
+                if(this.pageId != this.userInfo.aid) {
+                    params.aids = [this.pageId]
+                }
+                apiCourseStudy.followIds(params).then(res=>{
+                    if(res.status == 200) {
+                        list.forEach((item, index) => {
+                                res.result.some(con => {
+                                if (con.courseId == item.contentId) {
+                                    item.info = con;
+                                    return true;
+                                } else {
+                                    return false;
+                                }
+                                });
+                            });
+                   }
+                })
+            },
+            handleClick() {
+                if(this.activeName == '7') {
+                  //单独的分页，所以这里不与当前页面的分页共用
+                  this.$refs.followList.resetActive();
+                  this.$refs.followList.getPage();
+                  return
+                }
+                this.page.count = 0
+                if(this.activeName == '8') {
+                    this.page.count = 0;
+                    // console.log(this.$refs.followList,'this.$refs.followList');
+                    // this.$refs.followList.getPage();
+                   return
+                }
+                this.getList();
+            }
+        }
+      }
+  </script>
+
+  <style lang="scss" scoped>
+     .home-page{
+       ::v-deep .el-tabs__active-bar{
+          height: 4px;
+          border-radius: 3px;
+          background: #387DF7;
+          margin-top: 15px;
+        }
+        ::v-deep .el-tabs__item{
+            padding: 0 17px;
+            height: 55px;
+        }
+        ::v-deep .el-tabs__nav-wrap::after{
+            height: 1px;
+            background-color: 979797;
+        }
+        .home-page-box{
+            padding: 24px 84px;
+            display: flex;
+            .home-page-left{
+                flex: 1;
+                // width: 100%;
+                background: #FFFFFF;
+                border-radius: 4px;
+                padding: 25px 47px;
+                position: relative;
+                .book-input{
+                    position: absolute;
+                    right: 50px;
+                    width: 250px;
+                    height: 40px;
+                    border: 1px solid rgba(153,153,153,0.5);
+                    border-radius: 19px;
+                    span{
+                        display: inline-block;
+                        font-size: 14px;
+                        color: #999999;
+                        padding: 0 10px 0 16px;
+                        border-right:  1px solid rgba($color: #999999, $alpha: 0.48);
+                    }
+                    ::v-deep .el-input__inner{
+                        border: none !important;
+                    }
+                    ::v-deep .el-icon-search{
+                        color: #333333 !important;
+                    }
+                }
+                // display: flex;
+                .svg-icon{
+                    vertical-align: middle;
+                }
+                .tabs-info{
+                    font-size: 16px;
+                    color: #333333;
+                    margin-left: 4px;
+                }
+            }
+            .home-page-right{
+                padding: 40px 52px 18px 52px;
+                box-sizing: border-box;
+                background: #fff;
+                border-radius: 4px;
+                margin-left: 25px;
+                .total-per{
+                    display: flex;
+                    // justify-content: space-between;
+                    padding-bottom: 28px;
+                    border-bottom:  1px solid rgba($color: #999999, $alpha: 0.21);
+                    .per-li{
+                        width: 90px;
+                        text-align: center;
+                        margin: 0 25px;
+                        .per-info{
+                        display: block;
+                        font-size: 28px;
+                        font-weight: 600;
+                        color: #333333;
+                       }
+                       .per-text{
+                        font-size: 14px;
+                        color: #666666;
+                       }
+                    }
+
+                }
+                .ach-title{
+                    font-size: 18px;
+                    font-weight: 600;
+                    color: #333333;
+                }
+                .ach-ul{
+                    display: flex;
+                    flex-wrap: wrap;
+                    border-bottom:  1px solid rgba($color: #999999, $alpha: 0.21);
+                    padding-bottom: 4px;
+                    .ach-box{
+                        flex: 33%;
+                        width: 57px;
+                        text-align: center;
+                        margin-bottom: 18px;
+                        img{
+                            width: 52px;
+                            height: 58px;
+                            margin-bottom: 4px;
+                        }
+                        p{
+                            font-size: 14px;
+                            color: #333333;
+                            line-height: 20px;
+                        }
+
+                    }
+                }
+                .ava-info{
+                    display: flex;
+                    padding: 10px 0 30px 0;
+                    img{
+                        width: 48px;
+                        height: 48px;
+                    }
+                    .ava-text{
+                        padding: 2px 0;
+                        margin-left: 18px;
+                        font-size: 14px;
+                        display: flex;
+                        flex-direction: column;
+                        justify-content: space-between;
+                    }
+                }
+            }
+        }
+     }
+  </style>
diff --git a/src/views/medal/Index.vue b/src/views/medal/Index.vue
new file mode 100644
index 00000000..a854eb96
--- /dev/null
+++ b/src/views/medal/Index.vue
@@ -0,0 +1,420 @@
+<template>
+    <div class="medal-box">
+      <h6 class="medal-title">我的勋章 <span  class="text">  <router-link to="/user/urules" >勋章规则 <i class="el-icon-arrow-right"></i> </router-link></span> </h6>
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="全部勋章" name="first"></el-tab-pane>
+          <el-tab-pane label="学习勋章" name="second"></el-tab-pane>
+          <el-tab-pane label="社交勋章" name="third"></el-tab-pane>
+          <el-tab-pane label="成就勋章" name="fourth"></el-tab-pane>
+      </el-tabs>
+      <div class="medal-list" v-if="medalData.length > 0">
+            <div v-for="item in medalData" :key="item.id">
+                <div class="medal-index" v-if="item.medalId != 5">
+                    <medal-img :item="item"></medal-img>
+                    <p class="index-title">{{item.medalName}}</p>
+                    <p class="index-text">您已超过{{item.exceed}}人</p>
+                    <el-button class="btn" type="primary" @click="goView(item)">查看详情</el-button>
+                </div>
+                <div class="medal-index" v-else>
+                    <img style="width:143px;height:161px" :src="`${webBaseUrl}/images/login_medal.png`" alt="">
+                    <p class="index-title">{{item.medalName}}</p>
+                    <!-- <p class="index-text">您已超过{{item.exceed}}人</p> -->
+                    <el-button class="btn" style="margin-top:48px" type="primary" @click="showLoginMedal = true">查看详情</el-button>
+                </div>
+            </div>
+      </div>
+      <div v-else class="home-no-list">
+            <img class="img" style="width:360px;height:226px" :src="`${webBaseUrl}/images/homeWu/no-madel.png`" alt="" srcset="">
+            <p class="text" style="color: #333333;margin-top:50px;font-size: 14px">您目前还没有勋章哦～</p>
+      </div>
+      <el-dialog class="medal-dialog" title="提示" :visible.sync="dialogVisible" width="657px" top="13%">
+        <div class="medal-box">
+            <div class="medal-top">
+                <div>
+                    <h4 class="title-medal">{{medal.medalName}} <span style="font-weight: 600;">LV{{medal.medalLevel}}</span> </h4>
+                    <p class="title-medal-info">您已经超过 {{medal.exceed}} 人</p>
+                    <p class="title-medal-info" v-html="nextmsg"></p>
+                </div>
+                <div class="medal-img">
+                    <medal-img style="width:186px;height:210px" :item="medal"></medal-img>
+                </div>
+            </div>
+            <div class="medal-steps">
+                <el-steps :space="200" :active="medal.medalLevel-1">
+                    <el-step v-for="set in 8" :key="set" :title="'L'+set"></el-step>
+                </el-steps>
+            </div>
+            <el-table  :data="rules"   style="width: 100%;height:200px;overflow-y: auto;">
+                <el-table-column prop="name" angin="center" label="勋章" width="80">
+                    <template slot-scope="scope">
+                        <img style="width:40px;height:40px" :src="`${webBaseUrl}/images/medal.png`" alt="" srcset="">
+                        <!-- <medal-img class="table-medal" style="width:46px;height:52px" :item="medal"></medal-img> -->
+                    </template>
+                </el-table-column>
+                <el-table-column prop="level" angin="center" label="等级" width="80">
+                    <template slot-scope="scope">LV{{scope.row.level}}</template>
+                </el-table-column>
+                <el-table-column prop="remark" angin="center" label="获得条件">
+                </el-table-column>
+                <el-table-column prop="num" angin="center" width="120" label="获得人数">
+                    <template slot-scope="scope">{{scope.row.num?scope.row.num:0}}</template>
+                </el-table-column>
+            </el-table>
+          </div>
+        </el-dialog>
+        <el-dialog width="540px"  class="medalbox"  :visible.sync="showLoginMedal"  :append-to-body="true" >
+        <div class="jinian-medal-img" :style="`background: url(${webBaseUrl}/images/jinian_medal.png) no-repeat;`">
+           <!--登录勋章显示，根据UI显示修改-->
+           <span style="position: absolute; right:60px;top:60px;cursor: pointer;">
+             <img @click="showLoginMedal = false" :src="`${webBaseUrl}/images/close.png`" width="26px" height="26px" alt="">
+           </span>
+           <div style="text-align: center;"><img :src="`${webBaseUrl}/images/login_medal.png`" width="206px" height="269px" alt=""></div>
+           <div style="text-align: left;padding:20px 60px 100px 60px">
+             <div class="jntext1">感谢有你 一路相伴</div>
+             <div class="jntext2">勋章领取条件:</div>
+             <div class="jntext3">2022年10月31日-11月15日登录过平台学习的校友</div>
+           </div>
+        </div>
+    </el-dialog>
+    </div>
+  </template>
+
+  <script>
+    import apiStat from '@/api/phase2/stat.js';
+    import MedalImg from '@/components/Portal/medalImg.vue';
+    import { mapGetters } from 'vuex';
+      export default{
+          computed: {
+            ...mapGetters(['userInfo']),
+            nextmsg(){
+              let msg='';
+              if(this.medal.medalId){
+                if(this.medal.medalId==1){ //学习时长
+                    msg='继续学习 <span class="next-num">'+this.medal.dvalue+'</span> 小时可升级进入下一级';
+                }else if(this.medal.medalId==2){ //学习天数
+                    msg='继续学习 <span class="next-num">'+this.medal.dvalue+'</span> 天可升级进入下一级';
+                }else if(this.medal.medalId==3){ //上传的知识
+                    msg='继续发布 <span class="next-num">'+this.medal.dvalue+'</span> 个知识可升级进入下一级';
+                }else if(this.medal.medalId==4){ //被点赞数
+                    msg='再被点赞 <span class="next-num">'+this.medal.dvalue+'</span> 次可升级进入下一级';
+                }
+              }
+              return msg;
+            },
+            medalData(){
+            let data = [];
+            if(this.activeName == 'first') {
+                data = this.medalList
+            } else if(this.activeName == 'second') {
+                data = this.medalList.filter(item=>{
+                    return item.medalId == 1 || item.medalId == 2;
+                })
+            } else if(this.activeName == 'third') {
+                data = this.medalList.filter(item=>{
+                    return item.medalId == 4;
+                })
+            } else if(this.activeName == 'fourth') {
+                data = this.medalList.filter(item=>{
+                    return item.medalId == 3;
+                })
+            }
+            return data;
+            }
+          },
+          components: {
+            MedalImg
+          },
+          data(){
+              return{
+                showLoginMedal:false,
+                baseUrl:process.env.VUE_APP_FILE_BASE_URL,
+                activeName:'first',
+                dialogVisible:false,
+                medalList:[],
+                medal:{},
+                tableData:[],
+                medalConfig:[],
+                rules:[],
+              }
+          },
+          mounted() {
+             this.getMedal();
+             this.getConfig();
+          },
+        methods:{
+            
+            getConfig() {// 获取勋章配置
+                apiStat.userMedalConfig().then(res=>{
+                    if(res.status == 200) {
+                       this.medalConfig = res.result;
+                    }
+               })
+            },
+            goView(item) {
+              this.dialogVisible = true;
+              this.medal = item;
+
+              let data = this.medalConfig.find(it=>it.id ==item.medalId);
+              this.rules = JSON.parse(data.rules);
+              apiStat.userMedalLevelInfo(item.medalId).then(res=>{
+                 if(res.status == 200) {
+                    this.rules.forEach((it,index)=>{
+                        it.num = 0;
+                        res.result.some(con => {
+                            if (con.medalLevel == it.level) {
+                                it.num = con.currentLeverUserCount;
+                                this.$set(this.rules[index],this.rules[index].num,con.currentLeverUserCount)
+                                return true;
+                            } else {
+                                return false;
+                            }
+                        });
+                    })
+                 }
+              })
+            },
+            getMedal() {
+                apiStat.userMedal(this.userInfo.aid).then(res=>{
+                   if(res.status == 200) {
+                     this.medalList = res.result
+                   }
+                })
+            },
+            handleClick() {
+
+            }
+        }
+      }
+  </script>
+
+  <style lang="scss" scoped>
+  .medalbox {
+  background: transparent !important;
+ ::v-deep .el-dialog{
+   background: transparent !important;
+   box-shadow:none !important;
+   .el-dialog__header{
+     display: none !important;
+   }
+   .el-dialog__body{
+    //  width: 320px !important;
+    //  height: 420px !important;
+    background: transparent !important;
+   }
+}
+}
+.jinian-medal-img{
+  text-align: center;
+  padding-top: 10px;
+  .jntext1{
+    height: 56px;
+    font-size: 40px;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 600;
+    color: #924504;
+    line-height: 56px;
+  }
+  .jntext2{
+    margin-top: 30px;
+    height: 30px;
+    font-size: 22px;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 600;
+    color: #924504;
+    line-height: 30px;
+  }
+  .jntext3{
+    margin-top: 10px;
+    height: 50px;
+    font-size: 18px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #924504;
+    line-height: 25px;
+  }
+}
+    ::v-deep .el-dialog__body{
+        border-radius: 27px !important;
+    }
+    .next-num{
+      color:#333333;
+      font-size:18px;
+      font-weight: 600;
+    }
+   ::v-deep .table-medal{
+       .medal-text{
+        display: none;
+         font-size: 12px;
+        }
+    }
+   ::v-deep .el-dialog{
+        border-radius: 27px !important;
+    }
+    .medal-dialog{
+        ::v-deep .el-dialog__header{
+         display: none;
+       }
+       ::v-deep .el-dialog__body{
+         background: rgba(216, 216, 216, 0.1);
+         padding: 0;
+       }
+       .medal-box{
+        height: 538px;
+        border-radius: 27px !important;
+        background: linear-gradient(360deg, #FCFCFC 70%, #E1F0FD 90%, #E1F0FE 100%);
+        padding: 48px 16px 40px 60px;
+        .el-table{
+            background: #fcfcfc;
+        }
+        ::v-deep .el-table th.el-table__cell{
+            background: #fcfcfc;
+            font-size: 14px;
+            color: #666666;
+        }
+        ::v-deep .el-table th.el-table__cell.is-leaf {
+            border-bottom: 1px solid #fcfcfc;
+        }
+        ::v-deep .el-table td.el-table__cell{
+            border-bottom: 1px solid #fcfcfc;
+        }
+        ::v-deep .el-table::before{
+            background-color: none;
+        }
+        .medal-steps{
+            margin: 34px 0 60px 0;
+           ::v-deep .el-step__icon-inner{
+                display: none;
+            }
+            ::v-deep .el-step__head.is-finish {
+                .el-step__icon{
+                    width: 12px;
+                    height: 12px;
+                    background-color: #387DF7;
+                    margin-top: 7px;
+                }
+                .el-step__line{
+                    background-color: #387DF7;
+                }
+
+            }
+            ::v-deep .el-step__title.is-finish{
+                    font-size: 16px;
+                    color: #333333 !important;
+                }
+            ::v-deep .el-step__head.is-process{
+                 .el-step__icon{
+                    width: 20px;
+                    height: 20px;
+                    background: #387DF7;
+                    margin-top: 3px;
+                }
+            }
+            ::v-deep .el-step__head.is-wait {
+                .el-step__icon{
+                    width: 12px;
+                    height: 12px;
+                    background-color: #cedffa;
+                    margin-top: 7px;
+                }
+            }
+           ::v-deep .el-step__icon.is-text{
+            border: 2px solid #387DF7;
+           }
+           ::v-deep .el-step__line{
+            height: 4px;
+            background-color: #cedffa;
+            // border: 4px solid #387DF7;
+           }
+        }
+        .medal-top{
+            position: relative;
+            // display: flex;
+            h4{
+                margin: 0;
+            }
+            .title-medal{
+                font-weight: 400;
+                font-size: 28px;
+                color: #333333;
+            }
+            .title-medal-info{
+                font-size: 16px;
+                color: #666666;
+                margin-top: 14px;
+            }
+            ::v-deep .medal-img{
+              position: absolute;
+              right:84px;
+              top:-104px;
+              .medal-text{
+                font-size: 18px;
+                font-weight: 500;
+              }
+            }
+        }
+    }
+    }
+
+     .medal-box{
+        padding: 15px 18px;
+        .medal-list{
+            display: flex;
+            flex-wrap: wrap;
+        }
+        .medal-index{
+            width: 144px;
+
+            text-align: center;
+
+
+            .index-title{
+                margin-top: 26px;
+                font-size: 18px;
+                font-weight: 600;
+                color: #333333;
+            }
+            .index-text{
+                font-size: 14px;
+                font-weight: 400;
+                color: #666666;
+                margin-top: 10px;
+                margin-bottom: 24px;
+            }
+            .btn{
+                width: 140px;
+            }
+        }
+        .medal-title{
+            margin: 0;
+            font-size: 18px;
+            font-family: PingFangSC-Semibold, PingFang SC;
+            font-weight: 600;
+            color: #333333;
+            margin-bottom: 24px;
+            .text{
+                font-size: 14px;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #333333;
+                margin-left: 12px;
+            }
+        }
+        ::v-deep .el-tabs__item{
+            height: 46px;
+            font-size: 18px;
+            color: #666666;
+            padding: 0 30px;
+        }
+        ::v-deep .el-tabs__item.is-active{
+
+        }
+        ::v-deep .el-tabs__nav-wrap::after{
+            background-color: #fff !important;
+        }
+        ::v-deep .el-tabs__active-bar{
+            height: 4px;
+            width: 80px;
+            border-radius: 4px;
+        }
+     }
+  </style>
diff --git a/src/views/medal/urules.vue b/src/views/medal/urules.vue
new file mode 100644
index 00000000..3871b182
--- /dev/null
+++ b/src/views/medal/urules.vue
@@ -0,0 +1,231 @@
+<template>
+    <div class="rulesbox">
+        <div class="title">
+             <div class="exp-hear-text">
+              勋章规则
+               <span class="exp-hear-textbor"></span>
+            </div>
+        </div>
+        <div class="rules-content">
+            <div class="table-hear">
+                <div class="grade">勋章等级</div>
+                <div v-for="(ru, inx) in nameData" :class="(inx == 0 || inx == nameData.length -1)?'tabletime':'tabledata'" v-if="ru.id != 5"><span>{{ru.name}}</span></div>
+            </div>
+            <div class="table-content" v-for="item in rulesData">
+                <div style="line-height: 58px;" class="grade">LV.{{item.level}}</div>
+                <div class="cont-left">{{item.study}}</div>
+                <div class="cont-right">{{item.day}}</div>
+                <div class="cont-right" style="margin-left:-1%">{{item.steadily}}</div>
+                <div class="cont-left" style="margin-left:6%;margin-right:20px">{{item.popularity}}</div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import apiStat from '@/api/phase2/stat.js';
+export default {
+    data(){
+          return{
+            nameData:[],
+            rulesData:[],
+          }
+      },
+      mounted() {
+         this.getConfig();
+      },
+    methods:{
+        getConfig() {
+            apiStat.userMedalConfig().then(res=>{
+                let rulesData = [];
+                let studyList = [];
+                let dayList = [];
+                let steadilyList = [];
+                let popularityList = [];
+                if(res.status == 200){
+                  res.result.forEach(item => {
+                    item.rules = JSON.parse(item.rules);
+                    this.nameData.push({
+                        id: item.id,
+                        name: item.name
+                    })
+                    if(item.id == 1) {
+                        studyList = item.rules;
+                    }
+                    if(item.id == 2) {
+                        dayList = item.rules;
+                    }
+                    if(item.id == 3) {
+                        steadilyList = item.rules;
+                    }
+                    if(item.id == 4) {
+                        popularityList = item.rules;
+                    }
+                  });
+                  for (let index = 0; index < 8; index++) {
+                    rulesData.push({
+                        level:index+1,
+                        study: studyList[index].remark,
+                        day:dayList[index].remark,
+                        steadily:steadilyList[index].remark,
+                        popularity:popularityList[index].remark,
+                    })
+                    
+                  }
+                  this.rulesData = rulesData;
+                }
+            })
+        },
+    }
+    // userMedalConfig
+
+}
+</script>
+
+<style lang="scss" scoped>
+.table-content{
+    display: flex;
+    height: 58px;
+    .cont-left{
+        flex: 1;
+        margin-left: 10%;
+        // text-align: center;
+        font-size: 14px;
+        color: #666666;
+        font-weight: 400;
+        // line-height: 58px;
+        margin-top: 20px;
+        span{
+            font-size: 14px;
+            color: #333;
+            font-weight: 600;
+        }
+    }
+    .cont-right{
+        flex: 2;
+        margin-left: 4%;
+        // text-align: center;
+        font-size: 14px;
+        color: #666666;
+        font-weight: 400;
+        margin-top: 20px;
+        // line-height: 58px;
+        
+        span{
+            font-size: 14px;
+            color: #333;
+            font-weight: 600;
+        }
+        .text{
+            font-size: 12px;
+            font-weight: 400;
+            color: #999999;
+
+        }
+    }
+}
+.tabledata{
+            flex: 2;
+            margin-left: 8%;
+            text-align: center;
+            span{
+                display: inline-block;
+                width: 118px;
+                height: 27px;
+                background: linear-gradient(90deg, #00A8FF 0%, #74C6FF 100%);
+                box-shadow: 0px 4px 9px 0px rgba(146,212,255,0.57);
+                border-radius: 14px;
+                border: 1px solid #FFFFFF;
+                font-size: 14px;
+                font-weight: 600;
+                color: #FFFFFF;
+                text-align: center;
+                line-height: 24px;
+            }
+        }
+.grade{
+            width: 60px;
+            text-align: center;
+            font-size: 14px;
+            color: #333333;
+            font-weight: 600;
+        }
+ .tabletime{
+            flex: 1;
+            margin-left: 8%;
+            text-align: center;
+            span{
+                display: inline-block;
+                width: 118px;
+                height: 27px;
+                background: linear-gradient(90deg, #00A8FF 0%, #74C6FF 100%);
+                box-shadow: 0px 4px 9px 0px rgba(146,212,255,0.57);
+                border-radius: 14px;
+                border: 1px solid #FFFFFF;
+                font-size: 14px;
+                font-weight: 600;
+                color: #FFFFFF;
+                text-align: center;
+                line-height: 24px;
+            }
+
+        }
+.rules-content{
+    padding-left: 25px;
+    width: 100%;
+    .table-hear{
+        display: flex;
+        margin-bottom: 40px;
+        .tabledata{
+            flex: 2;
+            margin-left: 78px;
+            text-align: center;
+            span{
+                display: inline-block;
+                width: 118px;
+                height: 27px;
+                background: linear-gradient(90deg, #00A8FF 0%, #74C6FF 100%);
+                box-shadow: 0px 4px 9px 0px rgba(146,212,255,0.57);
+                border-radius: 14px;
+                border: 1px solid #FFFFFF;
+                font-size: 14px;
+                font-weight: 600;
+                color: #FFFFFF;
+                text-align: center;
+                line-height: 24px;
+            }
+        }
+    }
+    
+}
+.rulesbox{
+    .title{
+        width: 100%;
+        margin-bottom: 40px;
+        height: 50px;
+        .exp-hear-text {
+        float: left;
+        line-height: 65px;
+        margin-left: 25px;
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        position: relative;
+        z-index: 888;
+
+        .exp-hear-textbor {
+          width: 85px;
+          height: 8px;
+          background: linear-gradient(90deg, #6C91E7 0%, #0078FC 100%);
+          border-radius: 9px;
+          display: inline-block;
+          position: absolute;
+          left: -6px;
+          z-index: -1;
+          top: 60%;
+        }
+      }
+    }
+    
+}
+</style>
\ No newline at end of file
diff --git a/src/views/portal/article/Detail.vue b/src/views/portal/article/Detail.vue
index 04c6142e..6c88bd9f 100644
--- a/src/views/portal/article/Detail.vue
+++ b/src/views/portal/article/Detail.vue
@@ -1,95 +1,96 @@
 <template>
   <div id="article-index">
-    <portal-header current="article" :goSearch="3"></portal-header>
-    <div class="portal-content xcontent" style="margin-top: 30px;">
- <el-breadcrumb separator-class="el-icon-arrow-right" class="breadcrumb-nav">
-        <el-breadcrumb-item :to="{ path: '/article' }">文章列表</el-breadcrumb-item>
-        <el-breadcrumb-item>文章详情</el-breadcrumb-item>
-      </el-breadcrumb>
-      <div class="xrow" style="display: flex;justify-content: space-between;">
-         <div style="flex: 1;" class="xcol content-div">
-          <el-row  v-if="noData" >
-          <div>
-              <!-- <div v-else>我四娘娘</div> -->
-              <!-- <el-card :body-style="{ padding: '0px',background: '#f6f7fb' }" class="detail"> -->
-              <div class="detail">
+    <div class="article-banner">
+    <portal-header current="article" textColor="#ffffff" :goSearch="3"></portal-header>
+    </div>
+    <div style="padding-top:30px">
+      <div class="xcontent2">
+         <div class="xcontent2-main" style="margin-right: 30px;" >
+          <div  v-if="noData" >
+          <!--文章详细内容-->
+            <div class="detail">
+                <div class="xpage-detail-crumbs">
+                    <router-link to="/article"><span class="crumbs-first">文章列表</span></router-link>
+                    <span class="crumbs-line">/</span>
+                    <span class="crumbs-last">文章详情</span>
+                </div>
                 <div class="title">{{articleDetailData.title}}</div>
                 <div class="label">
                   <div style="margin-top: 5px;">
-                  <author :avatar="articleDetailData.avatar" :name="articleDetailData.name" :sex="articleDetailData.sex"></author>
+                      <author :aid="articleDetailData.sysCreateAid" :avatar="articleDetailData.avatar" :name="articleDetailData.name" :sex="articleDetailData.sex"></author>
                   </div>
-                  <div style="margin-top: 8px;">
-                  <time-show :time="articleDetailData.sysCreateTime"></time-show>
+                  <div style="margin-top: 8px;padding-left: 15px;font-size: 14px;">
+                    {{authorSign}}
+                  <!-- <time-show :time="articleDetailData.sysCreateTime"></time-show> -->
                   </div>
                   <!-- <author :avatar="articleDetailData.avatar" :name="articleDetailData.name" :info="articleDetailData.orgInfo" ></author> -->
-                   <!-- :readonly="true" -->
-                  <interactBar v-if="articleDetailData.id" :type="2" :data="articleDetailData" :comments="false" :praises="false" :views="false"></interactBar>
+                  <!-- :readonly="true" -->
+                  <!-- <interactBar v-if="articleDetailData.id" :type="2" :data="articleDetailData" :comments="false" :praises="false" :views="false"></interactBar> -->
                   <!-- <div style="padding-top: 5px;padding-left: 5px;"> 作者：{{ articleDetailData.name }}&emsp;&emsp;部门：{{ articleDetailData.orgInfo }}&emsp;&emsp;发布时间：<time-show :time="articleDetailData.sysCreateTime"></time-show> </div> -->
                 </div>
                 <div class="content ql-container">
                   <div class="ql-editor">
                   <div class="qltext" style="word-break:break-all; color:#121212" v-html="articleDetailData.content"></div>
                   </div>
-                  <!-- html内容 -->
-                  <!-- <img v-if="$route.query.id==1" style="width: 100%;" :src="`${webBaseUrl}/temp/articleOne.png`"/> -->
-                  <!-- <div v-if="$route.query.id==1">我是谁</div> -->
-                  <!-- <img v-else-if="$route.query.id==2" style="width: 100%;" :src="`${webBaseUrl}/temp/articleTwo.png`"/> -->
-                  <!-- <img v-else style="width: 100%;" :src="`${webBaseUrl}/temp/articleTwo.png`"/> -->
-                  <!-- html内容-->
-                  <!-- <img :src="process.env.VUE_APP_FILE_BASE_URL+articleDetailData."/> -->
                 </div>
               <!-- </el-card> -->
                 <div style="margin-top:10px;">
-                <interactBar :type="2" :data="articleDetailData" :theme='2' :comments="false" :views="false"></interactBar>
+                <interactBar :type="2" :data="articleDetailData" :theme='1' :shares="true" ></interactBar>
                 </div>
-              </div>
-
+            </div>
+          <!--评论, 修改边距调整-->
+            <div>
+              <comments v-if="articleId!=''" @success="success" :obj-type="2" :obj-id="articleId" :toUsers="toUsers" :authorId="articleDetailData.sysCreateAid"></comments>
+            </div>
           </div>
-          <!--评论-->
-          <div>
-            <comments v-if="articleId!=''" @success="success" :obj-type="2" :obj-id="articleId" :toUsers="toUsers" :authorId="articleDetailData.sysCreateAid"></comments>
-          </div>
-          </el-row>
           <div v-else>
             <el-empty :image-size="200"></el-empty>
           </div>
          </div>
-         <div style="width: 245px;margin-left: 5px;">
-
-             <el-row class="right-box">
-      
-       
-         <div id="article-detail">    
-            <el-button @click="openDialog" style="width: 100%;height: 37px;border-radius: 0;margin-bottom:15px;" type="primary">写文章</el-button>
-         <el-card class="ranking-card">
-           <div slot="header">
-             <span style="font-size: 14px;font-weight: 600;color: #333333;">贡献榜</span>
-           </div>
-           <div style="padding-bottom:10px">
-             <!-- <el-row class="ranking-title">
-               <el-col :offset="4" :span="10" style="color: #333333;font-size: 14px;">姓名</el-col>
-               <el-col :span="10" style="text-align: right;color: #333333;font-size: 14px;">贡献度</el-col>
-             </el-row> -->
-             <el-row class="ranking-title  bacolor" v-for="(item, index) in ankingList" :key="index" >
-               <el-col :span="6" style="height:34px">
-                 <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                 <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                 <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                 <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-               </el-col>
-               <el-col :span="18" class="one-line-ellipsis"> {{ item.sysCreateUname }}</el-col>
-             </el-row>
-           </div>
-         </el-card>
-         </div>
-
-       
-     </el-row>
+         <div class="xcontent2-minor">
+          <div>
+            <div class="portal-model-btn pointer" @click="openDialog">
+                    <svg-icon style="margin-right: 10px;font-size: 24px;" icon-class="addArticle"></svg-icon>
+                    写文章
+              </div>
+           <div id="articleAnking">
+              
+              <div class="portal-ranking ranking-bg">
+                <p class="ranking-title">贡献榜</p>
+                <ul class="ranking-data">
+                    <li class="index-one-line-ellipsis" v-for="(item, index) in ankingList" :key="index" style="margin-top:30px;line-height: 22px;cursor: pointer;">
+                      <router-link  :to="'article/detail?id=' + item.id">
+                        <span class="portal-right-text orange-one" v-if="index==0" style="margin-right:20px">
+                          <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
+                        </span>
+                        <span class="portal-right-text orange-tow" v-if="index==1" style="margin-right:20px">
+                            <img :src="`${webBaseUrl}/images/list02.png`" alt="">
+                        </span>
+                        <span class="portal-right-text orange-three" v-if="index==2" style="margin-right:20px">
+                            <img :src="`${webBaseUrl}/images/list03.png`" alt="">
+                        </span>
+                        <span class="portal-right-text" v-if="index==3" style="margin-right:20px">
+                             <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                        </span>
+                         <span class="portal-right-text" v-if="index==4" style="margin-right:20px">
+                             <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                        </span>
+                        <span class="portal-title-desc">{{ item.sysCreateUname }} <span class="orinfo-text">{{ item.orinfo }}</span>  </span>
+                         </router-link>
+                    </li>
+                </ul>
+              </div>
+              <!-- <div class="course-resources pointer"> -->
+                <!-- 资源位 -->
+                <!-- <img @click="banJump()" :src="fileBaseUrl + resonimg.image" alt=""> -->
+              <!-- </div> -->
+          </div>
+            </div>
          </div>
       </div>
-   
-     
-     
+
+
+
 
       <!--以下是评论信息-->
 
@@ -121,9 +122,11 @@ import apiPraises from '@/api/modules/praises.js';
 import apiShares from '@/api/modules/shares.js';
 import apiFavorites from '@/api/modules/favorites.js';
 import editItems from '@/components/Article/editItems.vue';
+import {cutOrgNamePath} from "@/utils/tools.js";
 import "quill/dist/quill.core.css";
 import "quill/dist/quill.snow.css";
 import "quill/dist/quill.bubble.css";
+import apiPlace from "@/api/phase2/place.js"
 export default {
   components: { portalHeader, portalFooter,interactBar,comments,timeShow,author,editItems,portalFloatTools},
   computed: {
@@ -131,17 +134,22 @@ export default {
   },
   data() {
     return {
+      ankIds:[],
+      resonimg:{},
+      fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
       noData:true,
       shareInfo:{
         name:'',
         load:false,
         list:[]
       },
+      authorSign:'',//个性签名
       shareShow:false,
       toUsers: [],
       articleId:'',
       shareUsers:[],
       articleDetailData:{
+        sysCreateAid:'',
         avatar:'',
         name:'',
         orgInfo:'',
@@ -152,6 +160,7 @@ export default {
       diagSync:false,//控制弹窗
       isPraise:false,
       isFavorite: false,
+      setTime: null
     };
   },
   created(){
@@ -167,22 +176,37 @@ export default {
       "scroll",
       this.handleScroll
     );
+    this.couresreso();
   },
   beforeDestroy(){
     window.removeEventListener("scroll",this.handleScroll);
+    clearInterval(this.setTime);
   },
   methods: {
+    banJump() {
+      if(this.resonimg.JumpUrl) {
+        window.open(this.resonimg.JumpUrl);
+      }
+    },
+    couresreso(){
+      let key = 'article';
+      apiPlace.detail(key).then(res=>{
+        let lmj =  JSON.parse(res.result.content)
+        this.resonimg = lmj[0]
+      })
+    },
       handleScroll() {
       let el_anking = document.querySelector('#articleAnking');
       //console.log(el_anking.clientWidth,'clientWidth');
       //el_anking.wid
       let innerHeight = document.querySelector('#article-index').clientHeight
+      let outerWidth = el_anking.clientWidth;
       let outerHeight = document.documentElement.clientHeight
       let scrollTop = document.documentElement.scrollTop
          if(scrollTop > 400) {
-          document.querySelector('#article-detail').style.cssText = "position: fixed;top: 0;width:242.5px";
+          document.querySelector('#articleAnking').style.cssText = "position: fixed;top: 0;width:"+outerWidth+"px";
         } else {
-          document.querySelector('#article-detail').style.cssText = "position: static";
+          document.querySelector('#articleAnking').style.cssText = "position: static";
         }
   },
     saveSuccess(data){
@@ -195,14 +219,32 @@ export default {
       this.diagSync=true
     },
     getAnkingData() {
+      let $this=this;
       apiArticle.countsUsername(5).then(res => {
         if (res.status == 200) {
-          this.ankingList = res.result;
+          let ids = [];
+          res.result.forEach(item =>{
+            item.orinfo='';
+            ids.push(item.sysCreateAid);
+          })
+          $this.ankingList = res.result;
+          apiUser.getByIds(ids).then(rs=>{
+              rs.result.forEach(u=>{
+                $this.ankingList.forEach((sub) => {
+                    if(sub.sysCreateAid==u.aid){
+                      sub.orinfo=cutOrgNamePath(u.orgInfo);
+                    }
+                })
+              })
+              // console.log(this.ankingList);
+          })
+
         }
       });
     },
     //获取文章详细信息
     getArticleDetail(){
+      let $this=this;
       apiArticle.detail(this.articleId,true).then(res=>{
         if(res.status==200){
           res.result.avatar='';
@@ -212,6 +254,27 @@ export default {
           this.articleDetailData=res.result;
           //if(this.articleDetailData.toString()!='{}'){
             this.getAuthorInfo(this.articleDetailData)
+            let event = {
+              key: "ViewArticle",//后台的事件key  发布文章且审核通过
+              title: "查看文章",//事件的标题
+              parameters:"",//用户自定义参数 name:value,name:value
+              content: "查看了文章",//事件的内容
+              source:'page',
+              objId: this.articleId,//关联的id
+              objType: "2",//关联的类型
+              objInfo: this.articleDetailData.title,
+              aid: this.userInfo.aid, //当前登录人的id
+              aname: this.userInfo.name,//当前人的姓名
+              status: 1 //状态，直接写1
+            }
+            this.$store.dispatch("userTrigger", event);
+            this.setTime = setTimeout(()=>{
+              event.key = 'ReadArticle';
+              event.title = "阅读文章";
+              event.parameters='second:60';//增加60秒的学习时长
+              event.content = "阅读了文章"
+              $this.$store.dispatch("userTrigger", event);
+            },61000);//1分钟后记录
           //}
         }else{
           this.noData = false;
@@ -226,6 +289,7 @@ export default {
       let ids=[data.sysCreateAid]
       apiUser.getByIds(ids).then(res=>{
         if(res.status==200){
+          this.authorSign=res.result[0].sign;
           this.articleDetailData=Object.assign(this.articleDetailData,res.result[0])
           this.toUsers = [
             {name: res.result[0].name,  aid:res.result[0].aid ,sex:res.result[0].sex}
@@ -248,7 +312,38 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.orinfo-text{
+  font-size: 13px;
+  color: #666666;
+  font-weight: 400;
+}
+  .article-banner{
+    height: 240px;
+    background: url('../../../../public/images/article-banner.png');
+  }
+.course-resources{
 
+  margin-top: 26px;
+  img{
+    width: 100%;
+    height: 100%;
+    border-radius: 8px;
+  }
+}
+
+.write-art{
+    width: 410px;
+    height: 67px;
+    text-align: center;
+    // line-height: 67px;
+    background: #DDEDFF;
+    border-radius: 8px;
+    font-size: 18px;
+    font-weight: 500;
+    border: none;
+    color: #387DF7;
+    margin-bottom: 22px;
+  }
 ::v-deep .el-card__body{
     padding: 0;
   }
@@ -272,14 +367,14 @@ export default {
 }
 .detail {
   background-color: #fff;
-  padding: 5px 20px 10px 20px;
+  padding: 50px;
   .title {
     font-size: 22px;
     text-align: center;
     line-height: 33px;
     color: #121212 ;
     font-weight: 500;
-    margin-top: 20px;
+    margin-top: 30px;
     word-break:break-all;
   }
   .label {
@@ -329,52 +424,4 @@ export default {
   }
 }
 
-.right-box {
-  .add-btn {
-    width: 100%;
-    padding: 15px 0;
-  }
-  .ranking-title {
-    line-height: 34px;
-    .center-titlt{
-      font-size: 15px;
-      color: #333333;
-    }
-    .center{
-      text-align: right;
-    }
-    img{
-      margin-top: 5px;
-    }
-  }
-  .ranking-data {
-    margin: 10px 0;
-    color: #999999;
-  }
-}
-// .ref-article-div {
-//   background-color: #fff;
-//   .change {
-//     float: right;
-//   }
-//   .list-item {
-//     padding: 5px 10px;
-//   }
-//   .list-item:not(:last-child) {
-//     border-bottom: 1px solid #dfdfdf;
-//   }
-//   img {
-//     width: 120px;
-//     border: 1px solid #eee;
-//     border-radius: 5px;
-//     vertical-align: middle;
-//   }
-//   .an-div {
-//     text-align: left;
-//     .tip {
-//       line-height: 35px;
-//       color: #666;
-//     }
-//   }
-// }
 </style>
diff --git a/src/views/portal/article/Index.vue b/src/views/portal/article/Index.vue
index 3bb704d7..0a38ff0a 100644
--- a/src/views/portal/article/Index.vue
+++ b/src/views/portal/article/Index.vue
@@ -1,144 +1,119 @@
 2<template>
   <div id="article-list-content" class="article-list-content">
-    <portal-header current="article" @emitInput="emitInput"></portal-header>
-    <div class="xcontent portal-content">
-      <div class="xrow" style="display: flex;justify-content: space-between;">
-         <div style="flex: 1;" class="xcol content-div">
-         <el-row>
-          <el-card :body-style="{ padding: '0px' }" class="left-div">
-            <el-row class="search-div">
-              <el-col>
-              <!-- <el-input  placeholder="请输入关键词搜索" clearable v-model="articleList.keyword" maxlength="20">
-                <el-button slot="append" icon="el-icon-search" @click="searchData()"></el-button>
-              </el-input> -->
-              <!-- <div class="tip">
-                热门搜索词：
-                <span v-for="(item, index) in searchRecords" :key="index" @click="useHotword(item)">{{ item.keyword }}</span>
-              </div> -->
-              </el-col>
-            </el-row>
-            <el-row class="order-div">
-              <div class="quyer-tag">
-                  <el-button
-                  type="text"
-                  class="order-class"
-                  @click="getData(2)"
-                  :class="{ actice: articleList.order == 2 }">
-                  最热
-                </el-button>
-                <el-button
-                  type="text"
-                  class="order-class"
-                  @click="getData(1)"
-                  :class="{ actice: articleList.order == 1 }">
-                  最新
-                </el-button>
-
+    <div class="article-banner">
+      <portal-header current="article" textColor="#ffffff" @emitInput="emitInput"></portal-header>
+    </div>
+    <!--内容区域-->
+    <div style="padding-top:30px" class="">
+      <div class="xcontent2">
+        <div class="xcontent2-main" style="margin-right: 30px;background-color: #fff;padding-top: 50px;">
+          <div>
+            <div style="padding:0px" class="left-div">
+              <div class="order-div">
+                <div class="quyer-tag">
+                  <el-button type="text" class="order-class" @click="getData(2)" :class="{ actice: articleList.order == 2 }"> 最热 </el-button>
+                  <el-button type="text" class="order-class" @click="getData(1)" :class="{ actice: articleList.order == 1 }"> 最新 </el-button>
+                </div>
+                <span class="more"></span>
               </div>
-              <span class="more"></span>
-            </el-row>
-            <div class="data-content" v-if="articleList.list.length > 0">
-              <div :span="24" v-for="(article, aidx) in articleList.list" :key="aidx" class="article-list">
-                <div class="article-info">
-                  <!--title-->
-                   <router-link  :to="'article/detail?id=' + article.id">
-                     <div style="display: flex;justify-content: space-between;margin-bottom: 10px;">
-                         <div class="article-title one-line-ellipsis" v-html="$keywordActiveShow(article.title,articleList.keyword)"></div>
-                         <div class="article-info-date"><i class="el-icon-time"></i> {{article.sysCreateTime.substring(0,10)}}</div>
-                     </div>
-                   </router-link>
-                  <!--body-->
-                  <div class="article-body" style="display: flex;justify-content: space-between;">
-                    <router-link  :to="'article/detail?id=' + article.id">
-                       <div class="article-image" v-if="article.coverurl">
-                         <article-image :article="article"></article-image>
+              <div class="data-content" v-if="articleList.list.length > 0">
+                <div v-for="(article, aidx) in articleList.list" :key="aidx" class="article-list">
+                  <div class="article-info">
+                    <!--title-->
+                     <router-link  :to="'article/detail?id=' + article.id">
+                       <div style="display: flex;justify-content: space-between;margin-bottom: 10px;">
+                           <div class="article-title one-line-ellipsis" v-html="$keywordActiveShow(article.title,articleList.keyword)"></div>
+                           <div class="article-info-date"><i style="font-size:14px" class="el-icon-time"></i> {{article.sysCreateTime}}</div>
                        </div>
                      </router-link>
-                      <div style="flex: 1;">
+                    <!--body-->
+                    <div class="article-body" style="display: flex;justify-content: space-between;">
+
+                        <div style="flex: 1;">
+                            <router-link  :to="'article/detail?id=' + article.id">
+                              <div style="padding-top: 5px;">
+                                <div class="article-info-summary" :style="{height:article.coverurl==''? '50px':'100px'}" :class="article.coverurl==''? 'two-line-ellipsis':'four-line-ellipsis'">{{ article.summary }}</div>
+                              </div>
+                            </router-link>
+                        </div>
                           <router-link  :to="'article/detail?id=' + article.id">
-                            <div style="padding-top: 5px;">
-                              <div class="article-info-summary" :style="{height:article.coverurl==''? '50px':'100px'}" :class="article.coverurl==''? 'two-line-ellipsis':'four-line-ellipsis'">{{ article.summary }}</div>
-                            </div>
-                          </router-link>
-                      </div>
-                  </div>
-                  <!--互动内容-->
-                  <div style="display: flex;justify-content:flex-start;align-items: center;margin-top: 0px;">
-                      <!-- <div style="width: 120px;"> -->
-                        <author :avatar="article.authorInfo.avatar" :name="article.sysCreateBy" :sex="article.authorInfo.sex"></author>
-                      <!-- </div> -->
-                      <!-- <div> -->
-                        <interactBar nodeWidth="60px" :readonly="true" :type="2" :data="article" :views="false"></interactBar>
-                      <!-- </div> -->
-                      <!-- <author :avatar="article.authorInfo.avatar" :name="article.sysCreateBy" :info="article.authorInfo.orgInfo"></author> -->
+                         <div class="article-image" v-if="article.coverurl">
+                           <article-image :article="article"></article-image>
+                         </div>
+                       </router-link>
+                    </div>
+                    <!--互动内容-->
+                    <div style="display: flex;justify-content:flex-start;align-items: center;margin-top: 0px;">
+                        <div style="flex:1;">
+                          <author :avatar="article.authorInfo.avatar" :name="article.sysCreateBy" :sex="article.authorInfo.sex" :aid="article.authorInfo.aid"></author>
+                        </div>
+                        <div style="">
+                          <interactBar nodeWidth="60px" :readonly="true" :type="2" :data="article" :shares="false" :views="false"></interactBar>
+                        </div>
+                        <!-- <author :avatar="article.authorInfo.avatar" :name="article.sysCreateBy" :info="article.authorInfo.orgInfo"></author> -->
+                    </div>
                   </div>
                 </div>
               </div>
-            </div>
-            <!-- <div class="pagination-div" v-if="isMore"><span class="pag-text" @click="loadMore()">加载更多</span></div> -->
-            <div class="pagination-div">
-              <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
-              <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
-              <span class="pag-text-msg" v-else-if="moreState == 3 && !isSeach">没有更多数据了</span>
-              <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span>
-            </div>
-            <div v-if="isSeach" style="height:382px">
-
-            </div>
-          </el-card>
-        </el-row>
-         </div>
-         <div style="width: 245px;margin-left: 5px;">
-            <div>
-                 <div id="articleAnking">
-            <el-button @click="openDialog" style="width: 100%;height: 37px;border-radius: 0;margin-bottom:15px;" type="primary">写文章</el-button>
-            <!-- <a :href="`${webBaseUrl}/article/add`" style="width: 100%;margin-bottom:15px;display: inline-block;" target="_blank"><el-button style="width: 100%;height: 37px;border-radius: 0;" type="primary">写文章</el-button></a> -->
-            <!-- <el-button style="width: 100%;margin:10px 0" type="primary">发布文章</el-button> -->
-            <el-card class="ranking-card">
-              <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">贡献榜</span>
+              <!-- <div class="pagination-div" v-if="isMore"><span class="pag-text" @click="loadMore()">加载更多</span></div> -->
+              <div class="pagination-div">
+                <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
+                <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
+                <span class="pag-text-msg" v-else-if="moreState == 3 && !isSeach">没有更多数据了</span>
+                <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span>
               </div>
-              <div style="padding-bottom:10px">
-                <!-- <el-row class="ranking-title"> -->
-                  <!-- <el-col :span="10" >姓名</el-col>
-                  <el-col :offset="4" :span="10" class="center">发布数</el-col> -->
-                  <!-- <el-col :offset="4" :span="10" style="color: #333333;font-size: 14px;">姓名</el-col>
-                  <el-col :span="10" style="text-align: right;color: #333333;font-size: 14px;">贡献度</el-col> -->
-                <!-- </el-row> -->
-                <!-- <el-row class="ranking-title" v-for="(item, index) in ankingList" :key="index">
-                  <el-col :span="4" style="text-align: center;">
-                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                    <span  style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-                  </el-col>
-                  <el-col :span="10" style="color: #333333;font-size: 14px;">{{ item.sysCreateUname }}</el-col>
-                  <el-col :span="10" style="text-align: right;color: #333333;font-size: 14px;">{{ item.counts }}</el-col>
-                </el-row> -->
-                <el-row style=" line-height: 34px;" class="ranking-title  bacolor" v-for="(item, index) in ankingList" :key="index" >
-                  <el-col :span="6" style="height:34px">
-                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-                  </el-col>
-                  <!-- <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.name" placement="top-start"> -->
-                  <el-col :span="18" class="one-line-ellipsis"> {{ item.sysCreateUname }}</el-col>
-                  <!-- </el-tooltip> -->
-                  <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
-                </el-row>
-              </div>
-            </el-card>
+              <div v-if="isSeach" style="height:382px"></div>
+            </div>
           </div>
+        </div>
+        <div class="xcontent2-minor">
+          <div>
+             <div class="portal-model-btn pointer" @click="openDialog">
+                      <svg-icon style="margin-right: 10px;font-size: 24px;" icon-class="addArticle"></svg-icon>
+                      写文章
+                </div>
+            <div id="articleAnking">
+              <div>
+               
+              </div>
+              <div class="portal-ranking ranking-bg">
+                <p class="ranking-title">贡献榜</p>
+                 <ul class="ranking-data">
+                      <li class="index-one-line-ellipsis"  v-for="(item, index) in ankingList" :key="index" style="margin-top:30px;line-height: 22px;cursor: pointer;">
+                        <!-- <router-link  :to="'article/detail?id=' + item.id"> -->
+                        <span class="portal-right-text orange-one" v-if="index==0" style="margin-right:20px">
+                          <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
+                        </span>
+                        <span class="portal-right-text orange-tow" v-if="index==1" style="margin-right:20px">
+                            <img :src="`${webBaseUrl}/images/listblue02.png`" alt="">
+                        </span>
+                        <span class="portal-right-text orange-three" v-if="index==2" style="margin-right:20px">
+                            <img :src="`${webBaseUrl}/images/listblue03.png`" alt="">
+                        </span>
+                        <span class="portal-right-text" v-if="index==3" style="margin-right:20px">
+                             <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                        </span>
+                         <span class="portal-right-text" v-if="index==4" style="margin-right:20px">
+                             <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                        </span>
+                        <span class="portal-title-desc  ">{{ item.sysCreateUname }}<span class="orinfo-text">{{ item.orinfo }}</span>   </span>
+                        <!-- {{ item.sysCreateAid }} -->
+                        <!-- </router-link> -->
+                      </li>
+                    </ul>
+              </div>
+              <!-- <div class="course-resources pointer"> -->
+                <!-- 资源位 -->
+                <!-- <img  @click="banJump()" :src="fileBaseUrl + resonimg.image" alt="">
+              </div> -->
+          </div>
+
+
             </div>
          </div>
+
       </div>
-      <el-row :gutter="10">
 
-        <el-col :span="6" class="right-box" >
-
-        </el-col>
-      </el-row>
     </div>
     <el-dialog title="创建文章" :visible.sync="diagSync" :close-on-click-modal="false" width="900px" custom-class="g-dialog">
       <editItems v-if="diagSync" :jumpLimit="false" :editForm="{}" @success="saveSuccess"></editItems>
@@ -161,6 +136,8 @@ import apiUser from '@/api/system/user.js';
 import apiSearchterm from '@/api/modules/searchterm.js';
 import articleImage from '@/components/Article/articleImage.vue';
 import editItems from '@/components/Article/editItems.vue';
+import apiPlace from "@/api/phase2/place.js"
+import {cutOrgNamePath} from "@/utils/tools.js";
 export default {
   name: 'index',
   components: { editItems,portalHeader, portalFooter,articleImage, portalFloatTools, interactBar, timeShow, author },
@@ -176,6 +153,8 @@ export default {
   },
   data() {
     return {
+      ankIds:[],
+      resonimg:{},
        moreState:1,// 1 加载更多 2 加载中 3无数据
       searchRecords: [],
       fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
@@ -206,7 +185,10 @@ export default {
     // let el_anking = document.querySelector('#articleAnking');
     // this.ankingWidth=el_anking.clientWidth;
     //console.log(el_anking.clientWidth,'clientWidth');
-    this.articleList.keyword = this.$route.query.keyword;
+    if(this.$route.query){
+      this.articleList.keyword = this.$route.query.keyword;
+    }
+
     if(this.articleList.keyword != '') {
      this.isSeach = true;
     }
@@ -219,11 +201,24 @@ export default {
       "scroll",
       this.handleScroll
     );
+    this.couresreso();
   },
   beforeDestroy(){
     window.removeEventListener("scroll",this.handleScroll);
   },
   methods: {
+    banJump() {
+      if(this.resonimg.JumpUrl) {
+        window.open(this.resonimg.JumpUrl);
+      }
+    },
+     couresreso(){
+      let key = 'article';
+      apiPlace.detail(key).then(res=>{
+        let lmj =  JSON.parse(res.result.content)
+        this.resonimg = lmj[0]
+      })
+    },
     emitInput(val){
       this.articleList.keyword = val;
       this.isSeach =true;
@@ -244,6 +239,7 @@ export default {
       //el_anking.wid
       let innerHeight = document.querySelector('#article-list-content').clientHeight
       let outerHeight = document.documentElement.clientHeight
+      let outerWidth = el_anking.clientWidth;
       let scrollTop = document.documentElement.scrollTop
       if ((outerHeight + scrollTop + 350) >= innerHeight) {
         if(this.moreState == 1) {
@@ -266,7 +262,7 @@ export default {
       //   }
       // }
          if(scrollTop > 400) {
-          document.querySelector('#articleAnking').style.cssText = "position: fixed;top: 0;width:242.5px";
+          document.querySelector('#articleAnking').style.cssText = "position: fixed;top: 0;width:"+outerWidth+"px";
         } else {
           document.querySelector('#articleAnking').style.cssText = "position: static";
         }
@@ -342,7 +338,7 @@ export default {
           this.isSeach =false;
           let ids = [];
           res.result.list.forEach(item => {
-            item.authorInfo = { name: '', avatar: '', orgInfo: '' ,sex:null};
+            item.authorInfo = {aid:'', name: '', avatar: '', orgInfo: '' ,sex:null};
             ids.push(item.sysCreateAid);
           });
           that.getQaUserData(res.result.list, ids);
@@ -365,6 +361,7 @@ export default {
           list.forEach(item => {
             res.result.some(author => {
               if (author.aid == item.sysCreateAid) {
+                item.authorInfo.aid = author.aid;
                 item.authorInfo.avatar = author.avatar;
                 item.authorInfo.name = author.name;
                 item.authorInfo.orgInfo = author.orgInfo;
@@ -396,9 +393,27 @@ export default {
       });
     },
     getAnkingData() {
+       let $this=this;
       apiArticle.countsUsername(5).then(res => {
         if (res.status == 200) {
-          this.ankingList = res.result;
+     
+          let ids = [];
+          res.result.forEach(item =>{
+            item.orinfo='';
+            ids.push(item.sysCreateAid);
+          })
+          $this.ankingList = res.result;
+          apiUser.getByIds(ids).then(rs=>{
+              rs.result.forEach(u=>{
+                $this.ankingList.forEach((sub) => {
+                    if(sub.sysCreateAid==u.aid){
+                      sub.orinfo=cutOrgNamePath(u.orgInfo);
+                    }
+                })
+              })
+              // console.log(this.ankingList);
+          })
+
         }
       });
     },
@@ -407,6 +422,36 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.orinfo-text{
+  font-size: 13px;
+  color: #666666;
+  font-weight: 400;
+}
+.course-resources{
+  margin-top: 26px;
+  width:100%;
+  img{
+    width: 100%;
+    height: 100%;
+    border-radius: 8px;
+  }
+}
+  .article-banner{
+    height: 240px;
+    background: url('../../../../public/images/article-banner.png');
+  }
+  .write-art{
+    width: 410px;
+    height: 67px;
+    text-align: center;
+    background: #DDEDFF;
+    border-radius: 8px;
+    font-size: 18px;
+    font-weight: 500;
+    border: none;
+    color: #387DF7;
+    margin-bottom: 22px;
+  }
   ::v-deep .el-card__body{
     padding: 0;
   }
@@ -461,6 +506,7 @@ export default {
   box-sizing: border-box;
 }
 .left-div {
+  border: none;
   .search-div{
     padding: 20px;
     // padding-top: 20px;
@@ -506,29 +552,24 @@ export default {
   }
   .quyer-tag {
     ::v-deep .el-button{
-      width: 52px;
-      height: 32px;
+      width: 44px;
+      height: 26px;
       padding: 0;
     }
     .order-class {
-      color: #666666;
-      // width: 80px;
-      // text-align: left;
+      color: #6E7B84;
       background-color: #FFFFFF;
-      border: 1px solid #DDDDDD;
-      border-radius: 0px;
+      border-radius: 4px;
       height: 32px;
       line-height: 32px;
-      // padding-left: 5px;
-      // padding-top: 5px;
-      // padding-bottom: 5px;
+      font-size: 14px;
       .el-icon--right {
         margin-left: 0;
       }
     }
     .actice {
       border: 0px;
-      background: #3e7fff;
+      background: #387DF7;
       color: #fff;
     }
   }
@@ -622,9 +663,9 @@ export default {
   .article-info-date {
     font-size: 12px;
     line-height: 30px;
-    color: #8590A6;
+    color: #999999;
     i {
-      margin-right: 5px;
+      margin-right: 3px;
     }
   }
   .art-box{
@@ -643,27 +684,24 @@ export default {
   .article-image {
     width: 156px;
     height: 105px;
-    margin-right: 15px;
-    // margin-right: 10px;
+    margin-left: 18px;
+    ::v-deep .el-image{
+      border-radius: 4px;
+    }
   }
   .article-body {
-    margin: 10px 0px;
-    // margin-right: 20px;
-    // display: flex;
-    // flex-direction: column;
-    // justify-content: space-between;
+    // margin: 10px 0px;
+    margin-bottom: 20px;
     .article-info {
       font-size: 16px;
-      // height: 30px;
-
     }
     .article-info-summary {
       word-break: break-all;
       height: 100px;
       line-height: 25px;
-      color: #121212;
+      color: #333333;
       font-weight: 400;
-      font-size: 15px;
+      font-size: 14px;
     }
   }
 }
diff --git a/src/views/portal/boeframe.vue b/src/views/portal/boeframe.vue
index 458cb170..8406b655 100644
--- a/src/views/portal/boeframe.vue
+++ b/src/views/portal/boeframe.vue
@@ -24,6 +24,10 @@ import portalFooter from "@/components/PortalFooter.vue";
       this.id = this.$route.query.id;
       this.type = this.$route.query.type;
       let urlPre=window.location.protocol+'//'+window.location.host;
+      
+      let params='detailId='+this.id+'&inner=1';
+      params=encodeURIComponent(params);
+      
       //console.log(urlPre,'urlPre');
       if(this.type == 20 || this.type=='online-course') {//在线课
          this.url= `${urlPre}/web/onlineClass?detailId=${this.id}&inner=1`
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index 32bf581c..c483eba5 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -1,23 +1,29 @@
 <template>
   <div id="case-list-content">
-    <portal-header current="case" :goSearch="2"></portal-header>
-    <div class="portal-content xcontent" style="margin-top: 30px;">
-       <el-breadcrumb separator-class="el-icon-arrow-right" class="breadcrumb-nav">
-        <el-breadcrumb-item :to="{ path: '/case' }">案例列表</el-breadcrumb-item>
-        <el-breadcrumb-item>案例详情</el-breadcrumb-item>
-      </el-breadcrumb>
-       <div class="xrow" style="display: flex;justify-content: space-between;" >
-          <div style="flex: 1;" class="xcol content-div" id="content-div">
-            <el-row :gutter="10" v-if="noData">
-              <el-col :span="24">
-                <el-card :body-style="{ padding: '0px' }" class="detail">
-                  <div class="title">{{ caseDetail.title }}</div>
+    <div style="margin-bottom:30px" class="case-banner">
+      <portal-header current="case" textColor="#fff" :goSearch="2"></portal-header>
+    </div>
+    <div class="">
+       <div class="xcontent2">
+          <div class="xcontent2-main" style="margin-right: 30px;" id="content-div">
+            <div v-if="noData">
+                <div class="detail">
+                  <div class="xpage-detail-crumbs">
+                      <router-link to="/case"><span class="crumbs-first">案例列表</span></router-link>
+                      <span class="crumbs-line">/</span>
+                      <span class="crumbs-last">案例详情</span>
+                  </div>
+                  <div class="title">
+                    <h5>{{ caseDetail.title }}</h5>
+                    <span style="text-align: right;" v-if="caseDetail.sysCreateTime"> <i class="el-icon-time"></i> {{ caseDetail.sysCreateTime.substring(0,10) }}</span>
+                  </div>
                   <div class="label">
-                    <author :onlyAvatar="true" :avatar="authorInfo.avatar" :sex="authorInfo.sex" ></author>
-                    <span>案主：{{ authorInfo.name }}</span>
+                    <author :aid="caseDetail.sysCreateAid" :onlyAvatar="true" :avatar="authorInfo.avatar" :sex="authorInfo.sex" ></author>
+                    <span>案主：{{ authorInfo.name }} ({{authorInfo.orgInfo}})</span>
+                    <!-- <span>案主：{{ authorInfo.name }}</span>
                     <span>工号：{{ authorInfo.code }}</span>
-                    <span>组织：{{ authorInfo.orgInfo }}</span>
-                    <span style="text-align: right;" v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span>
+                    <span>组织：{{ authorInfo.orgInfo }} </span> -->
+                    <span> {{authorInfo.sign}}</span>
                   </div>
                   <!-- <div class="label">
                     <span style="margin-left:0px;" v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span>
@@ -28,7 +34,7 @@
                     <div style="color:#2974D6;font-weight: 450;" v-if="caseDetail.orgDomain" class="item">{{ orgDomainTranslate(caseDetail.orgDomain) }}</div>
                     <div style="color:#2974D6;font-weight: 450;" class="item" v-if="caseDetail.orgDomain == '' && caseDetail.orgDomainParent">{{ orgDomainTranslate(caseDetail.orgDomainParent) }}</div>
                     <!-- <div style="color:#2974D6;font-weight: 450;" v-if="caseDetail.majorType" class="item">{{ majorTypeTranslate(caseDetail.majorType) }}</div> -->
-                    <div class="item" style="color:#2974D6;font-weight: 450;"  v-for="item,idx in caseDetail.majorType" :key="idx" v-if="item">{{ majorTypeTranslate(item) }}</div>
+                    <div class="item" style="color:#2974D6;font-weight: 450;"  v-for="item,idx in caseDetail.majorType" :key="idx" >{{ majorTypeTranslate(item) }}</div>
                     <div v-if="caseDetail.keyword1" class="item">{{ caseDetail.keyword1 }}</div>
                     <div v-if="caseDetail.keyword2" class="item">{{ caseDetail.keyword2 }}</div>
                     <div v-if="caseDetail.keyword3" class="item">{{ caseDetail.keyword3 }}</div>
@@ -39,17 +45,12 @@
                       <span v-if="caseDetail.caseType2" class="item">{{ caseDetail.caseType2 }}</span> -->
                   </div>
                   <div class="case-summary"><span>{{ caseDetail.summary }}</span></div>
-                  <div class="label" style="margin-top:10px">
-                    <!-- <span style="margin-left:0px;" v-if="caseDetail.sysCreateTime">{{ caseDetail.sysCreateTime.substring(0,10) }}</span> -->
-                    <interactBar  :data="caseDetail" :type="3" :comments="false" :shares="true" :unicom="true"></interactBar>
-                  </div>
-                </el-card>
-                <el-card v-if="Internet == 1" :body-style="{ padding: '0px' }" class="jianjie" id="pdfPreview">
-                  <!-- <div class="content">
-                    {{ caseDetail.content }}
-                  </div> -->
+
+                </div>
+
+                <div v-if="Internet == 1" :body-style="{ padding: '0px' }" class="jianjie" id="pdfPreview">
                   <pdfPreview v-if="pdfPath" :filePath="pdfPath"></pdfPreview>
-                </el-card>
+                </div>
                 <el-card v-if="Internet == 2" style="background-color:#eee" class="jianjie pdftext" id="pdfPreview">
                    <div style="margin-top:40px">
                      <span>十分抱歉，您当前的网络环境不符合观看要求。<br/>
@@ -80,7 +81,8 @@
                             <interactBar  :data="caseDetail" :type="3" :comments="false" :shares="true" :unicom="true"></interactBar>
                           </div>
                           <div style="display:inline-block;margin: 0 20px;">
-                            <el-button type="primary" @click="goTop()">返回顶部</el-button>
+                            <i style="font-size: 25px;color:#6E7B84;"  @click="goTop()" class="el-icon-arrow-up"></i>
+                            <!-- <el-button type="primary" >返回顶部</el-button> -->
                           </div>
                       </div>
                     </div>
@@ -88,96 +90,75 @@
                 </div>
                 <!-- :authorId="articleDetailData.sysCreateAid" -->
                 <div id="comments-box">
-                  <el-row><comments @success="success" v-if="resolveId != ''" :obj-type="3" :obj-id="resolveId" :authorId="caseDetail.authorId" :toUsers="toUsers"></comments></el-row>
+                  <comments @success="success" v-if="resolveId != ''" :obj-type="3" :obj-id="resolveId" :authorId="caseDetail.authorId" :toUsers="toUsers"></comments>
                 </div>
-              </el-col>
-            </el-row>
+
+            </div>
             <div v-else>
               <el-empty :image-size="200"></el-empty>
             </div>
           </div>
-          <div style="width: 245px;margin-left: 5px;" :class="zoomShow?'':'fixd-box-show'">
-        <div>
-           <div id="fixd-box">
-             <!-- <el-card class="ranking-card" >
-              <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">贡献榜</span>
-              </div>
-              <div style="padding-bottom:10px">
-                <el-row class="ranking-title">
-                 </el-row>
-                <el-row class="ranking-title  bacolor" v-for="(item, index) in ankingList" :key="index" >
-                  <el-col :span="6" style="height:34px">
-                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-                  </el-col>
-                        <el-col :span="15"  class="title-line-ellipsis"> {{ item.sysCreateUname }}</el-col>
-                </el-row>
-              </div>
-            </el-card> -->
-                <!-- <div style="height: 10px;"></div> -->
-              <el-card class="ranking-card" >
-              <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">人气榜</span>
-              </div>
-              <div style="padding-bottom:10px">
-                <el-row class="ranking-title">
-                  <!-- <el-col :span="15" style="color: #333333;font-size: 14px;">名称</el-col> -->
-                  <!-- <el-col :offset="4" :span="5" class="center" style="color: #333333;font-size: 14px;">分数</el-col> -->
-                </el-row>
-                <el-row class="ranking-title  bacolor" v-for="(item, index) in Popularity" :key="index" >
-                  <el-col :span="6" style="height:34px">
-                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                    <div v-if="item.title">
-                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-                    </div>
-                  </el-col>
-                  <!-- <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title + '（' + item.authorName+ ')'" placement="bottom" :visible-arrow="false" popper-class="text-tooltip"> -->
-                        <div :title="item.title + '（' + item.authorName+ ')'" @click="jumpRouter(item)">
-                           <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
-                       </div>
-                  <!-- </el-tooltip> -->
-                  <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
-                </el-row>
-              </div>
-            </el-card>
-             <div style="height: 10px;"></div>
-              <el-card class="ranking-card" >
-              <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">好评榜</span>
-              </div>
-              <div style="padding-bottom:10px">
-                <el-row class="ranking-title">
-                  <!-- <el-col :span="15" style="color: #333333;font-size: 14px;">名称</el-col> -->
-                  <!-- <el-col :offset="4" :span="5" class="center" style="color: #333333;font-size: 14px;">分数</el-col> -->
-                </el-row>
-                <el-row class="ranking-title  bacolor" v-for="(item, index) in Positive" :key="index" >
-                  <el-col :span="6" style="height:34px">
-                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                    <div v-if="item.title">
-                    <span  style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-                   </div>
-                  </el-col>
-                  <!-- <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title + '（' + item.authorName+ ')'" placement="bottom" :visible-arrow="false" popper-class="text-tooltip"> -->
-                    <div :title="item.title + '（' + item.authorName+ ')'" @click="jumpRouter(item)">
-                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
-
-                    </div>
-                  <!-- </el-tooltip> -->
-                  <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
-                </el-row>
-              </div>
-            </el-card>
+          <div class="xcontent2-minor" :style="{display:zoomShow? '':'none'}">
+            <div>
+            <div id="fixd-box">
+            <div class="portal-ranking ranking-bg">
+              <p class="ranking-title">好评榜</p>
+              <ul class="ranking-data">
+                  <li  v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis" style="cursor: pointer;margin-top:30px;line-height: 22px;">
+                         <router-link :to="'case/detail?id='+item.id">
+                          <span class="portal-right-text blue-one" v-if="index==0">
+                            <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
+                          </span>
+                          <span class="portal-right-text blue-tow" v-if="index==1">
+                              <img :src="`${webBaseUrl}/images/listblue02.png`" alt="">
+                          </span>
+                          <span class="portal-right-text blue-three" v-if="index==2">
+                              <img :src="`${webBaseUrl}/images/listblue03.png`" alt="">
+                          </span>
+                          <span class="portal-right-text" v-if="index==3">
+                               <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                          </span>
+                           <span class="portal-right-text" v-if="index==4">
+                               <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                          </span>
+                          <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
+                          </router-link>
+                  </li>
+              </ul>
+            </div>
+            <div style="margin-top:26px" class="portal-ranking ranking-bg1">
+              <p class="ranking-title">人气榜</p>
+              <ul class="ranking-data">
+                <li v-for="(item, index) in Popularity" :key="index" class="title-line-ellipsis" style="cursor: pointer;margin-top:30px;line-height: 22px;">
+                       <router-link :to="'case/detail?id='+item.id">
+                        <span class="portal-right-text orange-one" v-if="index==0">
+                          <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
+                        </span>
+                        <span class="portal-right-text orange-tow" v-if="index==1">
+                            <img :src="`${webBaseUrl}/images/list02.png`" alt="">
+                        </span>
+                        <span class="portal-right-text orange-three" v-if="index==2">
+                            <img :src="`${webBaseUrl}/images/list03.png`" alt="">
+                        </span>
+                        <span class="portal-right-text" v-if="index==3">
+                             <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                        </span>
+                         <span class="portal-right-text" v-if="index==4">
+                             <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                        </span>
+                        <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
+                        </router-link>
+                   </li>
+              </ul>
+            </div>
+             <!-- <div class="course-resources pointer"> -->
+                <!-- 资源位 -->
+                <!-- <img @click="banJump()" :src="fileBaseUrl + resonimg.image" alt=""> -->
+              <!-- </div> -->
            </div>
+          </div>
         </div>
       </div>
-      </div>
     </div>
     <portal-footer></portal-footer>
       <portalFloatTools></portalFloatTools>
@@ -199,6 +180,7 @@ import apiDict from "@/api/modules/dict.js"
 import {encrypt} from '@/utils/jsencrypt.js';
 import cookies from 'vue-cookies'
 import {cutFullName} from "@/utils/tools.js";
+import apiPlace from "@/api/phase2/place.js"
 import portalFloatTools from "@/components/PortalFloatTools.vue";
 export default {
   name: 'atticle',
@@ -208,8 +190,11 @@ export default {
   },
   data() {
     return {
+      fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
+      resonimg:{},
       Internet:3,//1是成功 2是是失败 3是检测中
       noData:true,
+      authorSign:'',//提问人的个性签名
       zoomShow:true,
       isTopBoxShow:true,
       toUsers:[],
@@ -220,6 +205,7 @@ export default {
       basePath:process.env.VUE_APP_FILE_BASE_URL,
       pdfPath:'',
       caseDetail: {
+        sysCreateAid:'',
         id:'',
         filePath:''
       },
@@ -228,6 +214,7 @@ export default {
       domain: [],
       Profess: [],
       orgData: [],
+      setTimeCase: null,
     };
   },
   mounted() {
@@ -245,12 +232,34 @@ export default {
     this.getAnkingData();
     this.getPopularity();
     this.getPositive();
+     this.couresreso();
     window.addEventListener(
       "scroll",
       this.handleScroll
     );
+
+  },
+  beforeDestroy(){
+    window.removeEventListener("scroll",this.handleScroll);
+    clearInterval(this.setTimeCase);
   },
   methods: {
+    banJump() {
+      if(this.resonimg.JumpUrl) {
+        window.open(this.resonimg.JumpUrl);
+      }
+    },
+    jumecase(item){
+      this.$router.push({ path: './Detail.vue', query: { id: item.id } });
+    },
+     couresreso(){
+      let key = 'case';
+      apiPlace.detail(key).then(res=>{
+        let lmj =  JSON.parse(res.result.content)
+        // console.log(lmj)
+        this.resonimg = lmj[0]
+      })
+    },
     retest(){
       this.Internet=3;
       let $this=this;
@@ -267,6 +276,7 @@ export default {
             if (xmlhttp.status==200){
               clearTimeout(timer);
               $this.Internet = 1;
+              $this.sendEventData();
             }else{
               clearTimeout(timer);
               $this.Internet = 2;
@@ -377,11 +387,13 @@ export default {
       }
     },
     handleScroll() {
+       let innerw = document.querySelector("#fixd-box");
         let innerHeight = document.querySelector('#case-list-content').clientHeight
         let pdfTopBox = document.querySelector('#comments-box')
         let pdfPreview = document.querySelector('#pdfPreview') //pdf盒子距离顶部的高度
         let contentDiv = document.querySelector('#content-div').clientWidth;
-        let outerHeight = document.documentElement.clientHeight
+        let outerHeight = document.documentElement.clientHeight;
+        let outerWidth = innerw.clientWidth;
         let scrollTop = document.documentElement.scrollTop
         if ((outerHeight + scrollTop + 350) >= innerHeight) {
           if(this.moreState == 1 && this.course.pageIndex < 4) {
@@ -398,7 +410,7 @@ export default {
         }
         if(scrollTop > 630) {
           this.isTopBoxShow = true;
-          document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -250px;width:245.5px";
+          document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -400px;width:"+outerWidth+"px";
         } else {
           document.querySelector('#fixd-box').style.cssText = "position: static";
         }
@@ -441,15 +453,39 @@ export default {
               title:'',
              })
           }
-            
+
           }
           // console.log(this.Positive);
-         
+
 
         }
       })
     },
+    sendEventData(){
+      let event = {
+          key: "ViewCase",//后台的事件key  发布文章且审核通过
+          title: '查看案例',//事件的标题
+          parameters:"",//用户自定义参数 name:value,name:value
+          content: '查看了案例',//事件的内容
+          objId: this.resolveId,//关联的id
+          objType: "3",//关联的类型
+          objInfo:this.caseDetail.title,
+          aid: this.userInfo.aid, //当前登录人的id
+          aname: this.userInfo.name,//当前人的姓名
+          status: 1 //状态，直接写1
+        }
+        this.$store.dispatch("userTrigger", event);
+        let $this=this;
+        this.setTimeCase = setTimeout(()=>{
+          event.key = 'ReadCase';
+          event.title = '阅读案例';
+          event.parameters="second:60";
+          event.content = '阅读了案例';
+          $this.$store.dispatch("userTrigger", event);
+        },61000);//1分钟之后发送阅读案例事件
+    },
     getCaseData() {
+      let $this=this;
       apiCase.details(this.resolveId,true).then(res => {
         if (res.status == 200) {
           if (JSON.stringify(res.result) != '{}') {
@@ -459,6 +495,7 @@ export default {
             if(this.caseDetail.filePath){
               //this.pdfPath=this.basePath+this.caseDetail.filePath;
               this.createPlayUrl(this.caseDetail.filePath);
+              //this.sendEventData();//移到检查之后
             }else{
                this.$message.error('内容文件不存在或已被删除，请与管理员联系');
             }
@@ -474,6 +511,7 @@ export default {
       apiUser.getByIds([this.caseDetail.authorId]).then(res => {
         if (res.status == 200 && res.result.length>0) {
           this.authorInfo = res.result[0];
+
           this.authorInfo.orgInfo=cutFullName(this.authorInfo.orgInfo,1);
 
           this.toUsers = [
@@ -504,6 +542,19 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
+  .case-banner{
+    height: 240px;
+    background: url('../../../../public/images/case-banner.png');
+  }
+.course-resources{
+  margin-top: 26px;
+  img{
+    width: 100%;
+    height: 100%;
+    border-radius: 8px;
+  }
+}
 .pdftext{
   // padding: 0 20px;
   span{
@@ -562,9 +613,9 @@ export default {
 
 }
 .ranking-title {
-     line-height: 34px;
-    font-size: 15px;
-    color: #333333;
+    //  line-height: 34px;
+    // font-size: 15px;
+    // color: #333333;
     .center-titlt{
       font-size: 15px;
       color: #333333;
@@ -591,12 +642,23 @@ export default {
 }
 .detail {
   background-color: #fff;
-  padding: 5px 20px 10px 20px;
+  padding: 50px;
   .title {
-    font-size: 20px;
-    line-height: 45px;
-    font-weight: 600;
-    word-break:break-all;
+    display: flex;
+    width: 100%;
+    h5{
+      margin: 0;
+      font-size: 20px;
+      line-height: 45px;
+      font-weight: 600;
+      flex: 1;
+    }
+    span{
+      margin-left: auto;
+      line-height: 45px;
+      color: #999999;
+      font-size: 14px;
+    }
   }
   .label {
     font-size: 15px;
@@ -632,15 +694,15 @@ export default {
     .item {
       float: left;
       margin: 7px 10px 0px 0px;
-      border: 1px solid #2974D6;
+      background: rgba(44,104,255,0.06);
+      border-radius: 2px;
       padding: 0px 10px;
       line-height: 24px;
       text-align: center;
+      font-size: 12px;
       height: 24px;
       box-sizing: border-box;
-      border-radius: 10px;
-      font-size: 14px;
-      color: #2974D6;
+      color: #2C68FF;
     }
     .item-right {
       float: right;
@@ -649,6 +711,7 @@ export default {
 }
 .jianjie {
   // margin: 15px 0;
+  margin-top: 30px;
   background-color: #f5f7fa;
   min-height: 300px;
   padding: 0px 0px 0px 0px;
@@ -763,6 +826,7 @@ export default {
   .aligh-title{
     font-size: 14px;
     color: #333333;
+
   }
   .ranking-data {
     margin: 10px 0;
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 2b1fe3e9..81b3f74c 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -1,220 +1,186 @@
 <template>
   <div id="case-list-content">
-    <portal-header current="case" @emitInput="emitInput"></portal-header>
-    <div class="xcontent portal-content">
-      <div style="flex: 1;" class="xcol content-div">
-         <el-row>
-             <el-col :span="24">
-          <el-card :body-style="{ padding: '0px' }" class="left-div">
-            <el-row class="search-div">
-              <!-- <el-row>
-                <el-col :span="10" class="search-keyword">
-                  <el-input placeholder="请输入关键词搜索" v-model="keyWord" clearable><el-button slot="append" icon="el-icon-search" @click="search"></el-button></el-input>
-                  <div class="tip">热门搜索词：物联网 教师 辅导 绩效</div>
-                  <div class="tip" style="font-size: 14px;">
-                  热门搜索词：<span style="cursor:pointer;font-size:15px;margin-left: 10px;" v-for="(item,index) in searchRecords" :key="index" @click="useHotword(item)">{{item.keyword}}</span>
+    <div style="margin-bottom:30px" class="case-banner">
+      <portal-header current="case" textColor="#fff" @emitInput="emitInput"></portal-header>
+    </div>
+    <div class="xcontent2">
+      <div class="xcontent2-main" style="margin-right: 30px;">
+            <div class="left-div">
+              <div class="search-div">
+                <div class="searchbar" v-if="searchTags.length > 0">
+                  <div style="line-height: 30px;">
+                    <span class="item-title">搜索条件</span>
+                    <el-tag closable v-for="(tag, tagIdx) in searchTags" :key="tagIdx" @close="tagsClose(tag,tagIdx)">{{ tag.value }}</el-tag>
                   </div>
-                </el-col>
-              </el-row> -->
-              <div class="searchbar" v-if="searchTags.length > 0">
-              <div style="line-height: 30px;">
-                <span class="item-title">搜索条件</span>
-                <el-tag closable v-for="(tag, tagIdx) in searchTags" :key="tagIdx" @close="tagsClose(tag,tagIdx)">{{ tag.value }}</el-tag>
-              </div>
-            </div>
-              <el-row class="search-item">
-                <el-col :span="24">
-                  <div style="margin-top:10px; display: flex;">
-                     <div style="line-height: 25px;padding-right: 10px;">
-                      <span class="item-title" style="padding-right: 5px;">组织领域</span>
-                      <span class="item-line"></span>
-                    </div>
-                    <div style="flex:1;">
-                    <el-radio-group v-model="queryCondition.orgDomain" size="mini" @change="search()">
-                       <el-radio-button :label="null">全部</el-radio-button>
-
-                    <el-radio-button v-for="item in domain" :key="item.code" :label="item.code"> {{ item.name}}</el-radio-button>
-                  </el-radio-group>
-                    </div>
-                  </div>
-                </el-col>
-              </el-row>
-              <div class="search-div-collapse">
-                <el-row class="search-item">
-                  <el-col :span="24" >
+                </div>
+                <div class="search-item">
                     <div style="margin-top:10px; display: flex;">
                       <div style="line-height: 25px;padding-right: 10px;">
-                    <span class="item-title" style="padding-right: 5px;">专业分类</span>
-                    <span class="item-line"></span>
-                     </div>
-                     <div style="flex:1" id="searchBox">
-                        <el-radio-group style="display:flex;" v-model="queryCondition.majorType" size="mini" @change="search()">
+                        <!-- <img class="orgaicon" :src="`${webBaseUrl}/images/orgaimg.png`" alt=""> -->
+                        <span class="item-title" >组织领域</span>
+                        <span class="item-line"></span>
+                      </div>
+                      <div style="flex:1;">
+                        <el-radio-group v-model="queryCondition.orgDomain" size="mini" @change="search()">
                           <el-radio-button :label="null">全部</el-radio-button>
-                          <div>
-                          <el-radio-button v-for="item in speciData" :key="item.code" :label="item.code" > {{ item.name }} </el-radio-button>
-                          </div>
+                          <el-radio-button v-for="item in domain" :key="item.code" :label="item.code"> {{ item.name}}</el-radio-button>
                         </el-radio-group>
-                     </div>
+                      </div>
                     </div>
-                  </el-col>
-                </el-row>
-              </div>
-              <div class="searBox" v-if="searchwd">
-                 <el-button type="text"  id="closeSearchBtn" @click="closeSearch">
-                      {{word}}
-                     <i :class="showAll ? 'el-icon-arrow-up ': 'el-icon-arrow-down'"></i>
-                </el-button>
-              </div>
-            </el-row>
-            <el-row style="height:10px;background-color:#f6f7fc;" >
-            </el-row>
-            <el-row class="order-div"  style="border: 1px solid #EBEEF5;border-bottom:none">
-              <span class="quyer-tag">
-                <el-button type="text" class="order-class" @click="searchData('views')" :class="{ actice: queryCondition.orderField == 'views' }">最热</el-button>
-                <el-button type="text" class="order-class" @click="searchData('')" :class="{ actice: queryCondition.orderField == '' }">最新</el-button>
-                <!-- <el-button type="text" class="order-class" @click="queryCondition.breCommend = queryCondition.breCommend == ture ? true : null" :class="{ actice: queryCondition.breCommend == true }">组织推荐</el-button> -->
-              </span>
-            </el-row>
-            <el-row class="data-content" style="border: 1px solid #EBEEF5;border-top:none;border-bottom:none">
-              <el-col :span="24" v-for="item in caseList.list" :key="item.id" class="case-list">
-                <div class="case-info">
-                  <div class="case-info-cont">
-                      <router-link :to="'/case/detail?id='+item.id">
-                    <div class="case-info-title">
-                    <div class="case-titdiv">
-                        <span class="case-tittext" v-html="item.title"></span>
-                        <div class="case-info-date">
-                          <i class="el-icon-time"></i>
-                          <time-show :time="item.sysCreateTime"></time-show>
-                        </div>
-                    </div>
-                  </div>
-                    <div style="height:40px;padding-top:5px ">
-                      <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo" :sex="item.authorInfo.sex"></author>
-                    </div>
-                    <div class="keyword-text clearfix">
-                      <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain">{{ orgDomainTranslate(item.orgDomain) }}</div>
-                      <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain == '' && item.orgDomainParent">{{ orgDomainTranslate(item.orgDomainParent) }}</div>
-                      <div style="color:#2974D6;font-weight: 450;"  v-for="item,idx in item.majorType" :key="idx" v-if="item">{{ majorTypeTranslate(item) }}</div>
+                </div>
+                <div class="search-div-collapse">
+                  <div class="search-item">
 
-                      <div v-if="item.keyword1">{{ item.keyword1 }}</div>
-                      <div v-if="item.keyword2">{{ item.keyword2 }}</div>
-                      <div v-if="item.keyword3">{{ item.keyword3 }}</div>
-                      <div v-if="item.keyword4">{{ item.keyword4 }}</div>
-                      <div v-if="item.keyword5">{{ item.keyword5 }}</div>
+                      <div style="margin-top:10px; display: flex;">
+                        <div style="line-height: 25px;padding-right: 10px;">
+                           <!-- <img class="orgaicon" :src="`${webBaseUrl}/images/specimg.png`" alt=""> -->
+                      <span class="item-title" >专业分类</span>
+                      <span class="item-line"></span>
+                       </div>
+                       <div style="flex:1" id="searchBox">
+                          <el-radio-group style="display:flex;" v-model="queryCondition.majorType" size="mini" @change="search()">
+                            <el-radio-button :label="null">全部</el-radio-button>
+                            <div>
+                              <el-radio-button v-for="item in speciData" :key="item.code" :label="item.code" > {{ item.name }} </el-radio-button>
+                            </div>
+                          </el-radio-group>
+                       </div>
+                      </div>
+
+                  </div>
+                </div>
+                <div class="searBox" v-if="searchwd">
+                   <el-button type="text"  id="closeSearchBtn" @click="closeSearch">
+                        {{word}}
+                       <i :class="showAll ? 'el-icon-arrow-up ': 'el-icon-arrow-down'"></i>
+                  </el-button>
+                </div>
+              </div>
+              <div style="height:30px;background-color:#f6f7fc;"></div>
+              <div class="order-div"  style="border-bottom:none">
+                <span class="quyer-tag">
+                  <el-button type="text" class="order-class" @click="searchData('views')" :class="{ actice: queryCondition.orderField == 'views' }">最热</el-button>
+                  <el-button type="text" class="order-class" @click="searchData('')" :class="{ actice: queryCondition.orderField == '' }">最新</el-button>
+                  <!-- <el-button type="text" class="order-class" @click="queryCondition.breCommend = queryCondition.breCommend == ture ? true : null" :class="{ actice: queryCondition.breCommend == true }">组织推荐</el-button> -->
+                </span>
+              </div>
+              <div class="data-content">
+                <div v-for="item in caseList.list" :key="item.id" class="case-list">
+                  <div class="case-info">
+                    <div class="case-info-cont">
+                        <router-link :to="'/case/detail?id='+item.id">
+                      <div class="case-info-title">
+                      <div class="case-titdiv">
+                          <span class="case-tittext" v-html="item.title"></span>
+                          <div class="case-info-date portal-time">
+                            <i class="el-icon-time"></i>
+                            <time-show :time="item.sysCreateTime"></time-show>
+                          </div>
+                      </div>
                     </div>
-                 </router-link>
-                    <div class="case-info-summary" @click="jumcasedet(item)">
-                      <!-- <router-link :to="'/case/detail?id='+item.id"> -->
-                          {{displayAll(item)}}
-                      <!-- </router-link> -->
-                          <span style="color:#588afc;cursor:pointer;" v-if="item.summary.length>180" @click.stop="changeIsAll(item)">
-                              {{item.isAll?'收起':'展开'}}
-                          </span>
-                    </div>
-                    <div style="display: flex;justify-content: space-between;">
-                     <div style="margin:8px 0;">
-                        <interactBar :type="0" :shares="false"  :data="item" :readonly="true"></interactBar> </div>
+                      <div style="height:58px;padding-top:14px ">
+                        <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo" :sex="item.authorInfo.sex"></author>
+                      </div>
+                      <div class="keyword-text clearfix">
+                        <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain">{{ orgDomainTranslate(item.orgDomain) }}</div>
+                        <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain == '' && item.orgDomainParent">{{ orgDomainTranslate(item.orgDomainParent) }}</div>
+                        <div style="color:#2974D6;font-weight: 450;"  v-for="item,idx in item.majorType" :key="idx" >{{ majorTypeTranslate(item) }}</div>
+                        <div v-if="item.keyword1">{{ item.keyword1 }}</div>
+                        <div v-if="item.keyword2">{{ item.keyword2 }}</div>
+                        <div v-if="item.keyword3">{{ item.keyword3 }}</div>
+                        <div v-if="item.keyword4">{{ item.keyword4 }}</div>
+                        <div v-if="item.keyword5">{{ item.keyword5 }}</div>
+                      </div>
+                   </router-link>
+                      <div class="case-info-summary two-line-ellipsis" @click="jumcasedet(item)">
+                        {{ item.summary }}
+                        <!-- <router-link :to="'/case/detail?id='+item.id"> -->
+                            <!-- {{displayAll(item)}} -->
+                        <!-- </router-link> -->
+                            <!-- <span style="color:#588afc;cursor:pointer;" v-if="item.summary.length>150" @click.stop="changeIsAll(item)"> -->
+                                <!-- {{item.isAll?'收起':'展开'}} -->
+                            <!-- </span> -->
+                      </div>
+                      <div style="display: flex;justify-content: flex-end;">
+                       <div style="margin:8px 0;">
+                          <interactBar :type="0" :shares="false"  :data="item" :readonly="true"></interactBar> </div>
+                      </div>
                     </div>
                   </div>
                 </div>
-              </el-col>
-            </el-row>
-            <div class="pagination-div">
-              <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
-              <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
-              <span class="pag-text-msg" v-else-if="moreState == 3 && !isSeach">没有更多数据了</span>
-              <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span>
+              </div>
+              <div class="pagination-div">
+                <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
+                <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
+                <span class="notcoures" v-else-if="moreState == 3 && !isSeach && caseList.count>0">
+                   <img :src="`${webBaseUrl}/images/nocase.png`" alt="">
+                  <h5>暂无案例，请优先学习其它案例吧～</h5>
+                  </span>
+                <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span>
+              </div>
+              <div v-if="isSeach" style="height:382px">
+              </div>
             </div>
-            <div v-if="isSeach" style="height:382px">
-            </div>
-          </el-card>
-        </el-col>
-         </el-row>
+
       </div>
-       <div style="width: 245px;margin-left: 5px;">
-        <div>
+      <div class="xcontent2-minor">
            <div id="fixd-box">
-             <!-- <el-card class="ranking-card" >
-              <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">贡献榜</span>
+              <div class="portal-ranking ranking-bg">
+                <p class="ranking-title">好评榜</p>
+                <ul class="ranking-data">
+                  <li v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis" style="cursor: pointer;margin-top:30px;line-height: 22px;">
+                        <router-link :to="'/case/detail?id='+item.id">
+                        <span class="portal-right-text blue-one" v-if="index==0">
+                          <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
+                        </span>
+                        <span class="portal-right-text blue-tow" v-if="index==1">
+                            <img :src="`${webBaseUrl}/images/listblue02.png`" alt="">
+                        </span>
+                        <span class="portal-right-text blue-three" v-if="index==2">
+                            <img :src="`${webBaseUrl}/images/listblue03.png`" alt="">
+                        </span>
+                        <span class="portal-right-text" v-if="index==3">
+                             <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                        </span>
+                         <span class="portal-right-text" v-if="index==4">
+                             <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                        </span>
+                        <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
+                         </router-link>
+                   </li>
+                </ul>
               </div>
-              <div style="padding-bottom:10px">
-                <el-row class="ranking-title"> </el-row>
-                <el-row class="ranking-title  bacolor" v-for="(item, index) in ankingList" :key="index" >
-                  <el-col :span="6" style="height:34px">
-                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-                  </el-col>
-                        <el-col :span="15"  class="title-line-ellipsis"> {{ item.sysCreateUname }}</el-col>
-                </el-row>
+              <div class="portal-ranking ranking-bg1" style="margin-top:26px" >
+                <p class="ranking-title">人气榜</p>
+                <ul class="ranking-data">
+                    <li v-for="(item, index) in Popularity" :key="index" class="title-line-ellipsis" style="cursor: pointer;margin-top:30px;line-height: 22px;">
+                        <router-link :to="'/case/detail?id='+item.id">
+                        <span class="portal-right-text orange-one" v-if="index==0">
+                          <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
+                        </span>
+                        <span class="portal-right-text orange-tow" v-if="index==1">
+                            <img :src="`${webBaseUrl}/images/list02.png`" alt="">
+                        </span>
+                        <span class="portal-right-text orange-three" v-if="index==2">
+                            <img :src="`${webBaseUrl}/images/list03.png`" alt="">
+                        </span>
+                        <span class="portal-right-text" v-if="index==3">
+                             <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                        </span>
+                         <span class="portal-right-text" v-if="index==4">
+                             <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                        </span>
+                        <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
+                        </router-link>
+                   </li>
+                </ul>
               </div>
-            </el-card> -->
-                <!-- <div style="height: 10px;"></div> -->
-              <el-card class="ranking-card" >
-              <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">人气榜</span>
-              </div>
-              <div style="padding-bottom:10px">
-                <el-row class="ranking-title">
-                  <!-- <el-col :span="15" style="color: #333333;font-size: 14px;">名称</el-col> -->
-                  <!-- <el-col :offset="4" :span="5" class="center" style="color: #333333;font-size: 14px;">分数</el-col> -->
-                </el-row>
-                <el-row class="ranking-title  bacolor" v-for="(item, index) in Popularity" :key="index" >
-                  <el-col :span="6" style="height:34px">
-                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                    <div v-if="item.title">
-                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-                    </div>
-                  </el-col>
-                  <!-- <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title + '（' + item.authorName+ ')'" placement="bottom" :visible-arrow="false" popper-class="text-tooltip"> -->
-                        <div :title="item.title + '（' + item.authorName+ ')'" @click="jumpRouter(item)">
-                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
-                        </div>
-                  <!-- </el-tooltip> -->
-                  <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
-                </el-row>
-              </div>
-            </el-card>
-             <div style="height: 10px;"></div>
-              <el-card class="ranking-card" >
-              <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">好评榜</span>
-              </div>
-              <div style="padding-bottom:10px">
-                <el-row class="ranking-title">
-                  <!-- <el-col :span="15" style="color: #333333;font-size: 14px;">名称</el-col> -->
-                  <!-- <el-col :offset="4" :span="5" class="center" style="color: #333333;font-size: 14px;">分数</el-col> -->
-                </el-row>
-                <el-row class="ranking-title  bacolor" v-for="(item, index) in Positive" :key="index" >
-                  <el-col :span="6" style="height:34px">
-                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                    <div v-if="item.title">
-                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-                    </div>
-                  </el-col>
-                  <!-- <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title + '（' + item.authorName+ ')'" placement="bottom" :visible-arrow="false" popper-class="text-tooltip"> -->
-                    <div :title="item.title+ '（' + item.authorName+ ')'" @click="jumpRouter(item)">
-                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
-
-                    </div>
-                  <!-- </el-tooltip> -->
-                  <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
-                </el-row>
-              </div>
-            </el-card>
+               <!-- <div class="course-resources pointer"> -->
+                <!-- 资源位 -->
+                <!-- <img  @click="banJump()" :src="fileBaseUrl + resonimg.image" alt=""> -->
+              <!-- </div> -->
            </div>
-        </div>
       </div>
-
-      <el-row :gutter="10">
-      </el-row>
       <div style="height: 50px;"></div>
       <el-dialog class="protocol" :close-on-click-modal="false" :visible.sync="protocolDialogVisible" width="30%" :show-close="false">
         <div class="protocol-title">案例查阅及使用用户协议</div>
@@ -249,6 +215,7 @@ import apiSearchterm from "@/api/modules/searchterm.js";
 import { deepClone } from "../../../utils";
 import apiDict from "@/api/modules/dict.js";
 import {cutFullName} from "@/utils/tools.js";
+import apiPlace from "@/api/phase2/place.js"
 export default {
   name: "index",
   components: {
@@ -279,6 +246,8 @@ export default {
   },
   data() {
     return {
+      fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
+      resonimg:{},
       speciData:[],
       moreState: 1, // 1 加载更多 2 加载中 3无数据
       isSeach: false,
@@ -345,6 +314,7 @@ export default {
     this.getdomain();
     // this.getCaseData();
     this.search();
+     this.couresreso();
     window.addEventListener("scroll", this.handleScroll);
 
   },
@@ -362,6 +332,18 @@ export default {
     window.removeEventListener("scroll", this.handleScroll);
   },
   methods: {
+    banJump() {
+      if(this.resonimg.JumpUrl) {
+        window.open(this.resonimg.JumpUrl);
+      }
+    },
+    couresreso(){
+      let key = 'case';
+      apiPlace.detail(key).then(res=>{
+        let lmj =  JSON.parse(res.result.content)
+        this.resonimg = lmj[0]
+      })
+    },
   specialized(){
     let $this=this;
     apiCase.majorTypes().then(res =>{
@@ -394,8 +376,8 @@ export default {
     },
     //展示全部
     displayAll(item) {
-      if (!item.isAll && item.summary && item.summary.length > 180) {
-        return item.summary.slice(0, 180) + "...";
+      if (!item.isAll && item.summary && item.summary.length > 150) {
+        return item.summary.slice(0, 150) + "...";
       }
       return item.summary;
     },
@@ -506,9 +488,11 @@ export default {
       this.getCaseData();
     },
     handleScroll() {
+      let innerw = document.querySelector("#fixd-box");
       let innerHeight = document.querySelector("#case-list-content")
         .clientHeight;
       let outerHeight = document.documentElement.clientHeight;
+      let outerWidth = innerw.clientWidth;
       let scrollTop = document.documentElement.scrollTop;
       if (outerHeight + scrollTop + 350 >= innerHeight) {
         if (this.moreState == 1) {
@@ -517,7 +501,7 @@ export default {
       }
       if (scrollTop > 630) {
         document.querySelector("#fixd-box").style.cssText =
-          "position: fixed;top: -250px;width:245.5px";
+          "position: fixed;top: -400px;width:"+outerWidth+"px";
       } else {
         document.querySelector("#fixd-box").style.cssText = "position: static";
       }
@@ -581,7 +565,6 @@ export default {
           if (res.status == 200) {
             if (res.result.list.length > 0) {
               this.isSeach = false;
-              console.log(res.result.list)
               res.result.list.forEach(item => {
                 item.majorType = item.majorType.split(",");
                 item.isAll = false;
@@ -738,16 +721,50 @@ export default {
 </script>
 
 <style scoped lang="scss">
-  
+.notcoures{
+  text-align: center;
+  img{
+    width: 360px;
+    height: 226px;
+  }
+  h5{
+    font-size: 14px;
+    color: #333333;
+    font-weight: 400;
+  }
+}
+.orgaicon{
+  width: 22px;
+  height: 22px;
+  vertical-align: middle;
+  margin-right: 8px;
+  img{
+    width: 100%;
+    height: 100%;
+  }
+}
+.course-resources{
+  margin-top: 26px;
+  img{
+    width: 100%;
+    height: 100%;
+    border-radius: 8px;
+  }
+}
+  .case-banner{
+    height: 240px;
+    background: url('../../../../public/images/case-banner.png');
+  }
+
 ::v-deep  .el-checkbox{
    .el-checkbox__input{
      .el-checkbox__inner{
        border: 1px solid #3e3c3c;
      }
    }
-     
+
   }
-  
+
 ::v-deep .el-radio-button{
   margin-right:-5px;
 }
@@ -758,8 +775,10 @@ export default {
   line-height: 30px;
   display: flex;
   .case-tittext {
-    font-size: 18px;
-    width: 80%;
+    font-size: 18px;     
+    font-weight: 600;
+    color: #333333;
+    width: 67%;
     display: -webkit-box;
     overflow: hidden;
     word-break: break-all;
@@ -783,15 +802,16 @@ export default {
 .keyword-text {
 
   div {
-    padding:0px 7px;
+    padding:0px 8px;
     margin-top: 5px;
     float: left;
-    line-height: 22px;
-    font-size: 14px;
-    color: #2974D6;
-    border: 1px solid #2974D6;
-    border-radius: 10px;
+    line-height: 24px;
+    font-size: 12px;
+    border-radius:2px;
     margin-right: 8px;
+    color: #2C68FF;
+    height: 24px;
+    background: rgba(44,104,255,0.06);
   }
 }
 .searBox {
@@ -802,21 +822,7 @@ export default {
   overflow: hidden;
 
 }
-.ranking-title {
-  line-height: 34px;
-  font-size: 15px;
-  color: #333333;
-  .center-titlt {
-    font-size: 15px;
-    color: #333333;
-  }
-  .center {
-    text-align: right;
-  }
-  img {
-    margin-top: 5px;
-  }
-}
+
 ::v-deep .title-line-ellipsis {
   // width: 100%;
   display: -webkit-box;
@@ -841,7 +847,7 @@ export default {
 ::v-deep .el-card {
   border: none;
   border-radius: 0px;
-  border: 1px solid #ebeef5;
+  // border: 1px solid #ebeef5;
 }
 ::v-deep .el-radio-button__inner,
 .el-radio-group {
@@ -857,37 +863,27 @@ export default {
   //box-shadow: none!important;
 }
 
-.item-title {
-  margin: 10px 10px 10px 0;
-  //font-size: 14px;
-  font-weight: 600;
-  color: #333333;
-  // line-height: 20px;
+::v-deep.item-title {
+  margin: 15px 10px 10px 0;
+  font-size: 16px !important;
+  font-weight: 400;
+  color: #6B7C85;
+  line-height: 25px;
 }
 .item-line {
   padding-left: 2px;
   height: 20px;
-
-  background: #ddd;
+  // background: #ddd;
 }
 
 .portal-content {
   display: flex;
   justify-content: space-between;
-  // .item-title{
-  //   margin-bottom: 5px;
-  //   line-height: 36px;
-  //   font-size: 14px;
-  //   font-weight: 600;
-  //   color: #333333;
-  // }
+  
 }
 .searchbar {
   background-color: #ffffff;
-  // border: 1px solid #f3f3f3;
-  // width: 1200px;
-  // padding: 5px 20px;
-  // margin-bottom: 10px;
+ 
 }
 
 .fixed {
@@ -914,21 +910,20 @@ export default {
   .quyer-tag {
     // margin-left: 10px;
     .order-class {
-      color: #666666;
-      width: 52px;
-      // text-align: left;
-      border: 1px solid #dfdfdf;
-      // padding-left: 5px;
-      // padding-top: 5px;
-      // padding-bottom: 5px;
-      // padding: 8px 20px;
+      padding:0px 12px;
+      color: #6E7B84;
+      line-height: 32px;
+      border-radius: 0px;
       .el-icon--right {
         margin-left: 0;
       }
     }
     .actice {
-      background: #3e7fff;
+      border: 0px;
+      background: #387DF7;
       color: #fff;
+      font-size: 14px;
+      border-radius: 4px;
     }
   }
   /* 分页div */
@@ -939,21 +934,28 @@ export default {
     }
   }
   .order-div {
-    padding: 12px 15px;
+    padding: 34px 40px 20px 40px;
     background-color: #fff;
     // margin-bottom: ;
   }
   .data-content {
     background-color: #fff;
-    padding: 5px 10px;
+    padding: 5px 50px;
+    ::v-deep .interact-bar-btns{
+      .interact-bar-btn{
+        text-align: right;
+        min-width: 78px !important;
+        margin-right: 0;
+      }
+    }
     .case-list:last-child {
       border-bottom: none;
     }
 
     .case-list {
-      border-bottom: 1px solid #dfdfdf;
-      margin: 8px 0px;
-      padding-bottom: 15px;
+      border-bottom: 1px solid rgba(153, 153, 153,.2);
+      margin-top: 10px;
+      margin-bottom: 25px;
       padding-left: 5px;
       padding-right: 5px;
     }
@@ -974,23 +976,24 @@ export default {
           .case-info-date {
             flex: 1;
             text-align: right;
-            font-size: 12px;
-            height: 30px;
-            font-weight: 200;
-            color: #8590a6;
+            font-weight: normal;
+            // font-size: 12px;
+            // height: 30px;
+            // font-weight: 200;
+            // color: #8590a6;
             i {
               margin-right: 5px;
             }
           }
         }
         .case-info-summary {
-          margin-top:8px;
+          margin-top:16px;
           cursor: pointer;
           margin-bottom: 5px;
           word-break: break-all;
-          line-height: 25px;
-          font-size: 15px;
-          color: #121212;
+          line-height: 24px;
+          font-size: 14px;
+          color: #333330;
           font-weight: 400;
         }
         .case-info-tools {
@@ -1019,7 +1022,7 @@ export default {
   }
   .search-div {
     background: #fff;
-    padding: 10px 25px;
+    padding: 30px 40px;
     .search-keyword {
       line-height: 30px;
       .tip {
@@ -1046,23 +1049,4 @@ export default {
   }
 }
 
-.ranking-card {
-  .center {
-    text-align: center;
-  }
-}
-.right-box {
-  line-height: 25px;
-
-  .ranking-title {
-  }
-  .aligh-title {
-    font-size: 14px;
-    color: #333333;
-  }
-  .ranking-data {
-    margin: 10px 0;
-    color: #999999;
-  }
-}
 </style>
diff --git a/src/views/portal/course/Detail.vue b/src/views/portal/course/Detail.vue
index 18e2710a..7ed57dda 100644
--- a/src/views/portal/course/Detail.vue
+++ b/src/views/portal/course/Detail.vue
@@ -1,67 +1,70 @@
 <template>
   <div>
-    <portal-header current="course" :goSearch="1"></portal-header>
-    <div  class="portal-content xcontent">
-      <el-breadcrumb separator-class="el-icon-arrow-right" class="breadcrumb-nav">
-        <el-breadcrumb-item :to="{ path: '/course' }">课程列表</el-breadcrumb-item>
-        <el-breadcrumb-item>课程详情</el-breadcrumb-item>
-      </el-breadcrumb>
-      <!-- <div class="course-title">
-        <div class="title">{{courseInfo.name}}</div>
-        <div class="course-title-right">
-          <interactBar :readonly="!stuStusts || stuStusts==0" :type="1" :data="courseInfo" :comments="false" :views="false"></interactBar>
+    <div class="xpage-coures-banner">
+        <portal-header current="course" textColor="#fff" :goSearch="1"></portal-header>
+        <div class="xcontent">
+            <div class="banner-crumbs">
+               <router-link to="/course"><span class="crumbs-first">课程列表</span></router-link>
+               <span class="crumbs-line">  &gt; </span>
+               <span class="crumbs-last">课程详情</span>
+            </div>
+            <div class="bcourse-title">
+               <!-- <span>{{courseInfo.name}}</span> -->
+                <!-- <span>{{courseInfo.summary}}</span>  -->
+                <!-- <span class="bcourse-score">{{toScore(courseInfo.score)}}分</span> -->
+            </div>
         </div>
-      </div> -->
-      <el-row :gutter="10">
-        <el-col :span="24">
-          <el-card :body-style="{ padding: '0px' }">
-            <div class="detail">
-              <div class="image">
-                <course-image :course="courseInfo"></course-image>
-              </div>
-              <div class="detail-info">
-              <div class="course-title">
-                <div class="title"> {{courseInfo.name}}</div>
-                <interactBar :readonly="!stuStusts || stuStusts==0" :type="1" :data="courseInfo" :praises="false" :comments="false" :views="false"></interactBar>
-              </div>
-                  <!-- <div class="course-title-right"> -->
-                  <!-- <interactBar :readonly="!stuStusts || stuStusts==0" :type="1" :data="courseInfo" :comments="false" :views="false"></interactBar> -->
-                <!-- </div> -->
-                <div>
-                  <div class="study-count">{{courseInfo.studys}}人学习</div>
-                  <!-- <div><span style="font-size:20px;color:#ff8e00">{{courseInfo.score ? courseInfo.score.toFixed(1) : 0}}</span><span style="font-size:12px;color:#ff8e00">分</span></div> -->
-                </div>
-                <div class="label-div">
-                  <el-tag class="label-item" effect="plain" v-for="(item,tagIdx) in tagArray" :key="tagIdx">{{item}}</el-tag>
-                 </div>
-                <!-- <div style="width:160px;height:50px"> -->
-                <!-- </div> -->
-                <!-- <div class="label-div">
-                  <el-tag class="label-item" effect="plain">{{courseType(courseInfo.type)}}</el-tag>
-                </div> -->
-                  <div class="score-div">
-                     <!-- colors="[#FF8E00]" -->
-                    <div v-if="courseInfo.score">
-                      <el-rate disabled v-model="courseInfo.score"></el-rate>
-                      <span class="score-text">{{courseInfo.score ? courseInfo.score.toFixed(1) : 0}}<span style="font-size: 14px;">分</span></span>
-                     </div>
-                     <div v-else class="score-no">未评分</div>
-                  </div>
-                  <div class="btn-div"  style="height:30px;margin-top: 15px;">
-                    <el-button v-if="stuStusts == 0" type="primary" @click="startSigningUp()" >立即报名</el-button>
-                    <el-button v-if="stuStusts == 1" type="primary" @click="jumpJearning">{{btnName}}</el-button>
-                 </div>
+    </div>
 
-                <div class="erweima" v-if="courseInfo.device == 2 || courseInfo.device == 3">
-                  <img class="detail-img" v-show="!showQrcode" @click="showQrcode = true" src="../../../assets/images/qr.png">
-                  <div v-show="showQrcode" class="qrcode" @click="showQrcode = false">
-                    <div id="qrcode" ref="qrcode"></div>
-                    <!-- <div class="qrcode-title">手机扫码观看</div> -->
-                  </div>
+    <div  class="portal-content xcontent">
+
+          <div class="detail">
+            <div class="image">
+              <course-image :course="courseInfo"></course-image>
+            </div>
+            <div class="detail-info">
+            <div class="course-title">
+              <div class="title"> {{courseInfo.name}}</div>
+              <interactBar  :readonly="!stuStusts || stuStusts==0" :type="1" :data="courseInfo" :praises="true" :comments="false" :views="false"></interactBar>
+            </div>
+                <!-- <div class="course-title-right"> -->
+                <!-- <interactBar :readonly="!stuStusts || stuStusts==0" :type="1" :data="courseInfo" :comments="false" :views="false"></interactBar> -->
+              <!-- </div> -->
+              <div>
+                <div class="study-count">{{courseInfo.studys}}人学习</div>
+                <!-- <div><span style="font-size:20px;color:#ff8e00">{{courseInfo.score ? courseInfo.score.toFixed(1) : 0}}</span><span style="font-size:12px;color:#ff8e00">分</span></div> -->
+              </div>
+              <div class="label-div">
+                <el-tag class="label-item" effect="plain" v-for="(item,tagIdx) in tagArray" :key="tagIdx">{{item}}</el-tag>
+               </div>
+              <!-- <div style="width:160px;height:50px"> -->
+              <!-- </div> -->
+              <!-- <div class="label-div">
+                <el-tag class="label-item" effect="plain">{{courseType(courseInfo.type)}}</el-tag>
+              </div> -->
+                <div class="score-div">
+                   <!-- colors="[#FF8E00]" -->
+                  <div v-if="courseInfo.score">
+                    <el-rate disabled v-model="courseInfo.score"></el-rate>
+                    <span class="score-text">{{courseInfo.score ? courseInfo.score.toFixed(1) : 0}}<span style="font-size: 14px;">分</span></span>
+                   </div>
+                   <div v-else class="score-no">未评分</div>
+                </div>
+                <div class="btn-div"  style="height:30px;margin-top: 15px;">
+                  <el-button v-if="stuStusts == 0" type="primary" @click="startSigningUp()" >开始学习</el-button>
+                  <el-button v-if="stuStusts == 1" type="primary" @click="jumpJearning">{{btnName}}</el-button>
+               </div>
+
+              <div class="erweima" v-if="courseInfo.device == 2 || courseInfo.device == 3">
+                <img class="detail-img" v-show="!showQrcode" @click="showQrcode = true" src="../../../assets/images/qr.png">
+                <div v-show="showQrcode" class="qrcode" @click="showQrcode = false">
+                  <div id="qrcode" ref="qrcode"></div>
+                  <!-- <div class="qrcode-title">手机扫码观看</div> -->
                 </div>
               </div>
             </div>
-          </el-card>
+          </div>
+
           <el-row :gutter="10">
             <el-col :span="18">
               <el-card :body-style="{ padding: '0px' }" class="info" style="margin-top: 10px;">
@@ -73,13 +76,12 @@
                       <div class="content"><img src="@/assets/images/icon/remark-iocn.png" alt="" srcset="">详细介绍：<div class="content-text"  v-html="courseInfo.summary"></div></div>
                     </div>
                   </el-tab-pane>
-                  <el-tab-pane label="大纲" name="second">
+                  <el-tab-pane label="大纲" name="second" v-if="courseInfo.type==20">
                     <div class="category" v-for="(item) in catalogTree" :key="item.id">
                       <div class="node">
                         <div class="title">{{item.section.name}}</div>
                         <div class="subnode" v-for="(it,itIdx) in item.contents" :key="it.id">
                           <div class="sub-title">
-                            <!-- {{itIdx+1}}.  -->
                             <div class="tip"><span class="tip-type">{{getType(it.contentType)}}</span>{{it.contentName}}</div>
                           </div>
                         </div>
@@ -87,6 +89,14 @@
                     </div>
                     <div style="height: 30px;"></div>
                   </el-tab-pane>
+                  <el-tab-pane label="大纲" name="second" v-if="courseInfo.type==10">
+                    <div class="category" v-for="(item) in contentList" :key="item.id">
+                      <div class="node">
+                        <div class="title">{{item.contentName}}</div>
+                      </div>
+                    </div>
+                    <div style="height: 30px;"></div>
+                  </el-tab-pane>
                   <el-tab-pane :label="'评论('+commentsTtoal+')'" name="third">
                     <comments v-if="courseInfo.id!=''" :readonly="!stuStusts || stuStusts==0" :showTop="false" @writeTotal="showCommentsTotal" @success="addCommentSuccess" @delSuccess="delCommentSuccess" :obj-type="1" :to-users="toUsers" :obj-id="courseInfo.id" :obj-title="courseInfo.name"></comments>
                   </el-tab-pane>
@@ -98,7 +108,7 @@
                 <div class="top">授课讲师</div>
                 <div>
                   <div class="teacher" v-for="(item, idx) in teachers" :key="idx" >
-                    <div class="teacher-avator">
+                    <div class="teacher-avator" style="cursor: pointer;" @click="toUserHome(item)">
                        <el-avatar v-if="item.avatar !=='' " :src="item.avatar" shape="circle" :size="50"></el-avatar>
                       <div class="teacher-text" v-if="item.sex !== null && item.avatar ==''">
                          <div v-if="item.sex === 1 "><img src="../../../../public/images/Avatarman.png" alt=""></div>
@@ -114,8 +124,7 @@
               </el-card>
             </el-col>
           </el-row>
-        </el-col>
-      </el-row>
+
     </div>
     <portal-footer></portal-footer>
   </div>
@@ -158,7 +167,7 @@ export default {
       curContent:{},//当前看的内容目录
       teachers:[],
       activeName: "first",
-      stuStusts: null,
+      stuStusts: 1,
       commentsTtoal:0,
       toUsers:[],//可以@的用户列表
       btnName:'开始学习',
@@ -175,6 +184,12 @@ export default {
     //页面只支取一次，所以先直接写在这里面
     apiCoursePortal.detail(id,false).then(rs=>{
       if(rs.status==200){
+
+        if(!rs.result.course.enabled || rs.result.course.deleted){
+          $this.$message.error('十分抱歉，此课程已停用，如需使用，请联系管理员。');
+          return;
+        }
+
         if(rs.result.teachers && rs.result.teachers.length > 0){
           let userIds=[];
           let ctoUsers=[];
@@ -185,31 +200,34 @@ export default {
             ctoUsers.push({aid:item.teacherId,name:item.teacherName,sex:item.sex});
           })
           this.toUsers=ctoUsers;
-          this.loadAuthorInfo(rs.result.teachers,userIds)
+          this.loadAuthorInfo(rs.result.teachers,userIds);
         }
-        this.courseInfo=rs.result.course;
-        this.courseInfo.score = rs.result.course.score;
-        if(rs.result.course.tags!=''){
-           this.tagArray=rs.result.course.tags.split(',');
-        }
-        if(!rs.result.course.resOwner3){
-          this.courseInfo.resOwner = this.resOwnerName(rs.result.course.resOwner2);
-        } else{
-          this.courseInfo.resOwner = this.resOwnerName(rs.result.course.resOwner3);
-        }
-        this.teachers=rs.result.teachers;
-        this.contentList=rs.result.contents;
-        let treeList=[];
-        rs.result.sections.forEach(sec=>{
-          let treeNode={section:sec,contents:[]}
-          rs.result.contents.forEach(c=>{
-            if(c.csectionId==sec.id){
-              treeNode.contents.push(c);
-            }
-          });
-          treeList.push(treeNode);
-        })
-        this.catalogTree=treeList;
+          this.courseInfo=rs.result.course;
+          this.courseInfo.score = rs.result.course.score;
+          if(rs.result.course.tags!=''){
+            this.tagArray=rs.result.course.tags.split(',');
+          }
+          if(!rs.result.course.resOwner3){
+            this.courseInfo.resOwner = this.resOwnerName(rs.result.course.resOwner2);
+          } else{
+            this.courseInfo.resOwner = this.resOwnerName(rs.result.course.resOwner3);
+          }
+          this.teachers=rs.result.teachers;
+          if(this.courseInfo.type == 10) {
+            this.contentList=rs.result.contents;
+          } else {
+              let treeList=[];
+              rs.result.sections.forEach(sec=>{
+                let treeNode={section:sec,contents:[]}
+                rs.result.contents.forEach(c=>{
+                  if(c.csectionId==sec.id){
+                    treeNode.contents.push(c);
+                  }
+                });
+                treeList.push(treeNode);
+              })
+              this.catalogTree=treeList;
+          }
         this.showQrimage();
         this.isSignUp();
       }else{
@@ -231,15 +249,21 @@ export default {
       getSysTypeTree:'sysType/getSysTypeTree',
       loadSysTypes:'sysType/loadSysTypes'
     }),
+    toUserHome(tea){
+      this.$router.push({path:this.$xpage.getHomePath(tea.teacherId)})
+    },
     showQrimage(){
       let urlPre=window.location.protocol+'//'+window.location.host;
+      let returnUrl='https://u.boe.com/mobile/pages/login/loading?returnUrl=/pages/resource/courseDetail?id='+this.courseInfo.id;
       // this.qrcode = this.webBaseUrl+'/mobile/pages/resource/courseDetail?id='+this.courseInfo.id;
-      urlPre='https://u.boe.com/m?returnUrl=https://u.boe.com/mobile/pages/login/loading?returnUrl=';
-       this.qrcode = urlPre+'/pages/resource/courseDetail?id='+this.courseInfo.id;
+      returnUrl=encodeURIComponent(returnUrl);
+      //urlPre='https://u.boe.com/m?returnUrl=https://u.boe.com/mobile/pages/login/loading?returnUrl=';
+      //this.qrcode = urlPre+'/pages/resource/courseDetail?id='+this.courseInfo.id;
        //console.log(this.qrcode,'qrcode');
-        this.$nextTick(() => {
-          this.crateQrcode();
-        });
+      this.qrcode ='https://u.boe.com/m?returnUrl='+returnUrl;
+      this.$nextTick(() => {
+        this.crateQrcode();
+      });
     },
     crateQrcode(){
        this.qr = new QRCode('qrcode', {
@@ -282,6 +306,7 @@ export default {
          if(res.status == 200) {
            this.stuStusts = 1;
            //this.activeName = 'second';
+           this.$router.push('/course/studyindex?id='+this.courseInfo.id);
 
          } else {
             this.$message.error(res.message);
@@ -304,7 +329,7 @@ export default {
          this.loadLastStudy();
        } else {
          this.stuStusts = 0;
-         this.startSigningUp();
+         //this.startSigningUp();
        }
      })
    },
@@ -397,6 +422,8 @@ export default {
 
 .detail {
   display: flex;
+  margin-top: 20px;
+  background-color: #fff;
   .image {
       width: 500px;
       height: 280px;
diff --git a/src/views/portal/course/Index(1).vue b/src/views/portal/course/Index(1).vue
deleted file mode 100644
index d13d5e53..00000000
--- a/src/views/portal/course/Index(1).vue
+++ /dev/null
@@ -1,1401 +0,0 @@
-<template>
-  <div id="couser-list-content" class="couser-list-content">
-    <portal-header current="course" @emitInput="emitInput"></portal-header>
-    <!-- <div class="course-input">
-      <el-input  class="course-value" v-model.trim="course.keyword"  maxlength="20" @input="inputOn($event)" clearable placeholder="请输入关键词搜索"><el-button slot="append" icon="el-icon-search" @click="searchData()" class="course-btn"></el-button></el-input>
-    </div> -->
-    <div class="xcontent portal-content">
-      <div class="xrow" style="display: flex;justify-content: space-between;">
-        <div style="flex: 1;" class="xcol content-div">
-          <el-row class="search-div">
-            <div class="searchbar" v-if="searchTags.length > 0">
-              <div style="line-height: 30px;">
-                <span class="item-title"> 搜索条件</span>
-                <el-tag closable v-for="(tag, tagIdx) in searchTags" :key="tagIdx" @close="tagsClose(tag,tagIdx)">{{ tag.name }}</el-tag>
-              </div>
-            </div>
-            <el-row class="search-item">
-              <el-col :span="24">
-                <div style="margin-top:10px; display: flex;">
-                  <div style="line-height: 25px;padding-right: 10px;">
-                    <span class="item-title" style="padding-right: 5px;">授课方式</span>
-                    <span class="item-line"></span>
-                  </div>
-                  <!-- // 10微课，21在线课(直播)；20:在线课( 录播)；30:面授课；40:学习项目,90:混合式， -->
-                  <div>
-                  <el-radio-group v-model="category" size="mini" @change="searchData">
-                    <el-radio-button :label="null">全部</el-radio-button>
-                    <el-radio-button :label="20">录播课</el-radio-button>
-                    <el-radio-button :label="30">线下课</el-radio-button>
-                    <el-radio-button :label="40">学习项目</el-radio-button>
-                  </el-radio-group>
-                  </div>
-                </div>
-              </el-col>
-            </el-row>
-            <div :class="queryExpand ? 'search-div-expand' : 'search-div-collapse'">
-              <el-row class="search-item">
-                <el-col :span="24">
-                  <div style="margin-top:10px;display: flex;">
-                    <div style="line-height: 25px;padding-right: 10px;">
-                      <span class="item-title" style="padding-right: 5px;">内容分类</span>
-                      <span class="item-line"></span>
-                    </div>
-                    <el-radio-group  v-model="types.sysTypes" size="mini" @change="changeType">
-                      <el-radio-button :label="null">全部</el-radio-button>
-                      <el-radio-button v-for="item in optionsList" :key="item.id" :label="item.id">{{item.name}}</el-radio-button>
-                    </el-radio-group>
-                      <span @click="jumUX()" class="Uxtext" style=""> U选小课堂
-                          <span class="uxicon">
-                            <svg-icon icon-class="hot" style="font-size:22px"></svg-icon>
-                          </span>
-                      </span>
-                  </div>
-                  <div class="search-item-sub" v-if="types.oneSubList.length != 0">
-                    <el-radio-group v-model="types.subOne" size="mini"  @change="changeTypeSub">
-                      <el-radio-button label="0">全部</el-radio-button>
-                      <el-radio-button v-for="item in types.oneSubList" :key="item.id" :label="item.id">{{item.name}}</el-radio-button>
-                    </el-radio-group>
-                  </div>
-                   <div class="search-item-sub" v-if="types.towSubList.length != 0">
-                    <el-radio-group v-model="types.subTow" size="mini" @change="searchData">
-                      <el-radio-button label="0">全部</el-radio-button>
-                      <el-radio-button v-for="item in types.towSubList" :key="item.id" :label="item.id">{{item.name}}</el-radio-button>
-                    </el-radio-group>
-                  </div>
-                </el-col>
-              </el-row>
-            </div>
-          </el-row>
-          <el-row class="order-div" v-if="listType == 1">
-            <span class="quyer-tag">
-                 <el-button type="text" class="order-class" @click="orderChange('studys')" :class="{ actice: course.orderField == 'studys' }">最热</el-button>
-              <el-button type="text" class="order-class" @click="orderChange('publishTime')" :class="{ actice: course.orderField == 'publishTime' }">最新</el-button>
-            </span>
-          </el-row>
-          <div class="xrow data-content" v-if="listType == 1">
-            <div class="xrow-course course-index" v-for="(cinfo,cidx) in courseList" :key="cinfo.id" v-if="(courseList.length<=course.pageSize) || (cidx<parseInt(courseList.length/columns)*columns)">
-              <el-card class="course-card" :body-style="{padding:'0px'}">
-                <a :href="toCourseDetail(cinfo)">
-                  <div class="course-image-box">
-                    <course-image height="146px" :course="cinfo"></course-image>
-                    <span v-if="cinfo.type==20" class="course-type-title course-type">录播课</span>
-                    <span v-if="cinfo.type==10" class="course-type-title course-type">录播课</span>
-                    <span v-if="cinfo.type=='online-course'" class="course-type-title course-type">录播课</span>
-                    <span v-if="cinfo.type=='face-course'" class="course-type-title course-type">线下课</span>
-                    <span v-if="cinfo.type=='project'" class="course-type-title course-type">学习项目</span>
-                </div>
-                  <!-- <el-tooltip class="item"  :content="cinfo.couretitle" placement="bottom-start" effect="light"  :visible-arrow="false" popper-class="text-tooltip" > -->
-                      <div :title="cinfo.name" class="course-title title-line-ellipsis"  v-html="$keywordActiveShow(cinfo.name,keyword)">
-                      </div>
-                  <!-- </el-tooltip> -->
-                <div class="course-author">
-                  <div class="course-author-left" v-if="cinfo.authorInfo">
-                      {{cinfo.authorInfo.name}}
-                  </div>
-                  <div style="flex:1;text-align: center;">
-                     <span class="study-num">{{cinfo.studys}}人学习</span>
-                  </div>
-                  <div style="padding-left:15px">
-                    <div v-if="cinfo.score">
-                  <span class="course-score-value">{{toScore(cinfo.score)}}</span>
-                </div>
-                <div v-else class="course-score-no">未评分</div>
-                  </div>
-                </div>
-                </a>
-                 <div class="cor-praises" v-if="cinfo.type == 10 || cinfo.type == 20"><interactBar :type="1" :data="cinfo" :comments="false" :praises="false" :shares="false" :views="false"></interactBar> </div>
-              </el-card>
-            </div>
-          </div>
-          <!--  分页 -->
-          <div class="pagination-div">
-            <span class="pag-text" @click="loadMore()" v-if="moreState == 1 && courseList.length>=course.pageSize">加载更多</span>
-            <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
-            <span class="pag-text-msg" v-else-if="moreState == 3">没有更多数据了</span>
-          </div>
-        </div>
-        <div style="width: 245px;margin-left: 5px;">
-          <div>
-            <div id="fixd-box">
-            <div v-if="identity == 2 || identity == 3 || identity == 5">
-              <el-button style="width: 100%;margin-bottom:15px;height: 37px;border-radius: 0;" type="primary" @click="toNeedCourse">做课程</el-button>
-            </div>
-               <el-card class="ranking-card" >
-              <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">好评榜</span>
-              </div>
-              <div style="padding-bottom:10px">
-                <el-row class="ranking-title">
-                </el-row>
-                <el-row class="ranking-title  bacolor" v-for="(item, index) in scorelist" :key="index" >
-                  <el-col :span="6" style="height:34px">
-                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-                  </el-col>
-                  <!-- <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.name" placement="bottom" :visible-arrow="false" popper-class="text-tooltip"> -->
-                        <div :title="item.name" @click="jumpRouter(item)">
-                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.name }}</el-col>
-                        </div>
-
-                  <!-- </el-tooltip> -->
-                </el-row>
-              </div>
-            </el-card>
-                <div style="height: 10px;"></div>
-            <el-card class="ranking-card">
-              <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">人气榜</span>
-              </div>
-              <div style="padding-bottom:10px">
-                <el-row class="ranking-title">
-                </el-row>
-                <el-row class="ranking-title bacolor" v-for="(item, index) in ankingList" :key="index">
-                  <el-col :span="6" style="height:34px">
-                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-                  </el-col>
-                  <!-- <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.name" placement="bottom" :visible-arrow="false" popper-class="text-tooltip"> -->
-                        <div :title="item.name" @click="jumpRouter(item)">
-                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.name }}</el-col>
-                        </div>
-
-                  <!-- </el-tooltip> -->
-                </el-row>
-              </div>
-            </el-card>
-            <div style="height: 10px;"></div>
-            <el-card class="ranking-card">
-              <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">热度榜</span>
-              </div>
-              <div style="padding-bottom:10px">
-                <el-row class="ranking-title">
-                </el-row>
-                <el-row class="ranking-title bacolor" v-for="(item, index) in hotList" :key="index">
-                  <el-col :span="6" style="height:34px">
-                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-                  </el-col>
-                  <!-- <el-tooltip :enterable="false" @click.native="jumpRouter2(item)" effect="light" :content="item.courseName" placement="bottom" :visible-arrow="false" popper-class="text-tooltip"> -->
-                        <div :title="item.courseName" @click="jumpRouter2(item)">
-                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.courseName }}</el-col>
-                        </div>
-                  <!-- </el-tooltip> -->
-                </el-row>
-              </div>
-            </el-card>
-            </div>
-
-          </div>
-        </div>
-      </div>
-    </div>
-    <portal-footer></portal-footer>
-    <portalFloatTools ref="floatTools"></portalFloatTools>
-  </div>
-</template>
-<script>
-import { mapGetters, mapActions } from "vuex";
-import portalHeader from "@/components/PortalHeader.vue";
-import portalFooter from "@/components/PortalFooter.vue";
-import portalFloatTools from "@/components/PortalFloatTools.vue";
-import authorInfo from "@/components/Portal/authorInfo.vue";
-import courseItem from "@/components/Portal/course/courseItem.vue";
-import apiCoursePortal from "@/api/modules/coursePortal.js";
-import courseForm from "@/components/Course/courseForm.vue";
-import apiType from "@/api/modules/type.js";
-import apiCourse from "@/api/modules/coursePortal.js";
-import apiOldCourse from "@/api/boe/course.js";
-import apiTeacher from "@/api/modules/teacher.js";
-import apiUser from "@/api/system/user.js";
-import scene from "@/api/modules/scene.js";
-import interactBar from "@/components/Portal/interactBar.vue";
-import courseImage from "@/components/Course/courseImage.vue";
-import { courseType, getType, toScore } from "@/utils/tools.js";
-import { deepClone, param } from "../../../utils";
-import apiSearchterm from "@/api/modules/searchterm.js";
-import { Promise } from "q";
-export default {
-  name: "index",
-  components: {
-    portalHeader,
-    portalFooter,
-    portalFloatTools,
-    courseItem,
-    courseForm,
-    authorInfo,
-    courseImage,
-    interactBar
-  },
-  computed: {
-    ...mapGetters(["resOwnerMap", "sysTypeMap", "userInfo", "identity"])
-  },
-  data() {
-    return {
-      couretitle: "",
-      toScore,
-      noPageList: true, //判断接口是否还有数据
-      noDataList: true, //判断接口是否还有数据
-      moreState: 1, // 1 加载更多 2 加载中 3无数据
-      columns: 3, //列的数量
-      fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
-      // 查询信息
-      types: {
-        sysTypesSub: "",
-        subOne: "",
-        subTow: "",
-        sysTypes: null,
-        oneSubList: [],
-        towSubList: []
-      },
-      course: {
-        orderField: "studys",
-        topOrder: true,
-        orderAsc: false,
-        pageIndex: 1, // 第几页
-        pageSize: 9 //每页多少条
-      },
-      optionsList: [], //分类数据
-      sceneList: [], //场景
-      keyword: "",
-      anking: "",
-      isFind: false,
-      searchbar: {
-        top: false
-      },
-      ankingList: [],
-      scorelist: [],
-      searchTags: [],
-      queryExpand: true, // true更多，false收起
-      category: null,
-      categorySub: 0,
-      type1: 0,
-      type2: [],
-      type3: 0,
-      type4: 0,
-      status: 1,
-      pager: {
-        total: 40
-      },
-      data: [{}, {}, {}, {}],
-      order: 1,
-      listType: 1,
-      courseList: [],
-      searchRecords: [],
-      hotList: [],
-      totalPages: 1
-    };
-  },
-  mounted() {
-    let screenWidth = window.screen.availHeight;
-    //console.log("screenWidth", screenWidth);
-    if (screenWidth < 1280) {
-      this.course.pageSize = 9;
-      this.columns = 3;
-    } else if (screenWidth < 1600) {
-      this.course.pageSize = 12;
-      this.columns = 4;
-    } else if (screenWidth >= 1600) {
-      this.course.pageSize = 15;
-      this.columns = 5;
-    }
-    //var hasNum=12;
-    //console.log(parseInt(hasNum/this.columns)*this.columns,'this.columns');
-
-    let el_top = document.querySelector("#searchbar");
-    let el_search = document.querySelector("#searchbar");
-    let height = 200;
-    let flag = true;
-    let $this = this;
-    this.getAnkingData();
-    window.addEventListener("scroll",this.handleScroll);
-    if (this.$route.query !== {}) {
-      this.course.keyword = this.$route.query.keyword;
-    }
-    this.getSceneData();
-    this.getTypeData();
-    if (this.course.keyword != undefined) {
-      this.totalPages = 4;
-    }
-    this.search();
-    this.searchterm();
-    this.loadSysTypes();
-    this.getScoreList();
-    this.getHotList();
-    //查询排行榜，页面打开只查询一次
-  },
-  beforeDestroy() {
-    window.removeEventListener("scroll", this.handleScroll);
-  },
-  methods: {
-    jumUX() {
-      window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130", "_blank");
-    },
-    emitInput(val) {
-      this.course.keyword = val;
-      this.searchData();
-    },
-    handleScroll() {
-      let innerHeight = document.querySelector("#couser-list-content")
-        .clientHeight;
-      let outerHeight = document.documentElement.clientHeight;
-      let scrollTop = document.documentElement.scrollTop;
-      if (outerHeight + scrollTop + 350 >= innerHeight) {
-        if (this.moreState == 1 && this.course.pageIndex < 4) {
-          this.loadMore();
-        }
-      }
-      if (scrollTop > 630) {
-        document.querySelector("#fixd-box").style.cssText =
-          "position: fixed;top: -550px;width:242.5px";
-      } else {
-        document.querySelector("#fixd-box").style.cssText = "position: static";
-      }
-    },
-    toNeedCourse() {
-      // 需要先切换标签
-      //this.$store.dispatch('SetCurIdentity',2);
-      //this.$router.push('/need/course?open=new');
-      this.$refs.floatTools.toNeedCourse();
-    },
-    searchData() {
-      this.course.pageIndex = 1;
-      this.noPageList = true; //判断接口是否还有数据
-      this.noDataList = true; //判断接口是否还有数据
-      this.courseList = [];
-      this.totalPages = 4;
-      this.search();
-    },
-    inputOn() {
-      this.$forceUpdate();
-    },
-    ...mapActions({
-      getResOwnerTree: "resOwner/getResOwnerTree",
-      loadResOwners: "resOwner/loadResOwners",
-      getSysTypeTree: "sysType/getSysTypeTree",
-      loadSysTypes: "sysType/loadSysTypes"
-    }),
-    sysTypeName(code) {
-      if (code == "") {
-        return "";
-      }
-      return this.sysTypeMap.get(code);
-    },
-    useHotword(item) {
-      this.$set(this.course, "keyword", item.keyword);
-      this.searchData();
-    },
-    searchterm() {
-      apiSearchterm.list(5, 1).then(res => {
-        if (res.status == 200) {
-          this.searchRecords = res.result;
-        }
-      });
-    },
-    toCourseDetail(item) {
-      if (isNaN(item.type)) {
-        return `${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${
-          item.type
-        }`;
-        //此处使用window.open有问题
-        //window.open(`${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.type}`);
-      } else {
-        if (item.type == 10) {
-          return this.webBaseUrl + "/course/micro?id=" + item.id;
-        } else if (item.type == 20) {
-          return this.webBaseUrl + "/course/detail?id=" + item.id;
-        }
-      }
-
-      return "";
-    },
-    orderChange(id) {
-      this.course.orderField = id;
-      this.course.pageIndex = 1;
-      this.noPageList = true; //判断接口是否还有数据
-      this.noDataList = true; //判断接口是否还有数据
-      this.courseList = [];
-      this.totalPages = 1;
-      this.search();
-    },
-    tagsClose(tag, index) {
-      for (let i in this.course) {
-        if (tag.id === this.course[i]) {
-          this.course[i] = "";
-          if (i === "sysType1") {
-            this.types.sysTypes = "";
-          }
-          if (i === "sysType2") {
-            this.types.subOne = "";
-          }
-          if (i === "sysType3") {
-            this.types.subTow = "";
-          }
-          if (i === "type") {
-            this.category = "";
-            this.categorySub = "";
-          }
-          
-
-          this.searchTags.splice(index, 1);
-           if(i === 'type') {
-            this.category = null;
-            this.categorySub = null;
-          }
-          if (i === "sysType1") {
-            this.types.sysTypes = null;
-          }
-          if (i === "sysType2") {
-            this.types.subOne = null;
-          }
-          if (i === "sysType3") {
-            this.types.subTow = null;
-          }
-
-          this.searchData();
-        }
-      }
-    },
-
-    // 分类
-    changeType(num) {
-      this.types.oneSubList = [];
-      this.types.subOne = "0";
-      this.types.towSubList = [];
-      let list = {};
-      if (num !== 0) {
-        list = this.optionsList.find(item => {
-          return item.id === num;
-        });
-      }
-      if (list && list.children) {
-        this.types.oneSubList = list.children;
-      }
-      this.searchData();
-    },
-    // 子级分类
-    changeTypeSub(num) {
-      this.types.subTow = "0";
-      let list = {};
-      if (num !== 0) {
-        apiType.list(1, num).then(res => {
-          if (res.status === 200) {
-            this.types.towSubList = res.result;
-          }
-        });
-      }
-      this.searchData();
-    },
-    //获取场景，保留
-    async getSceneData() {
-      try {
-        const { result, status } = await scene.list(1);
-        if (status === 200) {
-          this.sceneList = result;
-        }
-      } catch (error) {
-        console.log(error);
-      }
-    },
-    //获取分类，此处获取提内容分类
-    async getTypeData() {
-      try {
-        const { result, status } = await apiType.tree(1);
-        if (status === 200) {
-          this.optionsList = result;
-        }
-      } catch (error) {
-        console.log(error);
-      }
-    },
-    loadMore() {
-      this.course.pageIndex += 1;
-      this.search();
-    },
-    async search() {
-      let that = this;
-      if (this.course.keyword) {
-        apiSearchterm.save({ keyword: this.course.keyword, type: 1 });
-      }
-      this.isFind = true;
-      if (this.category === 0) {
-        this.course.type = null;
-      } else if (this.category === 2) {
-        // if (this.categorySub === "") {
-        //   this.course.type = "20";
-        // } else {
-        //   this.course.type = this.categorySub;
-        // }
-      } else {
-        this.course.type = this.category;
-      }
-      if (this.types.sysTypes == 0 || this.types.sysTypes == null) {
-        this.course.sysType1 = "";
-        this.course.sysType2 = "";
-        this.course.sysType3 = "";
-      } else {
-        this.course.sysType1 = this.types.sysTypes;
-      }
-      this.course.sysType2 = this.types.subOne;
-      this.course.sysType3 = this.types.subTow;
-      if (this.course.sysType2 == 0) {
-        this.course.sysType2 = "";
-      }
-      if (this.course.sysType3 == 0) {
-        this.course.sysType3 = "";
-      }
-      this.course.device = 1;
-      this.getTags();
-      //从新课程库中取10条，从老库中取10条
-      let oldPageIndex = 0;
-      let oldCateName = "";
-      let oldParamsType = "";
-      if (this.course.sysType1) {
-        //cateName
-        let courseSysType = this.course.sysType1;
-        let curName = this.optionsList.find(item => {
-          return item.id === courseSysType;
-        });
-        if (curName) {
-          oldCateName = curName.name;
-        }
-      }
-      if (this.category == 20) {
-        oldParamsType = "online-course";
-      } else if (this.category == 30) {
-        oldParamsType = "face-course";
-      } else if (this.category == 40) {
-        oldParamsType = "project";
-      }
-      //if(oldParamsType == '' && oldCateName == '' && this.course.keyword == '') {
-      if (this.searchTags.length == 0) {
-        oldPageIndex = this.course.pageIndex - 3;
-      } else {
-        oldPageIndex = this.course.pageIndex;
-      }
-
-      let oldParams = {
-        type: oldParamsType,
-        page: oldPageIndex,
-        size: this.course.pageSize,
-        keyword: this.course.keyword,
-        sort: "new",
-        cateName: oldCateName
-      };
-      if (this.course.orderField == "id") {
-        //最新
-        oldParams.sort = "new";
-      }
-      if (this.course.orderField == "studys") {
-        //最热
-        oldParams.sort = "hot";
-      }
-      let data = [];
-      let isTopList = [];
-
-      if (this.course.pageIndex > this.totalPages) {
-        //console.log(this.course.pageIndex, this.totalPages, "1");
-        this.noDataList = true;
-        if (this.searchTags.length == 0) {
-          oldParams.page = this.course.pageIndex - this.totalPages;
-        }
-      } else {
-        //console.log(this.course.pageIndex, this.totalPages, "2");
-        if (this.searchTags.length == 0) {
-          if (this.totalPages > 3) {
-            if (this.course.pageIndex <= 3) {
-              this.noDataList = false;
-            } else {
-              this.noDataList = true;
-            }
-          }
-        }
-        // if(this.totalPages == 1 && this.course.pageIndex ==1){
-        //   this.noDataList = true;
-        // }
-      }
-      if (this.course.type == 30 || this.course.type == 40) {
-        this.noPageList = false;
-      }
-      //console.log(this.noDataList, this.totalPages, "this.noDataList");
-      // 隐藏loadMore
-      this.moreState = 2;
-      this.noDataList &&
-        (await apiOldCourse
-          .courseList(oldParams)
-          .then(oldRs => {
-            if (oldRs.status == 200 && oldRs.result.dataList.length > 0) {
-              let list = that.filterConversion(oldRs.result.dataList);
-              //list.name = list.name.replace(/<[^>]+>|&[^>]+;/g,"").trim();
-              data.push(...list);
-              that.moreState = 1;
-            } else {
-              that.noDataList = false;
-            }
-          })
-          .catch(err => {
-            that.noDataList = false;
-          }));
-
-      this.noPageList &&
-        (await apiCoursePortal
-          .pageList(this.course)
-          .then(res => {
-            if (res.status == 200 && res.result.list.length > 0) {
-              this.totalPages = res.result.totalPages;
-              let courseIds = [];
-              res.result.list.forEach(item => {
-                item.name = this.$keywordActiveShow(
-                  item.name,
-                  this.course.keyword
-                );
-                item.couretitle = this.$keywordActiveShow(
-                  item.name,
-                  this.course.keyword
-                )
-                  .replace(/<[^>]+>|&[^>]+;/g, "")
-                  .trim(); //去掉所有的html标签和&nbsp;之类的特殊符合
-                item.authorInfo = {
-                  aid: "",
-                  name: "",
-                  orgInfo: "",
-                  avatar: "",
-                  code: ""
-                };
-                courseIds.push(item.id);
-                if (item.isTop) {
-                  isTopList.push(item);
-                } else {
-                  data.push(item);
-                }
-              });
-              that.loadCouserTeacher(res.result.list, courseIds);
-              // data.push(...res.result.list);
-              that.moreState = 1;
-            } else {
-              that.noPageList = false;
-            }
-          })
-          .catch(err => {
-            that.noPageList = false;
-          }));
-      if (this.course.orderField == "id") {
-        //最新
-        data.sort(this.pcompare("publishTime", false));
-      }
-      if (this.course.orderField == "studys") {
-        //最热
-        data.sort(this.pcompare("studys", false));
-      }
-      this.courseList.push(...isTopList, ...data);
-      if (this.noDataList == false && this.noPageList == false) {
-        this.moreState = 3;
-      }
-    },
-    pcompare(prop, rev) {
-      if (rev === undefined) {
-        rev = 1;
-      } else {
-        rev = rev ? 1 : -1;
-      }
-      return function(obj1, obj2) {
-        let val1 = obj1[prop],
-          val2 = obj2[prop];
-        return val1 < val2 ? rev * -1 : rev * 1;
-      };
-    },
-    filterConversion(data) {
-      let list = [];
-      data.forEach((item, index) => {
-        list.push({
-          coverImg: item.cover[0].url,
-          name: item.title,
-          type: item.type,
-          id: item.id,
-          studys: Number(item.enrollSuccess), // Number(), //学习人数
-          score: item.score,
-          publishTime: item.releaseDate,
-          authorInfo: {
-            avatar: "",
-            name: ""
-          }
-        });
-      });
-      return list;
-    },
-    loadCouserTeacher(list, ids) {
-      let that = this;
-      // 先查课程关联教师iD
-      apiCourse.getTeacherByCourseIDs(ids).then(cres => {
-        if (cres.status == 200) {
-          let userIds = [];
-          list.forEach((item, index) => {
-            cres.result.some(courseTeahcer => {
-              if (courseTeahcer.courseId == item.id) {
-                if (courseTeahcer.teacherIds) {
-                  userIds.push(courseTeahcer.teacherIds[0]);
-                  item.authorInfo.aid = courseTeahcer.teacherIds[0];
-                  item.authorInfo.name = courseTeahcer.names[0];
-                }
-                return true;
-              } else {
-                return false;
-              }
-            });
-          });
-          //that.loadCourseAuthorInfo(list,userIds);
-        }
-      });
-    },
-    loadCourseAuthorInfo(list, ids) {
-      //加载作者信息，头像，机构信息
-      if (ids.length == 0) {
-        return;
-      }
-      const noReapetIds = [...new Set(ids)];
-      apiUser.getByIds(ids).then(res => {
-        if (res.status == 200) {
-          list.forEach((item, index) => {
-            res.result.some(author => {
-              if (author.aid == item.authorInfo.aid) {
-                item.authorInfo = author;
-                return true;
-              } else {
-                return false;
-              }
-            });
-          });
-        } else {
-          console.log("加载课程信息失败:" + res.error);
-          //this.$message.error(res.message);
-        }
-      });
-    },
-    getTags() {
-      this.searchTags = [];
-      let courseData = deepClone(this.course);
-      for (let i in courseData) {
-        if (
-          courseData[i] !== "" &&
-          i !== "pageIndex" &&
-          i !== "pageSize" &&
-          i !== "orderField" &&
-          i !== "orderAsc" &&
-          i !== "topOrder" &&
-          i !== "device" &&
-          courseData[i] !== null &&
-          courseData[i] !== undefined
-        ) {
-          let id = courseData[i];
-          if (i == "type" && courseData[i] !== 0) {
-            courseData[i] = courseType(courseData[i]);
-          }
-          if (i == "sysType1" || i == "sysType2" || i == "sysType3") {
-            if (courseData[i] !== "0") {
-              courseData[i] = this.sysTypeName(courseData[i]);
-            }
-          }
-          if (i == "type" && courseData[i] === 0) {
-            courseData[i] = "在线课";
-          }
-          if (courseData[i] !== "0") {
-            this.searchTags.push({
-              id: id,
-              name: courseData[i]
-            });
-          }
-        }
-      }
-    },
-    // goTarget(href) {
-    //   window.open(this.webBaseUrl+href, "_blank");
-    // },
-    showInApply() {
-      this.inapply.show = true;
-    },
-    findOrg() {
-      //
-    },
-    pushEnter(type) {
-      this.type1.push(type);
-    },
-    deleteOut(type) {
-      this.type1 = this.type.filter(item => item != type);
-    },
-    chooseShow(type) {
-      return this.type1.some(item => item == type);
-    },
-    getAnkingData() {
-      apiCourse.ranking().then(res => {
-        if (res.status == 200) {
-          this.ankingList = res.result;
-        }
-      });
-    },
-    getScoreList() {
-      apiCourse.scorelist(5).then(res => {
-        if (res.status == 200) {
-          this.scorelist = res.result;
-        }
-      });
-    },
-    getHotList() {
-      apiCourse.studyCounts(5).then(res => {
-        if (res.status == 200) {
-          this.hotList = res.result;
-        }
-      });
-    },
-    jumpRouter(item) {
-      console.log(item.type, "item.type");
-      // return console.log(id,type,"fihkj1")
-      if (item.type == 20) {
-        //录播课
-        //  window.open(`${this.webBaseUrl}/course/detail?id=${id}`)
-        this.$router.push(`/course/detail?id=${item.id}`);
-      }
-      if (item.type == 10) {
-        //微课
-        //  window.open(`${this.webBaseUrl}/course/micro?id=${id}`)
-        this.$router.push(`/course/micro?id=${item.id}`);
-      }
-    },
-    jumpRouter2(item) {
-      // console.log(item,"土豪包括九年")
-      let type = item.courseType;
-      let id = item.courseId;
-
-      //console.log(item.type,type,'item.type');
-      // return console.log(id,type,"fihkj1")
-      if (type == 20) {
-        //录播课
-        //  window.open(`${this.webBaseUrl}/course/detail?id=${id}`)
-        this.$router.push(`/course/detail?id=${id}`);
-      }
-      if (type == 10) {
-        //微课
-        //  window.open(`${this.webBaseUrl}/course/micro?id=${id}`)
-        this.$router.push(`/course/micro?id=${id}`);
-      }
-    }
-  }
-};
-</script>
-
-<style scoped lang="scss">
-::v-deep .el-radio-button{
-  margin-right:0px;
-}
-::v-deep .title-line-ellipsis {
-  // width: 100%;
-  display: -webkit-box;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 1;
-  box-sizing: border-box;
-  word-break: break-all;
-}
-::v-deep .el-card__body {
-  padding: 0;
-}
-::v-deep .bacolor:nth-child(odd) {
-  background-color: #fff;
-  padding: 0 5px;
-}
-::v-deep .bacolor:nth-child(even) {
-  background-color: #f6f6f6;
-  padding: 0 5px;
-}
-.Uxtext {
-  font-weight: 450;
-  margin-top: 5px;
-  margin-left: 15px;
-  font-size: 14px;
-  color: #3d3d3d;
-  cursor: pointer;
-  position: relative;
-}
-.uxicon {
-  font-size: 10px;
-  position: absolute;
-  top: -14px;
-  left: 98%;
-}
-// .el-radio-button{
-//   margin-right: 10px;
-//   margin-bottom: 10px;
-
-//   .el-radio-button__inner{
-//     background: #fff;
-//     border: none;
-//     height: 20px;
-//   }
-// }
-::v-deep .el-radio-button__inner,
-.el-radio-group {
-  vertical-align: top;
-}
-::v-deep .el-radio-button__inner {
-  background: none;
-}
-::v-deep .el-radio-button:first-child .el-radio-button__inner {
-  border-left: none;
-
-  // border-radius: 4px 0 0 4px;
-  //box-shadow: none!important;
-}
-// .el-row{
-//   display: flex;
-//   flex-wrap: wrap;
-// }
-.item-title {
-  // margin-top: 10px;
-  // margin-bottom: 5px;
-  // margin-right: 10px;
-  // margin: 10px;
-  margin: 10px 10px 10px 0;
-  //font-size: 14px;
-  font-weight: 600;
-  color: #333333;
-  // line-height: 20px;
-}
-.item-line {
-  padding-left: 2px;
-  height: 20px;
-  background: #ddd;
-}
-.course-card {
-  // width: 290px;
-  margin-bottom: 15px;
-  position: relative;
-  ::v-deep .cor-praises {
-    position: absolute;
-    left: 0;
-    top: 0;
-    .interact-bar-btn {
-      .interact-bar-value {
-        display: none;
-      }
-    }
-  }
-  .cor-icon {
-    position: absolute;
-    left: 100px;
-    top: 54px;
-    border-radius: 50%;
-    background: rgba(88, 138, 252, 0.37);
-
-    .el-icon-caret-right {
-      font-size: 36px;
-      color: #588afc;
-    }
-  }
-  .course-image-box {
-    position: relative;
-    height: 148px;
-    width: 100%;
-    .course-image {
-      width: 100%;
-      height: 148px;
-    }
-    .course-type {
-      position: absolute;
-      top: 5px;
-      right: 0px;
-      width: 90px;
-      height: 30px;
-      line-height: 30px;
-      text-align: center;
-      background-color: #292828;
-      opacity: 0.4;
-      border-top-left-radius: 15px;
-      border-bottom-left-radius: 15px;
-      color: #ffffff;
-    }
-    .course-type-title {
-      position: absolute;
-      top: 5px;
-      right: 0px;
-      width: 90px;
-      height: 30px;
-      line-height: 30px;
-      text-align: center;
-      color: #ffffff;
-    }
-    .course-flag {
-      height: 26px;
-      position: absolute;
-      top: 15px;
-      right: 0;
-    }
-    .course-tip {
-      width: 100%;
-      height: 26px;
-      position: absolute;
-      bottom: 0;
-      padding: 0 10px;
-      color: #fff;
-      font-size: 14px;
-      .course-study-count {
-        float: left;
-      }
-      .course-time {
-        float: right;
-      }
-    }
-  }
-  .course-title {
-    // height: 70px;
-    margin: 10px 0;
-    padding: 0px 15px;
-    font-size: 18px;
-    font-weight: 600;
-    color: #343434;
-  }
-  .course-author {
-    margin: 5px 15px;
-    padding-bottom: 10px;
-    display: flex;
-    justify-content: space-between;
-    .course-author-left {
-      font-size: 12px;
-      line-height: 30px;
-      color: #666;
-    }
-    // .course-author-right{
-    //   padding-top: 5px;
-    // }
-  }
-  .course-score {
-    padding: 5px 15px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 10px;
-
-    .course-score-star {
-      flex: 1;
-    }
-    .course-score-value {
-      color: #ffb30f;
-      font-family: "Arial";
-      // font-size: 30px;
-    }
-    .course-score-no {
-      font-size: 12px;
-      color: #ffb30f;
-    }
-  }
-}
-.course-score-no {
-  text-align: right;
-  font-size: 12px;
-  color: #ffb30f;
-  line-height: 30px;
-}
-.course-score-value {
-  font-size: 14px;
-  color: #ffb30f;
-  margin-left: 32px;
-  line-height: 30px;
-  font-family: "Arial";
-  // font-size: 30px;
-}
-.study-num {
-  line-height: 30px;
-  font-size: 12px;
-
-  color: #8590a6;
-}
-.btn-label {
-}
-.btn-label {
-  position: relative;
-  display: inline-block;
-  outline: 0;
-  span {
-    padding: 7px 15px;
-    font-size: 12px;
-    border-radius: 0;
-    white-space: nowrap;
-    background: #fff;
-    border: 1px solid #dcdfe6;
-    font-weight: 500;
-    border-left: 0;
-    color: #606266;
-    -webkit-appearance: none;
-    text-align: center;
-    box-sizing: border-box;
-    outline: 0;
-    margin: 0;
-    position: relative;
-    cursor: pointer;
-    transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-  }
-}
-.searchbar {
-  background-color: #ffffff;
-  // border: 1px solid #f3f3f3;
-  // width: 900px;
-  // padding: 5px 20px;
-}
-
-.fixed {
-  position: fixed;
-  top: 0px;
-  background-color: #f0f0f0;
-  z-index: 999;
-  height: 50px;
-}
-.content-div {
-  .quyer-tag {
-    // margin-left: 10px;
-    .order-class {
-      color: #666666;
-      text-align: left;
-      border: 1px solid #dfdfdf;
-      padding: 10px 20px;
-    }
-    .actice {
-      background: #3e7fff;
-      color: #fff;
-    }
-  }
-  /* 分页div */
-  .pagination-div {
-    text-align: center;
-    padding: 10px 0;
-    margin: 10px;
-    .pag-text {
-      border: 1px solid #292828;
-      padding: 10px 20px;
-      border-radius: 20px;
-      background: #fff;
-      cursor: pointer;
-    }
-    .pag-text-msg {
-      padding: 10px 20px;
-      background: #fff;
-    }
-  }
-  .search-div {
-    background: #fff;
-    padding: 10px 25px;
-    ::v-deep .el-input {
-      width: 420px;
-      height: 38px;
-      margin-bottom: 13px;
-      .el-input__inner {
-        height: 38px;
-        border-radius: 0;
-      }
-      .el-input-group__append {
-        width: 44px;
-        height: 38px;
-        border: 0;
-        padding: 0;
-        background: #3e7fff;
-        border-radius: 0;
-        .el-button {
-          margin: 0;
-          border: 0;
-          width: 100%;
-          height: 38px;
-          padding: 0;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          .el-icon-search {
-            color: #fff;
-            font-size: 22px;
-          }
-        }
-      }
-    }
-    // .tip{
-    //   color:#999999;
-    //   font-size: 12px;
-    //   >span{
-    //     margin-right: 8px;
-    //     cursor: pointer;
-    //   }
-    // }
-    .search-item {
-      // padding: 10px 0;
-    }
-    .search-item:not(:last-child) {
-      // border-bottom: 1px solid #dfdfdf;
-    }
-    .search-item-sub {
-      // margin-top: 10px;
-    }
-  }
-  .search-div-collapse {
-    display: block;
-  }
-  .search-div-expand {
-    // display: none;
-  }
-  .search-div-more {
-    text-align: center;
-  }
-
-  .order-div {
-    padding: 10px 15px 0 0px;
-  }
-  .data-content {
-    padding: 5px 0px;
-    .course-card {
-      // width: 290px;
-      margin-bottom: 15px;
-      position: relative;
-      .course-image-box {
-        position: relative;
-        .course-image {
-          width: 288px;
-          height: 148px;
-        }
-        .course-flag {
-          height: 26px;
-          position: absolute;
-          top: 15px;
-          right: 0;
-        }
-        .course-tip {
-          width: 100%;
-          height: 26px;
-          position: absolute;
-          bottom: 0;
-          padding: 0 10px;
-          color: #fff;
-          font-size: 14px;
-          .course-study-count {
-            float: left;
-          }
-          .course-time {
-            float: right;
-          }
-        }
-      }
-      .course-info-box {
-        padding: 15px;
-        .course-info-title {
-          font-size: 18px;
-          font-weight: 600;
-          color: #343434;
-          height: 48px;
-        }
-        .course-other-info {
-          height: 40px;
-          margin-top: 10px;
-          .course-author {
-            float: left;
-            height: 40px;
-            font-size: 12px;
-            color: #666666;
-            line-height: 40px;
-            img {
-              margin-right: 10px;
-              width: 30px;
-              border: 1px solid #eee;
-              border-radius: 50%;
-              vertical-align: middle;
-            }
-          }
-          .course-score-info {
-            float: right;
-            height: 40px;
-            line-height: 40px;
-            .course-score {
-              color: #f8a114;
-              font-family: "Arial";
-              font-size: 36px;
-            }
-            .course-score-title {
-              font-size: 14px;
-              color: #787878;
-            }
-          }
-        }
-      }
-      .cardmark {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        background: rgba(101, 101, 101, 0.8);
-        pointer-events: none;
-        border-radius: 5px;
-        padding: 10px;
-        opacity: 0;
-        -webkit-transition: all 1.5s;
-        -moz-transition: all 1.5s;
-        -ms-transition: all 1.5s;
-        -o-transition: all 1.5s;
-        transition: all 1.5s;
-        .cardmark-name {
-          font-size: 18px;
-          line-height: 30px;
-          font-weight: 600;
-          color: #fff;
-        }
-        .cardmark-info {
-          color: #fff;
-          font-size: 14px;
-          line-height: 20px;
-        }
-      }
-    }
-    .course-card:hover .cardmark {
-      opacity: 1;
-    }
-  }
-}
-.course-form {
-  width: 100%;
-  margin: 10px 0;
-  ::v-deep.el-button {
-    width: 100%;
-    color: #fff;
-  }
-}
-
-.right-box {
-  .add-btn {
-    width: 100%;
-    padding: 15px 0;
-  }
-  .ranking-card {
-    margin-top: 0px;
-  }
-
-  .ranking-data {
-    margin: 10px 0;
-    color: #999999;
-  }
-}
-.ranking-title {
-  line-height: 34px;
-  font-size: 15px;
-  color: #333333;
-  .center-titlt {
-    font-size: 15px;
-    color: #333333;
-  }
-  .center {
-    text-align: right;
-  }
-  img {
-    margin-top: 5px;
-  }
-}
-</style>
diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue
index a5386f17..fd1c8d46 100644
--- a/src/views/portal/course/Index.vue
+++ b/src/views/portal/course/Index.vue
@@ -1,194 +1,282 @@
 <template>
   <div id="couser-list-content" class="couser-list-content">
-    <portal-header current="course" @emitInput="emitInput"></portal-header>
-    <!-- <div class="course-input">
-      <el-input  class="course-value" v-model.trim="course.keyword"  maxlength="20" @input="inputOn($event)" clearable placeholder="请输入关键词搜索"><el-button slot="append" icon="el-icon-search" @click="searchData()" class="course-btn"></el-button></el-input>
-    </div> -->
-    <div class="xcontent portal-content">
-      <div class="xrow" style="display: flex;justify-content: space-between;">
-        <div style="flex: 1;" class="xcol content-div">
-          <el-row class="search-div">
+    <div class="course-banner">
+      <portal-header current="course" textColor="#fff" @emitInput="emitInput"></portal-header>
+    </div>
+    <div style="padding-top:30px" class="">
+      <div class="xcontent2">
+        <div class="xcontent2-main content-div">
+          <div class="search-div" style="margin-right:36px">
             <div class="searchbar" v-if="searchTags.length > 0">
               <div style="line-height: 30px;">
                 <span class="item-title"> 搜索条件</span>
                 <el-tag closable v-for="(tag, tagIdx) in searchTags" :key="tagIdx" @close="tagsClose(tag,tagIdx)">{{ tag.name }}</el-tag>
               </div>
             </div>
-            <el-row class="search-item">
-              <el-col :span="24">
+            <div class="search-item">
                 <div style="margin-top:10px; display: flex;">
                   <div style="line-height: 25px;padding-right: 10px;">
-                    <span class="item-title" style="padding-right: 5px;">授课方式</span>
-                    <span class="item-line"></span>
+                    <span class="item-title" style="padding-right: 5px;">授课方式:</span>
                   </div>
                   <!-- // 10微课，21在线课(直播)；20:在线课( 录播)；30:面授课；40:学习项目,90:混合式， -->
                   <div>
                   <el-radio-group v-model="category" size="mini" @change="searchData">
                     <el-radio-button :label="null">全部</el-radio-button>
                     <el-radio-button :label="20">录播课</el-radio-button>
-                    <el-radio-button :label="30">线下课</el-radio-button>
+                    <el-radio-button :label="30">线下课 </el-radio-button>
+                    <el-radio-button class="couderbox"> <div class="coures-border"></div> </el-radio-button>
                     <el-radio-button :label="40">学习项目</el-radio-button>
                   </el-radio-group>
                   </div>
                 </div>
-              </el-col>
-            </el-row>
+            </div>
             <div :class="queryExpand ? 'search-div-expand' : 'search-div-collapse'">
               <el-row class="search-item">
                 <el-col :span="24">
                   <div style="margin-top:10px;display: flex;">
                     <div style="line-height: 25px;padding-right: 10px;">
-                      <span class="item-title" style="padding-right: 5px;">内容分类</span>
-                      <span class="item-line"></span>
+                      <span class="item-title" style="padding-right: 5px;">一级分类:</span>
                     </div>
                     <el-radio-group  v-model="types.sysTypes" size="mini" @change="changeType">
                       <el-radio-button :label="null">全部</el-radio-button>
                       <el-radio-button v-for="item in optionsList" :key="item.id" :label="item.id">{{item.name}}</el-radio-button>
+                    <el-radio-button class="couderbox"> <div class="coures-border"></div> </el-radio-button>
                     </el-radio-group>
                       <span @click="jumUX()" class="Uxtext" style=""> U选小课堂
                           <span class="uxicon">
                             <svg-icon icon-class="hot" style="font-size:22px"></svg-icon>
                           </span>
                       </span>
+                      <span @click="jumOpen()" class="Uxtext" style="margin-left: 30px;" :style="{'color': course.openCourse==1? '#387DF7':''}"> 公开课
+                      </span>
                   </div>
                   <div class="search-item-sub" v-if="types.oneSubList.length != 0">
-                    <el-radio-group v-model="types.subOne" size="mini"  @change="changeTypeSub">
-                      <el-radio-button label="0">全部</el-radio-button>
-                      <el-radio-button v-for="item in types.oneSubList" :key="item.id" :label="item.id">{{item.name}}</el-radio-button>
-                    </el-radio-group>
+                    <span class="item-title" style="min-width: 74px;">二级分类:</span>
+                    <div style="margin-top:10px">
+                      <el-radio-group v-model="types.subOne" size="mini"  @change="changeTypeSub">
+                        <el-radio-button label="0">全部</el-radio-button>
+                        <el-radio-button v-for="item in types.oneSubList" :key="item.id" :label="item.id">{{item.name}}</el-radio-button>
+                      </el-radio-group>
+                    </div>
                   </div>
                    <div class="search-item-sub" v-if="types.towSubList.length != 0">
-                    <el-radio-group v-model="types.subTow" size="mini" @change="changeTypeTow">
-                      <el-radio-button label="0">全部</el-radio-button>
-                      <el-radio-button v-for="item in types.towSubList" :key="item.id" :label="item.id">{{item.name}}</el-radio-button>
-                    </el-radio-group>
+                    <span class="item-title" style="padding-right:13px">三级分类:</span>
+                    <div style="margin-top:10px">
+                      <el-radio-group v-model="types.subTow" size="mini" @change="searchData" >
+                        <el-radio-button label="0">全部</el-radio-button>
+                        <el-radio-button v-for="item in types.towSubList" :key="item.id" :label="item.id">{{item.name}}</el-radio-button>
+                      </el-radio-group>
+                    </div>
+
                   </div>
                 </el-col>
               </el-row>
             </div>
-          </el-row>
-          <el-row class="order-div" v-if="listType == 1">
+          </div>
+          <div class="order-div">
             <span class="quyer-tag">
                  <el-button type="text" class="order-class" @click="orderChange('studys')" :class="{ actice: course.orderField == 'studys' }">最热</el-button>
-              <el-button type="text" class="order-class" @click="orderChange('publishTime')" :class="{ actice: course.orderField == 'publishTime' }">最新</el-button>
+                 <el-button type="text" class="order-class" @click="orderChange('publishTime')" :class="{ actice: course.orderField == 'publishTime' }">最新</el-button>
             </span>
-          </el-row>
-          <div class="xrow data-content" v-if="listType == 1">
-            <!-- v-if="(courseList.length<=course.pageSize) || (cidx<parseInt(courseList.length/columns)*columns)" -->
-            <div class="xrow-course course-index" v-for="(cinfo,cidx) in courseList" :key="cinfo.id">
-              <el-card class="course-card" :body-style="{padding:'0px'}">
-                <a :href="toCourseDetail(cinfo)">
+          </div>
+          <div class="xcourse-list">
+            <div class="xcourse-card" v-for="(cinfo,cidx) in courseList" :key="cinfo.id">
+              <div class="course-card">
+                <div class="course-card-favorite">
+                  <interactBar :type="1" nodeWidth="20px" :data="cinfo" :courseExclusive="true" :comments="false" :praises="false" :shares="false" :views="false"></interactBar>
+                </div>
+                <!-- <a :href="toCourseDetail(cinfo)"> -->
+                <a @click="toCourseDetail(cinfo)">
                   <div class="course-image-box">
-                    <course-image height="146px" :course="cinfo"></course-image>
-                    <span v-if="cinfo.type < 21" class="course-type-title course-type">录播课</span>
-                    <span v-if="cinfo.type==30" class="course-type-title course-type">线下课</span>
-                    <span v-if="cinfo.type==40" class="course-type-title course-type">学习项目</span>
-                </div>
-                <div :title="cinfo.title" class="course-title title-line-ellipsis"  v-html="cinfo.name">
-                </div>
-                <div class="course-author">
-                  <div class="course-author-left" v-if="cinfo.teacher" v-html="cinfo.teacher=='BOE教师'? '':cinfo.teacher"></div>
-                  <div style="flex:1;text-align: center;">
-                     <span class="study-num">{{cinfo.studies}}人学习</span>
+                    <course-image :course="cinfo"></course-image>
+                    <span v-if="cinfo.type == 20 || 10" class="course-type-left">录播课</span>
+                    <span v-if="cinfo.type == 30" class="course-type-left">线下课</span>
+                    <span v-if="cinfo.type == 40" class="course-type-left">学习项目</span>
                   </div>
-                  <div style="padding-left:15px">
-                    <div v-if="cinfo.score">
-                  <span class="course-score-value">{{toScore(cinfo.score)}}</span>
-                </div>
-                <div v-else class="course-score-no">未评分</div>
+                  <div style="width:80%" class="course-title two-line-ellipsis" :title="cinfo.title"   v-html="cinfo.name"></div>
+                  <div class="course-info">
+                    <div class="course-info-user">
+                       <span class="course-info-author"  v-if="cinfo.teacher">{{cinfo.teacher=='BOE教师'? '':cinfo.teacher}}</span>
+                       <span class="course-info-studys" >{{formatNum(cinfo.studies)}}人学习</span>
+                    </div>
+                    <div class="course-info-score">
+                      <div>
+                          <div v-if="cinfo.score">
+                            <span class="course-score-value">{{toScore(cinfo.score)}}分</span>
+                          </div>
+                          <div v-else class="course-score-no">未评分</div>
+                      </div>
+                    </div>
                   </div>
-                </div>
                 </a>
-                 <div class="cor-praises" v-if="cinfo.source == 2"><interactBar :type="1" :data="cinfo" :comments="false" :praises="false" :shares="false" :views="false"></interactBar> </div>
-              </el-card>
+              </div>
             </div>
           </div>
           <!--  分页 -->
           <div class="pagination-div">
             <span class="pag-text" @click="loadMore()" v-if="moreState == 1 && courseList.length>=course.pageSize">加载更多</span>
             <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
-            <span class="pag-text-msg" v-else-if="moreState == 3">没有更多数据了</span>
+            <span class="pag-text-msg" v-else-if="moreState == 3 && courseList.length > 0">没有更多数据了</span>
+            <span class="notcoures" v-else-if="moreState == 3 && courseList.length==0">
+              <img :src="`${webBaseUrl}/images/nocouresimg.png`" alt="">
+              <h5>暂无课程，请优先学习其它课程吧～</h5>
+            </span>
           </div>
         </div>
-        <div style="width: 245px;margin-left: 5px;">
-          <div>
+        <div class="xcontent2-minor">
             <div id="fixd-box">
-            <div v-if="identity == 2 || identity == 3 || identity == 5">
-              <el-button style="width: 100%;margin-bottom:15px;height: 37px;border-radius: 0;" type="primary" @click="toNeedCourse">做课程</el-button>
+              <div v-if="identity == 2 || identity == 3 || identity == 5">
+                <div class="portal-model-btn pointer" @click="toNeedCourse">
+                      <svg-icon style="margin-right: 10px;font-size: 24px;" icon-class="upCourse"></svg-icon>
+                      上传课程
+                </div>
+              </div>
+              <div class="portal-ranking-list ranking-bg">
+                <div class="ranking-title">好评榜</div>
+                <ul class="ranking-data">
+                   <li   class="list-info" v-for="(item, index) in scorelist" :key="index" style="cursor: pointer;margin-top:24px;line-height: 30px;display: flex;">
+                       <a style="display: inherit" @click="toCourseDetail(item)">
+                        <span class="portal-right-text blue-one" v-if="index==0">
+                          <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
+                        </span>
+                        <span class="portal-right-text blue-tow" v-if="index==1">
+                            <img :src="`${webBaseUrl}/images/listblue02.png`" alt="">
+                        </span>
+                        <span class="portal-right-text blue-three" v-if="index==2">
+                            <img :src="`${webBaseUrl}/images/listblue03.png`" alt="">
+                        </span>
+                        <span class="portal-right-text" v-if="index==3">
+                             <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                        </span>
+                         <span class="portal-right-text" v-if="index==4">
+                             <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                        </span>
+                        <span class="portal-title-desc title-line-ellipsis" v-if="item.images == ''" style="font-size: 14px;">{{ item.name }}</span>
+                        <span class="portal-title-desc" v-else style="font-size: 14px;">
+                          <!-- <img v-if="index == 0"  class="rankimg"  :src="fileBaseUrl + item.images" alt=""/> -->
+                          <span class="portal-images-title two-line-ellipsis">{{ item.name }}</span>
+                        </span>
+
+                      <div class="list-active">
+                         <div class="list-content">
+                           <div class="list-img">
+                           <course-image :course="item" width="108px" height="60px"></course-image>
+                            <span v-if="item.type < 21" class="course-type">录播</span>
+                            <span v-if="item.type==30" class="course-type">线下课</span>
+                            <span v-if="item.type==40" class="course-type">学习项目</span>
+                          </div>
+                           <div class="list-text">
+                             <h6 class="index-one-line-ellipsis">{{item.name}}</h6>
+                             <span class="index-one-line-ellipsis">{{item.publishTime}}</span>
+                           </div>
+                         </div>
+                         <div class="list-bottom">
+                          <interactBar :type="1" :data="item" :couseViews="true" :shares="false" :views="false"></interactBar>
+                         </div>
+                      </div>
+                      </a>
+                   </li>
+                </ul>
+              </div>
+              <div style="margin-top:26px" class="portal-ranking-list ranking-bg1">
+                <div class="ranking-title">人气榜</div>
+                <ul class="ranking-data">
+                   <li  class="list-info" v-for="(item, index) in ankingList" :key="index" style="cursor: pointer;margin-top:24px;line-height: 30px;display: flex;">
+                         <a style="display: inherit" @click="toCourseDetail(item)">
+                        <span class="portal-right-text orange-one" v-if="index==0">
+                          <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
+                        </span>
+                        <span class="portal-right-text orange-tow" v-if="index==1">
+                            <img :src="`${webBaseUrl}/images/list02.png`" alt="">
+                        </span>
+                        <span class="portal-right-text orange-three" v-if="index==2">
+                            <img :src="`${webBaseUrl}/images/list03.png`" alt="">
+                        </span>
+                        <span class="portal-right-text" v-if="index==3">
+                             <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                        </span>
+                         <span class="portal-right-text" v-if="index==4">
+                             <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                        </span>
+                        <span class="portal-title-desc title-line-ellipsis" v-if="item.images == ''" style="font-size: 14px;">{{ item.name }}</span>
+                        <span class="portal-title-desc" v-else style="font-size: 14px;">
+                          <!-- <img v-if="index == 0" class="rankimg"  :src="fileBaseUrl + item.images" alt=""/> -->
+                          <span class="portal-images-title two-line-ellipsis">{{ item.name }}</span>
+                        </span>
+
+                        <div class="list-active">
+                         <div class="list-content">
+                           <div class="list-img">
+                           <course-image :course="item" width="108px" height="60px"></course-image>
+                            <span v-if="item.type < 21" class="course-type">录播</span>
+                            <span v-if="item.type==30" class="course-type">线下课</span>
+                            <span v-if="item.type==40" class="course-type">学习项目</span>
+                           </div>
+                           <div class="list-text">
+                             <h6 class="index-one-line-ellipsis">{{item.name}}</h6>
+                             <span class="index-one-line-ellipsis">{{item.publishTime}}</span>
+                           </div>
+                         </div>
+                         <div class="list-bottom">
+                          <interactBar :type="1" :data="item" :couseViews="true" :shares="false" :views="false"></interactBar>
+                         </div>
+                      </div>
+                      </a>
+                   </li>
+                </ul>
+              </div>
+              <div style="margin-top:26px" class="portal-ranking-list ranking-bg2">
+                <div class="ranking-title">热度榜</div>
+                <ul class="ranking-data">
+                   <li class="list-info" v-for="(item, index) in hotList" :key="index" style="cursor: pointer;margin-top:24px;line-height: 30px;display: flex;">
+                         <a style="display: inherit" @click="toCourseDetail(item)">
+                        <span class="portal-right-text orange-one" v-if="index==0">
+                          <img :src="`${webBaseUrl}/images/listred01 .png`" alt="">
+                        </span>
+                        <span class="portal-right-text orange-tow" v-if="index==1">
+                            <img :src="`${webBaseUrl}/images/listred02.png`" alt="">
+                        </span>
+                        <span class="portal-right-text orange-three" v-if="index==2">
+                            <img :src="`${webBaseUrl}/images/listred03.png`" alt="">
+                        </span>
+                        <span class="portal-right-text" v-if="index==3">
+                             <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                        </span>
+                         <span class="portal-right-text" v-if="index==4">
+                             <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                        </span>
+                        <span class="portal-title-desc title-line-ellipsis list-lidex" v-if="item.images == ''" style="font-size: 14px;">{{ item.courseName }}</span>
+                        <span class="portal-title-desc " v-else style="font-size: 14px;">
+                          <!-- <img v-if="index == 0" class="rankimg"  :src="fileBaseUrl + item.images" alt=""/> -->
+                          <span class="portal-images-title two-line-ellipsis">{{ item.courseName }}</span>
+                        </span>
+                        <div class="list-active">
+                         <div class="list-content">
+                           <div class="list-img">
+                            <course-image :course="item" width="108px" height="60px"></course-image>
+                           <!-- <img style="width:96px;height:52px" :src="fileBaseUrl + item.images" alt=""/> -->
+                            <span v-if="item.type < 21" class="course-type">录播</span>
+                            <span v-if="item.type==30" class="course-type">线下课</span>
+                            <span v-if="item.type==40" class="course-type">学习项目</span>
+                           </div>
+                           <div class="list-text">
+                             <h6 class="index-one-line-ellipsis">{{item.courseName}}</h6>
+                             <span class="index-one-line-ellipsis">{{item.publishTime}}</span>
+                           </div>
+                         </div>
+                         <div class="list-bottom">
+                          <interactBar :type="1" :data="item" :couseViews="true" :shares="false" :views="false"></interactBar>
+                         </div>
+                      </div>
+                      </a>
+                   </li>
+                </ul>
+              </div>
+              <!-- <div class="course-resources pointer"> -->
+                <!-- 资源位 -->
+                <!-- <img  @click="banJump()" :src="fileBaseUrl + resonimg.image" alt=""> -->
+              <!-- </div> -->
             </div>
-               <el-card class="ranking-card" >
-              <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">好评榜</span>
-              </div>
-              <div style="padding-bottom:10px">
-                <el-row class="ranking-title">
-                </el-row>
-                <el-row class="ranking-title  bacolor" v-for="(item, index) in scorelist" :key="index" >
-                  <el-col :span="6" style="height:34px">
-                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-                  </el-col>
-                  <!-- <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.name" placement="bottom" :visible-arrow="false" popper-class="text-tooltip"> -->
-                        <div v-bind:title="item.name" @click="jumpRouter(item)">
-                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.name }}</el-col>
-                        </div>
-
-                  <!-- </el-tooltip> -->
-                </el-row>
-              </div>
-            </el-card>
-                <div style="height: 10px;"></div>
-            <el-card class="ranking-card">
-              <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">人气榜</span>
-              </div>
-              <div style="padding-bottom:10px">
-                <el-row class="ranking-title">
-                </el-row>
-                <el-row class="ranking-title bacolor" v-for="(item, index) in ankingList" :key="index">
-                  <el-col :span="6" style="height:34px">
-                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-                  </el-col>
-                  <!-- <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.name" placement="bottom" :visible-arrow="false" popper-class="text-tooltip"> -->
-                        <div :title="item.name" @click="jumpRouter(item)">
-                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.name }}</el-col>
-                        </div>
-
-                  <!-- </el-tooltip> -->
-                </el-row>
-              </div>
-            </el-card>
-            <div style="height: 10px;"></div>
-            <el-card class="ranking-card">
-              <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">热度榜</span>
-              </div>
-              <div style="padding-bottom:10px">
-                <el-row class="ranking-title">
-                </el-row>
-                <el-row class="ranking-title bacolor" v-for="(item, index) in hotList" :key="index">
-                  <el-col :span="6" style="height:34px">
-                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-                  </el-col>
-                  <!-- <el-tooltip :enterable="false" @click.native="jumpRouter2(item)" effect="light" :content="item.courseName" placement="bottom" :visible-arrow="false" popper-class="text-tooltip"> -->
-                        <div :title="item.courseName" @click="jumpRouter2(item)">
-                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.courseName }}</el-col>
-                        </div>
-                  <!-- </el-tooltip> -->
-                </el-row>
-              </div>
-            </el-card>
-            </div>
-
-          </div>
         </div>
       </div>
     </div>
@@ -204,6 +292,7 @@ import portalFloatTools from "@/components/PortalFloatTools.vue";
 import authorInfo from "@/components/Portal/authorInfo.vue";
 import courseItem from "@/components/Portal/course/courseItem.vue";
 import apiCoursePortal from "@/api/modules/coursePortal.js";
+import apiCourseStudy from "@/api/modules/courseStudy.js";
 import courseForm from "@/components/Course/courseForm.vue";
 import apiType from "@/api/modules/type.js";
 import apiCourse from "@/api/modules/coursePortal.js";
@@ -214,9 +303,10 @@ import scene from "@/api/modules/scene.js";
 import apiUserGroup from "@/api/modules/usergroup.js";
 import interactBar from "@/components/Portal/interactBar.vue";
 import courseImage from "@/components/Course/courseImage.vue";
-import { courseType, getType, toScore,formatDate } from "@/utils/tools.js";
+import { courseType, getType, toScore,formatDate,formatUserNumber } from "@/utils/tools.js";
 import { deepClone, param } from "../../../utils";
 import apiSearchterm from "@/api/modules/searchterm.js";
+import apiPlace from "@/api/phase2/place.js"
 export default {
   name: "index",
   components: {
@@ -234,7 +324,9 @@ export default {
   },
   data() {
     return {
+      resonimg:{},
       formatDate,
+      formatNum:formatUserNumber,
       audiences:[],//当前用户的受众
       couretitle: "",
       toScore,
@@ -257,8 +349,10 @@ export default {
         topOrder: true,
         orderAsc: false,
         pageIndex: 1, // 第几页
-        pageSize: 9 //每页多少条
+        pageSize: 9 ,//每页多少条
+        openCourse:0,//增加的公开课查询
       },
+
       optionsList: [], //分类数据
       sceneList: [], //场景
       keyword: "",
@@ -283,7 +377,6 @@ export default {
       },
       data: [{}, {}, {}, {}],
       order: 1,
-      listType: 1,
       courseList: [],
       searchRecords: [],
       hotList: [],
@@ -297,10 +390,10 @@ export default {
       this.columns = 3;
     } else if (screenWidth < 1600) {
       this.course.pageSize = 12;
-      this.columns = 4;
+      this.columns = 3;
     } else if (screenWidth >= 1600) {
       this.course.pageSize = 15;
-      this.columns = 5;
+      this.columns = 3;
     }
 
     let el_top = document.querySelector("#searchbar");
@@ -348,34 +441,64 @@ export default {
     }
 
     this.searchterm();
+    this.couresreso();
+
   },
   beforeDestroy() {
     window.removeEventListener("scroll", this.handleScroll);
   },
   methods: {
+    banJump() {
+      if(this.resonimg.JumpUrl) {
+        window.open(this.resonimg.JumpUrl);
+      }
+    },
+    couresreso(){
+      let key = 'course';
+      apiPlace.detail(key).then(res=>{
+        let resImgList =  JSON.parse(res.result.content);
+        if(resImgList && resImgList.length>0){
+          this.resonimg = resImgList[0]
+        }
+      })
+    },
     jumUX() {
       window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130", "_blank");
     },
+    jumOpen(){
+       //公开课 openCourse=1
+       this.course.openCourse=1;//
+       this.searchData();
+    },
     emitInput(val) {
       this.course.keyword = val;
       this.searchData();
     },
     handleScroll() {
-      let innerHeight = document.querySelector("#couser-list-content")
-        .clientHeight;
-      let outerHeight = document.documentElement.clientHeight;
-      let scrollTop = document.documentElement.scrollTop;
-      if (outerHeight + scrollTop + 350 >= innerHeight) {
-        if (this.moreState == 1 && this.course.pageIndex < 4) {
-          this.loadMore();
+      if(this.courseList.length>6){
+
+        let innerHeight = document.querySelector("#couser-list-content").clientHeight;
+        let outerHeight = document.documentElement.clientHeight;
+        let scrollTop = document.documentElement.scrollTop;
+        let outerWidth = document.querySelector(".xcontent2-minor").clientWidth;
+        if (outerHeight + scrollTop + 350 >= innerHeight) {
+          if (this.moreState == 1 && this.course.pageIndex < 4) {
+            this.loadMore();
+          }
         }
+        //console.log(this.course.pageIndex,'this.course.pageIndex');
+        //加此判断，是为了没有数据时的闪动问题
+        //if(this.course.pageIndex >1){
+          if (scrollTop > 1176) {
+            document.querySelector("#fixd-box").style.cssText =
+              "position: fixed;top: -882px;width:"+outerWidth+"px";
+          } else {
+              document.querySelector("#fixd-box").style.cssText = "position: static";
+          }
+        //}
+
       }
-      if (scrollTop > 630) {
-        document.querySelector("#fixd-box").style.cssText =
-          "position: fixed;top: -550px;width:242.5px";
-      } else {
-        document.querySelector("#fixd-box").style.cssText = "position: static";
-      }
+
     },
     toNeedCourse() {
       // 需要先切换标签
@@ -418,19 +541,30 @@ export default {
       });
     },
     toCourseDetail(item) {
+      let $this=this;
       if (item.source == 1) {
-        return `${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.type}`;
+        //return `${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.type}`;
+        //location.href=`${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.type}`;
+         this.$router.push('/course/boeframe?id='+item.id+'&type='+item.type);
         //此处使用window.open有问题
         //window.open(`${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.type}`);
       } else {
-        if (item.type == 10) {
-          return this.webBaseUrl + "/course/micro?id=" + item.id;
-        } else if (item.type == 20) {
-          return this.webBaseUrl + "/course/detail?id=" + item.id;
-        }
+         if (item.type == 10) {
+            //return this.webBaseUrl + "/course/studyindex?id=" + item.id;
+            this.$router.push("/course/studyindex?id=" + item.id);
+         } else if (item.type == 20) {
+           apiCourseStudy.hasSignup(item.id).then(rs=>{
+              if(rs.status==200){
+                //return $this.webBaseUrl + "/course/studyindex?id=" + item.id;
+                this.$router.push("/course/studyindex?id=" + item.id);
+              }else{
+                //return $this.webBaseUrl + "/course/detail?id=" + item.id;
+                this.$router.push("/course/detail?id=" + item.id);
+              }
+           })
+          //return $this.webBaseUrl + "/course/detail?id=" + item.id;
+         }
       }
-
-      return "";
     },
     orderChange(id) {
       this.course.orderField = id;
@@ -464,6 +598,7 @@ export default {
             this.category = "";
             this.categorySub = "";
           }
+
           this.searchTags.splice(index, 1);
            if(i === 'type') {
             this.category = null;
@@ -478,24 +613,21 @@ export default {
           if (i === "sysType3") {
             this.types.subTow = null;
           }
-
-          this.searchData();
         }
       }
+      this.searchData();
     },
+
     // 分类
     changeType(num) {
       this.types.oneSubList = [];
       this.types.subOne = "0";
-      this.types.subTow = "0";
       this.types.towSubList = [];
       let list = {};
       if (num !== 0) {
         list = this.optionsList.find(item => {
           return item.id === num;
         });
-      } else {
-        // this.types.towSubList = [];
       }
       if (list && list.children) {
         this.types.oneSubList = list.children;
@@ -506,21 +638,12 @@ export default {
     changeTypeSub(num) {
       this.types.subTow = "0";
       let list = {};
-      
-      if (num != 0) {
+      if (num !== 0) {
         apiType.list(1, num).then(res => {
           if (res.status === 200) {
             this.types.towSubList = res.result;
           }
         });
-      } else {
-        this.types.towSubList = [];
-      }
-      this.searchData();
-    },
-    changeTypeTow(num) {
-      if(num == 0) {
-        this.types.towSubList=[]
       }
       this.searchData();
     },
@@ -568,7 +691,9 @@ export default {
       if(this.audiences.length>0){
         this.course.audiences=this.audiences.join(",");
       }
-      this.course.companyId=this.userInfo.companyId;
+      //console.log(this.userInfo)
+      //this.course.companyId=this.userInfo.companyId;
+
        this.isFind = true;
        this.course.type = this.category;
       if (this.types.sysTypes == 0 || this.types.sysTypes == null) {
@@ -659,6 +784,13 @@ export default {
           if (i == "type" && courseData[i] === 0) {
             courseData[i] = "在线课";
           }
+          if (i == "openCourse") {
+            if(courseData[i] === 0){
+                courseData[i] = "0";
+            }else{
+              courseData[i] = "公开课";
+            }
+          }
           if (courseData[i] !== "0") {
             this.searchTags.push({
               id: id,
@@ -689,13 +821,27 @@ export default {
     getAnkingData() {
       apiCourse.ranking().then(res => {
         if (res.status == 200) {
+          res.result.forEach(item=>{
+            if(item.publishTime != '') {
+              item.coverImg=item.images;
+             let time = item.publishTime.split('-');
+             item.publishTime = `${time[0]}年${time[1]}月${time[2]}日`
+            }
+          })
           this.ankingList = res.result;
         }
       });
     },
     getScoreList() {
-      apiCourse.scorelist(5).then(res => {
+      apiCourse.scorelist(5,2).then(res => {
         if (res.status == 200) {
+          res.result.forEach(item=>{
+            if(item.publishTime != '') {
+              item.coverImg=item.images;
+             let time = item.publishTime.split('-');
+             item.publishTime = `${time[0]}年${time[1]}月${time[2]}日`
+            }
+          })
           this.scorelist = res.result;
         }
       });
@@ -703,6 +849,13 @@ export default {
     getHotList() {
       apiCourse.studyCounts(5).then(res => {
         if (res.status == 200) {
+          res.result.forEach(item=>{
+            if(item.publishTime != '') {
+              item.coverImg=item.images;
+             let time = item.publishTime.split('-');
+             item.publishTime = `${time[0]}年${time[1]}月${time[2]}日`
+            }
+          })
           this.hotList = res.result;
         }
       });
@@ -710,16 +863,16 @@ export default {
     jumpRouter(item) {
       //console.log(item.type, "item.type");
       // return console.log(id,type,"fihkj1")
-      if (item.type == 20) {
+      // if (item.type == 20) {
         //录播课
         //  window.open(`${this.webBaseUrl}/course/detail?id=${id}`)
         this.$router.push(`/course/detail?id=${item.id}`);
-      }
-      if (item.type == 10) {
+      // }
+      // if (item.type == 10) {
         //微课
         //  window.open(`${this.webBaseUrl}/course/micro?id=${id}`)
-        this.$router.push(`/course/micro?id=${item.id}`);
-      }
+      //   this.$router.push(`/course/micro?id=${item.id}`);
+      // }
     },
     jumpRouter2(item) {
       // console.log(item,"土豪包括九年")
@@ -728,22 +881,181 @@ export default {
 
       //console.log(item.type,type,'item.type');
       // return console.log(id,type,"fihkj1")
-      if (type == 20) {
+      // if (type == 20) {
         //录播课
         //  window.open(`${this.webBaseUrl}/course/detail?id=${id}`)
         this.$router.push(`/course/detail?id=${id}`);
-      }
-      if (type == 10) {
+      // }
+      // if (type == 10) {
         //微课
         //  window.open(`${this.webBaseUrl}/course/micro?id=${id}`)
-        this.$router.push(`/course/micro?id=${id}`);
-      }
+      //   this.$router.push(`/course/micro?id=${id}`);
+      // }
     }
   }
 };
 </script>
 
 <style scoped lang="scss">
+.couderbox{
+  // width: 5px;
+  // padding: 0;
+  // display: inline-block;
+  // text-align: center;
+}
+.coures-border{
+  width: 2px;
+  height: 15px;
+  border-radius: 20%;
+  background: #666;
+}
+.notcoures{
+  text-align: center;
+  img{
+    width: 360px;
+    height: 226px;
+  }
+  h5{
+    font-size: 14px;
+    color: #333333;
+    font-weight: 400;
+  }
+}
+
+  .course-type-left {
+        position: absolute;
+        top: 0px;
+        right: 0px;
+        width: 60px;
+        height: 24px;
+        line-height: 24px;
+        text-align: center;
+        background-color: #f99000;
+        border-radius: 2px 4px 2px 14px;
+        font-size: 12px;
+        color: #ffffff;
+        -moz-user-select: none;
+        /*火狐*/
+        -webkit-user-select: none;
+        /*webkit浏览器*/
+        -ms-user-select: none;
+        /*IE10*/
+        -khtml-user-select: none;
+        /*早期浏览器*/
+        user-select: none;
+      }
+  .list-lidex{
+    display: inline-block;
+    display: flex;
+  }
+.course-resources{
+  margin-top: 24px;
+
+  img{
+    width: 100%;
+    height: 100%;
+    border-radius: 8px;
+  }
+}
+
+::v-deep .course-image-box :hover .el-image{
+        // transition: all 0.5s;
+
+        //z-index: 999;
+        //position: absolute;
+        //top: -50px;
+        //left: -35px;
+        //width: 420px !important;
+        //height: 236px !important;
+
+}
+
+.list-active{
+  display: none;
+  // width: 458px;
+  width:135%;
+  height: 165px;
+  padding: 20px;
+  background: #FFFFFF;
+  box-sizing: border-box;
+  box-shadow: 0px 2px 12px 0px rgba(0,0,0,0.05);
+  border-radius: 2px;
+  border: 1px solid #EDEFF0;
+  position: absolute;
+  top: 30px;
+  left: -17.5%;
+  z-index: 999;
+  .list-content{
+    display: flex;
+    padding-bottom: 10px;
+    border-bottom: 1px solid #EDEFF0;
+    .list-img{
+      width: 125px;
+      height: 70px;
+      position: relative;
+      ::v-deep .el-image{
+        border-radius: 4px !important;
+      }
+      img{
+        width: 100%;
+        height: 100%;
+      }
+      .course-type{
+        position: absolute;
+        right: 23.5%;
+        // bottom: 26%;
+        top:0;
+        height: 20;
+        line-height: 20px;
+        font-size: 12px;
+        color: #FFFFFF;
+        padding: 0px 8px;
+        background: #f99000 ;
+        border-radius: 0px 0px 0px 10px;
+      }
+    }
+    .list-text{
+      flex: 1;
+      // margin-left: 12px;
+      h6{
+        font-size: 14px;
+        margin: 0px;
+        font-weight: 500;
+        line-height: normal;
+        color: #04243C;
+      }
+      span{
+        font-size: 14px;
+        color: #6E7B84;
+      }
+    }
+  }
+  .list-bottom{
+    padding-top: 10px;
+    ::v-deep .interact-bar-btns{
+      justify-content: space-between !important;
+      .interact-bar-btn{
+        margin: 0 !important;
+      }
+    }
+  }
+}
+.list-info{
+  position: relative;
+  .span{
+    display: flex;
+  }
+}
+.list-info:hover .list-active{
+  // transition: all 0.5s;
+  display: block;
+}
+
+.course-banner{
+  height: 240px;
+  background: url('../../../../public/images/course-banner.png');
+}
+
 ::v-deep .el-radio-button{
   margin-right:0px;
 }
@@ -802,209 +1114,21 @@ export default {
 }
 ::v-deep .el-radio-button:first-child .el-radio-button__inner {
   border-left: none;
-
   // border-radius: 4px 0 0 4px;
   //box-shadow: none!important;
 }
-// .el-row{
-//   display: flex;
-//   flex-wrap: wrap;
-// }
+
 .item-title {
-  // margin-top: 10px;
-  // margin-bottom: 5px;
-  // margin-right: 10px;
-  // margin: 10px;
   margin: 10px 10px 10px 0;
-  //font-size: 14px;
-  font-weight: 600;
-  color: #333333;
-  // line-height: 20px;
+  font-size: 14px;
+  color: #6E7B84;
 }
 .item-line {
   padding-left: 2px;
   height: 20px;
   background: #ddd;
 }
-.course-card {
-  // width: 290px;
-  margin-bottom: 15px;
-  position: relative;
-  ::v-deep .cor-praises {
-    position: absolute;
-    left: 0;
-    top: 0;
-    -moz-user-select: none; /*火狐*/
-    -webkit-user-select: none; /*webkit浏览器*/
-    -ms-user-select: none; /*IE10*/
-    -khtml-user-select: none; /*早期浏览器*/
-    user-select: none;
-    .interact-bar-btn {
-      .interact-bar-value {
-        display: none;
-      }
-    }
-  }
-  .cor-icon {
-    position: absolute;
-    left: 100px;
-    top: 54px;
-    border-radius: 50%;
-    background: rgba(88, 138, 252, 0.37);
 
-    .el-icon-caret-right {
-      font-size: 36px;
-      color: #588afc;
-    }
-  }
-  .course-image-box {
-    position: relative;
-    height: 148px;
-    width: 100%;
-    .course-image {
-      width: 100%;
-      height: 148px;
-    }
-    .course-type {
-      position: absolute;
-      top: 5px;
-      right: 0px;
-      width: 90px;
-      height: 30px;
-      line-height: 30px;
-      text-align: center;
-      background-color: #292828;
-      opacity: 0.4;
-      border-top-left-radius: 15px;
-      border-bottom-left-radius: 15px;
-      color: #ffffff;
-      -moz-user-select: none; /*火狐*/
-      -webkit-user-select: none; /*webkit浏览器*/
-      -ms-user-select: none; /*IE10*/
-      -khtml-user-select: none; /*早期浏览器*/
-      user-select: none;
-    }
-    .course-type-title {
-      position: absolute;
-      top: 5px;
-      right: 0px;
-      width: 90px;
-      height: 30px;
-      line-height: 30px;
-      text-align: center;
-      color: #ffffff;
-      -moz-user-select: none; /*火狐*/
-      -webkit-user-select: none; /*webkit浏览器*/
-      -ms-user-select: none; /*IE10*/
-      -khtml-user-select: none; /*早期浏览器*/
-      user-select: none;
-    }
-    .course-flag {
-      height: 26px;
-      position: absolute;
-      top: 15px;
-      right: 0;
-    }
-    .course-tip {
-      width: 100%;
-      height: 26px;
-      position: absolute;
-      bottom: 0;
-      padding: 0 10px;
-      color: #fff;
-      font-size: 14px;
-      .course-study-count {
-        float: left;
-      }
-      .course-time {
-        float: right;
-      }
-    }
-  }
-  .course-title {
-    // height: 70px;
-    margin: 10px 0;
-    padding: 0px 15px;
-    font-size: 18px;
-    font-weight: 600;
-    color: #343434;
-    -moz-user-select: none; /*火狐*/
-    -webkit-user-select: none; /*webkit浏览器*/
-    -ms-user-select: none; /*IE10*/
-    -khtml-user-select: none; /*早期浏览器*/
-    user-select: none;
-  }
-  .course-author {
-    margin: 5px 15px;
-    padding-bottom: 10px;
-    display: flex;
-    justify-content: space-between;
-    .course-author-left {
-      font-size: 12px;
-      line-height: 30px;
-      color: #666;
-    }
-    // .course-author-right{
-    //   padding-top: 5px;
-    // }
-  }
-  .course-score {
-    padding: 5px 15px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 10px;
-
-    .course-score-star {
-      flex: 1;
-    }
-    .course-score-value {
-      color: #ffb30f;
-      font-family: "Arial";
-      -moz-user-select: none; /*火狐*/
-      -webkit-user-select: none; /*webkit浏览器*/
-      -ms-user-select: none; /*IE10*/
-      -khtml-user-select: none; /*早期浏览器*/
-      user-select: none;
-      // font-size: 30px;
-    }
-    .course-score-no {
-      font-size: 12px;
-      color: #ffb30f;
-      -moz-user-select: none; /*火狐*/
-      -webkit-user-select: none; /*webkit浏览器*/
-      -ms-user-select: none; /*IE10*/
-      -khtml-user-select: none; /*早期浏览器*/
-      user-select: none;
-    }
-  }
-}
-.course-score-no {
-  text-align: right;
-  font-size: 12px;
-  color: #ffb30f;
-  line-height: 30px;
-}
-.course-score-value {
-  font-size: 14px;
-  color: #ffb30f;
-  margin-left: 32px;
-  line-height: 30px;
-  font-family: "Arial";
-  // font-size: 30px;
-}
-.study-num {
-  line-height: 30px;
-  font-size: 12px;
-  color: #8590a6;
-  -moz-user-select: none; /*火狐*/
-  -webkit-user-select: none; /*webkit浏览器*/
-  -ms-user-select: none; /*IE10*/
-  -khtml-user-select: none; /*早期浏览器*/
-  user-select: none;
-}
-.btn-label {
-}
 .btn-label {
   position: relative;
   display: inline-block;
@@ -1047,13 +1171,15 @@ export default {
   .quyer-tag {
     // margin-left: 10px;
     .order-class {
-      color: #666666;
+      margin: 30px 0;
+      color: #6E7B84;
       text-align: left;
-      border: 1px solid #dfdfdf;
-      padding: 10px 20px;
+      font-size: 14px;
+      padding: 4px 8px;
+      margin-right: 30px;
     }
     .actice {
-      background: #3e7fff;
+      background: #387DF7;
       color: #fff;
     }
   }
@@ -1077,6 +1203,7 @@ export default {
   .search-div {
     background: #fff;
     padding: 10px 25px;
+    border-radius: 8px;
     ::v-deep .el-input {
       width: 420px;
       height: 38px;
@@ -1124,6 +1251,7 @@ export default {
     }
     .search-item-sub {
       // margin-top: 10px;
+      display: flex;
     }
   }
   .search-div-collapse {
@@ -1137,153 +1265,31 @@ export default {
   }
 
   .order-div {
-    padding: 10px 15px 0 0px;
-  }
-  .data-content {
-    padding: 5px 0px;
-    .course-card {
-      // width: 290px;
-      margin-bottom: 15px;
-      position: relative;
-      .course-image-box {
-        position: relative;
-        .course-image {
-          width: 288px;
-          height: 148px;
-        }
-        .course-flag {
-          height: 26px;
-          position: absolute;
-          top: 15px;
-          right: 0;
-        }
-        .course-tip {
-          width: 100%;
-          height: 26px;
-          position: absolute;
-          bottom: 0;
-          padding: 0 10px;
-          color: #fff;
-          font-size: 14px;
-          .course-study-count {
-            float: left;
-          }
-          .course-time {
-            float: right;
-          }
-        }
-      }
-      .course-info-box {
-        padding: 15px;
-        .course-info-title {
-          font-size: 18px;
-          font-weight: 600;
-          color: #343434;
-          height: 48px;
-        }
-        .course-other-info {
-          height: 40px;
-          margin-top: 10px;
-          .course-author {
-            float: left;
-            height: 40px;
-            font-size: 12px;
-            color: #666666;
-            line-height: 40px;
-            img {
-              margin-right: 10px;
-              width: 30px;
-              border: 1px solid #eee;
-              border-radius: 50%;
-              vertical-align: middle;
-            }
-          }
-          .course-score-info {
-            float: right;
-            height: 40px;
-            line-height: 40px;
-            .course-score {
-              color: #f8a114;
-              font-family: "Arial";
-              font-size: 36px;
-            }
-            .course-score-title {
-              font-size: 14px;
-              color: #787878;
-            }
-          }
-        }
-      }
-      .cardmark {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        background: rgba(101, 101, 101, 0.8);
-        pointer-events: none;
-        border-radius: 5px;
-        padding: 10px;
-        opacity: 0;
-        -webkit-transition: all 1.5s;
-        -moz-transition: all 1.5s;
-        -ms-transition: all 1.5s;
-        -o-transition: all 1.5s;
-        transition: all 1.5s;
-        .cardmark-name {
-          font-size: 18px;
-          line-height: 30px;
-          font-weight: 600;
-          color: #fff;
-        }
-        .cardmark-info {
-          color: #fff;
-          font-size: 14px;
-          line-height: 20px;
-        }
-      }
-    }
-    .course-card:hover .cardmark {
-      opacity: 1;
-    }
-  }
-}
-.course-form {
-  width: 100%;
-  margin: 10px 0;
-  ::v-deep.el-button {
-    width: 100%;
-    color: #fff;
+    padding: 0px 15px 0 0px;
   }
 }
+// .course-form {
+//   width: 100%;
+//   margin: 10px 0;
+//   ::v-deep.el-button {
+//     width: 100%;
+//     color: #fff;
+//   }
+// }
 
-.right-box {
-  .add-btn {
-    width: 100%;
-    padding: 15px 0;
-  }
-  .ranking-card {
-    margin-top: 0px;
-  }
+// .right-box {
+//   .add-btn {
+//     width: 100%;
+//     padding: 15px 0;
+//   }
+//   .ranking-card {
+//     margin-top: 0px;
+//   }
+
+//   .ranking-data {
+//     margin: 10px 0;
+//     color: #999999;
+//   }
+// }
 
-  .ranking-data {
-    margin: 10px 0;
-    color: #999999;
-  }
-}
-.ranking-title {
-  line-height: 34px;
-  font-size: 15px;
-  color: #333333;
-  .center-titlt {
-    font-size: 15px;
-    color: #333333;
-  }
-  .center {
-    text-align: right;
-  }
-  img {
-    margin-top: 5px;
-  }
-}
 </style>
diff --git a/src/views/portal/course/Micro.vue b/src/views/portal/course/Micro.vue
index 26e60f8c..3b1ed95d 100644
--- a/src/views/portal/course/Micro.vue
+++ b/src/views/portal/course/Micro.vue
@@ -1,13 +1,21 @@
 <template>
   <div>
-    <portal-header current="course" :goSearch="1"></portal-header>
-    <div class="portal-content xcontent">
-      <el-breadcrumb separator-class="el-icon-arrow-right" class="breadcrumb-nav">
-        <el-breadcrumb-item :to="{ path: '/course' }">课程列表</el-breadcrumb-item>
-        <el-breadcrumb-item>课程详情</el-breadcrumb-item>
-      </el-breadcrumb>
-      <el-row :gutter="10">
-        <el-col :span="24">
+    <div class="xpage-coures-banner">
+        <portal-header current="course" textColor="#fff" :goSearch="1"></portal-header>
+        <div class="xcontent">
+            <div class="banner-crumbs">
+               <router-link to="/course"><span class="crumbs-first">课程列表</span></router-link>
+               <span class="crumbs-line">  &gt; </span>
+               <span class="crumbs-last">课程详情</span>
+            </div>
+            <div class="bcourse-title">
+               <!-- <span>{{courseInfo.name}}</span> -->
+                <!-- <span>{{courseInfo.summary}}</span>  -->
+                <!-- <span class="bcourse-score">{{toScore(courseInfo.score)}}分</span> -->
+            </div>
+        </div>
+    </div>
+    <div class="portal-content xcontent" style="margin-top: 20px;">
           <el-card :body-style="{ padding: '0px', 'min-height': '500px' }">
             <el-row class="detail">
               <el-col :span="18">
@@ -217,8 +225,7 @@
               </el-card>
             </el-col>
           </el-row>
-        </el-col>
-      </el-row>
+        
     </div>
     <portal-footer></portal-footer>
   </div>
@@ -286,7 +293,7 @@ export default {
       studyId: "",
       tags: [],
       numberToLetter: numberToLetter,
-      fileBaseUrl: this.$Constants.fileBaseUrl,
+      fileBaseUrl: this.$xpage.constants.fileBaseUrl,
       blobUrl:'',//播放的文件地址，新添加，采用blob方式
       getType: getType,
       courseType,
diff --git a/src/views/portal/course/rePreview.vue b/src/views/portal/course/rePreview.vue
index 57a034f9..cb846d95 100644
--- a/src/views/portal/course/rePreview.vue
+++ b/src/views/portal/course/rePreview.vue
@@ -109,30 +109,29 @@
           </div>
         </el-col>
         <el-col :span="8">
-          <div class="catalog-box">
+          <div class="course-units">
             <!-- <p class="title">课程目录</p> -->
             <!-- <el-tabs type="border-card" v-model="ctabName" @tab-click="ctabChange">
               <el-tab-pane label="课程目录" name="catalog"> -->
                 <div style="min-height: 500px;">
-                  <div class="catalog" style="margin-top:30px;">
-                    <el-collapse class="catalog-row" v-model="activeNames" @change="handleChange">
-                      <el-collapse-item v-for="(item, index) in catalogTree" :key="index" :name="index">
-                        <template class="collapse-title" slot="title">
-                          <!-- <span :class="statusToContent(item.section.status).class">{{ statusToContent(item.section.status).text }}</span> -->
-                          <span class="one-line-ellipsis" style="font-size:16px;font-weight: 700;color: #343434;margin-left: 5px;">{{ item.section.name }}</span>
-                        </template>
-                        <ul>
-                          <li @click="showRes(ele)" v-for="(ele, i) in item.children" :key="i" class="catalog-cell">
-                            <!-- <span :class="statusToContent(ele.status).class">{{ statusToContent(ele.status).text }}</span> -->
-                            <span class="title-type-info" :style="{color:contentData.id==ele.id? '#ffaa00':''}">{{ getType(ele.contentType) }}</span>
-                            <span style="line-height: 20px;" class="one-line-ellipsis" :style="{color:contentData.id==ele.id? '#ffaa00':''}">{{ ele.contentName}}</span>
-                            <!--状态 有问题,未切换为正在进行的状态-->
-                            <!-- <span :class="statusToContent(ele.status).class">{{ statusToContent(ele.status).text }}</span> -->
-                          </li>
-                        </ul>
-                      </el-collapse-item>
-                    </el-collapse>
-                  </div>
+                    <div class="catalog" v-if="courseInfo.type == 20">
+                      <div v-for="(item, index) in catalogTree" :key="index" :name="index">
+                        <div style="margin: 10px 0px;font-weight: 700;">{{item.section.name}}</div>
+                        <div class="units-info" :class="{'units-active':contentData.id == ele.id}"  v-for="(ele, i) in item.children" :key="i" @click="showRes(ele,i,index)">
+                          <img v-if="contentData.id == ele.id" :src="`${webBaseUrl}/images/playicon.png`" alt=""> {{i+1}}.
+                          <span>{{ ele.contentName }}</span>
+                        </div>
+                      </div>
+                    </div>
+                    <div v-else class="catalog">
+                      <!-- contentList -->
+                      <div class="units-info" v-for="(list, index) in contentList" :key="index" :name="index"  @click="showRes(list,-1,index)" :class="{'units-active':contentData.id == list.id}">
+                        <!-- <div class="units-info" :class="{'units-active':contentData.id == ele.id}" @click="showRes(ele,i,index)" v-for="(ele, i) in item.children" :key="i"> -->
+                        <img v-if="contentData.id == list.id" :src="`${webBaseUrl}/images/playicon.png`" alt=""> {{index+1}}.
+                        {{ list.contentName }}
+                        <!-- </div> -->
+                      </div>
+                    </div>
                 </div>
               <!-- </el-tab-pane>
             </el-tabs> -->
@@ -267,25 +266,6 @@ export default {
     onPlayerPlaying(itme){
       // //console.log("当前播放"+itme);
       // //console.log("当前播放11"+itme);
-      // if(this.contentData.contentType && this.contentData.contentType==10){
-      //     let intTime=parseInt(itme);
-      //     this.contentData.lastStudyTime=intTime;
-      //     let saveTime=Math.floor(intTime%10);
-      //     if(intTime>10 && saveTime==0 && this.contentData.studyItemId!=''){
-      //       //记录播放时间
-      //       //console.log('记录播放时间:'+intTime);
-      //       let postData={
-      //         itemId:this.contentData.studyItemId,
-      //         videoTime:intTime
-      //       }
-      //       apiStudy.studyVideoTime(postData).then(rs=>{
-      //          if(rs.status!=200){
-      //            console.log('记录播放时间错误');
-      //          }
-      //       })
-      //     }
-      // }
-
     },
     audioPlaying(item){
       //console.log("当前播放"+item);
@@ -303,14 +283,43 @@ export default {
       apiCoursePortal.detail(this.courseId,true).then(rs=>{
         if(rs.status==200){
           //设置必须的字段
-          rs.result.sections.forEach(sec=>{
-            sec.status=0;//加入状态表未开始
-            rs.result.contents.forEach(c=>{
-              c.status=0;//初始化状态 ，未开始
-              c.studyItemId='';//初始化字段，学习条目id
-              c.lastStudyTime=0;//初始化上次一学习的时间，作用于视频插放
+          if (rs.result.course.type == 20) { //有目录课程
+            rs.result.sections.forEach(sec => {
+              sec.status = 0; //加入状态表未开始
+              rs.result.contents.forEach(c => {
+                c.status = 0; //初始化状态 ，未开始
+                c.studyItemId = ''; //初始化字段，学习条目id
+                c.lastStudyTime = 0; //初始化上次一学习的时间，作用于视频插放
+              });
             });
-          })
+            this.sectionList = rs.result.sections;
+            }else if(rs.result.course.type==10){ //无目录课程
+            //如果是多个的话，就需要过滤一下
+            let indexNum=0;
+            let delIndexs=[];
+            rs.result.contents.forEach((c,cidx) => {
+              c.status = 0; //
+              c.studyItemId = '';
+              c.lastStudyTime = 0;
+              if(c.sortIndex==1){
+                indexNum++;
+                if(indexNum>1){
+                  delIndexs.push(cidx);
+                }
+              }else if(c.sortIndex==2){
+                c.contentName='作业';
+              }else if(c.sortIndex==3){
+                c.contentName='考试';
+              }else if(c.sortIndex==4){
+                c.contentName='评估';
+              }
+            });
+            if(delIndexs.length>0){
+              delIndexs.forEach(delIdx=>{
+                rs.result.contents.splice(delIdx,1);
+              })
+            }
+            }
           this.sectionList=rs.result.sections;
           this.courseInfo=rs.result.course;
           this.teachers=rs.result.teachers;
@@ -412,6 +421,34 @@ img{
   max-width: 100%;
 }
 }
+.course-units {
+  background: #fff;
+    padding: 10px 30px;
+    .units-info {
+      padding: 0 30px;
+      height: 60px;
+      line-height: 60px;
+      font-size: 16px;
+      cursor: pointer;
+      overflow: hidden;
+      white-space:nowrap;
+      word-break:break-all;
+      text-overflow:ellipsis;
+    }
+
+    .units-active {
+      background: #F6F6F6;
+      color: #387DF7;
+      font-weight: 600;
+      cursor: text;
+      img {
+        width: 18px;
+        height: 20px;
+        vertical-align: middle;
+        margin-right: 20px;
+      }
+    }
+  }
 .one-line-ellipsis{
   overflow: hidden;
   box-sizing: border-box;
@@ -457,17 +494,15 @@ word-break:break-all;
     padding: 20px;
   }
 }
-.catalog-box{
-  background: #fff;
-  padding: 20px;
-  // box-shadow: 1px 1px 2px 2px #ededed;
-  .title{
-    font-size: 16px;
-    font-weight: 600;
-    color: #333333;
-    padding-left: 20px;
+.catalog-box {
+    background: #fff;
+    .title {
+      font-size: 16px;
+      font-weight: 600;
+      color: #333333;
+      padding-left: 20px;
+    }
   }
-}
     .collapse-title {
 
          flex: 1 0 90%;
diff --git a/src/views/portal/follow/index.vue b/src/views/portal/follow/index.vue
new file mode 100644
index 00000000..e22d7d03
--- /dev/null
+++ b/src/views/portal/follow/index.vue
@@ -0,0 +1,618 @@
+<template>
+    <div class="follow-page">
+        <div class="follow-banner">
+          <portal-header current="follow" textColor="#fff"  :hideSearch="true" @emitInput="emitInput"></portal-header>
+        </div>
+        <div>
+            <div class="home-page-left">
+                <!--
+                <div class="book-input">
+                    <span>分享书籍</span>
+                    <el-input style="width:130px" v-model="input" placeholder="请输入内容"></el-input>
+                    <i style="color: #333333" class="el-icon-search"></i>
+                </div>
+                -->
+                <el-tabs v-model="activeName" @tab-click="handleClick">
+                    <el-tab-pane name="" label="全部">
+                        <template v-for="item in allPageList">
+                            <course-list v-if="item.contentType == 1" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></course-list>
+                            <case-list v-if="item.contentType == 3" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></case-list>
+                            <note-list v-if="item.contentType == 6" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></note-list>
+                            <put-list v-if="item.contentType == 4" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></put-list>
+                            <answer-list v-if="item.contentType == 5" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></answer-list>
+                            <article-list v-if="item.contentType == 2" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true" @hideIndex="dynamicHide"></article-list>
+                        </template>
+                        <div v-if="allPageList.length==0 && loading==1" class="home-no-list">
+                           <img class="img" :src="`${webBaseUrl}/images/homeWu/no-course.png`" alt="" srcset="">
+                           <p class="text">暂时没有动态</p>
+                        </div>
+                    </el-tab-pane>
+                    <el-tab-pane name="1" label="课程">
+                        <course-list :list="cousrePageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></course-list>
+                    </el-tab-pane>
+                    <el-tab-pane name="6" label="笔记">
+                        <note-list :list="notePageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></note-list>
+                    </el-tab-pane>
+                    <el-tab-pane name="3" label="案例">
+                        <case-list :list="casePageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></case-list>
+                    </el-tab-pane>
+                    <el-tab-pane name="2" label="文章">
+                        <article-list :list="articlePageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></article-list>
+                    </el-tab-pane>
+                    <el-tab-pane name="4" label="提问">
+                        <put-list :list="qaPageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></put-list>
+                    </el-tab-pane>
+                    <el-tab-pane name="5" label="回答">
+                        <answer-list :list="answerPageList" :isDynamic="true" :personal="true" :isFollow="true"  @hideIndex="dynamicHide"></answer-list>
+                    </el-tab-pane>
+
+                    <!-- <el-tab-pane name="7" label="关注">
+                        <follow-list></follow-list>
+                    </el-tab-pane> -->
+                    <!--
+                    <el-tab-pane name="book" label="书籍">
+                        <span slot="label"><svg-icon icon-class="home-book" style="font-size: 30px;"></svg-icon><span class="tabs-info">书籍</span></span>
+                        <book-list></book-list>
+                    </el-tab-pane>
+                     -->
+                </el-tabs>
+                <div style="text-align: center; margin-top:57px;" v-show="page.count > 0">
+                    <el-pagination
+                    background
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :current-page="page.pageIndex"
+                    :page-sizes="[10, 20, 30, 40]"
+                    :page-size="page.pageSize"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="page.count">
+                    </el-pagination>
+                </div>
+                <div style="height:200px"></div>
+            </div>
+        </div>
+    </div>
+  </template>
+
+  <script>
+    import portalHeader from "@/components/PortalHeader.vue";
+    import UcHeader from '@/components/HomePage/homePage.vue'
+    import CaseList from '@/components/HomePage/caseList.vue'
+    import CourseList from '@/components/HomePage/courseList.vue'
+    import NoteList from "@/components/HomePage/noteList.vue"
+    import PutList from "@/components/HomePage/putTo.vue"
+    import AnswerList from "@/components/HomePage/answerList.vue"
+    import ArticleList from "@/components/HomePage/articleList.vue"
+    import FollowList from "@/components/HomePage/followList.vue"
+    import BookList from "@/components/HomePage/bookList.vue"
+    import apiFollow from "@/api/phase2/userfollow.js"
+    import apiStat from "@/api/phase2/stat.js"
+    import apiArticle from '@/api/modules/article.js'
+    import apiCases from '@/api/modules/cases.js'
+    import apiCourseStudy from '@/api/modules/courseStudy.js'
+    import apiQa from '@/api/modules/qa.js'
+    import apiCourse from '@/api/modules/course.js'
+    import apiNote from '@/api/phase2/note.js'
+    import apiUser from "@/api/system/user.js";
+    import {cutFullName} from "@/utils/tools.js";
+    import { mapGetters,mapActions } from 'vuex';
+
+    export default{
+        components:{portalHeader,UcHeader,CaseList,CourseList,NoteList,PutList,AnswerList,ArticleList,FollowList,BookList},
+        data(){
+            return{
+                input:'',
+                loading:0,//加载中
+                activeName:'first',
+                page:{
+                    pageIndex:1,
+                    pageSize:10,
+                    count:0
+                },
+                input:'',
+                activeName:'',
+                pageId:'',
+                // pageList:[],
+                casePageList:[],
+                notePageList:[],
+                articlePageList:[],
+                qaPageList:[],
+                answerPageList:[],
+                cousrePageList:[],
+                allPageList:[],
+                personal:true,
+                orgData:[],
+                Profess:[],
+                followIds:[],
+            }
+        },
+        computed: {
+          ...mapGetters(['userInfo','majorTypeMap','orgDomainMap']),
+        },
+        created() {
+            apiFollow.list().then(res=>{
+                if(res.status == 200) {
+                   this.followIds = res.result;
+                   this.followIds.push(this.userInfo.aid);
+                   this.getList()
+                }
+            })
+            this.loadMajorType();
+            this.loadOrgDomain();
+        },
+      methods:{
+        emitInput(){
+
+        },
+        ...mapActions({
+                loadMajorType:'majorType/loadMajorTypes',
+                loadOrgDomain:'orgDomain/loadOrgDomains'
+        }),
+        dynamicHide(id){
+                apiStat.dynamicHide(id).then(res=>{
+                    if(res.status == 200){
+                      this.$message.success('动态隐藏成功')
+                      this.getList();
+                    } else {
+                      this.$message.error(res.message);
+                    }
+                })
+            },
+        handleSizeChange(val) {
+                this.page.pageSize = val;
+                this.page.pageIndex = 1;
+                this.getList();
+            },
+            handleCurrentChange(val) {
+                this.page.pageIndex = val;
+                this.getList();
+            },
+            getList() {
+                let data = {
+                    pageIndex:this.page.pageIndex,
+                    pageSize:this.page.pageSize,
+                    contentType:this.activeName == 0? '':this.activeName,//内容类型
+                    aids:this.followIds // 数组
+                }
+                apiStat.userDynamicfollows(data).then(res=>{
+                   this.loading=1;
+                   if(res.status == 200) {
+                    this.page.count = res.result.count;
+                    if(res.result.count==0){
+                      return;
+                    }
+                    let ids = res.result.list.map(item=>item.contentId);
+                    let aids = [];
+                    const noReapetIds = [...new Set(ids)];
+                    res.result.list.forEach(item=>{
+                        aids.push(item.aid);
+                            item.info = {};
+                            item.authorInfo = {
+                                aid: "",
+                                name: "",
+                                orgInfo: "",
+                                avatar: "",
+                                sex: null
+                            }
+                            item.isAll = false;
+                        })
+                    if(this.activeName == 0) {// 动态处理
+                        this.getAllList(res.result.list)
+                    }
+                    if(this.activeName == 1){
+                        const noReapetAids = [...new Set(aids)];
+                        this.cousrePageList = res.result.list;
+                        this.getCourse(noReapetIds,res.result.list);
+                    }
+                    if(this.activeName == 2) {
+                        this.articlePageList = res.result.list;
+                        this.getArticle(noReapetIds,res.result.list);
+                    }
+                    if(this.activeName == 3) {
+                        this.casePageList = res.result.list;
+                        this.getCase(noReapetIds,res.result.list);
+                    }
+                    if(this.activeName == 6) { // 笔记
+                        this.getNote(noReapetIds,res.result.list);
+                        this.notePageList = res.result.list;
+                    }
+                    if(this.activeName == 4) { // 提问
+                        this.qaPageList = res.result.list;
+                        this.getQa(noReapetIds,res.result.list);
+                    }
+                    if(this.activeName == 5) { // 回答
+                        this.answerPageList = res.result.list;
+                        this.getAnswer(ids,res.result.list);
+                    }
+                   }
+                })
+            },
+            getAllList(list) {
+                this.allPageList = [];
+                let casePageList=[];
+                let notePageList=[];
+                let articlePageList=[];
+                let qaPageList=[];
+                let answerPageList=[];
+                let cousrePageList=[];
+                list.forEach(item=>{
+                    if(item.contentType == 1) {
+                        cousrePageList.push(item);
+                    }
+                    if(item.contentType == 2) {
+                        articlePageList.push(item);
+                    }
+                    if(item.contentType == 3) {
+                        casePageList.push(item);
+                    }
+                    if(item.contentType == 4) {
+                        qaPageList.push(item);
+                    }
+                    if(item.contentType == 5) {
+                        answerPageList.push(item);
+                    }
+                    if(item.contentType == 6) {
+                        notePageList.push(item);
+                    }
+                })
+                let caseIds = casePageList.map(item=>item.contentId);
+                const noReapetCaseIds = [...new Set(caseIds)];
+                let articleIds = articlePageList.map(item=>item.contentId);
+                const noReapetArticleIds = [...new Set(articleIds)];
+                let cousreIds = cousrePageList.map(item=>item.contentId);
+                const noReapetCousreIds = [...new Set(cousreIds)];
+                let qaIds = qaPageList.map(item=>item.contentId);
+                const noReapetQaIds = [...new Set(qaIds)];
+                let anwerIds = answerPageList.map(item=>item.contentId);
+                const noReapetAnwerIds = [...new Set(anwerIds)];
+                let noteIds = notePageList.map(item=>item.contentId);
+                const noReapetNoteIds = [...new Set(noteIds)];
+                if(noReapetCaseIds.length > 0) {
+                    this.getCase(noReapetCaseIds,casePageList);
+                }
+                if(noReapetArticleIds.length > 0) {
+                    this.getArticle(noReapetArticleIds,articlePageList);
+                }
+                if(noReapetCousreIds.length > 0) {
+                    this.getCourse(noReapetCousreIds,cousrePageList);
+                }
+                if(noReapetQaIds.length > 0) {
+                    this.getQa(noReapetQaIds,qaPageList);
+                }
+                if(noReapetAnwerIds.length > 0) {
+                    this.getAnswer(noReapetAnwerIds,answerPageList);
+                }
+                if(noReapetNoteIds.length > 0) {
+                    this.getNote(noReapetNoteIds,notePageList);
+                }
+                this.allPageList.push(...casePageList,...articlePageList,...cousrePageList,...qaPageList,...answerPageList,...notePageList);
+                this.allPageList.sort(this.pcompare("eventTime", false));
+
+            },
+            pcompare(prop, rev) {
+                if (rev === undefined) {
+                    rev = 1;
+                } else {
+                    rev = rev ? 1 : -1;
+                }
+                return function(obj1, obj2) {
+                    let val1 = obj1[prop],
+                    val2 = obj2[prop];
+                    return val1 < val2 ? rev * -1 : rev * 1;
+                };
+            },
+            getAnswer(ids,list){
+                if(ids.length == 0){
+                   return
+                }
+                apiQa.answerIds(ids).then(res=>{
+                    if(res.status == 200) {
+                        list.forEach((item, index) => {
+                                res.result.some(con => {
+                                if (con.id == item.contentId) {
+                                    item.info = con;
+                                    item.info.comments = con.replays;
+                                    return true;
+                                } else {
+                                    return false;
+                                }
+                                });
+                            });
+                    }
+                })
+            },
+            getQa(ids,list){
+                apiQa.ids(ids).then(res=>{
+                    if(res.status == 200) {
+                        list.forEach((item, index) => {
+                                res.result.some(con => {
+                                if (con.id == item.contentId) {
+                                    item.info = con;
+                                    return true;
+                                } else {
+                                    return false;
+                                }
+                                });
+                            });
+                    }
+                    })
+            },
+            getNote(ids,list) {
+                apiNote.ids(ids).then(res=>{
+                  if(res.status == 200) {
+                    list.forEach((item, index) => {
+                            res.result.some(con => {
+                            if (con.id == item.contentId) {
+                                item.info = con;
+                                return true;
+                            } else {
+                                return false;
+                            }
+                            });
+                        });
+                   }
+                })
+            },
+            getCase(ids,list){
+                apiCases.ids(ids).then(res=>{
+                   if(res.status == 200) {
+                    list.forEach((item, index) => {
+                            res.result.some(con => {
+                            if (con.id == item.contentId) {
+                                item.info = con;
+                                if(typeof item.info.majorType == 'string') {
+                                    item.info.majorType = item.info.majorType.split(',');
+                                }
+                                return true;
+                            } else {
+                                return false;
+                            }
+                            });
+                        });
+                        this.getCaseUserData(list);
+                   }
+                })
+            },
+            getCaseUserData(list) {
+                // let ids = caseList.map((item, index) => {
+                //     return item.info.authorId;
+                // });
+                // const noReapetIds = [...new Set(ids)];
+                let data = list.filter((item, index) => {
+                    return item.info && item.info.authorId != null;
+                });
+                let ids = data.map((item, index) => {
+                    return item.info.authorId;
+                });
+                const noReapetIds = [...new Set(ids)];
+                apiUser.getByIds(noReapetIds).then(res => {
+                    if (res.status == 200) {
+                        list.forEach((item, index) => {
+                            res.result.some(author => {
+                            if (author.aid == item.info.authorId) {
+                                item.authorInfo = author;
+                                author.orgInfo=cutFullName(author.orgInfo,1);
+                                return true;
+                            } else {
+                                return false;
+                            }
+                        });
+                    });
+                    } else {
+                    this.$message.error(res.message);
+                    }
+                });
+            },
+            getArticle(ids,list){
+                apiArticle.ids(ids).then(res=>{
+                    if(res.status == 200) {
+                        list.forEach((item, index) => {
+                                res.result.some(con => {
+                                if (con.id == item.contentId) {
+                                    item.info = con;
+                                    return true;
+                                } else {
+                                    return false;
+                                }
+                                });
+                            });
+                        this.getArticleUserData(list);
+                   }
+                })
+            },
+            getArticleUserData(list) {
+                let data = list.filter((item, index) => {
+                    return item.info && item.info.sysCreateAid != null;
+                });
+                let ids = data.map((item, index) => {
+                    return item.info.sysCreateAid;
+                });
+                const noReapetIds = [...new Set(ids)];
+                apiUser.getByIds(noReapetIds).then(res => {
+                    if (res.status == 200) {
+                        list.forEach((item, index) => {
+                            res.result.some(author => {
+                            if (author.aid == item.info.sysCreateAid) {
+                                item.authorInfo = author;
+                                author.orgInfo=cutFullName(author.orgInfo,1);
+                                return true;
+                            } else {
+                                return false;
+                            }
+                        });
+                    });
+                    } else {
+                    this.$message.error(res.message);
+                    }
+                });
+            },
+            getCourse(ids,list) {
+                let params = {
+                    ids:ids,
+                    aids:this.followIds
+                }
+                apiCourseStudy.followIds(params).then(res=>{
+                    if(res.status == 200) {
+                        list.forEach((item, index) => {
+                                res.result.some(con => {
+                                if (item.contentId == con.courseId && item.aid == con.aid) {
+                                    item.info = con;
+                                    return true;
+                                } else {
+                                    return false;
+                                }
+                                });
+                            });
+                        // this.getArticleUserData(list);
+                   }
+                })
+            },
+            handleClick() {
+                this.page.count = 0;
+                this.getList();
+            }
+       }
+      }
+  </script>
+
+  <style lang="scss" scoped>
+    .follow-banner{
+      background-color: #0078FC;
+    }
+     .follow-page{
+        background: #FFFFFF;
+        // height: 100%;
+       ::v-deep .el-tabs__active-bar{
+          height: 4px;
+          border-radius: 3px;
+          background: #387DF7;
+          margin-top: 15px;
+        }
+        ::v-deep .el-tabs__item{
+            padding: 0 30px;
+            height: 55px;
+            font-size: 18px;
+            font-weight: 400;
+            color: #333333;
+        }
+        ::v-deep .el-tabs__item.is-active{
+            font-size: 18px;
+            font-weight: 600;
+            color: #333333;
+        }
+        ::v-deep .el-tabs__nav-wrap::after{
+            height: 1px;
+            background-color: 979797;
+        }
+            .home-page-left{
+                border-radius: 4px;
+                padding-top: 29px;
+                margin: 0px 20% 0 19%;
+                position: relative;
+                .book-input{
+                    position: absolute;
+                    right: 0px;
+                    width: 250px;
+                    height: 40px;
+                    border: 1px solid rgba(153,153,153,0.5);
+                    border-radius: 19px;
+                    span{
+                        display: inline-block;
+                        font-size: 14px;
+                        color: #999999;
+                        padding: 0 10px 0 16px;
+                        border-right:  1px solid rgba($color: #999999, $alpha: 0.48);
+                    }
+                    ::v-deep .el-input__inner{
+                        border: none !important;
+                    }
+                    ::v-deep .el-icon-search{
+                        color: #333333 !important;
+                    }
+                }
+                // display: flex;
+                .svg-icon{
+                    vertical-align: middle;
+                }
+                .tabs-info{
+                    font-size: 16px;
+                    color: #333333;
+                    margin-left: 4px;
+                }
+            }
+            .home-page-right{
+                padding: 40px 52px 18px 52px;
+                box-sizing: border-box;
+                background: #fff;
+                border-radius: 4px;
+                margin-left: 25px;
+                .total-per{
+                    display: flex;
+                    // justify-content: space-between;
+                    padding-bottom: 28px;
+                    border-bottom:  1px solid rgba($color: #999999, $alpha: 0.21);
+                    .per-li{
+                        width: 90px;
+                        text-align: center;
+                        margin: 0 25px;
+                        .per-info{
+                        display: block;
+                        font-size: 28px;
+                        font-weight: 600;
+                        color: #333333;
+                       }
+                       .per-text{
+                        font-size: 14px;
+                        color: #666666;
+                       }
+                    }
+
+                }
+                .ach-title{
+                    font-size: 18px;
+                    font-weight: 600;
+                    color: #333333;
+                }
+                .ach-ul{
+                    display: flex;
+                    flex-wrap: wrap;
+                    border-bottom:  1px solid rgba($color: #999999, $alpha: 0.21);
+                    padding-bottom: 4px;
+                    .ach-box{
+                        flex: 33%;
+                        width: 57px;
+                        text-align: center;
+                        margin-bottom: 18px;
+                        img{
+                            width: 52px;
+                            height: 58px;
+                            margin-bottom: 4px;
+                        }
+                        p{
+                            font-size: 14px;
+                            color: #333333;
+                            line-height: 20px;
+                        }
+
+                    }
+                }
+                .ava-info{
+                    display: flex;
+                    padding: 10px 0 30px 0;
+                    img{
+                        width: 48px;
+                        height: 48px;
+                    }
+                    .ava-text{
+                        padding: 2px 0;
+                        margin-left: 18px;
+                        font-size: 14px;
+                        display: flex;
+                        flex-direction: column;
+                        justify-content: space-between;
+                    }
+                }
+            }
+        // }
+     }
+  </style>
diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue
index 70961039..5e361601 100644
--- a/src/views/portal/qa/Answer.vue
+++ b/src/views/portal/qa/Answer.vue
@@ -1,61 +1,43 @@
 <template>
   <div id="answer-detail">
-    <portal-header current="qa" :goSearch="4"></portal-header>
-    <div class="portal-content xcontent">
-      <el-breadcrumb separator-class="el-icon-arrow-right" class="breadcrumb-nav">
-        <el-breadcrumb-item :to="{ path: '/qa' }">问答列表</el-breadcrumb-item>
-        <el-breadcrumb-item>问答详情</el-breadcrumb-item>
-      </el-breadcrumb>
-      <div class="xrow" style="display: flex;justify-content: space-between;">
-        <div style="flex: 1;">
-          <el-row v-if="noData">
-            <el-card :body-style="{ padding: '0px' }" class="detail">
-              <div class="title">
-                <span class="qa-basic" :class="detailData.isResolve ? 'qa-solve' : 'qa-unSolve'">
-                  {{ detailData.isResolve === true ? '【已解决】' : detailData.isResolve === false ? '【待解决】' : '' }}
-                </span>
-                {{ detailData.title }}
+    <div class="qa-banner">
+      <portal-header current="qa" textColor="#000000" :goSearch="4"></portal-header>
+    </div>
+    <div style="padding-top:30px" >
+      <div class="xcontent2">
+        <div style="margin-right: 30px;" class="xcontent2-main">
+          <div v-if="noData">
+            <div class="qust-detail">
+              <div class="xpage-detail-crumbs">
+                  <router-link to="/qa"><span class="crumbs-first">问答列表</span></router-link>
+                  <span class="crumbs-line">/</span>
+                  <span class="crumbs-last">问答详情</span>
               </div>
-              <div class="label"
-                style="display: flex;margin: 9px 0 14px 0;justify-content: space-between;align-items: center;font-size: 12px;">
-                <!-- <img :src="detailData.avatar || '/temp/index/male.jpg'" /> -->
-                <author width="24px" height="24px" :avatar="detailData.avatar" :name="detailData.name"
-                  :sex="detailData.sex"></author>
-                <!-- <author :avatar="detailData.avatar" :info="detailData.orgInfo" :name="detailData.name"></author> -->
+               <div class="qust-hear">
+                   {{ detailData.sysCreateBy }}提问了问题
                 <time-show :time="detailData.sysCreateTime"></time-show>
-              </div>
-              <div class="content">
-                <div style="word-break:break-all;">{{ detailData.content }}</div>
-                <div v-if="detailData.images" style="margin: 10px 0px;">
-                  <el-image :src="fileUrl + detailData.images" fit="scaleDown" />
+               </div>
+               <div class="qust-title">
+                  <span :class="detailData.isResolve ? 'qa-unSolve' : 'qa-solve'">
+                  {{ detailData.isResolve === true ? '【已解决】' : detailData.isResolve === false ? '【待解决】' : '' }}
+                  </span>
+                {{ detailData.title }}
+               </div>
+               <div class="qust-content">
+                 <div class="content-text">
+                      <div style="word-break:break-all;">{{ detailData.content }}</div>
+                     <div v-if="detailData.images" style="margin: 10px 0px;">
+                     <el-image :src="fileUrl + detailData.images" fit="scaleDown" />
+                    </div>
+                 </div>
+                 <div class="content-inter">
+                   <interactBar v-if="detailData.id" :type="4" :shares="true" :comments="false"  :data="detailData" :answers="true" :clickAnswer="true"  :views="false"> </interactBar>
                 </div>
-              </div>
 
-              <div class="btn-div">
-                <div class="write-btn" @click="answerShow = true">
-                  <el-button type="text" icon="el-icon-edit">写回答</el-button>
-                </div>
-                <span class="answer-total">共计{{ detailData.answers }}条回答</span>
-                <interactBar v-if="detailData.id" :type="4" :comments="false" :data="detailData" :views="false">
-                </interactBar>
-              </div>
-            </el-card>
-            <div v-if="answerShow">
-              <el-card :body-style="{ padding: '0px' }" style="padding: 20px;">
-                <div>
-                  <el-input type="textarea" rows="5" placeholder="写下您的答案(800字以内)，可以@提问者哦～" minlength="1" maxlength="800"
-                    v-model="content"></el-input>
-                </div>
-                <div style="padding-top: 10px;">
-                  <el-button type="primary" :disabled="!checked" class="dian-btn" @click="publishAnswer">发布</el-button>
-                  <!-- <el-checkbox style="margin-left:20px" v-model="checked"></el-checkbox><span style="margin-left:10px" @click="qaFormCheckedShow = true">我已阅读并遵守平台内容发布要求</span>  -->
-                  <el-checkbox style="margin-left:20px" v-model="checked"></el-checkbox><span
-                    style="font-size:14px;color:#787878;margin-left:10px">我已阅读并遵守<span
-                      style="color:#588afc;cursor: pointer;" @click="qaFormCheckedShow = true">平台内容发布要求</span></span>
-                </div>
-              </el-card>
+               </div>
             </div>
-            <el-card class="box-card" v-if="answerList.length == 0 && !answerShow" :body-style="{ padding: '0px' }">
+
+            <div style="margin-top: 20px;" class="box-card" v-if="answerList.length == 0 && !answerShow">
               <div>
                 <div style="height:50px;margin-top: 50px;">
                   <img style="width:50px" src="../../../assets/images/icon/anser.png" alt="" srcset="">
@@ -65,25 +47,27 @@
                 </div>
               </div>
 
-            </el-card>
-            <div v-if="answerList.length > 0">
-              <div :span="24">
-                <!-- <el-card :body-style="{ padding: '0px' }" class="answer publishAnswer">
-                <el-input placeholder="写回答...（1-1000个字）" minlength="1" maxlength="255" v-model="content"></el-input>
-                <el-button type="primary" class="dian-btn" @click="publishAnswer">发布</el-button>
-              </el-card> -->
-                <el-card :body-style="{ padding: '0px' }" class="answer-reply-box">
-                  <div class="answer" v-for="(item, index) of answerList" :key="item.id"
-                    :style="index === answerList.length - 1 ? 'border-bottom:none;' : ''">
+            </div>
+            <div style="background-color: #fff;">
+              <div class="wrt-answer" v-if="answerList.length > 0 || answerShow" style="margin-top: 30px;padding: 50px 40px 20px 40px;">
+                 <div class="answer-tit">
+                   写回答
+                 </div>
+                 <div class="answer-content">
+                    <input minlength="1" maxlength="800" v-model="content" placeholder="写下您的回答吧～" type="text">
+                   <el-button type="primary"  @click="publishAnswer">发布</el-button>
+                 </div>
+              </div>
+              <div v-if="answerList.length > 0" style="padding: 0px 40px;">
+                <div>
+                  <div class="answer" v-for="(item, index) of answerList" :key="item.id" :style="index === answerList.length - 1 ? 'border-bottom:none;' : ''">
                     <div class="answer-top">
                       <div>
-                        <author :avatar="item.avatar" :name="item.sysCreateBy" :sex="item.sex"></author>
+                        <author :aid="item.sysCreateAid" :avatar="item.avatar" :name="item.sysCreateBy" :info="item.orgInfo" :sex="item.sex" :sign="item.sign"></author>
                       </div>
                       <div>
                         <span v-if="detailData.isResolve && item.isBest" style="color: #ffb30f">最佳答案</span>
-                        <el-button type="primary"
-                          v-if="!detailData.isResolve && detailData.sysCreateAid == userInfo.aid" class="zuijia"
-                          @click="editAnsweBest(item)">设为最佳答案</el-button>
+                        <el-button type="primary"  v-if="!detailData.isResolve && detailData.sysCreateAid == userInfo.aid" class="zuijia"   @click="editAnsweBest(item)">设为最佳答案</el-button>
                       </div>
                     </div>
                     <div class="answer-body">
@@ -91,15 +75,13 @@
                         <!--在这一层上加事件-->
                         <div class="answer-text">
                           <span style="color: #303133" v-html="displayAll(item)"></span>
-                          <span v-if="item.content.length > 170" @click="changeIsAll(item)">{{ item.isAll ? '收起' : '全文'
+                          <span v-if="item.content.length > 170 || item.content.split('\n').length>5" @click="changeIsAll(item)">{{ item.isAll ? '收起' : '全文'
                           }}</span>
                         </div>
                         <div class="answer-time">
-                          <div>回答于 <time-show :time="item.sysCreateTime"></time-show>
-                          </div>
+                          <div> <!--之前显示时间的位置--> </div>
                           <div style="margin-right: 10px;">
-                            <interactBar :type="5" :comments="false" :favorites="false" :data="item" :shares="false"
-                              :views="false"></interactBar>
+                            <interactBar :type="5" :data="item" :comments="false" :shares="false" :views="false"></interactBar>
                           </div>
                         </div>
                         <div class="answer-boot">
@@ -125,8 +107,7 @@
                         </div>
                         <!---->
                         <div v-show="curParentId == item.id" class="answer-reply">
-                          <el-input type="textarea" v-model="replyContent" show-word-limit maxlength="800"
-                            placeholder="回复内容"></el-input>
+                          <el-input type="textarea" v-model="replyContent" show-word-limit maxlength="800" placeholder="回复内容"></el-input>
                           <el-button type="primary" @click="replyContentMethod(item, {})">发布回复</el-button>
                         </div>
                       </div>
@@ -136,12 +117,12 @@
                           :class="i === item.answers.length - 1 ? 'comment-last' : ''">
                           <div class="comment-top">
                             <div class="comment-author">
-                              <author :avatar="con.avatar" :name="con.sysCreateBy" :sex="con.sex"></author>
+                              <author :aid="con.sysCreateAid" :avatar="con.avatar" :name="con.sysCreateBy" :sex="con.sex" :sign="con.sign"></author>
                               <span class="comment-author-text">回复</span>
                               <span style="margin-left: 10px; font-size:14px">{{ con.replayName }}</span>
                             </div>
                             <div class="comment-time">
-                              <time-show :time="con.sysCreateTime"></time-show>
+                              <!-- <time-show :time="con.sysCreateTime"></time-show> -->
                             </div>
                           </div>
                           <div class="comment-body">
@@ -179,7 +160,7 @@
                                 :class="rowIdx === con.answers.length - 1 ? 'comment-last' : ''">
                                 <div class="comment-top">
                                   <div class="comment-author">
-                                    <author :avatar="row.avatar" :name="row.sysCreateBy" :sex="row.sex"></author>
+                                    <author :aid="row.sysCreateAid" :avatar="row.avatar" :name="row.sysCreateBy" :sex="row.sex" :sign="row.sign"></author>
                                     <span class="comment-author-text">回复</span>
                                     <span style="margin-left: 10px; font-size:14px">{{ row.replayName }}</span>
                                   </div>
@@ -190,7 +171,7 @@
                                 <div class="comment-body">
                                   <div class="comment-info" @mouseover="showButtons(row.id)" @mouseout="hideButtons()">
                                     <div class="comment-content">
-                                      <span style="color: #303133" v-html="displayAll(row)"></span> 
+                                      <span style="color: #303133" v-html="displayAll(row)"></span>
                                       <span v-if="row.content.length > 170" @click="changeIsAll(row)">
                                         {{ row.isAll ? '收起' : '全文' }}
                                       </span>
@@ -228,7 +209,7 @@
                       </div>
                     </div>
                   </div>
-                </el-card>
+                </div>
                 <div class="pagination-div">
                   <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
                   <span class="pag-text-msg" style="font-size:14px;color: #444444;"
@@ -236,58 +217,46 @@
                 </div>
               </div>
             </div>
-          </el-row>
+          </div>
           <div v-else>
             <el-empty :image-size="200"></el-empty>
           </div>
         </div>
-        <div style="width: 245px;margin-left: 5px;">
-          <el-row>
+        <div class="xcontent2-minor">
+ <div class="portal-model-btn pointer" @click="$refs.addQuestion.askQuestionDialog = true">
+                    <svg-icon style="margin-right: 0;font-size: 24px;" icon-class="question-mark"></svg-icon>
+                    提问题
+                  </div>
             <div class="qa-ranking">
-              <div style="margin-bottom:15px;padding: 0">
-                <el-button style="height: 100%;height: 37px;border-radius: 0; width: 100%;"
-                  @click="$refs.addQuestion.askQuestionDialog = true" type="primary">提问题</el-button>
-              </div>
-              <div :span="24" style="padding:0">
-                <el-card class="ranking-card">
-                  <div slot="header">
-                    <span style="font-size: 14px;font-weight: 600;color: #333333;">贡献排行榜</span>
-                    <!-- <el-radio-group v-model="anking" size="mini" style="float: right">
-                    <el-radio-button label="年"></el-radio-button>
-                    <el-radio-button label="月"></el-radio-button>
-                    <el-radio-button label="日"></el-radio-button>
-                  </el-radio-group> -->
-                  </div>
-                  <div style="padding-bottom:10px">
 
-                    <el-row class="ranking-title  bacolor" v-for="(item, index) in ankingList" :key="index">
-                      <el-col :span="6" style="height:34px;">
-                        <img style="margin-top: 5px;" v-if="index === 0" :src="`${webBaseUrl}/images/first.png`" />
-                        <img style="margin-top: 5px;" v-if="index === 1" :src="`${webBaseUrl}/images/second.png`" />
-                        <img style="margin-top: 5px;" v-if="index === 2" :src="`${webBaseUrl}/images/third.png`" />
-                        <span style="margin-left: 10px" v-if="index != 2 && index != 0 && index != 1">{{ index + 1
-                        }}</span>
-                      </el-col>
-                      <!-- <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.name" placement="top-start"> -->
-                      <el-col :span="18" class="one-line-ellipsis"> {{ item.sysCreateUname }}</el-col>
-                      <!-- </el-tooltip> -->
-                      <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
-                    </el-row>
-                    <!-- <el-row class="ranking-title" v-for="(item, index) in ankingList" :key="index">
-                    <el-col :span="4" class="center">
-                      <img v-if="index === 0" :src="`${webBaseUrl}/images/first.png`" />
-                      <img v-if="index === 1" :src="`${webBaseUrl}/images/second.png`" />
-                      <img v-if="index === 2" :src="`${webBaseUrl}/images/third.png`" />
-                      <span v-if="index != 2 && index != 0 && index != 1">{{ index + 1 }}</span>
-                    </el-col>
-                    <el-col style="color: #333333;font-size: 14px;" :span="10">{{ item.sysCreateUname }}</el-col>
-                    <el-col style="text-align: right;color: #333333;font-size: 14px;" :span="10">{{ item.answers }}</el-col>
-                  </el-row> -->
+                  <div class="portal-ranking ranking-bg">
+                        <p class="ranking-title">贡献榜</p>
+                        <ul class="ranking-data">
+                          <li class="index-one-line-ellipsis" v-for="(item, index) in ankingList" :key="index" style="margin-top:30px;line-height: 22px;cursor: pointer;">
+                            <span class="portal-right-text orange-one" v-if="index==0" style="margin-right:20px">
+                              <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
+                            </span>
+                            <span class="portal-right-text orange-tow" v-if="index==1" style="margin-right:20px">
+                                <img :src="`${webBaseUrl}/images/list02.png`" alt="">
+                            </span>
+                            <span class="portal-right-text orange-three" v-if="index==2" style="margin-right:20px">
+                                <img :src="`${webBaseUrl}/images/list03.png`" alt="">
+                            </span>
+                            <span class="portal-right-text" v-if="index==3" style="margin-right:20px">
+                                <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                            </span>
+                            <span class="portal-right-text" v-if="index==4" style="margin-right:20px">
+                                <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                            </span>
+                            <span class="portal-title-desc">{{ item.sysCreateUname }} <span class="orinfo-text">{{ item.orinfo }}</span> </span>
+                          </li>
+                        </ul>
                   </div>
-                </el-card>
-              </div>
+                  <!-- <div class="course-resources pointer"> -->
+                        <!-- 资源位 -->
+                        <!-- <img  @click="banJump()" :src="fileBaseUrl + resonimg.image" alt=""> -->
+                  <!-- </div> -->
             </div>
-          </el-row>
         </div>
       </div>
       <addQuestion ref="addQuestion" @sure="toDetail"></addQuestion>
@@ -315,13 +284,15 @@ import portalFooter from "@/components/PortalFooter.vue";
 import interactBar from "@/components/Portal/interactBar.vue";
 import editQuestion from "@/components/Qa/editQuestion.vue";
 import timeShow from "@/components/Portal/datetimeShow.vue";
-import author from "@/components/Portal/authorInfo.vue";
+import author from "@/components/Portal/artauthor.vue";
 import portalFloatTools from "@/components/PortalFloatTools.vue";
 import apiQa from "@/api/modules/qa.js";
 import apiUser from "@/api/system/user.js";
 import apiPraise from "@/api/modules/praises.js";
 import apiFavorites from "@/api/modules/favorites.js";
 import apiMessage from "@/api/system/message.js";
+import apiPlace from "@/api/phase2/place.js"
+import {cutOrgNamePath} from "@/utils/tools.js";
 export default {
   name: "answer",
   components: {
@@ -340,6 +311,9 @@ export default {
   },
   data() {
     return {
+      ankIds:[],
+      resonimg:{},
+      fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
       noData: true,
       qaFormCheckedShow: false,
       checked: false,
@@ -392,14 +366,29 @@ export default {
     this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
     window.addEventListener("scroll", this.handleScroll);
     this.getAnkingData();
+    this.couresreso();
   },
   beforeDestroy() {
     window.removeEventListener("scroll", this.handleScroll);
   },
   methods: {
+    banJump() {
+      if(this.resonimg.JumpUrl) {
+        window.open(this.resonimg.JumpUrl);
+      }
+    },
+    couresreso(){
+      let key = 'qa';
+      apiPlace.detail(key).then(res=>{
+        let lmj =  JSON.parse(res.result.content)
+        this.resonimg = lmj[0]
+      })
+    },
     handleScroll() {
+      let innerw = document.querySelector(".qa-ranking");
       let innerHeight = document.querySelector("#answer-detail").clientHeight;
       let outerHeight = document.documentElement.clientHeight;
+      let outerWidth = innerw.clientWidth;
       let scrollTop = document.documentElement.scrollTop;
       if (outerHeight + scrollTop + 350 >= innerHeight) {
         if (this.moreState == 1) {
@@ -408,7 +397,7 @@ export default {
       }
       if (scrollTop > 400) {
         document.querySelector(".qa-ranking").style.cssText =
-          "position: fixed;top: 0;width:242.5px";
+          "position: fixed;top: 0;width:"+outerWidth+"px";
       } else {
         document.querySelector(".qa-ranking").style.cssText =
           "position: static";
@@ -424,9 +413,25 @@ export default {
       this.getAnswerList(false);
     },
     getAnkingData() {
+      let $this=this;
       apiQa.queryList(5).then(res => {
         if (res.status == 200) {
-          this.ankingList = res.result;
+          let ids = [];
+         res.result.forEach(item =>{
+           item.orinfo='';
+           ids.push(item.sysCreateAid);
+         })
+         $this.ankingList = res.result;
+         apiUser.getByIds(ids).then(rs=>{
+             rs.result.forEach(u=>{
+               $this.ankingList.forEach((sub) => {
+                   if(sub.sysCreateAid==u.aid){
+                     sub.orinfo=cutOrgNamePath(u.orgInfo);
+                   }
+               })
+             })
+             // console.log(this.ankingList);
+         })
         }
       });
     },
@@ -478,11 +483,25 @@ export default {
           res.result.avatar = "";
           res.result.name = "";
           res.result.orgInfo = "";
+          res.result.sign= "";
           res.result.sex = null;
           this.detailData = res.result;
           if (JSON.stringify(this.detailData) != "{}") {
             this.getQaUserData(this.detailData);
           }
+          let event = {
+            key: "ReadQuestion",//后台的事件key  发布文章且审核通过
+            title: "阅读问题",//事件的标题
+            parameters:"author:"+res.result.sysCreateAid,//用户自定义参数 name:value,name:value
+            content: '阅读了问题',//事件的内容
+            objId: this.qid,//关联的id
+            objType: "4",//关联的类型
+            objInfo: this.detailData.title,
+            aid: this.userInfo.aid, //当前登录人的id
+            aname: this.userInfo.name,//当前人的姓名
+            status: 1 //状态，直接写1
+          }
+          this.$store.dispatch("userTrigger", event);
         } else {
           this.noData = false;
           this.$message.error(res.message);
@@ -507,6 +526,9 @@ export default {
         pageIndex: this.pageIndex
       }).then(res => {
         if (res.status == 200) {
+          if(res.result.length>0){
+            this.answerShow=true;
+          }
           let allList = [];
           let ids = [];
           let level3ParentIds = [];
@@ -514,6 +536,7 @@ export default {
             res.result.list.forEach(item => {
               item.avatar = "";
               item.sex = null;
+              item.sign = " ";
               item.isAll = false;//字数过大时，显示隐藏控制
               allList.push(item);
               ids.push(item.sysCreateAid);
@@ -521,6 +544,7 @@ export default {
                 item.answers.forEach(answers => {
                   answers.avatar = "";
                   answers.sex = null;
+                  answers.sign = " ";
                   answers.isAll = false;
                   allList.push(answers);
                   level3ParentIds.push(answers.id);
@@ -590,6 +614,7 @@ export default {
               if (author.aid == item.sysCreateAid) {
                 item.avatar = author.avatar;
                 item.orgInfo = author.orgInfo;
+                item.sign = author.sign
                 item.sex = author.sex;
                 return true;
               } else {
@@ -638,6 +663,19 @@ export default {
           this.getQuestionDetail();
           this.loadAnswer();
           this.content = "";
+          let event = {
+            key: "AnswerQuestion",//后台的事件key
+            title: "回答问题",//事件的标题
+            parameters:"",//用户自定义参数 name:value,name:value
+            content: '回答了问题',//事件的内容
+            objId: res.result.id,//关联的id
+            objType: "5",//关联的类型
+            objInfo: this.detailData.title,
+            aid: this.userInfo.aid, //当前登录人的id
+            aname: this.userInfo.name,//当前人的姓名
+            status: 1 //状态，直接写1
+          }
+          this.$store.dispatch("userTrigger", event);
         } else {
           this.$message({ message: res.message, type: "error" });
         }
@@ -661,23 +699,29 @@ export default {
         const { id } = data;
         apiQa.delAnswer(id).then(res => {
           if (res.status == 200) {
+            this.$message({ message: "删除成功",  type: "success" });
+            let event = {
+              key: "DeleteAnswer",//自己删除自己的回答
+              title: "删除自己的回答",//事件的标题
+              parameters:"",//用户自定义参数 name:value,name:value
+              content: '删除了自己问题',//事件的内容
+              objId: id,//关联的id
+              objType: "5",//关联的类型
+              objInfo: this.detailData.title,
+              aid: this.userInfo.aid, //当前登录人的id
+              aname: this.userInfo.name,//当前人的姓名
+              status: 1 //状态，直接写1
+            }
+            this.$store.dispatch("userTrigger", event);
+
             this.loadAnswer();
             this.getQuestionDetail();
-            this.$message({
-              message: "删除成功",
-              type: "success"
-            });
+
           } else {
-            this.$message({
-              message: res.message,
-              type: "error"
-            });
+            this.$message({ message: res.message,  type: "error" });
           }
         }).catch(err => {
-          this.$message({
-            message: "删除失败",
-            type: "error"
-          });
+          this.$message({  message: "删除失败", type: "error" });
         });
       }).catch(() => { });
     },
@@ -687,18 +731,30 @@ export default {
       apiQa.isBest(id).then(res => {
         if (res.status == 200) {
           this.messageSave("set");
+          //消息
+          console.log(data,'data');
+          let event = {
+            key: "AnswerBest",//设置为最佳答案
+            title: "回答被选为最佳答案",//
+            parameters:"author:"+data.sysCreateAid,//内容的作者
+            content: '回答被选为最佳答案',//事件的内容
+            objId: data.id,//关联的id
+            objType: '5',//关联的类型
+            objInfo: '设置最佳答案',
+            aid: this.userInfo.aid, //当前登录人的id
+            aname: this.userInfo.name,//当前人的姓名
+            status: 1 //状态，直接写1
+          }
+          console.log(event,'event');
+          this.$store.dispatch("userTrigger", event);
           this.loadAnswer();
           this.getQuestionDetail();
-          this.$message({
-            type: "success",
-            message: "设置为最佳答案成功"
-          });
+          this.$message({  type: "success", message: "设置为最佳答案成功" });
+        }else{
+          this.$message({  type: "warning",message: "设置为最佳答案失败:"+res.message});
         }
       }).catch(err => {
-        this.$message({
-          type: "warning",
-          message: "设置为最佳答案失败"
-        });
+        this.$message({  type: "warning",message: "设置为最佳答案失败"});
       });
     },
     enSure(data) {
@@ -713,12 +769,16 @@ export default {
     hideButtons() {
       this.btnsShowRowId = '';
     },
+
     //展示全部
     displayAll(item) {
       let content = '';
       content = item.content.replace(/(\n){2,}/,'<br>');
       item.content = content;
-      if (!item.isAll && item.content.length > 170) {
+      if (!item.isAll && item.content.length > 170 || !item.isAll && item.content.split("\n").length>5) {
+        if(!item.isAll && item.content.split("\n").length>5){
+          return item.content.slice(0, 10) + "...";
+        }
         return item.content.slice(0, 170) + "...";
       }
       return item.content;
@@ -757,13 +817,27 @@ export default {
           res.result.sex = null;
           res.result.isAll = false;
           this.$message.success("回复成功");
+          //发送回复事件
+          let event = {
+            key: "ReplyAnswer",//
+            title: '回复回答',//
+            parameters:"",//作者
+            content: '回复回答',//
+            objId: data.id,//关联的id
+            objType: "5",//关联的类型
+            objInfo:'',
+            aid: this.userInfo.aid, //当前登录人的id
+            aname: this.userInfo.name,//当前人的姓名
+            status: 1 //
+          }
+          this.$store.dispatch("userTrigger", event);
           this.getUserInfoList([res.result], [res.result.sysCreateAid]);
           this.curParentId = '';
           this.curParent = {};
           this.replyContent = '';
           //添加到页面中
           if (data.clevel < 3) {
-            if (data.answers) {
+            if(data.answers) {
               data.answers.push(res.result);
             } else {
               data.answers = [];
@@ -798,35 +872,88 @@ export default {
         commentId: this.replyDiaglog.commentId
       }
       let $this = this;
-      // apiComment.replyList(params).then(rs=>{
-      //   if(rs.status==200){
-      //     $this.replyDiaglog.count=rs.result.count;
-      //     $this.replyDiaglog.pages=rs.result.totalPages;
-      //     let ids=[];
-      //     if(append){
-      //       rs.result.list.forEach(item=>{
-      //         item.avatar='';
-      //         ids.push(item.sysCreateAid);
-      //         $this.replyDiaglog.list.push(item);
-      //       })
-      //     }else{
-      //       rs.result.list.forEach(item=>{
-      //         item.avatar='';
-      //         ids.push(item.sysCreateAid);
-      //       })
-      //       $this.replyDiaglog.list=rs.result.list;
-      //     }
-      //     this.loadAuthorInfo(rs.result.list,ids);
-      //   }else{
-      //     this.$message.error(rs.message);
-      //   }
-      // })
     },
   }
 };
 </script>
 
 <style scoped lang="scss">
+.wrt-answer{
+  .answer-tit{
+    font-size: 18px;
+    font-weight: 600;
+    color: #333333;
+  }
+  .answer-content{
+    margin-top: 20px;
+    display: flex;
+    margin-bottom: 45px;
+    input{
+      flex: 1;
+      height: 81px;
+      border-radius: 4px;
+      opacity: 0.5;
+      border: 1px solid #999999;
+      margin-right: 35px;
+      padding-left: 34px;
+    }
+    button{
+       width: 80px;
+       height: 35px;
+       margin-top: 42px;
+    }
+  }
+}
+.qust-detail{
+  width: 100%;
+  min-height: 200px;
+  box-sizing: border-box;
+  padding: 50px;
+  background: #FFFFFF;
+  border-radius: 8px;
+  .qust-content{
+    font-size: 14px;
+    font-weight: 400;
+    color: #666666;
+    margin-top: 18px;
+    display: flex;
+    .content-text{
+       flex: 1;
+       margin-right: 70px;
+       margin-left: 0 !important;
+    }
+    .content-inter{
+      width: 200px;
+    }
+
+  }
+  .qust-hear{
+    display: flex;justify-content: space-between;
+    align-items: center;
+    font-size: 14px;
+    color: #666666;
+    font-weight: 400;
+    margin-bottom: 20px;
+    margin-top:20px;
+  }
+  .qust-title{
+    font-size: 16px;
+    font-weight: 500;
+    color: #333333;
+  }
+}
+.qa-banner{
+    height: 240px;
+    background: url('../../../../public/images/qa-banner.png');
+  }
+.course-resources{
+  margin-top: 26px;
+  img{
+    width: 100%;
+    height: 100%;
+    border-radius: 8px;
+  }
+}
 ::v-deep .checked-show {
   .el-dialog__header {
     padding: 0;
@@ -861,8 +988,9 @@ export default {
 
 .ranking-title {
   line-height: 34px;
-  font-size: 15px;
-  color: #333333;
+  font-size: 24px;
+  font-weight: 500;
+  color: #000;
 
   .center-titlt {
     font-size: 15px;
@@ -877,67 +1005,10 @@ export default {
     margin-top: 5px;
   }
 }
-
-.detail {
-  background-color: #fff;
-  padding: 5px 20px 10px 20px;
-
-  .title {
-    margin-top: 20px;
-    font-size: 22px;
-    line-height: 30px;
-    word-break: break-all;
-
-    .resolve {
-      // padding: 3px;
-      color: #08a890;
-      margin-left: -10px;
-    }
-
-    .unResolve {
-      // padding:3px;
-      color: #588afc;
-      margin-left: -10px;
-    }
-  }
-
-  .label {
-    font-size: 15px;
-    color: #999999;
-  }
-
-  .content {
-    line-height: 21px;
-    margin: 14px 0 16px 0;
-    font-size: 15px;
-    color: #666666;
-  }
-
-  .btn-div {
-    display: flex;
-    align-items: center;
-    margin-bottom: 9px;
-
-    .answer-total {
-      font-size: 14px;
-      margin: 0 10px;
-    }
-
-    ::v-deep .interact-bar-btns {
-      justify-content: flex-start !important;
-    }
-  }
-
-  .dian-btn {
-    margin-top: 50px;
-    width: 60%;
-  }
-}
-
 .answer {
   margin-top: 14px;
   background-color: #fff;
-  border-bottom: 1px solid #dddddd;
+  // border-bottom: 1px solid #dddddd;
 
   // padding: 5px 20px 20px 20px;
   .answer-top {
@@ -954,7 +1025,11 @@ export default {
       border-radius: 50%;
       vertical-align: middle;
     }
-
+    .sign{
+      padding:5px 0px 10px 42px;
+      color:#666666;
+      font-weight: 400;
+    }
     .zuijia {
       width: 106px;
       height: 42px;
@@ -971,27 +1046,32 @@ export default {
   }
 
   .answer-body {
-    padding-left: 40px;
-
+    padding-left: 48px;
     .answer-text {
-      margin: 20px 0 15px;
+      //margin: 6px 0 15px;
+      margin:6px 70px 15px 5px;//按ui图，让开右边区域位置
       line-height: 24px;
+      max-height: 48px;
       white-space: pre-wrap;
       word-break: break-all;
+      display: inline-block;
 
       span {
         color: #409eff;
         cursor: pointer;
-        margin-left: 5px;
+        // margin-left: 5px;
       }
     }
 
     .answer-time {
       font-size: 14px;
       color: #8590a6;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
+      //display: flex;
+      //justify-content: space-between;
+      //align-items: center;
+      //按ui图，不再占一行，只是占右边
+      float: right;
+      margin-top: 10px;
     }
 
     .answer-boot {
@@ -1003,7 +1083,6 @@ export default {
       .answer-boot-btns {
         a {
           margin-right: 15px;
-
           span {
             margin-left: 6px;
             color: #8590A6;
@@ -1032,7 +1111,7 @@ export default {
 .comment {
   margin-top: 10px;
   background-color: #FFFFFF;
-  border-bottom: 1px solid #dddddd;
+  // border-bottom: 1px solid #dddddd;
 
   .comment-top {
     display: flex;
@@ -1062,7 +1141,7 @@ export default {
   }
 
   .comment-body {
-    padding-left: 40px;
+    padding-left: 53px;
 
     .comment-content {
       padding-bottom: 0px;
@@ -1111,9 +1190,9 @@ export default {
 }
 
 .answer-reply-box {
-  margin-top: 10px;
+  margin-top: 30px;
   background-color: #fff;
-  padding: 5px 20px 10px 20px;
+  padding: 30px 40px;
 }
 
 // ::v-deep .publishAnswer {
diff --git a/src/views/portal/qa/Detail.vue b/src/views/portal/qa/Detail.vue
index e35b6ee1..924d13f7 100644
--- a/src/views/portal/qa/Detail.vue
+++ b/src/views/portal/qa/Detail.vue
@@ -1,15 +1,14 @@
 <template>
   <div id="answer-detail">
-    <portal-header current="qa" :goSearch="4"></portal-header>
-    <div class="portal-content xcontent" >
-      <el-breadcrumb separator-class="el-icon-arrow-right" class="breadcrumb-nav">
-        <el-breadcrumb-item :to="{ path: '/qa' }">问答列表</el-breadcrumb-item>
-        <el-breadcrumb-item>问答详情</el-breadcrumb-item>
-      </el-breadcrumb>
+     <div class="qa-banner">
+      <portal-header current="qa" :goSearch="4"></portal-header>
+    </div>
+    <div style="padding-top:30px" class="portal-content xcontent" >
       <div class="xrow" style="display: flex;justify-content: space-between;">
          <div style="flex: 1;" class="xcol content-div">
-              <el-row>
-          <el-card :body-style="{ padding: '0px' }" class="detail">
+
+          <div  class="detail">
+            
             <div class="title" >
               <span class="qa-basic" :class="detailData.isResolve ? 'qa-solve' : 'qa-unSolve'">
                 {{ detailData.isResolve === true ? '【已解决】' : detailData.isResolve === false ? '【待解决】' : '' }}
@@ -18,7 +17,7 @@
             </div>
             <div class="label" style="display: flex;margin: 9px 0 14px 0;justify-content: space-between;align-items: center;font-size: 12px;">
               <!-- <img :src="detailData.avatar || '/temp/index/male.jpg'" /> -->
-              <author width="24px" height="24px" :avatar="detailData.avatar" :name="detailData.name" :sex="detailData.sex"></author>
+              <author width="24px" height="24px" :aid="detailData.aid" :avatar="detailData.avatar" :name="detailData.name" :sex="detailData.sex"></author>
               <!-- <author :avatar="detailData.avatar" :info="detailData.orgInfo" :name="detailData.name"></author> -->
               <time-show :time="detailData.sysCreateTime"></time-show>
             </div>
@@ -34,7 +33,7 @@
               <span class="answer-total">共计{{detailData.answers}}条回答</span>
               <interactBar :type="4" :comments="false" :data="detailData" :views="false"></interactBar>
             </div>
-          </el-card>
+          </div>
           <div  v-if="answerShow">
             <el-card :body-style="{ padding: '0px' }" style="padding: 20px;">
               <div>
@@ -152,53 +151,45 @@
               </div>
             </div>
           </div>
-        </el-row>
-         </div>
-         <div style="width: 245px;margin-left: 5px;">
-            <el-row>
-          <div class="qa-ranking" >
-             <div style="margin-bottom:15px;padding: 0">
-              <el-button style="height: 100%;height: 37px;border-radius: 0; width: 100%;" @click="$refs.addQuestion.askQuestionDialog = true" type="primary">提问题</el-button>
-            </div>
-            <div :span="24" style="padding:0">
-              <el-card class="ranking-card">
-                <div slot="header" >
-                  <span style="font-size: 14px;font-weight: 600;color: #333333;">贡献排行榜</span>
-                  <!-- <el-radio-group v-model="anking" size="mini" style="float: right">
-                    <el-radio-button label="年"></el-radio-button>
-                    <el-radio-button label="月"></el-radio-button>
-                    <el-radio-button label="日"></el-radio-button>
-                  </el-radio-group> -->
-                </div>
-                <div style="padding-bottom:10px">
 
-                  <el-row class="ranking-title  bacolor" v-for="(item, index) in ankingList" :key="index" >
-                    <el-col :span="6" style="height:34px;" >
-                      <img style="margin-top: 5px;" v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                      <img style="margin-top: 5px;" v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                      <img style="margin-top: 5px;" v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                      <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-                    </el-col>
-                    <!-- <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.name" placement="top-start"> -->
-                    <el-col :span="18" class="one-line-ellipsis"> {{ item.sysCreateUname }}</el-col>
-                    <!-- </el-tooltip> -->
-                    <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
-                  </el-row>
-                  <!-- <el-row class="ranking-title" v-for="(item, index) in ankingList" :key="index">
-                    <el-col :span="4" class="center">
-                      <img v-if="index === 0" :src="`${webBaseUrl}/images/first.png`" />
-                      <img v-if="index === 1" :src="`${webBaseUrl}/images/second.png`" />
-                      <img v-if="index === 2" :src="`${webBaseUrl}/images/third.png`" />
-                      <span v-if="index != 2 && index != 0 && index != 1">{{ index + 1 }}</span>
-                    </el-col>
-                    <el-col style="color: #333333;font-size: 14px;" :span="10">{{ item.sysCreateUname }}</el-col>
-                    <el-col style="text-align: right;color: #333333;font-size: 14px;" :span="10">{{ item.answers }}</el-col>
-                  </el-row> -->
-                </div>
-              </el-card>
-            </div>
+         </div>
+         <div style="width: 410px;">
+            <!-- <el-row> -->
+          <div class="qa-ranking" >
+            <div class="portal-model-btn" @click="$refs.addQuestion.askQuestionDialog = true">
+                    <svg-icon style="margin-right: 0;font-size: 24px;" icon-class="question-mark"></svg-icon>
+                    提问题
+                  </div>
+                    <div class="portal-right-box list-bg">
+                        <p class="portal-title-one" style="padding-bottom:12px">贡献榜</p>
+                        <ul>
+                        <li v-for="(item, index) in ankingList" :key="index" style="margin-top:30px">
+                        <span class="portal-right-text orange-one" v-if="index==0" style="margin-right:94px">
+                          <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
+                        </span>
+                        <span class="portal-right-text orange-tow" v-if="index==1" style="margin-right:94px">
+                            <img :src="`${webBaseUrl}/images/list02.png`" alt="">
+                        </span>
+                        <span class="portal-right-text orange-three" v-if="index==2" style="margin-right:94px">
+                            <img :src="`${webBaseUrl}/images/list03.png`" alt="">
+                        </span>
+                        <span class="portal-right-text" v-if="index==3" style="margin-right:94px">
+                             <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                        </span>
+                         <span class="portal-right-text" v-if="index==4" style="margin-right:94px">
+                             <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                        </span>
+                        <span class="portal-title-desc">{{ item.sysCreateUname }}</span>
+                   </li>
+                        </ul>
+                    </div>
+
+               <!-- <div class="course-resources"> -->
+                        资源位
+               <!-- <img :src="fileBaseUrl + resonimg.image" alt=""> -->
+              <!-- </div> -->
           </div>
-        </el-row>
+
          </div>
       </div>
       <addQuestion ref="addQuestion" @sure="toDetail"></addQuestion>
@@ -232,6 +223,7 @@ import apiUser from "@/api/system/user.js";
 import apiPraise from "@/api/modules/praises.js";
 import apiFavorites from "@/api/modules/favorites.js";
 import apiMessage from "@/api/system/message.js";
+import apiPlace from "@/api/phase2/place.js"
 export default {
   name: "answer",
   components: {
@@ -250,8 +242,11 @@ export default {
   },
   data() {
     return {
+      resonimg:{},
+      fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
       qaFormCheckedShow: false,
       checked: false,
+      authorSign:'',//提问人的个性签名
       // sex:null,
       moreState: 1,
       pageIndex: 1,
@@ -291,11 +286,21 @@ export default {
     this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
     window.addEventListener("scroll", this.handleScroll);
     this.getAnkingData();
+     this.couresreso();
   },
   beforeDestroy() {
     window.removeEventListener("scroll", this.handleScroll);
   },
   methods: {
+     couresreso(){
+      let key = 'qa';
+      apiPlace.detail(key).then(res=>{
+        console.log(res)
+        let lmj =  JSON.parse(res.result.content)
+        this.resonimg = lmj[0]
+        console.log(this.resonimg.image)
+      })
+    },
     handleScroll() {
       let innerHeight = document.querySelector("#answer-detail").clientHeight;
       let outerHeight = document.documentElement.clientHeight;
@@ -307,7 +312,7 @@ export default {
       }
       if (scrollTop > 400) {
         document.querySelector(".qa-ranking").style.cssText =
-          "position: fixed;top: 0;width:242.5px";
+          "position: fixed;top: 0;width:410px";
       } else {
         document.querySelector(".qa-ranking").style.cssText =
           "position: static";
@@ -733,6 +738,17 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.qa-banner{
+    height: 240px;
+    background: url('../../../../public/images/qa-banner.png');
+  }
+.course-resources{
+  // width: 410px;
+  img{
+    width: 100%;
+    height: 100%;
+  }
+}
 ::v-deep .checked-show{
   .el-dialog__header{
     padding:0;
diff --git a/src/views/portal/qa/Index.vue b/src/views/portal/qa/Index.vue
index 051d5788..f03f7e21 100644
--- a/src/views/portal/qa/Index.vue
+++ b/src/views/portal/qa/Index.vue
@@ -1,149 +1,121 @@
 <template>
   <div id="qa-list-content" class="qa-list-content">
-    <portal-header current="qa" @emitInput="emitInput"></portal-header>
-    <div class="xcontent portal-content">
+    <div class="qa-banner">
+      <portal-header current="qa" textColor="#000000" class="qa-nav" @emitInput="emitInput"></portal-header>
+    </div>
 
-      <div  class="xrow" style="display: flex;justify-content: space-between;">
-         <div  style="flex: 1;" class="xcol content-div">
-            <el-row>
-               <el-card :body-style="{ padding: '0px' }" class="left-div">
-            <el-row class="search-div">
-              <el-col>
-              <!-- <el-input placeholder="请输入关键词搜索" clearable v-model="queryKeyWord" maxlength="20">
-                <el-button slot="append" icon="el-icon-search" @click="search()"></el-button>
-              </el-input> -->
-              <!-- <div class="tip">
-                热门搜索词：
-                <span v-for="(item, index) in searchRecords" :key="index" @click="useHotword(item)">{{ item.keyword }}</span>
-              </div> -->
-              </el-col>
-            </el-row>
-            <el-row class="order-div">
-              <span class="quyer-tag">
-                  <el-button type="text" class="order-class" @click="orderFieldData('answers')" :class="{ actice: styleControl == 2 }">
-                  最热
-                </el-button>
-                <el-button type="text" class="order-class" @click="orderFieldData('')" :class="{ actice: styleControl == 1 }">
-                  最新
-                </el-button>
+    <div style="padding-top:30px" class="portal-content">
 
-                <!-- <el-checkbox-group> -->
-                <el-button type="text" @click="setEssence(queryConditions.isEssence)" class="order-class" :class="{ actice: styleControl == 3 }">精华问题</el-button>
-                <!-- </el-checkbox-group> -->
-              </span>
-              <!-- <span v-if="qaList.length > 0" style="padding-left:10px;">本次搜索出 {{ count }} 条结果</span> -->
-              <span class="quyer-tag">
-                <el-button type="text" class="order-class" @click="isResolveData(null)" :class="{ actice: queryConditions.isResolve === null }">
-                  全部
-                </el-button>
-                <el-button type="text" class="order-class" @click="isResolveData(false)" :class="{ actice: queryConditions.isResolve === false }">
-                  待解决
-                </el-button>
-                <!-- <el-checkbox-group> -->
-                <el-button type="text" @click="isResolveData(true)" class="order-class" :class="{ actice: queryConditions.isResolve===true }">已解决</el-button>
-                <!-- <el-radio-group style="margin-right: 10px;" v-model="queryConditions.isResolve" @change="getQaData(1)">
-                  <el-radio-button :label="null" border>全部</el-radio-button>
-                  <el-radio-button :label="false" border>待解决</el-radio-button>
-                  <el-radio-button :label="true" border>已解决</el-radio-button>
-                </el-radio-group> -->
-              </span>
-            </el-row>
-            <div class="data-content" v-if="qaList.length > 0">
-              <div :span="24" v-for="(qa, qaidx) in qaList" :key="qaidx" class="qa-list">
-                <div class="qa-info-box">
-                  <div class="qa-info">
-                    <div class="qa-info-title" @click="jumpDetail(qa)">
-                      <div class="qa-title-text one-line-ellipsis">
-                        <span class="qa-basic qa-unSolve" v-if="qa.isResolve == false" @click="searchData()">【待解决】</span>
-                        <span class="qa-basic qa-solve" v-if="qa.isResolve == true" @click="searchData()">【已解决】</span>
-                        <span v-html="$keywordActiveShow(qa.title,queryKeyWord)"></span>
-                      </div>
-                      <div class="qa-info-date">
-                        <i class="el-icon-time"></i> {{qa.sysCreateTime.substring(0,10)}}
-                       <!-- <time-show :time="qa.sysCreateTime"></time-show> -->
-                      </div>
-                    </div>
-                    <div style="display: flex;">
-                        <div style="flex: 83%" class="qa-info-summary two-line-ellipsis" @click="jumpDetail(qa)" v-html="$keywordActiveShow(qa.content,queryKeyWord)"></div>
-                        <div style="flex: 17% ; cursor: pointer; text-align: right;cursor: pointer;" v-if="qa.images!==''" @click="jumpDetail(qa)">
-                          <img style="width: 156px;height: 105px;" :src="fileBaseUrl + qa.images" alt="">
+      <div  class="xcontent2">
+        <div  class="xcontent2-main" style="margin-right: 30px;background-color: #fff;">
+          <div>
+            <div class="left-div">
+              <div class="order-div">
+                <span class="quyer-tag">
+                    <el-button type="text" class="order-class" @click="orderFieldData('answers')" :class="{ actice: styleControl == 2 }">
+                    最热
+                  </el-button>
+                  <el-button type="text" class="order-class" @click="orderFieldData('')" :class="{ actice: styleControl == 1 }">
+                    最新
+                  </el-button>
+                  <el-button type="text" @click="setEssence(queryConditions.isEssence)" class="order-class" :class="{ actice: styleControl == 3 }">精华问题</el-button>
+                </span>
+                <span class="quyer-tag">
+                  <el-button type="text" class="order-class" @click="isResolveData(null)" :class="{ actice: queryConditions.isResolve === null }">
+                    全部
+                  </el-button>
+                  <el-button type="text" class="order-class" @click="isResolveData(false)" :class="{ actice: queryConditions.isResolve === false }">
+                    待解决
+                  </el-button>
+                  <el-button type="text" @click="isResolveData(true)" class="order-class" :class="{ actice: queryConditions.isResolve===true }">已解决</el-button>
+                </span>
+              </div>
+              <div class="data-content" v-if="qaList.length > 0">
+                <div :span="24" v-for="(qa, qaidx) in qaList" :key="qaidx" class="qa-list">
+                  <div class="qa-info-box">
+                    <div class="qa-info">
+                      <div class="qa-info-title" @click="jumpDetail(qa)">
+                        <div class="portal-title-tow one-line-ellipsis">
+                          <span class="qa-solve" v-if="qa.isResolve == false" @click="searchData()">【待解决】</span>
+                          <span class="qa-basic qa-unSolve" v-if="qa.isResolve == true" @click="searchData()">【已解决】</span>
+                          <span v-html="$keywordActiveShow(qa.title,queryKeyWord)"></span>
+                        </div>
+                        <div class="portal-time">
+                          <i class="el-icon-time" style="margin-right:4px"></i> {{qa.sysCreateTime}}
                         </div>
-                    </div>
-
-                    <div style="display: flex;justify-content:flex-start;">
-                      <div style="width: 120px;">
-                        <author :avatar="qa.authorInfo.avatar" :name="qa.authorInfo.name" :sex="qa.authorInfo.sex"></author>
-                        <!-- <author :avatar="qa.authorInfo.avatar" :name="qa.authorInfo.name" :info="qa.authorInfo.orgInfo"></author> -->
                       </div>
-                      <div><interactBar nodeWidth="60px" :readonly="true"  :type="4" :data="qa" @addAnswers="qaAnswer(qa)" :shares="true" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar></div>
-                      <!-- <div class="qa-info-re" @click="qaAnswer(qa)">快速回答</div> -->
+                      <div style="display: flex;justify-content:space-between;">
+                          <div class="qa-info-summary portal-summary-text" :class="qa.images==''? 'two-line-ellipsis':'four-line-ellipsis'" @click="jumpDetail(qa)" v-html="$keywordActiveShow(qa.content,queryKeyWord)">
+
+                          </div>
+                          <div style="cursor: pointer; text-align: right;cursor: pointer;" v-if="qa.images!==''" @click="jumpDetail(qa)">
+                            <img style="width: 156px;height: 105px;border-radius: 4px;margin-left: 18px;" :src="fileBaseUrl + qa.images" alt="">
+                          </div>
+                      </div>
+
+                      <div style="display: flex;justify-content:space-between;">
+                        <div style="width: 150px;">
+                          <author :avatar="qa.authorInfo.avatar" :name="qa.authorInfo.name" :sex="qa.authorInfo.sex"></author>
+                        </div>
+                        <div><interactBar nodeWidth="60px" :readonly="true"  :type="4" :data="qa" @addAnswers="qaAnswer(qa)" :shares="false" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar></div>
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
-            </div>
-            <div class="pagination-div">
-              <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
-              <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
-              <span class="pag-text-msg" v-else-if="moreState == 3 && !isSeach">没有更多数据了</span>
-               <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span>
-            </div>
-            <div v-if="isSeach" style="height:382px">
-
-            </div>
-          </el-card>
-            </el-row>
-         </div>
-         <div style="width: 245px;margin-left: 5px;">
-            <div>
-                 <div  style="padding:0" id="qa-fixd">
-            <div style="margin-bottom:15px;padding: 0">
-             <el-button style="height: 100%;height: 37px;border-radius: 0;" class="add-btn" @click="$refs.addQuestion.askQuestionDialog = true" type="primary">提问题</el-button>
-            </div>
-            <el-card class="ranking-card">
-              <div slot="header">
-                <span style="font-size: 14px;font-weight: 600;color: #333333;">贡献排行榜</span>
-                <!-- <el-radio-group v-model="anking" size="mini" style="float: right">
-                  <el-radio-button label="年"></el-radio-button>
-                  <el-radio-button label="月"></el-radio-button>
-                  <el-radio-button label="日"></el-radio-button>
-                </el-radio-group> -->
+              <div class="pagination-div">
+                <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
+                <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
+                <span class="pag-text-msg" v-else-if="moreState == 3 && !isSeach">没有更多数据了</span>
+                 <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span>
               </div>
-              <div style="padding-bottom:10px">
-                <!-- <el-row class="ranking-title"> -->
-                  <!-- <el-col :offset="4" :span="10" style="color: #333333;font-size: 14px;">姓名</el-col>
-                  <el-col :span="10" style="text-align: right;color: #333333;font-size: 14px;">贡献度</el-col> -->
-                <!-- </el-row> -->
-                <el-row class="ranking-title  bacolor" v-for="(item, index) in ankingList" :key="index" >
-                  <el-col :span="6" style="height:34px">
-                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
-                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
-                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
-                  </el-col>
-                  <!-- <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.name" placement="top-start"> -->
-                  <el-col :span="18" class="one-line-ellipsis"> {{ item.sysCreateUname }}</el-col>
-                  <!-- </el-tooltip> -->
-                  <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
-                </el-row>
+              <div v-if="isSeach" style="height:382px">
 
-                <!-- <el-row class="ranking-title" v-for="(item, index) in ankingList" :key="index">
-                  <el-col :span="4" class="center">
-                    <img v-if="index === 0" :src="`${webBaseUrl}/images/first.png`" />
-                    <img v-if="index === 1" :src="`${webBaseUrl}/images/second.png`" />
-                    <img v-if="index === 2" :src="`${webBaseUrl}/images/third.png`" />
-                    <span v-if="index != 2 && index != 0 && index != 1">{{ index + 1 }}</span>
-                  </el-col>
-                  <el-col style="color: #333333;font-size: 14px;" :span="10">{{ item.sysCreateUname }}</el-col>
-                  <el-col style="text-align: right;color: #333333;font-size: 14px;" :span="10">{{ item.answers }}</el-col>
-                </el-row> -->
               </div>
-            </el-card>
+            </div>
           </div>
-            </div>
+         </div>
+         <div class="xcontent2-minor">
+            <!-- <div> -->
+               <div class="portal-model-btn pointer" @click="$refs.addQuestion.askQuestionDialog = true">
+                    <svg-icon style="margin-right: 0;font-size: 24px;" icon-class="question-mark"></svg-icon>
+                    提问题
+                  </div>
+              <div  style="padding:0" id="qa-fixd">
+                 
+                    <div class="portal-ranking ranking-bg">
+                        <p class="ranking-title">贡献榜</p>
+                        <ul class="ranking-data">
+                          <li  class="index-one-line-ellipsis" v-for="(item, index) in ankingList" :key="index" style="margin-top:30px;line-height: 22px;cursor: pointer;">
+                        <span class="portal-right-text orange-one" v-if="index==0" style="margin-right:20px">
+                          <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
+                        </span>
+                        <span class="portal-right-text orange-tow" v-if="index==1" style="margin-right:20px">
+                            <img :src="`${webBaseUrl}/images/listblue02.png`" alt="">
+                        </span>
+                        <span class="portal-right-text orange-three" v-if="index==2" style="margin-right:20px">
+                            <img :src="`${webBaseUrl}/images/listblue03.png`" alt="">
+                        </span>
+                        <span class="portal-right-text" v-if="index==3" style="margin-right:20px">
+                             <img :src="`${webBaseUrl}/images/list04.png`" alt="">
+                        </span>
+                         <span class="portal-right-text" v-if="index==4" style="margin-right:20px">
+                             <img :src="`${webBaseUrl}/images/list05.png`" alt="">
+                        </span>
+                        <span class="portal-title-desc">{{ item.sysCreateUname }}<span class="orinfo-text">{{ item.orinfo }}</span> </span>
+                        </li>
+                        </ul>
+                    </div>
+                      <!-- <div class="course-resources pointer"> -->
+                        <!-- 资源位 -->
+                        <!-- <img @click="banJump()" :src="fileBaseUrl + resonimg.image" alt=""> -->
+                      <!-- </div> -->
+                  </div>
+            <!-- </div> -->
+
+
          </div>
       </div>
-
       <addQuestion ref="addQuestion" @sure="getQaData(true)"></addQuestion>
     </div>
     <!-- :before-close="handleClose" -->
@@ -174,6 +146,8 @@ import addQuestion from '@/components/Qa/addQuestion.vue';
 import apiQa from '@/api/modules/qa.js';
 import apiUser from '@/api/system/user.js';
 import apiSearchterm from '@/api/modules/searchterm.js';
+import apiPlace from "@/api/phase2/place.js"
+import {cutOrgNamePath} from "@/utils/tools.js";
 export default {
   name: 'qaindex',
   components: { portalHeader, portalFooter, portalFloatTools, WxEditor, addQuestion, author, interactBar, timeShow },
@@ -194,6 +168,8 @@ export default {
   // },
   data() {
     return {
+      ankIds:[],
+      resonimg:{},
       fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
       loading: false,
       answer:{
@@ -233,11 +209,24 @@ export default {
     this.getAnkingData();
     window.addEventListener("scroll", this.handleScroll);
     this.searchterm();
+    this.couresreso();
   },
   beforeDestroy(){
     window.removeEventListener("scroll",this.handleScroll);
   },
   methods: {
+    banJump() {
+      if(this.resonimg.JumpUrl) {
+        window.open(this.resonimg.JumpUrl);
+      }
+    },
+     couresreso(){
+      let key = 'qa';
+      apiPlace.detail(key).then(res=>{
+        let lmj =  JSON.parse(res.result.content)
+        this.resonimg = lmj[0]
+      })
+    },
    emitInput(val){
       this.queryKeyWord = val;
       this.isSeach =true;
@@ -271,7 +260,7 @@ export default {
           } else {
             this.loading = false;
             this.$message({
-              message: res.message,
+              message: "回答发布失败："+ res.message,
               type: 'error'
             });
           }
@@ -282,8 +271,10 @@ export default {
       this.dialogVisible = true;
     },
     handleScroll(){
+      let innerw = document.querySelector("#qa-fixd");
       let innerHeight = document.querySelector('#qa-list-content').clientHeight
       let outerHeight = document.documentElement.clientHeight
+      let outerWidth = innerw.clientWidth;
       let scrollTop = document.documentElement.scrollTop
       if ((outerHeight + scrollTop + 350) >= innerHeight) {
         if(this.moreState == 1) {
@@ -291,7 +282,7 @@ export default {
         }
       }
        if(scrollTop > 400) {
-          document.querySelector('#qa-fixd').style.cssText = "position: fixed;top: 0;width:242.5px";
+          document.querySelector('#qa-fixd').style.cssText = "position: fixed;top: 0px;width:"+outerWidth+"px";
         } else {
           document.querySelector('#qa-fixd').style.cssText = "position: static";
         }
@@ -376,7 +367,7 @@ export default {
         this.qaList=[];
         this.queryConditions.pageIndex=1;
       }
-      this.queryConditions.orderField=this.styleControl==1? 'id':'answers';
+      this.queryConditions.orderField=this.styleControl==1? 'sysCreateTime':'answers';
       this.moreState = 2;
       await apiQa
         .potallist(this.queryConditions)
@@ -435,9 +426,25 @@ export default {
       this.$router.push({ path: '/qa/answer', query: { id: data.id } });
     },
     getAnkingData() {
+      let $this=this;
       apiQa.queryList(5).then(res => {
         if (res.status == 200) {
-          this.ankingList = res.result;
+          let ids = [];
+          res.result.forEach(item =>{
+            item.orinfo='';
+            ids.push(item.sysCreateAid);
+          })
+          $this.ankingList = res.result;
+          apiUser.getByIds(ids).then(rs=>{
+              rs.result.forEach(u=>{
+                $this.ankingList.forEach((sub) => {
+                    if(sub.sysCreateAid==u.aid){
+                      sub.orinfo=cutOrgNamePath(u.orgInfo);
+                    }
+                })
+              })
+              // console.log(this.ankingList);
+          })
         }
       });
     }
@@ -446,8 +453,47 @@ export default {
 </script>
 
 <style scoped lang="scss">
-  ::v-deep .el-card__body{
-    padding: 0;
+.four-line-ellipsis{
+  display: -webkit-box;
+  // white-space:pre-wrap;
+  overflow: hidden;
+  line-height: 25px;
+  text-overflow:ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 4;
+  box-sizing: border-box;
+}
+
+::v-deep.el-input__inner {
+  background-color: #fff !important;
+}
+::v-deep .top-nav{
+  color: #333;
+}
+::v-deep .current-nav{
+  font-weight: 500 !important;
+  color: #387DF7 !important;
+}
+::v-deep .el-dropdown-link{
+  color: #333 !important;
+}
+::v-deep .nav-bottbor{
+  background: #387DF7 !important;
+}
+.course-resources{
+  margin-top: 26px;
+  img{
+    border-radius: 8px;
+    width: 100%;
+    height: 100%;
+  }
+}
+  .qa-banner{
+    height: 240px;
+    background: url('../../../../public/images/qa-banner.png');
+  }
+  .el-card{
+    border: none;
   }
   ::v-deep .bacolor:nth-child(odd){
     background-color: #fff;
@@ -512,34 +558,18 @@ export default {
 .left-div {
   .quyer-tag {
     .order-class{
-      padding:0px 12px;
-      color: #666666;
-      line-height: 32px;
-      background-color: #FFFFFF;
-      border: 1px solid #DDDDDD;
+      padding:4px 8px;
+      color: #6E7B84;
+      line-height: 20px;
       border-radius: 0px;
     }
-    // ::v-deep .el-button{
-    //   width: 52px!important;
-    //   height: 32px;
-    //   padding: 0;
-    // }
-    // .order-class {
-    //   color: #666666;
-    //   width: 80px;
-    //   // text-align: left;
-    //   border: 1px solid #dfdfdf;
-    //   // padding-left: 5px;
-    //   // padding-top: 5px;
-    //   // padding-bottom: 5px;
-    //   .el-icon--right {
-    //     margin-left: 0;
-    //   }
-    // }
+
     .actice {
       border: 0px;
-      background: #3e7fff;
+      background: #387DF7;
       color: #fff;
+      font-size: 14px;
+      border-radius: 4px;
     }
   }
   .more {
@@ -552,7 +582,8 @@ export default {
     padding: 10px 0;
   }
   .order-div {
-    padding: 0 20px;
+    margin-top: 50px;
+    padding: 0 40px;
     background-color: #fff;
     display: flex;
     .quyer-tag{
@@ -564,19 +595,25 @@ export default {
   }
   .data-content {
     background-color: #fff;
-    padding: 5px 10px;
+    padding: 5px 50px;
     min-height: 382px;
+    ::v-deep .interact-bar-btns{
+      .interact-bar-btn{
+        text-align: right;
+        min-width: 78px !important;
+      }
+    }
     .qa-list:last-child {
       border-bottom: none;
     }
     .qa-list {
       // margin: 5px 0;
-      padding: 20px 10px;
+      padding: 33px 0 ;
       // padding-bottom: 10px;
       // padding-left: 10px;
       padding-right: 0px;
       margin-right:10px;
-      border-bottom: 1px solid #E8E8E8;
+      border-bottom: 1px solid rgba(153, 153, 153,.2);
     }
     .qa-info-box {
       .qa-info {
@@ -608,11 +645,11 @@ export default {
         }
         .qa-info-summary {
           cursor: pointer;
-          line-height: 1.6;
-          margin: 12px 0 20px 0;
-          color: #121212;
-          height: 45px;
-          font-size: 15px;
+          line-height: 20px;
+          margin: 12px 0 27px 0;
+          // color: #121212;
+          // height: 45px;
+          // font-size: 15px;
           word-break: break-all;
         }
         .qa-info-tools {
diff --git a/src/views/portal/user/Message.vue b/src/views/portal/user/Message.vue
index 2ed97531..b9515691 100644
--- a/src/views/portal/user/Message.vue
+++ b/src/views/portal/user/Message.vue
@@ -1,15 +1,15 @@
 <template>
   <div>
-    <Remark>
+    <!-- <Remark>
       <ul>
         <li>个人觉得以单选框的形式展现应该是勾选条件而不是查询条件</li>
-      </ul>  
+      </ul>
     </Remark>
-    <portal-header :goSearch="10"></portal-header>
-    <div class="xcontent portal-content">
+    <portal-header :goSearch="10"></portal-header> -->
+    <div class=" portal-content">
       <div class="msg-nav">
         <div style="display: flex;align-items: center;">
-          <div><el-checkbox v-model="checkAll" :indeterminate="isIndeterminate">全选</el-checkbox></div>
+          <div><el-checkbox v-model="checkAll" :indeterminate="isIndeterminate">多选</el-checkbox></div>
           <!-- <el-radio-group style="padding-left: 20px;" @change="queryMessage(true)" v-model="queryData.isRead">
             <el-radio :label="null">全部</el-radio>
             <el-radio :label="false">未读</el-radio>
@@ -17,29 +17,55 @@
           </el-radio-group> -->
         </div>
         <div>
-          <!-- <el-button type="text" icon="el-icon-remove" @click="isReadChooseList">设置已读</el-button> -->
-          <el-button type="text" icon="el-icon-remove" @click="delChooseList">删除所选</el-button>
+          <el-button class="navbut" type="text" @click="isReadChooseList">设置已读</el-button>
+          <el-button class="navbut" type="text" @click="delChooseList">删除所选</el-button>
         </div>
       </div>
       <div style="background-color: #FFFFFF;min-height: 600px;">
-        <p v-if="data.length == 0" style="line-height:30px;text-align: center;">暂无消息</p>
-        <div class="msg-list" v-for="(item, index) in data" :key="index">
+        <p style="line-height:30px;text-align: center;">{{showMessage}}</p>
+
+
+        <!-- 临时增加，上线一段时间后删除   开始 -->
+        <div class="msg-list">
+          <a href="javascript:void(0);">
           <div class="msg-top">
             <div>
-              <span style="padding-right: 10px;"><el-checkbox v-model="item.checked" @change="setCheckAll"></el-checkbox></span>
-              <span v-if="!item.isRead" style="font-size:14px;padding:2px;border: 1px dotted #ff0000;color: #ff0000;margin-right: 5px">未读</span>
-              <span v-else style="font-size:14px;padding:2px;border: 1px dotted #1EA0FA;color: #1EA0FA;margin-right: 5px">已读</span>
-              <span>{{ item.title }}</span>
-              <!-- <span class="msg-time"></span> -->
+              <span style="padding-right: 10px;"><el-checkbox disabled></el-checkbox></span>
+              <span @click="showGuideDialog()">系统消息</span>
+            </div>
+          </div>
+          <div class="msg-body" @click="showGuideDialog()">
+            <div class="msg-body-content">新版本上线！点击此处查看功能介绍</div>
+          </div>
+          <div class="msg-time">2022-10-20 10:21:50</div>
+          </a>
+        </div>
+        <!-- 临时增加，上线一段时间后删除   结束 -->
+
+
+        <div  class="msg-list" v-for="(item, index) in data" :key="index">
+
+          <div class="msg-top">
+            <div>
+              <span style="padding-right: 10px;"><el-checkbox v-model="item.checked" @change="setCheckAll(item)"></el-checkbox></span>
+              <span v-if="!item.isRead" style="font-size:12px;padding:5px 7px; border-radius: 2px;background: #FF6562;color: #fff;margin-right: 5px">未读</span>
+              <span v-else style="font-size:14px;padding:5px 7px; background: #eee;  border-radius: 2px; color: #666666;margin-right: 5px">已读</span>
+              <a :href="returnRouter(item)">
+				<span>{{ item.title }}</span>
+			  </a>
             </div>
-            <div><el-button type="danger" size="small" @click="delItem(item)">删除</el-button></div>
           </div>
           <div class="msg-body">
-            <!-- {{ filterContent(item.content)[0] }}- -->
-            {{item.tip}}-
-            <a :href="returnRouter(item)">{{ item.content }}</a>
+			<a :href="returnRouter(item)">
+				<div class="msg-body-content" v-if="item.content">{{item.tip}}-{{ item.content }}</div>
+        <div class="msg-body-content" v-else>{{item.tip}}</div>
+			</a>
+            <div class="msg-body-but">
+                <el-button type="danger" plain   @click="delItem(item)">删除</el-button>
+            </div>
           </div>
           <div class="msg-time">{{ item.msgTime }}</div>
+
         </div>
       </div>
       <div style="text-align: center;margin-top: 50px" v-if="total > queryData.pageSize">
@@ -55,7 +81,8 @@
       </div>
       <!-- <div class="pagination-div" v-if="queryData.pageIndex < totalPages"><span class="pag-text" @click="loadMore()">加载更多</span></div> -->
     </div>
-    <portal-footer></portal-footer>
+    <!-- <portal-footer></portal-footer> -->
+    <guide-box ref="guide"></guide-box> <!-- 引导页 -->
   </div>
 </template>
 
@@ -63,10 +90,15 @@
 import { mapGetters } from 'vuex';
 import portalHeader from '@/components/PortalHeader.vue';
 import portalFooter from '@/components/PortalFooter.vue';
+import GuideBox from '@/components/Portal/guideBox.vue'
 import apiMessage from '@/api/system/message.js';
 export default {
   name: 'answer',
-  components: { portalHeader, portalFooter },
+  components: {
+    portalHeader,
+    portalFooter,
+    GuideBox
+  },
   computed: {
     ...mapGetters(['userInfo'])
   },
@@ -81,16 +113,18 @@ export default {
       checkAll: false,
       data: [],
       totalPages: '',
+      checkedIds:[],
       isIndeterminate: false,
-      url: ''
+      url: '',
+      showMessage:'暂无消息'
     };
   },
   mounted() {
     this.queryMessage(true);
-    this.isReadChooseList();
+    // this.isReadChooseList();
   },
   updated() {
-    this.isReadChooseList();
+    // this.isReadChooseList();
   },
   watch: {
     checkAll(newVal) {
@@ -104,6 +138,7 @@ export default {
   },
   methods: {
     queryMessage(flag) {
+      this.showMessage = '加载中...';
       if (flag) {
         this.data = [];
         this.checkAll = false;
@@ -121,6 +156,8 @@ export default {
             item.checked = false;
             this.data.push(item);
           });
+          if(this.total == 0){this.showMessage = '暂无消息';}
+          this.showMessage = this.total <= 0 ? '暂无消息' : '';
         } else {
           this.$message.error('获取数据失败');
         }
@@ -150,8 +187,14 @@ export default {
     //     console.log(this.data,"点击加载中最后一次添加操作的data数据")
     //   }
     // },
-    setCheckAll(e) {
-      let flag = !e;
+    setCheckAll(item) {
+      if(item.checked){
+        this.checkedIds.push(item.id);
+      }else{
+        let obj = this.checkedIds.indexOf(item.id);
+        this.checkedIds.splice(obj, 1)
+      }
+      let flag = !item.checked;
       let has = this.data.some(msg => {
         return msg.checked == flag;
       });
@@ -160,7 +203,7 @@ export default {
         this.isIndeterminate = true;
       } else {
         this.isIndeterminate = false;
-        this.checkAll = e;
+        this.checkAll = item.checked;
       }
     },
     //改变已读状态的操作
@@ -172,12 +215,25 @@ export default {
           ids.push(this.data[i].id);
         }
       }
-      if (ids.length !== 0) {
+      if(this.checkedIds.length>0){
+          apiMessage.updateIsRead(this.checkedIds).then(res => {
+          if (res.status == 200) {
+            this.$store.dispatch('refrashMsg');
+            this.queryMessage(true)
+          }
+        });
+        this.checkedIds = [];
+        return;
+      }
+
+      if(this.checkAll){
         apiMessage.updateIsRead(ids).then(res => {
           if (res.status == 200) {
             this.$store.dispatch('refrashMsg');
+            this.queryMessage(true)
           }
         });
+        return;
       }
     },
     delChooseList() {
@@ -222,20 +278,25 @@ export default {
     filterContent(content) {
       return content.split('-');
     },
+
+    // 弹出新功能引导页弹窗事件(临时)
+    showGuideDialog(){
+      this.$refs.guide.guideCollection = true;
+    },
+
+
     // 跳转详情事件11
     returnRouter(item) {
       if (item.refType == 2) {
         return this.webBaseUrl + '/article/detail?id=' + item.refId;
       } else if (item.refType == 4||item.refType == 5) {
         return this.webBaseUrl + '/qa/answer?id=' + item.refId;
-      } else if(item.refType == 3){
-        return this.webBaseUrl + '/case/detail?id=' + item.refId;
       } else {
-        if (item.conType == 10) {
-          return this.webBaseUrl + '/course/micro?id=' + item.refId;
-        } else if (item.conType == 20) {
+        // if (item.conType == 10) {
+        //   return this.webBaseUrl + '/course/micro?id=' + item.refId;
+        // } else if (item.conType == 20) {
           return this.webBaseUrl + '/course/detail?id=' + item.refId;
-        }
+        // }
       }
     }
   }
@@ -243,9 +304,19 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.navbut{
+  width: 110px;
+  height: 30px;
+  border-radius: 2px;
+  margin-left: 25px;
+  text-align: center;
+  border: 1px solid #0078FC;
+  padding: 0;
+  color: #0078FC ;
+}
 .msg-nav {
   display: flex;
-  justify-content: space-between;
+  // justify-content: space-between;
   border-bottom: 1px solid #f5f5f5;
   line-height: 40px;
   background-color: #ffffff;
@@ -266,11 +337,37 @@ export default {
     line-height: 30px;
   }
   .msg-body {
-    word-break:break-all;
     padding: 10px 10px 10px 25px;
-    color: #727272;
-    a:hover {
-      color: #409eff;
+    display: flex;
+    width: 100%;
+    .msg-body-content{
+      flex: 1;
+      word-break:break-all;
+      color: #727272;
+      a:hover {
+        color: #409eff;
+      }
+    }
+    .msg-body-but{
+      margin-left: auto;
+
+      button{
+         width: 88px;
+         height: 32px;
+         background-color: #fff;
+         border-radius: 16px;
+         padding: 0;
+         color: #F52F3E;
+         line-height: 32px;
+         text-align: center;
+         border: 1px solid #F52F3E;
+      }
+      button:hover{
+         background-color: rgba(255,101,98,0.13);
+         color: #F52F3E;
+
+
+      }
     }
   }
   .msg-time {
diff --git a/src/views/qa/ManageList.vue b/src/views/qa/ManageList.vue
index fda89e3b..43d6ed53 100644
--- a/src/views/qa/ManageList.vue
+++ b/src/views/qa/ManageList.vue
@@ -39,7 +39,7 @@
         <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-search" @click="getQaList" type="primary" >搜索</el-button></div>
           <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button></div> -->
         <div style="display: flex;justify-content: flex-start;align-items: center;">
-         
+
           <el-button style="margin-left:0px" type="success" @click="setEssence('set')" >设置精华</el-button>
           <el-button type="warning" @click="setEssence('cancel')" >取消精华</el-button>
          <div style="padding-left:10px"><el-checkbox v-model="queryObj.isEssence" @change="isEssenceChange()">精华问题</el-checkbox></div>
@@ -131,8 +131,12 @@
 
 <script>
 import apiQa from '@/api/modules/qa.js';
+import { mapGetters } from 'vuex';
 export default {
   name: 'articleItems',
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
   data() {
     return {
     getRowKeys(row) {
@@ -204,18 +208,27 @@ export default {
     //接口删除问答单条数据
     delQaList(data) {
       const { id } = data;
-      apiQa
-        .del(id)
-        .then(res => {
+      apiQa.del(id).then(res => {
           if (res.status == 200) {
+            this.$message({ type: 'success',  message: '删除成功' });
+            let event = {
+              key: "QuestionDelete",//被管理员删除
+              title: '被管理员删除问题',//事件的标题
+              parameters:"author:"+data.sysCreateAid,//用户自定义参数 name:value,name:value
+              content: '被管理员删除问题',//事件的内容
+              objId: data.id,//关联的id
+              objType: "3",//关联的类型
+              objInfo:data.title,
+              aid: this.userInfo.aid, //当前登录人的id
+              aname: this.userInfo.name,//当前人的姓名
+              status: 1 //状态，直接写1
+            }
+            this.$store.dispatch("userTrigger", event);
             this.getQaList();
-            this.$message({
-              type: 'success',
-              message: '删除成功'
-            });
           }
         })
         .catch(err => {
+          console.log(err,'err');
           this.$message({
             type: 'error',
             message: '删除失败'
diff --git a/src/views/qa/MyList.vue b/src/views/qa/MyList.vue
index 6671abca..1b502e4c 100644
--- a/src/views/qa/MyList.vue
+++ b/src/views/qa/MyList.vue
@@ -1,31 +1,20 @@
 <template>
   <div>
-    <Remark>
-      1.我的问答，我发的问题列表信息
-      <br />
-      2.关于问题标题是否是必须的可以讨论下
-      <br />
-    </Remark>
     <div style="display: flex;justify-content: space-between;height: 40px;">
-      <!-- <div style="padding-top: 5px;"> -->
-      <!--
-        <el-tag type="primary" style="margin-right: 20px;">最新</el-tag>
-        <el-tag type="info">最热</el-tag>
-        -->
-      <!-- </div> -->
       <div>
         <div style="display: flex;justify-content:space-around;padding: 12px 22px 10px 18px;">
           <!--<div style="padding: 0px 5px;"><el-cascader clearable v-model="params.type" :options="typeList"></el-cascader></div>-->
+          <div class="uc-center-page" style="margin-right:30px">我的提问</div>
           <div style="padding: 0px 5px;">
-            <el-select v-model="queryObj.isResolve" style="width: 110px;" clearable placeholder="状态">
+            <el-select v-model="queryObj.isResolve" class="uc-select" clearable placeholder="状态">
               <el-option label="全部" value=""></el-option>
               <el-option label="待解决" :value="false"></el-option>
               <el-option label="已解决" :value="true"></el-option>
             </el-select>
           </div>
-          <div style="padding: 0px 5px;"><el-input clearable placeholder="搜索问题" v-model="queryObj.keyWord"></el-input></div>
-          <div style="padding: 0px 5px;"><el-button icon="el-icon-search" @click="getList" type="primary" >搜索</el-button></div>
-           <div style="padding-left:5px"><el-button type="primary" icon="el-icon-refresh-right" @click="reset">重置</el-button></div>
+          <div style="padding: 0px 6px;"><el-input class="uc-input" clearable placeholder="搜索问题" v-model="queryObj.keyWord"></el-input></div>
+          <div style="padding: 0px 6px;"><el-button icon="el-icon-search" class="search-btn" @click="getList" type="primary" >搜索</el-button></div>
+           <div style="padding-left:5px"><el-button type="primary" class="search-btn" icon="el-icon-refresh-right" @click="reset">重置</el-button></div>
         </div>
       </div>
       <div style="padding: 12px 32px 10px 32px;"><el-button type="primary" style="width: 89px;height: 38px;" icon="el-icon-plus" @click="$refs.addQuestion.askQuestionDialog = true" size="small">提问题</el-button></div>
@@ -46,9 +35,10 @@
         ></el-pagination>
       </div>
       <div v-else>
-          <div v-if="qaList.length == 0">
-              <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
-              <div v-else class="zan-wu">暂无数据</div>
+          <div v-if="qaList.length == 0" class="home-no-list">
+                <img class="img" style="width:360px;height:226px" :src="`${webBaseUrl}/images/homeWu/no-madel.png`" alt="" srcset="">
+                <p class="text"  v-if="isSearh" style="color: #333333;margin-top:50px;font-size: 14px">没有查询到相关内容</p>
+                <p class="text" v-else style="color: #333333;margin-top:50px;font-size: 14px">您还没有提问问题哦～</p>
           </div>
       </div>
     </div>
diff --git a/src/views/qa/MyReplys.vue b/src/views/qa/MyReplys.vue
index ae3992b1..fc0c76da 100644
--- a/src/views/qa/MyReplys.vue
+++ b/src/views/qa/MyReplys.vue
@@ -5,15 +5,9 @@
       <br />
     </Remark>
     <div style="display: flex;height: 40px;">
-      <div style="padding-top: 5px;">
-        <!--
-        <el-tag type="primary" style="margin-right: 20px;">最新</el-tag>
-        <el-tag type="info">最热</el-tag>
-        -->
-      </div>
       <div>
         <div style="display: flex;justify-content:space-around;padding: 12px 0px 10px 18px;">
-          <!--<div style="padding: 0px 5px;"><el-cascader clearable v-model="params.type" :options="typeList"></el-cascader></div>-->
+          <span class="title">我回答的</span>
           <div style="padding: 0px 5px;">
             <el-select v-model="queryObj.isResolve" placeholder="状态" style="width: 110px;" clearable>
               <el-option label="全部" value=""></el-option>
@@ -42,9 +36,10 @@
         ></el-pagination>
       </div>
       <div v-else>
-          <div v-if="qaList.length == 0">
+          <div v-if="qaList.length == 0" class="home-no-list">
+            <img class="img" style="width:360px;height:226px" :src="`${webBaseUrl}/images/homeWu/no-madel.png`" alt="" srcset=""/>
             <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
-            <div v-else class="zan-wu">暂无数据</div>
+            <div v-else class="zan-wu">您还没有回答问题哦～</div>
           </div>
       </div>
     </div>
@@ -84,6 +79,7 @@ export default {
     };
   },
   methods: {
+   
    getList() {
     this.queryObj.pageIndex = 1;
     this.isSearh = true;
@@ -96,8 +92,10 @@ export default {
         .then(res => {
           if (res.status == 200) {
             this.total = res.result.count;
-            res = res.result.list;
-            this.qaList = res;
+            res.result.list.forEach(item => {
+              item.isAll = false;
+            });
+            this.qaList = res.result.list;
           }
         })
         .catch(err => {
@@ -141,6 +139,13 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.title{
+  font-size: 18px;
+  color: #333333;
+  font-weight: 600;
+  line-height: 35px;
+  margin-right: 30px;
+}
 .uc-badge {
   margin-top: 10px;
   margin-right: 40px;
diff --git a/src/views/share/MyList.vue b/src/views/share/MyList.vue
index cf00df85..7c606c78 100644
--- a/src/views/share/MyList.vue
+++ b/src/views/share/MyList.vue
@@ -4,7 +4,8 @@
       
     </Remark>
     <div style="position: relative;" class="my-list">
-      <el-row :gutter="20">
+       <span class="title">我分享的</span>
+      <!-- <el-row :gutter="20">
         <el-col :span="4">
             <el-select v-model="isRead" clearable placeholder="状态" style="width:100%">
               <el-option label="全部" :value="null"></el-option>
@@ -19,13 +20,13 @@
           <el-button type="primary" icon="el-icon-search" @click="queryData" style="margin-right: 10px;padding: 10px 15px;">搜索</el-button>
           <el-button type="primary" @click="resData" icon="el-icon-refresh-right" style="padding: 10px 15px;">重置</el-button>
         </el-col>
-      </el-row>
+      </el-row> -->
 
     
-      <el-tabs  v-model="tabName" @tab-click="changeTab" style="margin-top:14px">
+      <!-- <el-tabs  v-model="tabName" @tab-click="changeTab" style="margin-top:14px"> -->
           <!-- 全部 -->
-       <el-tab-pane label="全部" name="all">
-          <div v-for="(item, index) in dataList.list">
+       <!-- <el-tab-pane label="全部" name="all"> -->
+          <div v-for="(item, index) in dataList.list" :key="index">
             <course-items type="myShare" v-if="item.type==1" :items="[item]" @confirm="confirm"></course-items>
             <case-items type="myShare" v-if="item.type==3" :items="[item]" @confirm="confirm" ></case-items>
             <article-items type="myShare" v-if="item.type==2" @confirm="confirm" :items="[item]"></article-items>
@@ -47,16 +48,19 @@
             <div v-else>
               <div v-if="dataList.list.length == 0">
                  <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
-                 <div v-else class="zan-wu">暂无数据</div>
+                 <div v-else class="zan-wu">
+                   <img :src="`${webBaseUrl}/images/nocouresimg.png`" alt="">
+                   <div>暂无数据</div>
+                </div>
               </div>
             </div>
-        </el-tab-pane>
+            
+        <!-- </el-tab-pane> -->
 
 
-        <el-tab-pane label="课程" name="course">
+        <!-- <el-tab-pane label="课程" name="course">
           <div style="min-height: 500px;">
             <course-items @confirm="confirm" type="myShare" :items="courseList.list"></course-items>
-            <!-- v-if="courseList.count>courseList.pageSize" -->
             <div v-if="courseList.list.length > 0" style="text-align: center;margin-top:57px">
               <el-pagination
               background
@@ -78,8 +82,8 @@
             </div>
        
           </div>
-        </el-tab-pane>
-        <el-tab-pane label="案例" name="case">
+        </el-tab-pane> -->
+        <!-- <el-tab-pane label="案例" name="case">
            <div style="min-height: 500px;">
             <case-items  @confirm="confirm" type="myShare" :items="caseList.list"></case-items>
             <div v-if="caseList.list.length > 0" style="text-align: center;margin-top:57px;">
@@ -101,11 +105,10 @@
                 </div>
               </div>
            </div>
-        </el-tab-pane>
-        <el-tab-pane label="文章" name="article">
+        </el-tab-pane> -->
+        <!-- <el-tab-pane label="文章" name="article">
            <div style="min-height: 500px;">
               <article-items @confirm="confirm" type="myShare" :items="articleList.list"></article-items>
-               <!-- v-if="articleList.count>articleList.pageSize" -->
               <div v-if="articleList.list.length > 0" style="text-align: center;margin-top:57px;">
                 <el-pagination
                   background
@@ -125,11 +128,10 @@
                 </div>
               </div>
            </div>
-        </el-tab-pane>
-        <el-tab-pane label="问答" name="qa">
+        </el-tab-pane> -->
+        <!-- <el-tab-pane label="问答" name="qa">
            <div>
               <qa-items @confirm="confirm" type="myShare" :items="qaList.list"></qa-items>
-              <!-- v-if="qaList.count>qaList.pageSize" -->
               <div v-if="qaList.list.length > 0" style="text-align: center;margin-top:57px;">
                 <el-pagination
                   background
@@ -149,8 +151,8 @@
                 </div>
               </div>
            </div>
-        </el-tab-pane>
-      </el-tabs>
+        </el-tab-pane> -->
+      <!-- </el-tabs> -->
   
       <!-- <div style="height: 100px;"></div> -->
     </div>
@@ -505,6 +507,11 @@
 </script>
 
 <style scoped lang="scss">
+.title{
+  font-size: 18px;
+  color: #333333;
+  font-weight: 600;
+}
 .el-col {
   padding: 0 0 0 10px !important;
 }
diff --git a/src/views/share/ToList.vue b/src/views/share/ToList.vue
index 1a720ce4..9c206570 100644
--- a/src/views/share/ToList.vue
+++ b/src/views/share/ToList.vue
@@ -2,7 +2,8 @@
   <div>
     <!-- 分享给我的 -->
     <div style="position: relative;padding: 12px 22px 32px;">
-      <el-row :gutter="20">
+      <span class="title">分享给我的</span>
+      <!-- <el-row :gutter="20">
         <el-col :span="4">
           <el-select v-model="isRead" clearable placeholder="状态" style="width:100%">
             <el-option label="全部" :value="null"></el-option>
@@ -15,10 +16,10 @@
           <el-button type="primary" icon="el-icon-search" @click="queryData" style="margin-right: 10px;padding: 10px 15px;">搜索</el-button>
           <el-button type="primary" @click="resData" icon="el-icon-refresh-right" style="padding: 10px 15px;">重置</el-button>
         </el-col>
-      </el-row>
-      <el-tabs v-model="tabName" @tab-click="changeTab" style="margin-top:14px">
+      </el-row> -->
+      <!-- <el-tabs v-model="tabName" @tab-click="changeTab" style="margin-top:14px"> -->
       <!-- 全部 -->
-       <el-tab-pane label="全部" name="all">
+       <!-- <el-tab-pane label="全部" name="all"> -->
           <div v-for="(item, index) in dataList.list">
             <course-items type="toMy" v-if="item.type==1" :items="[item]" @confirm="confirm"></course-items>
             <case-items type="toMy" v-if="item.type==3" :items="[item]" @confirm="confirm" ></case-items>
@@ -41,14 +42,16 @@
              <div v-else>
                 <div v-if="dataList.list.length == 0">
                   <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
-                  <div v-else class="zan-wu">暂无数据</div>
+                  <div v-else class="zan-wu">
+                      <img :src="`${webBaseUrl}/images/nocouresimg.png`" alt="">
+                   <div>暂无数据</div>
+                    </div>
                 </div>
               </div>
-        </el-tab-pane>
-        <el-tab-pane label="课程" name="course">
+        <!-- </el-tab-pane> -->
+        <!-- <el-tab-pane label="课程" name="course">
           <div style="min-height: 500px;">
             <course-items :keyword="keyword" type="toMy" @confirm="confirm" :items="courseList.list"></course-items>
-            <!-- v-if="courseList.count>courseList.pageSize" -->
             <div v-if="courseList.list.length > 0" style="text-align: center; margin-top:57px">
               <el-pagination
                 background
@@ -68,11 +71,10 @@
                 </div>
               </div>
           </div>
-        </el-tab-pane>
-        <el-tab-pane label="案例" name="case">
+        </el-tab-pane> -->
+        <!-- <el-tab-pane label="案例" name="case">
           <div style="min-height: 500px;">
             <case-items :keyword="keyword" type="toMy" @confirm="confirm" :items="caseList.list"></case-items>
-            <!-- v-if="articleList.count>articleList.pageSize" -->
             <div v-if="caseList.list.length > 0" style="text-align: center; margin-top:57px">
               <el-pagination
                 background
@@ -92,11 +94,10 @@
                 </div>
               </div>
           </div>
-        </el-tab-pane>
-        <el-tab-pane label="文章" name="article">
+        </el-tab-pane> -->
+        <!-- <el-tab-pane label="文章" name="article">
           <div style="min-height: 500px;">
             <article-items :keyword="keyword" type="toMy" @confirm="confirm" :items="articleList.list"></article-items>
-            <!-- v-if="articleList.count>articleList.pageSize" -->
             <div v-if="articleList.list.length > 0" style="text-align: center; margin-top:57px">
               <el-pagination
                 background
@@ -116,11 +117,10 @@
                 </div>
               </div>
           </div>
-        </el-tab-pane>
-        <el-tab-pane label="问答" name="qa">
+        </el-tab-pane> -->
+        <!-- <el-tab-pane label="问答" name="qa">
           <div style="min-height: 500px;">
             <qa-items :keyword="keyword" type="toMy" @confirm="confirm" :items="qaList.list"></qa-items>
-            <!-- v-if="qaList.count>qaList.pageSize" -->
             <div v-if="qaList.list.length > 0" style="text-align: center;margin-top:57px">
               <el-pagination
                 background
@@ -140,8 +140,8 @@
                 </div>
               </div>
           </div>
-        </el-tab-pane>
-      </el-tabs>
+        </el-tab-pane> -->
+      <!-- </el-tabs> -->
     </div>
   </div>
 </template>
@@ -476,6 +476,11 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.title{
+  font-size: 18px;
+  color: #333333;
+  font-weight: 600;
+}
 .el-col {
   padding: 0 0 0 10px !important;
 }
diff --git a/src/views/study/Courses.vue b/src/views/study/Courses.vue
index f18497c4..32a565e4 100644
--- a/src/views/study/Courses.vue
+++ b/src/views/study/Courses.vue
@@ -2,9 +2,10 @@
   <div>
     <div style="display: flex;justify-content:space-between; padding: 12px 32px 10px 22px;">
       <div style="display: flex;justify-content: flex-start;">
-        <div>
-          <el-select v-model="courseType" clearable placeholder="类型">
-            <el-option label="全部" value='1'></el-option>
+        <div class="uc-center-page">我的报名</div>
+        <div style="margin-left:32px">
+          <el-select v-model="courseType" class="uc-select" clearable placeholder="类型">
+            <el-option label="全部类型" value='1'></el-option>
             <!-- <el-option label="微课" :value="10"></el-option> -->
             <el-option label="录播课" :value="20"></el-option>
             <!-- <el-option label="在线课" value="online-course"></el-option> -->
@@ -14,41 +15,57 @@
             <el-option label="学习项目" :value="40"></el-option>
          </el-select>
         </div>
-        <el-select style="margin-left:10px" v-model="status" clearable placeholder="学习进度">
-          <el-option label="全部" value='0'></el-option>
+        <el-select style="margin-left:12px" class="uc-select" v-model="status" clearable placeholder="学习进度">
+          <el-option label="所有进度" value='0'></el-option>
           <el-option label="未开始" :value="1"></el-option>
           <el-option label="进行中" :value="2"></el-option>
           <el-option label="已完成" :value="9"></el-option>
           <!-- <el-option label="已停用" :value="3"></el-option> -->
         </el-select>
-        <div style="padding-left: 10px;"><el-input v-model="params.courseName" clearable placeholder="搜索名称"></el-input></div>
-        <div style="padding-left: 10px;"><el-button type="primary" icon="el-icon-search" @click="searchData()">搜索</el-button></div>
-        <div style="padding-left: 10px"><el-button type="primary" icon="el-icon-refresh-right" @click="reset()">重置</el-button></div>
+        <div style="padding-left: 12px;"><el-input class="uc-input" v-model="params.courseName" clearable placeholder="搜索名称"></el-input></div>
+        <div style="padding-left: 12px;"><el-button type="primary" class="search-btn" icon="el-icon-search" @click="searchData()">搜索</el-button></div>
+        <div style="padding-left: 12px"><el-button type="primary" class="search-btn" icon="el-icon-refresh-right" @click="reset()">重置</el-button></div>
       </div>
     </div>
   <div class="uc-list" v-loading="loading">
     <div class="uc-course" v-for="(item,idx) in pageChange" @click="jumpRouter(item)" :key="idx">
-      <div class="uc-course-img" style="width: 212px;height:119px">
+      <div class="uc-course-img" style="width: 260px;height:144px">
         <course-image :course="item"></course-image>
+        <div class="uc-type">
+          <span v-if="item.courseType==10">录播</span>
+          <span v-if="item.courseType==20">录播</span>
+          <span v-if="item.courseType==30">线下课</span>
+          <span v-if="item.courseType==40">学习项目</span>
+          </div>
       </div>
       <div class="uc-course-info">
         <div class="uc-course-name" style="cursor: pointer;">
-          <div>
-          <span v-if="item.courseType==10" class="uc-course-type2">录播</span>
-          <span v-if="item.courseType==20" class="uc-course-type2">录播</span>
-          <span v-if="item.courseType==30" class="uc-course-type3">线下课</span>
-          <span v-if="item.courseType==40" class="uc-course-type4">学习项目</span>
-          </div>
+          
          <div style="flex:1;">
            <a v-html="$keywordActiveShow(item.courseName,params.courseName)" class="uc-title two-line-ellipsis"></a>
          </div>
         </div>
-        <div style="width: 80%;margin-top:38px"><el-progress :percentage="item.progress"></el-progress></div>
-        <div class="uc-course-text">报名时间：{{item.addTime}}</div>
+        <div style="padding-top:6px" class="uc-course-text"><i class="el-icon-time" style="margin-right:4px"></i>报名时间：{{item.addTime}}</div>
+        <div style="width: 80%;margin-top: 20px;display: flex;">
+          <div style="color: #333333;font-size: 14px;">当前进度：</div>
+          <div style="width:170px;padding-top: 5px;">
+            <el-progress :percentage="item.progress" color="#FFA050"></el-progress>
+          </div>
+        </div>
       </div>
       <div class="uc-course-btns">
           <div style="text-align: right;">
-            <el-button class="del" @click.stop="delItem(item,idx)" type="text" icon="el-icon-delete" size="mini" title="删除"></el-button>
+            <!-- <el-button class="del" @click.stop="delItem(item,idx)" type="text" icon="el-icon-delete" size="mini" title="删除"></el-button> -->
+            <el-dropdown>
+               <span class="el-dropdown-link">
+                   <svg-icon style="margin-right: 0;font-size:26px;" icon-class="spot"></svg-icon>
+               </span>
+               <el-dropdown-menu slot="dropdown" class="dropdown-box">
+                   <el-dropdown-item command="a">
+                     <el-button class="del" @click.stop="delItem(item,idx)" type="text" icon="el-icon-delete" size="mini" title="删除"></el-button>
+                    </el-dropdown-item>
+               </el-dropdown-menu>
+           </el-dropdown>
           </div>
           <span  @click.stop="jumpRouter(item)">
             <el-button style="margin-top:30px" v-if="item.progress==0" type="primary" size="small">开始学习</el-button>
@@ -73,9 +90,12 @@
             <span v-if="dataList.length==0">正在加载数据...</span>
             <span v-else>查询中...</span>
         </div>
-        <div v-else >
-            <span v-if="dataList.length==0">当前列表无数据</span>
-            <span v-else-if="couresList.length==0" >未找到您要搜索的内容</span>
+        <div v-else class="home-no-list">
+            <!-- <span v-if="dataList.length==0">当前列表无数据</span>
+            <span v-else-if="couresList.length==0" >未找到您要搜索的内容</span> -->
+            <img v-if="dataList.length==0 || couresList.length==0" class="img" style="width:360px;height:226px" :src="`${webBaseUrl}/images/homeWu/no-madel.png`" alt="" srcset="">
+            <p v-if="dataList.length==0" class="text" style="color: #333333;margin-top:50px;font-size: 14px">您还没有报名课程哦～</p>
+            <p v-else-if="couresList.length==0" class="text" style="color: #333333;margin-top:50px;font-size: 14px">未找到您要搜索的内容</p>
         </div>
       </div>
   </div>
@@ -151,7 +171,7 @@ computed: {
             if(item.isOld){
                apiBoeCourse.delLearning(item.kid).then(res=>{
                   if(res.status==200){
-                     this.$message({ type: 'success', message: '删除成功!' });
+                     this.$message({ type: 'success',center: true, message: '课程删除成功!' });
                     this.couresList.forEach((ic,index)=>{
                        if(item.kid == ic.kid) {
                          this.couresList.splice(index,1);
@@ -292,16 +312,16 @@ computed: {
       if(item.isOld){
         location.href=`${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.courseType}`
       } else {
-           if(item.courseType==10){
-            this.$router.push({path:'/course/micro',query:{id:item.courseId}})
-        }
-        if(item.courseType==20){
+        //    if(item.courseType==10){
+        //     this.$router.push({path:'/course/micro',query:{id:item.courseId}})
+        // }
+        // if(item.courseType==20){
           if(item.progress>0 && item.progress<100) {
             this.$router.push({path:'/course/studyindex',query:{id:item.courseId}})
           } else {
             this.$router.push({path:'/course/detail',query:{id:item.courseId}})
           }
-        }
+        // }
       }
 
 
@@ -413,6 +433,7 @@ computed: {
     }
 .uc-list{
   padding-left: 22px;
+  margin-top: 30px;
 }
 .uc-course-type1{
   width: 58px;
@@ -467,22 +488,38 @@ computed: {
 .uc-course {
   display: flex;
   justify-content: space-around;
-  border-bottom: 1px solid #E8E8E8;
+  // border-bottom: 1px solid #E8E8E8;
   margin-right: 32px;
-  padding: 20px 0px 15px  0px ;
+  padding: 20px 0px 25px  0px ;
   cursor: pointer;
   .uc-course-img {
-    width: 200px;
-    img {
-      width: 200px;
-      border: 1px solid #f4f4f5;
+    position: relative;
+    width: 260px;
+   ::v-deep img {
+      // width: 200px;
+      // border: 1px solid #f4f4f5;
+      border-radius: 8px;
+    }
+    .uc-type{
+      position: absolute;
+      top: 0;
+      right:0;
+      width: 60px;
+      height: 24px;
+      line-height: 24px;
+      text-align: center;
+      background: #F99000;
+      border-radius: 2px 4px 2px 16px;
+      color: #fff;
+      font-size: 12px;
+      font-weight: 600;
     }
   }
   .uc-course-info {
     flex: 1;
     margin-top: -3px;
     line-height: 28px;
-    padding: 0px 10px;
+    padding: 0px 25px;
     .uc-course-name {
       display: flex;
       span{
@@ -491,7 +528,7 @@ computed: {
         margin-right: 8px;
       }
       font-size: 18px;
-      font-weight: 700;
+      font-weight: 600;
       color: #333;
     }
     .uc-course-text {
diff --git a/src/views/study/FinishCourses.vue b/src/views/study/FinishCourses.vue
index 4266123b..7127b780 100644
--- a/src/views/study/FinishCourses.vue
+++ b/src/views/study/FinishCourses.vue
@@ -95,14 +95,14 @@ export default {
       this.params.courseType = ''
     },
     jumpRouter(item) {
-      if (item.courseType == 10) {
-        let routeData = this.$router.resolve({path: "/course/micro?id=" + item.courseId});
-        window.open(this.webBaseUrl+routeData.href, "_blank");
-      }
-      if (item.courseType == 20) {
+      // if (item.courseType == 10) {
+      //   let routeData = this.$router.resolve({path: "/course/micro?id=" + item.courseId});
+      //   window.open(this.webBaseUrl+routeData.href, "_blank");
+      // }
+      // if (item.courseType == 20) {
         let routeData = this.$router.resolve({ path: "/course/detail?id=" + item.courseId}); // , query: {  id: 1 }
         window.open(this.webBaseUrl+routeData.href, "_blank");
-      }
+      // }
     },
     handleSizeChange(val) {
       this.page.pageSize = val;
diff --git a/src/views/study/PortalIndex.vue b/src/views/study/PortalIndex.vue
index c0019cac..5eda8a1e 100644
--- a/src/views/study/PortalIndex.vue
+++ b/src/views/study/PortalIndex.vue
@@ -292,7 +292,7 @@ export default {
       totalContent: 0, //课程内容数量
       pageCount: 0,
       currentPage: 0,
-      fileBaseUrl: this.$Constants.fileBaseUrl,
+      fileBaseUrl: this.$xpage.constants.fileBaseUrl,
       contentList: [],
       sectionList: [],
       teachers: [],
@@ -660,11 +660,11 @@ export default {
             }
           } else {
             this.$message.error('您还未报名');
-            if (this.courseInfo.type == 10) {
-              location.href = this.webBaseUrl + '/course/micro?id=' + this.courseId;
-            } else {
+            // if (this.courseInfo.type == 10) {
+            //   location.href = this.webBaseUrl + '/course/micro?id=' + this.courseId;
+            // } else {
               location.href = this.webBaseUrl + '/course/detail?id=' + this.courseId;
-            }
+            // }
           }
         } else {
           this.$message.error(res.message);
@@ -789,7 +789,7 @@ export default {
       //当前已经不再使用
       //console.log(e);
     },
-    showRes(r,i,index) {//i:子节下标，index:章下标
+    showRes(r,i,index) {    //i:子节下标，index:章下标
       if(i!=undefined && index!=undefined && r.status<9) {
         if(this.courseInfo.orderStudy) {
           //判断上个是否学完
@@ -1424,6 +1424,9 @@ export default {
       width: 68px !important;
       height: 68px !important;
       border-radius: 0px;
+       img{
+          width: 100% !important;
+        }
     }
     .teacher-text {
       width: 68px;
diff --git a/src/views/study/TaskList.vue b/src/views/study/TaskList.vue
index 15ef8eb5..d881cc39 100644
--- a/src/views/study/TaskList.vue
+++ b/src/views/study/TaskList.vue
@@ -136,18 +136,10 @@ export default {
           cmtask_name:this.params.cmtask_name,
         }
       this.loading=true;
-      let $this=this;
       apiBoeCourse.cmtaskList(params).then(res=>{
          if(res.status==200){
            this.total = res.result.count
            this.couresList = res.result.list;
-           //this.$store.commit('user/SET_StudyTaskCount',res.result.count);
-           //this.$store.dispatch('user/SetTaskCount',res.result.count);
-        
-           if(this.total==0){
-              //如果没有就跳转到其它页面
-              this.$router.push("/uc/study/courses")
-           }
          }else{
            this.$message.error('查询数据失败：'+res.message);
          }
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
new file mode 100644
index 00000000..760b7e50
--- /dev/null
+++ b/src/views/study/coursenew.vue
@@ -0,0 +1,2078 @@
+<template>
+  <div>
+    <div class="xpage-coures-banner">
+      <portal-header current="course" textColor="#fff" :goSearch="1"></portal-header>
+      <div style="margin: 0px 80px;">
+        <div class="banner-crumbs">
+          <router-link to="/course"><span class="crumbs-first">课程列表</span></router-link>
+          <span class="crumbs-line"> &gt; </span>
+          <span class="crumbs-last">课程详情</span>
+        </div>
+        <div class="bcourse-title">
+          <span>{{courseInfo.name}}</span>
+          <!-- <span>{{courseInfo.summary}}</span>  -->
+          <!--
+          <span class="bcourse-score" v-if="courseInfo.score>0">{{toScore(courseInfo.score)}} 分</span>
+          <span class="bcourse-score" v-else>无评分</span>
+          -->
+        </div>
+      </div>
+    </div>
+    <div class="course-content xcontent">
+      <div class="course-playbox" ref="coursePlayerBox" id="id_course_player_box">
+        <div class="course-player" ref="coursePlayer" id="id_course_player">
+          <div>
+            <div v-if="resType == null || resType == 0">
+              <!--先显示视频图片-->
+              <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
+            </div>
+            <div v-if="resType == 10" style="position: relative;">
+              <videoPlayer ref="myVideoPlayer" id="myVideoPlayer"  :src="blobUrl" @onPlayerPlaying="onPlayerPlaying"
+                :initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
+                :isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
+                @onPlayerEnded="onPlayerEnded"></videoPlayer>
+              <div class="player-box" v-if="playerBoxShow">
+                <div class="player-praise" style="cursor: pointer;">
+                  <div @click="praiseContent">
+                    <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
+                    <img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
+                    <!-- {{ courseInfo.praises }} -->
+                    <div style="color:#fff;cursor: pointer;">赞</div>
+                  </div>
+                  <div style="margin-left: 15px;cursor: pointer;" @click="treadContent">
+                    <img class="icon-small" v-if="isTrample"
+                      :src="require('@/assets/images/icon/trample-active.png')" />
+                    <img class="icon-small" v-else :src="require('@/assets/images/icon/cai.png')" />
+                    <!-- {{ courseInfo.trampleCount }} -->
+                    <div style="color:#fff;cursor: pointer;">踩</div>
+                  </div>
+                </div>
+                <div v-if="!scoreInfo.has" class="player-rate">
+
+                  <el-rate v-model="scoreInfo.score" text-color="#ff9900" score-template="{value}" void-color="#fff"  @change="addScore"></el-rate>
+                </div>
+                <div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
+                  <div class="player-rate" style="padding-left: 35px;">
+                    <el-rate disabled v-model="courseInfo.score" :allow-half="true"></el-rate>
+                  </div>
+                  <span class="score-text" style="margin-top:35px">
+                    <span style="color:#ffb30f;">{{ toScore(courseInfo.score) }}</span>
+                    <span style="font-size: 12px;color: #fff">分</span>
+                  </span>
+
+                </div>
+              </div>
+            </div>
+            <div v-if="resType == 20">
+              <div class="con-audio">
+                <div class="con-audio-title">{{ contentData.contentName }}</div>
+                <div class="con-audio-player">
+                  <audioPlayer v-if="resType == 20" :url="blobUrl" :name="contentData.contentName" @onPlaying="audioPlaying" :isDrag="curriculumData.isDrag"
+                    @onPlay="audioPlay" @onPause="audioPause" @onPlayEnd="audioEnd"></audioPlayer>
+                </div>
+              </div>
+            </div>
+            <div v-if="resType == 40">
+              <div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus < 2 && !contentData.content">
+                <div>此课程内容无法预览，请联系管理员</div>
+              </div>
+              <div style="padding: 10px;color: #ed0000;" v-if="curCFile.converStatus == 3 && !contentData.content">
+                此课程内容无法预览，请联系管理员
+              </div>
+              <pdfPreview :autoScroll="true" v-if="resType == 40" :filePath="fileBaseUrl + contentData.content">
+              </pdfPreview>
+            </div>
+            <div v-if="resType == 41">
+              <div style="padding: 20px;" v-html="contentData.content"></div>
+            </div>
+            <div v-if="resType == 52">
+              <div v-if="contentData.content != ''">
+                <div class="hyper-link" v-if="conLink.openType == 2">
+                  <div class="hyper-link-row">{{ contentData.contentName }}</div>
+                  <div class="hyper-link-row">{{ conLink.url }}</div>
+                </div>
+                <div v-if="conLink.openType == 1"><iframe :src="conLink.url"
+                    style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe></div>
+              </div>
+            </div>
+            <div v-if="resType == 60">
+              <homework v-if="resType == 60 && studyId != ''" :studyId="studyId" :content="contentData"></homework>
+            </div>
+            <div v-if="resType == 61">
+              <exam v-if="resType == 61 && studyId != '' " :studyId="studyId" :content="contentData"></exam>
+            </div>
+            <div v-if="resType == 62" style="padding:5px">
+              <assess v-if="resType == 62 && studyId != '' && contentData.id" :studyId="studyId" :content="contentData">
+              </assess>
+            </div>
+          </div>
+          <!--交互部分-->
+          <div>
+            <div class="course-interact">
+              <div class="score" style="display: flex;">
+                <div v-if="!scoreInfo.has" style="margin-left:10px;cursor: pointer;padding-top:18px">
+                  <!-- <el-popover placement="top" width="300" trigger="hover"> -->
+                    <!-- <div style="text-align:center;line-height:50px;padding:20px 0px">
+
+                      <div style="padding-top:30px"><el-button @click="addScore">提交评分</el-button></div>
+                    </div> -->
+                      <el-rate v-model="scoreInfo.score" @change="addScore"></el-rate>
+                    <!-- <el-tag class="ref-score" slot="reference">去评分</el-tag> -->
+                  <!-- </el-popover> -->
+                </div>
+                <div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
+                   <div style="padding-top: 16px;">
+                    <el-rate disabled v-model="courseInfo.score" :allow-half="true" ></el-rate>
+                  </div>
+                  <div>
+                        <span class="score-text">{{ toScore(courseInfo.score) }}</span>
+                        <span style="font-size: 18px;">分</span>
+                  </div>
+                </div>
+              </div>
+              <div style="display: flex;justify-content: flex-end;cursor: pointer;padding-top: 5px;">
+                <div @click="praiseContent">
+                  <el-tooltip class="item" effect="light" :content="isPraise?'取消点赞':'点赞'" placement="top-start" :visible-arrow="false" popper-class="text-tooltip">
+                    <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
+                    <img class="icon-small" v-else :src="require('@/assets/images/icon/praise.png')" />
+                  </el-tooltip>
+                  {{ courseInfo.praises }}
+                </div>
+                <div style="margin-left: 20px;" @click="treadContent">
+                 <el-tooltip class="item" effect="light" :content="isTrample?'取消踩':'踩'" placement="top-start" :visible-arrow="false" popper-class="text-tooltip">
+                  <img class="icon-small" v-if="isTrample" :src="require('@/assets/images/icon/trample-active.png')" />
+                  <img class="icon-small" v-else :src="require('@/assets/images/icon/trample.png')" />
+                 </el-tooltip>
+                  {{ courseInfo.trampleCount }}
+                </div>
+                <div style="margin-left: 6px;">
+                    <interactBar :size="16" :type="1" :aid="courseInfo.sysCreateAid" :data="courseInfo" :praises="false" :favorites="true" :shares="true" :comments="false" :views="false"></interactBar>
+                </div>
+              </div>
+            </div>
+
+          </div>
+        </div>
+        <div class="course-control">
+            <div class="control-tab" v-if="contentList.length>0" >
+              <div v-if="contentList.length>1" @click="heartabone" :class="tab == 1 ? 'control-tab-active' : ' '">
+                <i class="el-icon-reading" style="margin-right:9px;margin-left:9px"></i>课程单元
+              </div>
+              <div @click="heartabtwo" :class="tab == 2 ? 'control-tab-active' : ' '">
+                <i class="el-icon-edit" style="margin-right:9px;margin-left:9px"></i>我的笔记
+              </div>
+            </div>
+            <!-- 课程单元  -->
+            <div class="course-units" v-if="tab == 1">
+
+              <div :style="`height: ${controlHeight}px;overflow-y: auto;`">
+                <div class="catalog" v-if="courseInfo.type == 20">
+                  <div v-for="(item, index) in catalogTree" :key="index" :name="index">
+                    <div style="margin: 10px 0px;font-weight: 700;">{{item.section.name}}</div>
+                    <div class="units-info" :class="{'units-active':contentData.id == ele.id}"  v-for="(ele, i) in item.children" :key="i" @click="showRes(ele,i,index)">
+                      <img v-if="contentData.id == ele.id" :src="`${webBaseUrl}/images/playicon.png`" alt=""> {{i+1}}.
+                      <span>{{ ele.contentName }}</span>
+                    </div>
+                  </div>
+                </div>
+                <div v-else class="catalog">
+                  <!-- contentList -->
+                  <div class="units-info" v-for="(list, index) in contentList" :key="index" :name="index"  @click="showRes(list,-1,index)" :class="{'units-active':contentData.id == list.id}">
+                    <!-- <div class="units-info" :class="{'units-active':contentData.id == ele.id}" @click="showRes(ele,i,index)" v-for="(ele, i) in item.children" :key="i"> -->
+                    <img v-if="contentData.id == list.id" :src="`${webBaseUrl}/images/playicon.png`" alt=""> {{index+1}}.
+                    {{ list.contentName }}
+                    <!-- </div> -->
+                  </div>
+                </div>
+              </div>
+            </div>
+            <!-- 我的笔记 -->
+            <div class="mynote" v-show="tab == 2">
+              <my-note ref="mynote" :height="controlHeight" @change="noteChange" :data="courseInfo" @videoLocation="videoLocation" @onPlayVideo="onPlayVideo"
+                :score="courseInfo.score"></my-note>
+            </div>
+        </div>
+      </div>
+      <div class="course-infobox">
+        <div class="course-info">
+          <div style="background-color: #fff;">
+                <div class="course-info-tab">
+                  <div @click="coutab(1)" :class="courestab == 1? 'course-info-tab-active' : ''">课程介绍<span class=""></span> </div>
+                  <div @click="coutab(2)" :class="courestab == 2? 'course-info-tab-active' : ''">课程评论<span class=""></span> </div>
+                  <div @click="coutab(3)" :class="courestab == 3? 'course-info-tab-active' : ''">课程笔记<span class=""></span> </div>
+                </div>
+                <div v-show="courestab==1" style="margin-left:17px;padding-top: 20px;">
+                    <div style="padding: 30px;">
+                        <div class="course-info-row"><img src="@/assets/images/icon/remark-iocn.png" alt="" srcset=""> 目标人群：<div class="course-info-text">{{courseInfo.forUsers}}</div></div>
+                        <div class="course-info-row"><img src="@/assets/images/icon/remark-iocn.png" alt="" srcset=""> 课程价值：<div class="course-info-text">{{courseInfo.value}}</div></div>
+                        <div class="course-info-row"><img src="@/assets/images/icon/remark-iocn.png" alt="" srcset=""> 详细介绍：<div class="course-info-text"  v-html="courseInfo.summary"></div></div>
+                    </div>
+                </div>
+                <div v-show="courestab==2" class="coures-comments" style="margin-left:17px">
+                  <comments v-if="courseInfo.id && courseInfo.id != ''" :obj-type="1" :obj-id="courseInfo.id"  :toUsers="toUsers"></comments>
+                </div>
+                <div  v-show="courestab==3" class="coures-note">
+                  <note-comments  :key="timer" v-if="courseInfo.id && courseInfo.id != ''" :obj-type="6" :obj-id="courseInfo.id" :name="courseInfo.name"></note-comments>
+                </div>
+          </div>
+        </div>
+        <div class="course-teacher">
+          <div class="cteacher-top">
+              <div class="cteacher-top"><img width="100%" style="vertical-align: top;" height="10px" src="../../../public/images/tearch-top.png" alt=""></div>
+              <div class="cteacher-top-title">课程讲师</div>
+          </div>
+
+          <div class="cteacher-list">
+            <div class="teacher" v-for="(item, idx) in teachers" :key="idx">
+              <div class="teacher-avator" @click="toUserHome(item)" title="点击进入他的主页">
+                <!-- <div class="teacher-text" v-if="item.authorInfo.avatar == ''">{{userAvatarText(item.teacherName)}}</div> -->
+                 <div v-if="item.authorInfo.avatar !== ''">
+                    <el-avatar  :src="fileBaseUrl + item.authorInfo.avatar" shape="circle" :size="50"></el-avatar>
+                </div>
+                <div v-else class="teacher-text">
+                  <div v-if="item.authorInfo.sex === 1 "><img src="../../../public/images/Avatarman.png" alt=""></div>
+                  <div v-else><img src="../../../public/images/Avatarwoman.png" alt=""></div>
+                </div>
+              </div>
+              <div class="teacher-info">
+                <div class="teacher-name">
+                    <span> {{ item.teacherName }}</span>
+                    <span style="font-size: 12px; color:#666666 ;">( {{cutOrgNamePath(item.authorInfo.orgInfo)}} )</span>
+                </div>
+                <div class="teacher-remark" v-html="item.authorInfo.sign"></div>
+              </div>
+              <div  style="padding-top:15px;width:70px;">
+                <followButton :auto="true" size="small" :aid="item.teacherId"></followButton>
+              </div>
+            </div>
+          </div>
+
+        </div>
+      </div>
+    </div>
+    <!-- <div><portal-footer></portal-footer></div> -->
+  </div>
+</template>
+<script>
+  import { mapGetters } from 'vuex';
+  import followButton from "@/components/Follow/button.vue";
+  import portalHeader from "@/components/PortalHeader.vue";
+  import portalFooter from "@/components/PortalFooter.vue";
+  import comments from "@/components/Portal/comments.vue";
+  import noteComments from "@/components/Portal/noteComment.vue";
+  import interactBar from "@/components/Portal/interactBar.vue";
+  import audioPlayer from '@/components/AudioPlayer/index.vue';
+  import videoPlayer from '@/components/VideoPlayer/index.vue';
+  import hyperLink from '@/components/Course/hyperLink.vue';
+  import studyUtil from '@/utils/study.js';
+  import { encrypt } from '@/utils/jsencrypt.js';
+  import cookies from 'vue-cookies';
+  import apiStat from '@/api/phase2/stat.js';
+  import apiStudy from '@/api/modules/courseStudy.js';
+  import apiVideoStudy from "@/api/modules/videoStudy.js";
+  import apiCourseGrade from '@/api/modules/courseGrade.js';
+  import apiPraises from '@/api/modules/praises.js';
+  import apiTrample from '@/api/modules/trample.js';
+  import apiCoursePortal from '@/api/modules/coursePortal.js';
+  import apiUser from '@/api/system/user.js';
+  import apiCourseFile from '@/api/modules/courseFile.js';
+  import {
+    resListMap,
+    resOwnerListMap,
+    courseType,
+    getType,
+    toScore,
+    cutOrgNamePath,
+    userAvatarText
+  } from '@/utils/tools.js';
+  import pdfPreview from '@/components/PdfPreview/index.vue';
+  import courseImage from '@/components/Course/courseImage.vue';
+  import exam from '@/components/Course/exam';
+  import homework from '@/components/Course/homework';
+  import assess from '@/components/Course/assess';
+  import myNote from '../../components/Course/myNote.vue';
+  import apiFollow from "@/api/phase2/userfollow.js";
+  // import Vue from 'vue';
+  // Vue.forceUpdate();
+  export default {
+    name: "atticle",
+    components: {
+      courseImage,
+      portalHeader,
+      hyperLink,
+      comments,
+      homework,
+      exam,
+      interactBar,
+      assess,
+      pdfPreview,
+      audioPlayer,
+      videoPlayer,
+      myNote,
+      noteComments,
+      portalFooter,
+      followButton
+    },
+    data() {
+      return {
+        cutOrgNamePath,
+        loading:false,
+        controlHeight:400,//左边控制区域的内容高度
+        timer: '',
+        notePlay: null,
+        intTimeNote: '',
+        courestab: 2,//默认是课程评论
+        curCFile: {
+          converStatus: 4,
+        },
+        radio: '',
+        interactRuning: false,
+        playerBoxShow: false,
+        userAvatarText,
+        publicPath: process.env.VUE_APP_PUBLIC_PATH,
+        showiframe: false,
+        toScore,
+        courseId: '', //当前课程的id
+        studyId: '', //当前学习的id
+        initContentId: '', //初始化当前学习的内容节
+        blobUrl: '', //播放的文件地址，新添加，采用blob方式
+        contentData: {
+          studyItemId: '',
+          status: 1
+        }, //当前的显示的内容
+        conLink: {
+          openType: 1,
+          url: ''
+        }, //对于超连接的内容
+        curriculumData: {
+          url: '',
+          isDrag: true,
+          completeSetup: 0,
+          setupTage: 0,
+          second: 0
+        }, // 课件内容
+        courseInfo: {
+          id: '',
+          name: ''
+        }, //课程信息
+        totalContent: 0, //课程内容数量
+        pageCount: 0,
+        currentPage: 0,
+        fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
+        contentList: [],
+        sectionList: [],
+        teachers: [],
+        toUsers: [], //对于@教师的处理
+        getType: getType,
+        ctabName: 'catalog',
+        resType: null,
+        activeNames: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+        scoreInfo: {
+          dlgShow: false,
+          score: 5,
+          has: false
+        },
+        isPraise: false,
+        isTrample: false,
+        appendStartTime: null, //记录追加的开始时间
+        appendHandle: null, //追加学习时长的timeout句柄
+        isAppendTime: false, //是否追加学习时长
+        appentId: '', //当前追加的学习时长的id,此字段已经不再使用
+        appentInterval: 5000, //追加学习时间的间隔 5秒加一次
+        handleTimeout: null,
+        completed: [],
+        tab: 1,
+        notetab: 1,
+        localTimeKey:'boeu-study-time' ,//本地存储的学习时长的key   json格式
+        localTimeValue:0,//计算的时间
+        appendStudyOtherHandle:null,
+      }
+    },
+    mounted() {
+      this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
+      this.courseId = this.$route.query.id;
+      this.loadData();
+
+    },
+    computed: {
+      ...mapGetters(['userInfo']),
+      catalogTree(){
+        let treeList = [];
+        this.completed = [];
+        let $this = this;
+        $this.sectionList.forEach(sec => {
+          let treeNode = {
+            section: sec,
+            children: []
+          };
+          sec.status = 1;
+          let finishCount = 0;
+          $this.contentList.forEach(c => {
+            if (c.csectionId == sec.id) {
+              if (c.status > 1) {
+                sec.status = 2;
+                if (c.status == 9) {
+                  finishCount++;
+                }
+              }
+              if (c.status == 9) {
+                $this.completed.push(c.id);
+              }
+              treeNode.children.push(c);
+            }
+          });
+          if (finishCount == treeNode.children.length) {
+            sec.status = 9;
+          }
+          treeList.push(treeNode);
+        });
+        return treeList;
+      }
+    },
+    methods: {
+      toUserHome(tea){
+        this.$router.push({path:this.$xpage.getHomePath(tea.teacherId)})
+      },
+      noteChange(){
+	    //视频点定位，直接到播放的视频位置
+         this.timer = new Date().getTime()
+
+      },
+      //非音视频课学习时长的增加,每一分钟保存一次
+      appendStudyOtherTime() {
+        //console.log('开始追加学习时长',this.isAppendTime);
+        if (this.studyId == '') {
+          return;
+        }
+        if (!this.contentData.id) {
+          return;
+        }
+        let postData={
+            "key": "StudyCourseOther",//课程学习的key
+            "title": "非音视频课内容",//事件的标题
+            "parameters":"second:60",//second:value 本次的学习时长
+            "content": "学习课程",//事件的内容
+            "objId": this.courseInfo.id,//课程的id
+            "objType": "1",//类型
+            "source":"page",
+            "objInfo": ""+this.courseInfo.name,
+            "aid":this.userInfo.aid, //当前登录人的id
+            "aname":this.userInfo.name,//当前人的姓名
+            "status": 1 //状态
+          }
+          //静默处理
+          apiStat.sendEvent(postData).then(rs=>{
+              if(rs.status != 200) {
+                console.log(rs.message);
+              }
+          });
+          //每一分钟保存一次
+          let $this=this;
+          this.appendStudyOtherHandle = setTimeout(function() {
+            $this.appendStudyOtherTime();
+          }, 1000*60);
+
+      },
+      //笔记组件触发，播放指定时间
+      onPlayVideo(contentId,time){
+        //这里需要根据contentId,是否切换到对应的内容的视频的时间
+        //如果 contentId已经不存在，需要提示
+        console.log(contentId,this.contentData.id,'两个内容id');
+        let $this=this;
+        if(this.contentData.id==contentId){
+           this.onPlayerPause()
+           //this.audioPause();
+           this.contentData.lastStudyTime=time;
+           //this.onPlayerPlay();
+           setTimeout(() => {
+             $this.$refs.myVideoPlayer.startPlay(time);
+           }, 10)
+           console.log('开始播放1');
+        }else{
+           //通过contentId
+           let toResContent=null;
+            this.contentList.forEach(c => {
+              if(c.id==contentId){
+                 c.lastStudyTime=time;
+                 toResContent=c;
+              }
+            });
+            if(toResContent){
+
+              this.changePlayRes(toResContent);
+              //this.onPlayerPlay();
+              setTimeout(() => {
+                $this.$refs.myVideoPlayer.startPlay(time);
+              }, 10)
+
+              console.log('开始播放2');
+            }else{
+              this.$message.error('资源已不存在或更换过，已无法定位');
+            }
+        }
+        this.playerBoxShow = false;
+        //this.changePlayRes(r);
+        // this.playerBoxShow = false;
+        // this.notePlay = null;
+        // let $this=this;
+        // setTimeout(() => {
+        //   $this.notePlay = time;
+        // }, 500)
+      },
+      //笔记组件触发,记录当前播放时间
+      videoLocation() {
+        //this.$store.dispatch("SetIntTimeNote", this.intTimeNote);
+        //console.log(this.contentData.id+'='+this.intTimeNote,'设置视频播放时间')
+        this.$refs.mynote.setVideoTime(this.contentData.id,this.intTimeNote);
+      },
+      coutab(n) {
+        this.courestab =n;
+      },
+      createPlayUrl(fid, u) {
+        let nowDate = new Date();
+        let ctime = parseInt(nowDate.getTime() / 1000);
+        let beforeUrl = parseInt(nowDate.getTime() / 1000) + '/' + fid;
+        //console.log(beforeUrl,'beforeUrl');
+        let urlSign = encodeURIComponent(encrypt(beforeUrl));
+        //console.log(urlSign,'urlSign');
+        cookies.set('PLAYSIGN_TIME', ctime); //写客户端的cookie保存
+        //以下判断是为了区分本地环境和服务器环境
+        if (process.env.NODE_ENV == 'development') {
+          this.blobUrl = process.env.VUE_APP_FILE_BASE_URL + u;
+        } else {
+          this.blobUrl = process.env.VUE_APP_BASE_API + '/xboe/m/course/cware/resource?sign=' + urlSign;
+        }
+        //console.log(this.blobUrl,'this.blobUrl');
+      },
+      widthOpen(url) {
+        window.open(url, '_blank');
+      },
+      //替换播放区域
+      changePlayRes(r){
+
+        if(this.appendStudyOtherHandle!=null){
+          window.clearTimeout(this.appendStudyOtherHandle);
+        }
+        this.playerBoxShow = false;
+        //显示内容部分
+        this.$refs.mynote.showVideoTimeBtn(false);
+        let $this = this;
+        this.resType = r.contentType;
+        this.contentData = r;
+        this.contentData.name = this.courseInfo.name;
+        this.saveStudyDuration();
+
+        if (r.contentType == 10 || r.contentType == 20) {
+          if (r.content.startsWith('\{')) {
+            this.curriculumData = JSON.parse(r.content);
+          } else {
+            this.curriculumData.url = r.content;
+          }
+          this.$refs.mynote.showVideoTimeBtn(true);
+          //let url=process.env.VUE_APP_BASE_API+'/xboe/m/course/file/show?cf='+this.curriculumData.url;
+          //let url=this.fileBaseUrl+this.curriculumData.url;
+          this.createPlayUrl(r.contentRefId, this.curriculumData.url);
+        } else if (r.contentType == 40) {
+          // if (r.content != '' && r.content.indexOf('.pdf') == -1) {
+          apiCourseFile.detail(r.contentRefId).then(cfrs => {
+            if (cfrs.status == 200) {
+              r.content = cfrs.result.previewFilePath;
+              this.curCFile = cfrs.result;
+              if (cfrs.result.previewFilePath == '' && cfrs.result.filePath.indexOf('pdf') > -1) {
+                r.content = cfrs.result.filePath;
+                this.curCFile.converStatus = 2;
+              }
+              if (r.content && r.content.indexOf('.pdf') > -1) {
+                this.curCFile.converStatus = 2;
+              }
+            } else {
+              $this.$message.error('加载pdf课件文件失败');
+            }
+          });
+          // }
+        } else if (r.contentType == 52) {
+          this.isAppendTime = false;
+          if (r.content.startsWith('\{')) {
+            this.conLink = JSON.parse(r.content);
+          } else {
+            this.conLink.url = r.content;
+            this.conLink.openType = 1;
+          }
+          if (this.conLink.openType == 2) {
+            //直接设置完成状态
+            this.widthOpen(this.conLink.url);
+          }
+          //this.conLink=
+        } else if (r.contentType == 61) {
+          // 考试
+        } else if (r.contentType == 60) {
+          // 作业
+        } else if (r.contentType == 62) {
+          // 评估
+          //评估不需要查找，因为内容就是content中
+          //console.log('评估处理');
+        }
+        if (this.contentData.status < 2) {
+          this.contentData.status = 2; //进行中
+        }
+        if (this.contentData.contentType > 20) { //非视频类的
+         //用户的学习时长，非音视频课程学习,单独的处理
+          this.isAppendTime = false;
+
+          this.appendStudyOtherHandle = setTimeout(function() {
+            $this.appendStudyOtherTime();
+          }, 1000*60*2); //非音视频课程学习,2分钟后记录，因为一次记录是60秒
+          //this.appendStudyTime();
+          this.handleTimeout = setTimeout(function() {
+            $this.saveStudyInfo();
+          }, 5000); //5秒后记录学习完成
+        }
+
+
+        this.$nextTick(function(){
+            //let h0=document.getElementById('id_course_player').offsetHeight;
+            let h=$this.$refs.coursePlayer.offsetHeight;
+            //let h1=$this.$refs.coursePlayer.clientHeight;
+            ///console.log(h0,h,$this.controlHeight,'$this.controlHeight');
+            //解决获取高度不正的问题
+            if(h>400 && h<500){
+              h=h+40;
+            }else if(h>500){
+              h=h+60;
+            }
+            //$this.controlHeight=h-99;
+            $this.controlHeight=h-95;
+            //console.log(h,$this.controlHeight,'$this.controlHeight');
+        })
+      },
+      showRes(r, i, index) { //i:子节下标，index:章下标
+        if (i != undefined && i!=-1 && index != undefined && r.status < 9) {
+          if (this.courseInfo.orderStudy) {
+            //判断上个是否学完
+            if (i == 0) {
+              if (index > 0) { //第一章 第一节
+                let preCatalog = this.catalogTree[index - 1];
+                let last = preCatalog.children[preCatalog.children.length - 1];
+                if (last.status != 9) {
+                  this.$message.warning('请按顺序学习！');
+                  return;
+                }
+              }
+            } else {
+              let pre = this.catalogTree[index].children[i - 1];
+              if (pre.status != 9) {
+                this.$message.warning('请按顺序学习！');
+                return;
+              }
+            }
+            //判断是否是第一个未学完的
+            let isAllow = false;
+            let has = this.catalogTree.some(treeNode => {
+              let hasNo = treeNode.children.some(child => {
+                if (child.status < 9) {
+                  if (child.id == r.id) {
+                    isAllow = true;
+                  }
+                  return true;
+                } else {
+                  return false;
+                }
+
+              });
+              return hasNo;
+            });
+            if (has) {
+              if (!isAllow) {
+                this.$message.warning('请按顺序学习！');
+                return;
+              }
+            }
+          }
+        }
+        this.changePlayRes(r);
+      },
+      loadScorePraiseAndTrample() {
+        //加载是否请过分
+        apiCourseGrade.has(this.courseId).then(rs => {
+          if (rs.status == 200 && rs.result) {
+            this.scoreInfo.has = true;
+          }
+        });
+        apiPraises.has(1, this.courseId).then(rs => {
+          if (rs.status == 200 && rs.result) {
+            this.isPraise = true;
+          }
+        });
+        apiTrample.has(this.courseId).then(rs => {
+          if (rs.status == 200 && rs.result) {
+            this.isTrample = true;
+          }
+        });
+      },
+      addScore() {
+        let that = this;
+        let postData = {
+          courseId: this.courseInfo.id,
+          studyId: this.studyId,
+          score: this.scoreInfo.score
+        };
+        if (this.scoreInfo.score > 0) {
+          apiCourseGrade.grade(postData).then(rs => {
+            if (rs.status == 200) {
+              this.$message.success('打分成功，谢谢您的打分');
+              that.scoreInfo.has = true;
+              that.courseInfo.score = rs.result;
+              let event = {
+                key: "ScoreCourse", //后台的事件key  发布文章且审核通过
+                title: "完成课程评分", //事件的标题
+                parameters: "", //用户自定义参数 name:value,name:value
+                content: "给课程评分", //事件的内容
+                objId: this.courseInfo.id, //关联的id
+                objType: 1, //关联的类型
+                objInfo: this.courseInfo.name,
+                aid: this.userInfo.aid, //当前登录人的id
+                aname: this.userInfo.name, //当前人的姓名
+                status: 1 //状态，直接写1
+              }
+              this.$store.dispatch("userTrigger", event);
+
+            } else {
+              this.$message.error('打分处理失败，请稍后再试');
+            }
+          });
+        }
+      },
+      praiseContent() {
+        if(this.isTrample) {
+          this.$message.error('您已踩过了，不能再赞了');
+          return;
+        }
+        if(this.interactRuning) {
+          return;
+        }
+        this.interactRuning = true;
+        let postData = {
+          objType: 1,
+          objId: this.courseId,
+          title: this.courseInfo.name
+        };
+        if (this.isPraise) {
+          apiPraises.remove(1, this.courseInfo.id).then(res => {
+            this.interactRuning = false;
+            if (res.status == 200) {
+              this.$message.info('已取消点赞');
+              this.isPraise = false;
+              this.courseInfo.praises--;
+              let event = {
+                key: "CancelPraise",//点赞
+                title: "取消点赞",//事件的标题
+                parameters:"author:"+this.courseInfo.sysCreateAid,//用户自定义参数 name:value,name:value
+                content: "取消点赞课程",//事件的内容
+                objId: this.courseId,//关联的id
+                objType: "1",//关联的类型
+                objInfo: this.courseInfo.name,
+                aid: this.userInfo.aid, //当前登录人的id
+                aname: this.userInfo.name,//当前人的姓名
+                status: 1 //状态，直接写1
+              }
+              this.$store.dispatch("userTrigger", event);
+            } else {
+              this.$message.error('取消点赞失败,请稍后再试');
+            }
+          });
+        } else {
+          apiPraises.save(postData).then(rs => {
+            this.interactRuning = false;
+            if (rs.status == 200) {
+              this.$message.success('点赞成功');
+              this.isPraise = true;
+              this.courseInfo.praises++;
+              let event = {
+                key: "Praise",//点赞
+                title: "点赞",//事件的标题
+                parameters:"author:"+this.courseInfo.sysCreateAid,//用户自定义参数 name:value,name:value
+                content: "点赞了课程",//事件的内容
+                objId: this.courseId,//关联的id
+                objType: "1",//关联的类型
+                objInfo: this.courseInfo.name,
+                aid: this.userInfo.aid, //当前登录人的id
+                aname: this.userInfo.name,//当前人的姓名
+                status: 1 //状态，直接写1
+              }
+              this.$store.dispatch("userTrigger", event);
+            } else {
+              this.$message.error('点赞失败,请稍后再试');
+            }
+          });
+        }
+      },
+      treadContent() {
+        if (this.isPraise) {
+          this.$message.error('您已赞过了，不能再踩了');
+          return;
+        }
+        if (this.interactRuning) {
+          return;
+        }
+        this.interactRuning = true;
+        if (this.isTrample) {
+          apiTrample.remove(this.courseInfo.id).then(rs => {
+            this.interactRuning = false;
+            if (rs.status == 200) {
+              this.$message.info('已取消踩');
+              this.isTrample = false;
+              this.courseInfo.trampleCount--;
+            } else {
+              this.$message.error('取消失败,请稍后再试');
+            }
+          });
+        } else {
+          apiTrample.trample(this.courseInfo.id).then(rs => {
+            this.interactRuning = false;
+            if (rs.status == 200) {
+              this.$message.success('已踩');
+              this.isTrample = true;
+              this.courseInfo.trampleCount++;
+            } else {
+              this.$message.error('踩失败,请稍后再试');
+            }
+          });
+        }
+      },
+      statusToContent(status) {
+        let data = null;
+        switch (status) {
+          case 1: {
+            data = {
+              text: '未开始',
+              class: 'catalog-cell-state1'
+            };
+            break;
+          }
+          case 2: {
+            data = {
+              text: '进行中',
+              class: 'catalog-cell-state2'
+            };
+            break;
+          }
+          case 9: {
+            data = {
+              text: '已完成',
+              class: 'catalog-cell-state9'
+            };
+            break;
+          }
+          default: {
+            data = {
+              text: '未开始',
+              class: 'catalog-cell-state1'
+            };
+          }
+          break;
+        }
+        return data;
+      },
+      loadAuthorInfo(list, ids) {
+        //加载作者信息，头像，机构信息
+        if (ids.length == 0) {
+          return;
+        }
+        apiUser.getByIds(ids).then(res => {
+          if (res.status == 200) {
+            list.forEach((item, index) => {
+              res.result.some(author => {
+                if (author.aid == item.teacherId) {
+                  item.authorInfo = author;
+                  if(author.avatar){
+                    item.avatar=this.fileBaseUrl + author.avatar;
+                  }
+                  return true;
+                } else {
+                  return false;
+                }
+              });
+
+            });
+          } else {
+            //console.log('加载课程信息失败:'+res.error);
+            //this.$message.error(res.message);
+          }
+        });
+      },
+
+      onPlayerPlay() {
+        //console.log("开始播放");
+        this.playerBoxShow = false;
+        let $this = this;
+        //这里有些不准备，如果文件未能加载，这个事件就是错误的
+        this.isAppendTime=true;
+        this.appendStudyTime();//启动追加学习时长
+        //console.log(this.contentData.status,'this.contentData.status');
+        // if(this.contentData.status<9){
+        //   let completeType=this.curriculumData.completeSetup;
+        //   //console.log(completeType,'completeType');
+        //   if(completeType==0){
+        //     //默认5秒后学习完成.
+        //     $this.handleTimeout= setTimeout(function() {$this.saveStudyInfo();}, 5000); //5秒后记录学习完成
+        //   }else{
+        //     //先记录进行中的学习内容
+        //     this.saveStudyItem();
+        //   }
+        // }
+      },
+      onFullscreen(full) {
+        let divId = 'videowatermark';
+        var div = document.getElementById('myVideoPlayer')
+        if (full) {
+          var div3 = document.createElement("div");
+          div3.id = divId;
+          div3.setAttribute("class", "fullmark");
+          div3.innerHTML = '';
+          //从父组件传过来的水印内容
+          //div3.innerText =this.userInfo.name+this.userInfo.code;
+          for (var i = 0; i < 8; i++) {
+            div3.innerHTML +=
+              '<div style="color:#ffffff;width: 40%;height: 155px;padding-left:60px;padding-top:50px; display: flex;justify-content: center; transform: rotate(-36deg);font-size:20px;">' +
+              this.userInfo.name + this.userInfo.loginName + '</div>';
+          }
+          div3.style.cssText =
+            "position:absolute;pointer-events: none; width: 100%;height: 100%;top:0;left:0;bottom: 0;right: 0; display: flex;justify-content: center;flex-wrap: wrap;overflow: hidden; opacity:0.3;padding-top:10px";
+          div.appendChild(div3);
+        } else {
+          var markDiv = div.querySelector("#" + divId);
+          if (markDiv) {
+      	     div.removeChild(markDiv);
+          }
+        }
+      },
+      onPlayerPause() {
+        //console.log("暂停");
+        this.stopStudyTime();
+      },
+      onPlayerEnded() {
+        this.playerBoxShow = true;
+        this.stopStudyTime();
+        if(this.contentData.status < 9) {
+          this.finishStudyItem();
+        }
+      },
+      onPlayerPlaying(itme) {
+        this.isAppendTime = true;//可以追加学习时长
+        this.intTimeNote = parseInt(itme);
+        //console.log("当前播放"+itme);
+        //console.log("当前播放11"+itme);
+        if (this.contentData.contentType && this.contentData.contentType == 10) {
+          let intTime = parseInt(itme);
+          //判断是否完成
+          let completeType = this.curriculumData.completeSetup;
+          let completeSecond = this.curriculumData.second;
+          if (!completeSecond || completeType == 0) {
+            completeSecond = 5; //如果没有就采用默认的时间了
+          }
+          if (this.contentData.status < 9) { //因为1按进度，2按时长都是计算时间，所以这里直接大于0处理
+            if (completeType == 1) {
+              let finishPercent = this.curriculumData.setupTage;
+              let videDuration = this.contentData.duration;
+              let percent = intTime * 100 / videDuration;
+              if (percent >= finishPercent) {
+                this.finishStudyItem();
+              }
+            } else {
+              if (intTime >= completeSecond) {
+                this.finishStudyItem();
+              }
+            }
+          }
+          //下面是每隔10秒记录一下次
+          let saveTime = Math.floor(intTime % 10);
+          if (intTime > 10 && intTime != this.contentData.lastStudyTime && saveTime == 0 && this.contentData
+            .studyItemId != '') {
+            this.contentData.lastStudyTime = intTime;
+            let postData = {
+              itemId: this.contentData.studyItemId,
+              videoTime: intTime
+            };
+            //console.log('记录播放时间')
+            apiStudy.studyVideoTime(postData).then(rs => {
+              if (rs.status != 200) {
+                console.log('记录播放时间错误');
+              }
+            });
+          }
+        }
+      },
+      audioPlaying(item, currentTime) {
+        //console.log("当前播放"+item);
+        let intTime = parseInt(currentTime);
+        //判断是否完成
+        let completeType = this.curriculumData.completeSetup;
+        let completeSecond = this.curriculumData.second;
+        if (!completeSecond || completeType == 0) {
+          completeSecond = 5; //如果没有就采用默认的时间了
+        }
+        if (this.contentData.status < 9) { //因为1按进度，2按时长都是计算时间，所以这里直接大于0处理
+          if (completeType == 1) {
+            let finishPercent = this.curriculumData.setupTage;
+            let videDuration = this.contentData.duration;
+            let percent = intTime * 100 / videDuration;
+            if (percent >= finishPercent) {
+              this.finishStudyItem();
+            }
+          } else {
+            if (intTime >= completeSecond) {
+              this.finishStudyItem();
+            }
+          }
+        }
+        //下面是每隔10秒记录一下次
+        let saveTime = Math.floor(intTime % 10);
+        if (intTime > 10 && intTime != this.contentData.lastStudyTime && saveTime == 0 && this.contentData
+          .studyItemId) {
+          this.contentData.lastStudyTime = intTime;
+          let postData = {
+            itemId: this.contentData.studyItemId,
+            videoTime: intTime
+          };
+          //console.log('记录播放时间')
+          apiStudy.studyVideoTime(postData).then(rs => {
+            if (rs.status != 200) {
+              console.log('记录播放时间错误');
+            }
+          });
+        }
+      },
+      audioPlay() {
+        //console.log("开始播放");
+        let $this = this;
+        this.isAppendTime=true;
+        this.appendStudyTime();//启动追加学习时长
+      },
+      audioPause() {
+        //console.log("暂停");
+        this.stopStudyTime();//启动追加学习时长
+      },
+      audioEnd() {
+        //console.log("播放结束");
+        this.stopStudyTime();//启动追加学习时长
+        if (this.contentData.status < 9) {
+          this.finishStudyItem();
+        }
+      },
+      loadData() {
+        let $this=this;
+        apiStudy.studyIndex(this.courseId).then(rs => {
+          if (rs.status == 200) {
+            if(rs.result.contents.length==0){
+              $this.$message.error('课程内容已删除或课程已不再使用');
+              return;
+            }
+            if(!rs.result.course.enabled){
+              $this.$message.error('十分抱歉，此课程已停用，如需使用，请联系管理员。');
+              return;
+            }
+            //设置必须的字段
+            if(rs.result.contents.length==1){
+               $this.tab=2;
+               //console.log('内容只有一个');
+            }
+            if (rs.result.course.type == 20) { //有目录课程
+
+              rs.result.sections.forEach(sec => {
+                sec.status = 0; //加入状态表未开始
+                rs.result.contents.forEach(c => {
+                  c.status = 0; //初始化状态 ，未开始
+                  c.studyItemId = ''; //初始化字段，学习条目id
+                  c.lastStudyTime = 0; //初始化上次一学习的时间，作用于视频插放
+                });
+              });
+              this.sectionList = rs.result.sections;
+            }else if(rs.result.course.type==10){ //无目录课程
+              //如果是多个的话，就需要过滤一下
+              let indexNum=0;
+              let delIndexs=[];
+              rs.result.contents.forEach((c,cidx) => {
+                c.status = 0; //
+                c.studyItemId = '';
+                c.lastStudyTime = 0;
+                if(c.sortIndex==1){
+                  c.contentName=rs.result.course.name;
+                  indexNum++;
+                  if(indexNum>1){
+                    delIndexs.push(cidx);
+                  }
+                }else if(c.sortIndex==2){
+                  c.contentName='作业';
+                }else if(c.sortIndex==3){
+                  c.contentName='考试';
+                }else if(c.sortIndex==4){
+                  c.contentName='评估';
+                }
+              });
+              if(delIndexs.length>0){
+                delIndexs.forEach(delIdx=>{
+                  rs.result.contents.splice(delIdx,1);
+                })
+              }
+            }
+            this.courseInfo = rs.result.course;
+
+            if (rs.result.teachers && rs.result.teachers.length > 0) {
+              let userIds = [];
+              let ctoUsers = [];
+              rs.result.teachers.forEach(item => {
+                item.authorInfo = {
+                  aid: '',
+                  name: '',
+                  orgInfo: '',
+                  avatar: '',
+                  code: '',
+                  sex: null,
+                  sign:''
+                };
+                userIds.push(item.teacherId);
+                ctoUsers.push({
+                  aid: item.teacherId,
+                  name: item.teacherName
+                });
+              });
+              this.toUsers = ctoUsers;
+              this.loadAuthorInfo(rs.result.teachers, userIds);
+              this.teachers = rs.result.teachers;
+            }
+            this.contentList = rs.result.contents;
+            //处理内容的名称
+            this.totalContent = rs.result.contents.length;
+            //加载学习的数据
+            //this.loadStudyData();
+            this.loadStudyData(rs.result);
+
+          } else {
+            this.$message.error(rs.message);
+          }
+        });
+      },
+      loadStudyData(result) {
+        let $this=this;
+        this.loadScorePraiseAndTrample();
+        this.studyId = result.studyId;
+        //对已学习的内容进行比对，重要的字段， 学习内容id，在后缀的
+        let playIndex = -1;
+        this.contentList.forEach((con, conIdx) => {
+          result.contentStudys.forEach((scon, sconIdx) => {
+            if (scon.contentId == con.id) {
+              //定位显示的内容
+              if ($this.initContentId != '' && $this.initContentId == scon.contentId) {
+                //定位当前学习的内容，是上一次学习的内容
+                playIndex = conIdx;
+              } else {
+                if (sconIdx == 0 && con.contentType < 52) {
+                  playIndex = conIdx;
+                }
+              }
+              //console.log(scon.contentId,con.id);
+              con.lastStudyTime = scon.lastStudyTime;
+              //以下判断是为了兼容之前的问题，学习状态
+              if (scon.status) {
+                con.status = scon.status;
+              } else {
+                con.status = 9;
+              }
+              con.studyItemId = scon.id; //这个就是学习内容（条目）的id
+              //console.log(scon.id,"scon.id");
+              //console.log(con,"scon.id");
+            }
+          });
+        });
+
+        if (this.courseInfo.type == 10) {
+          ///console.log(this.contentList[0],'ccccc11111')
+          this.showRes(this.contentList[0]);
+        } else {
+          //如果没有，就定位第一项内容
+          if (playIndex === -1) {
+            // this.showRes(this.contentList[0]);
+            //console.log(this.catalogTree,'ccccc22222')
+            this.showRes(this.catalogTree[0].children[0])
+          } else {
+             //console.log(this.contentList[0],'ccccc3333')
+            this.showRes(this.contentList[playIndex]);
+          }
+        }
+      },
+      saveStudyInfo() {
+        //记录课件学习信息
+        if (this.contentData.contentType >= 60) {
+          //只有在课件页面停留超过5秒才会记录
+          return;
+        }
+        if (this.contentData.status == 9) {
+          //已学习完的，不用再添加
+          return;
+        }
+        let params = {
+          studyId: this.studyId, //学习id,
+          courseId: this.courseId, //课程id,
+          contentId: this.contentData.id, //内容id,
+          contentType: this.contentData.contentType,
+          contentName: this.contentData.contentName, //内容名称
+          progress: 100,
+          status: 9,
+          contentTotal: this.totalContent
+        };
+        apiStudy.studyContent(params).then(res => {
+          if (res.status == 200) {
+            this.contentData.status = 9; //完成
+            this.contentData.studyItemId = res.result; //学习记录id
+          } else {
+            console.log('记录学习失败:' + res.message + '，' + res.error);
+          }
+        });
+      },
+      saveStudyDuration(duration) { //保存本地存储的学习时长
+        if (duration > 0) {
+          //发送用户学习事件
+          //console.log('保存到后台学习时长='+duration);
+          let postData={
+              "key": "StudyCourse",//课程学习的key
+              "title": "学习课程",//事件的标题
+              "parameters":"second:"+duration,//second:value,total:value 本次的学习时长
+              "content": "学习课程【"+this.courseInfo.name+"】",//事件的内容
+              "objId": this.courseInfo.id,//课程的id
+              "objType": "1",//类型
+              "source":"page",
+              "objInfo": ""+this.courseInfo.name,
+              "aid":this.userInfo.aid, //当前登录人的id
+              "aname":this.userInfo.name,//当前人的姓名
+              "status": 1 //状态
+            }
+            //静默处理
+            apiStat.sendEvent(postData).then(rs=>{
+                if(rs.status == 200) {
+                  this.appendStartTime = new Date();//重新计时
+                  studyUtil.clearStudyDuration(); //清除本地存储
+                } else {
+                  console.log(rs.message);
+                }
+            });
+          // let postData = {
+          //   id: this.appentId,
+          //   studyId: this.studyId,
+          //   courseId: this.courseInfo.id,
+          //   contentId: this.contentData.id,
+          //   studyInfo: this.courseInfo.name +
+          //     "-" +
+          //     this.contentData.contentName,
+          //   duration: duration
+          // };
+          // apiStudy.appendStudyTime(postData).then(rs => {
+          //   if (rs.status == 200) {
+          //     this.appentId = rs.result;
+          //     studyUtil.clearStudyDuration(); //清除本地存储
+          //   } else {
+          //     console.log(rs.message);
+          //   }
+          // });
+        }
+      },
+      //结束追加学习时长
+      stopStudyTime(){
+          //console.log('停止追加学习时长');
+          this.isAppendTime=false;
+          if (this.appendHandle != null) {
+              window.clearTimeout(this.appendHandle);
+          }
+      },
+      //追加学习时长， flag是否提交到后台
+      appendStudyTime() {
+        //console.log('开始追加学习时长',this.isAppendTime);
+        if (this.studyId == '') {
+          return;
+        }
+        if (!this.contentData.id) {
+          return;
+        }
+        if (!this.isAppendTime) {
+          this.appendStartTime = null;
+          return;
+        }
+
+        if (this.appendHandle != null) {
+          window.clearTimeout(this.appendHandle);
+        }
+        //首先从本地读取
+        let duration = studyUtil.getStudyDuration();
+        //console.log('追加学习时长，当前本地积累的学习时长='+duration);
+        //追加学习长
+        let $this = this;
+        if (this.appendStartTime == null) {
+          this.appendStartTime = new Date();
+          this.appendHandle = setTimeout(function() {
+            $this.appendStudyTime();
+          }, $this.appentInterval); //设置定时追加学习时长
+          //保存之前的
+          if (duration >0 ) {
+            this.saveStudyDuration(duration);
+          }
+          return;
+        }
+        //如果当前追加开始时间不为空
+        let now = new Date();
+        let m = now.getTime() - this.appendStartTime.getTime(); //相差的毫秒数
+        let sen = parseInt(m / 1000); //计算秒数
+        duration = duration + $this.appentInterval/1000;//追加的是秒
+        if (sen>=60) { //一分钟保存一次
+          this.saveStudyDuration(duration);
+          // if (duration > 0) {
+          //   let postData = {
+          //     id: this.appentId,
+          //     studyId: this.studyId,
+          //     courseId: this.courseInfo.id,
+          //     contentId: this.contentData.id,
+          //     studyInfo: this.courseInfo.name +
+          //       "-" +
+          //       this.contentData.contentName,
+          //     duration: duration
+          //   };
+          //   apiStudy.appendStudyTime(postData).then(rs => {
+          //     if (rs.status == 200) {
+          //       $this.appentId = rs.result;
+          //       $this.appendStartTime = new Date(); //重置开始时间
+          //       studyUtil.clearStudyDuration(); //清除本地存储
+          //       //this.appendHandle=setTimeout(function() {$this.appendStudyTime();}, $this.appentInterval);
+          //     } else {
+          //       console.log(rs.message);
+          //     }
+          //   });
+          // }
+        } else {
+          studyUtil.setStudyDuration(duration); //添加到本地存储中
+        }
+        //启动下次追加学习时长
+        this.appendHandle = setTimeout(function() {
+          $this.appendStudyTime();
+        }, $this.appentInterval);
+      },
+
+      finishStudyItem() { //设置完成学习的内容,针对于音视频的内容
+        if (!this.contentData.studyItemId) {
+          //这种可能没有，不过这里也是为了万中那个1
+          this.saveStudyInfo();
+        } else {
+          let params = {
+            itemId: this.contentData.studyItemId,
+            studyId: this.studyId,
+            courseId: this.courseId,
+            cnum: this.totalContent
+          }
+          apiVideoStudy.finishStudyItem(params).then(res => {
+            if (res.status == 200) {
+              this.contentData.status = 9;
+              this.contentData.progress = 100;
+            } else {
+              console.log("记录完成学习失败:" + res.message + "，" + res.error);
+            }
+          });
+        }
+      },
+
+      saveStudyItem() { //先保存学习的内容,针对于音视频的内容
+        if (this.contentData.studyItemId) {
+          return; //已经有记录的，不需要再保存了
+        }
+        let params = {
+          studyId: this.studyId, //学习id,
+          courseId: this.courseId, //课程id,
+          contentId: this.contentData.id, //内容id,
+          contentType: this.contentData.contentType, //内容id,
+          contentName: this.contentData.contentName, //内容名称
+          progress: 0,
+          lastStudyTime: 0,
+          status: 2,
+          studyDuration: 0,
+          contentTotal: this.totalContent
+        };
+        apiVideoStudy.saveStudyItem(params).then(res => {
+          if (res.status == 200) {
+            this.contentData.studyItemId = res.result.id;
+            this.contentData.status = 2; //进行中状态
+          } else {
+            console.log("记录学习失败:" + res.message + "，" + res.error);
+          }
+        });
+      },
+      formatTime(duration) {
+        let min = 0;
+        if (duration > 0) {
+          min = parseInt(duration / 60);
+        }
+        return min;
+      },
+      heartabone() {
+        this.tab = 1
+      },
+      heartabtwo() {
+        this.tab = 2
+      }
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+
+  //内容块样式定义
+  .course-content {
+    min-height: 745px;
+
+    margin: 20px auto;
+    .course-playbox {
+      background-color: #fff;
+      min-height: 400px;
+      display: flex;
+      justify-content: space-between;
+      .course-player{ //内容播放区域
+        flex:1;
+        min-width: 700px;
+        min-height: 400px;
+        max-height: 800px;
+        height: 100%;
+        border: 1px solid #ffffff;
+        padding-right: 20px;
+        overflow: auto;
+      }
+      .course-control{ //内容控制区域
+         width: 420px;
+      }
+    }
+    .course-infobox {
+      margin-top: 20px;
+      display: flex;
+      justify-content: space-between;
+      .course-info {
+        flex:1;
+        min-width: 700px;
+
+        min-height: 710px;
+        box-sizing: border-box;
+        padding-right: 20px;
+      }
+      .course-teacher{
+        width: 420px;
+      }
+    }
+  }
+
+  .control-tab {
+    margin: 35px 30px 10px 30px;
+
+    border-bottom: 1px solid #D8D8D8;
+    display: flex;
+    justify-content: space-around;
+    padding-bottom: 12px;
+    div {
+      color: #666666;
+      cursor: pointer;
+    }
+    .control-tab-active {
+      color: #333333;
+      font-weight: 600;
+    }
+  }
+
+  .course-info-tab {
+    display: flex;
+    padding-top: 30px;
+    margin-left: 47px;
+    div {
+      color: #333333;
+      font-size: 16px;
+      cursor: pointer;
+      margin-right: 50px;
+    }
+
+    .course-info-tab-active {
+      color: #333333;
+      font-weight: 600;
+      position: relative;
+      span {
+        display: inline-block;
+        width: 69px;
+        height: 4px;
+        background: #387DF7;
+        border-radius: 5px;
+        position: absolute;
+        left: 0;
+        top: 128%;
+      }
+
+    }
+
+  }
+
+  .course-info-row{
+    padding: 10px 0;
+    font-size: 18px;
+    color: #343434;
+    img{
+      width:18px
+    }
+    .course-info-text{
+      margin: 10px 0;
+      font-size: 14px;
+      text-indent: 2em;
+      color: #666666;
+      word-break: break-all;
+    }
+  }
+  //右侧老师部分头部及标题
+  .cteacher-top {
+    background-color: #fff;
+    margin-top: 0px;
+    .cteacher-top-bar{
+      width: 100%;
+      height: 15px;
+    }
+    .cteacher-top-title{
+      padding-left:30px;
+      padding-top:10px;
+      font-size: 16px;
+      font-weight: 600;
+      line-height: 50px;
+    }
+
+  }
+  //右侧老师部分 老师列表
+  .cteacher-list {
+    background-color: #fff;
+    padding: 10px 30px 30px 30px;
+  }
+
+//以下是未整理的样式，上面的整理之后的样式
+  .coures-note {
+    min-height: 500px;
+    padding-left: 17px;
+    padding-top: 10px;
+
+    .note-tole {
+      color: #333333;
+      font-size: 18px;
+      font-weight: 600;
+    }
+
+    .note-info {}
+  }
+
+  .player-box {
+    position: absolute;
+    // top: 62px;
+    // left: 184px;
+    width: 300px;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    height: 187px;
+    background: rgba(74, 74, 74, .5);
+    border-radius: 33px;
+    text-align: center;
+    padding: 20px;
+    box-sizing: border-box;
+
+    .player-praise {
+      margin-top: 25px;
+      display: flex;
+      // justify-items: center;
+      justify-content: center;
+    }
+
+    .player-rate {
+      margin-top: 35px;
+    }
+  }
+
+  .score-text {
+    font-size: 18px;
+    color: #ffb30f;
+    font-family: 'Arial';
+    margin-left: 23px;
+    // font-weight: 600;
+  }
+
+  // .score {
+  //   display: flex;
+  //   justify-content: center;
+  //   align-items: center;
+
+  //   .el-rate {
+  //     display: inline-block;
+  //   }
+  //   // margin-bottom: 19px;
+  //   .score-no {
+  //     color: #ffb30f;
+  //     padding: 5px 0;
+  //     background: #efefef;
+  //     border-radius: 20px;
+  //     width: 65px;
+  //     font-size: 12px;
+  //     font-weight: 600;
+  //     text-align: center;
+  //   }
+  // }
+
+  .portal-content-title {
+    font-weight: 600;
+    padding: 10px;
+    font-size: 22px;
+    line-height: 40px;
+    color: #333333;
+    word-break: break-all;
+  }
+
+  .type-kuang {
+    color: #666666;
+    border: 1px solid #666666;
+  }
+
+  .type-click {
+    color: #ffb30f !important;
+    border: 1px solid #ffb30f !important;
+  }
+
+  ::v-deep .el-rate__icon {
+    font-size: 22px;
+    margin-right: 6px;
+    color: #ff8e00;
+    transition: 0.3s;
+  }
+
+  .ref-score {
+    // background: #e4e4e4;
+    // width: 64px;
+    // height: 32px;
+    // border-radius: 17px;
+    // line-height: 32px;
+    // // opacity: 0.24;
+    // color: #000;
+    // font-size: 14px;
+    // border: none;
+  }
+
+  .icon-small {
+    width: 16px;
+    height: 16px;
+    line-height: 16px;
+    vertical-align: middle;
+  }
+
+  .con-audio {
+    padding: 50px;
+    text-align: center;
+
+    .con-audio-title {
+      font-size: 16px;
+      font-weight: 700;
+    }
+
+    .con-audio-player {
+      min-height: 300px;
+      padding: 60px 50px 80px 50px;
+    }
+  }
+
+  .hyper-link {
+    padding-left: 20px;
+    text-align: center;
+    padding-top: 100px;
+
+    .hyper-link-row {
+      padding: 20px;
+    }
+  }
+
+  .catalog-box {
+    background: #fff;
+
+    // padding: 15px 0px;
+    // box-shadow: 1px 1px 2px 2px #ededed;
+    .title {
+      font-size: 16px;
+      font-weight: 600;
+      color: #333333;
+      padding-left: 20px;
+    }
+  }
+
+  .collapse-title {
+    flex: 1 0 90%;
+    order: 1;
+  }
+
+  .el-collapse-item__header {
+    flex: 1 0 auto;
+    order: -1;
+  }
+
+  .course-interact {
+    height: 54px;
+    // padding-top: 10px;
+    // padding-right: 10px;
+    padding: 0 20px;
+    line-height: 54px;
+    background-color: #FFFFFF;
+    display: flex;
+    justify-content: space-between;
+    box-sizing: border-box;
+  }
+
+  .interact-btn {
+    margin-right: 10px;
+  }
+
+  .uc-badge {
+    margin-top: 10px;
+    margin-right: 40px;
+  }
+
+  .cres-list {
+    list-style-type: decimal;
+    margin: 0px;
+
+    li {
+      line-height: 30px;
+    }
+
+    .current {
+      color: #1ea0fa;
+    }
+  }
+
+  .uc-course {
+    display: flex;
+    justify-content: space-around;
+    border: 1px solid #f0f0f0;
+    padding: 10px;
+
+    .uc-course-img {
+      width: 200px;
+
+      img {
+        width: 200px;
+        border: 1px solid #f4f4f5;
+      }
+    }
+
+    .uc-course-info {
+      flex: 1;
+      line-height: 28px;
+      padding: 0px 10px;
+
+      .uc-course-name {
+        font-size: 18px;
+        font-weight: 700;
+      }
+
+      .uc-course-text {
+        color: #747474;
+      }
+    }
+
+    .uc-course-btns {
+      width: 150px;
+    }
+  }
+
+  .catalog-cell-state2 {
+    height: 24px;
+    width: 58px;
+    line-height: 20px;
+    border: 0px dotted #bed2f8;
+    padding: 3px 10px;
+    color: #ff8e00;
+    font-size: 12px;
+    border-radius: 6px;
+    margin-left: 2px;
+    background: #ffedd6;
+  }
+
+  .catalog-cell-state9 {
+    height: 24px;
+    width: 58px;
+    line-height: 20px;
+    border: 0px dotted #bed2f8;
+    padding: 3px 10px;
+    color: #3e7fff;
+    font-size: 12px;
+    border-radius: 6px;
+    margin-left: 2px;
+    background: #edf2fd;
+    // margin-left: 68%;
+    // background-color: #BED2F8;
+  }
+
+  .catalog-cell-state1 {
+    height: 24px;
+    width: 58px;
+    line-height: 20px;
+    border: 0px dotted #edf2fd;
+    border-radius: 6px;
+    padding: 3px 10px;
+    color: #ff3e3e;
+    font-size: 12px;
+    margin-left: 2px;
+    background: #fff0f0;
+  }
+
+  .catalog {
+    height: 100%;
+    max-width: 500px;
+    overflow: auto;
+
+    .catalog-row {
+      margin: 0px;
+      padding: 0px 10px 10px 10px;
+
+      .title-type {
+        width: 36px;
+        height: 24px;
+        padding: 2px 5px;
+        color: #666666;
+        border: 1px solid #666666;
+        margin-right: 8px;
+      }
+
+      ul {
+        padding: 0px;
+        margin: 0px;
+
+        li {
+          padding: 6px 0;
+        }
+      }
+
+      .catalog-cell {
+        line-height: 32px;
+        cursor: pointer;
+        list-style: none;
+        margin: 0px;
+        padding-left: 20px;
+        color: #5c5c5c;
+      }
+    }
+  }
+
+  .video-div {
+    position: absolute;
+    z-index: 999999999;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(101, 101, 101, 0.9);
+
+    .good {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin-top: 200px;
+
+      div {
+        line-height: 1;
+        margin: 0 15px;
+
+        .svg-icon {
+          width: 30px;
+          height: 30px;
+        }
+      }
+
+      div:nth-of-type(2) {
+        .svg-icon {
+          transform: scaleX(-1);
+          transform: rotate(180deg);
+        }
+      }
+    }
+  }
+
+  ::v-deep .el-tag {
+    background-color: #ecf5ff;
+    border-color: #409EFF;
+    display: inline-block;
+    height: 28px;
+    padding: 0 10px;
+    line-height: 28px;
+    font-size: 12px;
+    color: #3e7fff;
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 0px;
+    box-sizing: border-box;
+    white-space: nowrap;
+  }
+
+  ::v-deep .teacher .teacher-avator .teacher-text {
+    background: none;
+    border: none;
+  }
+
+  .teacher {
+    background-color: #ffffff;
+    display: flex;
+    width: 100%;
+    border-top: none;
+    padding: 10px 0px;
+    .teacher-avator {
+      cursor: pointer;
+      ::v-deep .el-avatar {
+        width: 60px !important;
+        height: 60px !important;
+        border-radius: 50%;
+         img{
+             width: 100% !important;
+             }
+      }
+      .teacher-text {
+        width: 68px;
+        height: 68px;
+
+        div {
+          img {
+            width: 68px;
+            height: 68px;
+          }
+        }
+      }
+    }
+    .teacher-info {
+      flex: 1;
+      .teacher-name {
+        padding: 5px 5px 10px 10px;
+      }
+      .teacher-remark {
+        padding: 0px 5px 0 10px;
+        font-size: 14px;
+        color: #666666;
+        line-height: 20px;
+        overflow:hidden;
+        text-overflow:ellipsis;
+        // white-space:nowrap;
+        word-break:break-all
+      }
+    }
+  }
+
+
+
+  .breadname {
+    margin-bottom: 15px;
+  }
+
+  //目录的样式更改
+  ::v-deep .el-collapse-item {
+    .el-collapse-item__header {
+      // position: relative;
+      direction: rtl;
+      display: flex;
+      // justify-content;
+      justify-content: space-between;
+
+      // .el-collapse-item__arrow{
+      //   float:right;
+      // }
+      // span{
+      //   float:right;
+      // }
+      i {
+        display: none
+      }
+    }
+  }
+
+  .course-units {
+    padding: 10px 30px;
+    .units-info {
+      padding: 0 30px;
+      height: 60px;
+      line-height: 60px;
+      font-size: 16px;
+      cursor: pointer;
+      overflow: hidden;
+      white-space:nowrap;
+      word-break:break-all;
+      text-overflow:ellipsis;
+    }
+
+    .units-active {
+      background: #F6F6F6;
+      color: #387DF7;
+      font-weight: 600;
+      cursor: text;
+      img {
+        width: 18px;
+        height: 20px;
+        vertical-align: middle;
+        margin-right: 20px;
+      }
+    }
+  }
+
+  .more {
+    float: right;
+  }
+
+  .coures-title {
+    margin-left: 82px;
+    font-size: 20px;
+    font-weight: 600;
+    color: #FFFFFF;
+    margin-top: 25px;
+
+    div {
+      float: left;
+      font-size: 20px;
+      font-weight: 600;
+      color: #FFFFFF;
+      line-height: 20px;
+
+    }
+
+    span {
+      float: left;
+      font-size: 16px;
+      font-weight: 400;
+      color: #FFFFFF;
+      margin-left: 27px;
+    }
+
+    h6 {
+      float: left;
+      font-size: 16px;
+      font-weight: 600;
+      color: #FFFFFF;
+      margin: 0 20px;
+
+    }
+  }
+
+  ::v-deep.el-breadcrumb__item:first-child .el-breadcrumb__inner a,
+  .el-breadcrumb__inner .is-link {
+    color: #fff !important;
+  }
+
+  ::v-deep.el-breadcrumb__item:last-child .el-breadcrumb__inner {
+    color: #fff !important;
+  }
+
+  ::v-deep.hear-nav {
+    color: #fff !important;
+  }
+
+  .breadcrumb-nav {
+    color: #FFFFFF;
+  }
+
+  .coures-bg {
+    width: 100%;
+    height: 200px;
+    background: url('../../../public/images/couresdetail.png');
+  }
+</style>
diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue
new file mode 100644
index 00000000..3bbdb24f
--- /dev/null
+++ b/src/views/ucurrency/Index.vue
@@ -0,0 +1,905 @@
+<template>
+  <div class="u-currency">
+    <div class="myubi">
+      <div class="ubi-hear">
+        <h6>我的U币:{{uinfo.uCurrency}}</h6><span class="pointer" @click="dialogVisible = true">U币规则
+          <i class="el-icon-arrow-right"></i> </span>
+        <el-button icon="el-icon-document" @click="exportRecord()">导出记录</el-button>
+      </div>
+      <div style="max-height:600px;overflow-y:auto;padding-right:30px">
+        <div class="Ubi-hist">
+          <h6>U币历史记录</h6><span>（最多保留近7天的记录）</span>
+          <div v-show="isShowChart" >
+            <div style="height:290px;min-width: 350px;" ref="chart"></div>
+          </div>
+
+        </div>
+        <div v-if="uCoinRecord.length > 0">
+          <div class="my-Recording" v-for="(day, index) in uCoinRecord" :key="index">
+            <h3>{{day.dayNmae}}</h3>
+            <div class="Recording-info" v-for="info in day.list">
+              <div class="info-tit">{{info.content}}</div>
+              <div class="info-Gold"><img :src="`${webBaseUrl}/images/Uimg.png`" alt="">{{info.uvalue > 0? '+':''}}
+                {{info.uvalue}}</div>
+            </div>
+          </div>
+        </div>
+        <div v-else class="home-no-list" style="margin-top:150px">
+          <img class="img" style="width:76px;height:76px" :src="`${webBaseUrl}/images/homeWu/u-wu.png`" alt=""
+            srcset="">
+          <p class="text">最近7天您可能太忙了，快开始努力获得U币吧</p>
+        </div>
+      </div>
+    </div>
+    <div class="experience">
+      <div class="exp-hear">
+        <div class="exp-hear-text">
+          经验值排行榜
+          <el-tooltip placement="top"  effect="light">
+            <div slot="content" style="line-height:13px;">
+              所有用户经验值TOP排行榜单，通过学习、贡献等行为可以获得经验值 。</br>
+              系统已经根据您在4月23日新系统上线之后产生的学习数据对经验值进行</br>
+              <span  style="line-height:15px;">了初始化，更早的数据以及老系统中产生的数据，将在2022年底一次性</span></br>
+              补充到您的经验值中，请您耐心等待。
+            </div>
+            <svg-icon style="margin-left: 5px;font-size:20px;padding-top: 4px;" icon-class="doubt"></svg-icon>
+          </el-tooltip>
+          <span class="exp-hear-textbor"></span>
+        </div>
+        <div class="exp-hear-xiala">
+          <el-dropdown trigger="click" @command="handleCommand">
+            <span class="el-dropdown-link pointer">
+              {{name}}<i class="el-icon-arrow-down el-icon--right"></i>
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="total">累计</el-dropdown-item>
+              <el-dropdown-item command="weeks">本周</el-dropdown-item>
+              <el-dropdown-item command="months">本月</el-dropdown-item>
+              <el-dropdown-item command="years">本年</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+      </div>
+      <div class="myselftext">
+        <div class="myranking">
+          累计排名 : <span> {{currentUserRankingTotalData.rankNo}}</span>
+        </div>
+        <div class="myexperience">
+          累计经验值 : <span>{{currentUserRankingTotalData.rankValue}}</span>
+        </div>
+      </div>
+
+      <!--  注释经验值等级进度条
+      <div class="exp-bar">
+        <h6>{{currentUserRankingTotalData.rankValue}}/{{currentUserRankingTotalData.endValue}}</h6>
+        <div class="exp-barbox">
+          <el-progress :percentage="currentUserRankingTotalData.rankValue*100/currentUserRankingTotalData.endValue" color="#387DF7"></el-progress>
+        </div>
+        <div class="exp-barname">
+          <span>{{current.start}}</span>
+          <span>{{current.end}}</span>
+        </div>
+      </div>
+      -->
+
+      <div class="exp-table">
+        <div class="table-hear">
+          <div style="margin-left:5px">排名</div>
+          <div style="margin-left:5px">姓名</div>
+          <div class="bm">部门</div>
+          <div class="jy">经验值</div>
+        </div>
+        <div>
+          <div class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px"
+            v-for="(ran,index) in rankingData" :key="ran.id">
+            <div class="tab-rank">
+              <img v-if="index == 0" :src="`${webBaseUrl}/images/rank1.png`" alt="" />
+              <img v-if="index == 1" :src="`${webBaseUrl}/images/rank2.png`" alt="" />
+              <img v-if="index == 2" :src="`${webBaseUrl}/images/rank3.png`" alt="" />
+              <div v-if="index > 2" style="line-height: 40px;padding-left:15px;font-size: 16px;color: #333333;">
+                {{index+1}}</div>
+            </div>
+            <div class="tab-name">
+              <author-img :avatar="ran.authorInfo.avatar" :aid="ran.authorInfo.aid" :sex="ran.authorInfo.sex">
+              </author-img> <span>{{ran.authorInfo.name}}</span>
+            </div>
+            <div class="bm tab-bm" style="margin-left:30px;">{{cutOrgNamePath(ran.authorInfo.orgInfo)}}</div>
+            <div class="jy tab-jy">
+              <div v-if="cycle == 'total'" style="font-size: 18px;color: #333333;font-weight: 600;">{{ran.total}}</div>
+              <div v-if="cycle == 'months'" style="font-size: 18px;color: #333333;font-weight: 600;">{{ran.months}}</div>
+              <div v-if="cycle == 'years'" style="font-size: 18px;color: #333333;font-weight: 600;">{{ran.years}}</div>
+              <div v-if="cycle == 'weeks'" style="font-size: 18px;color: #333333;font-weight: 600;">{{ran.weeks}}</div>
+            </div>
+
+
+          </div>
+        </div>
+
+        <div v-if="currentUserRankingData.rankingNo>5" style="margin-top:20px;border-bottom: 1px solid #ddd;padding-bottom:40px">
+            <div v-if="currentUserRankingData.rankingNo>5" class="omit">
+                <div>.</div> <div>.</div> <div>.</div>
+            </div>
+        </div>
+
+
+        <div v-if="currentUserRankingData.rankingNo>4" class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px">
+          <div style="color: #0059FF;line-height: 40px;padding-left:15px;font-size: 16px;" class="tab-rank">
+            {{currentUserRankingData.rankingNo}}</div>
+          <div class="tab-name">
+            <author-img :avatar="userInfo.avatar" :aid="userInfo.aid"
+              :sex="userInfo.sex"></author-img> <span style="color: #0059FF;">{{userInfo.name}}</span>
+          </div>
+          <div class="bm tab-bm" style="margin-left:30px;color: #0059FF;">{{cutOrgNamePath(userInfo.departFullName)}}
+          </div>
+          <div class="jy tab-jy">
+            <div v-if="cycle == 'total'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{currentUserRankingData.total}}</div>
+            <div v-if="cycle == 'months'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{currentUserRankingData.months}}</div>
+            <div v-if="cycle == 'years'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{currentUserRankingData.years}}</div>
+            <div v-if="cycle == 'weeks'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{currentUserRankingData.weeks}}</div>
+          </div>
+        </div>
+
+      </div>
+    </div>
+    <el-dialog :visible.sync="dialogVisible" :show-close="false" width="716px" top="13%">
+      <div class="dialog-box">
+        <div class="box-top">
+          <p style="font-size: 26px;font-weight: 600;margin-bottom: 4px;">U币规则</p>
+          <p style="font-size: 14px;line-height: 20px;">学员每日通过积分规则获得积分的上限为150积分，当天达到上限后，将 不能通过积分规则获得积分</p>
+        </div>
+        <div style="max-height:420px;overflow-y: auto;">
+          <div class="box-table">
+            <p class="table-title portal-title-tow"><span></span>学习</p>
+            <el-table :data="tableData" style="">
+              <el-table-column prop="name" label="分类" width="180"></el-table-column>
+              <el-table-column prop="name" label="描述" width="180">
+                <template slot-scope="scope">
+                  <p v-for="(rem,index) in scope.row.hear" :key="index">{{rem}}</p>
+                  <p style="font-size:12px;color: #999999;" v-if="scope.row.label">{{scope.row.label}}</p>
+                </template>
+              </el-table-column>
+              <el-table-column align="right" label="经验值/U币">
+                <template slot-scope="scope">
+                  <p style="font-size:16px;color: #333333;font-weight: 600;" v-for="(val,index) in scope.row.value" :key="index">{{val}}
+                  </p>
+                </template>
+              </el-table-column>
+              <el-table-column prop="upperlimit" align="right" label="每日上限">
+              </el-table-column>
+            </el-table>
+          </div>
+          <div class="box-table">
+            <p class="table-title portal-title-tow"><span></span>知识贡献</p>
+            <el-table :data="tableList" style="">
+              <el-table-column prop="name" label="分类" width="180">
+              </el-table-column>
+              <el-table-column prop="name" label="描述" width="180">
+                <template slot-scope="scope">
+                  <p v-for="(rem,index) in scope.row.hear" :key="index">{{rem}}</p>
+                </template>
+              </el-table-column>
+              <el-table-column align="right" label="经验值/U币">
+                <template slot-scope="scope">
+                  <p style="font-size:16px;color: #333333;font-weight: 600;" v-for="(val,index) in scope.row.value"
+                    :key="index">{{val}}</p>
+                </template>
+              </el-table-column>
+              <el-table-column prop="upperlimit" align="right" label="每日上限">
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+
+		<!--
+        <div class="dialog-close" @click="dialogVisible=false">
+          <img style="width:86px;height:86px" :src="`${webBaseUrl}/images/homeWu/u-close.png`" alt="">
+        </div>
+		-->
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import apiStat from '@/api/phase2/stat.js';
+  import {  mapGetters } from 'vuex';
+  import {getUType } from '@/utils/tools.js'
+  import authorImg from '@/components/Portal/authorImg.vue';
+  import author from '@/components/Portal/authorInfo.vue';
+  import apiUser from "@/api/system/user.js";
+  import * as echarts from 'echarts'
+  import {
+    translate,
+    experienceValue,
+    cutOrgNamePath
+  } from "@/utils/tools.js";
+  export default {
+    computed: {
+      ...mapGetters(['userInfo']),
+
+    },
+    components: {
+      authorImg,
+      author
+    },
+    data() {
+      return {
+        percentageNum:0,
+        cutOrgNamePath:cutOrgNamePath,
+        chatData:[],
+        isShowChart:false,
+        current: {
+          percentage: 0
+        },
+        experienceValue,
+        translate,
+        cycle: 'total',
+        name: '累计',
+        getUType,
+        dialogVisible: false,
+        tableData: [{
+            name: '试听学习',
+            hear: ['每日累计学习10分钟', '每日累计学习20分钟', '每日累计学习30分钟', '每日累计学习45分钟', '每日累计学习60分钟', ],
+            value: ['+10', '+20', '+30', '+40', "+50"],
+            upperlimit: 50
+          },
+          {
+            name: '案例学习',
+            hear: ['完成一个案例的阅读', ],
+            value: ['+5'],
+            upperlimit: 30,
+            label: '（最低3分钟）'
+          },
+          {
+            name: '文章学习',
+            hear: ['完成一个文章的阅读', ],
+            value: ['+5'],
+            upperlimit: 30,
+            label: '（最低2分钟）'
+          },
+        ],
+        tableList: [{
+            name: '发布音视频课程',
+            hear: ['完成一个音视频课发布', ],
+            value: ['+60'],
+            upperlimit: null
+          },
+          {
+            name: '面授课记录',
+            hear: ['有一个完成的面授课记录（<4h）', '有一个完成的面授课记录（>=4h）'],
+            value: ['+40', '+60'],
+            upperlimit: null
+          },
+          {
+            name: '发布文章',
+            hear: ['每发布1篇文章', ],
+            value: ['+40'],
+            upperlimit: null
+          },
+          {
+            name: '发布案例',
+            hear: ['每发布1篇案例', ],
+            value: ['+50'],
+            upperlimit: null
+          },
+          {
+            name: '发布笔记',
+            hear: ['每发布公开笔记1篇', ],
+            value: ["+5"],
+            upperlimit: 30
+          },
+          {
+            name: '发表评论',
+            hear: ['在课程，问答，案例中发表1个评论', ],
+            value: ['+2'],
+            upperlimit: 20
+          },
+        ],
+        uCoinRecord: [],
+        chart: null,
+        currentUserRankingData: {},
+        currentUserRankingTotalData:{
+          rankNo:0, // 经验值累计排名
+          rankValue:0 ,// 经验值累计,
+          endValue:0 // 累计经验值进度条最大值
+        },
+        rankingData: [],
+        uinfo: {
+          uCurrency: 0 // 用户累计U币
+        },
+      }
+    },
+    mounted() {
+      this.getList();
+      this.getRanking();
+      this.getLevel();
+    },
+    watch:{
+      isShowChart(val) {
+         if(val) {
+          this.initChat(this.chatData);
+         }
+      }
+    },
+    updated() {
+      this.chart && this.chart.resize();
+    },
+    methods: {
+
+      handleCommand(e) {
+        this.cycle = e;
+        this.name = this.translate(e)
+        this.getRanking();
+      },
+      getRanking() {
+        let data = {
+          aid: this.userInfo.aid, // #用户id
+          statType: 20, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
+          field: this.cycle, // #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
+          num: 5, //  #显示的条数
+        }
+        apiStat.getRanking(data).then(res => {
+          if (res.status == 200) {
+            if (res.result.currentUserRankingData) {
+              res.result.currentUserRankingData.authorInfo = {
+                aid: "",
+                name: "",
+                orgInfo: "",
+                avatar: "",
+                sex: null
+              }
+              this.getUserData([res.result.currentUserRankingData.aid], [res.result.currentUserRankingData])
+              this.currentUserRankingData = res.result.currentUserRankingData;
+              if(this.cycle == 'total'){
+                this.current = this.experienceValue(res.result.currentUserRankingData.total);
+                this.currentUserRankingTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
+                this.currentUserRankingTotalData.rankValue = res.result.currentUserRankingData.total;
+                this.currentUserRankingTotalData.endValue = this.current.endValue;
+              }
+            }
+
+            const ids = [];
+            res.result.rankingData.forEach(item => {
+              ids.push(item.aid)
+              item.authorInfo = {
+                aid: "",
+                name: "",
+                orgInfo: "",
+                avatar: "",
+                sex: null
+              }
+            })
+            this.getUserData(ids, res.result.rankingData)
+            this.rankingData = res.result.rankingData;
+          }
+        })
+      },
+      getUserData(ids, list) {
+        const noReapetIds = [...new Set(ids)];
+        apiUser.getByIds(noReapetIds).then(res => {
+          if (res.status == 200) {
+            list.forEach((item, index) => {
+              res.result.some(author => {
+                if (author.aid == item.aid) {
+                  item.authorInfo = author;
+                  return true;
+                } else {
+                  return false;
+                }
+              });
+            });
+          } else {
+            this.$message.error(res.message);
+          }
+        });
+      },
+      exportRecord() {
+
+        let downUrl='';
+
+        // let curHost=window.location.host;
+        // console.log(window.location.host,'window.location.host');
+        // if(curHost=='localhost' || curHost='127.0.0.1'){
+        //   downUrl=process.env.VUE_APP_BOE_WEB_URL+process.env.VUE_APP_CESOURCE_BASE_API+'/xboe/m/stat/usercoinrecord/export?aid=' + this.userInfo.aid;
+        // }else{
+        //    //let urlPre = window.location.protocol + '//' + window.location.host;
+        //   downUrl=process.env.VUE_APP_CESOURCE_BASE_API+'/xboe/m/stat/usercoinrecord/export?aid=' + this.userInfo.aid;
+        // }
+        downUrl=process.env.VUE_APP_STAT_BASE_API+'/xboe/m/stat/usercoinrecord/export';
+
+        const el = document.createElement('a');
+        el.style.display = 'none';
+        el.setAttribute('target', '_blank');
+        el.setAttribute('download', '我的U币记录');
+        el.href = downUrl;
+        document.body.appendChild(el);
+        el.click();
+        document.body.removeChild(el);
+
+      },
+      initChat(chatData) {
+        this.chart = echarts.init(this.$refs.chart);
+        const option = {
+          tooltip: {
+            trigger: 'item'
+          },
+          legend: {
+            top: 'center',
+            right: 100,
+            orient: 'vertical',
+            itemWidth: 8,
+            itemHeight: 8,
+            borderRadius: '50%',
+            itemGap: 26,
+            selectedMode: false,
+            formatter: function(name) {
+              let data = option.series[0].data;
+              let total = 0;
+              let tarValue = 0; //每一项值
+              for (let i = 0; i < data.length; i++) {
+                total += data[i].value;
+                if (data[i].name == name) {
+                  tarValue = data[i].value;
+                }
+              }
+              let p = total != 0 ? Math.round((tarValue / total) * 100) + '%' : 0 + '%';
+              return ` ${p}  ${name}`
+            }
+          },
+          series: [{
+            // name: 'name',
+            type: 'pie',
+            radius: ['50%', '40%'],
+            avoidLabelOverlap: false,
+            center: ['32%', '50%'],
+            itemStyle: {
+              borderRadius: 0,
+              borderColor: '#fff',
+              borderWidth: 2,
+              normal: {
+                color: function(colors) {
+                  let colorList = ['#5bb9fe', '#f7b36b', '#72e5d5', '#e1e1f9'];
+                  return colorList[colors.dataIndex];
+                },
+              }
+            },
+            label: {
+              show: true,
+              position: 'center',
+              formatter:`{total|${this.percentageNum}%}\n{active|来源top3}`,
+              rich:{
+                total:{
+                  fontSize:20,
+                  color:'#000',
+                },
+                active: {
+                  fontSize:16,
+                  color:'#333',
+                  lineHeight:30,
+                }
+              }
+            },
+            labelLine: {
+              show: false
+            },
+            data: chatData,
+          }]
+        };
+        this.chart.setOption(option);
+      },
+      getList() {
+        apiStat.userCoinList(this.userInfo.aid, 7).then(res => {
+          if (res.status == 200) {
+            this.uCoinRecord = [];
+            for (let key in res.result.uCoinRecord) {
+              this.uCoinRecord.push({
+                dayNmae: key,
+                list: res.result.uCoinRecord[key]
+              })
+            }
+            let chatData = [];
+            let total = null;
+            let top3 = null;
+            let totalList = [];
+            for (let key in res.result.chatData) {
+              if(res.result.chatData[key] > 0) {
+                 this.isShowChart = true;
+                 if(key !== 'other') {
+                   top3 += res.result.chatData[key];
+                 }
+              }
+              total += res.result.chatData[key];
+              totalList.push(res.result.chatData[key]);
+              chatData.push({
+                value: res.result.chatData[key],
+                name: this.getUType(key)
+              })
+            }
+            this.percentageNum = ((top3/total)*100).toFixed(2);
+            this.chatData = chatData;
+            this.initChat(chatData);
+          }
+        })
+      },
+      getLevel() { //获取用户累计U币
+        apiStat.getUserStatTotalInfo(this.userInfo.aid).then(res => {
+          if (res.status == 200) {
+            this.uinfo.uCurrency = res.result.uvalue;
+          }
+        });
+      },
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  .u-currency {
+    padding: 10px 18px;
+     display: flex;
+     justify-content: space-between;
+     overflow-x: auto;
+  }
+
+  .experience {
+    font-size: 16px;
+     min-width: 480px;
+     font-weight: 600;
+     color: #333333;
+  }
+
+  .myubi {
+    flex: 1;
+    padding-right: 30px;
+  }
+
+  ::v-deep .el-dialog {
+    border-radius: 8px;
+
+  }
+
+  ::v-deep .el-dialog__header {
+    display: none;
+  }
+
+  ::v-deep .el-dialog__body {
+    padding: 0;
+    //    ::v-deep .el-table td.el-table__cell{
+    //       font-size: 14px;
+    //       color: #333333;
+    //    }
+  }
+
+  ::v-deep .el-table__body-wrapper {
+    font-size: 14px;
+    color: #333333;
+  }
+
+  .dialog-box {
+    position: relative;
+      .dialog-close {
+      position: absolute;
+      left: 50%;
+      transform: translate(-50%);
+      bottom: -127px;
+    }
+
+    .box-top {
+      color: #FBA511;
+      padding: 26px 212px 17px 61px;
+      background: url('../../../public/images/homeWu/u-bg.png') no-repeat;
+    }
+
+    .box-table {
+      padding: 26px 14px 40px 66px;
+
+      .table-title {
+        margin-bottom: 18px;
+
+        span {
+          display: inline-block;
+          width: 6px;
+          height: 18px;
+          background: #0060FF;
+          border-radius: 4px;
+          margin-right: 10px;
+        }
+      }
+    }
+  }
+
+  .Recording-info {
+    margin-top: 12px;
+    height: 45px;
+    border-bottom: 1px solid #ddd;
+
+    .info-tit {
+      float: left;
+      font-size: 14px;
+      font-weight: 400;
+      color: #333333;
+      line-height: 40px;
+    }
+
+    .info-Gold {
+      float: right;
+      font-size: 18px;
+      color: #333333;
+      font-weight: 400;
+      line-height: 40px;
+
+      img {
+        width: 54px;
+        height: 32px;
+        vertical-align: middle;
+      }
+    }
+  }
+
+  .Ubi-hist {
+    margin-top: 15px;
+
+    h6 {
+      font-size: 16px;
+      font-weight: 600;
+      color: #333333;
+      margin: 0;
+      float: left;
+    }
+
+    span {
+      font-size: 14px;
+      font-weight: 600;
+      color: #999999;
+    }
+  }
+
+
+  .ubi-hear {
+    height: 40px;
+
+    button {
+      width: 140px;
+      height: 40px;
+      margin-right: 30px;
+      border-radius: 2px;
+      border: 1px solid rgba(153, 153, 153, 0.35);
+      float: right;
+    }
+
+    span {
+      font-size: 14px;
+      font-weight: 400;
+      color: #333333;
+      line-height: 40px;
+    }
+
+    h6 {
+      margin: 0;
+      margin-right: 18px;
+      line-height: 40px;
+      float: left;
+      color: #333333;
+      font-size: 18px;
+      font-weight: 600;
+    }
+  }
+
+  .omit {
+    padding-left: 20px;
+
+    div {
+      font-size: 30px;
+      line-height: 10px;
+      color: #D8D8D8;
+    }
+  }
+
+  .exp-table {
+    //width: 100%;
+    padding-left: 25px;
+    padding-right: 20px;
+
+    .table-hear {
+      display: flex;
+
+      div {
+        min-width: 90px;
+        font-size: 14px;
+        font-weight: 400;
+        color: #999999;
+      }
+
+      .bm {
+        flex: 1;
+        margin-left: 20px;
+      }
+
+      .jy {
+        margin-left: auto;
+        text-align: right;
+        margin-right: 0;
+        text-align: center;
+      }
+    }
+
+
+  }
+
+  .myselftext {
+    height: 75px;
+    padding: 0 25px;
+    //width: 100%;
+    display: flex;
+
+    .myranking {
+      flex: 1;
+      line-height: 75px;
+      font-size: 14px;
+      font-weight: 400;
+      color: #666666;
+
+      span {
+        color: #333;
+        font-weight: 600;
+        font-size: 18px;
+      }
+    }
+
+    .myexperience {
+      text-align: right;
+      line-height: 75px;
+      margin-left: 120px;
+      font-size: 14px;
+      font-weight: 400;
+      margin-right: -45px;
+      color: #666666;
+
+      span {
+        color: #333;
+        font-weight: 600;
+        font-size: 18px;
+      }
+    }
+  }
+
+  .tab-jy {
+    padding-top: 10px;
+
+    div {
+      line-height: 28px;
+      width: 70px;
+      text-align: center;
+      font-size: 18px;
+      color: #333333;
+      font-weight: 600;
+      height: 28px;
+      background: #F7F8FA;
+      border-radius: 14px;
+    }
+  }
+
+  .tab-bm {
+    line-height: 40px;
+  }
+
+  .tab-name {
+    display: flex;
+    min-width:98px;
+    ::v-deep .item-author {
+      min-width: 50px !important;
+    }
+
+    img {
+      width: 40px;
+      height: 40px;
+      vertical-align: middle;
+    }
+
+    span {
+      display: block;
+      margin-top: 10px;
+      color: #333333;
+      font-size: 14px;
+      font-weight: 600;
+    }
+
+  }
+
+  .tab-rank {
+
+
+    img {
+      width: 40px;
+      height: 40px;
+
+    }
+  }
+
+  .experience {
+    flex: 1;
+
+    .exp-hear {
+      //width: 100%;
+      height: 65px;
+      background: url('../../../public/images/expbg.png') no-repeat 100% / 100%;
+
+      .exp-hear-text {
+        float: left;
+        line-height: 65px;
+        margin-left: 25px;
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        position: relative;
+        z-index: 888;
+
+        .exp-hear-textbor {
+          width: 108px;
+          height: 10px;
+          background: #9CC7FC;
+          border-radius: 9px;
+          display: inline-block;
+          position: absolute;
+          left: 0;
+          z-index: -1;
+          top: 60%;
+        }
+      }
+
+      .exp-hear-xiala {
+        line-height: 65px;
+        float: right;
+        margin-right: 15px;
+      }
+
+    }
+
+    .exp-bar {
+
+      //width: 100%;
+      h6 {
+        font-size: 14px;
+        color: #666666;
+        font-weight: 600;
+        margin: 0;
+        margin-left: 50px;
+      }
+
+      .exp-barname {
+        //width: 100%;
+        padding: 20px 35px;
+        display: flex;
+
+        span {
+          flex: 1;
+        }
+      }
+
+      .exp-barbox {
+        //width: 100%;
+        height: 8px;
+        //  background: #ECF1FE;
+        border-radius: 6px;
+        margin-left: 25px;
+        margin-top: 3px;
+        position: relative;
+        z-index: 1;
+
+        ::v-deep .el-progress__text {
+          display: none;
+        }
+
+        .exp-bar-cont {
+          width: 230px;
+          height: 6px;
+          background: #0059FF;
+          border-radius: 6px;
+          opacity: 0.56;
+          position: absolute;
+          left: 0;
+          z-index: 999;
+        }
+      }
+
+    }
+  }
+</style>
diff --git a/src/views/user/MyAssess.vue b/src/views/user/MyAssess.vue
index 18974ed7..74ef674b 100644
--- a/src/views/user/MyAssess.vue
+++ b/src/views/user/MyAssess.vue
@@ -2,16 +2,17 @@
     <!-- <Remark>
       1.测评界面实例图<br/>
     </Remark> -->
-    <div style="padding:10px 0px 12px 2px">
+    <div style="padding:10px 0px 12px 22px">
     <el-row>
       <el-col :span="24">
-        <el-input clearable placeholder="搜索名称" v-model="keyword"></el-input>
-        <el-button type="primary" icon="el-icon-search" @click="getData()">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh-right" @click="reset">重置</el-button>
+        <span class="uc-center-page" style="margin-right:90px">我的测评</span>
+        <el-input clearable placeholder="搜索名称" class="uc-input" v-model="keyword"></el-input>
+        <el-button type="primary" icon="el-icon-search" class="search-btn" @click="getData()">搜索</el-button>
+        <el-button type="primary" icon="el-icon-refresh-right" class="search-btn" @click="reset">重置</el-button>
       </el-col>
       <el-col  :span="8" v-for="(item,index) in testList" :key="index">
          <!-- @click="textdetail(item)" -->
-        <div>
+        <div style="text-align: center;">
            <!-- @click="jumpRouter(item)" -->
           <section>
             <!-- <div @click="hasPermission(item)">
@@ -41,13 +42,12 @@
           </el-pagination>
        </div>
        <div v-else>
-            <div v-if="testList.length == 0">
-              <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
-              <div v-else class="zan-wu">暂无数据</div>
-            </div>
+          <div v-if="testList.length == 0" class="home-no-list">
+            <img class="img" style="width:360px;height:226px" :src="`${webBaseUrl}/images/homeWu/no-madel.png`" alt="" srcset="">
+            <p class="text" style="color: #333333;margin-top:50px;font-size: 14px">目前还没有测评哦～</p>
           </div>
-    </div>
-
+       </div>
+  </div>
 </template>
 <script>
   import apiBoeCourse from '@/api/boe/course.js';
diff --git a/src/views/user/MyFavorites.vue b/src/views/user/MyFavorites.vue
index 7af80358..10151439 100644
--- a/src/views/user/MyFavorites.vue
+++ b/src/views/user/MyFavorites.vue
@@ -14,6 +14,7 @@
             <el-option label="已解决" :value="3"></el-option>
           </el-select>
         </el-col> -->
+        <el-col :span="3"><span class="uc-center-page">我的收藏</span></el-col>
         <el-col :span="6"><el-input placeholder="标题查询" clearable v-model="keyword" style="margin-right: 20px"></el-input></el-col>
         <el-col :span="6">
           <el-button type="primary" icon="el-icon-search" @click="queryData" style="padding: 10px 15px;">搜索</el-button>
@@ -35,10 +36,12 @@
         </el-tab-pane> -->
         <el-tab-pane label="全部" name="all">
           <div v-for="(item, index) in dataList.list">
-            <course-items v-if="item.type==1" :items="[item]" @confirm="confirm"></course-items>
-            <case-items v-if="item.type==3" @confirm="confirm" :items="[item]"></case-items>
-            <article-items v-if="item.type==2" @confirm="confirm" :items="[item]"></article-items>
+            <course-items :isAll="true" v-if="item.type==1" :items="[item]" @confirm="confirm"></course-items>
+            <case-items :isAll="true" v-if="item.type==3" @confirm="confirm" :items="[item]"></case-items>
+            <note-list :isAll="true" v-if="item.type==6" @confirm="confirm" :list="[item]"></note-list>
+            <article-items :isAll="true" v-if="item.type==2" @confirm="confirm" :items="[item]"></article-items>
             <qa-items v-if="item.type==4" :items="[item]" @confirm="confirm" :collect="true" :share="false" :remove="false" :edit="false"></qa-items>
+            <answer-items v-if="item.type==5" :items="[item]" @confirm="confirm"></answer-items>
           </div>
           <!-- v-if="courseList.count>courseList.pageSize" -->
           <div v-if="dataList.list.length > 0" style="text-align: center;margin-top:57px">
@@ -99,6 +102,23 @@
             </div>
           </div>
         </el-tab-pane>
+        <el-tab-pane label="笔记" name="note">
+          <div>
+            <note-list @confirm="confirm" :list="noteList.list"></note-list>
+          </div>
+          <div style="text-align: center;margin-top:50px;" v-if="caseList.list.length > 0">
+            <el-pagination
+              background
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="noteList.pageIndex"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="noteList.pageSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="noteList.count"
+            ></el-pagination>
+          </div>
+        </el-tab-pane>
         <el-tab-pane label="案例" name="case">
           <div>
             <case-items @confirm="confirm" :items="caseList.list"></case-items>
@@ -153,23 +173,10 @@
             </div>
           </div>
         </el-tab-pane>
-        <el-tab-pane label="问答" name="qa">
+        <el-tab-pane label="提问" name="qa">
           <div>
-            <!-- <div style="padding-bottom: 10px;">
-              <div style="display: flex;justify-content:flex-start;">
-                <div style="padding: 0px 5px;">
-                  <el-select v-model="qaList.resolve" style="width: 110px;" clearable>
-                    <el-option label="未解决" :value="false"></el-option>
-                    <el-option label="已解决" :value="true"></el-option>
-                  </el-select>
-                </div>
-                <div style="padding: 0px 5px;"><el-input placeholder="关键词搜索" v-model="qaList.title"></el-input></div>
-                <div style="padding: 0px 5px;"><el-button @click="findQa" icon="el-icon-search" type="primary" >搜索</el-button></div>
-              </div>
-            </div> -->
             <qa-items :items="qaList.list" @confirm="confirm" :collect="true" :share="false" :remove="false" :edit="false"></qa-items>
           </div>
-          <!-- v-if="qaList.count>qaList.pageSize" -->
           <div v-if="qaList.list.length > 0" style="text-align: center;margin-top:57px">
             <el-pagination
               background
@@ -189,6 +196,29 @@
             </div>
           </div>
         </el-tab-pane>
+        <el-tab-pane label="回答" name="answer">
+          <div>
+            <answer-items :items="answerList.list" @confirm="confirm"></answer-items>
+          </div>
+          <div v-if="answerList.list.length > 0" style="text-align: center;margin-top:57px">
+            <el-pagination
+              background
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="answerList.pageIndex"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="answerList.pageSize"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="answerList.count"
+            ></el-pagination>
+          </div>
+          <div v-else>
+            <div v-if="answerList.list.length == 0">
+              <div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
+              <div v-else class="zan-wu">暂无数据</div>
+            </div>
+          </div>
+        </el-tab-pane>
       </el-tabs>
       <div style="height: 100px;text-align: center;"></div>
     </div>
@@ -199,15 +229,18 @@
 import articleItems from '@/components/Article/collectList.vue';
 import courseItems from '@/components/Course/collectItem.vue';
 import caseItems from '@/components/Case/collectList.vue';
+import noteList from '@/components/HomePage/favoritesNote.vue'
 import qaItems from '@/components/Qa/favoritesQaList.vue';
+import answerItems from '@/components/Qa/answerList.vue';
 import apiFavorite from '@/api/modules/favorites.js';
 import apiUser from '@/api/system/user.js';
+import apiNote from '@/api/phase2/note.js';
 import apiCourse from "@/api/modules/coursePortal.js";
 import courseImage from '@/components/Course/courseImage.vue';
 import {cutFullName} from "@/utils/tools.js";
 export default {
   name: 'myShareIndex',
-  components: { articleItems, courseItems, qaItems, courseImage,caseItems },
+  components: { articleItems, courseItems, qaItems, courseImage,caseItems,noteList,answerItems},
   data() {
     return {
       isSearh:false,
@@ -227,6 +260,12 @@ export default {
           label: '录播课'
         }
       ],
+      answerList:{
+        pageIndex: 1,
+        pageSize: 10,
+        count: 0,
+        list: []
+      },
       qaList: {
         pageIndex: 1,
         pageSize: 10,
@@ -239,6 +278,12 @@ export default {
         count: 0,
         list: []
       },
+      noteList:{
+        pageIndex: 1,
+        pageSize: 10,
+        count: 0,
+        list: []
+      },
       articleList: {
         type: '',
         pageIndex: 1,
@@ -270,12 +315,18 @@ export default {
     if (this.tabName == 'case') {
       this.findCase();
     }
+    if (this.tabName == 'note') {
+        this.findNote();
+      }
     if (this.tabName == 'article') {
       this.findArticle();
     }
     if (this.tabName == 'course') {
       this.findCourse();
     }
+    if (this.tabName == 'answer') {
+      this.findAnswer();
+    }
     if (this.tabName == 'all') {
       this.findAll();
     }
@@ -294,6 +345,9 @@ export default {
       if (this.tabName == 'case') {
         this.findCase();
       }
+      if (this.tabName == 'note') {
+        this.findNote();
+      }
       if (this.tabName == 'article') {
         this.findArticle();
       }
@@ -303,6 +357,9 @@ export default {
       if (this.tabName == 'all') {
         this.findAll();
       }
+      if (this.tabName == 'answer') {
+      this.findAnswer();
+    }
     },
     resData() {
       this.qaList.pageIndex = 1;
@@ -325,6 +382,9 @@ export default {
       if (tab.name == 'case') {
         this.findCase();
       }
+      if (this.tabName == 'note') {
+        this.findNote();
+      }
       if (tab.name == 'article') {
         this.findArticle();
       }
@@ -334,6 +394,9 @@ export default {
       if (tab.name == 'all') {
         this.findAll();
       }
+      if (this.tabName == 'answer') {
+      this.findAnswer();
+    }
     },
     //分页点击事件
     handleSizeChange(value) {
@@ -345,6 +408,9 @@ export default {
         this.caseList.pageSize = value;
         this.findCase();
       }
+      if (this.tabName == 'note') {
+        this.findNote();
+      }
       if (this.tabName == 'article') {
         this.articleList.pageSize = value;
         this.findArticle();
@@ -357,6 +423,10 @@ export default {
         this.dataList.pageSize = value;
         this.findAll();
       }
+      if (this.tabName == 'answer') {
+        this.answerList.pageSize = value;
+          this.findAnswer();
+        }
     },
     //分页点击事件
     handleCurrentChange(value) {
@@ -368,6 +438,10 @@ export default {
         this.caseList.pageIndex = value;
         this.findCase();
       }
+      if (this.tabName == 'note') {
+        this.noteList.pageIndex = value;
+        this.findNote();
+      }
       if (this.tabName == 'article') {
         this.articleList.pageIndex = value;
         this.findArticle();
@@ -380,6 +454,45 @@ export default {
         this.dataList.pageIndex = value;
         this.findAll();
       }
+      if (this.tabName == 'answer') {
+        this.answerList.pageIndex = value;
+        this.findAnswer();
+      }
+    },
+    findAnswer() {
+      let query = {
+        pageIndex:this.answerList.pageIndex,
+        pageSize:this.answerList.pageSize,
+        // dataType:1,
+        // orderType 排序顺序 顺序倒叙
+        // orderField 排序字段
+        keyword: this.keyword.trim()
+      }
+      apiFavorite.findAnswerPage(query).then(res=>{
+        if(res.status==200){
+          res.result.list.forEach(item=>{
+            item.isAll = false;
+          })
+          this.answerList.count = res.result.count;
+          this.answerList.list = res.result.list;
+        }
+      })
+    },
+    findNote() {
+      let query = {
+        pageIndex:this.noteList.pageIndex,
+        pageSize:this.noteList.pageSize,
+        dataType:1,
+        // orderType 排序顺序 顺序倒叙
+        // orderField 排序字段
+        keyword: this.keyword.trim()
+      }
+      apiNote.pagelist(query).then(res=>{
+        if(res.status==200){
+          this.noteList.count = res.result.count;
+          this.noteList.list = res.result.list;
+        }
+      })
     },
     findAll() {
       let query = {
@@ -389,7 +502,7 @@ export default {
       };
       apiFavorite.queryAll(query).then(res=>{
         if(res.status==200){
-          this.dataList.count=res.result.count
+          this.dataList.count=res.result.count;
           if(res.result.length!=0){
             let courseIds=[];
             res.result.list.map(item=>{
@@ -405,6 +518,7 @@ export default {
                 item.question.content=item.content;
                 item.question.bestAnswer=item.bestAnswer;
                 item.question.id=item.id;
+                
               }
               if(item.type == 3){
               item.cases = {title:'',summary:''};
@@ -414,7 +528,11 @@ export default {
             }
             })
             this.loadCouserTeacher(res.result.list,courseIds);
-            this.dataList.list = res.result.list;
+            res.result.list.forEach(item=>{
+              item.isAll = false;
+            })
+            // this.dataList.list.push(...res.result.list);
+            this.dataList.list=res.result.list;
             this.getAllUserData(res.result.list);
           }else{
             this.dataList.list=[]
@@ -485,10 +603,14 @@ export default {
       // if (this.qaList.title) {
       query.keyword = this.keyword.trim();
       // }
-      apiFavorite.qaPageList(query).then(res => {
+      apiFavorite.qaPageList(query)
+      .then(res => {
         if (res.status == 200) {
           this.qaList.count = res.result.count;
-          this.qaList.list = res.result.list;
+          res.result.list.forEach(item =>{
+            item.isAll = false;
+          })
+          this.qaList.list.push(...res.result.list);
           if (this.qaList.list.length != 0) {
             this.getQaUserData(res.result.list);
           }
@@ -529,7 +651,10 @@ export default {
       apiFavorite.casePageList(query).then(res => {
         if (res.status == 200) {
           this.caseList.count = res.result.count;
-          this.caseList.list = res.result.list;
+          res.result.list.forEach(item =>{
+            item.isAll = false;
+          })
+          this.caseList.list.push(...res.result.list);
           if (this.caseList.list.length != 0) {
             this.getCaseUserData(res.result.list);
           }
@@ -678,7 +803,7 @@ export default {
     },
     confirm(item) {
       let id = '';
-      if(item.type){
+      if(item.favoriteId){
         id = item.favoriteId;
       } else {
         id = item.id;
@@ -692,6 +817,9 @@ export default {
           if (this.tabName == 'case') {
             this.findCase();
           }
+          if (this.tabName == 'note') {
+            this.findNote();
+          }
           if (this.tabName == 'article') {
             this.findArticle();
           }
@@ -701,6 +829,9 @@ export default {
           if (this.tabName == 'all') {
             this.findAll();
           }
+          if (this.tabName == 'answer') {
+            this.findAnswer();
+          }
         } else {
           this.$message.error(res.message);
         }
@@ -722,7 +853,7 @@ export default {
   color: #333333;
 }
 ::v-deep .el-tabs__active-bar {
-  background-color: #ffb30f;
+  // background-color: #ffb30f;
 }
 .tag-space {
   margin-right: 10px;
diff --git a/src/views/user/Mynotes.vue b/src/views/user/Mynotes.vue
new file mode 100644
index 00000000..ed9ee57b
--- /dev/null
+++ b/src/views/user/Mynotes.vue
@@ -0,0 +1,896 @@
+<template>
+    <div class="note-info-index">
+        <div class="note-hear">
+            <h3>我的笔记</h3>
+            <div>
+            <el-dropdown style="margin-left:15px" @command="exportCommand">
+                    <el-button>导出<i class="el-icon-arrow-down el-icon--right"></i></el-button>
+                    <el-dropdown-menu slot="dropdown">
+                        <!--
+                        <el-dropdown-item command="1">PDF</el-dropdown-item>
+                        -->
+                        <el-dropdown-item command="2">Excel</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
+                <el-dropdown style="margin-left:15px" @command="importCommand">
+                    <el-button>导入<i class="el-icon-arrow-down el-icon--right"></i>
+                    </el-button>
+                    <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item command="3">图片</el-dropdown-item>
+                        <el-dropdown-item command="1">Txt</el-dropdown-item>
+                        <el-dropdown-item command="2">Word</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
+
+            </div>
+        </div>
+        <div class="note-sift">
+                 <el-date-picker
+                 style="width:250px"
+                 @change="Time()"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                v-model="Filtertime"
+                type="daterange"
+                start-placeholder="开始"
+                end-placeholder="结束">
+                </el-date-picker>
+            <el-dropdown  @command="handleCommand">
+                    <el-button class="one-line-ellipsis">{{courseName ? courseName: '全部课程'}}<i class="el-icon-arrow-down el-icon--right"></i></el-button>
+                    <el-dropdown-menu slot="dropdown" style="height: 150px;overflow-y: auto !important;">
+                        <el-dropdown-item command="">全部</el-dropdown-item>
+                        <el-dropdown-item v-for="(cou,couidx) in couresna" :key="couidx" :command="cou">{{cou.courseName}}</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
+            <el-button @click="publish" class="el-buttons">
+                修改时间
+                <i  v-if="ordertime" class="el-icon-bottom"></i>
+                <i v-else class="el-icon-upload2"></i>
+                </el-button>
+            <el-button @click="thumbs" class="el-buttons">
+                点赞次数
+                 <i v-if="orderpiss" class="el-icon-bottom"></i>
+                 <i v-else class="el-icon-upload2"></i>
+                </el-button>
+        </div>
+        <div class="note-tab">
+            <div class="tabcontent">
+                <span @click="noteData(null)" :class=" num == null ? 'tab-textactive':''" >全部</span>
+                <span @click="noteData(1)" :class=" num == 1 ? 'tab-textactive':''" >线上笔记</span>
+                <span @click="noteData(2)" :class=" num == 2 ? 'tab-textactive':''" >导入笔记</span>
+            </div>
+        </div>
+        <div class="note-all">
+           <div class="note-all-info"  v-for="(item,idx) in datalist" :key="idx">
+              <div class="all-title">
+                 <h3 :class="item.courseId != ''?'pointer':''" @click="routerTo(item)"> {{ item.courseName }} </h3>
+                  <div class="drbut" v-if="item.type==2">导入</div>
+                  <div class="butbox" v-if="item.playTime != ''"><img :src="`${webBaseUrl}/images/coteplay.png`" alt=""> {{  getHMS(item.playTime) }} </div>
+                  <span style="margin-left:14px">{{item.openType == 9?'公开':'私密'}}</span>
+                  <h6>{{ item.sysUpdateTime }}</h6>
+              </div>
+              <div class="all-content" style="word-break:break-all;">
+                <span v-if="item.type == 1">{{item.content}}</span>
+             
+                 <span v-if="item.contentType != 3 && item.type == 2">
+                    <!-- {{ item.content }} -->
+                        {{displayAll(item)}}
+                            <span style="color:#588afc;cursor:pointer;" v-if="item.content && item.content.length>150" @click.stop="changeIsAll(item)">
+                                {{item.isAll?'收起':'全文展开'}}
+                            </span>
+                </span>
+                 <div v-else>
+                    <template v-for="img in item.content">
+                        <img @click="showBigImg(fileBaseUrl + img)"  :src="fileBaseUrl + img" alt="" style="max-width: 400px;"/>
+                    </template>
+                 </div>
+              </div>
+              <div class="all-footer">
+                  <div>
+                    <div class="textbut-box">
+                      <div style="padding-top: 8px;">
+                        <interactBar v-if="item.type == 1" nodeWidth="60px" :readonly="true"  :type="6" :data="item"  :shares="false" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar>
+                      </div>
+                      <el-button @click="deleteNote(item)" style=" margin-right: 10px;" class="textbut" type="text"><svg-icon icon-class="notedel" ></svg-icon>删除</el-button>
+                      <el-button @click="edit(item)" class="textbut" type="text"><svg-icon icon-class="noteedit" ></svg-icon> 编辑</el-button>
+                    </div>
+                  </div>
+              </div>
+           </div>
+           <div style="margin-top:50px;text-align: center">
+            <el-pagination
+            background
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="pageIndex"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="paegSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="count">
+            </el-pagination>
+           </div>
+        </div>
+        <!-- 导入 -->
+        <el-dialog
+        :visible.sync="importDialogVisible"
+        width="785px"
+        :close-on-click-modal="false">
+        <div class="import-info">
+            <p class="import-info-tip">导入笔记</p>
+            <div class="import-info-enclosure">
+                <label class="label"><svg-icon style="font-size:12px;margin-right:5px" icon-class="red-start"></svg-icon>标题</label>
+                <el-input
+                    type="text"
+                    placeholder="请输入内容"
+                    v-model="noteFile.courseName"
+                    maxlength="20"
+                    show-word-limit/>
+            </div>
+            <div class="import-info-enclosure">
+                <label class="label" style="width:66px"><svg-icon style="font-size:16px;margin-right:5px" icon-class="enclisure"></svg-icon>附件</label>
+                    <file-upload dir="files" ref="myUpload" :isClear="importDialogVisible" :fileType="upNoteFile.fileType" :showList="true" :value="imageShowUrl" :limit="upNoteFile.limit" @success="handleUploadSuccess" @remove="handleRemoveSuccess"></file-upload>
+                </div>
+        </div>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="importDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="noteSave()">确 定</el-button>
+        </span>
+        </el-dialog>
+     <el-dialog  width="700px"  class="export-dialog" :close-on-click-modal="false" :visible.sync="dialogVisible">
+        <div class="Exportbox" id="idPdfDom">
+            <div class="export-dialog-top">
+                <div class="export-dialog-left">
+                    <!--生成pdf有问题，这里需要单独的处理图片-->
+                    <author-img :avatar="userData.avatar" :aid="userData.aid" :sex="userData.sex"></author-img>
+                    <div class="userInfo-info">
+                        <p><span style="font-weight: 500;font-size: 22px;">{{userData.name}}</span><span style="font-size: 12px;margin-left:10px">{{userInfo.departFullName}}</span></p>
+                        <p>{{userData.sign}}</p>
+                    </div>
+                </div>
+                <div class="export-dialog-right">
+                    <p>累计导出{{exportPreData.length}}条</p>
+                    <p style="margin-top:10px">导出时间：{{formatDateShort(new Date())}}</p>
+                </div>
+
+            </div>
+            <div class="export-dialog-body">
+                <div class="Export-info" style="" v-for="(item,idx) in exportPreData" :key="idx">
+                <div class="all-title">
+                    <h3> {{item.courseName}}</h3>
+                    <div v-if="item.playTime != ''"><img :src="`${webBaseUrl}/images/coteplay.png`" alt="">{{item.playTime}}</div>
+                    <h6>{{item.sysCreateTime}}</h6>
+                </div>
+                <div class="all-content">
+                    <span v-if="item.contentType != 3">{{ item.content }}</span>
+                    <div v-else>
+                        <template v-for="img in item.imgList">
+                            <img style="max-width:400px" crossOrigin="anonymous" :src="fileBaseUrl + img" alt=""/>
+                        </template>
+                    </div>
+                </div>
+                </div>
+            </div>
+        </div>
+        <span slot="footer" class="dialog-footer">
+            <el-button class="footer-btn" style="color: #387DF7;" plain @click="dialogVisible = false">取 消</el-button>
+            <!-- <el-button @click="dialogVisible = false">打 印</el-button> -->
+            <el-button class="footer-btn" style="margin-right:36px" type="primary" @click="exportStart()">确 定</el-button>
+        </span>
+     </el-dialog>
+
+     <!-- 图片放大框 -->
+      <el-dialog
+        :visible.sync="dialogVisibleBigImage"
+        :close-on-click-modal="true"
+        width="30%">
+          <img :src="currentImagePath" style="width: 100%;" />
+      </el-dialog>
+
+    </div>
+</template>
+
+<script>
+import apiNote from '@/api/phase2/note.js';
+import interactBar from '@/components/Portal/interactBar.vue';
+import FileUpload from '@/components/NoteUpload/index.vue';
+import AuthorImg from '@/components/Portal/authorImg.vue';
+import { mapGetters } from 'vuex';
+import {formatDate,formatDateShort,getHMS} from '@/utils/tools.js';
+import apiUser from "@/api/system/user.js";
+export default {
+    components:{interactBar,FileUpload,AuthorImg},
+    computed: {
+    ...mapGetters(['userInfo'])
+  },
+  data(){
+      return{
+        getHMS,
+        dialogVisibleBigImage:false, // 显示图片放大框 true-显示弹框；false-隐藏弹框
+        currentImagePath:'',
+        userData:{},
+        formatDate,
+		formatDateShort,
+        noteFile:{
+            contentType:null,
+            type:2,
+            courseName:'',
+            filePath:'',
+            fileName:'',
+            openType:1,
+        },
+        upNoteFile:{
+            content:[],
+            fileType:[],//文件上传格式
+            contentType:null,
+            limit:1,
+        },
+
+        uploadFileUrl: process.env.VUE_APP_BASE_API + '/xboe/sys/xuploader/file/upload',
+        text:'',
+        importDialogVisible:false,
+        imageShowUrl:'',
+        count:0,
+          fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
+          options: [
+            {
+              value: '选项1',
+              label: 'PDF'
+            },
+            {
+              value: '选项2',
+              label: 'Excel'
+            }
+          ],
+           value1: '起止时间',
+           num :null,
+           dialogVisible: false,
+           pageIndex:1,
+           paegSize:10,
+           orderType:true,
+           orderField:'',
+           courseId:'',
+           startTime:'',
+           endTime:'',
+           datalist:[ ],
+           exportPreData:[],
+           thu:true,
+           couresna:[],
+           courseName:'',
+           ordertime:true,
+           orderpiss:true,
+           Filtertime:[],
+      }
+
+
+  },
+  mounted(){
+    this.noteData(null);
+    this.allcoures();
+    apiUser.getByIds([this.userInfo.aid]).then(res => {
+        if (res.status == 200) {
+           this.userData = res.result[0];
+        } else {
+          this.$message.error(res.message);
+        }
+    });
+  },
+  methods: {
+    displayAll(item) {
+      if (!item.isAll && item.content && item.content.length > 180) {
+        return item.content.slice(0, 150) + "...";
+      }
+      return item.content;
+    },
+    changeIsAll(item) {
+      item.isAll = !item.isAll;
+    },
+    // 笔记图片放大
+    showBigImg(path){
+          this.currentImagePath = path;
+          this.dialogVisibleBigImage = true;
+    },
+
+    routerTo(item) {
+        if(item.courseId) {
+            this.$router.push('/course/studyindex?id='+item.courseId);
+        }
+    },
+    exportCommand(e) {
+        this.exportType = e;
+        this.dialogVisible = false;
+        let data = {
+            orderType:this.orderType,
+            orderField:this.orderField,
+            courseId:this.courseId,
+            type:this.num,
+            startTime:this.startTime,
+            endTime:this.endTime,
+        }
+        // 获取导出文件前的预览数据
+        apiNote.exportExcelPre(data).then(res=>{
+          if(res.status != 200){return;}
+          if(res.result.data.length == 0){
+            this.$message.warning('未查询到满足条件的数据')
+            return;
+          }
+
+          if(res.result.isImage && e == 2){
+            this.$message.warning('当前筛选条件下含图片类内容，无法导出Excel！')
+            return;
+          }
+          res.result.data.forEach((item)=>{
+             if(item.contentType==3){
+               item.imgList=item.content.split(',');
+             }else{
+               item.imgList=[];
+             }
+          })
+          this.exportPreData = res.result.data;
+          this.dialogVisible = true;
+        })
+    },
+    exportStart(){
+
+        let ids = this.datalist.map(item=>{
+            if(item.contentType !=3) {
+              return item.id;
+            }
+        })
+        let data = {
+            name:this.userData.name,
+            sign:this.userData.sign,
+            orderType:this.orderType,
+            orderField:this.orderField,
+            courseId:this.courseId,
+            type:this.num,
+            startTime:this.startTime,
+            endTime:this.endTime,
+            author:this.userData.avatar,//this.userInfo.avatar,
+        }
+        if(this.exportType == '1') {
+
+          //apiNote.exportPdf(data);
+            // apiNote.exportPdf(data).then(res=>{
+            //     if(res.status) {
+            //        this.$message.error('导出失败');
+            //     } else {
+            //       const link = document.createElement('a');// 创建a标签
+            //         // let blob = new Blob([res],{type: 'application/vnd.ms-pdf;charset=UTF-8'}); // 设置文件类型
+            //       let blob = new Blob([res],{type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'}); // 设置文件类型
+            //         link.style.display = "none";
+            //         link.href = URL.createObjectURL(blob); // 创建URL
+            //         link.setAttribute("download", "我的笔记.pdf");
+            //         document.body.appendChild(link);
+            //         link.click();
+            //         document.body.removeChild(link);
+            //         this.dialogVisible = false;
+            //     }
+
+            // })
+        } else {
+            let data = {
+                orderType:this.orderType,
+                orderField:this.orderField,
+                courseId:this.courseId,
+                type:this.num,
+                startTime:this.startTime,
+                endTime:this.endTime,
+            }
+            // apiNote.exportExcel(ids).then(res=>{
+              apiNote.exportExcel(data).then(res=>{
+                if(res.status) {
+                    this.$message.error('导出失败');
+                } else {
+                    const link = document.createElement('a');// 创建a标签
+                    let blob = new Blob([res],{type: 'application/vnd.;charset=UTF-8'}); // 设置文件类型
+                    link.style.display = "none";
+                    link.href = URL.createObjectURL(blob); // 创建URL
+                    link.setAttribute("download", "我的笔记.xls");
+                    document.body.appendChild(link);
+                    link.click();
+                    document.body.removeChild(link);
+                    this.dialogVisible = false;
+                }
+
+            })
+        }
+    },
+    noteSave() {
+        if(this.noteFile.courseName == '') {
+           this.$message.warning('请填写标题！');
+           return
+        }
+        this.noteFile.contentType = this.upNoteFile.contentType;
+        if(this.upNoteFile.content.length > 0) {
+            this.noteFile.filePath = this.upNoteFile.content.join();
+        }
+        if(this.noteFile.filePath == '') {
+           this.$message.warning('您还没有上传文件！');
+           return
+        }
+        apiNote.save(this.noteFile).then(res=>{
+            if(res.status == 200) {
+                this.$message.success('导入笔记成功');
+                this.importDialogVisible = false;
+                this.noteFile.courseName = '';
+                this.noteData(this.num);
+            }
+        })
+    },
+    handleBeforeUpload() {
+
+    },
+    importCommand(e){
+      this.importDialogVisible = true;
+      this.upNoteFile.contentType = e;
+      this.noteFile.filePath = '';
+      this.noteFile.fileName = '';
+      this.upNoteFile.content = [];
+      if(e == '3') {
+         this.upNoteFile.limit = 9;
+         this.upNoteFile.fileType = ["png","jpg","jpeg","bmp"];
+      } else if(e == '1'){
+        this.upNoteFile.fileType = ["txt"];
+      } else {
+        this.upNoteFile.fileType = ["doc","docx"];
+      }
+    },
+    handleRemoveSuccess(file) {
+        if(this.upNoteFile.contentType == 1) {
+            // this.upNoteFile.content.push()
+            // this.noteFile.filePath.replace(file.response.result.filePath+',','');
+            this.upNoteFile.content.forEach((item,index) => {
+                if(item == file.response.result.filePath) {
+                    this.upNoteFile.content.splice(index,1);
+                }
+            });
+        } else {
+            this.noteFile.filePath ='';
+            this.noteFile.fileName = '';
+        }
+    },
+    handleUploadSuccess(file) {
+        if(this.upNoteFile.contentType == 3) {
+            this.noteFile.fileName = '图片';
+            this.upNoteFile.content.push(file.result.filePath);
+            // this.noteFile.filePath += file.result.filePath;
+        } else {
+            this.noteFile.filePath = file.result.filePath;
+            this.noteFile.fileName = file.result.displayName;
+        }
+    },
+    handleCommand(e) {
+      this.courseId = e.courseId;
+      this.courseName = e.courseName;
+      console.log(e,'e');
+      this.noteData(this.num);
+    },
+      Time(val){
+        if(this.Filtertime && this.Filtertime.length > 0) {
+            this.startTime = this.Filtertime[0];
+            this.endTime =  this.Filtertime[1];
+        } else {
+            this.startTime ='';
+            this.endTime =  '';
+        }
+        this.noteData(this.num);
+      },
+      deleteNote(item) {
+          let $this=this;
+          this.$confirm('移除后将不在笔记列表中展示', '确定要删除您的笔记吗？', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+              apiNote.del(item.id).then(res=>{
+                if(res.status==200){
+                  this.noteData(this.num);
+                  this.$message({type:'success', message: '删除成功!'});
+                  //删除事件
+                  let event = {
+                    key: "DeleteNote",//
+                    title: "删除笔记",//
+                    parameters:"author",//
+                    content: "删除了笔记",//
+                    source:'page',
+                    objId: item.id,//关联的id
+                    objType: "6",//关联的类型
+                    objInfo: "",
+                    aid: this.userInfo.aid, //当前登录人的id
+                    aname: this.userInfo.name,//当前人的姓名
+                    status: 1 //状态，直接写1
+                  }
+                  this.$store.dispatch("userTrigger", event);
+                }else{
+                  this.$message({type:'success', message: '删除失败!'+res.message});
+                }
+
+              });
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除',
+            });
+          });
+      },
+      couresitem(item){
+        this.courseId = item.courseId;
+        this.noteData(this.num)
+      },
+
+      allcoures(){
+        apiNote.course().then(res=>{
+            this.couresna = res.result
+        })
+      },
+      publish(){
+         this.ordertime = !this.ordertime;
+          this.orderType = !this.orderType;
+          this.orderField = 'sysUpdateTime';
+          this.noteData(this.num)
+      },
+      thumbs(){
+        this.orderpiss = !this.orderpiss;
+         this.orderField = 'praises';
+         this.orderType = !this.orderType;
+         this.noteData(this.num)
+      },
+      edit(item){
+      this.$router.push({ path: `/user/Noteedit?id=${item.id}` });
+      },
+      noteData(tab){
+        this.num = tab
+        let data = {
+            pageIndex:this.pageIndex,
+            paegsize:this.paegSize,
+            orderType:this.orderType,
+            orderField:this.orderField,
+            courseId:this.courseId,
+            type:this.num,
+            startTime:this.startTime,
+            endTime:this.endTime,
+        }
+        apiNote.query(data).then(res=>{
+            if(res.status == 200) {
+                res.result.list.forEach((item,index)=>{
+                    if(item.type == 2 && item.contentType !== 3) {
+                        item.isAll = false;
+                    }
+                  if(item.contentType == 3) {
+                    item.content = item.content.split(',');
+                  }
+                });
+                this.datalist = res.result.list;
+                this.count = res.result.count;
+            }
+
+        })
+      },
+    handleSizeChange(val) {
+        this.paegSize = val;
+        this.pageIndex = 1;
+        this.noteData(this.num);
+    },
+    handleCurrentChange(val) {
+        this.pageIndex = val;
+        this.noteData(this.num);
+    }
+
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.drbut{
+    width: 80px;
+    height: 30px;
+    border-radius: 4px;
+    border: 1px solid #3379FB;
+    font-size: 14px;
+    font-weight: 400;
+    color: #387DF7;
+    line-height: 30px;
+    text-align: center;
+    float: left;
+    margin: 0 20px;
+}
+    ::v-deep .el-dropdown-menu__item:not(.is-disabled):hover{
+   background-color: #fff !important;
+   color: #0059FF !important;
+}
+::v-deep.el-dropdown-menu {
+   border: none !important;
+}
+    .footer-btn{
+        width: 140px;
+        height: 40px;
+        border-radius: 4px;
+        border: 1px solid #387DF7;
+    }
+    ::v-deep  .note-sift{
+       .el-dropdown-menu{
+
+        }
+    }
+   ::v-deep .export-dialog{
+        .el-dialog__header{
+            display: none;
+        }
+        .el-dialog__body{
+            padding: 0;
+        }
+        .export-dialog-top{
+            height: 90px;
+            background: linear-gradient(128deg, #70B0FF 0%, #4B7CFF 15%, #4678FF 39%, #7599FF 76%, rgba(1,72,228,0.85) 100%);
+            box-shadow: 14px 12px 14px 2px rgba(0,0,0,0.03);
+            padding: 16px 46px 16px 56px;
+            color: #fff;
+            display: flex;
+            justify-content: space-between;
+          .export-dialog-left{
+                display: flex;
+                // ::v-deep  .item-author .el-avatar{
+                //     width: 60px !important;
+                //     height: 60px !important;
+                // }
+                .el-avatar{
+                    width: 60px;
+                    height: 60px;
+                 img{
+                    width: 100% !important;
+                    }
+                }
+                .userInfo-info{
+                    margin-left: 40px;
+                }
+            }
+            .export-dialog-right{
+                text-align: right;
+            }
+        }
+        .export-dialog-body{
+            margin: 40px 13px 0 53px;
+            padding-right: 36px;
+            height: 500px;
+            overflow-y: auto;
+        }
+    }
+    .note-info-index{
+        padding: 15px 18px;
+       ::v-deep .el-upload-dragger{
+            width: 500px;
+            height: 168px;
+        }
+        .import-info{
+            padding: 0 74px;
+        }
+        .import-info-tip{
+            font-size: 18px;
+            font-weight: 600;
+            color: #333333;
+            margin-bottom: 34px;
+        }
+        .import-info-enclosure{
+            display: flex;
+            margin-bottom: 27px;
+            .label{
+                width: 72px;
+                font-size: 16px;
+                color: #666666;
+                font-weight: 400;
+
+            }
+        }
+    }
+.el-select-dropdown__item{
+    width: 140px !important;
+}
+.el-input--medium .el-input__inner{
+    height: 40px;
+    line-height: 40px;
+}
+.el-dropdown-menu--medium .el-dropdown-menu__item{
+    width: 100% !important;
+    // height: 30px !important;
+    overflow: hidden;
+    text-overflow:ellipsis;
+    white-space: nowrap;
+  display: block;
+  word-break:break-all;
+}
+.el-dropdown-menu{
+    width: 140px !important;
+    padding: 12px  10px;
+    overflow: hidden;
+    li{
+        text-align: center;
+    }
+
+}
+.el-popper{
+    margin-top: 5px;
+}
+.Export-info{
+    border-bottom: 1px solid #ddd;
+    padding-bottom:30px;
+    margin-bottom:35px
+}
+.Export-info:last-child{
+    border: none;
+
+}
+::v-deep.dr-dialog{
+    max-width: 870px !important;
+}
+ .all-title{
+           height: 50px;
+           display: flex;
+           .daoru{
+                width: 80px;
+                height: 30px;
+                border-radius: 4px;
+                border: 1px solid #3379FB;
+           }
+           h6{
+               margin: 0;
+               margin-left: auto;
+               float: right;
+               font-size: 14px;
+               color: #999999;
+               font-weight: 400;
+           }
+           h3{
+              font-size: 18px;
+              font-weight: 600;
+              color: #333333;
+              margin: 0;
+              float: left;
+           }
+           span{
+               width: 53px;
+               height: 22px;
+               border-radius: 10px;
+               border: 1px solid #3379FB;
+               font-size: 14px;
+               font-weight: 400;
+               color: #3379FB;
+               text-align:center;
+               margin-top: 2px;
+               display: inline-block;
+           }
+           .butbox{
+                width: 120px;
+                height: 30px;
+                border-radius: 4px;
+                border: 1px solid #3379FB;
+                font-size: 14px;
+                font-weight: 400;
+                color: #387DF7;
+                line-height: 30px;
+                text-align: center;
+                float: left;
+                margin: 0 20px;
+                img{
+                    width: 10px;
+                    // height: 16px;
+                    padding-top: 6px;
+                    vertical-align: top;
+                    margin-right: 12px;
+                }
+           }
+       }
+
+
+::v-deep.el-dialog__header{
+    background: url('../../../public/images/daochubg.png') 100% / 100% !important;
+}
+.textbut-box{
+    // position: absolute;
+    // right: 0;
+    display: flex;
+}
+.textbut{
+        font-size: 12px;
+        font-weight: 400;
+        color: #6E7B84 !important;
+
+}
+.note-all{
+    width: 100%;
+    .note-all-info{
+       border-bottom: 1px solid #ddd;
+       padding-top: 35px;
+       .all-footer{
+           height: 10px;
+           padding-bottom: 45px;
+           width: 100%;
+           div{
+               float: right;
+           }
+       }
+       .all-content{
+           font-size: 14px;
+           font-weight: 400;
+           white-space: pre-line;
+           color: #333333;
+           img{
+               max-width: 400px;
+               margin-right: 23px;
+           }
+       }
+
+    }
+}
+.tabcontent{
+    span{
+         margin-right: 45px;
+        padding: 0 7px;
+        text-align: center;
+        padding-bottom: 14px;
+        display: inline-block;
+    }
+}
+
+.tab-textactive{
+    border-bottom: 4px solid #3379FB;
+    transform: all 0.3s;
+    font-weight: 600;
+}
+.note-tab{
+    height: 40px;
+    margin-top: 40px;
+    border-bottom: 1px solid #ddd;
+}
+.el-buttons{
+    width: 160px !important;
+    height: 40px;
+    border-radius: 4px;
+    // margin-left: 20px;
+}
+.el-buttons:hover{
+    background-color: #fff !important;
+    border: 1px solid #ddd !important;
+    color: #0059FF !important;
+}
+.el-buttons:focus{
+    background-color: #fff !important;
+    color: #0059FF !important;
+    border: 1px solid #ddd !important;
+}
+.note-sift{
+    button{
+        width: 160px;
+        height: 40px;
+        border-radius: 4px;
+        margin-left: 20px;
+    }
+   ::v-deep .el-input__inner{
+        height: 40px;
+    }
+}
+.note-hear{
+    width: 100%;
+    height: 50px;
+    div button{
+        width: 140px;
+        height: 40px;
+    }
+    h3{
+        margin: 0;
+        float: left;
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 30px;
+    }
+    div{
+        float: right;
+        button{
+            width: 140px;
+            font-size: 14px;
+            height: 40px;
+            border-radius: 4px;
+            border: 1px solid rgba(153,153,153,0.2);
+        }
+    }
+}
+</style>
diff --git a/src/views/user/Noteedit.vue b/src/views/user/Noteedit.vue
new file mode 100644
index 00000000..b18b58ff
--- /dev/null
+++ b/src/views/user/Noteedit.vue
@@ -0,0 +1,433 @@
+<template>
+   <div class="box" style="padding: 38px 42px;">
+      <div class="edit-box">
+         <div class="edit-hear">
+            <h3>笔记编辑</h3>
+            <span>{{isShowTip}}</span>
+            <span class="his-info pointer" @click="isShowList = true">历史记录</span>
+         </div>
+         <div :class="editContent">
+            <div  v-if="editdata.playTime" class="note-tit">
+                <div :style="{cursor:editdata.type==1? 'pointer':''}">
+					<img :src="`${webBaseUrl}/images/coteplay.png`" @click="toCoursePage()" alt="">
+					<span @click="toCoursePage()">{{getHMS(editdata.playTime)}}</span>
+					<img :src="`${webBaseUrl}/images/cotedetel.png`" style="margin-top:4px;margin-left:5px;" @click="timeDel()" />
+				</div>
+            </div>
+            <div class="note-text" v-if="editdata.contentType != 3">
+               <!-- <input style="vertical-align:top;outline:none;" type="textarea"  :rows="4" v-model="editdata.content"> -->
+                <textarea v-model="editdata.content" name="" id="" cols="" :rows="rowNum" style="vertical-align:top;outline:none;width:100%;border:none;padding-left:20px; background-color: #F5F5F5;font-size: 14px;font-weight: 400;color: #333333;" maxlength="200"
+  show-word-limit></textarea>
+            </div>
+            <div class="note-text" v-else>
+               <div class="img-box" v-for="(img,index) in imgContent">
+                  <img  :src="fileBaseUrl + img" alt=""/>
+                  <span class="del-icon"><i class="el-icon-delete" @click="imgDel(index)"></i></span>
+               </div>
+            </div>
+         </div>
+         <div class="edit-footer">
+            <el-radio-group  v-if="editdata.openType == 9" v-model="editdata.openType"><el-radio :label="9">公开</el-radio><el-radio :label="1">私密</el-radio></el-radio-group>
+            <el-radio-group  v-if="editdata.openType == 1" v-model="editdata.openType"><el-radio :label="1">私密</el-radio></el-radio-group>
+            <el-button style="margin-right:34%;box-shadow: 1px 8px 15px 1px rgba(56,125,247,0.18);" type="primary" @click="savedata">保存</el-button>
+            <el-button  @click="comeback">取消</el-button>
+         </div>
+      </div>
+      <div class="edti-hist" v-show="isShowList">
+         <h3>历史记录 <i style="font-size: 22px;color: #999;float: right;" @click="isShowList = false" class="el-icon-circle-close"></i></h3>
+         <div class="histinfo" v-for="(item,idx) in histdata" :key="idx">
+            <div class="hist-top">
+               编辑了笔记
+               <span style="font-size: 12px;">{{item.sysCreateTime}}</span>
+            </div>
+            <div class="hist-cont">
+               <div class="hist-tit">
+                  <div class="one-line-ellipsis">
+                      {{ item.noteName }}
+                  </div>
+                  <span class="pointer" @click="restore(item)"> <i class="el-icon-refresh-left"></i> 还原</span>
+               </div>
+               <div class="hist-text" v-if="editdata.contentType != 3">
+                 {{ item.beforeContent }}
+               </div>
+               <div class="hist-text" v-else>
+                 <template class="img-box" v-for="(before,index) in item.beforeContent">
+                  <img style="width:40px;height:65px;margin-right:10px" :src="fileBaseUrl + before" alt=""/>
+                 </template>
+               </div>
+            </div>
+         </div>
+      </div>
+   </div>
+</template>
+
+<script>
+import apiNote from '@/api/phase2/note.js'
+import {getHMS} from '@/utils/tools.js';
+export default {
+   data () {
+      return {
+         getHMS,
+         editContent: 'edit-content',
+         imgContent:[],
+         fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
+         isShowList:false,
+       isShowTip:'',
+        radio: '1',
+        editdata:{
+         content:'',
+         isAuto:false,
+         type:0,
+         courseId:''
+        },
+        histId:'',
+        histdata:[],
+        id:'',
+        timer:null,
+        rowNum:16
+      };
+    },
+    mounted(){
+      this.id = this.$route.query.id;
+      this.notedetail();
+      this.timer = setInterval(()=>{
+         this.savedata(1);
+      },30000);
+
+      let screenWidth = window.screen.availWidth;
+      if (screenWidth <= 1440) {
+        this.editContent = 'edit-content-low';
+        this.rowNum = 11;
+      }
+
+    },
+    methods:{
+      toCoursePage(){
+        if(this.editdata.type==1){
+          this.$router.push('/course/detail?id='+this.editdata.courseId);
+        }
+      },
+      imgDel(index) {
+         this.imgContent.splice(index,1);
+      },
+	  timeDel() {
+	      this.editdata.playTime = '';
+	  },
+       comeback(){
+          clearInterval(this.timer);
+          this.timer = null;
+          this.$router.go(-1);
+       },
+       notedetail(){
+           apiNote.detail(this.id).then(res=>{
+            if(res.result.contentType == 3 && res.result.content != '') {
+               this.imgContent = res.result.content.split(',');
+           }
+           this.editdata = res.result;
+           this.editdata.openTypeBackups = res.result.openType;
+           this.histId = res.result.id;
+
+           this.hist();
+        })
+       },
+       restore(item){
+         this.$confirm('确定还原此次笔记吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+         if(this.editdata.contentType == 3) {
+            this.imgContent = item.beforeContent;
+         } else {
+            this.editdata.content = item.beforeContent;
+         }
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消还原'
+          });
+        });
+
+         //  apiNote.restore(item.id).then(res=>{
+         //       this.$message({
+         //          message: '还原成功',
+         //          type: 'success'
+         //       });
+         //       this.hist();
+         //  })
+
+       },
+      hist(){
+         apiNote.history(this.histId).then(res=>{
+            if(this.editdata.contentType == 3) {
+               res.result.forEach(item=>{
+                  item.beforeContent = item.beforeContent.split(',');
+               })
+
+            }
+            this.histdata = res.result
+         })
+      },
+       savedata(num){
+         if(this.editdata.openTypeBackups == 1 && this.editdata.openType == 9) {
+           this.$message({
+                  message: '仅支持公开笔记转私密笔记！',
+                  type: 'warning'
+               });
+            this.editdata.openType == 1;
+         }
+         if(num == 1) {
+            this.editdata.isAuto = true;
+
+         }
+         if(this.imgContent.length > 0) {
+            this.editdata.content = this.imgContent.join();
+         }
+          apiNote.update(this.editdata).then(res=>{
+            if(res.status == 200) {
+               sessionStorage.setItem('isShowTip','');
+              if(num ==1) {//自动保存
+                  this.editdata.sysVersion += 1;
+                  this.isShowTip = '笔记自动保存成功';
+                  setTimeout(()=>{
+                     this.isShowTip = '';
+                  },10000*2)
+               } else {
+                  this.notedetail()
+                  this.$message({message: '笔记保存成功',type: 'success',center: true});
+                  // 跳转到笔记列表
+                  clearInterval(this.timer);
+                  this.timer = null;
+                  this.$router.go(-1);
+               }
+            } else {
+               this.isShowTip = '当前网络异常，内容已离线保存，请尝试连接网络后重新自动上传！';
+               setTimeout(()=>{
+                     this.isShowTip = '';
+                  },10000 * 2)
+               sessionStorage.setItem('isShowTip',this.editdata.content);
+            }
+          })
+       }
+    },
+    beforeDestroy() {
+      // clearInterval(this.timer);
+      // this.timer = null;
+      clearInterval(this.timer)
+      this.timer = null
+  },
+  destroyed(){
+   clearInterval(this.timer)
+   this.timer = null
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+.note-input{
+   outline-style: none;
+   border: none;
+   font-size: 14px;
+   font-weight: 400;
+   color: #333333;
+   width: 300px;
+   height: 300px;
+}
+.edti-hist{
+   position: absolute;
+   // height: 650px;
+   overflow-y: auto;
+   right: -10px;
+   top:-20px;
+   width: 380px;
+   padding: 0 30px;
+   box-sizing: border-box;
+   margin: 0;
+   font-size: 18px;
+   font-weight: 600;
+   color: #333333;
+   background: #FFFFFF;
+   box-shadow: -9px 2px 25px 0px rgba(119,119,119,0.16);
+   height: 700px;
+   border-radius: 4px;
+   h3{
+      margin: 0;
+      margin-top: 50px;
+      padding-bottom: 33px;
+      border-bottom: 1px solid rgba($color: #999999, $alpha: 0.2);
+   }
+   .histinfo{
+      // background: #F2F5F7;
+      .hist-cont{
+         // padding: 38px 32px;
+         box-sizing: border-box;
+         // height: 163px;
+         background: #FFFFFF;
+         border-radius: 4px;
+         margin-top: 20px;
+         padding-bottom: 30px;
+         border-bottom: 1px solid rgba($color: #999999, $alpha: 0.2);
+         .hist-text{
+            word-break:break-all;
+            font-weight: 400;
+            color: #666666;
+            margin-top: 20px;
+            font-size: 14px;
+            white-space: pre-wrap;
+         }
+         .hist-tit{
+            display: flex;
+            font-size: 16px;
+            font-weight: 600;
+            color: #666666;
+            div{
+               flex: 1;
+            }
+            span{
+               width: 60px;
+               left: auto;
+               color: #387DF7;
+               font-weight: 400;
+               font-size: 16px;
+            }
+         }
+      }
+      .hist-top{
+         font-size: 16px;
+         font-weight: 400;
+         color: #333333;
+         margin-top: 30px;
+         span{
+            float: right;
+            font-weight: 400;
+            color: #999999;
+            font-size: 16px;
+         }
+      }
+   }
+}
+.edit-footer{
+  margin-top:10px;
+   button{
+      float: right;
+      margin-left: 25px;
+      width: 140px;
+      height: 40px;
+      border-radius: 4px;
+   }
+}
+.edit-content{
+   min-height: 380px;
+   background-color: #F5F5F5;
+}
+
+.edit-content-low{
+   min-height: 200px;
+   background-color: #F5F5F5;
+}
+
+.note-text{
+   font-size: 14px;
+   font-weight: 400;
+   color: #333333;
+   background-color: #F5F5F5;
+   display: flex;
+   flex-wrap: wrap;
+   .img-box{
+      position: relative;
+      // display: flex;
+      .del-icon{
+         display: inline-block;
+         position: absolute;
+         top:0;
+         right:20px;
+      }
+   }
+   img{
+      width: 140px;
+      height: 175px;
+      margin-right: 23px;
+   }
+   input{
+      border: none;
+      font-size: 14px;
+      font-weight: 400;
+      color: #333333;
+      width: 100%;
+      height: 100px;
+   }
+}
+.note-tit{
+   padding-top: 30px;
+   width: 100%;
+   margin-bottom: 30px;
+   display: flex;
+       h3{
+              font-size: 18px;
+              font-weight: 600;
+              color: #333333;
+              margin: 0;
+              float: left;
+           }
+           div{
+                width: 120px;
+                height: 30px;
+                border-radius: 4px;
+                border: 1px solid #3379FB;
+                font-size: 14px;
+                font-weight: 400;
+                color: #387DF7;
+                line-height: 30px;
+                text-align: center;
+                float: left;
+                margin: 0 20px;
+                img{
+                    width: 10px;
+                    // height: 16px;
+                    padding-top: 6px;
+                    vertical-align: top;
+                    margin-right: 12px;
+                }
+           }
+
+}
+.box{
+   position: relative;
+   width: 100%;
+   height: 100%;
+   // display: flex;
+   .edit-box{
+      // flex: 1;
+      padding-right: 30px;
+      .his-info{
+         float: right;
+         font-weight: 600 !important;
+         color: #333333 !important;
+         font-size: 18px;
+      }
+      .edit-hear{
+         height: 40px;
+         border-bottom: 1px solid #ddd;
+         h3{
+            margin: 0;
+            float: left;
+            font-size: 18px;
+            font-weight: 600;
+            color: #333333;
+            line-height: 30px;
+
+         }
+         span{
+            font-size: 14px;
+            font-weight: 400;
+            color: #999999;
+            margin-left: 27px;
+            line-height: 30px;
+         }
+      }
+   }
+
+}
+
+</style>
diff --git a/src/views/user/Setting.vue b/src/views/user/Setting.vue
index 18ccd606..186f5218 100644
--- a/src/views/user/Setting.vue
+++ b/src/views/user/Setting.vue
@@ -1,36 +1,100 @@
 <template>
   <div class="personSetting">
-    <div class="avatar">
-      <el-avatar :src="avatar" :size="80" alt=""></el-avatar>
-      <span>{{userInfo.name}}</span>
-      <el-button type="primary" @click="openAvatar">修改头像</el-button>
+    <el-button type="text" class="passWard-btn"  @click="openPassword"><svg-icon icon-class="passWard-edit" style="margin-right: 10px;font-size: 22px;"></svg-icon>修改密码</el-button>
+    <div class="avatar" title="修改头像" @click="openAvatar">
+      <el-avatar :src="avatar" :size="116" alt=""></el-avatar>
+      <!-- <span>{{userInfo.name}}</span> -->
+      <!-- <el-button type="primary" @click="openAvatar">修改头像</el-button> -->
+      <div @click="openAvatar" class="avatarhover">
+       <img :src="`${webBaseUrl}/images/phone.png`" alt="">
+       <h6>修改头像</h6>
     </div>
-    <el-form :model="form" label-position="right" label-width="80px">
+    </div>
+
+    <!-- <el-form :model="form" label-position="right" label-width="80px"> -->
       <div class="informationItem">
         <div class="information-header">
           <h4>基础信息</h4>
-          <el-button type="primary" @click="openPassword">修改密码</el-button>
         </div>
-        <el-form-item label="姓名">
-           <el-input v-model="form.name" disabled></el-input>
-        </el-form-item>
-        <el-form-item label="性别">
-          <el-select v-model="form.gender" disabled>
-            <el-option label="男" :value="1"></el-option>
-            <el-option label="女" :value="2"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="Email地址">
-           <el-input v-model="form.account.email" disabled></el-input>
-        </el-form-item>
-        <el-form-item label="手机号">
-           <el-input v-model="form.account.mobile" disabled></el-input>
-        </el-form-item>
-        <el-form-item label="生日">
-           <el-input v-model="form.birthday" disabled></el-input>
-        </el-form-item>
+        <ul class="base-info">
+          <li><label class="label" style="width:32px">姓名</label><span class="info-text">{{form.name}}</span></li>
+          <li><label class="label" style="width:32px">性别</label><span class="info-text">{{form.gender == 1?'男':'女'}}</span></li>
+          <li><label class="label">所属部门</label><span class="info-text">{{form.departName}}</span></li>
+        </ul>
+        <ul class="base-info">
+          <li><label class="label" style="width:32px">生日</label><span class="info-text">{{form.birthday}}</span></li>
+          <li><label class="label">手机号</label><span class="info-text">{{form.account.mobile}}</span></li>
+          <li><label class="label">邮箱</label><span class="info-text">{{form.account.email}}</span></li>
+        </ul>
       </div>
-    </el-form>
+      <div class="informationItem">
+        <div class="information-header">
+          <h4>个人签名<svg-icon v-show="!signData.isEdit" type="primary" @click="signData.isEdit = true" icon-class="passWard-edit" style="margin-left: 10px;font-size: 18px;cursor: pointer;"></svg-icon></h4>
+        </div>
+        <div class="base-info">
+          <label class="label" style="min-width:70px;text-align: left;">我的签名</label>
+          <p class="info-text" style="width:540px" v-show="!signData.isEdit">
+            {{form.sign}}
+            
+          </p>
+          <el-input v-show="signData.isEdit" style="width:40%;height:40px" type="textarea" maxlength="20" v-model="signData.sign" :rows="1"></el-input>
+          <el-button v-show="signData.isEdit" style="margin-left:110px" @click="signData.isEdit = false">取消</el-button>
+          <el-button v-show="signData.isEdit" type="primary" @click="saveSign()">保存</el-button>
+          <!-- <el-button v-show="!signData.isEdit" style="margin-left:110px" type="primary" @click="signData.isEdit = true"></el-button> -->
+        </div>
+      </div>
+      <div class="informationItem">
+        <div class="information-header">
+          <h4>个人主页设置<svg-icon v-show="!hideHomeEdit" type="primary" @click="hideHomeEdit = true" icon-class="passWard-edit" style="margin-left: 10px;font-size: 18px;cursor: pointer;"></svg-icon></h4>
+        </div>
+        <div class="dynamic-range"> 
+          <el-radio v-model="hideHome" :label="true">关闭个人主页</el-radio>
+          <el-radio v-model="hideHome" :label="false">打开个人主页</el-radio>
+          <!-- <el-checkbox v-model="hideHome"> 关闭个人主页 </el-checkbox> -->
+          <el-button v-show="hideHomeEdit" style="margin-left:110px" @click="hideHomeEdit = false">取消</el-button>
+          <el-button v-show="hideHomeEdit" type="primary" @click="saveHideHome()">保存</el-button>
+           <!-- <el-button v-show="!dynamicData.isEdit" style="margin-left:110px" type="primary" @click="dynamicData.isEdit = true">编辑</el-button> -->
+        </div>
+      </div>
+      <div class="informationItem">
+        <div class="information-header">
+          <h4>动态可见范围<svg-icon v-show="!dynamicDataEdit" type="primary" @click="dynamicDataEdit = true" icon-class="passWard-edit" style="margin-left: 10px;font-size: 18px;cursor: pointer;"></svg-icon></h4>
+        </div>
+        <div class="dynamic-range">
+           <el-radio v-model="form.dynamic" :label="1">全部动态</el-radio>
+           <el-radio v-model="form.dynamic" :label="2">最近半年动态</el-radio>
+           <el-radio v-model="form.dynamic" :label="3">最近三个月动态</el-radio>
+           <el-button v-show="dynamicDataEdit" style="margin-left:110px" @click="dynamicDataEdit = false">取消</el-button>
+           <el-button type="primary" v-show="dynamicDataEdit" @click="saveDynamic()">保存</el-button>
+           <!-- <el-button v-show="!dynamicData.isEdit" style="margin-left:110px" type="primary" @click="dynamicData.isEdit = true">编辑</el-button> -->
+        </div>
+      </div>
+         <h4>兴趣爱好 <svg-icon v-show="!interestIsEdit" type="primary" @click="interestIsEdit = true" icon-class="passWard-edit" style="margin-left: 10px;font-size: 18px;cursor: pointer;"></svg-icon></h4>
+         <div class="interest" v-show="!interestIsEdit">
+            <ul class="interest-ul">
+              <li class="interest-li" v-for="int in interestList" :key="int.id">{{int.name}}</li>
+            </ul>
+         </div>
+         <div v-show="interestIsEdit">
+          <div class="interest" v-for="(sys,index) in sysTypeListMap" :key="sys.id">
+           <span class="interest-title">{{sys.name}}</span>
+           <div style="width:100%">
+            <el-checkbox-group v-model="checkboxGroup" v-if="sys.children.length > 0">
+              <el-checkbox size="medium" border v-for="ch in sys.children" :label="ch.id" :key="ch.id">{{ch.name}}</el-checkbox>
+            </el-checkbox-group>
+           </div>
+          </div>
+         </div>
+
+         <div style="text-align: center;margin-top:56px">
+          <el-button v-show="interestIsEdit" @click="interestIsEdit = false">取消</el-button>
+          <el-button v-show="interestIsEdit" type="primary" @click="saveHobby()">保存</el-button>
+          <!--
+          <el-button v-show="!interestIsEdit" type="primary" @click="interestIsEdit = true">编辑</el-button>
+          -->
+         </div>
+      <!-- </div> -->
+    <!-- </el-form> -->
     <el-dialog
       title="上传头像"
       :visible.sync="dialogVisibleAvatar"
@@ -79,11 +143,13 @@
 </template>
 
 <script>
-  import { mapGetters } from 'vuex';
+  import { mapGetters, mapActions } from 'vuex';
   import userApi from "@/api/system/user";
   import accountApi from "@/api/account";
   import apiPassword from '@/api/boe/login.js'
   import imageUpload from '@/components/ImageUpload/index.vue';
+  import apiUserhobby from "@/api/phase2/userhobby.js"
+   const cityOptions = ['上海', '北京', '广州', '深圳'];
   export default{
     components:{imageUpload},
     data(){
@@ -124,6 +190,16 @@
         }
       };
       return {
+        dynamicDataEdit:false,
+        hideHomeEdit:false,
+        signData:{
+          sign:'',
+          isEdit:false
+        },
+        hideHome:false,// 是否隐藏个人主页
+        cities: cityOptions,
+        checkboxGroup: [],
+        radio: '1',
         form:{
           account:{}
         },
@@ -138,13 +214,16 @@
           confirmPass: [
             { validator: validatePass3, trigger: 'blur' }
           ]
-        }
+        },
+        sysTypeListMap:[],
+        interestList:[],//已有兴趣爱好列表
+        interestIsEdit:false,
       }
     },
     computed: {
-      ...mapGetters(['userInfo']),
+
+      ...mapGetters(['userInfo','sysTypeMap']),
       avatar(){
-        console.log(this.userInfo,'this.userInfo')
         if(this.userInfo.avatar){
           if(this.userInfo.avatar.indexOf('http')==-1){
             return this.baseUrl+this.userInfo.avatar
@@ -162,32 +241,150 @@
       }
     },
     watch:{
+      // hideHome() {
+      //    this.hideHomeEdit = true;
+      // },
       dialogVisiblePassword(val) {
         if(!val) {
            this.passwordForm={};
         }
+      },
+
+      // 监听"编辑按钮"事件变化
+      interestIsEdit(){
+        this.load();
+        this.getInfo();
       }
+
+
     },
     mounted(){
-      //console.log(this.userInfo,'this.userInfo')
       if(this.userInfo.avatar){
         this.avatarUrl = this.avatar;
       }
+      this.hideHome = !this.userInfo.showHome;
       this.load();
+      this.getInfo();
+      this.getSysTypeTree().then(rs => {
+        this.sysTypeListMap = rs;
+      });
     },
     methods:{
+      // 保存个人主页选项的编辑
+      saveHideHome(){
+         //执行隐藏操作
+         userApi.updateShowHome(!this.hideHome).then(res=>{
+            if(res.status == 200) {
+              this.hideHomeEdit = false;
+              //this.userInfo.showHome = !this.hideHome;
+              this.$message.success('修改成功');
+              this.$store.dispatch('InitData');
+            }
+         })
+      },
+      checkAndSendFinish(){
+        //验证并发送完成事件
+        if(this.userInfo.avatar && this.form.sign && this.form.sign!='' && this.interestList.length>1){
+           let event = {
+             key: "FinishSelf",//后台的事件key  发布文章且审核通过
+             title: "完善个人信息奖励",//事件的标题
+             parameters:"",//用户自定义参数 name:value,name:value
+             content: "需完成头像，个性签名，学习偏好设置",//事件的内容
+             source:'page',
+             objId: this.userInfo.aid,//关联的id
+             objType: "98",//关联的类型
+             objInfo: "个人信息",
+             aid: this.userInfo.aid, //当前登录人的id
+             aname: this.userInfo.name,//当前人的姓名
+             status: 1 //状态，直接写1
+           }
+           this.$store.dispatch("userTrigger", event);
+        }else{
+          // console.log('还未达到奖励');
+          // console.log('this.userInfo.avatar',this.userInfo.avatar);
+          // console.log('this.form.sign',this.form.sign);
+          // console.log('this.interestList',this.interestList);
+        }
+      },
+      saveDynamic() {
+        userApi.updateDynamic(this.form.dynamic).then(res=>{
+           if(res.status == 200) {
+            this.dynamicDataEdit = false;
+            this.$message.success('修改动态可见范围成功');
+           }
+        })
+      },
+      saveSign() {
+        userApi.updateSign(this.signData.sign).then(res=>{
+           if(res.status == 200){
+              this.$message.success('我的签名修改成功');
+              this.form.sign = this.signData.sign;
+              this.signData.isEdit = false;
+              this.checkAndSendFinish();
+           } else {
+            this.$message.error('保存失败：'+res.message);
+           }
+        })
+      },
+      getInfo() { //获取用户兴趣关联的id
+        this.checkboxGroup = [];
+        apiUserhobby.info(this.userInfo.aid).then(res=>{
+          if(res.status == 200) {
+            res.result.forEach(item=>{
+              this.checkboxGroup.push(item.refId);
+              item.name = this.sysTypeName(item.refId)
+            })
+            this.interestList = res.result;
+          }
+        })
+      },
+      sysTypeName(code){
+        if(code==''){return '';}
+        return this.sysTypeMap.get(code);
+      },
+
+      // 更新用户与偏好数据
+      saveHobby(){
+        let data = []
+        if(this.checkboxGroup.length  <3 && this.checkboxGroup.length>=1) {
+          this.$message.error('至少选择三个兴趣偏好！')
+          return;
+        }
+        this.checkboxGroup.forEach(item=>{
+          data.push({
+            type:1,
+            refId:item
+          })
+        })
+        apiUserhobby.update(data).then(res=>{
+          if(res.status == 200) {
+            this.interestIsEdit = false;
+            this.getInfo();
+            this.checkAndSendFinish();
+            this.$message.success('更改成功！')
+          } else {
+            this.$message.error("更改失败！")
+          }
+        })
+      },
+      ...mapActions({
+            getResOwnerTree: 'resOwner/getResOwnerTree',
+            loadResOwners: 'resOwner/loadResOwners',
+            getSysTypeTree: 'sysType/getSysTypeTree',
+            loadSysTypes: 'sysType/loadSysTypes'
+        }),
       load(){
         userApi.detail(this.userInfo.aid).then(res=>{
-          //console.log(res)
           if(res.status==200){
-            //console.log(res)
-            //console.log(res.result,'res.result')
-            this.form=res.result
+            this.form=res.result;
+            this.signData.sign = res.result.sign;
+            if(res.result.dynamic == '') {
+              this.form.dynamic = 0;
+            }
           }
         });
       },
       openAvatar(){
-        //console.log(this.avatarUrl,'this.avatarUrl');
         this.dialogVisibleAvatar=true
       },
       openPassword(){
@@ -210,6 +407,7 @@
             this.$store.dispatch('InitData');
             this.$message.success("保存图片成功")
             this.dialogVisibleAvatar=false;
+            this.checkAndSendFinish();
           }else{
             this.$message.error("保存图片失败")
           }
@@ -236,48 +434,190 @@
 </script>
 
 <style lang="scss" scoped>
+.avatarhover{
+  width: 116px;
+   height: 116px;
+  background-color: rgba(0, 0, 0, 0.4);
+   border-radius: 50%;
+   position: absolute;
+   cursor:pointer;
+   display: none;
+   left: 0%;
+   top:0px;
+   text-align: center;
+  img{
+   width: 42px;
+   height: 38px;
+   vertical-align: bottom;
+   margin-top: 22px;
+   margin-bottom: 5px;
+  }
+  h6{
+  font-size: 18px;
+  font-weight: 400;
+  color: #FFFFFF;
+  margin: 0px;
+  }
+
+}
+.avatar:hover .avatarhover{
+  display: block;
+}
+::v-deep .el-checkbox-button--medium .el-checkbox-button__inner{
+  // padding: 10px 40px !important;
+  width: 146px;
+  height: 44px;
+  line-height: 24px;
+}
+::v-deep .el-checkbox-button.is-checked .el-checkbox-button__inner {
+  background-color: rgba(0,0,0,0) !important;
+  color: #387DF8 !important;
+}
+::v-deep .el-checkbox-button.is-focus .el-checkbox-button__inner{
+  // border-color:#fff !important;
+  outline: none;
+}
+// ::v-deep .el-checkbox-button.is-focus{
+//   border-color:none !important;
+//   outline: none !important;
+// }
+::v-deep .el-checkbox-button:first-child .el-checkbox-button__inner{
+  border-left:none;
+}
+.el-checkbox-button, .el-checkbox-button__inner {
+   margin-right: 40px;
+   background: #FFFFFF;
+   border-radius: 4px;
+   box-shadow: none;
+   border-left: 1px solid rgba(151,151,151,0.3);
+   box-shadow: 1px 0 0 0 #fff;
+}
+.interest{
+  display: flex;
+  padding-left: 20px;
+  .interest-ul{
+    display: flex;
+    flex-wrap: wrap;
+    .interest-li{
+      width: 146px;
+      height: 44px;
+      text-align: center;
+      line-height: 44px;
+      font-size: 14px;
+      color: #333333;
+      border: 1px solid rgba($color: #979797, $alpha: 0.3);
+      border-radius: 4px;
+      margin-right: 44px;
+      margin-bottom: 22px;
+    }
+  }
+
+  .interest-title{
+    width: 70px;
+    margin-right: 17px;
+    color: #333333;
+    font-size: 14px;
+    margin-bottom: 20px;
+  }
+  ::v-deep .el-checkbox__input{
+    display: none;
+  }
+  ::v-deep .el-checkbox{
+     width: 146px;
+     height: 44px;
+     margin-bottom: 22px;
+     text-align: center;
+     line-height: 26px;
+     margin-left: 0px;
+     margin-right: 48px;
+  }
+  ::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered{
+    margin-left: 0px;
+  }
+
+}
+ .dynamic-range{
+   span{
+     font-size: 14px;
+     color: #333333;
+     margin-right: 10px;
+   }
+ }
+  .depart{
+    font-size: 14px;
+    color: #999999;
+  }
+ ::v-deep .el-radio-button:first-child .el-radio-button__inner {
+      border: none !important;
+}
   .personSetting{
-    padding: 0 20px;
+    background-color: #fff;
+    box-sizing: border-box;
+    // padding: 30px 0px 0px 247px;
+    padding: 30px 0 10% 20%;
+    // margin: 0 auto;
+    position: relative;
     .avatar{
-      display:flex;
-      align-items: center;
-      span{
-        margin-left: 10px;
-      }
-      .el-button{
-        margin-left: auto;
-      }
+      width: 116px;
+      height: 116px;
+      position: absolute;
+      cursor:pointer;
+      left: 5%;
+      top:56px;
+    }
+    .passWard-btn{
+      position: absolute;
+      font-size: 16px;
+      top:45px;
+      right:45px;
+    }
+
+    ::v-deep .el-radio-button__inner{
+      background: #F4F4F4 !important;
+      border-radius: 4px !important;
+    }
+    ::v-deep .el-radio-button__orig-radio:checked+.el-radio-button__inner{
+      color: #FFF;
+      background-color: #387DF7 !important;
+      border-color: #387DF7;
+      box-shadow: -1px 0 0 0 #387DF7;
     }
     .informationItem{
-      &:first-of-type{
-        margin-top: 10px;
-      }
+      min-width: 600px;
+      padding-right: 10%;
+      margin-bottom: 82px;
       .information-header{
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        padding: 10px 0;
-        border-bottom: 1px solid #dddddd;
-        margin-bottom: 22px;
+        // display: flex;
+        // justify-content: space-between;
+        // align-items: center;
+        // padding: 10px 0;
+        margin-bottom: 35px;
       }
-      ::v-deep .el-form-item{
-        font-size: 12px;
-        .el-form-item__label{
-          color: #bbbbbb;
-          font-weight: 400;
+      .base-info{
+        margin: 0;
+        display: flex;
+        margin-bottom: 46px;
+        text-align: left;
+        // flex-direction: row;
+        // flex-wrap: nowrap;
+        li{
+          width: 260px;
+          text-align: left;
+          // flex-grow: 2;
         }
-        .el-form-item__content{
-          .el-input__inner{
-            background: #ffffff;
-            width: 336px;
-            height: 34px;
-            cursor: text;
-            color:#343434;
-            border-radius:6px;
-          }
-          .el-input__suffix{
-            display: none;
-          }
+        .label{
+          display: inline-block;
+          font-size: 16px;
+          font-weight: 400;
+          color: #333333;
+          width: 64px;
+          margin-right: 20px;
+          text-align: left;
+        }
+        .info-text{
+          font-size: 14px;
+          color: #999999;
+          text-align: left;
         }
       }
     }
diff --git a/src/views/user/ranking.vue b/src/views/user/ranking.vue
new file mode 100644
index 00000000..fc939619
--- /dev/null
+++ b/src/views/user/ranking.vue
@@ -0,0 +1,785 @@
+<template>
+  <div class="page-ranking">
+    <div class="page-ranking-col experience">
+          <div class="exp-hear">
+           <div class="exp-hear-text">
+                  经验值排行榜
+                  <el-tooltip placement="top"  effect="light">
+                    <div slot="content" style="line-height:13px;">
+                      所有用户经验值TOP排行榜单，通过学习、贡献等行为可以获得经验值 。</br></br>
+                      系统已经根据您在4月23日新系统上线之后产生的学习数据对经验值进行</br>
+                      <span  style="line-height:15px;">了初始化，更早的数据以及老系统中产生的数据，将在2022年底一次性</span></br>
+                      补充到您的经验值中，请您耐心等待。
+                    </div>
+                    <svg-icon style="margin-left: 14px;font-size:20px;padding-top: 4px;" icon-class="doubt"></svg-icon>
+                  </el-tooltip>
+                  <span class="exp-hear-textbor"></span>
+             </div>
+              <div class="exp-hear-xiala">
+                 <el-dropdown trigger="click"  @command="experienceCommand">
+                    <span class="el-dropdown-link pointer">
+                        {{experience.name}}<i class="el-icon-arrow-down el-icon--right"></i>
+                    </span>
+                    <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item command="total">累计</el-dropdown-item>
+                        <el-dropdown-item command="weeks">本周</el-dropdown-item>
+                        <el-dropdown-item command="months">本月</el-dropdown-item>
+                        <el-dropdown-item command="years">本年</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+          </div>
+          <div class="myselftext">
+             <div class="myranking">
+                 累计排名 :  <span> {{currentUserRankingTotalData.rankNo}}</span>
+             </div>
+             <div class="myexperience">
+                 累计经验值 :  <span>{{currentUserRankingTotalData.rankValue}}</span>
+             </div>
+          </div>
+
+          <!--
+          <div class="exp-bar">
+            <h6> {{currentUserRankingTotalData.rankValue}}/{{currentUserRankingTotalData.endValue}}</h6>
+            <div class="exp-barbox">
+                <el-progress :percentage="currentUserRankingTotalData.rankValue*100/currentUserRankingTotalData.endValue" color="#387DF7"></el-progress>
+            </div>
+            <div class="exp-barname">
+                <span>{{current.start}}</span>
+                <span>{{current.end}}</span>
+            </div>
+          </div>
+          -->
+
+          <div class="exp-table" style="margin-top:20px;">
+             <div class="table-hear">
+                <div style="margin-left:5px">排名</div>
+                <div style="margin-left:5px">姓名</div>
+                <div class="bm">经验值</div>
+             </div>
+             <div>
+            <div class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px" v-for="(ran,index) in experience.list" :key="ran.id">
+                 <div class="tab-rank" >
+                    <img v-if="index ==0" :src="`${webBaseUrl}/images/rank1.png`" alt=""/>
+                    <img v-if="index ==1" :src="`${webBaseUrl}/images/rank2.png`" alt=""/>
+                    <img v-if="index ==2" :src="`${webBaseUrl}/images/rank3.png`" alt=""/>
+                    <div v-if="index >2" style="line-height: 40px;padding-left:15px;font-size: 16px;color: #333333;">{{index+1}}</div>
+                </div>
+                 <div class="tab-name">
+                    <author-img :avatar="ran.authorInfo.avatar" :aid="ran.authorInfo.aid" :sex="ran.authorInfo.sex"></author-img>
+                    <div>
+                        <span>{{ran.authorInfo.name}}</span>
+                        <div class="tab-bm">{{cutOrgNamePath(ran.authorInfo.orgInfo)}}</div>
+                    </div>
+
+                     </div>
+                 <div class="jy tab-jy">
+                     <div v-if="experience.field == 'total'" style="font-size: 18px;color: #333333;font-weight: 600;">{{ran.total}}</div>
+                     <div v-if="experience.field == 'months'" style="font-size: 18px;color: #333333;font-weight: 600;">{{ran.months}}</div>
+                     <div v-if="experience.field == 'years'" style="font-size: 18px;color: #333333;font-weight: 600;">{{ran.years}}</div>
+                     <div v-if="experience.field == 'weeks'" style="font-size: 18px;color: #333333;font-weight: 600;">{{ran.weeks}}</div>
+                 </div>
+             </div>
+             </div>
+
+             <div v-if="experience.data.rankingNo>5" style="margin-top:20px;border-bottom: 1px solid #ddd;padding-bottom:40px">
+                 <div v-if="experience.data.rankingNo>5" class="omit">
+                     <div>.</div> <div>.</div> <div>.</div>
+                 </div>
+             </div>
+
+
+             <div v-if="experience.data.rankingNo>5" class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px">
+                 <div style="color: #0059FF;line-height: 40px;padding-left:14px;font-size: 16px;" class="tab-rank" >{{experience.data.rankingNo}}</div>
+                 <div class="tab-name" v-if="userInfo.aid">
+                    <author-img :avatar="userInfo.avatar" :aid="userInfo.aid" :sex="userInfo.sex"></author-img>
+                    <div>
+                        <span style="color: #0059FF;">{{userInfo.name}}</span>
+                        <div class="tab-bm" style="color: #0059FF;">{{cutOrgNamePath(userInfo.departFullName)}}</div>
+                    </div>
+                </div>
+
+                 <div class="jy tab-jy">
+                     <div v-if="experience.field == 'total'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{experience.data.total}}</div>
+                     <div v-if="experience.field == 'months'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{experience.data.months}}</div>
+                     <div v-if="experience.field == 'years'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{experience.data.years}}</div>
+                     <div v-if="experience.field == 'weeks'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{experience.data.weeks}}</div>
+                 </div>
+             </div>
+
+          </div>
+      </div>
+
+    <div class="page-ranking-col Duration">
+           <div class="exp-hear">
+              <div class="exp-hear-text">
+                  学习时长排行榜
+                  <el-tooltip placement="top"  effect="light">
+                    <div slot="content">所有用户学习时长TOP排行榜单，统计单位为小时</div>
+                    <svg-icon style="margin-left: 14px;font-size:20px;padding-top: 4px;" icon-class="doubt"></svg-icon>
+                  </el-tooltip>
+                  <span class="exp-hear-textbor"></span>
+             </div>
+              <div class="exp-hear-xiala">
+                 <el-dropdown trigger="click" @command="durationCommand">
+                    <span class="el-dropdown-link pointer">
+                        {{learningDuration.name}}<i class="el-icon-arrow-down el-icon--right"></i>
+                    </span>
+                    <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item command="total">累计</el-dropdown-item>
+                        <el-dropdown-item command="weeks">本周</el-dropdown-item>
+                        <el-dropdown-item command="months">本月</el-dropdown-item>
+                        <el-dropdown-item command="years">本年</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+          </div>
+          <div class="myselftext">
+             <div class="myranking">
+                 累计排名 :  <span> {{learningDurationTotalData.rankNo}}</span>
+             </div>
+             <div class="myexperience">
+                 累计学习时长:  <span> {{formatSecondToHour(learningDurationTotalData.rankValue)}}</span> h
+             </div>
+          </div>
+           <div class="exp-table" style="margin-top:20px;">
+             <div class="table-hear">
+                <div style="margin-left:5px">排名</div>
+                <div style="margin-left:5px">姓名</div>
+                <div style="margin-left:32%;">学习时长:小时</div>
+             </div>
+             <div>
+            <div class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px" v-for="(lan,idx) in learningDuration.list" :key="lan.id">
+                 <div class="tab-rank">
+                    <img v-if="idx ==0" :src="`${webBaseUrl}/images/rank1.png`" alt=""/>
+                    <img v-if="idx ==1" :src="`${webBaseUrl}/images/rank2.png`" alt=""/>
+                    <img v-if="idx ==2" :src="`${webBaseUrl}/images/rank3.png`" alt=""/>
+                    <div v-if="idx >2" style="line-height: 40px;padding-left:15px;font-size: 16px;color: #333333;">{{idx+1}}</div>
+                </div>
+                 <div class="tab-name">
+                    <author-img :avatar="lan.authorInfo.avatar" :aid="lan.authorInfo.aid" :sex="lan.authorInfo.sex"></author-img>
+                    <div>
+                        <span>{{lan.authorInfo.name}}</span>
+                        <div class="tab-bm">{{cutOrgNamePath(lan.authorInfo.orgInfo)}}</div>
+                    </div>
+                </div>
+                 <div class="jy tab-jy">
+                     <div v-if="learningDuration.field == 'total'" style="font-size: 18px;color: #333333;font-weight: 600;">{{formatSecondToHour(lan.total)}}</div>
+                     <div v-if="learningDuration.field == 'months'" style="font-size: 18px;color: #333333;font-weight: 600;">{{formatSecondToHour(lan.months)}}</div>
+                     <div v-if="learningDuration.field == 'years'" style="font-size: 18px;color: #333333;font-weight: 600;">{{formatSecondToHour(lan.years)}}</div>
+                     <div v-if="learningDuration.field == 'weeks'" style="font-size: 18px;color: #333333;font-weight: 600;">{{formatSecondToHour(lan.weeks)}}</div>
+                 </div>
+             </div>
+             </div>
+
+             <div v-if="learningDuration.data.rankingNo>5" style="margin-top:20px;border-bottom: 1px solid #ddd;padding-bottom:40px">
+                 <div v-if="learningDuration.data.rankingNo>5" class="omit">
+                     <div>.</div> <div>.</div> <div>.</div>
+                 </div>
+             </div>
+
+             <div v-if="learningDuration.data.rankingNo>5" class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px">
+                 <div style="color: #0059FF;line-height: 40px;padding-left:14px;font-size: 16px;" class="tab-rank" >{{learningDuration.data.rankingNo}}</div>
+                 <div class="tab-name" v-if="userInfo.aid">
+                    <author-img  :avatar="userInfo.avatar" :aid="userInfo.aid" :sex="userInfo.sex"></author-img>
+                    <div>
+                        <span style="color: #0059FF;">{{userInfo.name}}</span>
+                        <div class="tab-bm" style="color: #0059FF;">{{cutOrgNamePath(userInfo.departFullName)}}</div>
+                    </div>
+                </div>
+                 <div class="jy tab-jy">
+                     <div v-if="learningDuration.field == 'total'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{formatSecondToHour(learningDuration.data.total)}}</div>
+                     <div v-if="learningDuration.field == 'months'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{formatSecondToHour(learningDuration.data.months)}}</div>
+                     <div v-if="learningDuration.field == 'years'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{formatSecondToHour(learningDuration.data.years)}}</div>
+                     <div v-if="learningDuration.field == 'weeks'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{formatSecondToHour(learningDuration.data.weeks)}}</div>
+                 </div>
+             </div>
+          </div>
+      </div>
+
+    <div class="page-ranking-col Duration">
+           <div class="exp-hear study-info">
+              <div class="exp-hear-text">
+                  学习天数排行榜
+                  <el-tooltip placement="top"  effect="light">
+                    <div slot="content">所有用户学习天数TOP排行榜单，每活跃学习1天可累计学习天数</div>
+                    <svg-icon style="margin-left: 14px;font-size:20px;padding-top: 4px;" icon-class="doubt"></svg-icon>
+                  </el-tooltip>
+                  <span class="exp-hear-textbor" style="background:#f1b48f !important"></span>
+             </div>
+              <div class="exp-hear-xiala">
+                 <el-dropdown trigger="click" @command="daysCommand">
+                    <span class="el-dropdown-link pointer">
+                        {{learningDays.name}}<i class="el-icon-arrow-down el-icon--right"></i>
+                    </span>
+                    <el-dropdown-menu slot="dropdown">
+                        <el-dropdown-item command="total">累计</el-dropdown-item>
+                        <el-dropdown-item command="weeks">本周</el-dropdown-item>
+                        <el-dropdown-item command="months">本月</el-dropdown-item>
+                        <el-dropdown-item command="years">本年</el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+          </div>
+          <div class="myselftext">
+             <div class="myranking">
+                 累计排名 :  <span> {{learningDaysTotalData.rankNo}}</span>
+             </div>
+             <div class="myexperience">
+                 累计学习天数 :  <span>{{learningDaysTotalData.rankValue}}</span>
+             </div>
+          </div>
+           <div class="exp-table" style="margin-top:20px;">
+             <div class="table-hear">
+                <div style="margin-left:5px">排名</div>
+                <div style="margin-left:5px">姓名</div>
+                <div style="margin-left:41%;">学习天数</div>
+             </div>
+             <div>
+            <div class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px" v-for="(day,inx) in learningDays.list" :key="day.id">
+                 <div class="tab-rank" >
+                    <img v-if="inx ==0" :src="`${webBaseUrl}/images/rank1.png`" alt=""/>
+                    <img v-if="inx ==1" :src="`${webBaseUrl}/images/rank2.png`" alt=""/>
+                    <img v-if="inx ==2" :src="`${webBaseUrl}/images/rank3.png`" alt=""/>
+                    <div v-if="inx >2" style="line-height: 40px;padding-left:15px;font-size: 16px;color: #333333;">{{inx+1}}</div>
+                </div>
+                 <div class="tab-name">
+                    <author-img :avatar="day.authorInfo.avatar" :aid="day.authorInfo.aid" :sex="day.authorInfo.sex"></author-img>
+                    <div>
+                        <span>{{day.authorInfo.name}}</span>
+                        <div class="tab-bm">{{cutOrgNamePath(day.authorInfo.orgInfo)}}</div>
+                    </div>
+                </div>
+
+                 <div class="jy tab-jy">
+                     <div v-if="learningDays.field == 'total'" style="font-size: 18px;color: #333333;font-weight: 600;">{{day.total}}</div>
+                     <div v-if="learningDays.field == 'weeks'" style="font-size: 18px;color: #333333;font-weight: 600;">{{day.weeks}}</div>
+                     <div v-if="learningDays.field == 'months'" style="font-size: 18px;color: #333333;font-weight: 600;">{{day.months}}</div>
+                     <div v-if="learningDays.field == 'years'" style="font-size: 18px;color: #333333;font-weight: 600;">{{day.years}}</div>
+                 </div>
+             </div>
+             </div>
+             
+             <div v-if="learningDays.data.rankingNo>5" style="margin-top:20px;border-bottom: 1px solid #ddd;padding-bottom:40px">
+                 <div v-if="learningDays.data.rankingNo>5" class="omit">
+                     <div>.</div> <div>.</div> <div>.</div>
+                 </div>
+             </div>
+             
+
+             <div v-if="learningDays.data.rankingNo>5" class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px">
+                 <div style="color: #0059FF;line-height: 40px;padding-left:14px;font-size: 16px;" class="tab-rank" >{{learningDays.data.rankingNo}}</div>
+                 <div class="tab-name" v-if="userInfo.aid">
+                    <author-img  :avatar="userInfo.avatar" :aid="userInfo.aid" :sex="userInfo.sex"></author-img>
+                    <div>
+                        <span style="color: #0059FF;">{{userInfo.name}}</span>
+                        <div class="tab-bm" style="color: #0059FF;">{{cutOrgNamePath(userInfo.departFullName)}}</div>
+                    </div>
+                </div>
+
+                 <div class="jy tab-jy">
+                     <div v-if="learningDays.field == 'total'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{learningDays.data.total}}</div>
+                     <div v-if="learningDays.field == 'weeks'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{learningDays.data.weeks}}</div>
+                     <div v-if="learningDays.field == 'months'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{learningDays.data.months}}</div>
+                     <div v-if="learningDays.field == 'years'" style="font-size: 18px;color: #333333;font-weight: 600;color: #0059FF;">{{learningDays.data.years}}</div>
+                 </div>
+             </div>
+          </div>
+      </div>
+
+
+
+  </div>
+</template>
+
+<script>
+    import apiUser from "@/api/system/user.js";
+    import apiStat from '@/api/phase2/stat.js';
+    import { mapGetters } from 'vuex';
+    import authorImg from '@/components/Portal/authorImg.vue';
+    import {translate,experienceValue,formatSecondToHour,cutOrgNamePath} from "@/utils/tools.js";
+export default {
+    computed: {
+      ...mapGetters(['userInfo']),
+
+      },
+      components: {authorImg},
+  data(){
+      return{
+        experienceValue,
+        cutOrgNamePath:cutOrgNamePath,
+        current:{},
+        currentUserRankingTotalData:{
+          rankNo:0, // 经验值累计排名
+          rankValue:0 ,// 经验值累计,
+          endValue:0 // 累计经验值进度条最大值
+        },
+        translate,
+        formatSecondToHour:formatSecondToHour,
+        experience:{
+            field:'total',
+            name:'累计',
+            data:{
+                rankingNo:0,
+                total:0
+            },
+            list:[],
+        },
+        learningDuration:{
+            field:'total',
+            name:'累计',
+            data:{
+                rankingNo:0,
+                total:0
+            },
+            list:[],
+        },
+        learningDurationTotalData:{
+          rankNo:0, // 学习时长累计排名
+          rankValue:0  // 累计学习时长
+        },
+        learningDaysTotalData:{
+          rankNo:0, // 学习天数累计排名
+          rankValue:0  // 累计学习天数
+        },
+        learningDays:{
+            field:'total',
+            name:'累计',
+            data:{
+                rankingNo:0,
+                total:0
+            },
+            list:[],
+        }
+      }
+  },
+  mounted() {
+    this.getExperience();
+    this.getDuration();
+    this.getDays();
+  },
+  methods:{
+
+    // 经验值排行榜（下拉框事件）
+    experienceCommand(e) {
+        this.experience.field = e;
+        this.experience.name = this.translate(e)
+        this.getExperience();
+    },
+    // 学习时长（下拉框事件）
+    durationCommand(e) {
+        this.learningDuration.field = e;
+        this.learningDuration.name = this.translate(e)
+        this.getDuration();
+    },
+    // 学习天数（下拉框事件）
+    daysCommand(e) {
+        this.learningDays.field = e;
+        this.learningDays.name = this.translate(e)
+        this.getDays();
+    },
+    getExperience() {//经验值
+  let data = {
+      aid:this.userInfo.aid,// #用户id
+      statType:20, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
+      field:this.experience.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
+      num:5,//  #显示的条数
+  }
+  apiStat.getRanking(data).then(res=>{
+      if(res.status==200){
+          if(res.result.currentUserRankingData) {
+              res.result.currentUserRankingData.authorInfo={
+                  aid: "",
+                  name: "",
+                  orgInfo: "",
+                  avatar: "",
+                  sex: null
+              }
+              this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData])
+              this.experience.data = res.result.currentUserRankingData;
+              if(this.experience.field == 'total') {
+                this.current = this.experienceValue(res.result.currentUserRankingData.total);
+                this.currentUserRankingTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
+                this.currentUserRankingTotalData.rankValue = res.result.currentUserRankingData.total;
+                this.currentUserRankingTotalData.endValue = this.current.endValue;
+              }
+          }
+          this.current.total=res.result.currentUserRankingData.total;//当前用户的经验值是固定的
+         const ids= [];
+         res.result.rankingData.forEach(item=>{
+          ids.push(item.aid)
+          item.authorInfo = {
+              aid: "",
+              name: "",
+              orgInfo: "",
+              avatar: "",
+              sex: null
+          }
+         })
+         this.getUserData(ids,res.result.rankingData)
+         this.experience.list = res.result.rankingData;
+      }
+  })
+    },
+    getDuration() {//学习时长
+      let data = {
+          aid:this.userInfo.aid,// #用户id
+          statType:10, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
+          field:this.learningDuration.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
+          num:5,//  #显示的条数
+      }
+      apiStat.getRanking(data).then(res=>{
+          if(res.status==200){
+              if(res.result.currentUserRankingData) {
+                  res.result.currentUserRankingData.authorInfo={
+                      aid: "",
+                      name: "",
+                      orgInfo: "",
+                      avatar: "",
+                      sex: null
+                  }
+                  this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData])
+                  this.learningDuration.data = res.result.currentUserRankingData;
+                  if(data.field == 'total'){
+                    this.learningDurationTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
+                    this.learningDurationTotalData.rankValue = res.result.currentUserRankingData.total;
+                  }
+              }
+
+
+             const ids= [];
+             res.result.rankingData.forEach(item=>{
+              ids.push(item.aid)
+              item.authorInfo = {
+                  aid: "",
+                  name: "",
+                  orgInfo: "",
+                  avatar: "",
+                  sex: null
+              }
+             })
+             this.getUserData(ids,res.result.rankingData)
+             this.learningDuration.list = res.result.rankingData;
+          }
+      })
+    },
+    //学习天数
+    getDays() {
+      let data = {
+          aid:this.userInfo.aid,// #用户id
+          statType:11, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
+          field:this.learningDays.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
+          num:5,//  #显示的条数
+      }
+      apiStat.getRanking(data).then(res=>{
+          if(res.status==200){
+              if(res.result.currentUserRankingData) {
+                  res.result.currentUserRankingData.authorInfo={
+                      aid: "",
+                      name: "",
+                      orgInfo: "",
+                      avatar: "",
+                      sex: null
+                  }
+                  this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData]);
+                  this.learningDays.data = res.result.currentUserRankingData;
+                  if(data.field == 'total'){
+                    this.learningDaysTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
+                    this.learningDaysTotalData.rankValue = res.result.currentUserRankingData.total;
+                  }
+              }
+
+             const ids= [];
+             res.result.rankingData.forEach(item=>{
+              ids.push(item.aid)
+              item.authorInfo = {
+                  aid: "",
+                  name: "",
+                  orgInfo: "",
+                  avatar: "",
+                  sex: null
+              }
+             })
+             this.getUserData(ids,res.result.rankingData)
+             this.learningDays.list = res.result.rankingData;
+          }
+      })
+    },
+    getUserData(ids,list) {
+                const noReapetIds = [...new Set(ids)];
+                apiUser.getByIds(noReapetIds).then(res => {
+                    if (res.status == 200) {
+                        list.forEach((item, index) => {
+                            res.result.some(author => {
+                            if (author.aid == item.aid) {
+                                item.authorInfo = author;
+                                return true;
+                            } else {
+                                return false;
+                            }
+                        });
+                    });
+                    } else {
+                    this.$message.error(res.message);
+                    }
+                });
+    },
+}
+}
+</script>
+
+<style lang="scss" scoped>
+  //只是控制布局
+  .page-ranking{
+    padding:15px 18px;
+    display:flex;
+    overflow-x: auto;
+  }
+  ::v-deep .el-dropdown-menu__item:not(.is-disabled):hover{
+        background-color: #fff !important;
+        color: #0059FF !important;
+    }
+  ::v-deep.el-dropdown-menu {
+      border: none !important;
+  }
+  .page-ranking-col{
+     min-width: 430px;
+     //padding-right:30px;
+     padding-right: 5%;
+  }
+
+.omit{
+  padding-left: 13px;
+  div{
+      font-size: 30px;
+      line-height: 10px;
+      color: #D8D8D8;
+  }
+}
+.exp-table{
+      //width: 100%;
+      padding-left: 25px;
+      padding-right: 10px;
+      .table-hear{
+         display: flex;
+        div{
+        //  margin-right: 13%;
+         min-width: 60px;
+         font-size: 14px;
+         font-weight: 400;
+         color: #999999;
+       }
+      .bm{
+        //   flex: 1;
+          margin-left: 46%;
+        // float: right;
+      }
+      .jy{
+          margin-left: auto;
+          text-align: right;
+          margin-right: 0;
+          text-align: center;
+      }
+      }
+
+
+  }
+ .myselftext{
+      height: 75px;
+      padding: 0 25px;
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
+      .myranking{
+        //   flex: 1;
+          line-height: 75px;
+          font-size: 14px;
+          font-weight: 400;
+          color: #666666;
+          span{
+              color: #333;
+              font-weight: 600;
+              font-size: 18px;
+          }
+      }
+      .myexperience{
+        //   text-align: right;
+          line-height: 75px;
+        //   margin-left: auto;
+          font-size: 14px;
+          font-weight: 400;
+          color: #666666;
+          span{
+              color: #333;
+              font-weight: 600;
+              font-size: 18px;
+          }
+      }
+  }
+.tab-jy{
+    padding-top: 10px;
+    padding-right: 10px;
+    div{
+        line-height: 28px;
+        width: 70px;
+        text-align: center;
+        font-size: 18px;
+        color: #333333;
+        font-weight: 600;
+        height: 28px;
+        background: #F7F8FA;
+        border-radius: 14px;
+    }
+}
+.tab-bm{
+    font-size: 12px !important;
+    color: #666666;
+    margin-top: 7px;
+}
+.exp-table .table-hear div{
+    min-width: 65px !important;
+}
+.tab-name{
+    min-width: 65px;
+    display: flex;
+    ::v-deep .item-author{
+        min-width: 54px !important;
+    }
+    img{
+        width: 40px;
+        height: 40px;
+        vertical-align: middle;
+    }
+    span{
+        color: #333333;
+        font-size: 14px;
+        font-weight: 600;
+    }
+
+}
+.tab-rank{
+    width: 54px;
+    img{
+         width: 40px;
+         height: 40px;
+
+    }
+}
+.experience{
+  .exp-hear{
+      //width: 100%;
+      height: 65px;
+      background: url('../../../public/images/expbg.png') no-repeat 100% / 100%;
+      .exp-hear-text{
+          float: left;
+          line-height: 65px;
+          margin-left: 25px;
+          font-size: 18px;
+          font-weight: 600;
+          color: #333333;
+          position: relative;
+          z-index: 888;
+          .exp-hear-textbor{
+            width: 108px;
+            height: 10px;
+            background: #9CC7FC;
+            border-radius: 9px;
+            display: inline-block;
+            position: absolute;
+            left: 0;
+            z-index: -1;
+            top: 60%;
+          }
+      }
+      .exp-hear-xiala{
+          line-height: 65px;
+          float: right;
+          margin-right: 15px;
+      }
+
+  }
+
+  .exp-bar{
+      //width: 100%;
+      h6{
+           font-size: 14px;
+            color: #666666;
+            font-weight: 600;
+            margin: 0;
+            margin-left: 50px;
+     }
+     .exp-barname{
+         //width: 100%;
+         padding: 20px 35px;
+         display: flex;
+         span{
+             flex: 1;
+         }
+     }
+     .exp-barbox{
+         //width: 100%;
+         height: 8px;
+        //  background: #ECF1FE;
+         border-radius: 6px;
+         margin-left: 25px;
+         margin-top: 3px;
+         position: relative;
+         z-index: 1;
+         ::v-deep .el-progress__text{
+            display: none;
+         }
+         .exp-bar-cont{
+             width: 230px;
+             height: 6px;
+             background: #0059FF;
+             border-radius: 6px;
+             opacity: 0.56;
+             position: absolute;
+             left: 0;
+             z-index: 999;
+         }
+     }
+
+
+  }
+}
+.Duration{
+
+  .study-info{
+      height: 62px !important;
+      background: url('../../../public/images/study-info.png') no-repeat 100% / 100% !important;
+  }
+  .exp-hear{
+      //width: 100%;
+      height: 62px;
+      background: url('../../../public/images/Durbg.png') no-repeat 100% / 100%;
+      .exp-hear-text{
+          float: left;
+          line-height: 62px;
+          margin-left: 25px;
+          font-size: 18px;
+          font-weight: 600;
+          color: #333333;
+          position: relative;
+          z-index: 888;
+          .exp-hear-textbor{
+            width: 130px;
+            height: 10px;
+            background: #FDAFB3 ;
+            border-radius: 9px;
+            display: inline-block;
+            position: absolute;
+            left: 0;
+            z-index: -1;
+            top: 60%;
+          }
+      }
+      .exp-hear-xiala{
+          line-height: 65px;
+          float: right;
+          margin-right: 15px;
+      }
+
+  }
+}
+</style>
diff --git a/vue.config.js b/vue.config.js
index 8a9cdf0f..c0c6035f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -114,7 +114,7 @@ module.exports = {
         proxy: {
             '/systemapi': {
                 // 目标代理服务器地址
-                target: 'http://localhost:9090',
+                target: 'http://192.168.0.11:9090',
                 changeOrigin: true,
                 logLevel:'debug',
                 secure: false,
@@ -124,13 +124,33 @@ module.exports = {
             },
             '/uboeApi': {
                 // 目标代理服务器地址
-                target: 'http://u-pre.boe.com',
+                target: 'https://u-pre.boe.com',
                 changeOrigin: true,
                 secure: false,
                 pathRewrite: {
                     '^/uboeApi': '/api'
                 }
             },
+            '/statApi': {
+                // 目标代理服务器地址
+                target: 'http://192.168.0.11:9080',
+                changeOrigin: true,
+                logLevel:'debug',
+                secure: false,
+                pathRewrite: {
+                  '^/statApi': ''
+                }
+              },
+              '/socialApi': {
+                // 目标代理服务器地址
+                target: 'http://192.168.0.11:9081',
+                changeOrigin: true,
+                logLevel:'debug',
+                secure: false,
+                pathRewrite: {
+                  '^/socialApi': ''
+                }
+              },
         },
     },
 }