解决冲突

src/utils/fetch.js

@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境qgit
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      // config.headers['token'] = '28731437A7EF482ABC5DF4D4DB13B3ED';
+      config.headers['token'] = 'B66468F48B5847DE8A5A5CFB0F79022A';
 
       config.headers['token'] = localStorage.getItem('storageToken')
     }else{

src/views/education/create-component.vue

@@ -265,7 +265,24 @@
                                                                     </el-select>
                                                                 </el-form-item>
                                                             </el-col>
+                                                            <el-row>
+                                                                <el-col :span="10">
+                                                                    <el-form-item label="是否有试看限制">
+                                                                        <el-radio-group v-model="item3.content5">
+                                                                            <el-radio label="1">是</el-radio>
+                                                                            <el-radio label="0">否</el-radio>
+                                                                        </el-radio-group>
+                                                                    </el-form-item>
+                                                                </el-col>
+                                                                <el-col :span="10" v-if="item3.content5 == 1">
+                                                                    <el-form-item label="试看时长">
+                                                                        <el-input maxlength="8" type="input" rows="4" v-model="item3.content6" size="small" placeholder="请输入试看时长" style="width:300px"></el-input>
+                                                                        <span class="word-num">(秒)</span>
+                                                                    </el-form-item>                                                                   
+                                                                </el-col>
+                                                            </el-row>                                                            
                                                         </el-row>
+
                                                     </div>
                                                 </div>
                                             </div>