Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/src/admin/billing/toPay.vue

@@ -360,7 +360,7 @@ export default {
       let that = this
       let content = '确认取消？'
       if(this.returnCode == 'BBS11105' || this.returnCode == 'BBS10000'){
-        content = '客户正在付款，提醒客户退出付款界面，再点确认'
+        content = '确认取消？'
       }
       // 取消支付时，必须清除定时器和支付占用状态
       that.$util.confirmModal({content:content,cancelText:'返回'},() => {

ghsPad/src/pages/home/components/toPay.vue

@@ -255,7 +255,7 @@ export default {
         cancelPayFn(){
             this.isCancelDialogOpen = true
             if(this.returnCode=='BBS11105' || this.returnCode=='BBS10000'){
-                this.cancelText = '客户正在付款，提醒客户退出付款界面，再点确认取消'
+                this.cancelText = '确认取消？取消'
             }
             this.$refs.cancelPaymentRef.open('center')
         },

hdApp/src/admin/billing/toPay.vue

@@ -285,7 +285,7 @@ export default {
       let that = this
       let content = '确认取消？'
       if(this.returnCode == 'BBS11105' || this.returnCode == 'BBS10000'){
-        content = '客户正在付款，提醒客户退出付款界面，再点确认'
+        content = '确认取消？'
       }
       // 取消支付时，必须清除定时器和支付占用状态
       that.$util.confirmModal({content:content,cancelText:'返回'},() => {

hdPad/src/pages/home/components/toPay.vue

@@ -238,7 +238,7 @@ export default {
         cancelPayFn(){
             this.isCancelDialogOpen = true
             if(this.returnCode=='BBS11105' || this.returnCode=='BBS10000'){
-                this.cancelText = '客户正在付款，提醒客户退出付款界面，再点确认取消'
+                this.cancelText = '确认取消？取消'
             }
             this.$refs.cancelPaymentRef.open('center')
         },