diff --git a/apis/commonApi.js b/apis/commonApi.js
index e6c5d47..3482615 100644
--- a/apis/commonApi.js
+++ b/apis/commonApi.js
@@ -107,3 +107,13 @@ export function transformFileToImg(data) {
data: data
})
}
+
+/**
+ * 获取飞算地址
+ */
+export function getFeisuanUrl(data = {}) {
+ return http.get({
+ url: '/yyt-uec/feisuan/feisuan-apply-url.json',
+ data: data
+ })
+}
diff --git a/pages.json b/pages.json
index 634e29f..5b2450d 100644
--- a/pages.json
+++ b/pages.json
@@ -32,8 +32,9 @@
{
"path": "pages/agreement/index",
"style": {
- "navigationStyle": "custom",
- "navigationBarTitleText": "用户与隐私协议"
+ "navigationBarTitleText": "用户与隐私协议",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
}
},
{
diff --git a/pages/agreement/index.vue b/pages/agreement/index.vue
index 7ebaabe..c79c362 100644
--- a/pages/agreement/index.vue
+++ b/pages/agreement/index.vue
@@ -1,35 +1,82 @@
- agreement
+
+
+
+
-
+const content = `软件许可使用协议
+发布时间:2020年 7 月 1 日
-
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index e50cb63..0ce0904 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -70,6 +70,7 @@
class="poster"
v-if="fsInfo.status == fsAuditStatus.WAIT_APPLY || fsInfo.status == fsAuditStatus.REJECT"
src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/fs-to-apply.png"
+ @click="applyForFinance()"
>
import { exit, go2, loginGo2 } from '@/utils/hook.js'
import { fddEnterpriseStatus, fsAuditStatus, orderStatusEnum } from '@/enums/index.js'
-import { getVerifyUrl, getFsCredit } from '@/apis/commonApi.js'
+import { getVerifyUrl, getFsCredit, getBaseInfo, getFeisuanUrl } from '@/apis/commonApi.js'
export default {
data() {
@@ -163,7 +164,22 @@ export default {
})
}
},
- go2
+ go2,
+ applyForFinance() {
+ getFeisuanUrl().then((res) => {
+ if (res) {
+ // #ifdef APP-PLUS
+ go2('page-view', {
+ title: '飞算申请',
+ url: encodeURIComponent(res)
+ })
+ // #endif
+ // #ifdef H5
+ window ? (window.location.href = res) : ''
+ // #endif
+ }
+ })
+ }
// 获取纸盘商订单统计
},
computed: {
@@ -196,10 +212,11 @@ export default {
getFsCredit({
enterpriseId: this.$store.state.companyInfo.id
}).then((res) => {
- if (res.status) {
+ if (res) {
this.fsInfo = res
}
})
+ this.hasLogin && getBaseInfo({}, true)
}
}
diff --git a/utils/http/index.js b/utils/http/index.js
index b24d04f..a6dc8c5 100644
--- a/utils/http/index.js
+++ b/utils/http/index.js
@@ -4,12 +4,17 @@ import env from '@/env/index.js'
// 请求封装文件
const urlEnv = env === 'production' ? '' : `-${env}`
const xappid = '503258978847966404'
+/**
+ * 系统默认的请求域名
+ */
+const baseUrl = `https://api-client-yyt${urlEnv}.qniao.cn`
// 请求url列表
const prefixList = {
- '/yyt-uec': `https://api-client-yyt${urlEnv}.qniao.cn`,
- '/base-paper-trading': `https://api-client-yyt${urlEnv}.qniao.cn`,
- '/uec': `https://api-client-uec${urlEnv}.qniao.cn`,
- '/document': `https://api-ops-yyt${urlEnv}.qniao.cn`
+ // '/yyt-uec': `https://api-client-yyt${urlEnv}.qniao.cn`,
+ // '/base-paper-trading': `https://api-client-yyt${urlEnv}.qniao.cn`,
+ '/uec': `https://api-client-uec${urlEnv}.qniao.cn`
+ // '/document': `https://api-client-yyt${urlEnv}.qniao.cn`,
+ // '/cloud-print-user-center':`https://api-client-yyt${urlEnv}.qniao.cn`
}
const config = {
@@ -51,12 +56,17 @@ const reqInterceptor = (config, options) => {
if (url.startsWith('http')) {
newUrl = url
} else {
+ let hit = false
for (let key in prefixList) {
if (url.startsWith(key)) {
newUrl = prefixList[key] + url
+ hit = true
break
}
}
+ if (!hit) {
+ newUrl = baseUrl + url
+ }
}
config.url = newUrl
if (!options.hideLoading) {