Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

f099594f · huangyuanyuan · c52d49bf · e01951fd · f099594f
Commit f099594f authored Apr 12, 2019 by huangyuanyuan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

addReceivablesDocuments.vue src/components/FinancialModule/addReceivablesDocuments.vue +2 -2

No files found.
--- a/src/components/FinancialModule/addReceivablesDocuments.vue
+++ b/src/components/FinancialModule/addReceivablesDocuments.vue
@@ -795,8 +795,8 @@ export default {
                    })
                    var wechat=[];
                    var zhifu=[];
-                    wechat = OcrStr.match(/(?<=商户单号)(\d*)/);
-                    zhifu = OcrStr.match(/(?<=商家可扫码退款或查询交易)(\d*)/);
+                    wechat = OcrStr.match(/(\?<=商户单号)(\d*)/);
+                    zhifu = OcrStr.match(/(\?<=商家可扫码退款或查询交易)(\d*)/);
                    if(wechat==null&&zhifu==null){
                          return;  
                    }