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

public/static/liveIndex.html

@@ -32,7 +32,7 @@
             <p>指导单位：吉林省计算中心</p>
             <p>主办方：吉林省计算中心</p>
             <p>支持单位：长春市福瑞科技有限公司</p>
-            <a class="childpage" onclick="btnDirect()" target="_blank">进入活动现场<i class="iconfont icon-bofang"></i></a>
+            <a class="childpage" onclick="btnDirect()">进入活动现场<i class="iconfont icon-bofang"></i></a>
             <br>
           </div>
         </div>
@@ -51,10 +51,9 @@
 <script language="javascript">
  function btnDirect() {
      var query = window.location.search.substring(1);
-     window.open('../direct?'+query)
-
-     
-   window.location.href = "../direct?id="+query
+     console.log(query);
+    //  window.open('../direct?'+query)
+   window.location.href = "../direct?"+query
   }
 </script>
 </html>

src/layout/market/context.vue

@@ -36,16 +36,9 @@
         </div>
         <div>
           <p>
-            <span>产品参数:</span
-            ><span
-              ><el-button type="text" @click="dialogTableVisible = true">查看详情</el-button>
-
-              <el-dialog title="参数" :visible.sync="dialogTableVisible">
-                <el-table :data="detailInfo.product_args" border style="width: 100%">
-                  <el-table-column prop="arg_name" label="参数名称" :show-overflow-tooltip="true"> </el-table-column>
-                  <el-table-column prop="memo" label="参数内容" :show-overflow-tooltip="true"> </el-table-column>
-                </el-table>
-              </el-dialog>
+            <span>产品参数:</span>
+            <span>
+              <el-button type="text" @click="product_argsDia = true">查看详情</el-button>
             </span>
           </p>
         </div>
@@ -71,9 +64,7 @@
       </el-col>
       <el-col :span="24" class="anniu">
         <el-button type="primary" @click="btnPhone()" v-if="this.user.uid != detailInfo.userid">对接聊天</el-button>
-
         <el-button v-if="this.user.uid != detailInfo.userid" @click="onSubmit()" type="success">洽谈交易</el-button>
-
         <!-- <el-button @click="onSubmit" type="success">对接聊天</el-button><el-button @click="onSubmit" type="primary">洽谈交易</el-button></el-col -->
       </el-col>
       <el-dialog title="对接聊天" :visible.sync="dialogTableVisible">
@@ -81,6 +72,12 @@
           <chat :room="room"></chat>
         </el-col>
       </el-dialog>
+      <el-dialog title="参数" class="argsDialog" :visible.sync="product_argsDia">
+        <el-table :data="detailInfo.product_args" border style="width: 100%">
+          <el-table-column prop="arg_name" label="参数名称" :show-overflow-tooltip="true"> </el-table-column>
+          <el-table-column prop="memo" label="参数内容" :show-overflow-tooltip="true"> </el-table-column>
+        </el-table>
+      </el-dialog>
     </el-col>
   </div>
 </template>
