提交前端代码

config/index.js

@@ -66,7 +66,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:80",
-    // target: "http://localhost:8080",
+    //target: "http://localhost:8080",
     // target: "http://192.168.1.101:8080",
     ws: true,
     pathRewrite: {

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailOrder.vue

@@ -71,10 +71,6 @@
             <label class="el-form-item__label" style="width: auto;"
               >已选中省市县(区):</label
             >
-<<<<<<< HEAD
-            </el-autocomplete>
-          </el-form-item>
-=======
           </el-form-item>
           <el-form-item>
             <el-input
@@ -99,7 +95,6 @@
               >
               </el-autocomplete>
             </el-form-item>
->>>>>>> 176afc48db5501735cf0b7b76294927091bc7890
 
             <el-button type="primary" @click="addAddressClick">确定</el-button>
           </el-form>
@@ -123,16 +118,11 @@
             disabled
           ></el-input>
           <label>原单价</label>
-<<<<<<< HEAD
-          <el-input style="width:100px" v-model="originalPriceValue" disabled></el-input>
-
-=======
           <el-input
             style="width:100px"
             v-model="originalPriceValue"
             disabled
           ></el-input>
->>>>>>> 176afc48db5501735cf0b7b76294927091bc7890
         </el-form-item>
         <el-form-item label="新详单地址" :label-width="formLabelWidth">
           <el-input
@@ -375,10 +365,6 @@ export default {
             });
         }
       }
-<<<<<<< HEAD
-
-=======
->>>>>>> 176afc48db5501735cf0b7b76294927091bc7890
     },
     onclick() {
       console.log("查询待定值");