Merge branch 'feature/消息提示' into develop

src/views/mallManagement/order/order_detail/index.vue

@@ -580,7 +580,10 @@ export default {
       })
     },
     goBack() {
-      this.$router.go(-1);
+      // this.$router.go(-1);
+		this.$router.push({
+			name:"order_list"
+		})
     },
     isNumber(val) {
       const regPos = /^\d+(\.\d+)?$/

src/views/mallManagement/order/order_refund_detail/index.vue

@@ -209,7 +209,10 @@ export default {
       })
     },
     goBack() {
-      this.$router.go(-1);
+      // this.$router.go(-1);
+		this.$router.push({
+			name:"order_list"
+		})
     },
     showRemark() {
       this.remarkVisible = true