diff --git a/.env.dev b/.env.dev index 5a4a3d8a7e1f7a1e1770def1f9680f5d8560cb39..74ce16a5b96c16e75e467393fc3eef71d3ac936b 100644 --- a/.env.dev +++ b/.env.dev @@ -12,7 +12,7 @@ VUE_APP_CLIENT_SECRET = web-loong-secret VUE_APP_API_PREFIX = /api/v1 // 网关服务 -VUE_APP_MS_GATEWAY_API = http://localhost:9140 +VUE_APP_MS_GATEWAY_API = http://192.168.14.1:9140 // 业务服务 @@ -31,7 +31,8 @@ VUE_APP_ENABLE_GATEWAY = on VUE_APP_SYS_API = http://10.2.3.118:9165/online-financial-service/api/v1/cust-info/permit_endpoint -VUE_APP_ONLINE_API = http://10.2.3.118:9165/online-financial-service/api/v1/cust-info/permit_endpoint + +VUE_APP_ONLINE_API = http://192.168.14.1:9155/ms-online/api/v1 //http://10.0.3.144:9165/online-financial-service/api/v1/cust-info/permit_endpointy //服务器http://10.2.3.118:9165/online-financial-service/api/v1/cust-info/permit_endpoint diff --git a/src/components/common/Picket.vue b/src/components/common/Picket.vue index fd666c74aa527988c1f329c4d8bdde7ed0f12f71..56be54022bc1d6585ba4d8c41e826df2844e3ff2 100644 --- a/src/components/common/Picket.vue +++ b/src/components/common/Picket.vue @@ -29,8 +29,8 @@ {{ crowd }} - {{ assureMeans }} - {{ type }} + {{ this.$dictData.getText(assureMeans,"LOAN_TYPE") }} + {{ this.$dictData.getText(type,"PROD_TYPE")}} 面向人群 @@ -105,6 +105,7 @@ export default class Picket extends Vue { background: #eaf5ff; font-size: 12px; margin-left: 3%; + margin-right: 3%; color: #1890FF; text-rendering: optimizeLegibility; font-feature-settings: "kern" 1; diff --git a/src/components/common/ProductCard.vue b/src/components/common/ProductCard.vue index 4a434441f901548f99adec3844699dc10d58f7b8..025605790559a5b868979010df359336b7c4fcc4 100644 --- a/src/components/common/ProductCard.vue +++ b/src/components/common/ProductCard.vue @@ -42,7 +42,7 @@ - {{ money }} + ¥{{ productData.amtMax }} {{ moneyName }} @@ -56,7 +56,7 @@
- - 农村信用社向符合条件的客户发放的用于满足个人消费、生产经营流动资金等需求的一项贷款业务。 - 一次核定,三年有效,随用随贷,循环使用。 + {{item.desc}} + + 以借款人自有或第三人提供有权处置的有效资产抵押担保。 -->
@@ -85,8 +85,13 @@ import { Component, Vue, Prop, Watch, Emit } from "vue-property-decorator"; name: "ProductCard" }) export default class ProductCard extends Vue { - @Prop({ default: "" }) money: string | undefined; //额度 - @Prop({ default: "" }) moneyName: string | undefined;//额度大写 + // @Prop({ default: "" }) money: string | undefined; //额度 + // @Prop({ default: "" }) moneyName: string | undefined;//额度大写 + + @Prop({ default: {prodDesc:""} }) productData: any | {};//产品数据 + @Prop({ default: {prodDesc:""} }) desc: any | {};//产品数据 + + //立即登录 activeNames = [""]; lodiing() { diff --git a/src/constants/api/login/common.api.ts b/src/constants/api/login/common.api.ts index a6456be8fe109c5e2a9158c7577d6b0e4903ad58..690b4b02c107a04db3f1bae6b3cbde9224e944fb 100644 --- a/src/constants/api/login/common.api.ts +++ b/src/constants/api/login/common.api.ts @@ -11,7 +11,7 @@ import { HeaderType } from "@/constants/enum/general/header-type.enum"; //网关 // const prefix = process.env.VUE_APP_MS_GATEWAY_API + process.env.VUE_APP_AUTH_API ; - +const onlinePrefix = process.env.VUE_APP_ONLINE_API //本地 const prefix = "http://localhost:9130"+ process.env.VUE_APP_AUTH_API ; const commonApi = { @@ -20,6 +20,12 @@ const commonApi = { method: MethodType.POST.code, header: HeaderType.AUTH.code, }, + + getProductList: { + url: onlinePrefix + "/prodSub/getProductList", + method: MethodType.POST.code, + header: HeaderType.AUTH.code, + }, }; diff --git a/src/constants/types/property.d.ts b/src/constants/types/property.d.ts index 83cc7043ac0f38086227dff1c043499aa972ec15..23c364c23903f13029d233b40ccb8c97391833ef 100644 --- a/src/constants/types/property.d.ts +++ b/src/constants/types/property.d.ts @@ -2,8 +2,15 @@ import Vue from "vue"; declare module "vue/types/vue" { import { GlobalStateService } from "@/services/global-state.service"; + import dictData from "@/services/dict.service"; interface Vue { $globalStateService: GlobalStateService; + $dictData: dictData; + /* $ebus: any; + push: any; + pop: any; + replace: any; + transitionName: string;*/ } } diff --git a/src/main.ts b/src/main.ts index d70d0e0e294ba8605d0c470680ca90eead860248..bbc530b6ede5428a544c2c3b350d7c5b051119bc 100644 --- a/src/main.ts +++ b/src/main.ts @@ -16,7 +16,7 @@ import filterService from "./filtres/filter.service"; import directiveService from "./directives/directive.service"; import apiService from "@/services/api.service"; import dbService from "@/services/db.service"; -import dictService from "@/services/dict.service"; +// import dictService from "@/services/dict.service"; import "./assets/iconfont/iconfont.css"; import "./assets/iconfont/iconfont.js"; import { NativeUI } from "@/public/ts/NativeUI"; @@ -37,6 +37,8 @@ import ant from 'ant-design-vue' import 'ant-design-vue/dist/antd.css' import { VanComponent } from "vant/types/component" import 'element-ui/lib/theme-chalk/index.css'; + import * as echarts from 'echarts'; +import dictData from "@/services/dict.service"; Vue.use(Element); Vue.use(Vant); Vue.use(ant); @@ -45,6 +47,8 @@ Vue.use(Step); Vue.use(Steps); Vue.config.productionTip = process.env.PRODUCTION_TIP; +Vue.prototype.$dictData = dictData; + /*注册组件*/ @@ -62,9 +66,12 @@ directiveService.init(); /*注册axios*/ apiService.init(); -dbService.initDB().then(() => { - dictService.init(); -}); +/**注册字典**/ +dictData.init(); + +// dbService.initDB().then(() => { +// dictService.init(); +// }); new Vconsole(); /*h5+插件*/ nativeService.init(); diff --git a/src/services/api.service.ts b/src/services/api.service.ts index 74bba2f9fa1436ce7ead7f06715efb551453d0e4..530a1c0ea3870f46824cc99ae68d480fd872a5fa 100644 --- a/src/services/api.service.ts +++ b/src/services/api.service.ts @@ -344,6 +344,8 @@ class ApiService { return data; } } + }else{ + NativeUI.toast("网络异常!"); } return response; }; diff --git a/src/services/dict.service.ts b/src/services/dict.service.ts index 938a05c4b07f0101b90ca212fa21614d626b46cd..45a217b30c265afe83bd9fe4af7e9cd1bc004228 100644 --- a/src/services/dict.service.ts +++ b/src/services/dict.service.ts @@ -15,7 +15,7 @@ class DictService { * @Author zhangmk * @Date 2021年12月31日17:58:48 */ - private dicData = ([ + private dictData = ([ { s_field_name: '是否撤销', s_field: 'ISREVOCATION', value: '1', text: '是' }, { s_field_name: '是否撤销', s_field: 'ISREVOCATION', value: '0', text: '否' }, { s_field_name: '经济类型分类', s_field: 'ECOTYPE', value: '100', text: '内资企业' }, @@ -2591,6 +2591,19 @@ class DictService { { s_field_name: '流程业务类型', s_field: 'PROCESS_TYPE', value: '977', text: '企业债主体授信-分支行' }, { s_field_name: '流程业务类型', s_field: 'PROCESS_TYPE', value: '978', text: '企业债主体授信-资金部' }, /*****************************对公营销* 开始 *********************************************/ + + + + /*****************************线上金融产品 *********************************************/ + { s_field_name: '担保方式', s_field: 'LOAN_TYPE', value: '01', text: '抵押' }, + { s_field_name: '担保方式', s_field: 'LOAN_TYPE', value: '02', text: '质押' }, + { s_field_name: '担保方式', s_field: 'LOAN_TYPE', value: '03', text: '保证' }, + { s_field_name: '担保方式', s_field: 'LOAN_TYPE', value: '04', text: '信用' }, + + { s_field_name: '贷款种类', s_field: 'PROD_TYPE', value: '0', text: '消费贷' }, + { s_field_name: '贷款种类', s_field: 'PROD_TYPE', value: '1', text: '购房贷' }, + + ]); /** @@ -2600,7 +2613,8 @@ class DictService { */ init() { //TODO 需要通过接口先进行查询然后保存。 - localStorage.setItem("dictData", JSON.stringify(this.dicData)); + localStorage.setItem("dictData", JSON.stringify(this.dictData)); + console.log("dicDataInit") // this.queryDictList().then((data: any) => { // const dictData: any = {}; // data.forEach((item: any) => { @@ -2687,5 +2701,5 @@ class DictService { return result; } } -const dictService = new DictService(); -export default dictService; +const dictData = new DictService(); +export default dictData; diff --git a/src/views/ProductDetail/ProductDetails.vue b/src/views/ProductDetail/ProductDetails.vue index 645f4a542c1451ff6b7711347f2bba55cedfe5e3..844925e1b89bff3f8f62dc0dfa3a05b0b2aabcaf 100644 --- a/src/views/ProductDetail/ProductDetails.vue +++ b/src/views/ProductDetail/ProductDetails.vue @@ -8,24 +8,42 @@ -->