Merge remote-tracking branch 'origin/ysy_admin' into ysy_admin

src/views/components/his/storeOrderDetails.vue

@@ -1141,7 +1141,8 @@ import {getCitys} from "@/api/store/city";
       },
       refund(){
         var that=this;
-        this.$confirm('是否确认申请退款?', "警告", {
+        const str = that.erpType === 1 ? '是否确认申请退款?' : '申请退款,是否已联系兔灵?'
+        this.$confirm(str, "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"