Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

src/components/enterprise/enterprisexuqiu.vue

@@ -12,7 +12,7 @@
             </el-col>
           </el-col>
           <el-col :span="19" class="right">
-            <contextfabu v-on="$listeners" :demandForm="demandForm" :totaltype="totaltype" :columnList="columnList"></contextfabu>
+            <contextfabu v-on="$listeners" :anniu="anniu" :demandForm="demandForm" :totaltype="totaltype" :columnList="columnList"></contextfabu>
           </el-col>
         </div>
         <el-col :span="24" class="foots">
@@ -35,6 +35,7 @@ export default {
     demandForm: null, //需求发布
     columnList: null, //类型列表
     totaltype: null, //判断
+    anniu: null,
   },
   components: {
     heads,

src/layout/enterprise/contextfabu.vue

@@ -5,20 +5,21 @@
         <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="我的发布" name="first">
             <el-row class="demandForm">
-              <el-form ref="form" :model="demandForm" label-width="80px">
-                <el-form-item label="产品类型">
+              <el-form ref="form" :model="demandForm" label-width="80px" :rules="rules">
+                <el-form-item label="产品类型" prop="totaltype">
                   <el-select v-model="demandForm.totaltype" placeholder="请选择产品类型" @change="selectType">
                     <el-option v-for="(item, index) in totaltype_list" :key="index" :value="item.value" :label="item.name"></el-option>
                   </el-select>
                 </el-form-item>
-                <span v-if="totaltype == 0">
+
+                <span v-if="demandForm.totaltype == 0">
                   <el-form-item label="选择不显示的信息">
                     <el-select v-model="is_display" multiple placeholder="请选择" style="width:100%">
                       <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled"> </el-option>
                     </el-select>
                   </el-form-item>
                 </span>
-                <span v-if="totaltype == 1">
+                <span v-if="demandForm.totaltype == 1">
                   <el-form-item label="选择不显示的信息">
                     <el-select v-model="demandForm.is_display" multiple placeholder="请选择" style="width:100%">
                       <el-option v-for="item in option2" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled"> </el-option>
@@ -26,7 +27,7 @@
                   </el-form-item>
                 </span>
 
-                <span v-if="totaltype == 2">
+                <span v-if="demandForm.totaltype == 2">
                   <el-form-item label="选择不显示的信息">
                     <el-select v-model="demandForm.is_display" multiple placeholder="请选择" style="width:100%">
                       <el-option v-for="item in option3" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled"> </el-option>
@@ -34,7 +35,7 @@
                   </el-form-item>
                 </span>
 
-                <el-form-item label="产品名称">
+                <el-form-item label="产品名称" prop="name">
                   <el-input v-model="demandForm.name" placeholder="请输入产品名称"></el-input>
                 </el-form-item>
                 <el-form-item label="类型">
@@ -67,7 +68,7 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-                <el-form-item label="产品图片">
+                <el-form-item label="产品图片" prop="image">
                   <!-- <upload :limit="1" :data="acc.url" type="url" :url="'/files/image/upload'" @upload="uploadSuccess"></upload> -->
                   <upload
                     :limit="6"
@@ -134,10 +135,10 @@
                     <el-option label="转让" value="2"></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="联系人">
+                <el-form-item label="联系人" prop="contact_user">
                   <el-input v-model="demandForm.contact_user" placeholder="请输入联系人"></el-input>
                 </el-form-item>
-                <el-form-item label="联系电话">
+                <el-form-item label="联系电话" prop="contact_tel">
                   <el-input v-model="demandForm.contact_tel" placeholder="请输入联系电话"></el-input>
                 </el-form-item>
                 <el-form-item label="产品描述">
@@ -145,7 +146,8 @@
                 </el-form-item>
 
                 <el-row class="demandBtn">
-                  <el-button type="primary" @click="demandBtn()">保存草稿</el-button>
+                  <el-button type="primary" @click="demandBtn()" v-if="this.anniu == 1">信息发布</el-button>
+                  <el-button type="primary" @click="demandBtn()" v-else>保存草稿</el-button>
                 </el-row>
               </el-form>
             </el-row>
@@ -166,6 +168,7 @@ export default {
     demandForm: null,
     columnList: null,
     totaltype: null,
+    anniu: null,
   },
   components: {
     upload,
@@ -450,6 +453,14 @@ export default {
       { name: '产品', value: '1' },
       { name: '服务', value: '2' },
     ],
+
+    rules: {
+      name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+      totaltype: [{ required: true, message: '请选择类型', trigger: 'change' }],
+      image: [{ type: 'array', required: true, message: '请上传图片', trigger: 'blur' }],
+      contact_tel: [{ required: true, message: '请输入联系电话', trigger: 'blur' }],
+      contact_user: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+    },
   }),
   created() {},
 
@@ -527,6 +538,7 @@ export default {
 }
 .demandBtn {
   text-align: center;
+  padding: 0 0 20px 0;
 }
 /deep/.demandBtn .el-button {
   background-color: #ff7814;

src/layout/live/head.vue

@@ -14,7 +14,6 @@
               <button type="text" style="color:blue" @click="stnmae">
                 个人中心
               </button>
-              {{ user.name }}
               <button type="button" class="logininfo" @click="zhuxiao">注销</button>
             </span>
             <span v-else>
@@ -100,7 +99,7 @@ export default {
     stnmae() {
       if (this.user.role == '2' || this.user.role == '3') {
         this.$router.push({ path: '/enterprise/enterprisejb' });
-      } else if (res.role == '5') this.$router.push('/hallList/index');
+      } else if (this.user.role == '5') this.$router.push('/hallList/index');
       else this.$router.push('/market/index');
     },
     async zhuxiao() {

src/views/enterprise/enterprisexuqiu.vue

@@ -9,6 +9,7 @@
       :columnList="columnList"
       @changeType="changeType"
       :totaltype="totaltype"
+      :anniu="anniu"
     ></enterprisexuqiu-detail>
   </div>
 </template>
@@ -27,6 +28,7 @@ export default {
     enterprisexuqiuDetail,
   },
   data: () => ({
+    anniu: 23,
     info: {},
     liebiaoList: [
       { name: '基本信息' },

src/views/login.vue

@@ -27,6 +27,11 @@ export default {
     ...login({ toLogin: 'login' }),
     async submitLogin(form) {
       let res = await this.toLogin({ user: form });
+      if (res.uid) {
+        if (res.role == '2' || res.role == '3') this.$router.push('/market/marketfabu');
+        else if (res.role == '5') this.$router.push('/hallList/index');
+        else this.$router.push('/market/index');
+      }
     },
     async submitRegister(forms) {
       let data = this.forms;

src/views/market/marketfabu.vue

@@ -4,7 +4,7 @@
       <div class="w_1200">
         <div class="servicemain">
           <div class="infocontext">
-            <contextfabu v-on="$listeners" :demandForm="demandForm" @demandSubmit="sumbit" :columnList="columnList"></contextfabu>
+            <contextfabu v-on="$listeners" :anniu="anniu" :demandForm="demandForm" @demandSubmit="sumbit" :columnList="columnList"></contextfabu>
           </div>
         </div>
       </div>
@@ -27,6 +27,7 @@ export default {
     return {
       demandForm: {},
       columnList: [],
+      anniu: 1,
     };
   },
   created() {
@@ -100,7 +101,6 @@ export default {
   box-shadow: 0 0 10px #2d64b3;
   width: 100%;
   float: left;
-
-  margin: 25px 0 10px 0;
+  margin: 30px 0 30px 0;
 }
 </style>