修改付款浏览器点击问题，修改仓库管理地图问题

src/components/mapdrag/mapdrag.vue

@@ -191,10 +191,10 @@ export default {
         }
       })
       this.marker = new AMap.Marker({
-        // icon: new AMap.Icon({
-        //   size: new AMap.Size(36, 44),
-        //   image: image,
-        // }),
+        icon: new AMap.Icon({
+          size: new AMap.Size(0, 0),
+          image: image,
+        }),
         map: that.map,
       })
       AMap.plugin(

src/router/index.js

@@ -215,7 +215,12 @@ router.beforeEach(async (to, from, next) => {
       }
     }
     renewalHead(data).toPromise().then(() => {
-      next()
+      console.log(sessionStorage.getItem('paymentManagementReturn'))
+      if(to.name=='settlement'&&sessionStorage.getItem('paymentManagementReturn')=='true'){
+        next(`/houseSelfCollect/paymentManagement`);
+      }else{
+        next()
+      }
     })
     .catch((err) => {
       clearStorage()

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -26,7 +26,8 @@
               <el-input type="number" @mousewheel.native.prevent v-model="baseInfoForm.waterBase" @input="changeBaseWater" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
-          <div v-if="baseInfoForm.paramType != '1'" class="grid-content">
+          <!-- <div v-if="baseInfoForm.paramType != '1'" class="grid-content"> -->
+          <div class="grid-content">
             <el-form-item label="扣重比">
               <el-input type="number" @mousewheel.native.prevent v-model="baseInfoForm.deductWeight" :disabled="!isEdit"></el-input>
             </el-form-item>

src/views/houseSelfCollect/paymentManagement.vue

@@ -135,6 +135,10 @@
                     scope.row.status == '待结算'
                   "
               @click="settlement(1, scope.row)"
+            >结算</el-button>
+                      <el-button
+            
+              @click="settlement(1, scope.row)"
             >结算</el-button>
           </span>
 
@@ -572,11 +576,15 @@ export default {
       this.getList()
     },
     settlement(index, row) {
-      if (row.goodsName)
+      if (row.goodsName){
+      sessionStorage.setItem('paymentManagementReturn', false)
         this.$router.push({
-          path: 'settlement',
-          query: { type: index, id: row.id }
-        })
+                path: 'settlement',
+                query: { type: index, id: row.id }
+              })
+      }
+      
+     
     },
     payment() {
       this.imageUrl = ''

src/views/houseSelfCollect/settlement.vue

@@ -765,15 +765,16 @@ export default {
             type: 'warning',
           })
       }
-      
     },
     cancel() {
       this.isShowPrint = false
       this.paymentList = [] 
+      sessionStorage.setItem('paymentManagementReturn', true)
       this.$router.push({ path: 'paymentManagement' })
     },
     closePrint(){
         this.isShowPrint = false
+         sessionStorage.setItem('paymentManagementReturn', true)
         this.$router.push({path:'paymentManagement'})
       },
   },