diff --git a/App.vue b/App.vue index 3579f38..614c9ff 100644 --- a/App.vue +++ b/App.vue @@ -11,6 +11,27 @@ export default { if (flag && token) { go2('client') } + setTimeout(() => { + plus.push.addEventListener( + 'click', + function (msg) { + plus.ui.alert('click:' + JSON.stringify(msg)) + plus.ui.alert(msg.payload) + // plus.ui.alert(JSON.stringify(msg)); + }, + false + ) + // 监听在线消息事件 + plus.push.addEventListener( + 'receive', + function (msg) { + // plus.ui.alert(2); + plus.ui.alert('receive:' + JSON.stringify(msg)) + console.log('receive:' + JSON.stringify(msg)) + }, + false + ) + }, 1000) }, onShow: function () {}, onHide: function () {} diff --git a/apis/commonApi.js b/apis/commonApi.js index 66c84f9..86764a3 100644 --- a/apis/commonApi.js +++ b/apis/commonApi.js @@ -1,5 +1,6 @@ import http from '../utils/http/index.js' import store from '@/store/index' +import { XAPPID } from '@/enums/index.js' let areaCache = null /** * 获取省市区街道 @@ -28,7 +29,7 @@ let baseInfo = null function syncStore(res) { if (res.enterpriseList && res.enterpriseList.length > 0) { let supplierInfo = res.enterpriseList[0] - let vipExpireTime = supplierInfo.supplier.vipExpireTime + let vipExpireTime = supplierInfo.supplier.vipExpireTime || null let isVip = false if (vipExpireTime) { let now = new Date().getTime() @@ -41,7 +42,8 @@ function syncStore(res) { name: supplierInfo.name, fddEnterpriseStatus: supplierInfo.fddEnterpriseStatus, supplierId: supplierInfo.supplier.id, - isVip + isVip, + vipExpireTime }) let userInfo = { name: supplierInfo.employeeName, // 没有企业就没有name, @@ -115,3 +117,14 @@ export function transformFileToImg(data) { data: data }) } + +/** + * 推送客户绑定 + * + */ +export function pushCustomerBind(cid, platformType = 'Android', appId = XAPPID) { + return http.post({ + url: '/base-paper-trading/user/binding/geTui/cid', + data: { cid, appId, platformType } + }) +} diff --git a/apis/creditManagementApi.js b/apis/creditManagementApi.js index a2cbf7c..0d64659 100644 --- a/apis/creditManagementApi.js +++ b/apis/creditManagementApi.js @@ -1,9 +1,37 @@ import http from '../utils/http/index.js' -// 添加纸品 -export function addPaper(data) { +/** + * 获取授信公司列表 + * @param {object} data + * @returns + */ +export function getCreditCompanyList(data) { + return http.get({ + url: '/base-paper-trading/get/customer-investigationcredit/list', + data + }) +} + +/** + * 获取公司授信订单列表 + * @param {object} data + * @returns + */ +export function getCompanyCreditOrderList(data) { + return http.get({ + url: '/base-paper-trading/get/customer-feisuan-order/list', + data + }) +} + +/** + * 上传征信 + * @param {object} data + * @returns + */ +export function uploadCompanyCredit(data) { return http.post({ - url: '/base-paper-trading/create/product', + url: `/base-paper-trading/upload/bank-investigation-credit/for-customer?customerEnterpriseId=${data.customerEnterpriseId}&supplierId=${data.supplierId}`, data }) } diff --git a/hybrid/html/share.html b/hybrid/html/share.html new file mode 100644 index 0000000..55b15e3 --- /dev/null +++ b/hybrid/html/share.html @@ -0,0 +1,39 @@ + + + + + + + + Document + + + + + + + + + + + \ No newline at end of file diff --git a/manifest.json b/manifest.json index 854b740..e44b192 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__8C1E198", "description" : "", "versionName" : "1.0.0", - "versionCode" : "100", + "versionCode" : 102, "transformPx" : false, "networkTimeout" : { "request" : 6000 @@ -27,7 +27,8 @@ "Maps" : {}, "Geolocation" : {}, "FaceID" : {}, - "iBeacon" : {} + "iBeacon" : {}, + "Push" : {} }, /* 应用发布信息 */ "distribute" : { @@ -58,7 +59,16 @@ "abiFilters" : [ "armeabi-v7a", "x86" ] }, /* ios打包配置 */ - "ios" : {}, + "ios" : { + "privacyDescription" : { + "NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册，以便为你编辑信息", + "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册，以便为你保存信息", + "NSCameraUsageDescription" : "该应用需要使用你的摄像头，以便为你编辑信息", + "NSLocationWhenInUseUsageDescription" : "该应用需要你的地理位置，以便为你提供当前位置附近印包厂信息", + "NSLocationAlwaysUsageDescription" : "该应用需要你的地理位置，以便为你提供当前位置附近印包厂信息", + "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要你的地理位置，以便为你提供当前位置附近印包厂信息" + } + }, /* SDK配置 */ "sdkConfigs" : { "maps" : { @@ -82,7 +92,8 @@ "appkey_android" : "877848546f7f3717101a17c33e1d4df3" } }, - "share" : {} + "share" : {}, + "push" : {} }, "icons" : { "android" : { diff --git a/pages.json b/pages.json index 5853336..4339494 100644 --- a/pages.json +++ b/pages.json @@ -1,12 +1,12 @@ { "pages": [ - { - "path": "pages/client/index", - "style": { - "navigationBarTitleText": "客户", - "navigationStyle": "custom" - } - }, + { + "path": "pages/client/index", + "style": { + "navigationBarTitleText": "客户", + "navigationStyle": "custom" + } + }, { "path": "pages/start-page/index", "style": { @@ -231,6 +231,13 @@ "navigationStyle": "custom" } }, + { + "path": "pages/credit-company-order/index", + "style": { + "navigationBarTitleText": "客户订单", + "navigationStyle": "custom" + } + }, { "path": "pages/credit-order-list/index", "style": { diff --git a/pages/credit-company-order/index.vue b/pages/credit-company-order/index.vue new file mode 100644 index 0000000..46e6c45 --- /dev/null +++ b/pages/credit-company-order/index.vue @@ -0,0 +1,370 @@ + + + + + diff --git a/pages/credit-management/index.vue b/pages/credit-management/index.vue index e1b1068..24899e2 100644 --- a/pages/credit-management/index.vue +++ b/pages/credit-management/index.vue @@ -1,18 +1,153 @@ @@ -20,5 +155,141 @@ export default { diff --git a/pages/login/index.vue b/pages/login/index.vue index ed33bfa..1827263 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -44,7 +44,7 @@