更新

README.md

@@ -29,22 +29,9 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
 超级管理员
 http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKt8yN1OHAJWrX1ApOf2vWM5U
 
-测试合作机构管理员
-http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKt5e0Xkt14t4UfJyiKNfWdFI
-
-测试合作机构业务管理员
-http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKt0piAr7qAJ_yvO-QywHtPgc
-
-临时
+高新处
 http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKtyLBFA09hrQM3F2mYAkexfo
 
-个人
-http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKt-mgL0w8r3ZqNRTH01Kfbko
-
-企业
-http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKt5VIqOJ_8F3eE69qYMu7I2o
-
-专家
-http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKt0F_bQkB6hWqN7xzNz-OdqI
-
+测试企业-顾红伟
+http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKt3AHT4JGsalxnQwicULgjFI
 

src/layout/adminuser/release.vue

@@ -11,13 +11,10 @@
             </van-radio-group>
           </template>
         </van-field>
-
         <van-field v-model="form.name" name="用户名称" label="用户名称" placeholder="请输入用户名称" :rules="[{ required: true, message: '请输入用户名称' }]" />
-
         <van-field v-model="form.phone" name="手机号" label="手机号" placeholder="请输入手机号" v-if="this.id" disabled />
         <van-field v-model="form.phone" name="手机号" label="手机号" placeholder="请输入手机号" v-else />
         <van-field v-model="form.password" type="password" name="登录密码" label="登录密码" placeholder="请输入登录密码" />
-
         <van-field
           v-model="form.cardnumber"
           name="身份证号"
@@ -34,17 +31,17 @@
         <van-field name="radio" label="用户类型">
           <template #input>
             <van-radio-group v-model="form.role" direction="horizontal">
-              <van-radio name="2">个人</van-radio>
-              <van-radio name="3">企业</van-radio>
+              <van-radio name="4">个人</van-radio>
+              <van-radio name="5">企业</van-radio>
               <van-radio name="6">专家</van-radio>
             </van-radio-group>
           </template>
         </van-field>
-        <van-field name="uploader" label="身份证正面" v-if="form.role == '2' || form.role == '3'">
+        <van-field name="uploader" label="身份证正面" v-if="form.role == '4' || form.role == '5'">
           <template #input
             ><upload
               :limit="1"
-              v-if="form.role == '2' || form.role == '3'"
+              v-if="form.role == '4' || form.role == '5'"
               :data="form.cardfile_a"
               type="cardfile_a"
               :url="'/files/cardfilea/upload'"
@@ -52,11 +49,11 @@
             ></upload>
           </template>
         </van-field>
-        <van-field name="uploader" label="身份证背面" v-if="form.role == '2' || form.role == '3'">
+        <van-field name="uploader" label="身份证背面" v-if="form.role == '4' || form.role == '5'">
           <template #input
             ><upload
               :limit="1"
-              v-if="form.role == '2' || form.role == '3'"
+              v-if="form.role == '4' || form.role == '5'"
               :data="form.cardfile_b"
               type="cardfile_b"
               :url="'/files/cardfileb/upload'"
@@ -64,11 +61,11 @@
             ></upload>
           </template>
         </van-field>
-        <van-field name="uploader" label="组织机构图片" v-if="form.role == '3'">
+        <van-field name="uploader" label="组织机构图片" v-if="form.role == '5'">
           <template #input
             ><upload
               :limit="1"
-              v-if="form.role == '2' || form.role == '3'"
+              v-if="form.role == '4' || form.role == '5'"
               :data="form.img_qy"
               type="img_qy"
               :url="'/files/img_qy/upload'"
@@ -76,14 +73,14 @@
             ></upload>
           </template>
         </van-field>
-        <template v-if="form.role == '3'">
+        <template v-if="form.role == '5'">
           <van-field v-model="form.institution_type" name="机构类型" label="机构类型" placeholder="请输入机构类型" />
           <van-field v-model="form.institution_name" name="机构名称" label="机构名称" placeholder="请输入机构名称" />
           <van-field v-model="form.institution_code" name="机构代码" label="机构代码" placeholder="请输入机构代码" />
           <van-field v-model="form.institution_nature" name="机构性质" label="机构性质" placeholder="请输入机构性质" />
         </template>
