Merge branch 'dk-dev' of http://39.101.143.165:8090/dong_k/zhapp into dk-dev

manifest.json

@@ -1,144 +1,144 @@
 {
-    "name" : "晋掌柜",
-    "appid" : "__UNI__05D695B",
-    "description" : "晋掌柜app",
-    "versionName" : "1.1.0",
-    "versionCode" : 110,
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0,
-            "useOriginalMsgbox" : true
-        },
-        /* 模块配置 */
-        "modules" : {
-            "Camera" : {}
-        },
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
-                "minSdkVersion" : 21,
-                "schemes" : "zgcxapp",
-                "targetSdkVersion" : 30
-            },
-            /* ios打包配置 */
-            "ios" : {
-                "dSYMs" : false
-            },
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "maps" : {},
-                "oauth" : {},
-                "share" : {
-                    "weixin" : {
-                        "appid" : "",
-                        "UniversalLinks" : ""
-                    }
-                }
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
-                }
-            },
-            "splashscreen" : {
-                "androidStyle" : "common",
-                "useOriginalMsgbox" : true
-            }
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "2",
-    "h5" : {
-        "template" : "index.html",
-        "router" : {
-            "mode" : "hash",
-            "base" : "./"
-        },
-        "devServer" : {
-            "port" : "",
-            "https" : false
-        },
-        "optimization" : {
-            "treeShaking" : {
-                "enable" : true
-            }
-        }
-    }
+	"name": "晋掌柜",
+	"appid": "__UNI__05D695B",
+	"description": "晋掌柜app",
+	"versionName": "1.1.1",
+	"versionCode": 110,
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0,
+			"useOriginalMsgbox": true
+		},
+		/* 模块配置 */
+		"modules": {
+			"Camera": {}
+		},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				],
+				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
+				"minSdkVersion": 21,
+				"schemes": "zgcxapp",
+				"targetSdkVersion": 30
+			},
+			/* ios打包配置 */
+			"ios": {
+				"dSYMs": false
+			},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"maps": {},
+				"oauth": {},
+				"share": {
+					"weixin": {
+						"appid": "",
+						"UniversalLinks": ""
+					}
+				}
+			},
+			"icons": {
+				"android": {
+					"hdpi": "unpackage/res/icons/72x72.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
+				},
+				"ios": {
+					"appstore": "unpackage/res/icons/1024x1024.png",
+					"ipad": {
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
+					},
+					"iphone": {
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
+					}
+				}
+			},
+			"splashscreen": {
+				"androidStyle": "common",
+				"useOriginalMsgbox": true
+			}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "2",
+	"h5": {
+		"template": "index.html",
+		"router": {
+			"mode": "hash",
+			"base": "./"
+		},
+		"devServer": {
+			"port": "",
+			"https": false
+		},
+		"optimization": {
+			"treeShaking": {
+				"enable": true
+			}
+		}
+	}
 }
-/* 模块配置 *//* 应用发布信息 *//* android打包配置 */
-
+/* 模块配置 */
+/* 应用发布信息 */ /* android打包配置 */

pages/login/login.vue

@@ -139,7 +139,7 @@
 				checkboxList1: ['选中'],
 				isHidePassword: true, //是否隐藏密码
 				info: {
-					userName: "18335592988", //账号
+					userName: "", //账号
 					passWord: "Aa159357", //密码
 					system: "APP", //系统code
 					captcha: "", //验证码

pages/my/my.vue

@@ -186,7 +186,6 @@
 			plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => {
 				this.version = widgetInfo.version;
 			})
-
 			setTimeout(() => {
 				this.$refs.app_update.update(); //调用子组件检查更新方法
 			}, 500)

pages/quote/Mixin.js

@@ -217,7 +217,84 @@ export default {
 				},
 			],
 			optimalData: [], //比价列表
