reghao 4 年之前
父节点
当前提交
f3e3176f63

+ 2 - 63
package-lock.json

@@ -2437,14 +2437,6 @@
       "integrity": "sha1-3TeelPDbgxCwgpH51kwyCXZmF/0=",
       "dev": true
     },
-    "async-validator": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmmirror.com/async-validator/download/async-validator-1.8.5.tgz",
-      "integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=",
-      "requires": {
-        "babel-runtime": "6.x"
-      }
-    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz",
@@ -2529,11 +2521,6 @@
         "resolve": "^1.12.0"
       }
     },
-    "babel-helper-vue-jsx-merge-props": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
-      "integrity": "sha1-Iq69OzOQIyjlEyk6jkmSs4T58bY="
-    },
     "babel-loader": {
       "version": "8.1.0",
       "resolved": "https://registry.npm.taobao.org/babel-loader/download/babel-loader-8.1.0.tgz?cache=0&sync_timestamp=1584715910722&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-loader%2Fdownload%2Fbabel-loader-8.1.0.tgz",
@@ -2556,27 +2543,6 @@
         "object.assign": "^4.1.0"
       }
     },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "http://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.12",
-          "resolved": "https://registry.npmmirror.com/core-js/download/core-js-2.6.12.tgz",
-          "integrity": "sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw="
-        },
-        "regenerator-runtime": {
-          "version": "0.11.1",
-          "resolved": "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz",
-          "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk="
-        }
-      }
-    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz",
@@ -4244,7 +4210,8 @@
     "deepmerge": {
       "version": "1.5.2",
       "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz?cache=0&sync_timestamp=1572279556265&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeepmerge%2Fdownload%2Fdeepmerge-1.5.2.tgz",
-      "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M="
+      "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M=",
+      "dev": true
     },
     "default-gateway": {
       "version": "5.0.5",
@@ -4715,19 +4682,6 @@
       "integrity": "sha1-LnAjRITgPXx+kDENfXn9N3U3nDQ=",
       "dev": true
     },
-    "element-ui": {
-      "version": "2.13.2",
-      "resolved": "https://registry.npmmirror.com/element-ui/download/element-ui-2.13.2.tgz",
-      "integrity": "sha1-WCv0eqqqr+I+oZWPriF6aHrQZEc=",
-      "requires": {
-        "async-validator": "~1.8.1",
-        "babel-helper-vue-jsx-merge-props": "^2.0.0",
-        "deepmerge": "^1.2.0",
-        "normalize-wheel": "^1.0.1",
-        "resize-observer-polyfill": "^1.5.0",
-        "throttle-debounce": "^1.0.1"
-      }
-    },
     "elliptic": {
       "version": "6.5.3",
       "resolved": "https://registry.npm.taobao.org/elliptic/download/elliptic-6.5.3.tgz?cache=0&sync_timestamp=1592492844326&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felliptic%2Fdownload%2Felliptic-6.5.3.tgz",
@@ -7910,11 +7864,6 @@
       "integrity": "sha1-suHE3E98bVd0PfczpPWXjRhlBVk=",
       "dev": true
     },
-    "normalize-wheel": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
-      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
-    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npm.taobao.org/npm-run-path/download/npm-run-path-2.0.2.tgz",
@@ -9665,11 +9614,6 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
-    "resize-observer-polyfill": {
-      "version": "1.5.1",
-      "resolved": "http://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
-    },
     "resolve": {
       "version": "1.17.0",
       "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.17.0.tgz",
@@ -10894,11 +10838,6 @@
         "neo-async": "^2.6.0"
       }
     },
-    "throttle-debounce": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz?cache=0&sync_timestamp=1604313880785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fthrottle-debounce%2Fdownload%2Fthrottle-debounce-1.1.0.tgz",
-      "integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0="
-    },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz",

+ 0 - 1
package.json

@@ -12,7 +12,6 @@
     "crypto-js": "^4.1.1",
     "dashjs": "^4.2.0",
     "dplayer": "^1.26.0",
-    "element-ui": "2.13.2",
     "filepond": "^4.20.1",
     "filepond-plugin-file-validate-size": "^2.2.1",
     "filepond-plugin-file-validate-type": "^1.2.5",

+ 5 - 6
src/api/index.js

@@ -2,7 +2,6 @@ import axios from 'axios'
 import store from '@/store'
 import router from '@/router'
 import Vue from 'vue'
-import { Message } from 'element-ui' // 引用element-ui的加载和消息提示组件
 
 const $axios = axios.create({
   // 5 分钟超时
@@ -63,18 +62,18 @@ $axios.interceptors.response.use(
           })
           break
         case 404:
-          Message.error('网络请求不存在')
+          console.error('网络请求不存在')
           break
         default:
-          Message.error(error.response.data.message)
+          console.error(error.response.data.message)
       }
     } else {
       // 请求超时或者网络有问题
       if (error.message.includes('timeout')) {
-        Message.error('请求超时!请检查网络是否正常')
+        console.error('请求超时!请检查网络是否正常')
       } else {
-        Message.error(error.message)
-        Message.error('请求失败,请检查服务器是否已启动')
+        console.error(error.message)
+        console.error('请求失败,请检查服务器是否已启动')
       }
     }
     return Promise.reject(error)

+ 0 - 1
src/components/comment/video-comment.vue

