diff --git a/BagAuth/pages/login/oldLogin.vue b/BagAuth/pages/login/oldLogin.vue
index 157565b..7880e89 100644
--- a/BagAuth/pages/login/oldLogin.vue
+++ b/BagAuth/pages/login/oldLogin.vue
@@ -68,8 +68,8 @@
-
+ 选择更多方式登录
@@ -130,6 +130,9 @@
},
onShow() {},
methods: {
+ moreLogin(){
+ uni.redirectTo({url:'/BagAuth/pages/login/login'})
+ },
checkAgree(val) {
this.checked = val
// this.showRandom = true
@@ -504,6 +507,12 @@
diff --git a/Financial/components/cmd-progress/cmd-progress.vue b/Financial/components/cmd-progress/cmd-progress.vue
new file mode 100644
index 0000000..2ec29d2
--- /dev/null
+++ b/Financial/components/cmd-progress/cmd-progress.vue
@@ -0,0 +1,558 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{setFormat}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{setFormat}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Financial/components/plateNumber.vue b/Financial/components/plateNumber.vue
new file mode 100644
index 0000000..abcbf26
--- /dev/null
+++ b/Financial/components/plateNumber.vue
@@ -0,0 +1,300 @@
+
+
+
+
+ {{administrative?administrative:'行政'}}
+
+
+
+
+
+
+
+
+
+ {{ item.text}}
+
+
+
+
+
+
+
+
+
+
diff --git a/Financial/components/plateNumberColor.vue b/Financial/components/plateNumberColor.vue
new file mode 100644
index 0000000..e87f5c2
--- /dev/null
+++ b/Financial/components/plateNumberColor.vue
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Financial/components/seleBar.vue b/Financial/components/seleBar.vue
new file mode 100644
index 0000000..a7d8963
--- /dev/null
+++ b/Financial/components/seleBar.vue
@@ -0,0 +1,88 @@
+
+
+
+
+
+ {{item.lable}}
+
+
+
+
+
+
+
+
diff --git a/Financial/components/seniorPagePopup.vue b/Financial/components/seniorPagePopup.vue
new file mode 100644
index 0000000..08143af
--- /dev/null
+++ b/Financial/components/seniorPagePopup.vue
@@ -0,0 +1,184 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Financial/pages/details/index.vue b/Financial/pages/details/index.vue
new file mode 100644
index 0000000..03df4ee
--- /dev/null
+++ b/Financial/pages/details/index.vue
@@ -0,0 +1,936 @@
+
+
+
+ 返回
+ 评估报告
+
+
+
+
+
+
+
+
+
+
+ {{ formatCarNumber(scoreData.platenumOrVinnum,0) }}
+
+ {{scoreData.queryDate}}
+ 近{{scoreData.statype}}个月
+
+
+
+ 评估时间 {{scoreData.createTime}}
+
+
+
+ {{displayChange?'综合等级':'综合分数'}}
+
+ {{scoreData.rate?Number((scoreData.rate)*100).toFixed(1).split('.')[0]:'-'}}
+ .{{scoreData.rate?(Number(scoreData.rate)*100).toFixed(1).split('.')[1]:'-'}}
+
+
+ {{displayChangeFn(Number(scoreData.rate)*100)}}
+
+
+
+
+
+
+
+ 车辆类型
+ {{scoreData.f12}}
+
+
+ 车辆评分基础
+ {{scoreData.esc||'---'}}
+
+
+
+
+ {{item.label}}
+ {{Number(scoreData[item.field]).toFixed(1)}} {{item.unit}}
+
+
+
+
+
+
+
+
+
+ {{ formatCarNumber(proposal.homeRiskVo.platenumOrVinnum,0)}}
+
+ {{proposal.homeRiskVo.safeinfoQueryDate}}
+ 近{{proposal.homeRiskVo.safeinfoStatype}}个月
+
+
+
+ 评估时间 {{proposal.homeRiskVo.safeinfoCreateTime||'---'}}
+
+
+
+ 改善建议
+
+ 查看等级说明
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+ {{proposal.transdisrto||'--'}}
+
+
+
+ {{progressItem[0]}}
+
+
+
+ {{progressItem[2].label}}
+
+
+
+
+
+
+
+ 风险改善建议
+
+
+
+ {{suggestedIndex+1}}.{{suggestedItem}}
+
+
+
+
+ 暂无建议
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.label}}
+ {{item.value}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Financial/pages/estimate/index.vue b/Financial/pages/estimate/index.vue
new file mode 100644
index 0000000..6833d42
--- /dev/null
+++ b/Financial/pages/estimate/index.vue
@@ -0,0 +1,969 @@
+
+
+
+ 返回
+
+
+
+
+
+
+
+ {{ formatCarNumber(page.params.platenumOrVinnum,0)}}
+
+
+
+
+
+ 了解一下自己的风险分数
+ 以及全国排名
+
+ 查分数和排名
+
+
+
+ 综合评分
+
+
+
+ 全国
+
+ 前
+
+ {{estimateData.homeScoreVo.natrnk!==null&&estimateData.homeScoreVo.natrnk!==undefined?Number(estimateData.homeScoreVo.natrnk).toFixed(2).split('.')[0]:'0'}}
+
+ .{{estimateData.homeScoreVo.natrnk!==null&&estimateData.homeScoreVo.natrnk!==undefined?Number(estimateData.homeScoreVo.natrnk).toFixed(2).split('.')[1]:'00'}}%
+
+
+
+
+ 全省
+
+ 前
+
+ {{estimateData.homeScoreVo.prornk!==null&&estimateData.homeScoreVo.prornk!==undefined?Number(estimateData.homeScoreVo.prornk).toFixed(2).split('.')[0]:'0'}}
+
+ .{{estimateData.homeScoreVo.prornk!==null&&estimateData.homeScoreVo.prornk!==undefined?Number(estimateData.homeScoreVo.prornk).toFixed(2).split('.')[1]:'00'}}%
+
+
+
+
+
+
+
+
+ {{displayChange?'综合等级':'综合分数'}}
+
+
+ {{estimateData.homeScoreVo.rate[0]}}
+ .{{estimateData.homeScoreVo.rate[1]}}
+
+
+ {{displayChangeFn(estimateData.homeScoreVo.rate.join('.'))}}
+
+
+
+
+
+
+
+
+
+
+
+ 如何提升分数
+ 您的车辆可能涉及多个风险
+
+ 获取改善建议
+
+
+
+
+
+
+
+ {{item.label}}
+ 有 {{estimateData.homeRiskVo[item.field]}} 项风险
+
+
+
+
+
+
+
+
+
+
+ {{estimateData.prompts[0]||'已有最新综合评分或改善建议!'}}
+
+
+
+
+
+
+
+
+
+
+ {{ formatCarNumber(item.platenumOrVinnum,0) }}
+
+
+ {{item.queryDate}}
+ 近{{item.statype}}个月
+
+
+
+
+
+
+
+ {{item.payStatusData.label}}
+
+ ￥{{item.payAmount? Number(item.payAmount).toFixed(2) :'0.00'}}
+
+
+ {{item.createTime}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 车牌号码
+
+
+
+
+
+
+ {{item}}
+
+
+
+ 注意：请核对确认录入的车牌号码无误!录入错误车牌导致报告错误，责任自担
+
+
+
+
+
+
+
+
+
+
diff --git a/Financial/pages/index.vue b/Financial/pages/index.vue
new file mode 100644
index 0000000..ea7dcf0
--- /dev/null
+++ b/Financial/pages/index.vue
@@ -0,0 +1,534 @@
+
+
+
+ 返回
+ 开始评估
+
+
+
+
+
+ 查询车牌号码
+
+
+
+ 高级评估设置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.全国12吨以上重载货车（车型9.6米以上）车辆安全评分分数是车辆保险保费的直接重要影响因素之一,评分的及时获知和有效改善能降低保费,帮助车主降本增效;
+ 2.评分因素:1.道路;2.运营;3.驾驶等主要因素。评分的改善可以有效降低车辆事故率。
+ 3.车主以往查询的渠道主要通过保险公司查询。缺点:1.不方便（不能随时自主查询）;2.不全面（不清楚评分低的原因）;3.缺少有效的改善建议;4.只能在投保前获知评分结果,不能提前获知而丧失改善的时间。
+
+
+
+
+
+
+
+
+
+ {{item.label}}
+ {{palayData[item.value]}}
+
+
+ 合计支付
+ ￥{{palayData.productPrice}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Financial/static/img/guide.png b/Financial/static/img/guide.png
new file mode 100644
index 0000000..bd5906f
Binary files /dev/null and b/Financial/static/img/guide.png differ
diff --git a/Financial/static/img/hot.png b/Financial/static/img/hot.png
new file mode 100644
index 0000000..3316f29
Binary files /dev/null and b/Financial/static/img/hot.png differ
diff --git a/api/Financial.js b/api/Financial.js
new file mode 100644
index 0000000..50b9851
--- /dev/null
+++ b/api/Financial.js
@@ -0,0 +1,58 @@
+import request from '@/utils/request'
+export default {
+ //
+ findHomePageReport(data) {
+ return request({
+ url: `/oil-interfaces/xoilSinoiovCustomerRiskevalReport/findHomePageReport`,
+ method: 'get',
+ params: data
+ })
+ },
+ //获取支付记录
+ getByPage(data) {
+ return request({
+ url: `/oil-interfaces/xoilSinoiovCustomerPayRecord/getByPage`,
+ method: 'post',
+ data: data
+ })
+ },
+ //获取 产品列表
+ Productlist(data) {
+ return request({
+ url: `/oil-interfaces/xoilSinoiovProduct/list`,
+ method: 'GET',
+ params: data
+ })
+ },
+ //微信支付
+ weiXinPay(data) {
+ return request({
+ url: `/oil-interfaces/xoilSinoiovCustomerPayRecord/weiXinPay`,
+ method: 'post',
+ data: data
+ })
+ },
+ //查询评分报告详情
+ xoilSinoiovCustomerRiskevalReport(data) {
+ return request({
+ url: `/oil-interfaces/xoilSinoiovCustomerRiskevalReport/get/${data.id}`,
+ method: 'get',
+ })
+ },
+ //查询评估报告
+ getEvaluationReportById(data) {
+ return request({
+ url: `/oil-interfaces/xoilSinoiovCustomerSafeinfoReport/getEvaluationReportById`,
+ method: 'get',
+ params: data
+ })
+ },
+ //获取
+ findOldPlate(data) {
+ return request({
+ url: `/oil-interfaces/xoilSinoiovCustomerPayRecord/findOldPlate`,
+ method: 'get',
+ params: data
+ })
+ },
+}
\ No newline at end of file
diff --git a/api/global.js b/api/global.js
index df2d40d..b9b38d9 100644
--- a/api/global.js
+++ b/api/global.js
@@ -2,6 +2,7 @@ const baseURL = 'https://www.51xingka.net/LSMDRIVER/'
const starUrl = 'https://xingka51.oss-cn-hangzhou.aliyuncs.com/applets/starOil/'
const mainURL = 'https://xingka51.oss-cn-hangzhou.aliyuncs.com/applets/cloudSite/'
const imgURL = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/'
+const newImgURL = 'https://xoil-public.oss-cn-beijing.aliyuncs.com/enterprise_startoil/'
const yellowURL = 'https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-xq/'
const qqMapKey = 'NYEBZ-YURY3-XTU3N-YBR54-PKW6E-ROB2F'
@@ -11,5 +12,6 @@ export default {
mainURL,
imgURL,
qqMapKey,
- yellowURL
+ yellowURL,
+ newImgURL
}
\ No newline at end of file
diff --git a/colorui/main.css b/colorui/main.css
index 81c50af..68e848f 100644
--- a/colorui/main.css
+++ b/colorui/main.css
@@ -3583,7 +3583,10 @@ scroll-view.cu-steps .cu-item {
background-color: #FF6700;
color: #ffffff;
}
-
+.bg-zj-oil {
+ background-color: #1890FF;
+ color: #ffffff;
+}
.bg-gradual-pink {
background-image: linear-gradient(45deg, #ec008c, #6739b6);
color: #ffffff;
diff --git a/components/AbnormalPopup.vue b/components/AbnormalPopup.vue
index 2e3b891..3c70e8f 100644
--- a/components/AbnormalPopup.vue
+++ b/components/AbnormalPopup.vue
@@ -83,7 +83,7 @@
errorsList:[
{
title:'您当前位置和该油站位置不一致或距离过远，是否继续下单',
- icon: require('@/static/img/jlgy.png'),
+ icon: 'https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/jlgy.png',
type:0
},{
title:'您当前使用的加注机不可用，请提枪挂枪后重试',
@@ -99,15 +99,15 @@
type:3
},{
title:'请提枪后再挂枪',
- icon:require('@/static/img/stopGun.gif') ,
+ icon:'https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/stopGun.gif' ,
type:4
},{
title:'加注完成后，挂枪即可离开',
- icon:require('@/static/img/carryGun.gif') ,
+ icon:'https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/carryGun.gif',
type:5
},{
title:'扫码与当前站点不匹配,是否前往当前站点',
- icon:require('@/static/img/jlgy.png') ,
+ icon:'https://xoi-support.oss-cn-hangzhou.aliyuncs.com/星油运营小程序/jlgy.png' ,
type:6
},
]
diff --git a/pages.json b/pages.json
index 8b4e16a..6454fb2 100644
--- a/pages.json
+++ b/pages.json
@@ -112,6 +112,26 @@
]
},
+ {
+ "root": "Financial",
+ "pages": [{
+ "path": "pages/index",
+ "style": {}
+ },{
+ "path": "pages/estimate/index",
+ "style": {}
+ }
+ ,{
+ "path" : "pages/details/index",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ]
+ },
{
"root": "AppletCode",
"pages": [{
diff --git a/pages/index/startPage/startPage.vue b/pages/index/startPage/startPage.vue
index 1f05fb7..0da1167 100644
--- a/pages/index/startPage/startPage.vue
+++ b/pages/index/startPage/startPage.vue
@@ -77,7 +77,8 @@
})
} else {
uni.redirectTo({
- url: '/BagAuth/pages/login/login'
+ // url: '/BagAuth/pages/login/login'
+ url:'/BagAuth/pages/login/oldLogin'
})
}
}, 2000)
diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue
index bae092c..fdd0a59 100644
--- a/pages/tabbar/home/home.vue
+++ b/pages/tabbar/home/home.vue
@@ -135,7 +135,7 @@
@@ -13,391 +17,458 @@
-
diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
index 7146f13..6f5f72e 100644
--- a/uni_modules/uni-popup/package.json
+++ b/uni_modules/uni-popup/package.json
@@ -1,7 +1,7 @@
{
"id": "uni-popup",
"displayName": "uni-popup 弹出层",
- "version": "1.7.0",
+ "version": "1.8.1",
"description": " Popup 组件，提供常用的弹层",
"keywords": [
"uni-ui",
@@ -17,12 +17,8 @@
"directories": {
"example": "../../temps/example_temps"
},
- "dcloudext": {
- "category": [
- "前端组件",
- "通用组件"
- ],
- "sale": {
+ "dcloudext": {
+ "sale": {
"regular": {
"price": "0.00"
},
@@ -38,7 +34,8 @@
"data": "无",
"permissions": "无"
},
- "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+ "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+ "type": "component-vue"
},
"uni_modules": {
"dependencies": [
diff --git a/utils/request.js b/utils/request.js
index afc8a3d..4d4da14 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -5,10 +5,10 @@ import utils from '@/utils/encode'
// const env = 'test'
const env = 'production'
// 45
-const testUrl = 'https://5210i098j7.hsk.top'
-// const productUrl = 'https://www.xingoil.com/adminapi'
+const testUrl = 'http://192.168.0.45:38080'
+const productUrl = 'https://www.xingoil.com/adminapi'
-const productUrl = 'http://uat.xingoil.com/adminapi'
+// const productUrl = 'http://uat.xingoil.com/adminapi'
// const productUrl = 'http://192.168.0.191:38080'
// const productUrl = 'http://121.196.213.68/adminapi'
const service = axios.create({
@@ -109,7 +109,7 @@ service.interceptors.response.use(
if(response.config.url.indexOf('/oil-user/oilCompanyInfo/getQrCodeType') != -1){
setTimeout(()=>{
uni.redirectTo({
- url: '/BagAuth/pages/login/login'
+ url: '/BagAuth/pages/login/oldLogin'
})
},2000)
}