bugfix

src/App.vue

@@ -32,10 +32,8 @@ export default {
     };
   },
   created() {
-    console.log(1111);
   },
   mounted() {
-    console.log(2222);
     bus.$on("closeGetSoundMsg", () => {
       console.log("进来准备关闭新订单提醒声音了");
       clearInterval(this.timer);

src/api/http.js

@@ -1,9 +1,9 @@
 import axios from 'axios';
 import qs from 'qs';
 import { message } from 'element-ui';
-// const requestUrl = 'http://153.37.175.42:8086/'; // 测试内部接口
+const requestUrl = 'http://153.37.175.42:8086/'; // 测试内部接口
 // const requestUrl = 'http://192.168.50.97:8082/'; // 测试内部接口
-const requestUrl = 'https://api.liebaoai.cn/'; // 统一正式接口
+// const requestUrl = 'https://api.liebaoai.cn/'; // 统一正式接口
 //创建axios实例
 const service = axios.create({
   timeout: 30000 //超时时间

src/components/accountCompoents/wallet.vue

@@ -132,13 +132,15 @@ export default {
     },
     open() {
       this.curIdx = -1;
+      this.money = ''
+      this.id = ''
     },
     recharge() {
       let params = {
         money: this.value ? this.value : this.money,
         paymentType: this.paymentType,
         createType: 1,
-        id: this.value ? "" : this.id,
+        id: this.id,
       };
       if (!this.paymentType) {
         return this.$message({

src/components/orderComponents/orderAMap.vue

@@ -24,12 +24,9 @@
         </div>
       </div>
     </el-form>
-    <el-amap ref="map" vid="container" :zoom="zoom" :center="center" style="height: 600px;" class="amap-demo">
+    <el-amap ref="map" vid="container" :zoom="zoom" :plugins="plugin" :center="center" style="height: 600px;" class="amap-demo">
       <el-amap-marker v-for="(marker,index) in markers" :key="index" :position="marker.position" :icon="marker.icon"></el-amap-marker>
       <el-amap-text v-for="text in texts" :key="text.id" :text="text.text" :offset="text.offset" :position="text.position" :events="text.events"></el-amap-text>
-      <!-- <el-amap-polyline :path="polyline.path"></el-amap-polyline> -->
-      <!-- <el-amap-info-window v-if="window" :position="window.position" :visible="window.visible"
-        :content="window.content"></el-amap-info-window> -->
     </el-amap>
   </el-dialog>
 </template>
@@ -117,7 +114,6 @@ export default {
       });
     },
     init(data, mapData) {
-      console.log("地图数据：", data, mapData);
       let sendM = {
         id: 1,
         position: [data.sendLng, data.sendLat],
@@ -149,7 +145,7 @@ export default {
 
       let orderDistance =
         mapData.orderDistance > 1000
-          ? mapData.orderDistance / 1000 + "公里"
+          ? (mapData.orderDistance / 1000).toFixed(1) + "公里"
           : mapData.orderDistance + "米";
       this.texts = [
         {
@@ -162,7 +158,7 @@ export default {
       if (mapData.shipperLng && mapData.shipperLat && mapData.shipperDistance) {
         let distance =
           mapData.shipperDistance > 1000
-            ? mapData.shipperDistance / 1000 + "公里"
+            ? (mapData.shipperDistance / 1000).toFixed(1) + "公里"
             : mapData.shipperDistance + "米";
         this.texts.push({
           id: 5,
@@ -202,6 +198,7 @@ export default {
     },
     chooseLocation() {
       this.dialogTableVisible = true;
+
       this.showSearch = true;
       this.searchKey = "";
       this.lat = "";

src/components/orderComponents/orderTrack.vue

@@ -82,7 +82,7 @@
             <el-timeline-item class="p-item" v-for="(v, i) in trackOrder.itemList" :key="i" type="info" size="large" :icon="i ? 'el-icon-success' : 'el-icon-circle-check'">
               <div class="p-right">
                 <div class="p-top">
-                  <span class="p-status">{{ [-1,-2].includes(v.orderStatus) ? showCancelType(trackOrder.cancelType) : orderStatus(v.orderStatus) }}</span>
+                  <span class="p-status">{{ v.orderStatus === -1 ? showCancelType(trackOrder.cancelType) : orderStatus(v.orderStatus) }}</span>
                   <span class="p-time">{{ v.nodeTime }}</span>
                 </div>
                 <div class="p-bottom" v-if="v.orderStatus === 1">
@@ -177,6 +177,9 @@ export default {
       trackOrder({ orderId: this.orderInfo.id }).then((res) => {
         if (res.code === 200) {
           this.trackOrder = res.data;
+          this.trackOrder.itemList = this.trackOrder.itemList.filter((v) => {
+            return v.orderStatus !== -2;
+          });
         } else {
           this.$message({
             message: res.msg,

src/components/orderSearch.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="mainContent">
     <el-row class="order_tab">
-      <el-col :span="8" class="search">
+      <!-- <el-col :span="8" class="search">
         <el-input size="small" @keydown.enter.native="seachEnterFun" class="inp" clearable v-model="params.searchKey" placeholder="请输入手机号/姓名/地址/订单编号"></el-input>
-      </el-col>
+      </el-col> -->
       <el-col :span="24">
         <div class="order_list_sel">
-          <!-- <div class="sel_item">
+          <div class="sel_item">
             <el-input size="small" @keydown.enter.native="seachEnterFun" class="inp" clearable v-model="params.searchKey" placeholder="请输入手机号/姓名/地址/订单编号"></el-input>
-          </div> -->
+          </div>
           <div class="sel_item" v-if="memberType !== 1">
             <span class="name">门店：</span>
             <el-select size="small" class="item1" v-model="params.shopId" placeholder="请选择门店">
@@ -33,6 +33,7 @@
             </el-date-picker>
           </div>
           <el-button size='small' @click="search" style="background: #0D1E40;color:#fff">查询</el-button>
+          <el-button size='small' @click="search" class="btn">手动发单</el-button>
         </div>
       </el-col>
     </el-row>
@@ -292,7 +293,7 @@ export default {
     justify-content: space-around;
     width: 100%;
     background: #fff;
-    height: 90px;
+    height: 74px;
     .search {
       margin-left: 20px;
     }
@@ -300,6 +301,11 @@ export default {
       display: flex;
       align-items: center;
       margin: 0 0 0 20px;
+      .btn {
+        background: #fc7200;
+        border-color: #fc7200;
+        color: #fff !important;
+      }
       .sel_item {
         display: flex;
         align-items: center;
@@ -315,13 +321,12 @@ export default {
 
   .order_list {
     width: 100%;
-    height: calc(100vh - 200px);
+    height: calc(100vh - 180px);
     margin-top: 10px;
     .list {
       position: relative;
-      height: calc(100vh - 220px);
+      height: calc(100vh - 210px);
       overflow: hidden;
-      // overflow-y: auto;
     }
     .empty-data {
       display: flex;

src/components/shopCompoents/shopAdd.vue

@@ -97,10 +97,8 @@ export default {
   methods: {
     init(e) {
       if (e) {
-        console.log(e);
         this.title = "编辑门店";
         Object.keys(e).map((v) => {
-          console.log("key", v);
           this.form[v] = e[v];
         });
         this.deliveries = e.deliveries.filter((v) => {

src/router/index.js

@@ -70,7 +70,6 @@ const router = new Router({
 })
 
 router.beforeEach((to, from, next) => {
-  console.log(to)
   if (to.path === '/login') {
     next()
   } else {