diff --git a/src/components/SetLeftMenu.vue b/src/components/SetLeftMenu.vue index a63e283..d56de69 100644 --- a/src/components/SetLeftMenu.vue +++ b/src/components/SetLeftMenu.vue @@ -234,6 +234,14 @@ export default { setHighActive(dom) { const ele = document.getElementById(dom); if (ele) { + const eles = document.getElementsByClassName('siteMessage'); + for (let i = 0; i < eles.length; i++) { + eles[i].classList.remove('siteMessage-active'); + } + ele.classList.add('siteMessage-active'); + setTimeout(function (){ + ele.classList.remove('siteMessage-active'); + },1000) ele.scrollIntoView({ behavior: 'smooth', block: 'start' diff --git a/src/store/index.js b/src/store/index.js index cbaf5cf..8c36200 100755 --- a/src/store/index.js +++ b/src/store/index.js @@ -247,6 +247,10 @@ export default new Vuex.Store({ desc: 'siteMessage2' }, { + name: '渠道设置', + desc: 'siteMessage14' + }, + { name: '收款方式', desc: 'siteMessage3' }, @@ -333,6 +337,10 @@ export default new Vuex.Store({ desc: 'siteMessage2' }, { + name: '渠道设置', + desc: 'siteMessage14' + }, + { name: '收款方式', desc: 'siteMessage3' }, @@ -380,6 +388,10 @@ export default new Vuex.Store({ name: '小程序', desc: 'siteMessage10' }, + { + name: '手机浏览器', + desc: 'siteMessage15' + }, ] }, { @@ -514,7 +526,7 @@ export default new Vuex.Store({ img:'site/pay.svg', imgActive: require('@/assets/site/sitebase_active.svg'), list: [], - permission:[0,4,11,2] + permission:[0,4,11,2,3] }, { name: '钱款交易', diff --git a/src/views/agent/payCertSetting.vue b/src/views/agent/payCertSetting.vue index d2f45ba..961e2fc 100644 --- a/src/views/agent/payCertSetting.vue +++ b/src/views/agent/payCertSetting.vue @@ -2,7 +2,7 @@
-
+

管理证书

API证书获取： @@ -43,7 +43,7 @@
-
+

平台退款

@@ -61,7 +61,7 @@
-
+

分账管理

@@ -282,6 +282,7 @@ export default { }, data() { return { + areaShowList: [], payid: '', payinfo: [], payType: -1, @@ -326,6 +327,11 @@ export default { const {payType} = this.$route.query store.commit('SET_CUSTOMIZE', true); const data = this.$filterByPermission(this.paySettingData,Number(payType)) + data.forEach((row) => { + row.list.forEach((item) => { + this.areaShowList.push(item.desc) + }) + }) store.commit('SET_SLIDER_MENU', data); }, mounted() { @@ -599,6 +605,11 @@ a { color: #1E2226; } +.siteMessage-active { + border: 1px solid #006AFF!important; + box-shadow: 0px 4px 16px 0px rgba(17, 55, 143, 0.12); +} + .site-setting-wrap { width: 100%; } diff --git a/src/views/agent/payInfoSetting.vue b/src/views/agent/payInfoSetting.vue index 29e5fe0..1b25bee 100644 --- a/src/views/agent/payInfoSetting.vue +++ b/src/views/agent/payInfoSetting.vue @@ -254,8 +254,12 @@ export default { if (this.payType == PAY_TYPE_WEIXIN && response.data.qrcode_url) { this.getQrCodeUrl(response.data.qrcode_url); } - if (this.payType == PAY_TYPE_ALIPAY && response.data.qrcode_url) { - this.getQrCodeUrl(response.data.qrcode_url); + if (this.payType == PAY_TYPE_ALIPAY) { + if(response.data.qrcode_url) { + this.getQrCodeUrl(response.data.qrcode_url); + } else { + this.confirmText = '去授权'; + } } if (this.payType == PAY_TYPE_TAOBAO || this.payType == PAY_TYPE_JINGDONG) { diff --git a/src/views/agent/payList.vue b/src/views/agent/payList.vue index aa9285e..c932202 100644 --- a/src/views/agent/payList.vue +++ b/src/views/agent/payList.vue @@ -565,7 +565,7 @@ export default { }, updatePayStatus(row) { var payid = row.payid - if (!row.is_close_pay_tip && row.status==1 && this.payBindSites[payid] && this.payBindSites[payid].length > 0 && this.payBindSites[payid].length==1) { + if (!row.is_close_pay_tip && row.status==0 && this.payBindSites[payid] && this.payBindSites[payid].length > 0 && this.payBindSites[payid].length==1) { this.closePayTipDialogVisible = true row['is_close_pay_tip'] = true; diff --git a/src/views/agent/paySetting.vue b/src/views/agent/paySetting.vue index 09a82fd..08d199f 100644 --- a/src/views/agent/paySetting.vue +++ b/src/views/agent/paySetting.vue @@ -2,7 +2,7 @@
-
+

支付客服

@@ -21,7 +21,7 @@
-
+

启停收款方式

@@ -32,7 +32,7 @@ - +

{{ payinfo.account }}

@@ -40,7 +40,7 @@
-
+

移除收款方式

@@ -78,6 +78,7 @@ export default { }, data() { return { + areaShowList: [], payinfo: [], payType: -1, payStatus: -1, @@ -98,6 +99,11 @@ export default { const {payType} = this.$route.query store.commit('SET_CUSTOMIZE', true); const data = this.$filterByPermission(this.paySettingData,Number(payType)) + data.forEach((row) => { + row.list.forEach((item) => { + this.areaShowList.push(item.desc) + }) + }) store.commit('SET_SLIDER_MENU', data); }, mounted() { @@ -125,10 +131,10 @@ export default { console.error(error, 'error') }) }, - updatePayStatus(row) { + updatePayStatus() { this.$http('POST', '/agentnew/ajax_update_pay_status', { payid: this.$route.query.payid, - status: row.status, + status: this.payStatus, }).then(response => { this.$nextTick(() => { if (response.status) { @@ -262,6 +268,11 @@ a { color: #1E2226; } +.siteMessage-active { + border: 1px solid #006AFF; + box-shadow: 0px 4px 16px 0px rgba(17, 55, 143, 0.12); +} + .site-setting-wrap { width: 100%; } diff --git a/src/views/agent/siteBaseSetting.vue b/src/views/agent/siteBaseSetting.vue index a14aeb2..6e5cec9 100644 --- a/src/views/agent/siteBaseSetting.vue +++ b/src/views/agent/siteBaseSetting.vue @@ -7,7 +7,7 @@
-
+

站点信息

@@ -30,7 +30,7 @@
-
+

域名设置

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

@@ -68,7 +68,7 @@
-
+

销售渠道

@@ -80,7 +80,6 @@
-

收款方式至少需要配置1种收款方式

@@ -426,6 +425,13 @@ export default { this.getSiteInfo(); this.getPayList(); this.getAddablePays(); + + if (this.$route.hash) { + const el = document.querySelector(this.$route.hash) + if (el) { + el.scrollIntoView({ behavior: 'smooth', block: 'start' }) + } + } }, methods: { // 获取可添加的收款方式 @@ -511,14 +517,6 @@ export default { this.addPayType = type; this.isShowAddPay = true; }, - // 操作下拉框 - toggleDrop(e){ - this.$refs.dropDomain.toggleDropdown(e) - }, - changeSelectIp(item) { - //内容真实绑定在 - this.selectedItem1 = { ...item }; - }, // 获取站点信息 getSiteInfo() { const that = this @@ -668,23 +666,9 @@ export default { onSwitchChange(data) { console.log(data, '---'); }, - submitForm(form) { - console.log(this.$refs[form], '-----'); - this.$refs[form].validate((valid) => { - console.log(this[form], '======formxinxi'); - if (valid) { - alert('提交成功!'); - } else { - return false; - } - }); - }, cancelClick() { console.log('quxiao'); }, - confirmClick(type) { - console.log(type, '确认'); - }, updateSitePay() { var data = { uid: this.$route.query.uid, @@ -704,6 +688,7 @@ export default { } else { this.$Message.error(response.info); } + this.getPayList(); }) }).catch(error => { console.error(error, 'error') @@ -832,6 +817,12 @@ export default { transition: all .5s; border: 1px solid transparent; } + +.siteMessage-active { + border: 1px solid #006AFF; + box-shadow: 0px 4px 16px 0px rgba(17, 55, 143, 0.12); +} + .combo-formItem { ::v-deep { .form-item-bottom { @@ -908,10 +899,6 @@ export default { } } -#siteMessage2 { - margin: 12px 0; -} - .domain-wrap { .domain-item { margin-bottom: 10px; diff --git a/src/views/agent/siteMobileSetting.vue b/src/views/agent/siteMobileSetting.vue index 199925e..2f8e5e8 100644 --- a/src/views/agent/siteMobileSetting.vue +++ b/src/views/agent/siteMobileSetting.vue @@ -39,7 +39,7 @@
H5开关 - +
@@ -177,6 +177,51 @@
+
+

手机浏览器 什么是手机浏览器

+ +
+

说明

+

开启手机浏览器后，手机浏览器访问站点链接时自动切换至H5模式

+

注意

+

1.WAP网站暂时只支持支付宝收款

+

2.为保证正常收款，支付宝收款账号需开通手机网站支付功能

+

如何开通？

+

前往快乐论文帮助中心查看相关指引。

+

+ + 开通流程 + +

+
+ +
为保证正常收款，请确定支付宝收款账号已开通手机网站支付功能
+ +
+
+
+
+
+ 手浏览器开关 + +
+ +
+

支付宝收款账号：{{ siteAlipayInfo.appid }}（{{ siteAlipayInfo.short_name }}）

+
+
+

支付宝收款：未开启

+

+ 去开启支付宝收款 + 绑定支付宝收款后，才可使用 +

+
+
+
+
+
+ +
{ this.$nextTick(() => { that.siteInfo = response.data - that.siteInfo.is_open_h5 = Number(response.data.is_open_h5) }) }).catch(error => { console.error(error, 'error') @@ -349,6 +396,19 @@ export default { console.error(error, 'error') }) }, + getSiteAlipayInfo() { + const that = this + that.siteInfo = [] + this.$http('POST', '/agentnew/ajax_get_site_alipay_info', { + uid: this.$route.query.uid, + }).then(response => { + this.$nextTick(() => { + that.siteAlipayInfo = response.data + }) + }).catch(error => { + console.error(error, 'error') + }) + }, getXcxList() { this.$http('POST', '/agentnew/ajax_get_xcx_list', { // uid: this.$route.query.uid, @@ -393,7 +453,22 @@ export default { this.$nextTick(() => { if (response.status) { this.$Message.success(response.info); - this.getSiteInfo(); + } else { + this.$Message.error(response.info); + } + }) + }).catch(error => { + console.error(error, 'error') + }) + }, + updateSiteWapStatus() { + this.$http('POST', '/agentnew/ajax_update_site_wap_config', { + uid: this.$route.query.uid, + status: this.siteInfo.is_open_wap + }).then(response => { + this.$nextTick(() => { + if (response.status) { + this.$Message.success(response.info); } else { this.$Message.error(response.info); } @@ -406,7 +481,11 @@ export default { }, goBindPay() { - window.open('/agent/siteBaseSetting?uid='+this.$route.query.uid, '_blank'); + window.open(this.$router.resolve({ + path: '/agent/siteBaseSetting', + query: { uid: this.$route.query.uid }, + hash: '#siteMessage3' + }).href, '_blank'); }, // 弹框相关方法---start showMpAuth() { @@ -582,6 +661,11 @@ export default { // } + .siteMessage-active { + border: 1px solid #006AFF; + box-shadow: 0px 4px 16px 0px rgba(17, 55, 143, 0.12); + } + .left-pay-list { width: 100%; border-radius: 4px; diff --git a/src/views/agent/sitePersonalization.vue b/src/views/agent/sitePersonalization.vue index 0bf634f..3b29f92 100644 --- a/src/views/agent/sitePersonalization.vue +++ b/src/views/agent/sitePersonalization.vue @@ -569,6 +569,12 @@ export default { } + .siteMessage-active { + border: 1px solid #006AFF; + box-shadow: 0px 4px 16px 0px rgba(17, 55, 143, 0.12); + } + + .checkboxGroup { display: flex; justify-content: flex-start; diff --git a/src/views/agent/siteSemSetting.vue b/src/views/agent/siteSemSetting.vue index 1b8c6bf..b98df4a 100644 --- a/src/views/agent/siteSemSetting.vue +++ b/src/views/agent/siteSemSetting.vue @@ -523,6 +523,17 @@ export default { .site-sem-wrap { width: 100%; letter-spacing: 0.08em; + + .siteMessage { + border-radius: 4px; + transition: all .5s; + border: 1px solid transparent; + } + + .siteMessage-active { + border: 1px solid #006AFF; + box-shadow: 0px 4px 16px 0px rgba(17, 55, 143, 0.12); + } } .notSet,