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

src/layout/matter/detailinfo.vue

@@ -3,28 +3,24 @@
     <el-row>
       <el-col :span="24" class="info">
         <el-col :span="24" class="top">
-          <p class="textOver">{{ detailInfo.name }}</p>
+          <p class="textOver">{{ detailInfo.product_name }}</p>
         </el-col>
         <el-col :span="24" class="message">
           <p>
-            <span>服务范围</span>
-            <span>{{ detailInfo.scope || '暂无' }}</span>
+            <span>营销人名称:</span>
+            <span>{{ detailInfo.market_username || '暂无' }}</span>
           </p>
           <p>
-            <span>产品单价</span>
-            <span>{{ detailInfo.price }}/{{ detailInfo.priceunit }}</span>
+            <span>购买人名称:</span>
+            <span>{{ detailInfo.username || '暂无' }}</span>
           </p>
           <p>
-            <span>联系人</span>
-            <span>{{ detailInfo.contact_user }}</span>
-          </p>
-          <p>
-            <span>联系电话</span>
-            <span>{{ detailInfo.contact_tel }}</span>
+            <span>联系人:</span>
+            <span>{{ detailInfo.contact_user || '暂无' }}</span>
           </p>
           <div class="introduction">
-            <p>产品简介</p>
-            <p>{{ detailInfo.introduction }}</p>
+            <p>说明:</p>
+            <p>{{ detailInfo.description || '暂无' }}</p>
           </div>
         </el-col>
       </el-col>
@@ -77,9 +73,6 @@ export default {
       font-size: 18px;
       // color: #7996b1;
       padding: 10px 0 10px 0;
-      color: transparent;
-      -webkit-text-stroke: 1px #7996b1;
-      letter-spacing: 0.04em;
     }
   }
   .message {
@@ -93,7 +86,7 @@ export default {
     }
     span:first-child {
       display: inline-block;
-      width: 80px;
+      width: 90px;
       color: #ccc;
     }
     span:last-child {

src/views/userCenter/matter/detailinfo.vue

@@ -31,7 +31,7 @@ export default {
     // 返回
     navShow: true,
     // 产品名称
-    detailInfo: { name: '测试产品' },
+    detailInfo: { product_name: '最最新新技术', market_username: '卖家1', username: '买家1', description: '222222222222222222222222222222' },
   }),
   created() {},
   computed: {},

src/views/userCenter/matter/parts/negotiation.vue

@@ -3,7 +3,10 @@
     <el-row>
       <el-col :span="24" class="info">
         <el-col :span="24" class="list" @click.native="$router.push({ path: '/userCenter/matter/detailinfo' })" v-for="(item, index) in list" :key="index">
-          <p class="textOver">{{ item.product_name }}</p>
+          <p class="textOver">
+            <span>{{ item.product_name }}</span>
+            <span><van-button type="primary" size="mini">主要按钮</van-button><van-button type="primary" size="mini">主要按钮</van-button></span>
+          </p>
           <p>
             <span class="ptwo"><span>营销人名称:</span>{{ item.market_username || '暂无phase' }}</span>
             <span class="ptwo"><span>购买人名称:</span>{{ item.username || '暂无' }}</span>