diff --git a/enums/index.js b/enums/index.js
index 639811b..53e509c 100644
--- a/enums/index.js
+++ b/enums/index.js
@@ -3,7 +3,7 @@ const urlEnv = env === 'production' ? '' : `-${env}`
export const XAPPID = '503258978847966403'
-export const H5_URL = `http://shopkeeper${env === 'production' ? '' : '.' + env}.qniao.cn`
+export const H5_URL = `https://shopkeeper${urlEnv}.qniao.cn`
export const H5_URL_STORE = `${H5_URL}/#/pages/store/index?share=true&`
export const H5_URL_PAPER = `${H5_URL}/#/pages/paper-details/index?share=true&`
@@ -19,7 +19,7 @@ export const accountType = {
PHONE: 2,
EMAIL: 3,
APPLEID: 4,
- CUSTOM: 5,
+ CUSTOM: 5
}
/**
@@ -30,7 +30,7 @@ export const codePurpose = {
RESET_LOGIN_PASSWORD: 2,
RESET_PHONE: 3,
BIND_BANK_CARD: 4,
- RESET_CREDIT_PASSWORD: 5,
+ RESET_CREDIT_PASSWORD: 5
}
/**
@@ -38,7 +38,7 @@ export const codePurpose = {
*/
export const verificationType = {
PHONE: 1,
- EMAIL: 2,
+ EMAIL: 2
}
/**
* 法大大企业认证状态 1:未认证 2:认证中 3:已认证 4:认证失败
@@ -47,14 +47,14 @@ export const fddEnterpriseStatus = {
UNCERTIFIED: 1,
CERTIFIED_ING: 2,
CERTIFIED_SUCCESS: 3,
- CERTIFIED_FAIL: 4,
+ CERTIFIED_FAIL: 4
}
/**
* 上传地址
*/
export const uploadUrl = {
image: `https://api-client-yyt${urlEnv}.qniao.cn/yyt-uec/file-uploading/upload/image`,
- file: `https://api-client-yyt${urlEnv}.qniao.cn/yyt-uec/file-uploading/upload/file`,
+ file: `https://api-client-yyt${urlEnv}.qniao.cn/yyt-uec/file-uploading/upload/file`
}
/**
* 结算周期:1:月结30(飞算1期),2:月结45,3:月结60(飞算2期),4:月结75,5:月结90(飞算3期)
@@ -62,24 +62,24 @@ export const uploadUrl = {
export const settlementPeriodEnum = [
{
value: 1,
- label: '月结30',
+ label: '月结30'
},
{
value: 2,
- label: '月结45',
+ label: '月结45'
},
{
value: 3,
- label: '月结60',
+ label: '月结60'
},
{
value: 4,
- label: '月结75',
+ label: '月结75'
},
{
value: 5,
- label: '月结90',
- },
+ label: '月结90'
+ }
]
/**
* 结算周期:1:1期,2:2期,3:3期
@@ -87,16 +87,16 @@ export const settlementPeriodEnum = [
export const fsSettlementPeriodEnum = [
{
value: 1,
- label: '1期',
+ label: '1期'
},
{
value: 2,
- label: '2期',
+ label: '2期'
},
{
value: 3,
- label: '3期',
- },
+ label: '3期'
+ }
]
/**
* 飞算结算方式: 1: 先息后本
@@ -104,8 +104,8 @@ export const fsSettlementPeriodEnum = [
export const fsSettlementMethodEnum = [
{
value: 1,
- label: '先息后本',
- },
+ label: '先息后本'
+ }
]
/**
@@ -115,7 +115,7 @@ export const fsAuditStatus = {
WAIT_APPLY: 0,
AUDITING: 1,
PASS: 2,
- REJECT: 3,
+ REJECT: 3
}
/**
@@ -133,7 +133,7 @@ export const supplierOrderStatusEnum = {
FINISHED: 30213,
WAIT_CLIENT_REPAY: 30217,
REPAYING: 30216,
- CANCELED: 30212,
+ CANCELED: 30212
}
/**
* 供应商订单状态 待客户确认订单/30202,待供应商确认订单/30205,待发货/30106,已发货/30107 ,待客户借款/30207,支付中/30208,待客户支付/30214,付款失败/30211,已完成/30213,待客户还款/30217,已取消/30212,还款中/30216
@@ -150,7 +150,7 @@ export const supplierOrderStatusMap = {
[supplierOrderStatusEnum.FINISHED]: '已完成',
[supplierOrderStatusEnum.WAIT_CLIENT_REPAY]: '待客户还款',
[supplierOrderStatusEnum.REPAYING]: '还款中',
- [supplierOrderStatusEnum.CANCELED]: '已取消',
+ [supplierOrderStatusEnum.CANCELED]: '已取消'
}
/**
@@ -159,13 +159,13 @@ export const supplierOrderStatusMap = {
export const paymentMethodEnum = {
WECHAT_PAY: 1,
MONTHLY_PAY: 2,
- FLY_PAY: 4,
+ FLY_PAY: 4
}
export const paymentMethodMap = {
[paymentMethodEnum.WECHAT_PAY]: '微信支付',
[paymentMethodEnum.MONTHLY_PAY]: '月结支付',
- [paymentMethodEnum.FLY_PAY]: '飞算支付',
+ [paymentMethodEnum.FLY_PAY]: '飞算支付'
}
/**
@@ -175,7 +175,7 @@ export const financeStatusEnum = {
WAIT_CLIENT_LOAN: 30181,
WAIT_FINANCE: 30182,
FINISHED: 30183,
- FAILED: 30184,
+ FAILED: 30184
}
/**
@@ -185,7 +185,7 @@ export const financeStatusMap = {
[financeStatusEnum.WAIT_CLIENT_LOAN]: '待客户借款',
[financeStatusEnum.WAIT_FINANCE]: '待融资',
[financeStatusEnum.FINISHED]: '已融资',
- [financeStatusEnum.FAILED]: '融资失败',
+ [financeStatusEnum.FAILED]: '融资失败'
}
/**
@@ -193,10 +193,10 @@ export const financeStatusMap = {
*/
export const contractTypeEnum = {
ORDER_CONTRACT: 1,
- GUARANTEE_CONTRACT: 2,
+ GUARANTEE_CONTRACT: 2
}
export const contractTypeMap = {
[contractTypeEnum.ORDER_CONTRACT]: '订单合同',
- [contractTypeEnum.GUARANTEE_CONTRACT]: '担保合同',
+ [contractTypeEnum.GUARANTEE_CONTRACT]: '担保合同'
}
diff --git a/pages/client-credit/index.vue b/pages/client-credit/index.vue
index 5b5b6f4..422f8ab 100644
--- a/pages/client-credit/index.vue
+++ b/pages/client-credit/index.vue
@@ -89,7 +89,8 @@ export default {
searchList: [],
supplierList: [],
hasCreditList: [],
- isFinishedContract: false // 是否该账户与企业签署过担保协议
+ isFinishedContract: false, // 是否该账户与企业签署过担保协议
+ timer: null
}
},
onLoad(option) {
@@ -105,6 +106,12 @@ export default {
}
}
},
+ onShow() {
+ if (this.form.enterpriseId && this.form.supplierId) {
+ console.log('onshow 获取授信信息')
+ this.getCreditList({ mallSupplierId: this.form.supplierId, customerEnterpriseId: this.form.enterpriseId })
+ }
+ },
methods: {
back,
showCompany(e) {
@@ -192,17 +199,23 @@ export default {
this.creditType = creditType
},
getCreditList(data) {
- getCustomerCreditInfo(data).then((res) => {
- if (res) {
- this.hasCreditList = []
- res.hasCredit && this.hasCreditList.push('month')
- res.hasFeisuanCredit && this.hasCreditList.push('fs')
- this.isFinishedContract = res.isFinishedContract
- } else {
- this.hasCreditList = []
- this.isFinishedContract = false
- }
- })
+ if (this.timer) {
+ clearTimeout(this.timer)
+ this.timer = null
+ }
+ this.timer = setTimeout(() => {
+ getCustomerCreditInfo(data).then((res) => {
+ if (res) {
+ this.hasCreditList = []
+ res.hasCredit && this.hasCreditList.push('month')
+ res.hasFeisuanCredit && this.hasCreditList.push('fs')
+ this.isFinishedContract = res.isFinishedContract
+ } else {
+ this.hasCreditList = []
+ this.isFinishedContract = false
+ }
+ })
+ }, 500)
}
},
created() {
@@ -227,7 +240,6 @@ export default {
}
},
['form.enterpriseId']() {
- console.log('form.enterpriseId', this.form)
if (this.form.enterpriseId && this.form.supplierId) {
this.getCreditList({ mallSupplierId: this.form.supplierId, customerEnterpriseId: this.form.enterpriseId })
}
diff --git a/pages/client-list/index.vue b/pages/client-list/index.vue
index 9e8aa37..c695b49 100644
--- a/pages/client-list/index.vue
+++ b/pages/client-list/index.vue
@@ -147,20 +147,12 @@ export default {
return this.$store.state.qnToken != ''
}
},
- mounted() {
- // getArea().then((res) => {
- // if (res) {
- // this.items = res
- // }
- // })
- },
onLoad(option) {
if (option) {
option.latitude && (this.params.latitude = option.latitude)
option.longitude && (this.params.longitude = option.longitude)
option.km && (this.params.km = option.km)
}
- // this.getList()
}
}
diff --git a/pages/guarantee-agreement/index.vue b/pages/guarantee-agreement/index.vue
index f1262a9..172c84e 100644
--- a/pages/guarantee-agreement/index.vue
+++ b/pages/guarantee-agreement/index.vue
@@ -180,7 +180,7 @@ export default {
getGuaranteeContract({ mallSupplierId: this.params.mallSupplierId, customerEnterpriseId: this.params.enterpriseId }).then((res) => {
if (res) {
// #ifdef APP-PLUS
- go2('page-view', { title: '签约担保协议', url: encodeURIComponent(res), params: this.params })
+ go2('page-view', { title: '签约担保协议', url: encodeURIComponent(res), params: JSON.stringify(this.params) }, true)
// #endif
// #ifdef H5
window ? (window.location.href = res) : ''
diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index 3dc4048..515072d 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -6,7 +6,7 @@
分享
-
+
{{ storeInformation.name }}
全部商品 {{ storeInformation.productNumber }} | 上新 {{ storeInformation.currentProductNumber }}
@@ -28,10 +28,10 @@
:src="item.litPicUrl || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/paper-default-small.png'"
mode=""
>
-
+
- {{ item.name }}
-
+ {{ item.name }}
+
{{ item.updateTime | timeFilter }}
- 编辑
+ 编辑
- {{ item.status === 30111 ? '下架' : '上架' }}
+ {{ item.status === 30111 ? '下架' : '上架' }}
@@ -71,7 +71,7 @@
请先完善企业基本信息
-
+
diff --git a/pages/month-credit/index.vue b/pages/month-credit/index.vue
index 95dca62..3edd92e 100644
--- a/pages/month-credit/index.vue
+++ b/pages/month-credit/index.vue
@@ -70,7 +70,7 @@ export default {
duration: 2000,
success: () => {
setTimeout(() => {
- go2('client-credit', {}, true)
+ go2('client-credit', { enterpriseId: this.form.enterpriseId, name: this.form.enterpriseName }, true)
}, 2000)
}
})
diff --git a/pages/page-view/index.vue b/pages/page-view/index.vue
index 5a92738..2c61354 100644
--- a/pages/page-view/index.vue
+++ b/pages/page-view/index.vue
@@ -11,13 +11,15 @@ export default {
data() {
return {
url: '',
- socket: null
+ socket: null,
+ params: null
}
},
onLoad(option) {
if (option) {
this.url = decodeURIComponent(option.url)
- console.log(this.url, option)
+ this.params = JSON.parse(option.params)
+ console.log('params', option.params)
} else {
uni.showToast({
title: '参数错误',
@@ -41,6 +43,11 @@ export default {
* @param {Object} data {data:{},type:''}
*/
getMessage(data) {
+ // 供应商担保协议回调
+ if (data.type === 'guaranteeSuccess') {
+ go2('fs-credit', { ...this.params }, true)
+ }
+ // 订单合同签署成功
if (data.type == 'zzgSupplierTCSignSuccess') {
go2('order-detail', { orderId: data.data.orderId }, true)
}
diff --git a/pages/vip-center/index.vue b/pages/vip-center/index.vue
index 6229bbb..bca86d8 100644
--- a/pages/vip-center/index.vue
+++ b/pages/vip-center/index.vue
@@ -16,37 +16,25 @@
-
+
账期变现
-
+
电子签约
-
+
智能合同
-
+
征信管理
@@ -69,12 +57,12 @@
diff --git a/static/imgs/vip-center/1.png b/static/imgs/vip-center/1.png
new file mode 100644
index 0000000..41c5e24
Binary files /dev/null and b/static/imgs/vip-center/1.png differ
diff --git a/static/imgs/vip-center/2.png b/static/imgs/vip-center/2.png
new file mode 100644
index 0000000..eb3765f
Binary files /dev/null and b/static/imgs/vip-center/2.png differ
diff --git a/static/imgs/vip-center/3.png b/static/imgs/vip-center/3.png
new file mode 100644
index 0000000..0ad8854
Binary files /dev/null and b/static/imgs/vip-center/3.png differ
diff --git a/static/imgs/vip-center/4.png b/static/imgs/vip-center/4.png
new file mode 100644
index 0000000..2eccfb8
Binary files /dev/null and b/static/imgs/vip-center/4.png differ
diff --git a/static/logo.png b/static/logo.png
index 2b6d783..3d0c130 100644
Binary files a/static/logo.png and b/static/logo.png differ
diff --git a/unpackage/res/icons/1024x1024.png b/unpackage/res/icons/1024x1024.png
index a8b682a..ea54033 100644
Binary files a/unpackage/res/icons/1024x1024.png and b/unpackage/res/icons/1024x1024.png differ
diff --git a/unpackage/res/icons/120x120.png b/unpackage/res/icons/120x120.png
index 4730ff9..aa2f05c 100644
Binary files a/unpackage/res/icons/120x120.png and b/unpackage/res/icons/120x120.png differ
diff --git a/unpackage/res/icons/144x144.png b/unpackage/res/icons/144x144.png
index 09aa081..cceb9cc 100644
Binary files a/unpackage/res/icons/144x144.png and b/unpackage/res/icons/144x144.png differ
diff --git a/unpackage/res/icons/152x152.png b/unpackage/res/icons/152x152.png
index 199c736..59ecf3b 100644
Binary files a/unpackage/res/icons/152x152.png and b/unpackage/res/icons/152x152.png differ
diff --git a/unpackage/res/icons/167x167.png b/unpackage/res/icons/167x167.png
index 4f5f569..4a0a20c 100644
Binary files a/unpackage/res/icons/167x167.png and b/unpackage/res/icons/167x167.png differ
diff --git a/unpackage/res/icons/180x180.png b/unpackage/res/icons/180x180.png
index 057aaa1..553159b 100644
Binary files a/unpackage/res/icons/180x180.png and b/unpackage/res/icons/180x180.png differ
diff --git a/unpackage/res/icons/192x192.png b/unpackage/res/icons/192x192.png
index e0e1da5..7f43e19 100644
Binary files a/unpackage/res/icons/192x192.png and b/unpackage/res/icons/192x192.png differ
diff --git a/unpackage/res/icons/20x20.png b/unpackage/res/icons/20x20.png
index 700f06a..5208544 100644
Binary files a/unpackage/res/icons/20x20.png and b/unpackage/res/icons/20x20.png differ
diff --git a/unpackage/res/icons/29x29.png b/unpackage/res/icons/29x29.png
index 6075302..677dee3 100644
Binary files a/unpackage/res/icons/29x29.png and b/unpackage/res/icons/29x29.png differ
diff --git a/unpackage/res/icons/40x40.png b/unpackage/res/icons/40x40.png
index 2d52bd4..c91bd57 100644
Binary files a/unpackage/res/icons/40x40.png and b/unpackage/res/icons/40x40.png differ
diff --git a/unpackage/res/icons/58x58.png b/unpackage/res/icons/58x58.png
index 5658a55..2b4e52f 100644
Binary files a/unpackage/res/icons/58x58.png and b/unpackage/res/icons/58x58.png differ
diff --git a/unpackage/res/icons/60x60.png b/unpackage/res/icons/60x60.png
index 94b3f6f..afaeebd 100644
Binary files a/unpackage/res/icons/60x60.png and b/unpackage/res/icons/60x60.png differ
diff --git a/unpackage/res/icons/72x72.png b/unpackage/res/icons/72x72.png
index 2529b24..17e6aea 100644
Binary files a/unpackage/res/icons/72x72.png and b/unpackage/res/icons/72x72.png differ
diff --git a/unpackage/res/icons/76x76.png b/unpackage/res/icons/76x76.png
index edae3ec..a964f29 100644
Binary files a/unpackage/res/icons/76x76.png and b/unpackage/res/icons/76x76.png differ
diff --git a/unpackage/res/icons/80x80.png b/unpackage/res/icons/80x80.png
index 83dfe79..6b44e94 100644
Binary files a/unpackage/res/icons/80x80.png and b/unpackage/res/icons/80x80.png differ
diff --git a/unpackage/res/icons/87x87.png b/unpackage/res/icons/87x87.png
index a0f337c..54ecc38 100644
Binary files a/unpackage/res/icons/87x87.png and b/unpackage/res/icons/87x87.png differ
diff --git a/unpackage/res/icons/96x96.png b/unpackage/res/icons/96x96.png
index 55f6c1c..1e143a5 100644
Binary files a/unpackage/res/icons/96x96.png and b/unpackage/res/icons/96x96.png differ