diff --git a/.DS_Store b/.DS_Store index c86b643..79e1842 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/apis/clientListApi.js b/apis/clientListApi.js index 1abec78..5671ba8 100644 --- a/apis/clientListApi.js +++ b/apis/clientListApi.js @@ -12,3 +12,44 @@ export function getCompanyList(data) { } ) } + +/** + * 获取我的客户 + * @param {object} data mallSupplierId + * @returns 印包厂列表 + */ +export function getMyClientList(data) { + return http.get( + { + url: '/yyt-uec/get/my/zzg-customer/page', + data + }, + { + hideLoading: true + } + ) +} + +/** + * 查询客户税点 + * @param {object} data supplierId customerEnterpriseId + * @returns 税点 + */ +export function getClientTaxPoint(data) { + return http.get({ + url: '/yyt-uec/supllier/get/tax-point/for-customer', + data + }) +} + +/** + * 修改/新增客户税点 + * @param {object} data supplierId customerEnterpriseId taxPoint + * @returns 税点 + */ +export function editClientTaxPoint(data) { + return http.post({ + url: '/yyt-uec/supllier/create/tax-point/for-customer?supplierId=' + data.supplierId, + data + }) +} diff --git a/apis/commonApi.js b/apis/commonApi.js index cfaa931..b8a4a48 100644 --- a/apis/commonApi.js +++ b/apis/commonApi.js @@ -45,13 +45,13 @@ function syncStore(res) { fddEnterpriseStatus: supplierInfo.fddEnterpriseStatus, supplierId: supplierInfo.supplier.id, isVip, - vipExpireTime, + vipExpireTime }) let userInfo = { name: supplierInfo.employeeName, // 没有企业就没有name, userId: res.userId, mobile: res.mobile, - avatar: null, + avatar: null } store.commit('setUserInfo', userInfo) } else { @@ -59,7 +59,7 @@ function syncStore(res) { name: '', // 没有企业就没有name, userId: res.userId, mobile: res.mobile, - avatar: null, + avatar: null } store.commit('setUserInfo', userInfo) // 移除企业信息 @@ -105,7 +105,7 @@ export function getVerifyUrl(data = {}) { export function getGuaranteeContract(data = {}) { return http.post({ url: `/yyt-uec/create/supplier/guarantee-contract?mallSupplierId=${data.mallSupplierId}&customerEnterpriseId=${data.customerEnterpriseId}`, - data, + data }) } @@ -116,7 +116,7 @@ export function getGuaranteeContract(data = {}) { export function transformFileToImg(data) { return http.get({ url: '/document/get/enterprise-documents/file-image-base64', - data: data, + data: data }) } @@ -127,7 +127,7 @@ export function transformFileToImg(data) { export function pushCustomerBind(cid, platformType = 'android', appId = XAPPID) { return http.post({ url: '/base-paper-trading/user/binding/geTui/cid', - data: { cid, appId, platformType }, + data: { cid, appId, platformType } }) } @@ -138,7 +138,7 @@ export function pushCustomerBind(cid, platformType = 'android', appId = XAPPID) export function pushCustomerOff(cid, platformType = 'android', appId = XAPPID) { return http.post({ url: '/base-paper-trading/user/geTui/offline', - data: { cid, appId, platformType }, + data: { cid, appId, platformType } }) } @@ -148,7 +148,7 @@ export function pushCustomerOff(cid, platformType = 'android', appId = XAPPID) { export function getLicenseOcr(data = {}) { return http.post({ url: '/base-paper-trading/ocr/business-license', - data: data, + data: data }) } @@ -158,7 +158,7 @@ export function getLicenseOcr(data = {}) { export function getFrontIdCardOcr(data = {}) { return http.post({ url: '/base-paper-trading/ocr/id-card/face', - data: data, + data: data }) } @@ -170,7 +170,7 @@ export function getFrontIdCardOcr(data = {}) { export function checkUpdate(data = {}) { return http.get({ url: '/base-paper-trading/get/app/version', - data: data, + data: data }) } @@ -183,7 +183,7 @@ export function checkUpdate(data = {}) { export function openVip(data = {}) { return http.post({ url: `/yyt-uec/supplier/apply/for/vip?type=${data.type}&mallSupplierId=${data.mallSupplierId}`, - data: data, + data: data }) } @@ -196,6 +196,32 @@ export function openVip(data = {}) { export function openVipPay(data = {}) { return http.post({ url: PAY_URL, - data: data, + data: data + }) +} + +/** + * 获取账号下纸盘商首款吗列表 + * @param {object} data + * @value {string} mallSupplierId + * @value {string} payeeCodeUrl + */ +export function getReciptCodeList(data = {}) { + return http.get({ + url: '/yyt-uec/get/mall/supplier/payee/code/list', + data: data + }) +} + +/** + * 纸盘商绑定收款码 + * @param {object} data + * @value {string} mallSupplierId + * @value {string} payeeCodeUrl + */ +export function bindingReciptCode(data = {}) { + return http.post({ + url: '/yyt-uec/save/mall/supplier/payee/code', + data: data }) } diff --git a/apis/orderApi.js b/apis/orderApi.js index f757301..f7aa1b4 100644 --- a/apis/orderApi.js +++ b/apis/orderApi.js @@ -140,3 +140,14 @@ export function getCooperationList(data) { data }) } + +/** + * 获取已签署合同企业列表 + * @param {object} data supplierOrderId + */ +export function supplierConfirmWxpay(data) { + return http.post({ + url: '/base-paper-trading/supplier/submit/confirm/cash/payment', + data + }) +} diff --git a/components/business-components/packingStationItem.vue b/components/business-components/packingStationItem.vue index f72b456..40150df 100644 --- a/components/business-components/packingStationItem.vue +++ b/components/business-components/packingStationItem.vue @@ -55,7 +55,7 @@ - + {{ info.detailedAddress || '未知' }} @@ -75,20 +75,7 @@ export default { props: { info: { type: Object, - default: () => ({ - enterpriseName: '广州市金骏彩色印务有限公司', - enterpriseLogo: '', - business: '生产画册、书刊、包装盒、手提袋子、快递箱', - whetherCooperation: 1, - monthlyPurchaseQuantity: 100, - monthlyTradingQuota: 200, - lastTradingDate: '2020-12-12', - openingDate: '2020-12-12', - legalPerson: '张三', - registeredCapital: 1000, - contactNumber: '13888888888', - detailedAddress: '广州市天河区天河路' - }) + default: () => ({}) } }, methods: { @@ -124,6 +111,9 @@ export default { } } return '' + }, + selected() { + this.$emit('selected', this.info) } }, computed: { diff --git a/components/qn-select/qn-select.vue b/components/qn-select/qn-select.vue new file mode 100644 index 0000000..04d4695 --- /dev/null +++ b/components/qn-select/qn-select.vue @@ -0,0 +1,133 @@ + + + + + diff --git a/enums/index.js b/enums/index.js index 53e509c..f660dd7 100644 --- a/enums/index.js +++ b/enums/index.js @@ -200,3 +200,17 @@ export const contractTypeMap = { [contractTypeEnum.ORDER_CONTRACT]: '订单合同', [contractTypeEnum.GUARANTEE_CONTRACT]: '担保合同' } + +/** + * 订单是否开票: 1:开票 0:不开票 + * 默认开票 + */ +export const invoiceStatusEnum = { + INVOICE: 1, + NO_INVOICE: 0 +} + +export const invoiceStatusMap = { + [invoiceStatusEnum.INVOICE]: '开票', + [invoiceStatusEnum.NO_INVOICE]: '不开票' +} diff --git a/pages.json b/pages.json index ac284e2..ca0e162 100644 --- a/pages.json +++ b/pages.json @@ -356,6 +356,22 @@ "navigationStyle": "custom", "enablePullDownRefresh": false } + }, + { + "path": "pages/my-client/index", + "style": { + "navigationBarTitleText": "我的客户", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/my-receipt-code/index", + "style": { + "navigationBarTitleText": "我的收款码", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } } ], "globalStyle": { diff --git a/pages/add-paper/index.vue b/pages/add-paper/index.vue index c10fe59..0a49057 100644 --- a/pages/add-paper/index.vue +++ b/pages/add-paper/index.vue @@ -139,7 +139,7 @@ - 含税价格: + 现款单价: 元/{{ item.stockUnit === 1 ? '张' : '吨' }} diff --git a/pages/client-list/index.vue b/pages/client-list/index.vue index 9116736..005c212 100644 --- a/pages/client-list/index.vue +++ b/pages/client-list/index.vue @@ -17,15 +17,41 @@ - + + + + + + + 供应企业 + + + + + + + 税点(%) + (例如:12=12%) + + + + + + + + 保存税点 + + + - diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 9e3ba4c..b726c22 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -20,7 +20,7 @@ - + 其他工具 + + + 订单管理 + 账期订单融资 @@ -118,12 +122,16 @@ 征信管理 - + 授信记录 - - - 订单列表 + + + 客户列表 + + + + 收款码 @@ -581,14 +589,14 @@ export default { display: flex; flex-direction: row; align-items: center; - justify-content: space-between; + justify-content: flex-start; flex-wrap: wrap; .icon-item { display: flex; flex-direction: column; align-items: center; justify-content: center; - min-width: 140rpx; + min-width: 154rpx; margin-bottom: 36rpx; .icon { width: 68rpx; diff --git a/pages/my-client/index.vue b/pages/my-client/index.vue new file mode 100644 index 0000000..9d46d8d --- /dev/null +++ b/pages/my-client/index.vue @@ -0,0 +1,175 @@ + + + + + diff --git a/pages/my-receipt-code/index.vue b/pages/my-receipt-code/index.vue new file mode 100644 index 0000000..5e15584 --- /dev/null +++ b/pages/my-receipt-code/index.vue @@ -0,0 +1,162 @@ + + + + + diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue index 32fd0db..9500e3d 100644 --- a/pages/order-detail/index.vue +++ b/pages/order-detail/index.vue @@ -100,6 +100,10 @@ + + 是否开票 + {{ invoiceStatusMap[orderInfo.invoiceOrNot] || '开票' }} + 订单备注 {{ orderInfo.remark || '无' }} @@ -132,6 +136,9 @@ 取消订单 查看合同 + + 确认微信收款 + 确认发货 @@ -183,9 +190,10 @@ import { supplierUploadVoucher, supplierDelivery, supplierDeleteVoucher, - supplierConfirmRepay + supplierConfirmRepay, + supplierConfirmWxpay } from '@/apis/orderApi.js' -import { supplierOrderStatusMap, supplierOrderStatusEnum, paymentMethodEnum } from '@/enums/index.js' +import { supplierOrderStatusMap, supplierOrderStatusEnum, paymentMethodEnum, invoiceStatusMap } from '@/enums/index.js' import { transformFileToImg } from '@/apis/commonApi.js' export default { data() { @@ -203,7 +211,8 @@ export default { quantity: 0, max: 0, index: 0 - } + }, + invoiceStatusMap: Object.freeze(invoiceStatusMap) } }, onLoad(option) { @@ -272,6 +281,28 @@ export default { } }) }, + // 确定微信收款 + confirmWxpay() { + uni.showModal({ + title: '提示', + content: '确定已经收到微信款项?', + success: (res) => { + if (res.confirm) { + supplierConfirmWxpay({ + supplierOrderId: this.orderInfo.orderId + }).then((res) => { + if (res) { + uni.showToast({ + title: '确认成功', + icon: 'success' + }) + this.init(this.orderInfo.orderId) + } + }) + } + } + }) + }, // 生成步骤条 transformStep(list, quantity) { // 分切 出库 完成 diff --git a/pages/paper-detail/index.vue b/pages/paper-detail/index.vue index 4bd124f..a0cd2af 100644 --- a/pages/paper-detail/index.vue +++ b/pages/paper-detail/index.vue @@ -33,7 +33,7 @@ 克重 - 含税单价 + 现款单价 库存 是否特价 diff --git a/pages/switching-mall/index.vue b/pages/switching-mall/index.vue index b9e9130..7104cd3 100644 --- a/pages/switching-mall/index.vue +++ b/pages/switching-mall/index.vue @@ -49,7 +49,6 @@ export default { back, queryData() { getStoreList().then((res) => { - console.log('==', res) this.enterpriseList = res }) }, diff --git a/static/.DS_Store b/static/.DS_Store index e537d1c..b9f8c5a 100644 Binary files a/static/.DS_Store and b/static/.DS_Store differ diff --git a/static/imgs/.DS_Store b/static/imgs/.DS_Store index 39ffe3d..57189e7 100644 Binary files a/static/imgs/.DS_Store and b/static/imgs/.DS_Store differ diff --git a/static/imgs/general/camera-icon.png b/static/imgs/general/camera-icon.png new file mode 100644 index 0000000..7ad2275 Binary files /dev/null and b/static/imgs/general/camera-icon.png differ diff --git a/static/imgs/general/close-icon.png b/static/imgs/general/close-icon.png new file mode 100644 index 0000000..752614b Binary files /dev/null and b/static/imgs/general/close-icon.png differ diff --git a/static/imgs/mine/credit-record.png b/static/imgs/mine/credit-record.png new file mode 100644 index 0000000..7526d8e Binary files /dev/null and b/static/imgs/mine/credit-record.png differ diff --git a/static/imgs/mine/my-client.png b/static/imgs/mine/my-client.png new file mode 100644 index 0000000..87292c5 Binary files /dev/null and b/static/imgs/mine/my-client.png differ diff --git a/static/imgs/mine/my-receipt-code.png b/static/imgs/mine/my-receipt-code.png new file mode 100644 index 0000000..5073e28 Binary files /dev/null and b/static/imgs/mine/my-receipt-code.png differ diff --git a/static/imgs/mine/设置税点.sketch b/static/imgs/mine/设置税点.sketch new file mode 100644 index 0000000..e2d8c61 Binary files /dev/null and b/static/imgs/mine/设置税点.sketch differ