-        <van-field v-model="form.office_phone" v-if="form.role == '2' || form.role == '3'" name="办公电话" label="办公电话" placeholder="请输入办公电话" />
-        <van-field v-model="form.profession" v-if="form.role == '2' || form.role == '3'" name="所属行业" label="所属行业" placeholder="请输入所属行业" />
+        <van-field v-model="form.office_phone" v-if="form.role == '4' || form.role == '5'" name="办公电话" label="办公电话" placeholder="请输入办公电话" />
+        <van-field v-model="form.profession" v-if="form.role == '4' || form.role == '5'" name="所属行业" label="所属行业" placeholder="请输入所属行业" />
         <van-field name="radio" label="性别" v-if="form.role == '6'">
           <template #input>
             <van-radio-group v-model="form.gender" direction="horizontal">

src/layout/duijiehui/detail.vue

@@ -1,57 +1,50 @@
 <template>
   <div id="person">
     <el-col :span="24" class="info">
-      <van-form @submit="onSubmit">
-        <van-field
-          v-model="form.title"
-          name="对接会标题"
-          label="对接会标题"
-          placeholder="请输入对接会标题"
-          :rules="[{ required: true, message: '请输入对接会标题' }]"
-        />
-
-        <van-cell title="开始时间" is-link :value="form.start_time" @click="birthdayPopup" />
-        <van-popup v-model="birthdayShow" position="bottom">
-          <van-datetime-picker type="date" @cancel="birthdayShow = false" @confirm="birthdayPicker" />
-        </van-popup>
-
-        <van-cell title="截止时间" is-link :value="form.join_end" @click="birthdayPopups" />
-        <van-popup v-model="newShow" position="bottom">
-          <van-datetime-picker type="date" @cancel="newShow = false" @confirm="birthdayPickers" />
-        </van-popup>
-      </van-form>
-
-      <el-form ref="form" :model="form" label-width="58px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" class="demo-ruleForm">
+        <el-form-item label="对接会标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入对接会标题"></el-input>
+        </el-form-item>
+        <el-form-item label="开始时间">
+          <el-date-picker v-model="form.start_time" type="datetime" placeholder="请选择开始时间" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间">
+          <el-date-picker v-model="form.end_time" type="datetime" placeholder="请选择结束时间" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="报名截止时间">
+          <el-date-picker v-model="form.join_end" type="datetime" placeholder="请选择报名截止时间" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm">
+          </el-date-picker>
+        </el-form-item>
         <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-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>
-
-        <el-form-item label="简介">
-          <el-input type="textarea" v-model="form.desc"></el-input>
+        <el-form-item label="负责人" prop="adminuser">
+          <el-input v-model="form.adminuser" placeholder="请输入用户名"></el-input>
         </el-form-item>
-
-        <el-form-item label="对接会视频">
-          <upload :limit="1" :data="form.file_path" type="file_path" listType="" :url="'/files/imgpath/upload'" @upload="uploadSuccess"></upload>
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" maxlength="11" placeholder="请输入手机号"> </el-input>
+        </el-form-item>
+        <el-form-item label="简介">
+          <el-input type="textarea" v-model="form.desc" placeholder="请输入信息简介"></el-input>
         </el-form-item>
       </el-form>
-      <div style="margin: 16px;">
-        <van-button round block type="info" native-type="submit" @click="onSubmit">
-          保存
-        </van-button>
-      </div>
+      <el-col :span="24" class="btn">
+        <el-button type="primary" size="mini" @click="onSubmit('form')">保存</el-button>
+      </el-col>
     </el-col>
   </div>
 </template>
 
 <script>
