浏览代码

1.新增华泰财险 2.微信登录、绑定微信

@dongkboy 1 年之前
父节点
当前提交
c98e81063f

+ 10 - 0
AndroidManifest.xml

@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
+	package="uni.UNID4FE29A">
+	<!--permissions-->
+
+	<application>
+		<!--meta-data-->
+		<meta-data android:name="EasyGoClient" android:value="true" />
+
+	</application>
+</manifest>

+ 3 - 4
App.vue

@@ -2,18 +2,19 @@
 	/* 注意要写在第一行,同时给style标签加入lang="scss"属性 */
 	@import "uview-ui/index.scss";
 </style>
-
 <script>
 	import store from "@/store";
 	import socket from "@/config/socket";
 	import DB from "@/common/sqlite";
 	export default {
+
 		onLaunch: function(e) {
 			//取出缓存数据
 			store.commit("setCacheData");
 			if (store.state.token) {
 				socket.init();
 			} else {
+
 				var url = window.location.href;
 				if ((url.indexOf("pages/carInsure/quoteDetail1") > 0) || (url.indexOf("pages/carInsure/quoteDetail") >
 						0) || (url.indexOf("pages/carInsure/payVerify") >
@@ -22,9 +23,7 @@
 					uni.navigateTo({
 						url: url
 					})
-				} else {
-
-				}
+				} else {}
 			}
 			// #ifdef H5
 			if (store.state.token) {

+ 13 - 0
components/modules/carInsure/uni-modal/uni-modal.vue

@@ -0,0 +1,13 @@
+<template>
+	<view>
+		<view class="">
+			<u-modal v-model="show" :content="content"></u-modal>
+		</view>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

+ 27 - 42
components/modules/my/my-list-item.vue

@@ -16,16 +16,21 @@
 <script>
 	const PACKAGE_INFO_KEY = '__package_info__'
 	export default {
-		
+
 		data() {
 			return {}
 		},
 		props: {
 			item: Object,
-			index: Number
+			index: Number,
+			someData: {
+				type: Boolean,
+				default: null,
+			},
 		},
 		methods: {
 			clickevent() {
+				console.log(this.someData)
 				switch (this.item.clicktype) {
 					case "navigateTo":
 						if (this.item.url) {
@@ -64,69 +69,49 @@
 							},
 						});
 						break;
-					case "bind":
-						if (this.User.userbind[this.item.provider]) return;
-						this.bindother();
+					case "weixin":
+						if (this.someData) {
+							uni.showToast({
+								title: '已绑定',
+								icon: 'none'
+							});
+						} else {
+							this.bindother();
+						}
 						break;
+
 					case "nothing":
 						uni.showToast({
 							title: '更新中...',
 							icon: 'none'
 						});
 						break;
-					
+
 				}
 			},
 			// 绑定第三方登录
 			bindother() {
 				uni.login({
-					provider: this.item.provider,
-					// #ifdef MP-ALIPAY
-					scopes: 'auth_user', //支付宝小程序需设置授权类型
-					// #endif
+					provider: 'weixin',
+					onlyAuthorize: true,
 					success: (res) => {
-						uni.getUserInfo({
-							provider: this.item.provider,
-							success: (infoRes) => {
-								let options = Object.assign(infoRes, res);
-								this.bindEvent(this.User.__formatOtherLogin(this.item.provider,
-									options));
-							}
-						});
+						this.codeRes(res.code)
 					},
 					fail: (err) => {
 						uni.showToast({
 							title: '绑定失败',
 							icon: "none"
 						});
-						console.log('login fail:', err);
 					}
 				});
+
 			},
-			async bindEvent(data) {
-				uni.showLoading({
-					title: '绑定中...',
-					mask: false
-				});
-				let [err, res] = await this.$http.post("/user/bindother", data, {
-					token: true,
-					checkToken: true
+			async codeRes(code) {
+				let res = await this.$http.post("/wechat/bind", {
+					code: code,
 				})
-				if (!this.$http.errorCheck(err, res)) return uni.hideLoading();
-				// 绑定成功
-				uni.hideLoading();
-				uni.showToast({
-					title: '绑定成功!'
-				});
-				// 修改状态,缓存
-				this.User.userbind[this.item.provider] = {
-					nickname: data.nickName
-				}
-				uni.setStorageSync("userbind", this.User.userbind);
-				this.$emit('updateuserbind');
+				this.$emit('weixinMsg', res);
 			},
-
-			
 		}
 	}
 </script>
@@ -163,4 +148,4 @@
 		margin-left: 10upx;
 		font-size: 24upx;
 	}
-</style>
+</style>

+ 41 - 41
components/modules/tools/team/swiper-tab.vue

@@ -1,11 +1,8 @@
 <template>
-	<view class="uni-tab-bar">	
-		<scroll-view class="scroll-view content-scroll" scroll-x  scroll-with-animation :scroll-left="scrollLeft">
+	<view class="uni-tab-bar">
+		<scroll-view class="scroll-view content-scroll" scroll-x scroll-with-animation :scroll-left="scrollLeft">
 			<block v-for="(tab,index) in tabBars" :key="index">
-				<view class="scroll-view-item scroll-item"
-					:class="{'active':tabIndex==index}"
-					@tap="tabtap(index)" 
-					>
+				<view class="scroll-view-item scroll-item" :class="{'active':tabIndex==index}" @tap="tabtap(index)">
 					<view class="d-flex a-center j-center">{{tab.name}}</view>
 					<view class="d-flex a-center j-center">({{tab.personNum}}人,{{tab.orderNum}}单)</view>
 				</view>
@@ -16,58 +13,58 @@
 
 <script>
 	export default {
-		data(){
+		data() {
 			return {
 				contentScrollW: 0, // 导航区宽度
 				scrollLeft: 0, // 横向滚动条位置
 			}
 		},
-		props:{
-			tabBars:Array,
-			tabIndex:Number
+		props: {
+			tabBars: Array,
+			tabIndex: Number
 		},
-		 mounted() {
-		     // 获取标题区域宽度,和每个子元素节点的宽度
-		     this.getScrollW()
-		 },
-		methods:{
-			tabtap(index){
+		mounted() {
+			// 获取标题区域宽度,和每个子元素节点的宽度
+			this.getScrollW()
+		},
+		methods: {
+			tabtap(index) {
 				this.scrollLeft = this.tabBars[index].left - this.contentScrollW / 2 + this.tabBars[index].width / 2;
-				this.$emit('tabtap',index);
+				this.$emit('tabtap', index);
 			},
 			// 获取标题区域宽度,和每个子元素节点的宽度以及元素距离左边栏的距离
 			getScrollW() {
-			    const query = uni.createSelectorQuery().in(this);
-			    
-			    query.select('.content-scroll').boundingClientRect(data => {
-			        // 拿到 scroll-view 组件宽度
-			        this.contentScrollW = data.width
-			    }).exec();
-			    
-			    query.selectAll('.scroll-item').boundingClientRect(data => {
-					console.log(data)
-			        let dataLen = data.length;
-			        for (let i = 0; i < dataLen; i++) {
-			            //  scroll-view 子元素组件距离左边栏的距离
-			            this.tabBars[i].left = data[i].left;
-			            //  scroll-view 子元素组件宽度
-			            this.tabBars[i].width = data[i].width
-			        }
-			    }).exec()
+				const query = uni.createSelectorQuery().in(this);
+
+				query.select('.content-scroll').boundingClientRect(data => {
+					// 拿到 scroll-view 组件宽度
+					this.contentScrollW = data.width
+				}).exec();
+
+				query.selectAll('.scroll-item').boundingClientRect(data => {
+					let dataLen = data.length;
+					for (let i = 0; i < dataLen; i++) {
+						//  scroll-view 子元素组件距离左边栏的距离
+						this.tabBars[i].left = data[i].left;
+						//  scroll-view 子元素组件宽度
+						this.tabBars[i].width = data[i].width
+					}
+				}).exec()
 			},
-			
-			
-			
+
+
+
 		}
 	}
 </script>
 
 <style>
-/* 横向滚动选项Start */
+	/* 横向滚动选项Start */
 	.scroll-view {
 		white-space: nowrap;
 		width: 100%;
 	}
+
 	.scroll-view .scroll-view-item {
 		display: inline-block;
 		width: 40%;
@@ -76,11 +73,14 @@
 		box-sizing: border-box;
 		border: ;
 	}
-	.scroll-view .scroll-view-item.active{
+
+	.scroll-view .scroll-view-item.active {
 		border-bottom: 10rpx solid #007AFF;
 	}
-	.scroll-view .scroll-view-item>view:nth-of-type(2){
+
+	.scroll-view .scroll-view-item>view:nth-of-type(2) {
 		font-size: 24rpx;
 	}
+
 	/* 横向滚动选项Start */
-</style>
+</style>

+ 6 - 1
components/uni-forms/uni-forms.vue

@@ -281,7 +281,8 @@
 							// 获取当前未通过子组件实例
 							example = this.childrens.find(child => child.name === resultData.key)
 							// 获取easyInput 组件实例
-							const inputComp = this.inputChildrens.find(child => child.rename === (example && example.name))
+							const inputComp = this.inputChildrens.find(child => child.rename === (example && example
+								.name))
 							if (inputComp) {
 								inputComp.errMsg = resultData.errorMessage
 							}
@@ -434,4 +435,8 @@
 	.uni-forms--top {
 		padding: 10px 15px;
 	}
+
+	.uni-forms {
+		/* max-width: 400px; */
+	}
 </style>

+ 1 - 0
components/uni-group/uni-group.vue

@@ -79,6 +79,7 @@
 	.uni-group {
 		background: #fff;
 		margin-top: 10px;
+		/* max-width: 400px; */
 	}
 
 	.group-margin {

+ 3 - 2
config/baseUrl.js

@@ -5,7 +5,7 @@ if (process.env.NODE_ENV === 'development') {
 	// 开发环境
 	// baseUrl = "http://39.98.239.48/web-api"; //测试
 	// h5BaseUrl = "http://39.98.239.48/h5";
-	// baseUrl = "http://192.168.0.106:8080/"; 
+	// baseUrl = "http://192.168.0.253:8080";
 	// baseUrl = "http://192.168.0.115:8080"; //凯森
 	baseUrl = "http://sxzgkj.baoxianzhanggui.com/web-api"; //正式
 	h5BaseUrl = "http://sxzgkj.baoxianzhanggui.com/h5";
@@ -14,7 +14,8 @@ if (process.env.NODE_ENV === 'development') {
 	// 生产环境
 	// baseUrl = "http://39.98.239.48/web-api"; //测试
 	// h5BaseUrl = "http://39.98.239.48/h5";
-	baseUrl = "http://sxzgkj.baoxianzhanggui.com/web-api"; //正式
+	baseUrl = "http://192.168.0.115:8080"; //凯森
+	// baseUrl = "http://sxzgkj.baoxianzhanggui.com/web-api"; //正式
 	h5BaseUrl = "http://sxzgkj.baoxianzhanggui.com/h5";
 	socketUrl = "";
 }

+ 4 - 2
config/login.js

@@ -22,8 +22,10 @@ async function login(options = {}) {
 			icon: 'none'
 		});
 	} else {
-		uni.setStorageSync('username', options.data.account);
-		uni.setStorageSync('password', options.data.password);
+		if (options.data.account) {
+			uni.setStorageSync('username', options.data.account);
+			uni.setStorageSync('password', options.data.password);
+		}
 	}
 	let loginStatus = await getLoginUserInfo(res.data, options.data.account);
 	if (loginStatus) {

+ 7 - 4
manifest.json

@@ -7,8 +7,8 @@
 		"sizes": "分辨率,192x192",
 		"src": "图片路径"
 	}],
-	"versionName": "1.0.195",
-	"versionCode": 195,
+	"versionName": "1.2.0",
+	"versionCode": 120,
 	"app-plus": {
 		"error": {
 			"url": "hybrid/html/error.html"
@@ -79,7 +79,9 @@
 					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
 					"<uses-permission android:name=\"android.permission.WRITE_SMS\"/>"
 				],
-				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"]
+				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
+				"minSdkVersion": 21,
+				"schemes": "zgcxapp"
 			},
 			"sdkConfigs": {
 				"ad": {},
@@ -166,7 +168,8 @@
 		"nvueLaunchMode": "fast",
 		"splashscreen": {
 			"alwaysShowBeforeRender": true
-		}
+		},
+		"nativePlugins": {}
 	},
 	// 5+App特有相关
 	"quickapp": {},

+ 5 - 2
pages.json

@@ -139,7 +139,7 @@
 		}, {
 			"path": "pages/set/safe",
 			"style": {
-				"navigationBarTitleText": "账号与安全",
+				"navigationBarTitleText": "账号管理",
 				"app-plus": {
 					"scrollIndicator": "none", //隐藏滚动条
 					"bounce": "none" //关闭反弹效果
@@ -370,6 +370,7 @@
 		}, {
 			"path": "pages/carInsure1/carInfo1",
 			"style": {
+				// "maxWidth": 400,
 				"navigationBarTitleText": "信息录入",
 				"app-plus": {
 					"scrollIndicator": "none",
@@ -731,6 +732,7 @@
 				"navigationBarTitleText": "实名认证",
 				"enablePullDownRefresh": false
 
+
 			}
 		}, {
 			"path": "pages/orders/quoteHistory",
@@ -766,8 +768,9 @@
 		// rpx 计算所支持的最大设备宽度,单位 px,默认值为 960
 		"rpxCalcBaseDeviceWidth": 375,
 		// rpx 计算使用的基准设备宽度,设备实际宽度超出 rpx 计算所支持的最大设备宽度时将按基准宽度计算,单位 px,默认值为 375
-		"rpxCalcIncludeWidth": 750
+		"rpxCalcIncludeWidth": 750,
 		// rpx 计算特殊处理的值,始终按实际的设备宽度计算,单位 rpx,默认值为 750
+		"pageOrientation": "portrait"
 	},
 	"tabBar": {
 		"color": "#444444",

+ 7 - 0
pages/carInsure1/carInfo1.vue

@@ -129,6 +129,12 @@
 							style="margin-right: 15px;" @change="transferFlagchange"></u-switch>
 					</view>
 				</uni-forms-item>
+				<uni-forms-item required label="商业险过户: ">
+					<view class="d-flex j-end a-c" style="height:100%">
+						<u-switch v-model="carInfo.transferFlagBi" active-color="#ea552d " size="30"
+							style="margin-right: 15px;"></u-switch>
+					</view>
+				</uni-forms-item>
 				<uni-forms-item required label="是否脱保: ">
 					<view class="d-flex j-end a-c" style="height:100%">
 						<u-switch v-model="carInfo.outOfInsurance" active-color="#ea552d " size="30"
@@ -633,6 +639,7 @@
 					registerDate: "", //注册日期
 					issueDate: "", //发证日期
 					transferFlag: false, //过户标志
+					transferFlagBi: false, //商业过户标志
 					transferDate: "", //过户日期
 					loanStatus: 0, //贷款标志
 					firstBeneMan: "", //第一受益人

+ 89 - 3
pages/carInsure1/insureItems1.vue

@@ -244,7 +244,12 @@
 				<scroll-view scroll-top="0" scroll-y="true" class="popContent">
 					<view class="popContentTitle">{{insureItem.kindName}}</view>
 					<view style="color: #999;font-size: 24upx;">{{insureItem.desc}}</view>
-					<view>
+					<view class="dis a-c j-s p-3" v-if="['TY2','TY3','TY4'].includes(insureItem.kindCode)">
+						<text>自定义次数</text>
+						<u-number-box v-model="insureItem.amount" :input-width="100" :input-height="60" :min="0"
+							bg-color="#ea552d" color="#fff" size="30" @change="numberBoxChange"></u-number-box>
+					</view>
+					<view v-else>
 						<block v-for="(amt,index) in insureItem.amtList" :key="index">
 							<view class="amtSingle">
 								<view :class="(amt.label== insureItem.amountDesc)?'active':''"
@@ -858,6 +863,64 @@
 						kindName: "附加医保-座位险(司机)",
 						desc: "附加医保外医疗费用责任险(机动车第三者责任保险)"
 					},
+					{
+						amount: "0",
+						amountDesc: "不投保",
+						coveragePremium: 0,
+						amtList: [{
+								label: "不投保",
+								value: "0"
+							},
+							{
+								label: "2次",
+								value: "2"
+							},
+							{
+								label: "7次",
+								value: "7"
+							},
+							{
+								label: "12次",
+								value: "12"
+							},
+							{
+								label: "17次",
+								value: "17"
+							},
+							{
+								label: "22次",
+								value: "22"
+							},
+						],
+						kindCode: "TY1",
+						isMainRisk: true,
+						kindName: "道路救援服务特约条款",
+						desc: "道路救援服务特约条款是指在保险期内,被保险机动车在使用过程中发生故障而丧失行驶能力时,保险人根据被保险人的请求,向被保险人提供道路救援服务。"
+					},
+					{
+						amount: 0,
+						amountDesc: "不投保",
+						kindCode: "TY2",
+						isMainRisk: true,
+						kindName: "车辆安全检测特约条款",
+						desc: "安全检测特约条款是指保险期间内,为保障车辆安全运行,保险人或其受托人根据被保险人请求,为被保险机动车提供车辆安全检测服务。"
+					},
+					{
+						amount: 0,
+						amountDesc: "不投保",
+						kindCode: "TY3",
+						isMainRisk: true,
+						kindName: "代为驾驶服务特约条款",
+						desc: "代为驾驶特约条款是指保险期间内,在被保险人或其允许的驾驶人因饮酒、服用药物等原因无法驾驶或存在重大安全驾驶隐患时,提供单程30公里以内的短途代驾服务。"
+					},
+					{
+						amount: 0,
+						amountDesc: "不投保",
+						kindCode: "TY4",
+						isMainRisk: true,
+						kindName: "代为送检服务特约条款",
+						desc: "代为送检特约条款是指保险期间内,由保险人或其受托人代替车辆所有人进行车辆送检。"
+					},
 					{
 						amount: "0",
 						amountDesc: "不投保",
@@ -1151,8 +1214,8 @@
 			adjustBIItemLabelSubmit() {
 				for (let i = 0; i < this.insureList.length; i++) {
 					if (this.insureItem.kindCode == this.insureList[i].kindCode) {
-						this.insureList[i].amount = this.insureItem.amount;
-						this.insureList[i].amountDesc = this.insureItem.amountDesc;
+						this.insureList[i].amount = this.insureItem.amount; /* 保额 */
+						this.insureList[i].amountDesc = this.insureItem.amountDesc; /* 保额名称 */
 
 						if (this.insureItem.kindCode == 'B') {
 							if (this.insureItem.amount != 0) {
@@ -1193,6 +1256,17 @@
 				}
 				this.$refs.popupBI.hide();
 			},
+			numberBoxChange(val) {
+				console.log(val)
+				if (val.value > 0) {
+					this.insureItem.amount = val.value;
+					this.insureItem.amountDesc = val.value + '次';
+				} else {
+					this.insureItem.amount = 0;
+					this.insureItem.amountDesc = '不投保';
+				}
+
+			},
 			getDate(type) {
 				const date = new Date();
 				if (type === 'start') {
@@ -1324,6 +1398,18 @@
 								kindCode: this.insureList[index].kindCode,
 								kindName: this.insureList[index].kindName
 							});
+						} else if (
+							ele.amount != "0" &&
+							(ele.kindCode == "TY1" ||
+								ele.kindCode == "TY2" ||
+								ele.kindCode == "TY3" ||
+								ele.kindCode == "TY4")
+						) {
+							kindList.push({
+								serviceTimes: String(this.insureList[index].amount),
+								kindCode: this.insureList[index].kindCode,
+								kindName: this.insureList[index].kindName
+							});
 						} else if (ele.amount != "0") {
 							kindList.push({
 								amount: this.insureList[index].amount,

文件差异内容过多而无法显示
+ 514 - 111
pages/carInsure1/quote1.vue


+ 73 - 8
pages/carInsure1/quoteDetail1.vue

@@ -1142,7 +1142,7 @@
 							this.yonganprint(); //电子保单
 							break;
 						case "中煤财险":
-							this.zmgetPolicyPrint(); //电子保单
+							this.zhongMeigetPolicyPrint(); //电子保单
 							break;
 						case "恒邦财险":
 						case "安盛天平":
@@ -1151,13 +1151,16 @@
 							this.pythonprint(); //电子保单
 							break;
 						case "永诚财险":
-							this.ycgetPolicyPrint(); //电子保单
+							this.yongChenggetPolicyPrint(); //电子保单
 							break;
 						case "紫金财险":
-							this.zjgetPolicyPrint(); //电子保单
+							this.ziJingetPolicyPrint(); //电子保单
+							break;
+						case "华泰财险":
+							this.huaTaigetPolicyPrint(); //电子保单
 							break;
 						case "国任财险":
-							this.grgetPolicyPrint(); //电子保单
+							this.guoRengetPolicyPrint(); //电子保单
 							break;
 					}
 				}
@@ -1288,7 +1291,7 @@
 					}
 				}
 			},
-			async zmgetPolicyPrint() {
+			async zhongMeigetPolicyPrint() {
 				this.policyList = [];
 				this.policyList1 = [];
 				if (this.orderInfo.jqpolicyno) {
@@ -1333,7 +1336,7 @@
 				}
 
 			},
-			async ycgetPolicyPrint() {
+			async yongChenggetPolicyPrint() {
 				this.policyList = [];
 				this.policyList1 = [];
 				let res = await this.$http.post('/api/yongCheng/getPolicyPrint', {
@@ -1409,7 +1412,7 @@
 
 
 			},
-			async zjgetPolicyPrint() {
+			async ziJingetPolicyPrint() {
 				this.policyList = [];
 				this.policyList1 = [];
 				if (this.orderInfo.jqpolicyno) {
@@ -1471,7 +1474,69 @@
 				}
 
 			},
-			async grgetPolicyPrint() {
+			async huaTaigetPolicyPrint() {
+				this.policyList = [];
+				this.policyList1 = [];
+				if (this.orderInfo.jqpolicyno) {
+					let res = await this.$http.post('/order/huaTaiApi/getPolicyPrint', {
+						companyId: this.companyId,
+						riskCode: "0507",
+						type: '2', //2:保单
+					});
+					if (res.code == '200') {
+						this.policyList.push({
+							fileTitle: "交强电子保单",
+							filename: this.orderInfo.jqpolicyno,
+							fileurl: res.data,
+						})
+					}
+					let res1 = await this.$http.post('/order/huaTaiApi/getPolicyPrint', {
+						companyId: this.companyId,
+						riskCode: "0507",
+						type: '1', //1:标志
+					});
+					if (res1.code == '200') {
+						this.policyList1.push({
+							fileTitle: "交强电子标志",
+							filename: this.orderInfo.jqpolicyno,
+							fileurl: res1.data,
+						})
+					}
+				}
+				if (this.orderInfo.sypolicyno) {
+					let res = await this.$http.post('/order/huaTaiApi/getPolicyPrint', {
+						companyId: this.companyId,
+						riskCode: "0510",
+						type: '2', //2:标志
+					});
+					if (res.code == '200') {
+						this.policyList.push({
+							fileTitle: "商业电子保单",
+							filename: this.orderInfo.sypolicyno,
+							fileurl: res.data,
+						})
+					}
+				}
+				if (this.orderInfo.crossInsurance.length > 0) {
+					this.orderInfo.crossInsurance.map(async ele => {
+						let res = await this.$http.post('/order/huaTaiApi/getPolicyPrint', {
+							companyId: this.companyId,
+							policyNumber: ele.policyNumber,
+							riskCode: "0513",
+							type: '2', //2:保单
+						});
+						if (res.code == '200') {
+							this.policyList.push({
+								fileTitle: "驾意险保单",
+								filename: ele.policyNumber,
+								fileurl: res.data,
+							})
+						}
+					})
+				}
+
+			},
+			async guoRengetPolicyPrint() {
 				this.policyList = [];
 				this.policyList1 = [];
 				if (this.orderInfo.jqpolicyno) {

+ 200 - 25
pages/carInsure1/underwriting1.vue

@@ -383,7 +383,7 @@
 			</view>
 			<!-- 验车照End -->
 			<!-- 特约 -->
-			<block v-if="zijinengageListData.length>0">
+			<block v-if="['紫金财险','华泰财险'].includes(this.name)">
 				<template>
 					<view class="appoint">
 						<view class="title d-flex a-center j-sb">
@@ -391,15 +391,26 @@
 							<view class="showStatus" @tap="controlShow('showAppoint')">{{showAppoint?'收起':'展开'}}</view>
 						</view>
 						<view class="content dis f-c j-c a-end" v-if="showAppoint">
-							<u-button type="warning" size="mini" style="width: 80px;margin-top: 5px;"
-								@click="show=true">特约选择</u-button>
-							<view class="contributing dis f-c" v-for="(item,index) in zijinengageList">
-								<text>{{item.clauseName}}</text>
-								<u-input v-if="item.modifyFlag==1" :border="true" v-model="item.clauses" size="mini"
-									type="textarea" :custom-style="{fontSize:'14px'}" />
-								<text v-else>{{item.clauses}}</text>
-							</view>
-
+							<template v-if="this.name=='紫金财险'">
+								<u-button type="warning" size="mini" style="width: 80px;margin-top: 5px;"
+									@click="ziJinshow=true">特约选择</u-button>
+								<view class="contributing dis f-c" v-for="(item,index) in ziJinengageList">
+									<text>{{item.clauseName}}</text>
+									<u-input v-if="item.modifyFlag==1" :border="true" v-model="item.clauses" size="mini"
+										type="textarea" :custom-style="{fontSize:'14px'}" />
+									<text v-else>{{item.clauses}}</text>
+								</view>
+							</template>
+							<template v-if="this.name=='华泰财险'">
+								<u-button type="warning" size="mini" style="width: 80px;margin-top: 5px;"
+									@click="huaTaishow=true">特约选择</u-button>
+								<view class="contributing dis f-c" v-for="(item,index) in huaTaiengageList">
+									<text>{{item.engageTitle}}</text>
+									<u-input v-if="item.modifyFlag==1" :border="true" v-model="item.engageDetail"
+										size="mini" type="textarea" :custom-style="{fontSize:'14px'}" />
+									<text v-else>{{item.engageDetail}}</text>
+								</view>
+							</template>
 						</view>
 					</view>
 				</template>
@@ -457,15 +468,26 @@
 				<view class="btn d-flex a-center j-center" @tap="submitAudit">申请核保</view>
 			</view>
 		</view>
-		<u-modal v-model="show" title="特约选择" :scroll-height="{height: '300px'}">
+		<u-modal v-model="ziJinshow" title="紫金特约选择" :title-style="{fontWeight: 'bold'}"
+			:scroll-height="{height: '300px'}">
 			<view class="slot-content">
-				<u-checkbox-group @change="tycheckboxGroupChange">
+				<u-checkbox-group @change="ziJincontributingChange">
 					<u-checkbox v-model="item.checked" active-color="rgb(255, 153, 0)"
-						v-for="(item, index) in zijinengageListData" :key="index"
+						v-for="(item, index) in ziJinengageListData" :key="index"
 						:name="item.clauseCode">{{item.clauseName}}</u-checkbox>
 				</u-checkbox-group>
 			</view>
 		</u-modal>
+		<u-modal v-model="huaTaishow" title="华泰特约选择" :title-style="{fontWeight: 'bold'}"
+			:scroll-height="{height: '300px'}">
+			<view class="slot-content">
+				<u-checkbox-group @change="huaTaicontributingChange">
+					<u-checkbox v-model="item.checked" active-color="rgb(255, 153, 0)"
+						v-for="(item, index) in huaTaiengageListData" :key="index"
+						:name="item.engageCode">{{item.engageTitle}}</u-checkbox>
+				</u-checkbox-group>
+			</view>
+		</u-modal>
 		<previewImage ref="previewImage" :opacity="0.8" :circular="true" :imgs="previewImgs"></previewImage>
 	</view>
 </template>
@@ -493,7 +515,8 @@
 		},
 		data() {
 			return {
-				show: false,
+				ziJinshow: false,
+				huaTaishow: false,
 				quoteno: "", //报价号
 				previewImgs: [],
 				sumPermium: "",
@@ -571,8 +594,10 @@
 				imgRelationship: [], //其他证明
 				imgNewCarQualified: [], //合格证
 				imgNewCarInvoice: [], //发票
-				zijinengageListData: [],
-				zijinengageList: [],
+				ziJinengageListData: [],
+				ziJinengageList: [],
+				huaTaiengageListData: [],
+				huaTaiengageList: [],
 			}
 		},
 		async onLoad(params) {
@@ -604,10 +629,10 @@
 				this.imageEcho(this.quoteno)
 				if (this.name == '紫金财险') {
 					let Zijinres = await this.$http.post('/order/zijin/queryClauseData', param);
-					this.zijinengageListData = Zijinres.data;
-					let data = this.zijinengageListData.find(val => val.optType == 3)
+					this.ziJinengageListData = Zijinres.data;
+					let data = this.ziJinengageListData.find(val => val.optType == 3)
 					if (data) {
-						this.zijinengageList.push({
+						this.ziJinengageList.push({
 							clauseCode: data.clauseCode,
 							clauseName: data.clauseName,
 							clauses: data.clauseContent,
@@ -618,6 +643,10 @@
 					}
 
 				}
+				if (this.name == '华泰财险') {
+					let huaTaires = await this.$http.post('/order/huaTaiApi/queryClauseData', param);
+					this.huaTaiengageListData = huaTaires.data;
+				}
 				// 影像获取完毕
 			} else {
 				uni.showModal({
@@ -627,11 +656,11 @@
 			}
 		},
 		methods: {
-			tycheckboxGroupChange(detail) {
-				this.zijinengageList = [];
-				detail.map(val => {
-					let list = this.zijinengageListData.find(item => item.clauseCode == val)
-					this.zijinengageList.push({
+			ziJincontributingChange(param) {
+				this.ziJinengageList = [];
+				param.map(val => {
+					let list = this.ziJinengageListData.find(item => item.clauseCode == val)
+					this.ziJinengageList.push({
 						clauseCode: list.clauseCode,
 						clauseName: list.clauseName,
 						clauses: list.clauseContent,
@@ -641,6 +670,19 @@
 					})
 				})
 			},
+			huaTaicontributingChange(param) {
+				this.huaTaiengageList = [];
+				param.map(val => {
+					let list = this.huaTaiengageListData.find(item => item.engageCode == val)
+					this.huaTaiengageList.push({
+						engageCode: list.engageCode,
+						engageDetail: list.engageDetail,
+						engageTitle: list.engageTitle,
+						riskCode: list.riskCode,
+						modifyFlag: list.modifyFlag,
+					})
+				})
+			},
 
 			//影像查询
 			async imageEcho(quotenos) {
@@ -1089,6 +1131,71 @@
 										});
 									}
 									break;
+								case "大家财险":
+									let djimage = await this.$http.post(
+										'/api/dajia/submitImage', {
+											companyId: this.companyId
+										});
+									if (djimage.code == '200') {
+										let djaudit = await this.$http.post(
+											'/api/dajia/audit', {
+												companyId: this.companyId,
+											});
+										if (djaudit.code == '200') {
+											uni.showModal({
+												content: '订单自核成功',
+												cancelText: '暂不缴费',
+												confirmText: '立即缴费',
+												success: (res1) => {
+													if (res1.confirm) {
+														uni.navigateTo({
+															url: "/pages/carInsure1/payCode1?companyId=" +
+																this
+																.companyId
+														})
+													} else {
+														this.navigate({
+																url: "/pages/orders/orders"
+															}, "switchTab",
+															true);
+													}
+												}
+											});
+										} else {
+											uni.showModal({
+												content: '核保失败(' + djaudit.msg + ')',
+												cancelText: '返回订单',
+												confirmText: '修改',
+												success: async (res2) => {
+													if (res2.confirm) {
+
+													} else {
+														this.navigate({
+																url: "/pages/orders/orders"
+															}, "switchTab",
+															true);
+													}
+												}
+											});
+										}
+									} else {
+										uni.showModal({
+											content: '影像上传失败(' + djimage.msg + ')',
+											cancelText: '返回订单',
+											confirmText: '修改',
+											success: async (res3) => {
+												if (res3.confirm) {
+
+												} else {
+													this.navigate({
+															url: "/pages/orders/orders"
+														}, "switchTab",
+														true);
+												}
+											}
+										});
+									}
+									break;
 								case "紫金财险":
 									let zjimage = await this.$http.post(
 										'/order/zijin/submitImage', {
@@ -1098,7 +1205,7 @@
 										let zjaudit = await this.$http.post(
 											'/order/zijin/audit', {
 												companyId: this.companyId,
-												engageList: this.zijinengageList,
+												engageList: this.ziJinengageList,
 											});
 										if (zjaudit.code == '200') {
 											uni.showModal({
@@ -1156,6 +1263,73 @@
 										});
 									}
 									break;
+								case "华泰财险":
+									let htimage = await this.$http.post(
+										'/order/huaTaiApi/submitImage', {
+											companyId: this.companyId
+										});
+									if (htimage.code == '200') {
+										let htaudit = await this.$http.post(
+											'/order/huaTaiApi/audit', {
+												companyId: this.companyId,
+												engageList: this.huaTaiengageList,
+											});
+										if (htaudit.code == '200') {
+											uni.showModal({
+												content: '订单自核成功',
+												cancelText: '暂不缴费',
+												confirmText: '立即缴费',
+												success: (res1) => {
+													if (res1.confirm) {
+														uni.navigateTo({
+															url: "/pages/carInsure1/payCode1?companyId=" +
+																this
+																.companyId
+														})
+													} else {
+														this.navigate({
+																url: "/pages/orders/orders"
+															}, "switchTab",
+															true);
+													}
+												}
+											});
+										} else {
+											uni.showModal({
+												content: '核保失败(' + htaudit.msg + ')',
+												cancelText: '返回订单',
+												confirmText: '修改',
+												success: async (res2) => {
+													if (res2.confirm) {
+
+													} else {
+														this.navigate({
+																url: "/pages/orders/orders"
+															}, "switchTab",
+															true);
+													}
+												}
+											});
+										}
+									} else {
+
+										uni.showModal({
+											content: '影像上传失败(' + htimage.msg + ')',
+											cancelText: '返回订单',
+											confirmText: '修改',
+											success: async (res3) => {
+												if (res3.confirm) {
+
+												} else {
+													this.navigate({
+															url: "/pages/orders/orders"
+														}, "switchTab",
+														true);
+												}
+											}
+										});
+									}
+									break;
 								case "恒邦财险":
 								case "安盛天平":
 								case "众安财险":
@@ -1247,6 +1421,7 @@
 		width: 120upx;
 		font-size: 90upx;
 		color: #FFFFFF;
+
 	}
 
 	.carInfo .topRight .brandName {

+ 20 - 12
pages/login/login.vue

@@ -74,8 +74,8 @@
 			<view class="third_party_login_box">
 				<view class="third_party_title"><text>第三方登录</text></view>
 				<view class="third_party_content flex-wrap">
-					<image src="/static/icon/weixin.png" @click=" onWxAppLogin" mode="aspectFit"></image>
-					<image src="/static/icon/zhifubao.png" mode="aspectFit"></image>
+					<image src="/static/icon/weixin.png" @click="onWxAppLogin" mode="aspectFit"></image>
+					<!-- <image src="/static/icon/zhifubao.png" mode="aspectFit"></image> -->
 				</view>
 			</view>
 			<!-- #endif -->
@@ -224,7 +224,7 @@
 			this.closeSQL();
 		},
 		computed: {
-			...mapState(["userLoginId"])
+			...mapState(["userLoginId", "loginStatus"])
 
 		},
 		//方法
@@ -405,6 +405,7 @@
 								captcha: this.imgcode.toLowerCase()
 							}
 						}).then(res => {
+							console.log(res)
 							socket.init();
 							return;
 						})
@@ -438,7 +439,7 @@
 								captcha: this.imgcode.toLowerCase()
 							}
 						}).then(res => {
-							console.log(1)
+							console.log(res)
 							this.openSQL(); //打开数据库
 							this.createTable(); //创建表
 							this.insertTableData(this.username, this.password); //新增表数据
@@ -470,26 +471,31 @@
 				var that = this;
 				uni.login({
 					provider: 'weixin',
-					scopes: "auth_user",
 					onlyAuthorize: true,
 					success: function(loginRes) {
-						that.codeRes(loginRes);
+						that.codeRes(loginRes.code);
+
+					},
+					fail: (err) => {
+						uni.showToast({
+							title: '绑定失败',
+							icon: "none"
+						});
+						console.log('login fail:', err);
 					}
 				});
 			},
-			async codeRes(data) {
+			codeRes(code) {
 				this.$login({
 					url: "/wechat/login",
 					data: {
-						code: data.code,
+						code: code,
 					}
 				}).then(res => {
 					socket.init();
 					return;
 				})
-
 			},
-
 			// 打开数据库
 			openSQL() {
 				// 这个是查询有没有打开数据库
@@ -544,7 +550,8 @@
 					}]
 					arr.map(item => {
 						let time = this.formatDate(new Date().getTime());
-						let sql = `'${item.username}','${item.password}','${item.defaultid}','${time}'`;
+						let sql =
+							`'${item.username}','${item.password}','${item.defaultid}','${time}'`;
 						let condition = "'username','password','defaultid','time'";
 						// 新增 DB.insertTableData(表名, 对应表头列的数据)
 						DB.insertTableData("chat", sql, condition)
@@ -579,7 +586,8 @@
 				let open = DB.isOpen();
 				if (open) {
 					let time = this.formatDate(new Date().getTime());
-					let data = `username ='${this.username}',password ='${this.password}',defaultid='${this.username}'`;
+					let data =
+						`username ='${this.username}',password ='${this.password}',defaultid='${this.username}'`;
 					// 修改表数据 DB.updateTableData(表名, 要修改的列名=修改后列值, 修改条件的列名, 修改条件的列值)
 					DB.updateTableData("chat", data)
 						.then(res => {

+ 2 - 1
pages/orders/orders.vue

@@ -245,7 +245,8 @@
 			}
 			this.getOrdersList()
 		},
-		onLoad() {
+		onLoad(e) {
+			console.log(e)
 			this.pageRequest.userId = this.userInfo.sysUser.id;
 			this.pageRequest.deptId = this.userInfo.sysUser.deptId;
 			this.getOrdersList()

+ 8 - 0
pages/orders/quotation.vue

@@ -181,6 +181,14 @@
 						name: "国任财险",
 						icon: "../../static/insuranceicon/guoren.png"
 					},
+					{
+						name: "华泰财险",
+						icon: "../../static/insuranceicon/huatai.png"
+					},
+					{
+						name: "大家财险",
+						icon: "../../static/insuranceicon/dajia.png"
+					},
 				],
 				logoimg: "",
 			}

+ 25 - 2
pages/orders/quoteHistory.vue

@@ -40,12 +40,15 @@
 					</view>
 				</view>
 				<view class="orders-below dis j-end">
+					<u-button v-if="item.orderstatus==2" size="mini" type="error" :plain="true" :hair-line="false"
+						shape="circle" @click="revokeCode(item.id)">撤销二维码</u-button>
+					<u-button v-if="item.orderstatus==4 && item.inscompany=='华泰财险'" size="mini" type="error"
+						:plain="true" :hair-line="false" shape="circle"
+						@click="underwritingCode(item.id)">核保状态查询</u-button>
 					<u-button size="mini" type="error" :plain="true" :hair-line="false" shape="circle"
 						@click="bjdpreview(item.id)">报价单</u-button>
 					<u-button v-if="item.orderstatus==2" size="mini" type="error" :plain="true" :hair-line="false"
 						shape="circle" @click="Payment(item.id)">付款码</u-button>
-					<u-button v-if="item.orderstatus==2" size="mini" type="error" :plain="true" :hair-line="false"
-						shape="circle" @click="revokeCode(item.id)">撤销二维码</u-button>
 					<u-button size="mini" type="primary" :plain="true" :hair-line="false" shape="circle"
 						@click="detial(item.id)">查看详情</u-button>
 				</view>
@@ -139,6 +142,26 @@
 					});
 				}
 			},
+			async underwritingCode(id) {
+				let params = {
+					companyId: id,
+				}
+				let res = await this.$http.post('/order/huaTaiApi/auditStatusQuery', params)
+				if (res.code == '200') {
+					uni.showToast({
+						title: res.msg,
+						icon: 'success',
+						duration: 1000
+					});
+					this.querylist();
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none',
+						duration: 1000
+					});
+				}
+			},
 			//报价单
 			bjdpreview(id) {
 				uni.navigateTo({

+ 69 - 9
pages/orders/subOrders.vue

@@ -43,18 +43,22 @@
 					</view>
 				</view>
 				<view class="orders-below dis j-end">
-					<u-button v-if="item.orderstatus==2 && ['紫金财险'].includes(item.inscompany)" size="mini" type="error"
-						:plain="true" :hair-line="false" shape="circle" @click="cancelorder(item.id)">撤单</u-button>
-					<u-button v-if="item.orderstatus==2" size="mini" type="error" :plain="true" :hair-line="false"
-						shape="circle" @click="Payment(item.id)">二维码</u-button>
 					<u-button v-if="item.orderstatus==2" size="mini" type="error" :plain="true" :hair-line="false"
 						shape="circle" @click="revokeCode(item.id)">撤销二维码</u-button>
 					<u-button v-if="item.orderstatus==1  && ['中煤财险'].includes(item.inscompany)" size="mini" type="error"
 						:plain="true" :hair-line="false" shape="circle" @click="underwriting(item.id)">核保状态查询</u-button>
+					<u-button v-if="item.orderstatus==4 && item.inscompany=='华泰财险'" size="mini" type="error"
+						:plain="true" :hair-line="false" shape="circle"
+						@click="underwritingCode(item.id)">核保状态查询</u-button>
 					<u-button
-						v-if="item.orderstatus==2 && ['恒邦财险','安盛天平','中国人寿','众安财险','紫金财险','永诚财险','国任财险'].includes(item.inscompany)"
+						v-if="item.orderstatus==2 && ['恒邦财险','安盛天平','中国人寿','众安财险','紫金财险','永诚财险','国任财险','大家财险','华泰财险'].includes(item.inscompany)"
 						size="mini" type="error" :plain="true" :hair-line="false" shape="circle"
 						@click="queryStatus(item.id,item.inscompany)">查询缴费状态</u-button>
+					<u-button v-if="item.orderstatus==2 && ['紫金财险'].includes(item.inscompany)" size="mini" type="error"
+						:plain="true" :hair-line="false" shape="circle" @click="cancelorder(item.id)">撤单</u-button>
+					<u-button v-if="item.orderstatus==2" size="mini" type="error" :plain="true" :hair-line="false"
+						shape="circle" @click="Payment(item.id)">二维码</u-button>
+
 					<u-button size="mini" type="primary" :plain="true" :hair-line="false" shape="circle"
 						@click="detial(item.id)">查看详情</u-button>
 
@@ -149,6 +153,26 @@
 					});
 				}
 			},
+			async underwritingCode(id) {
+				let params = {
+					companyId: id,
+				}
+				let res = await this.$http.post('/order/huaTaiApi/auditStatusQuery', params)
+				if (res.code == '200') {
+					uni.showToast({
+						title: res.msg,
+						icon: 'success',
+						duration: 1000
+					});
+					this.querylist();
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none',
+						duration: 1000
+					});
+				}
+			},
 			//报价单
 			bjdpreview(id) {
 				uni.navigateTo({
@@ -195,19 +219,55 @@
 			async queryStatus(id, inscompany) {
 				switch (inscompany) {
 					case "紫金财险":
-						let res = await this.$http.post('/order/zijin/getOrderDetail', {
+						let zjres = await this.$http.post('/order/zijin/getOrderDetail', {
+							companyId: id
+						});
+						if (zjres.code == '200') {
+							uni.showToast({
+								title: zjres.msg,
+								icon: 'none',
+								duration: 2000
+							});
+							this.querylist();
+						} else {
+							uni.showToast({
+								title: zjres.msg,
+								icon: 'error',
+							});
+						}
+						break;
+					case "大家财险":
+						let djres = await this.$http.post('/api/dajia/verifyPayment', {
+							companyId: id
+						});
+						if (djres.code == '200') {
+							uni.showToast({
+								title: djres.msg,
+								icon: 'none',
+								duration: 2000
+							});
+							this.querylist();
+						} else {
+							uni.showToast({
+								title: djres.msg,
+								icon: 'error',
+							});
+						}
+						break;
+					case "华泰财险":
+						let htres = await this.$http.post('/order/huaTaiApi/paymentEnquiry', {
 							companyId: id
 						});
-						if (res.code == '200') {
+						if (htres.code == '200') {
 							uni.showToast({
-								title: res.msg,
+								title: htres.msg,
 								icon: 'none',
 								duration: 2000
 							});
 							this.querylist();
 						} else {
 							uni.showToast({
-								title: res.msg,
+								title: htres.msg,
 								icon: 'error',
 							});
 						}

+ 48 - 11
pages/set/safe.vue

@@ -3,37 +3,74 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<block v-for="(item,index) in list" :key="index">
-			<my-list-item :item="item" :index="index"></my-list-item>
+			<my-list-item :item="item" :index="index" @weixinMsg="weixinMsg" :someData="status"></my-list-item>
 		</block>
 	</view>
 </template>
 
 <script>
-	import {mapState} from "vuex"
+	import {
+		mapState
+	} from "vuex"
 	import myListItem from "@/components/modules/my/my-list-item.vue";
 	export default {
-		components:{
+		components: {
 			myListItem
 		},
 		data() {
 			return {
-				list:[
-					{ icon:"",name:"修改密码",clicktype:"navigateTo",url:"/pages/set/password",text:"去设置",auth:true },
-					{ icon:"",name:"修改手机号",clicktype:"navigateTo",url:"/pages/set/mobile",text:'',auth:true }
-				]
+				list: [{
+						icon: "",
+						name: "修改密码",
+						clicktype: "navigateTo",
+						url: "/pages/set/password",
+						text: "去设置",
+						auth: true
+					},
+					{
+						icon: "",
+						name: "修改手机号",
+						clicktype: "navigateTo",
+						url: "/pages/set/mobile",
+						text: '',
+						auth: true
+					},
+					{
+						icon: "",
+						name: "微信",
+						clicktype: "weixin",
+						url: "",
+						text: '未绑定',
+					},
+				],
+				status: false,
 			}
 		},
-		onLoad() {
+		async onLoad() {
 			this.list[1].text = this.userInfo.sysUser.mobile;
+			let res = await this.$http.get("/user/isBindWechat")
+			if (res.code == '200') {
+				this.list[2].text = "已绑定"
+				this.status = true;
+				this.list[2].text
+			} else {
+				this.status = false;
+			}
 		},
-		computed:{
+		computed: {
 			...mapState(["userInfo"])
 		},
 		methods: {
-			
+			weixinMsg(mag) {
+				uni.showToast({
+					title: mag.msg,
+					icon: "none"
+				});
+
+			},
 		}
 	}
 </script>
 
 <style>
-</style>
+</style>

+ 40 - 15
pages/set/set.vue

@@ -2,46 +2,71 @@
 	<view class="body">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		
+
 		<block v-for="(item,index) in list" :key="index">
 			<my-list-item :item="item" :index="index"></my-list-item>
 		</block>
-		<button class="my-3 mt-4 mx-3 d-flex a-center j-center main-bg-color" type="primary" @tap="logout" >退出登录</button>
+		<button class="my-3 mt-4 mx-3 d-flex a-center j-center main-bg-color" type="primary" @tap="logout">退出登录</button>
 	</view>
 </template>
 
 <script>
-	import {mapMutations} from "vuex"
+	import {
+		mapMutations
+	} from "vuex"
 	import myListItem from "@/components/modules/my/my-list-item.vue";
 	export default {
-		components:{
+		components: {
 			myListItem
 		},
 		data() {
 			return {
-				list:[
-					{ icon:"",name:"账号与安全",clicktype:"navigateTo",url:"/pages/set/safe",auth:true },
-					{ icon:"",name:"清除缓存",clicktype:"clear",url:"" },
-					{ icon:"",name:"常见问题",clicktype:"navigateTo",url:"/pages/set/question",auth:true },
+				list: [{
+						icon: "",
+						name: "账号管理",
+						clicktype: "navigateTo",
+						url: "/pages/set/safe",
+						auth: true
+					},
+					{
+						icon: "",
+						name: "清除缓存",
+						clicktype: "clear",
+						url: ""
+					},
+					{
+						icon: "",
+						name: "常见问题",
+						clicktype: "navigateTo",
+						url: "/pages/set/question",
+						auth: true
+					},
 					// { icon:"",name:"意见反馈",clicktype:"navigateTo",url:"/pages/set/suggest",auth:true },
-					{ icon:"",name:"关于掌柜",clicktype:"navigateTo",url:"/pages/set/about",text:"",auth:false },
+					{
+						icon: "",
+						name: "关于掌柜",
+						clicktype: "navigateTo",
+						url: "/pages/set/about",
+						text: "",
+						auth: false
+					},
 				]
 			}
 		},
-		onLoad(){
+		onLoad() {
 			// #ifdef APP-PLUS
-			plus.runtime.getProperty(plus.runtime.appid, (widgetInfo)=>{ 
-				this.list[4].text  = widgetInfo.version;
+			plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => {
+				this.list[4].text = widgetInfo.version;
 			})
 			// #endif
 		},
 		methods: {
 			...mapMutations(['emptyUserInfo']),
-			logout(){
+			logout() {
 				this.emptyUserInfo();
 				setTimeout(() => {
 					uni.reLaunch({
-						url:"/pages/login/login"
+						url: "/pages/login/login"
 					})
 					return true;
 				}, 500);
@@ -51,4 +76,4 @@
 </script>
 
 <style>
-</style>
+</style>

+ 4 - 6
pages/tools/team/team.vue

@@ -147,9 +147,7 @@
 			}
 
 		},
-		onShow() {
-
-		},
+		onShow() {},
 		computed: {
 			...mapState(['userInfo']),
 			getHeight() {
@@ -189,11 +187,11 @@
 				})
 				this.teamTabIndex = 0;
 				var params = {
-					"id": "9991401004",
+					"id": this.queryPeopleId,
 					"mobile": "",
 					"name": "",
-					"enddate": "2023-10-03",
-					"startdate": "2023-1-01"
+					"enddate": this.dateRange[1],
+					"startdate": this.dateRange[0]
 				}
 				let res = await this.$http.post('/esm/user/queryTeamPolicy', params);
 				if (res.code == '200') {

+ 1 - 0
style/common.css

@@ -4,6 +4,7 @@ page {
 	font-size: 28upx;
 	line-height: 1.8;
 	background-color: #FFFFFF;
+
 }
 
 image {

+ 0 - 29
uniCloud-aliyun/database/db_init.json

@@ -1,29 +0,0 @@
-// 在本文件中可配置云数据库初始化,数据格式见:https://uniapp.dcloud.io/uniCloud/cf-database?id=db_init
-// 编写完毕后对本文件点右键,可按配置规则创建表和添加数据
-
-// 注(小更新为wgt更新(只更新自己写的代码),大更新为apk更新(要下载所有的文件包含权限模块依赖等))
-// 版本号一般为 A.B.C ,如 4.5.6 版本
-// A—第一级:重大重构
-// B—第二级:重大功能改进
-// C—第三极:小升级或者BUG修复
-{
-	"opendb-app-versions": {
-		"data": [{
-			"is_silently": true,
-			"is_mandatory": false,
-			"appid": "__UNI__D4FE29A",
-			"name": "晋掌柜",
-			"title": "",
-			"contents": " ",
-			"platform": [
-				"Android"
-			],
-			"version": "1.0.40",
-			"url": "https://vkceyugu.cdn.bspapp.com/VKCEYUGU-deda6fee-fa8c-4305-9ae6-e6ba7c6f1882/5a2916d9-aa38-4706-aaa7-b239f984aaac.wgt",
-			"min_uni_version":"1.0.33",
-			"stable_publish": true,
-			"type": "wgt",
-			"create_date": 1623054124464
-		}]
-	}
-}

+ 0 - 0
uni_modules/dk-Parallelhorizon/changelog.md


+ 81 - 0
uni_modules/dk-Parallelhorizon/package.json

@@ -0,0 +1,81 @@
+{
+  "id": "dk-Parallelhorizon",
+  "displayName": "dk-Parallelhorizon",
+  "version": "1.0.0",
+  "description": "dk-Parallelhorizon",
+  "keywords": [
+    "dk-Parallelhorizon"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.6.8"
+  },
+  "dcloudext": {
+    "type": "uts",
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "",
+      "data": "",
+      "permissions": ""
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "u",
+        "aliyun": "u"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "u",
+          "vue3": "u"
+        },
+        "App": {
+          "app-android": "u",
+          "app-ios": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+          "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}

+ 6 - 0
uni_modules/dk-Parallelhorizon/readme.md

@@ -0,0 +1,6 @@
+# dk-Parallelhorizon
+### 开发文档
+[UTS 语法](https://uniapp.dcloud.net.cn/tutorial/syntax-uts.html)
+[UTS API插件](https://uniapp.dcloud.net.cn/plugin/uts-plugin.html)
+[UTS 组件插件](https://uniapp.dcloud.net.cn/plugin/uts-component.html)
+[Hello UTS](https://gitcode.net/dcloud/hello-uts)

+ 0 - 0
uni_modules/dk-Parallelhorizon/utssdk/app-android/index.uts


+ 0 - 0
uni_modules/dk-Parallelhorizon/utssdk/app-ios/index.uts


部分文件因为文件数量过多而无法显示