Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

# Conflicts:
#	src/views/BidSystem/ProductDeOrder/deorderdetail.vue

src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -2181,8 +2181,7 @@ export default {
           element.partsNameList.forEach((ele) => {
             if (element.part_id == ele.id && ele.id == ele.title) {
               flag = true;
-            }
-          });
+          }});
           if (flag) {
             let result = await this.axios({
               method: "post",
@@ -2541,40 +2540,40 @@ export default {
       display: flex;
       flex-wrap: wrap;
       justify-content: flex-start;
-      border-left: 1px solid #dedede;
+      border-left: 1px solid #3764ff;
       .radio-us {
-        background: #f4f5f7;
+        background: #fff;
         padding: 5px 20px;
         margin: 5px;
         margin-right: 18px;
-        color: #999999;
+        color: #3764ff;
         border-radius: 15px;
-        border: 1px solid #dedede;
+        border: 1px solid #3764ff;
         cursor: pointer;
       }
       .radio-us-foc {
-        color: #3764ff;
-        background: #fff;
+        color: #fff;
+        background: #3764ff;
         border: 1px solid #3764ff;
       }
     }
     .tit_box {
       .box-us {
-        background: #f4f5f7;
+        background: #fff;
         padding: 5px 20px;
         margin: 5px;
         margin-right: 18px;
-        color: #999999;
+        color: #3764ff;
         border-radius: 5px;
-        border: 1px solid #dedede;
+        border: 1px solid #3764ff;
         cursor: pointer;
         width: 100px;
         display: inline-block;
         text-align: center;
       }
       .box-us-foc {
-        color: #3764ff;
-        background: #fff;
+        color:  #fff;
+        background:#3764ff;
         border: 1px solid #3764ff;
       }
     }