Merge branch 'igirl-web' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-web

igirl-web/app/front/vues/pages/nowbuy/nowbuy.html

@@ -6,7 +6,7 @@
                     style="cursor: pointer;">首页</span>
                     style="cursor: pointer;">首页</span>
                 <i class="el-icon-arrow-right"></i>
                 <i class="el-icon-arrow-right"></i>
                 <span style="font-weight:600;cursor: pointer;font-weight: 300;"
                 <span style="font-weight:600;cursor: pointer;font-weight: 300;"
-                    @click="tiaozhuan( \'/servicedetails\',\'服务详情\',)">担保商标注册</span>
+                    @click="tiaozhuan( \'/servicedetails\',\'服务详情\',)">{{serviceName||\'担保商标注册\'}}</span>
                 <i class="el-icon-arrow-right">下单</i>
                 <i class="el-icon-arrow-right">下单</i>
             </div>
             </div>
         </div>
         </div>
@@ -18,7 +18,7 @@
             </div>
             </div>
             <div style="width:1093px;border:1px solid #F3F3F3;margin-bottom: 51px;">
             <div style="width:1093px;border:1px solid #F3F3F3;margin-bottom: 51px;">
                 <el-table :data="tableData" header-row-class-name="nowbuy-tableheader" style="width: 100%">
                 <el-table :data="tableData" header-row-class-name="nowbuy-tableheader" style="width: 100%">
-                    <el-table-column prop="itemTypeName" label="服务名称" width="180">
+                    <el-table-column prop="name" label="服务名称" width="180">
                     </el-table-column>
                     </el-table-column>
                     <el-table-column prop="num" label="购买数量" width="180">
                     <el-table-column prop="num" label="购买数量" width="180">
                     </el-table-column>
                     </el-table-column>
@@ -27,7 +27,7 @@
                 </el-table>
                 </el-table>
             </div>
             </div>
             <div style="width:100%;height:1px;background:#f3f3f3;transform: translateX(-30px);margin-bottom: 30px;">
             <div style="width:100%;height:1px;background:#f3f3f3;transform: translateX(-30px);margin-bottom: 30px;">
-                
+
             </div>
             </div>
             <div class="nowbuy-title">
             <div class="nowbuy-title">
                 <div>
                 <div>

igirl-web/app/front/vues/pages/nowbuy/nowbuy.js

@@ -57,8 +57,10 @@
                     },
                     },
                     tm: {
                     tm: {
                         totalSum: null,
                         totalSum: null,
-                    }
+                    },
                 },
                 },
+                serviceName:"",
+
             }
             }
         },
         },
     mounted: function() {
     mounted: function() {
@@ -113,6 +115,7 @@
                     d.data.countPrice = (d.data.serviceCharge + d.data.publicExpense) * Number(that.$route.query.num);
                     d.data.countPrice = (d.data.serviceCharge + d.data.publicExpense) * Number(that.$route.query.num);
                     that.tableData.push(d.data);
                     that.tableData.push(d.data);
                     console.log("返回信息", that.tableData);
                     console.log("返回信息", that.tableData);
+                    that.serviceName = d.data.name;
                 }
                 }
             });
             });
         },
         },