diff --git a/src/components/addPay.vue b/src/components/addPay.vue
index 8514ed5..ccfce4e 100644
--- a/src/components/addPay.vue
+++ b/src/components/addPay.vue
@@ -312,7 +312,7 @@ export default {
this.$http('POST', '/agentnew/ajax_add_alipay', {
company_short_name: this.alipayRules.company_short_name,
alipay_account: this.alipayRules.alipay_account,
- // is_pay_public: this.isPayPublic,
+ is_pay_public: this.isPayPublic,
// receive_payment_account: this.receive_payment_account,
// receive_payment_name: this.receive_payment_name
}).then(response => {
diff --git a/src/views/HosInformation.vue b/src/views/HosInformation.vue
index 6197042..8229547 100644
--- a/src/views/HosInformation.vue
+++ b/src/views/HosInformation.vue
@@ -903,6 +903,7 @@ export default {
this.$nextTick(() => {
if(response.code == 0) {
this.$Message.success('设置成功');
+ this.fetchDoctorData()
}else{
this.$Message.error(response.msg);
}
diff --git a/src/views/weChatPayment.vue b/src/views/weChatPayment.vue
index 18fb2e0..6330f0b 100644
--- a/src/views/weChatPayment.vue
+++ b/src/views/weChatPayment.vue
@@ -42,7 +42,7 @@
指南
-
@@ -73,15 +73,15 @@
-
选择文件
-
+
+
@@ -89,15 +89,15 @@
-
选择文件
-
+
+
@@ -105,7 +105,7 @@
- 保存
+ 完成设置
@@ -125,6 +125,15 @@ export default {
GuipFormItem,
},
data() {
+ const notPureNumberRule = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error('该字段为必填项'));
+ } else if (/^\d+$/.test(value)) {
+ callback(new Error('不能设为纯数字'));
+ } else {
+ callback();
+ }
+ };
return {
formData1:{
// 公司简称
@@ -132,7 +141,7 @@ export default {
// 商户号
mch_id: '',
// 微信支付秘钥
- key: '',
+ pkey: '',
// 公众号APPID
appid: '',
},
@@ -141,13 +150,15 @@ export default {
{ required: true, message: '请输入公司简称', trigger: 'blur' }
],
appid: [
- { required: true, message: '请输入公众号APPID', trigger: 'blur' }
+ { required: true, message: '请输入公众号APPID', trigger: 'blur' },
+ { validator: notPureNumberRule, trigger: 'blur' }
],
mch_id: [
{ required: true, message: '请输入微信支付商户号', trigger: 'blur' }
],
- key: [
- { required: true, message: '请输入微信支付秘钥', trigger: 'blur' }
+ pkey: [
+ { required: true, message: '请输入微信支付秘钥', trigger: 'blur' },
+ { validator: notPureNumberRule, trigger: 'blur' }
],
},
formData: new FormData(),
@@ -158,33 +169,54 @@ export default {
borderRadius: '4px',
background: '#006AFF',
},
+ fileList: [],
+ fileList1: [],
+ noFileFlag: false,
+ noFileFlag1: false,
}
},
created() {
- // 初始化反显
+ // 初始化
+ this.getPayment();
+ console.log('apiclient_cert' in this.payInfo,'apiclient_key');
},
methods: {
getPayment() {
- this.$http('POST', '/agentnew/ajax_get_payinfo', {
- payid: this.$route.query.payid,
- }).then(response => {
- this.$nextTick(() => {
- this.payinfo = response.data
- })
- }).catch(error => {
- console.error(error, 'error')
- })
+ // 初始化数据、证书文件列表？？？
+
+ // this.$http('POST', '/agentnew/ajax_get_payinfo', {
+ // doctor_id : this.doctor_id,
+ // depart_id : this.depart_id
+ // }).then(response => {
+ // this.$nextTick(() => {
+ // this.payinfo = response.data
+ // this.formData1 = response.data
+ // })
+ // }).catch(error => {
+ // console.error(error, 'error')
+ // })
+ },
+ handRemove() {
+ this.formData.delete('apiclient_cert');
+ this.payInfo.delete('apiclient_cert');
+ this.noFileFlag = true;
+ },
+ handRemove1() {
+ this.formData.delete('apiclient_key');
+ this.payInfo.delete('apiclient_key');
+ this.noFileFlag1 = true;
},
handleAvatarChange(file, fileList) {
console.log(file, fileList, 'file')
let fileObj = file.raw
+ this.noFileFlag = false;
this.payInfo.apiclient_cert = fileObj;
this.formData.set('apiclient_cert', fileObj)
- // this.formData.append('apiclient_cert', fileObj)
},
handleAvatarChange1(file, fileList) {
console.log(file, fileList, 'file')
- let fileObj = file.raw
+ let fileObj = file.raw;
+ this.noFileFlag1 = false;
this.payInfo.apiclient_key = fileObj;
this.formData.set('apiclient_key', fileObj)
},
@@ -195,31 +227,43 @@ export default {
// console.log('键 (Key):', key);
// console.log('值 (Value):', value);
// }
+ if(!this.formData.has('apiclient_key') ){
+ this.noFileFlag1 = true;
+ if( !this.formData.has('apiclient_cert')){
+ this.noFileFlag = true;
+ this.$positionMessage({
+ type: 'error',
+ message: '请先上传证书',
+ target: this.$refs['saveRef'], // 可以是DOM元素或选择器
+ position: 'top'
+ })
+ return false;
+ }
+ this.$positionMessage({
+ type: 'error',
+ message: '请先上传证书',
+ target: this.$refs['saveRef'], // 可以是DOM元素或选择器
+ position: 'top'
+ })
+ return false;
+ }
+
this.$refs.wxform.validate((valid) => {
console.log(valid, 'valid');
if (valid) {
for (let key in this.formData1) {
this.formData.set(key, this.formData1[key])
}
- if(!this.formData.has('apiclient_key') || !this.formData.has('apiclient_cert')){
- this.$positionMessage({
- type: 'error',
- message: '请先上传证书',
- target: this.$refs['saveRef'], // 可以是DOM元素或选择器
- position: 'top'
- })
- return false;
- }
this.formData.set('doctor_id', this.$route.query.doctor_id)
this.formData.set('depart_id', this.$route.query.depart_id)
+ this.formData.set('type','2')
const that = this
- this.$http('POST', '/agentnew/ajax_payment_switch', this.formData).then(response => {
+ this.$http('POST', '/api/admin/set_pay_method', this.formData).then(response => {
if(response.status){
that.$message.success('保存成功');
// that.payList = response.data.paylist
// that.$emit('saveEvent', that.payList)
this.$router.go(-1);
-
return true;
}
that.$message.error(response.info);