Merge branch 'ldx' into dev

src/components/e-charts/dashboard.vue

@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import { graphic } from "echarts/lib/export";
 export default {
   props: {
     data: {
@@ -11,9 +12,10 @@ export default {
     }
   },
   data: () => ({
-    navList: []
+    navList: [],
   }),
-  mounted() {},
+  mounted() {
+  },
   methods: {
     dashboard() {
       let self = this;
@@ -51,7 +53,7 @@ export default {
           max: 138,
           boundaryGap: ["0", "100"],
           startAngle: 220,
-          endAngle: -40,
+          endAngle: -40
         },
         radiusAxis: {
           type: "category",
@@ -66,23 +68,30 @@ export default {
           }
         },
         polar: {
-          radius: "100%"
+          radius: "110%"
         },
         series: [
           {
             type: "bar",
-            data: [,40],
+            data: [, 40],
             coordinateSystem: "polar",
             barMaxWidth: 10,
             z: 1,
-            name: "抢修项目",
+            name: "B",
             roundCap: true,
-            color: "#1779ee",
+            itemStyle: {
+              normal: {
+                color: new graphic.LinearGradient(0, 0, 0, 1, [
+                  { offset: 0, color: "#25bdb1" },
+                  { offset: 1, color: "#e7fdfc" }
+                ])
+              }
+            },
             barGap: "-100%"
           },
           {
             type: "bar",
-            data: [,100],
+            data: [, 100],
             z: 0,
             silent: true,
             coordinateSystem: "polar",
@@ -94,7 +103,7 @@ export default {
           },
           {
             type: "gauge",
-            radius: "55%",
+            radius: "70%",
             min: 0, //最小刻度
             max: 100, //最大刻度
             splitNumber: 10, //刻度数量
@@ -117,16 +126,16 @@ export default {
               show: true,
               splitNumber: 5,
               lineStyle: {
-                color: "#468EFD", //用颜色渐变函数不起作用
+                color: "#a9aec0",
                 width: 1
               },
-              length: -8
+              length: 4
             }, //刻度样式
             splitLine: {
               show: true,
-              length: -10,
+              length: 6,
               lineStyle: {
-                color: "#468EFD" //用颜色渐变函数不起作用
+                color: "#a9aec0"
               }
             }, //分隔线样式
             detail: {
@@ -151,7 +160,7 @@ export default {
               }
             },
 
-            data: [,40]
+            data: [, 40]
           }
         ]
       };

src/pages/data-analysis/my-service.vue

@@ -10,8 +10,8 @@
         <el-row>
           <el-col :span="24" class="in_block">
             <block-radius class="block left_1">
-              <dashboard ref="left_1_l" class="left_1_l"></dashboard>
-              <div ref="left_1_r" class="left_1_r"></div>
+              <div ref="left_1_l" class="left_1_l"></div>
+              <dashboard ref="left_1_r" class="left_1_r"></dashboard>
             </block-radius>
           </el-col>
           <el-col :span="24" class="in_block">
@@ -72,9 +72,7 @@ export default {
   data: () => ({
     navList: []
   }),
-  mounted() {
-    
-  },
+  mounted() {},
   methods: {}
 };
 </script>
@@ -82,7 +80,7 @@ export default {
 .in_analysis {
   padding: 0 10px 10px;
   height: 100%;
-  min-width: 1000px;
+  min-width: 1700px;
 }
 .in_l {
 }
@@ -91,7 +89,7 @@ export default {
 .in_c {
 }
 .in_block {
-  height: 300px;
+  height: 280px;
   padding: 10px;
 }
 .block {

src/pages/user/order/order_detail.vue

@@ -75,10 +75,15 @@
             @click="showMsgBox = false"
           >收起评价</el-button>
           <el-button
-            v-if="	orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1"
+            v-if="orderDetail.approval_second_level == 1 && orderDetail.pay_status != -1"
             class="again"
             @click="nextApply"
           >再次申请</el-button>
+          <el-button
+            v-if="orderDetail.approval_first_level == 1 && orderDetail.approval_second_level == 0 && orderDetail.pay_status != -1"
+            class="again"
+            @click="cancelDetail"
+          >取消申请</el-button>
         </div>
       </div>
       <div class="detail_title">{{ orderDetail.order_type == 1 ? "服务" : "应用"}}信息</div>
@@ -353,6 +358,24 @@ export default {
         path: "/shop/shop_car_apply",
         query: query
       });
+    },
+    cancelDetail() {
+      this.$api.user
+        .cancelOrder({ order_id: this.orderDetail.order_id })
+        .then(response => {
+          if (response.data.success == 1) {
+            this.$message({
+              message: "取消订单成功",
+              type: "success"
+            });
+            this.$router.push({ name: "orderList" });
+          } else {
+            this.$message({
+              message: "取消订单失败",
+              type: "error"
+            });
+          }
+        });
     }
   }
 };

src/pages/user/user_info.vue

@@ -403,7 +403,10 @@ export default {
       input.select();
       if (document.execCommand("copy")) {
         document.execCommand("copy");
-        console.log("复制成功");
+        this.$message({
+          message: "复制成功",
+          type: "success"
+        });
       }
       document.body.removeChild(input);
     },

src/request/api/user.js

@@ -34,7 +34,9 @@ const user = {
     getOrderApproval(params) {
         return axios.get(`/apaas/serviceapp/v3/order/approval?apply_id=${params.apply_id}`);
     },
-
+    cancelOrder(params) {
+        return axios.get(`/order/cancel?order_id=${params.order_id}`);
+    },
 
     // user info
     getNowUser() {