gengxin

src/layout/live/head.vue

@@ -9,19 +9,16 @@
           <p>
             欢迎来到吉林省计算中心科技平台
           </p>
-          <p v-if="user && user.uid">
-            {{ user.name }}
-          </p>
           <p>
             <span v-if="user && user.name">{{ user.name }}</span>
-            <button type="button" class="logininfo">登录</button>
-            <button type="button" class="logininfo">注册</button>
+            <button type="button" class="logininfo" @click="btnLogin">登录</button>
+            <button type="button" class="logininfo" @click="btnLogin">注册</button>
           </p>
         </div>
       </div>
       <div class="superlogo">
         <div class="w_1200">
-          <a href="home">
+          <a href="/">
             <img :src="logo" />
             <span>
               吉林省计算中心科技平台
@@ -33,9 +30,6 @@
         <div class="w_1200">
           <div class="info">
             <ul>
-              <!-- <li :class="isTab('index') ? 'active' : ''">
-                <a @click="turnTo('home')" target="">首页</a>
-              </li> -->
               <li :class="isTab('hallList') ? 'active' : ''">
                 <a @click="turnTo('hallList')" target="">直播大厅</a>
               </li>
@@ -76,12 +70,8 @@ export default {
     fuwu() {
       this.$router.push({ path: '/live/service' });
     },
-    zhibo() {
-      this.$router.push({ path: '/technical/zhibolist' });
-    },
     turnTo(type) {
       if (type == 'index') {
-        console.log('首页未出');
       } else if (type == 'hall_index') this.$router.push({ path: '/live/hall/index' });
       else this.$router.push({ path: `/${type}/index` });
     },
@@ -89,6 +79,9 @@ export default {
       if (type == 'index') return this.$route.path.includes('/live/index');
       else return this.$route.path.includes(`/${type}`);
     },
+    btnLogin() {
+      window.open('http://free.liaoningdoupo.com/platlogin/');
+    },
   },
   computed: {
     ...mapState(['user']),

src/style/style.css

@@ -91,7 +91,6 @@ body {
 	position: relative;
 	float: left;
 	width: 100%;
-	overflow: hidden;
 }
 
 select {

src/views/dynamic/list.vue

@@ -61,7 +61,7 @@
             :current-page.sync="currentPage"
             :page-size="10"
             layout="total,prev, pager, next, jumper"
-            :total="1000"
+            :total="total"
           >
           </el-pagination>
         </el-col>
@@ -97,15 +97,40 @@ export default {
     willTable: [
       { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
       { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
     ],
     cooperationTable: [
       { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
       { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
     ],
     demandTable: [
       { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
       { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '测试项目名称', sell_unit: '营销单位', buy_unit: '采购单位' },
+      { time: '2020-5-10', name: '十条数据', sell_unit: '营销单位', buy_unit: '采购单位' },
     ],
+    total: 4,
   }),
   created() {
     this.searchList();

src/views/hall/dock/dockDetail.vue

@@ -14,10 +14,10 @@
                 <el-col :span="24">
                   <el-button type="primary" icon="el-icon-tickets" @click="btnInfo">项目信息</el-button>
                 </el-col>
-                <el-col :span="24">
+                <el-col :span="24" v-if="this.user.uid != productInfo.userid">
                   <el-button type="danger" icon="el-icon-phone-outline" @click="btnPhone">对接</el-button>
                 </el-col>
-                <el-col :span="24">
+                <el-col :span="24" v-if="this.user.uid != productInfo.userid">
                   <el-button type="success" icon="el-icon-check" @click="btnTrade">申请交易</el-button>
                 </el-col>
               </el-col>
@@ -81,6 +81,7 @@ export default {
     if (this.$route.query.id) {
       this.searchInfo();
     }
+    this.test();
   },
   methods: {
     ...mapProduct(['fetch']),
@@ -89,6 +90,7 @@ export default {
     async searchInfo() {
       let res = await this.fetch(this.$route.query.id);
       if (res.errcode === 0) {
+        console.log(res.data.userid);
         this.$set(this, `productInfo`, res.data);
       }
     },
@@ -135,6 +137,9 @@ export default {
       let res = await this.buyProduct(form);
       this.$checkRes(res, '购买申请成功', res.errmsg || '购买申请失败');
     },
+    test() {
+      console.log(this.user.uid);
+    },
   },
   computed: {
     ...mapState(['user']),