冲突

main.js

@@ -10,6 +10,10 @@ Vue.config.productionTip = false;
 Vue.prototype.axios = axios;
 Vue.prototype.$api = api;
 
+import { numberToCurrencyNo } from '@/utils/numberToCurrency'
+// 配置全局过滤器，实现数字千分位格式
+Vue.filter('numberToCurrency', numberToCurrencyNo)
+
 App.mpType = 'app'
 const app = new Vue({
 	api,

pages/dataImport/data-import.css

+/* 保单年度弹窗 */
+	.policySelectContainer{
+		position: fixed;
+		z-index: 2;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0,0,0,0.35);
+	}
+	.policySelectContainer .policyYearContainer{
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 57%;
+		background-color: #fff;
+		border-top-left-radius: 40rpx;
+		border-top-right-radius: 40rpx;
+		padding: 20rpx 30rpx 0;
+		box-sizing: border-box;
+	}
+	.policyYearContainer .modalTitle{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		font-weight: bold;
+	}
+	.policyYearContainer .modalTitle text:last-child{
+		color: #FF0000;
+	}
+	.policyYearItemContainer{
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-around;
+	}
+	.policyYearItemContainer view{
+		width: 9%;
+		height: 0;
+		padding-bottom: 9%;
+		margin: 20rpx 0;
+		color: #fff;
+		border-radius: 50%;
+		position: relative;
+		margin-right: 6rpx;
+		color: #333;
+		font-weight: bold;
+	}
+	.policyYearItemContainer view.actived{
+		background: linear-gradient(135deg, #CEB07D 0%, #FFDDA9 56%, #FED495 100%, #FED495 100%);
+		color:#6B4000;
+	}
+	.policyYearItemContainer view text{
+		position: absolute;
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%,-55%);
+	}
+	.policyStepContainer{
+		display: flex;
+		justify-content: space-around;
+		margin-top: 40rpx;
+	}
+	.policyStepContainer button{
+		flex: 0 0 30%;
+		font-size: 32rpx;
+		color:#000;
+		font-weight:bold;
+		border:1px solid #CEB07D;
+	}
+	.policyStepContainer uni-button::after{
+		border:1px solid #CEB07D;
+	}
+	.policyStepContainer button.actived{
+		background: linear-gradient(135deg, #CEB07D 0%, #FFDDA9 56%, #FED495 100%, #FED495 100%);
+		color: #6B4000;
+	}
+	.policyStepContainer button.actived,.policyStepContainer button.actived::after{
+		border:none;
+	}
+	.confirm button{
+		background: linear-gradient(135deg, #CEB07D 0%, #FFDDA9 56%, #FED495 100%, #FED495 100%);
+		color: #6B4000;
+		font-weight: bold;
+		font-size: 36rpx;
+		margin-top: 56rpx;
+		width: 300rpx;
+	}
+	.confirm button,.confirm button::after{
+		border: none ;
+	}
+	.uni-textarea{
+		position: relative;
+	}
+	.pasteDiscernment{
+		position: absolute;
+		right: 0;
+		bottom: 0;
+		height: 50rpx;
+		background: #9B8055;
+		border-radius: 100px;
+		color: #fff;
+		font-size: 24rpx;
+	}
+	.batchDataImportContainer{
+		background-color: #fbfbfb;
+		height: 90vh;
+	}
+	.batchDataLists{
+		margin-top: 20rpx;
+		background: #fff;
+	}
+	.batchDataLists view{
+		display: flex;
+		text-align: center;
+		border-bottom: 1px solid #e4e4e4;
+	}
+	.batchDataLists view text:first-child{
+		width: 0;
+		flex: 0 0 35%;
+		border-right: 1px solid #e4e4e4;
+	}
+	.batchDataLists view text:last-child{
+		width: 0;
+		flex: 0 0 65%;
+	}
+	.batchDataLists view.batchDataTh{
+		height: 60rpx;
+		background:linear-gradient(135deg, #CEB07D 0%, #FFDDA9 56%, #FED495 100%, #FED495 100%);
+		line-height: 60rpx;
+		border-top-left-radius: 12rpx;
+		border-top-right-radius: 12rpx;
+	}
+	.batchDataLists view.batchDataTd{
+		height: 80rpx;
+		line-height: 80rpx;
+	}
+	.dataOptionContainer{
+		margin: 20rpx 20rpx 0;
+		margin-bottom: 34rpx;
+	}
+	.dataOptionContainer .uni-textarea{
+		background-color: #fff;
+		margin-bottom: 20rpx;
+	}
+	.tips{
+		font-size: 24rpx;
+		color: #666;
+		padding: 0 20rpx 20rpx;
+		background-color: #fff;
+	}
+	.tips text text{
+		font-size: 28rpx;
+		color: #9B8055;
+		font-weight: bold;
+	}
+	.selectStepContent,.selectStepContainer{
+		display: flex;
+		align-items: center;
+	}
+	.selectStepContainer{
+		justify-content: space-between;
+		padding: 20rpx 20rpx 0;
+		background-color: #fff;
+	}
+	.stepContent{
+		display: flex;
+		align-items: center;
+		border-bottom: 1px solid #e4e4e4;
+		padding: 0 5px;
+	}
+	.selectStepContainer button{
+		background-color: transparent;
+	}
+	.selectStepContainer button::after{
+		border: 1px solid #CEB07D;
+	}
+	.optionContent{
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background-color: #fff;
+	}
+	.optionContent button{
+		flex: 0 0 46%;
+		border:2rpx solid #e7c793;
+		color: #6B4000;
+		font-size: 36rpx;
+	}
+	.optionContent button:last-child{
+		background: linear-gradient(135deg, #CEB07D 0%, #FFDDA9 56%, #FED495 100%, #FED495 100%);
+		border: none;
+	}
+	.batchDataTd input{
+		height: 100%;
+	}
\ No newline at end of file

util/interceptor.ts

 import api from "../api/api";
 import {baseURL,apiURL,sfpURL} from "../environments/environment";
 // 白名单，不需要携带token就允许被访问的接口
+<<<<<<< HEAD
 const whiteApiList = ['/api/authorize/obtainToken']
+=======
+const whiteApiList = [`/api/authorize/obtainToken`]
+>>>>>>> 20eb17e444fb451ad26e91c66292178c8cb3acd4
 
 
 export const interceptor = () => {

util/numerPipe.ts

+export function numberToCurrencyNo(value) {
+  if (!value) return 0
+  // 获取整数部分
+  const intPart = Math.trunc(value)
+  // 整数部分处理，增加,
+  const intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')
+  // 预定义小数部分
+  let floatPart = ''
+  // 将数值截取为小数部分和整数部分
+  const valueArray = value.toString().split('.')
+  if (valueArray.length === 2) { // 有小数部分
+    floatPart = valueArray[1].toString() // 取得小数部分
+    return intPartFormat + '.' + floatPart
+  }
+  return intPartFormat + floatPart
+}
\ No newline at end of file