@@ -100,6 +97,7 @@ export default {
     chat,
   },
   data: () => ({
+    product_argsDia: false,
     dialogTableVisible: false,
     dialogFormVisible: false,
     scope: '123',
@@ -354,7 +352,11 @@ p {
   padding: 15px 20px;
   color: #606266;
   font-size: 14px;
-  height: 660px;
+  min-height: 120px;
   word-break: break-all;
 }
+// /deep/.argsDialog .el-dialog__body {
+//   min-height: 120px;
+//   height: 0;
+// }
 </style>

src/layout/market/zhuanjia.vue

@@ -211,11 +211,12 @@ p {
       font-size: 20px;
       font-weight: bold;
       padding: 27px 0;
-    }
-    p:nth-child(2) span:last-child {
       color: red;
-      font-weight: bold;
     }
+    // p:nth-child(2) span:last-child {
+    //   color: red;
+    //   font-weight: bold;
+    // }
   }
 
   .newRight {

src/views/dynamic/dealDetail.vue

@@ -28,9 +28,9 @@
                   <el-col :span="24" class="message">
                     <el-col :span="12" class="content">
                       <p>项目名称</p>
-                      <p>产品名称：{{ dealDetails.product_name }}</p>
+                      <p>服务名称：{{ dealDetails.product_name }}</p>
                       <p>发布时间：{{ dealDetails.meta | getDate }}</p>
-                      <p>产品说明：{{ dealDetails.description }}</p>
+                      <p>服务说明：{{ dealDetails.description }}</p>
                     </el-col>
                     <el-col :span="12" class="image">
                       <el-col :span="24" class="user"> 购买人:{{ dealDetails.username }} </el-col>
@@ -89,19 +89,17 @@ export default {
       res.data.status = res.data.status + 1;
       this.$set(this, `dealDetails`, res.data);
     },
-
     async onclick() {
-      console.log(this.dealDetails.product_id);
-      const res = await this.newfetch(this.dealDetails.product_id);
-      let id = this.dealDetails.product_id;
-      console.log(res.data.totaltype);
-      if (res.data.totaltype == '0') {
-        this.$router.push({ path: '/market/marketlists', query: { totaltype: 0, id: id, column_name: '技术供求', display: 2 } });
-      } else if (res.data.totaltype == '1') {
-        this.$router.push({ path: '/market/marketlists', query: { totaltype: 1, id: id, column_name: '科技产品', display: 2 } });
-      } else if (res.data.totaltype == '2') {
-        this.$router.push({ path: '/market/marketlists', query: { totaltype: 2, id: id, display: 2, column_name: '科技产品' } });
-      }
+      console.log(this.dealDetails);
+      // const res = await this.newfetch(this.id);
+      // console.log(res);
+      // if (res.data.totaltype == '0') {
+      //   this.$router.push({ path: '/market/marketlists', query: { totaltype: 0, id: this.dealDetails.product_id, column_name: '技术供求', display: 2 } });
+      // } else if (res.data.totaltype == '1') {
+      //   this.$router.push({ path: '/market/marketlists', query: { totaltype: 1, id: this.dealDetails.product_id, column_name: '科技产品', display: 2 } });
+      // } else if (res.data.totaltype == '2') {
+      //   this.$router.push({ path: '/market/marketlists', query: { totaltype: 2, id: this.dealDetails.product_id, display: 2, column_name: '科技产品' } });
+      // }
     },
   },
   filters: {

src/views/dynamic/parts/down-pie.vue

@@ -7,7 +7,7 @@
         </el-col>
         <el-col :span="16" class="rightData">
           <el-table :data="tableData" border style="width: 100%">
-            <el-table-column prop="product_name" label="产品名称" align="center"> </el-table-column>
+            <el-table-column prop="product_name" label="服务名称" align="center"> </el-table-column>
             <el-table-column prop="market_username" label="营销单位" align="center"> </el-table-column>
             <el-table-column label="操作" width="100" align="center" fixed="right">
               <template slot-scope="scoped">

src/views/hall/dock/dockDetail.vue

@@ -209,7 +209,6 @@ export default {
       form.market_userid = this.detailInfo.userid;
       form.market_username = this.detailInfo.contact_user;
       form.status = '0';
-
       if (!this.user.uid) {
         this.$message.error('游客身份无法与卖家对话,请先注册');
         return;

src/views/hall/dock/zhanjiaduijie.vue

@@ -54,7 +54,7 @@
                         <p>工作简介:</p>
                         <p class="resume" v-if="resume != ''">{{ detailInfo.resume || '暂无' }}</p>
                         <p class="resume1" v-else>{{ detailInfo.resume || '暂无' }}</p>
-                        <el-button size="mini" v-if="detailInfo.resume != null">
+                        <el-button size="mini" v-if="detailInfo.resume != null && detailInfo.resume.length > 288">
                           <span v-if="resume != ''" @click="resumeMore()">更多</span>
                           <span v-else @click="resumeMore1()">收起</span>
                         </el-button>
@@ -192,9 +192,6 @@ export default {
     },
     async btnTrade() {
       let form = {};
-
-      console.log(this.detailInfo);
-
       form.userid = this.user.uid;
       form.username = this.user.name;
       form.product_id = this.detailInfo.id;
@@ -202,8 +199,13 @@ export default {
       form.market_userid = this.detailInfo.id;
       form.market_username = this.detailInfo.name;
       form.status = '0';
-      let res = await this.buyProduct(form);
-      this.$checkRes(res, '购买申请成功', res.errmsg || '购买申请失败');
+      if (!this.user.uid) {
+        this.$message.error('游客身份无法与卖家对话,请先注册');
+        return;
+      } else {
+        let res = await this.buyProduct(form);
+        this.$checkRes(res, '购买申请成功', res.errmsg || '购买申请失败');
+      }
     },
     // killTalk() {
     //   this.$alert('您确认对话已经可以结束了吗?');
@@ -311,11 +313,12 @@ p {
           font-size: 20px;
           font-weight: bold;
           padding: 20px 0;
-        }
-        p:nth-child(2) span:last-child {
           color: red;
-          font-weight: bold;
         }
+        // p:nth-child(2) span:last-child {
+        //   color: red;
+        //   font-weight: bold;
+        // }
       }
       .oneDown {
         border-top: 1px dashed #ccc;

src/views/service/detail/achievements.vue

@@ -80,7 +80,7 @@ export default {
     .one {
       padding: 20px;
       p:first-child {
-        width: 10%;
+        width: 15%;
         background: #22529a;
         padding: 10px 0;
         font-size: 18px;

src/views/service/detail/assessment.vue

@@ -59,7 +59,7 @@ export default {
     .one {
       padding: 20px;
       p:first-child {
-        width: 10%;
+        width: 15%;
         background: #22529a;
         padding: 10px 0;
         font-size: 18px;

src/views/service/detail/contract.vue

@@ -60,7 +60,7 @@ export default {
     .one {
       padding: 20px;
       p:first-child {
-        width: 10%;
+        width: 15%;
         background: #22529a;
         padding: 10px 0;
         font-size: 18px;

src/views/service/detail/credit.vue

@@ -61,7 +61,7 @@ export default {
     .one {
       padding: 20px;
       p:first-child {
-        width: 10%;
+        width: 15%;
         background: #22529a;
         padding: 10px 0;
         font-size: 18px;

src/views/service/detail/exhibition.vue

@@ -57,7 +57,7 @@ export default {
     .one {
       padding: 20px;
       p:first-child {
-        width: 10%;
+        width: 15%;
         background: #22529a;
         padding: 10px 0;
         font-size: 18px;

src/views/service/detail/wisdom.vue

@@ -58,7 +58,7 @@ export default {
     .one {
       padding: 20px;
       p:first-child {
-        width: 10%;
+        width: 15%;
         background: #22529a;
         padding: 10px 0;
         font-size: 18px;