12.19

config/dev.env.js

@@ -4,7 +4,7 @@ const prodEnv = require('./prod.env')
 
 
 module.exports = merge(prodEnv, {
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   NODE_ENV: '"development"',
-  BASE_API: '"http://192.168.0.13:9001/sharePiano"',
+  BASE_API: '"http://gxgqs.com/sharePiano"',
 })
 })
 //http://gxgqs.com/sharePiano
 //http://gxgqs.com/sharePiano
 //http://192.168.10.105:9001/sharePiano
 //http://192.168.10.105:9001/sharePiano

src/permission.js

@@ -5,7 +5,7 @@ import 'nprogress/nprogress.css'// Progress 进度条样式
 import { Message } from 'element-ui'
 import { Message } from 'element-ui'
 import { getToken } from '@/utils/auth' // 验权
 import { getToken } from '@/utils/auth' // 验权
 
 
-const whiteList = ['/login'] // 不重定向白名单
+const whiteList = ['/login','/courseList','/courseEdit','/bargainList','/bargainEdit'] // 不重定向白名单
 router.beforeEach((to, from, next) => {
 router.beforeEach((to, from, next) => {
   NProgress.start()
   NProgress.start()
   if (getToken()) {
   if (getToken()) {

src/views/bargain/bargainEdit.vue

@@ -54,7 +54,7 @@
     </el-form>
     </el-form>
 
 
     <div class="editor-container">
     <div class="editor-container">
-      <Tinymce :height="500" ref="editor" v-model="temp.commodity_introduction"/>
+      <Tinymce :height="500" ref="editor" v-model="temp.commodityIntroduction"/>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
@@ -82,7 +82,7 @@ export default {
         actualAmountAvailable: undefined,
         actualAmountAvailable: undefined,
         createDate: undefined,
         createDate: undefined,
         creteUser: undefined,
         creteUser: undefined,
-        commodity_introduction: undefined,
+        commodityIntroduction: undefined,
         picture: undefined
         picture: undefined
       },
       },
       uploadUrl: upload_url,
       uploadUrl: upload_url,

src/views/course/index.vue

@@ -77,7 +77,7 @@
         <el-upload class="avatar-uploader" :action="uploadUrl" :show-file-list="false"
         <el-upload class="avatar-uploader" :action="uploadUrl" :show-file-list="false"
                    :on-success="handleVideoSuccess" :before-upload="beforeUploadVideo"
                    :on-success="handleVideoSuccess" :before-upload="beforeUploadVideo"
                    :on-progress="uploadVideoProcess">
                    :on-progress="uploadVideoProcess">
-          <video v-if="diversityTemp.videoAddress && !videoFlag" :src="diversityTemp.videoAddress" class="avatar" controls="controls">
+          <video v-if="diversityTemp.videoAddress && !videoFlag" :src="diversityTemp.videoAddress" class="avatar-video" controls="controls">
             您的浏览器不支持视频播放
             您的浏览器不支持视频播放
           </video>
           </video>
           <!--<i v-else-if="!videoFlag" class="el-icon-upload avatar-uploader-icon">上传视频</i>-->
           <!--<i v-else-if="!videoFlag" class="el-icon-upload avatar-uploader-icon">上传视频</i>-->
@@ -532,6 +532,7 @@
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           const tempData = Object.assign({}, this.diversityTemp)
           const tempData = Object.assign({}, this.diversityTemp)
+          console.log(tempData)
           if (!tempData.id) {
           if (!tempData.id) {
             this.$fetch.sysCourseDiversity.insert(tempData).then(() => {
             this.$fetch.sysCourseDiversity.insert(tempData).then(() => {
               this.$message({
               this.$message({
@@ -602,4 +603,9 @@
   }
   }
 </script>
 </script>
 <style scoped>
 <style scoped>
+.avatar-video {
+    width: 300px;
+    height: 250px;
+    display: block;
+  }
 </style>
 </style>