diff --git a/src/utils/index.js b/src/utils/index.js
index 1421fd9..efaf5d8 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -169,9 +169,11 @@ export function deepCopy(data) {
     return data;
   }
 }
-
-   export function replaceAll(str,before,after){
 
+   export function replaceAll(str,before,after){
+        if(!str){
+          return ''
+        }
         if(str.indexOf(before) != -1){
           return str.replace(new RegExp(before, 'g'),after)
         }else{
diff --git a/src/views/productService/components/addPolicy.vue b/src/views/productService/components/addPolicy.vue
index 9df0393..24e8550 100644
--- a/src/views/productService/components/addPolicy.vue
+++ b/src/views/productService/components/addPolicy.vue
@@ -90,6 +90,7 @@ export default {
         accept_by_merchant:'接受',
         return_by_merchant:'退回',
         confirm_by_merchant:'确认有效',
+        confirm_return:'确认商家退回',
         finish_by_merchant:'核销',
         mark_cancel_by_member:'用户退单',
         mark_cancel_by_merchant:'标注退单',