-
+			// 保险公司icon
+			companylogoList: [{
+					name: "中煤财险",
+					icon: "/static/image/insuranceCompany/zhongmei.png"
+				}, //华农
+				{
+					name: "恒邦财险",
+					icon: "/static/image/insuranceCompany/hengbang.png"
+				},
+				{
+					name: "安盛天平",
+					icon: "/static/image/insuranceCompany/ansheng.png"
+				},
+				{
+					name: "中国人寿",
+					icon: "/static/image/insuranceCompany/renshou.png"
+				},
+				{
+					name: "众安财险",
+					icon: "/static/image/insuranceCompany/zhongan.png"
+				},
+				{
+					name: "永诚财险",
+					icon: "/static/image/insuranceCompany/yongcheng.png"
+				},
+				{
+					name: "永安财险",
+					icon: "/static/image/insuranceCompany/yongan.png"
+				},
+				{
+					name: "紫金财险",
+					icon: "/static/image/insuranceCompany/zijin.png"
+				},
+				{
+					name: "国任财险",
+					icon: "/static/image/insuranceCompany/guoren.png"
+				},
+				{
+					name: "华泰财险",
+					icon: "/static/image/insuranceCompany/huatai.png"
+				},
+				{
+					name: "大家财险",
+					icon: "/static/image/insuranceCompany/dajia.png"
+				},
+				{
+					name: "太平财险",
+					icon: "/static/image/insuranceCompany/taiping.png"
+				},
+				{
+					name: "华农财险",
+					icon: "/static/image/insuranceCompany/huanong.png"
+				},
+				{
+					name: "渤海财险",
+					icon: "/static/image/insuranceCompany/bohai.png"
+				},
+				{
+					name: "泰康财险",
+					icon: "/static/image/insuranceCompany/taikang.png"
+				},
+				{
+					name: "诚泰财险",
+					icon: "/static/image/insuranceCompany/chengtai.png"
+				},
+				{
+					name: "阳光财险",
+					icon: "/static/image/insuranceCompany/yangguang.png"
+				},
+				{
+					name: "太平洋财险",
+					icon: "/static/image/insuranceCompany/taipingyang.png"
+				},
+				{
+					name: "泰山财险",
+					icon: "/static/image/insuranceCompany/taishan.png"
+				},
+			]
 		};
 	},
 	watch: {

pages/quote/modules/insuranceInfo.vue

@@ -5,6 +5,10 @@
 				<text class="mr-2">评分</text>
 				<text>{{scoreVo.score}}</text>
 			</view>
+			<view class="item" v-for="(item,index) in scoreVo.scoreJson" :key="index">
+				<text class="mr-2">{{item.scoreName}}</text>
+				<text>{{item.score}}</text>
+			</view>
 			<view class="item">
 				<text class="mr-2">交强险系数</text>
 				<text>0.751</text>
@@ -105,7 +109,7 @@
 							class="td">{{item.amount}}%</text>
 						<text v-else-if="['TY1', 'TY2', 'TY3', 'TY4'].includes(item.kindCode)"
 							class="td">{{item.serviceTimes}}次</text>
-						<text v-else class="td">{{convertedValue(item.amount)}}</text>
+						<text v-else class="td">{{item.kindCode=='J1'?'--':convertedValue(item.amount)}}</text>
 						<text class="td">{{item.premium?item.premium:'-'}}</text>
 					</view>
 				</view>

pages/quote/premiumCalc1.vue

@@ -429,6 +429,7 @@
 				syendDate: "", //商业终保日期
 				companyindex: 0,
 				currentCompanyInfo: {},
+				insCompanyVo: {},
 			}
 		},
 		onShow() {},
@@ -454,6 +455,8 @@
 					this.vehicleAndVesselTaxVo = res.data.vehicleAndVesselTaxVo; //车船税信息
 					this.orderno = res.data.order.ordersNo;
 					this.quoteno = res.data.order.quoteNo;
+					this.insCompanyVo = res.data.insCompanyVo[0]; //历史保险公司
+					await this.ruleFilterCompany();
 					await this.commpanyList(res.data);
 					this.imageEcho(res.data.imageVoList) // 影像获取完毕
 					if (this.ciRiskInfoVo) {
@@ -524,8 +527,30 @@
 			},
 		},
 		methods: {
+			// 保险公司列表过滤回显
+			async ruleFilterCompany() {
+				let params = {
+					carInfo: this.carInfo,
+					ownerInfo: this.ownerInfo,
+					applyInfo: this.policyHolderInfo,
+					insureInfo: this.insuredPersonInfo,
+					productId: this.productId
+				}
+				let res = await this.$http.post('/scheme/ruleFilterCompanyApp', params);
+				if (res.code == '200') {
+					this.quotableCompanyList = res.data.filter(val => val.id == this.insCompanyVo.id);
+				} else {
+					this.quotableCompanyList = [];
+					uni.showToast({
+						icon: 'none',
+						title: res.msg,
+					});
+				}
+
+			},
 			// 跳转报价详情
 			dorderDetails(orderno) {
+				console.log(orderno);
 				uni.navigateTo({
 					url: '/pages/quote/quoteRecordDetail?ordersNo=' + orderno
 				})
@@ -690,7 +715,7 @@
 						orderSource: '1',
 					},
 					accidentalDrivings: company.insurancePlanInfo.drivings,
-					kindInfoVo: company.insurancePlanInfo.kinds,
+					kindInfoVo: this.productId === '0330' ? [] : company.insurancePlanInfo.kinds,
 					ciRiskInfoVo: ['0330', '0330034002', '0330034001'].includes(this.productId) ? this
 						.ciRiskInfoVo : null,
 					biRiskInfoVo: ['034001', '034002', '0330034002', '0330034001'].includes(this.productId) ? this
@@ -703,6 +728,7 @@
 					isTaxSource: isTaxSource == 1 ? isTaxSource : null,
 					systemType: '2'
 				};
