Merge remote-tracking branch 'origin/master'

src/views/operation/orderDetail.vue

@@ -83,7 +83,13 @@
               <el-card class="box-card">
                 <div class="clearfix">
                   <span class="title">订单详情</span>
-                  <span v-html="renderfun(dataSource)"></span>
+                  <div>
+                    <el-button type="danger" size="mini">取消订单</el-button>
+                    <el-button type="primary" size="mini">同步司机信息</el-button>
+                    <el-button type="warning" size="mini">强制完单</el-button>
+                    <el-button type="warning" size="mini">更改支付状态</el-button>
+                    <!-- <span v-html="renderfun(dataSource)"></span> -->
+                  </div>
                 </div>
                 <div>
                   <ul class="table-info">
@@ -537,8 +543,8 @@ export default {
           json.platformId = item.value;
         }
       });
-      this.getOrderInfo(json)
-      this.seeLeftLog(json)
+      this.getOrderInfo(json);
+      this.seeLeftLog(json);
     },
 
     chooseSOrF(s) {
@@ -572,7 +578,7 @@ export default {
       getThisorderInfo([obj.orderId], obj.brandUrl, obj.platformId).then(
         (res) => {
           if (res.status == 200) {
-            this.inputStatus=true;
+            this.inputStatus = true;
             let datas = res.data.content[0];
             try {
               if (datas.productInfo) {
@@ -633,7 +639,7 @@ export default {
       this.getOrderLog(obj);
     },
     getOrderLog(obj) {
-console.log(obj);
+      console.log(obj);
       let json = {
         loadings: false,
         businessId: obj.orderId,
@@ -722,7 +728,6 @@ console.log(obj);
     },
     seeLeftLog(json) {
       try {
-       
         OrderDetailsSelect(
           {
             orderId: json.orderId,