From 0091fa0d5855539f5034364e6f699af8f1353f90 Mon Sep 17 00:00:00 2001 From: pengda <1111@qq.com> Date: Fri, 8 Aug 2025 15:23:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AD=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/agent/siteBaseSetting.vue | 86 +++++++++++++++++++++++++++---------- 1 file changed, 63 insertions(+), 23 deletions(-) diff --git a/src/views/agent/siteBaseSetting.vue b/src/views/agent/siteBaseSetting.vue index 7a33af8..8865169 100644 --- a/src/views/agent/siteBaseSetting.vue +++ b/src/views/agent/siteBaseSetting.vue @@ -33,7 +33,7 @@

域名设置

当前站点域名：{{ siteInfo.domain }}

- +

域名来源

@@ -43,15 +43,15 @@
- +

修改域名

- + - + @@ -384,7 +384,16 @@ export default { domainType: 0, domainTypes: [], domainPrefix: '', + domainName: '', siteDomain: '', + domainData: { + domainPrefix: '' + }, + domainRules: { + domainPrefix: [ + { required: true, message: '请设置站点域名', trigger: [] } + ], + }, } }, computed: { @@ -505,6 +514,8 @@ export default { this.domainType = String(that.siteInfo.domain_type); this.domainTypes = that.siteInfo.domain_types; this.siteDomain = response.data.domain; + this.domainPrefix = response.data.domain_prefix + this.domainName = response.data.domain_name if ( response.data && @@ -514,7 +525,6 @@ export default { this.bindWxpayId = response.data.site_pays[this.payTypeWeixin].payid; this.selectWxpay = response.data.site_pays[this.payTypeWeixin]; } - console.log(this.selectWxpay, 'selectWxpay'); if ( response.data && @@ -630,6 +640,9 @@ export default { console.log(this.domainType, 'this.domainType'); console.log(typeof this.domainType, 'domainTypeChange'); }, + domainChange(){ + this.domainData.domainPrefix = this.domainPrefix + }, onSwitchChange(data) { console.log(data, '---'); }, @@ -675,15 +688,14 @@ export default { }) }, handleEvent(data) { - console.log(data, 'handleEvent'); this.isShowAddPay = data }, handleEvent2(data) { - console.log(data, 'handleEvent2'); this.siteDomain = data.prefix + data.domain; + this.domainPrefix = data.prefix + this.domainName = data.domain }, - handleClear(value) { - console.log(value, 'value===qinghcu'); + handleClear() { this.domainPrefix = ''; }, updateSiteDomain() { @@ -694,27 +706,48 @@ export default { domain = this.siteDomain; } - this.$http('POST', '/agentnew/ajax_update_site_domain', { - uid: this.$route.query.uid, - domain: domain, - }).then(response => { - this.$nextTick(() => { - if (response.status) { - this.$Message.success(response.info); - this.getSiteInfo(); - } else { - this.$Message.error(response.info); - } + const that = this + let formValid = false; + that.$refs.domainFormRef.validate((valid) => { + formValid = valid + }); + + let domainValid = false; + if(this.domainType === '2'){ + that.$refs.domainBind.$refs.bindFormRef.validate(valid => { + domainValid = valid }) - }).catch(error => { - console.error(error, 'error') - }) + }else{ + domainValid = true + } + + if(formValid && domainValid){ + this.$http('POST', '/agentnew/ajax_update_site_domain', { + uid: this.$route.query.uid, + domain: domain, + }).then(response => { + this.$nextTick(() => { + if (response.status) { + this.$Message.success(response.info); + this.getSiteInfo(); + } else { + this.$Message.error(response.info); + } + }) + }).catch(error => { + console.error(error, 'error') + }) + } + } } } \ No newline at end of file From ac649f48b5bbc83140b4e16642f8d5cbe0c89ecd Mon Sep 17 00:00:00 2001 From: pengda <1111@qq.com> Date: Fri, 8 Aug 2025 15:23:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/paymentMethod.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/paymentMethod.vue b/src/components/paymentMethod.vue index 8ac2009..6eece63 100644 --- a/src/components/paymentMethod.vue +++ b/src/components/paymentMethod.vue @@ -2,7 +2,7 @@
-
+
@@ -56,10 +56,11 @@ export default { checkMove(evt) { // 获取将要移动到的位置索引 const targetIndex = this.list.length - 1; // 最后一项的索引是列表长度减1 - // 如果当前拖拽项即将移动到最后一项，则不允许移动 - // console.log(evt.relatedContext.index === evt.draggedContext.index,targetIndex === evt.draggedContext.index,'0000targetIndex00'); - if ((evt.relatedContext.index === targetIndex) || (targetIndex === evt.draggedContext.index)) { - return false; // 不允许移动到最后一项 + if(evt.draggedContext.index == targetIndex && evt.draggedContext.element.pay_type == 1) { + return false;//检测卡不允许移动 + } + if (evt.relatedContext.index === targetIndex && this.list[targetIndex].pay_type == 1) { + return false;//最后一项是检测卡 不允许移动到最后一项 } return true; // 其他情况允许移动 }