+
 				try {
 					let res = await this.$http.post('/unify/order/quote', params);
 					company.msg = res.msg;
@@ -714,13 +740,12 @@
 						};
 						this.quotableCompanyList.splice(companyIndex, 1, updatedItem);
 					} else {
+						company.msg = res.msg;
 						const updatedItem = {
 							...company,
 							quoteCode: '3'
 						};
 						this.quotableCompanyList.splice(companyIndex, 1, updatedItem);
-						company.msg = res.msg;
-						console.log(company);
 						return;
 					}
 				} catch (error) {

pages/quote/quoteRecordDetail.vue

@@ -287,6 +287,10 @@
 						<text>商业折扣</text>
 						<text>{{costs.biRatio}}</text>
 					</view>
+					<view class="item dis a-start j-s" v-for="(item,index) in scoreVo.scoreJson" :key="index">
+						<text>{{item.scoreName}}</text>
+						<text>{{item.score}}</text>
+					</view>
 				</view>
 				<!-- 查看更多 -->
 				<view v-if="premiumFactorHeight>collapsedHeight" class="loadMore dis a-c j-c"
@@ -340,7 +344,7 @@
 								class="td">{{item.amount}}%</text>
 							<text v-else-if="['TY1', 'TY2', 'TY3', 'TY4'].includes(item.kindCode)"
 								class="td">{{item.serviceTimes}}次</text>
-							<text v-else class="td">{{convertedValue(item.amount)}}</text>
+							<text v-else class="td">{{item.kindCode=='J1'?'--':convertedValue(item.amount)}}</text>
 							<text class="td">{{item.premium?item.premium:'-'}}</text>
 						</view>
 					</view>

pages/quote/selectInsuranceCompany.vue

@@ -65,6 +65,7 @@
 </template>
 
 <script>
+	import Mixin from './Mixin.js';
 	import {
 		dictionaryMatch
 	} from '@/plugins/utils';
@@ -73,6 +74,7 @@
 		components: {
 			CarInfoForm,
 		},
+		mixins: [Mixin], // 注入 Mixin
 		data() {
 			return {
 				loadingShow: false, //加载
@@ -151,83 +153,7 @@
 				car_kind_codeoptions: [], //车辆种类
 				energy_type_codeoptions: [], //能源类型
 				car_type_codeoptions: [], //车辆类型
-				companylogoList: [{
-						name: "中煤财险",
-						icon: "/static/image/insuranceCompany/zhongmei.png"
-					}, //华农
-					{
-						name: "恒邦财险",
-						icon: "/static/image/insuranceCompany/hengbang.png"
-					},
-					{
-						name: "安盛天平",
-						icon: "/static/image/insuranceCompany/ansheng.png"
-					},
-					{
-						name: "中国人寿",
-						icon: "/static/image/insuranceCompany/renshou.png"
-					},
-					{
-						name: "众安财险",
-						icon: "/static/image/insuranceCompany/zhongan.png"
-					},
-					{
-						name: "永诚财险",
-						icon: "/static/image/insuranceCompany/yongcheng.png"
-					},
-					{
-						name: "永安财险",
-						icon: "/static/image/insuranceCompany/yongan.png"
-					},
-					{
-						name: "紫金财险",
-						icon: "/static/image/insuranceCompany/zijin.png"
-					},
-					{
-						name: "国任财险",
-						icon: "/static/image/insuranceCompany/guoren.png"
-					},
-					{
-						name: "华泰财险",
-						icon: "/static/image/insuranceCompany/huatai.png"
-					},
-					{
-						name: "大家财险",
-						icon: "/static/image/insuranceCompany/dajia.png"
-					},
-					{
-						name: "太平财险",
-						icon: "/static/image/insuranceCompany/taiping.png"
-					},
-					{
-						name: "华农财险",
-						icon: "/static/image/insuranceCompany/huanong.png"
-					},
-					{
-						name: "渤海财险",
-						icon: "/static/image/insuranceCompany/bohai.png"
-					},
-					{
-						name: "泰康财险",
-						icon: "/static/image/insuranceCompany/taikang.png"
-					},
-					{
-						name: "诚泰财险",
-						icon: "/static/image/insuranceCompany/chengtai.png"
-					},
-					{
-						name: "阳光财险",
-						icon: "/static/image/insuranceCompany/yangguang.png"
-					},
-					{
-						name: "太平洋财险",
-						icon: "/static/image/insuranceCompany/taipingyang.png"
-					},
-					{
-						name: "泰山财险",
-						icon: "/static/image/insuranceCompany/taishan.png"
-					},
-				]
+
 			}
 		},
 		onShow() {
@@ -314,7 +240,7 @@
 					insureInfo: this.insuredPersonInfo,
 					productId: this.productId
 				}
-				let res = await this.$http.post('/scheme/ruleFilterCompany', params);
+				let res = await this.$http.post('/scheme/ruleFilterCompanyApp', params);
 				if (res.code == '200') {
 					this.quotableCompanyList = res.data;
 					// 遍历 logo数组，检查是否存在匹配