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

src/components/enterprise/duijiedetail.vue

@@ -12,7 +12,7 @@
             </el-col>
           </el-col>
           <el-col :span="19" class="right">
-            <duijiecontext v-on="$listeners" :options="options" :form="form" :liebiaoList="liebiaoList"></duijiecontext>
+            <duijiecontext v-on="$listeners" :options="options" :option="option" :form="form" :liebiaoList="liebiaoList"></duijiecontext>
           </el-col>
         </div>
         <el-col :span="24" class="foots">
@@ -35,6 +35,7 @@ export default {
     liebiaoList: null, //分类导航
     options: null,
     form: null,
+    option: null,
   },
   components: {
     heads,

src/layout/enterprise/appointment.vue

@@ -19,7 +19,8 @@
             <el-table-column prop="title" label="对接会标题"> </el-table-column>
             <el-table-column prop="start_time" label="开始时间" :show-overflow-tooltip="true"> </el-table-column>
             <el-table-column prop="join_end" label="报名截止时间" :show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="place" label="地址" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="province" label="省" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="place" label="市" :show-overflow-tooltip="true"> </el-table-column>
             <el-table-column label="审核状态" align="center">
               <template slot-scope="scoped">
                 {{ scoped.row.is_allowed === '0' ? '未审核' : scoped.row.is_allowed === '1' ? '审核通过' : '审核拒绝' }}

src/layout/enterprise/duijiecontext.vue

@@ -13,9 +13,14 @@
               </el-date-picker>
             </el-form-item>
             <template>
-              <el-form-item label="地址">
-                <el-select v-model="form.place" placeholder="请选择地址">
-                  <el-option v-for="item in options" :key="item.name" :label="item.name" :value="item.name"> </el-option>
+              <el-form-item label="省份">
+                <el-select v-model="form.province" placeholder="请选择省份" @change="changeshenge">
+                  <el-option v-for="item in option" :key="item.code" :label="item.name" :value="item.code"> </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="市">
+                <el-select v-model="form.place" placeholder="请选择市">
+                  <el-option v-for="item in options" :key="item.code" :label="item.name" :value="item.code"> </el-option>
                 </el-select>
               </el-form-item>
             </template>
@@ -51,6 +56,7 @@ export default {
     userinfo: null,
     form: null,
     options: null,
+    option: null,
   },
   components: {},
   data: () => ({}),
@@ -63,6 +69,10 @@ export default {
       console.log(this.form);
       this.$emit('onSubmit', { data: this.form });
     },
+    changeshenge(value) {
+      console.log(value);
+            this.$emit('placesubmit', { value});
+    },
   },
 };
 </script>

src/layout/live/head.vue

@@ -95,7 +95,7 @@ export default {
       else return this.$route.path.includes(`/${type}`);
     },
     btnLogin() {
-      this.$router.push({ path: '/login' });
+      this.$router.push({ path: '/newlogin' });
     },
     stnmae() {
       if (this.user.role == '2' || this.user.role == '3') {

src/router/index.js

@@ -13,6 +13,11 @@ const live = [
         meta: { title: '登陆' },
         component: () => import('../views/login.vue'),
       },
+      {
+        path: '/newlogin',
+        meta: { title: '登陆' },
+        component: () => import('../views/newlogin.vue'),
+      },
       {
         path: '/live/detail',
         meta: { title: '信息详情', subSite: true },

src/views/detail/semDetail.vue

@@ -48,7 +48,7 @@
                   <el-col :span="24" class="leftDown">
                     <el-image :src="squareImage"></el-image>
                     <el-col :span="24" class="jobname">
-                      {{ item.name }}
+                      {{ item.uname }}
                     </el-col>
                   </el-col>
                 </el-col>

src/views/enterprise/duijiedetail.vue

@@ -7,6 +7,8 @@
       @onSubmit="onSubmit"
       :liebiaoList="liebiaoList"
       @onsave="onsaveClick"
+      :option="option"
+      @placesubmit="placesubmit"
     ></duijiedetail-detail>
   </div>
 </template>
@@ -27,6 +29,7 @@ export default {
     form: {},
     info: {},
     options: [],
+    option: [],
     liebiaoList: [
       { name: '基本信息' },
       { name: '消息管理' },
@@ -68,13 +71,18 @@ export default {
       }
     },
     async search() {
-      let parent = 220000;
+      // let parent = 220000;
+      let level = 1;
+      let res = await this.palcequery({ level });
+      this.$set(this, `option`, res.data);
+    },
+    async placesubmit({ value }) {
       let level = 2;
-      let res = await this.palcequery({ parent, level });
-
+      let parent = value;
+      console.log(parent);
+      let res = await this.palcequery({ level, parent });
       this.$set(this, `options`, res.data);
     },
-
     async onSubmit({ data }) {
       let res;
       let msg;

src/views/login.vue

@@ -30,7 +30,7 @@ export default {
       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');
+        else history.back();
       }
     },
     async submitRegister(forms) {

src/views/newlogin.vue

@@ -0,0 +1,56 @@
+<template>
+  <div id="login">
+    <login-detail :info="info" :form="form" @submitDate="submitnewLogin" :forms="forms" @submitDates="submitRegisters"></login-detail>
+  </div>
+</template>
+
+<script>
+import loginDetail from '@/layout/login.vue';
+import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
+const { mapActions: mapMarket } = createNamespacedHelpers('market');
+const { mapActions: login } = createNamespacedHelpers('login');
+export default {
+  name: 'login',
+  props: {},
+  components: { loginDetail },
+  data: () => {
+    return {
+      info: {},
+      form: {},
+      forms: {},
+    };
+  },
+  created() {},
+  methods: {
+    // ...mapSite(['showInfo', 'toGetUser']),
+    ...mapMarket({ userFetch: 'fetch', userCreate: 'create', userUpdate: 'update' }),
+    ...login({ toLogin: 'login' }),
+    async submitnewLogin(form) {
+      let res = await this.toLogin({ user: form });
+      if (res.uid) {
+        history.back();
+      }
+    },
+    async submitRegisters(forms) {
+      let data = this.forms;
+      let res = await this.userCreate(data);
+      let msg = `注册成功`;
+      this.$checkRes(res, msg);
+    },
+  },
+  computed: {
+    ...mapState(['user']),
+    pageTitle() {
+      return `${this.$route.meta.title}`;
+    },
+    redirect_uri() {
+      return `${this.$route.query.redirect_uri}`;
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+};
+</script>
+
+<style lang="less" scoped></style>