Merge branch '1.1.18' into test

src/views/system/goodsimport/components/importdetail.vue

@@ -84,6 +84,7 @@
               let payResult = await aliPayGet({order_sn: res.data.order_sn});
               if(payResult.code === 1) {
                 this.$message({type: 'success',message: '充值成功！'});
+                this.closeDrawer() 
                 // 如果充值成功，则需要初始化数据
               }else{
                 this.$message({type: 'error',message: payResult.message});

src/views/system/goodsimport/index.vue

@@ -110,6 +110,7 @@ export default {
   methods: {
     handleClose(){
       this.dialogDetail = false
+      this.info()
     },
     info() {
       getShopInf().then(res => {