Merge branch 'master' of http://git.cc-lotus.info/financial_platform/admin-cms

src/layout/companyidentify/detailInfo.vue

@@ -45,9 +45,10 @@
             <el-input v-model="ruleForm.number" disabled></el-input>
           </el-form-item>
           <el-form-item label="企业所属类型:">
-            <el-input v-model="ruleForm.belong_type" disabled></el-input>
+            <el-select v-model="ruleForm.belong_type" placeholder="请选择" disabled> </el-select>
           </el-form-item>
           <el-form-item label="企业所属地:">
+            <el-select v-model="belong_addr_province" class="selects" placeholder="请选择" disabled> </el-select>
             <el-select v-model="ruleForm.belong_addr_city" placeholder="请选择" disabled> </el-select>
             <el-select v-model="ruleForm.belong_addr_area" placeholder="请选择" disabled> </el-select>
           </el-form-item>
@@ -61,7 +62,7 @@
             <el-input v-model="ruleForm.business_scope" disabled></el-input>
           </el-form-item>
           <el-form-item label="企业简介:">
-            <el-input v-model="ruleForm.introduction" disabled></el-input>
+            <el-input v-model="ruleForm.introduction" type="textarea" disabled></el-input>
           </el-form-item>
           <el-form-item label="身份证正面图:">
             <el-image :src="ruleForm.card_front" style="width:100px" @click="showCardFront(ruleForm.card_front)"></el-image>
@@ -107,6 +108,7 @@ export default {
   },
   components: {},
   data: () => ({
+    belong_addr_province: '吉林省',
     licenseDialog: false,
     licenseImage: '',
     cardFrontDialog: false,

src/router/index.js

@@ -284,7 +284,7 @@ const routes = [
 ];
 const router = new VueRouter({
   mode: 'history',
-  base: process.env.NODE_ENV === 'development' ? '' : '',
+  base: process.env.NODE_ENV === 'development' ? '' : process.env.VUE_APP_ROOT_URL,
   routes,
 });
 router.beforeEach((to, form, next) => {

vue.config.js

@@ -1,7 +1,7 @@
 const path = require('path');
 
 module.exports = {
-  publicPath: process.env.NODE_ENV === 'development' ? '/' : process.env.VUE_APP_ROOT_URL + 'teacher',
+  publicPath: process.env.NODE_ENV === 'development' ? '/' : process.env.VUE_APP_ROOT_URL,
 
   configureWebpack: config => {
     Object.assign(config, {