@@ -65,5 +65,4 @@ export default {
 </script>
 
 <style>
-
 </style>

+ 1 - 1
src/components/player/player.vue

@@ -86,7 +86,7 @@ export default {
           }
         })
         .catch(error => {
-          this.$message.error(error.message)
+          console.error(error.message)
         })
     },
     initMp4Player(videoId, coverUrl, videoUrl) {

+ 1 - 1
src/components/player/player2.vue

@@ -85,7 +85,7 @@ export default {
           }
         })
         .catch(error => {
-          this.$message.error(error.message)
+          console.error(error.message)
         })
     },
     initMp4Player(videoId, coverUrl, videoUrl) {

+ 1 - 1
src/components/register-from.vue

@@ -196,7 +196,7 @@ export default {
           }
         })
         .catch(error => {
-          this.$message.error(error.message)
+          console.error(error.message)
         })
     }
   }

+ 2 - 2
src/components/upload/upload-video.vue

@@ -192,7 +192,7 @@ export default {
           }
         })
         .catch(error => {
-          this.$message.error(error.message)
+          console.error(error.message)
         })
     },
     setFile(value) {
@@ -276,7 +276,7 @@ export default {
           }
         })
         .catch(error => {
-          this.$message.error(error.message)
+          console.error(error.message)
         })
     },
     getCategory(name) {

+ 5 - 6
src/utils/request.js

@@ -2,7 +2,6 @@ import axios from 'axios'
 import store from '@/store'
 import router from '@/router'
 import Vue from 'vue'
-import { Message } from 'element-ui' // 引用element-ui的加载和消息提示组件
 
 const $axios = axios.create({
   // 5 分钟超时
@@ -64,18 +63,18 @@ $axios.interceptors.response.use(
           })
           break
         case 404:
-          Message.error('网络请求不存在')
+          console.error('网络请求不存在')
           break
         default:
-          Message.error(error.response.data.message)
+          console.error(error.response.data.message)
       }
     } else {
       // 请求超时或者网络有问题
       if (error.message.includes('timeout')) {
-        Message.error('请求超时!请检查网络是否正常')
+        console.error('请求超时!请检查网络是否正常')
       } else {
-        Message.error(error.message)
-        Message.error('请求失败,请检查服务器是否已启动')
+        console.error(error.message)
+        console.error('请求失败,请检查服务器是否已启动')
       }
     }
     return Promise.reject(error)

+ 1 - 1
src/views/home/index.vue

@@ -59,7 +59,7 @@ export default {
           }
         })
         .catch(error => {
-          this.$message.error(error.message)
+          console.error(error.message)
         })
     }
   }

+ 1 - 1
src/views/login.vue

@@ -117,7 +117,7 @@ export default {
           }
         })
         .catch(error => {
-          this.$message.error(error.message)
+          console.error(error.message)
         })
     },
     register(value) {

+ 34 - 32
src/views/video/video.vue

@@ -58,42 +58,35 @@
               </router-link>
               <span v-html="'&nbsp;&nbsp;&nbsp;&nbsp;'" />
               <v-btn small outlined color="primary">
-                <span>关注</span><span v-html="'&nbsp;&nbsp;'" />
+                <span>关注</span>
+                <span v-html="'&nbsp;&nbsp;'" />
                 <span v-text="videoData.followerCount" />
               </v-btn>
             </v-col>
           </v-row>
         </v-col>
         <v-col cols="4">
-          <v-rating v-model="score" color="orange" background-color="orange lighten-3" />
-          <v-tooltip bottom>
+          <v-btn icon @click="showErrDialog">
+            <v-icon>mdi-thumb-up</v-icon>
+            <span>问题或建议</span>
+          </v-btn>
 
-            <template v-slot:activator="{ on, attrs }">
-              <v-btn
-                icon
-                v-bind="attrs"
-                v-on="on"
-              >
-                <v-icon>mdi-thumb-up</v-icon>
-                <span v-text="videoData.thumbUpCount" />
-              </v-btn>
-            </template>
-            <span>顶一下</span>
-          </v-tooltip>
-          <span v-html="'&nbsp;&nbsp;&nbsp;&nbsp;'" />
-          <v-tooltip bottom>
-            <template v-slot:activator="{ on, attrs }">
-              <v-btn
-                icon
-                v-bind="attrs"
-                v-on="on"
-              >
-                <v-icon>mdi-thumb-down</v-icon>
-                <span v-text="videoData.thumbDownCount" />
-              </v-btn>
-            </template>
-            <span>踩一下</span>
-          </v-tooltip>
+          <v-dialog v-model="showDialog" max-width="500" persistent>
+            <v-card>
+              <v-toolbar dense dark color="primary">
+                <v-toolbar-title>视频问题或建议</v-toolbar-title>
+              </v-toolbar>
+
+              <form @submit.prevent="submitVideoErr">
+                <v-textarea
+                  placeholder="问题或建议"
+                  rows="2"
+                  :no-resize="true"
+                />
+                <button type="submit"><span>提交</span></button>
+              </form>
+            </v-card>
+          </v-dialog>
         </v-col>
       </v-row>
       <v-row>
@@ -139,7 +132,9 @@ export default {
       videoData: {},
       windowSize: {
       },
-      colsWidth: 8
+      colsWidth: 8,
+      showDialog: false,
+      formData: {}
     }
   },
   created() {
@@ -177,7 +172,7 @@ export default {
           }
         })
         .catch(error => {
-          this.$message.error(error.message)
+          console.error(error.message)
         })
     },
     // 获取和当前视频类似的其他视频
@@ -196,8 +191,15 @@ export default {
           }
         })
         .catch(error => {
-          this.$message.error(error.message)
+          console.error(error.message)
         })
+    },
+    showErrDialog() {
+      this.showDialog = true
+    },
+    submitVideoErr() {
+      console.log('提交视频错误')
+      this.showDialog = false
     }
   }
 }