-import upload from '@/components/upload.vue';
 export default {
   name: 'person',
   props: {
@@ -59,20 +52,15 @@ export default {
     option: null,
     options: null,
   },
-  components: {
-    upload,
-  },
+  components: {},
   data: () => ({
-    // 出生日期
-    birthday: '',
-    birthdayShow: false,
-    newShow: false,
-    // 学历
-    xlPicker: false,
-    xlList: ['中专及以上', '大专及以上', '本科及以上', '研究生及以上'],
-    // 学位
-    xwPicker: false,
-    xwList: ['学士', '硕士', '博士', '其他'],
+    rules: {
+      title: [{ required: true, message: '请输入对接标题', trigger: 'blur' }],
+      start_time: [{ type: 'date', required: true, message: '请选择开始时间', trigger: 'change' }],
+      end_time: [{ type: 'date', required: true, message: '请选择结束时间', trigger: 'change' }],
+      adminuser: [{ required: true, message: '请输入负责人姓名', trigger: 'blur' }],
+      phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
+    },
   }),
   created() {},
   computed: {
@@ -81,48 +69,36 @@ export default {
     },
   },
   methods: {
-    // 出生日期
-    birthdayPopup() {
-      this.birthdayShow = true;
-    },
-
-    birthdayPopups() {
-      this.newShow = true;
-    },
-    // 确认选择之后的时间
-    birthdayPicker(val) {
-      let year = val.getFullYear();
-      let month = val.getMonth() + 1;
-      let day = val.getDate();
-      let birthday = `${year}-${month}-${day}`;
-      this.$set(this.form, `start_time`, birthday);
-      this.birthdayShow = false;
-    },
-    birthdayPickers(val) {
-      let year = val.getFullYear();
-      let month = val.getMonth() + 1;
-      let day = val.getDate();
-      let birthday = `${year}-${month}-${day}`;
-      this.$set(this.form, `join_end`, birthday);
-      this.newShow = false;
-    },
-
     changeshenge(value) {
       this.$emit('placesubmit', { value });
     },
-    onSubmit() {
-      this.$emit('onSubmit', { data: this.form });
-    },
-    // 图片上传
-    uploadSuccess({ type, data }) {
-      this.$set(this.form, `${type}`, data.uri);
+    onSubmit(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          this.$emit('onSubmit', { data: this.form });
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
     },
   },
 };
 </script>
 
 <style lang="less" scoped>
-.info {
-  margin: 0 0 50px 0;
+/deep/.el-form-item__label {
+  text-align: center;
+}
+.btn {
+  text-align: center;
+  background: #fff;
+  padding: 10px 0;
+}
+/deep/.el-form-item {
+  margin-bottom: 0px;
+  border-bottom: 1px solid #ccc;
+  background-color: #fff;
+  padding: 20px 0;
 }
 </style>

src/layout/transaction/detaliinfo.vue

@@ -41,8 +41,8 @@
       <van-field name="radio" label="审核">
         <template #input>
           <van-radio-group v-model="form.status" direction="horizontal">
-            <van-radio name="0">待审核</van-radio>
-            <van-radio name="1">审核通过</van-radio>
+            <van-radio name="0">待确定</van-radio>
+            <van-radio name="1">交易确定</van-radio>
           </van-radio-group>
         </template>
       </van-field>

src/layout/user/person.vue

@@ -20,17 +20,17 @@
         <van-field name="radio" label="用户类型">
           <template #input>
             <van-radio-group v-model="form.role" direction="horizontal">
-              <van-radio name="2">个人</van-radio>
-              <van-radio name="3">企业</van-radio>
+              <van-radio name="4">个人</van-radio>
+              <van-radio name="5">企业</van-radio>
               <van-radio name="6">专家</van-radio>
             </van-radio-group>
           </template>
         </van-field>
-        <van-field name="uploader" label="身份证正面" v-if="form.role == '2' || form.role == '3'">
+        <van-field name="uploader" label="身份证正面" v-if="form.role == '4' || form.role == '5'">
           <template #input
             ><upload
               :limit="1"
-              v-if="form.role == '2' || form.role == '3'"
+              v-if="form.role == '4' || form.role == '5'"
               :data="form.cardfile_a"
               type="cardfile_a"
               :url="'/files/cardfilea/upload'"
@@ -38,11 +38,11 @@
             ></upload>
           </template>
         </van-field>
-        <van-field name="uploader" label="身份证背面" v-if="form.role == '2' || form.role == '3'">
+        <van-field name="uploader" label="身份证背面" v-if="form.role == '4' || form.role == '5'">
           <template #input
             ><upload
               :limit="1"
-              v-if="form.role == '2' || form.role == '3'"
+              v-if="form.role == '4' || form.role == '5'"
               :data="form.cardfile_b"
               type="cardfile_b"
               :url="'/files/cardfileb/upload'"
@@ -50,11 +50,11 @@
             ></upload>
           </template>
         </van-field>
-        <van-field name="uploader" label="组织机构图片" v-if="form.role == '3'">
+        <van-field name="uploader" label="组织机构图片" v-if="form.role == '5'">
           <template #input
             ><upload
               :limit="1"
-              v-if="form.role == '2' || form.role == '3'"
+              v-if="form.role == '4' || form.role == '5'"
               :data="form.img_qy"
               type="img_qy"
               :url="'/files/img_qy/upload'"
@@ -62,14 +62,14 @@
             ></upload>
           </template>
         </van-field>
-        <template v-if="form.role == '3'">
+        <template v-if="form.role == '4'">
           <van-field v-model="form.institution_type" name="机构类型" label="机构类型" placeholder="请输入机构类型" />
           <van-field v-model="form.institution_name" name="机构名称" label="机构类型" placeholder="请输入机构名称" />
           <van-field v-model="form.institution_code" name="机构代码" label="机构代码" placeholder="请输入机构代码" />
           <van-field v-model="form.institution_nature" name="机构性质" label="机构性质" placeholder="请输入机构性质" />
         </template>
-        <van-field v-model="form.office_phone" v-if="form.role == '2' || form.role == '3'" name="办公电话" label="办公电话" placeholder="请输入办公电话" />
-        <van-field v-model="form.profession" v-if="form.role == '2' || form.role == '3'" name="所属行业" label="所属行业" placeholder="请输入所属行业" />
+        <van-field v-model="form.office_phone" v-if="form.role == '4' || form.role == '5'" name="办公电话" label="办公电话" placeholder="请输入办公电话" />
+        <van-field v-model="form.profession" v-if="form.role == '4' || form.role == '5'" name="所属行业" label="所属行业" placeholder="请输入所属行业" />
         <van-field name="radio" label="性别" v-if="form.role == '6'">
           <template #input>
             <van-radio-group v-model="form.gender" direction="horizontal">

src/views/adminCenter/duijiehui/detail.vue

@@ -19,7 +19,7 @@ import detail from '@/layout/duijiehui/detail.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: dock } = createNamespacedHelpers('dock');
 const { mapActions: place } = createNamespacedHelpers('place');
-
+const jwt = require('jsonwebtoken');
 export default {
   name: 'index',
   props: {},
@@ -63,7 +63,6 @@ export default {
       let res = await this.palcequery({ level, parent });
       this.$set(this, `options`, res.data);
     },
-
     async searchplace() {
       if (this.id) {
         let level = 2;
@@ -89,14 +88,27 @@ export default {
     async onSubmit({ data }) {
       if (this.id) {
         let res = await this.liveupdate(data);
-        this.$checkRes(res, '修改成功', '修改失败');
+        this.$notify({
+          message: '修改成功',
+          type: 'success',
+        });
+        this.$router.push({ path: '/adminCenter/duijiehui/index' });
       } else {
-        this.form.user_id = this.user.uid;
-        this.form.is_allowed = '1';
+        data.user_id = this.user.uid;
         let res = await this.livecreate(data);
-        this.$checkRes(res, '创建成功', '添加失败');
+        if (this.$checkRes(res)) {
+          let passwd = jwt.decode(res.data.password);
+          this.$alert(`房间号：${res.data.room_id}` + `手机号：${res.data.phone};` + `密码：${passwd};`, '成功', {
+            dangerouslyUseHTMLString: true,
+            confirmButtonText: '确定',
+            type: 'success',
+            center: true,
+            callback: action => {
+              this.$router.push({ path: '/adminCenter/duijiehui/index' });
+            },
+          });
+        }
       }
-      this.$router.push({ path: './index' });
     },
   },
   mounted() {

src/views/adminCenter/duijiehui/index.vue

@@ -6,11 +6,7 @@
           <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
         </el-col>
         <el-col :span="24" class="main">
-          <el-col :span="24" class="main">
-            <el-col :span="24" class="one">
-              <list></list>
-            </el-col>
-          </el-col>
+          <list></list>
         </el-col>
       </el-col>
     </el-row>

src/views/adminCenter/duijiehui/parts/list.vue

@@ -2,7 +2,9 @@
   <div id="auditList">
     <el-row>
       <el-col :span="24" class="info">
-        <el-col class="newuser"><van-button type="info" size="small" @click="usersubmit()">新建对接会</van-button> </el-col>
+        <el-col class="newuser">
+          <el-button type="primary" size="mini" @click="usersubmit()">创建对接会</el-button>
+        </el-col>
         <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
           <el-col :span="20">
             <p class="textOver">
@@ -23,10 +25,7 @@
             </p>
           </el-col>
           <el-col :span="4">
-            <p><van-button type="danger" size="mini" @click="toDelete(item)">删除</van-button></p>
             <p><van-button type="info" size="mini" @click="submit(item)">编辑</van-button></p>
-            <p><van-button type="info" size="mini" @click="shenqing(item)">申请情况</van-button></p>
-            <van-button type="primary" style="color:#fff!important;" size="mini" @click="shenhe(item)">审核</van-button>
           </el-col>
         </el-col>
       </el-col>
@@ -98,12 +97,11 @@ export default {
 
 <style lang="less" scoped>
 .newuser {
-  float: right;
-  padding: 10px 0 10px 10px;
+  text-align: center;
+  padding: 10px 0;
 }
 .info {
   border-top: 1px solid #f5f5f5;
-
   .list {
     background: #fff;
     padding: 0 10px;
@@ -123,8 +121,6 @@ export default {
     p:nth-child(2) .ptwo span:first-child {
       color: #ccc;
     }
-    p:last-child span {
-    }
   }
 }
 
@@ -146,6 +142,5 @@ export default {
   width: 90%;
   overflow: hidden;
   text-overflow: ellipsis;
-  whitewhite-space: nowrap;
 }
 </style>

src/views/adminCenter/enterpriseProduct/index.vue

@@ -6,11 +6,7 @@
           <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
         </el-col>
         <el-col :span="24" class="main">
-          <el-col :span="24" class="main">
-            <el-col :span="24" class="one">
-              <list></list>
-            </el-col>
-          </el-col>
+          <list></list>
         </el-col>
       </el-col>
     </el-row>

src/views/adminCenter/enterpriseProduct/parts/list.vue

@@ -3,24 +3,22 @@
     <el-row>
       <el-col :span="24" class="info">
         <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
-          <p class="textOver">
-            <span class="titel">{{ item.name }}</span>
-            <span style="float:right;margin:0 0 0  5px;" v-if="item.status == '0'">
-              <van-button type="info" size="mini" @click="fail(item)">审核拒绝</van-button>
-            </span>
-            <span style="float:right;margin:0 0 0  5px;" v-if="item.status == '0'">
-              <van-button type="info" size="mini" @click="sussess(item)">审核通过</van-button>
-            </span>
-          </p>
-          <p class="listInfo">
+          <el-col :span="16" class="textOver">
+            {{ item.name }}
+          </el-col>
+          <el-col :span="8" v-if="item.status == '0'">
+            <el-button type="text" size="mini" @click="sussess(item)">审核通过</el-button>
+            <el-button type="text" size="mini" @click="fail(item)">审核拒绝</el-button>
+          </el-col>
+          <el-col :span="24" class="listInfo">
             <span>类型:</span><span>{{ item.status == '0' ? '技术' : item.status == '1' ? '产品' : '服务' }}</span>
-          </p>
-          <p class="listInfo">
+          </el-col>
+          <el-col :span="24" class="listInfo">
             <span>联系人:</span><span>{{ item.contact_user }}</span>
-          </p>
-          <p class="listInfo">
+          </el-col>
+          <el-col :span="24" class="listInfo">
             <span>审核状态：</span><span>{{ item.status == '0' ? '待审核' : item.status == '1' ? '审核成功' : item.status == '2' ? '审核拒绝' : '草稿' }}</span>
-          </p>
+          </el-col>
         </el-col>
       </el-col>
     </el-row>
@@ -47,7 +45,6 @@ export default {
     ...product(['query', 'update']),
     async searchInfo() {
       if (this.user.role == '4') {
-        // let userid = this.user.uid;
         let res = await this.query();
         this.$set(this, `list`, res.data);
       } else {
@@ -96,16 +93,12 @@ export default {
   border-top: 1px solid #f5f5f5;
   .list {
     background: #fff;
-    padding: 0 10px;
+    padding: 5px 10px;
     border-bottom: 1px solid #ccc;
-    p {
-      font-size: 16px;
-      color: #000;
-      padding: 5px 0;
-    }
     .listInfo {
       font-size: 14px;
       color: #000;
+      padding: 5px 0 0 0;
       span:first-child {
         color: #ccc;
       }
@@ -117,17 +110,4 @@ export default {
   height: 160px;
   background-color: aqua;
 }
-/deep/.van-button--small {
-  min-width: 60px;
-  height: 30px;
-  padding: 0 8px;
-  font-size: 12px;
-  margin: 0 5px 0 0;
-}
-.titel {
-  display: inline-block;
-  width: 65%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
 </style>

src/views/adminCenter/transaction/detail.vue

@@ -64,8 +64,8 @@ export default {
         data.id = data.transaction_id;
         const arr = await this.transactionupdate(data);
         if (this.$checkRes(arr)) {
-          this.$message({
-            message: '审核通过',
+          this.$notify({
+            message: '确定成功',
             type: 'success',
           });
         }

src/views/adminCenter/transaction/index.vue

@@ -6,9 +6,7 @@
           <NavBar v-show="navShow" :title="title" :isleftarrow="isleftarrow"> </NavBar>
         </el-col>
         <el-col :span="24" class="main">
-          <el-col :span="24" class="one">
-            <list></list>
-          </el-col>
+          <list></list>
         </el-col>
       </el-col>
     </el-row>

src/views/adminCenter/transaction/parts/list.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
           <p class="textOver">
             <span @click="$router.push({ path: '/userCenter/matter/detailinfo', query: { id: item.id } })">{{ item.product_name }}</span>
-            <span style="float:right"><van-button v-if="item.status == '4'" type="primary" size="small" @click="submit(item)">审核</van-button> </span>
+            <span style="float:right"><van-button v-if="item.status == '4'" type="primary" size="small" @click="submit(item)">备案</van-button> </span>
           </p>
           <p>
             <span class="ptwo"><span>购买人名称:</span>{{ item.username || '暂无' }}</span>

src/views/adminCenter/user/detail.vue

@@ -52,7 +52,7 @@ export default {
     ...market(['fetch', 'update', 'create']),
     ...expertsuser({ expertsuserFetch: 'fetch', expertsuserUpdate: 'update', expertsuserUpgrade: 'upgrade', expertsuserCreate: 'create' }),
     async searchInfo() {
-      if (this.role == '2' || this.role == '3' || this.role == '7') {
+      if (this.role == '4' || this.role == '5' || this.role == '7') {
         let res = await this.fetch(this.id);
         if (res.errcode === 0) {
           this.$set(this, `form`, res.data);
@@ -65,7 +65,7 @@ export default {
       }
     },
     async onSubmit({ data }) {
-      if (data.role == '2' || data.role == '3' || data.role == '7') {
+      if (data.role == '4' || data.role == '5' || data.role == '7') {
         let res;
         let msg;
         if (data.id) {

src/views/adminCenter/user/parts/userlist.vue

@@ -2,7 +2,7 @@
   <div id="auditList">
     <el-row>
       <el-col :span="24" class="info">
-        <el-col :span="24" class="newuser"><van-button type="info" size="small" @click="usersubmit()">新建用户</van-button> </el-col>
+        <!-- <el-col :span="24" class="newuser"><van-button type="info" size="small" @click="usersubmit()">新建用户</van-button> </el-col> -->
         <el-col :span="24" class="list" v-for="(item, index) in list" :key="index">
           <p class="textOver">
             <span class="textOver">{{ item.name }}</span>
@@ -49,16 +49,16 @@ export default {
     ...exportuser({ exportuserQuery: 'query' }),
     async search() {
       if (this.user.code.length == 3) {
-        const res = await this.query();
-        const resTwo = await this.exportuserQuery();
+        const res = await this.query({ limit: '1000' });
+        const resTwo = await this.exportuserQuery({ limit: '1000' });
         var newData = res.data.concat(resTwo.data);
         if (this.$checkRes(newData)) {
           var arr = newData.filter(item => item.pid == undefined && item.status != '3');
           this.$set(this, `list`, arr);
         }
       } else {
-        const res = await this.query({ code: this.user.code });
-        const resTwo = await this.exportuserQuery({ code: this.user.code });
+        const res = await this.query({ limit: '1000', code: this.user.code });
+        const resTwo = await this.exportuserQuery({ limit: '1000', code: this.user.code });
         var newData = res.data.concat(resTwo.data);
         if (this.$checkRes(newData)) {
           var arr = newData.filter(item => item.pid == undefined && item.status != '3');

src/views/market/index.vue

@@ -121,6 +121,14 @@ export default {
 /deep/.van-tabs--line .van-tabs__wrap {
   height: 70px;
   margin: 0 0 10px 0;
+  position: fixed;
+  width: 100%;
+  z-index: 999;
+}
+/deep/.van-tabs__content--animated {
+  position: relative;
+  top: 70px;
+  margin: 0 0 50px 0;
 }
 /deep/.van-tab--active {
   color: red;

src/views/market/parts/expertList.vue

@@ -43,7 +43,7 @@ export default {
   methods: {
     ...expertsuser({ expertQuery: 'query' }),
     async searchInfo() {
-      let res = await this.expertQuery({ skip: 0, limit: 6 });
+      let res = await this.expertQuery({ skip: 0, limit: 1000 });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
       }

src/views/market/parts/productList.vue

@@ -39,7 +39,7 @@ export default {
   methods: {
     ...product(['newquery']),
     async searchInfo() {
-      let res = await this.newquery({ totaltype: '1', status: '1' });
+      let res = await this.newquery({ limit: 1000, totaltype: '1', status: '1' });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
       }

src/views/market/parts/serviceList.vue

@@ -39,7 +39,7 @@ export default {
   methods: {
     ...product(['newquery']),
     async searchInfo() {
-      let res = await this.newquery({ totaltype: '2', status: '1' });
+      let res = await this.newquery({ limit: 1000, totaltype: '2', status: '1' });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
       }

src/views/market/parts/technologyList.vue

@@ -39,7 +39,7 @@ export default {
   methods: {
     ...product(['newquery']),
     async searchInfo() {
-      let res = await this.newquery({ totaltype: '0', status: '1' });
+      let res = await this.newquery({ limit: 1000, totaltype: '0', status: '1' });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
       }

src/views/user/parts/clickBtn.vue

@@ -2,20 +2,20 @@
   <div id="clickBtn">
     <el-row>
       <el-col :span="24" class="style">
-        <span v-if="user.role == '2' || user.role == '3' || user.role == '6' || user.role == '7'">
+        <span v-if="user.role == '4' || user.role == '5' || user.role == '6' || user.role == '7'">
           <van-cell is-link title="个人信息" @click="$router.push({ path: '/userCenter/user/index' })" />
           <van-cell is-link title="我的发布" @click="$router.push({ path: '/userCenter/myProduct/index' })" />
           <van-cell is-link title="事项管理" @click="$router.push({ path: '/userCenter/matter/index' })" />
           <van-cell is-link title="展会管理" @click="$router.push({ path: '/userCenter/dock/index' })" />
         </span>
         <span v-else>
-          <span v-if="user.role == '1'">
+          <span v-if="user.role == '0'">
             <van-cell is-link title="用户管理" @click="$router.push({ path: '/adminCenter/user/index' })" />
             <van-cell is-link title="对接会管理" @click="$router.push({ path: '/adminCenter/duijiehui/index' })" />
             <van-cell is-link title="产品供求审核管理" @click="$router.push({ path: '/adminCenter/enterpriseProduct/index' })" />
             <van-cell is-link title="产品供求交易状态审核管理" @click="$router.push({ path: '/adminCenter/transaction/index' })" />
           </span>
-          <span v-else>
+          <span v-else-if="user.role == '1'">
             <van-cell is-link title="用户管理" v-if="oneName == '用户管理'" @click="$router.push({ path: '/adminCenter/user/index' })" />
             <van-cell is-link title="对接会管理" v-if="twoName == '对接会'" @click="$router.push({ path: '/adminCenter/duijiehui/index' })" />
             <van-cell
@@ -31,6 +31,12 @@
               @click="$router.push({ path: '/adminCenter/transaction/index' })"
             />
           </span>
+          <span v-else-if="user.role == '3'">
+            展会负责人
+          </span>
+          <span v-else-if="user.role == '8'">
+            展會vip
+          </span>
         </span>
       </el-col>
     </el-row>