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

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

@@ -4,27 +4,30 @@
       <el-col :span="24" class="info">
         <el-col 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="titel">{{ item.title }}</span>
-            <span style="margin:0 0 0  5px;"> <van-button type="info" size="mini" @click="toDelete(item)">删除</van-button></span>
-            <span style="margin:0 0 0  5px;"><van-button type="info" size="mini" @click="submit(item)">编辑</van-button> </span>
-            <span style="margin:0 0 0  5px;"><van-button type="info" size="mini" @click="shenqing(item)">申请情况</van-button> </span>
+          <el-col :span="20">
+            <p class="textOver">
+              <span class="titel">{{ item.title }}</span>
+            </p>
+            <p>
+              <span class="ptwo"
+                ><span>开始时间:{{ item.start_time || '暂无' }}</span></span
+              >
+            </p>
+            <p class="newptwo">
+              <span class="ptwo"><span>报名截止时间:</span>{{ item.join_end }}</span>
+            </p>
 
-            <span style="margin:0 0 0  5px;"><van-button type="info" size="mini" @click="shenhe(item)">审核</van-button> </span>
-          </p>
-          <p>
-            <span class="ptwo"
-              ><span>开始时间:{{ item.start_time || '暂无' }}</span></span
-            >
-          </p>
-          <p class="newptwo">
-            <span class="ptwo"><span>报名截止时间:</span>{{ item.join_end }}</span>
-          </p>
-
-          <p class="newptwo">
-            <span>审核状态：</span>{{ item.is_allowed == '0' ? '待审核' : item.is_allowed == '1' ? '审核成功' : item.is_allowed == '2' ? '审核拒绝' : '' }}
-            <span>对接会状态：</span>{{ item.status == '1' ? '开始' : item.status == '2' ? '结束' : '准备中' }}
-          </p>
+            <p class="newptwo">
+              <span>审核状态：</span>{{ item.is_allowed == '0' ? '待审核' : item.is_allowed == '1' ? '审核成功' : item.is_allowed == '2' ? '审核拒绝' : '' }}
+              <span>对接会状态：</span>{{ item.status == '1' ? '开始' : item.status == '2' ? '结束' : '准备中' }}
+            </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>
     </el-row>
@@ -121,18 +124,16 @@ export default {
       color: #ccc;
     }
     p:last-child span {
-      color: #ccc;
     }
   }
 }
+
 .content {
   padding: 16px 16px 160px;
   height: 160px;
   background-color: aqua;
 }
-.newptwo {
-  color: #ccc !important;
-}
+
 /deep/.van-button--small {
   min-width: 60px;
   height: 30px;
@@ -143,7 +144,6 @@ export default {
 .titel {
   display: inline-block;
   width: 41%;
-
   overflow: hidden;
   text-overflow: ellipsis;
   whitewhite-space: nowrap;

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

@@ -1,19 +1,124 @@
 <template>
-  <div id="list">
-    <p>list</p>
+  <div id="auditList">
+    <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;"> <van-button type="info" size="mini" @click="sussess(item)">审核通过</van-button></span>
+          </p>
+          <p class="newptwo">
+            <span class="ptwo"><span>类型:</span>{{ item.status == '0' ? '技术' : item.status == '1' ? '产品' : '服务' }}</span>
+          </p>
+
+          <p class="newptwo">
+            <span class="ptwo"><span>联系人:</span>{{ item.contact_user }}</span>
+          </p>
+          <p class="newptwo">
+            <span>审核状态：</span>{{ item.status == '0' ? '待审核' : item.status == '1' ? '审核成功' : item.status == '2' ? '审核拒绝' : '草稿' }}
+          </p>
+          <p class="newptwo"><span>简介：</span>{{ item.introduction }}</p></el-col
+        >
+      </el-col>
+    </el-row>
   </div>
 </template>
 
 <script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: product } = createNamespacedHelpers('transaction');
+
 export default {
-  name: 'list',
+  name: 'auditList',
   props: {},
   components: {},
-  data: () => ({}),
-  created() {},
-  computed: {},
-  methods: {},
+  data: function() {
+    return {
+      list: [{ name: '1' }],
+    };
+  },
+  created() {
+    this.searchInfo();
+  },
+  methods: {
+    ...transaction(['query', 'update']),
+    async searchInfo() {
+      if (this.user.role == '4') {
+        let userid = this.user.uid;
+        let res = await this.query({ userid });
+        this.$set(this, `list`, res.data);
+      } else {
+        let res = await this.query();
+        this.$set(this, `list`, res.data);
+      }
+    },
+    async sussess(item) {},
+  },
+  computed: {
+    ...mapState(['user']),
+    pageTitle() {
+      return `${this.$route.meta.title}`;
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.newuser {
+  float: right;
+  padding: 10px 0 10px 10px;
+}
+.info {
+  border-top: 1px solid #f5f5f5;
+
+  .list {
+    background: #fff;
+    padding: 0 10px;
+    border-bottom: 1px solid #ccc;
+    p {
+      font-size: 14px;
+      color: #000;
+      padding: 5px 0;
+    }
+    p:first-child {
+      font-size: 16px;
+    }
+    p:nth-child(2) .ptwo {
+      display: inline-block;
+      width: 50%;
+    }
+    p:nth-child(2) .ptwo span:first-child {
+      color: #ccc;
+    }
+    p:last-child span {
+      color: #ccc;
+    }
+  }
+}
+.content {
+  padding: 16px 16px 160px;
+  height: 160px;
+  background-color: aqua;
+}
+.newptwo {
+  color: #ccc !important;
+}
+/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: 41%;
+
+  overflow: hidden;
+  text-overflow: ellipsis;
+  whitewhite-space: nowrap;
+}
+</style>