.env.js

@@ -1,53 +1,53 @@
-let version = __wxConfig.envVersion;
+// let version = __wxConfig.envVersion;
 
-console.log('配置文件加载')
-// #ifdef MP-WEIXIN
-console.log('微信小程序验证')
-console.log(__wxConfig.envVersion)
-if (version === 'develop') {
-    //开发环境
-    ENV_CONFIG = require('.env.dev.js');
-    ENV_CONFIG.isCanvas2d = false
-}else if (__wxConfig.envVersion === 'release') {
-    //生产环境
-    ENV_CONFIG = require('.env.prod.js');
-    ENV_CONFIG.isCanvas2d = true
-}  else {
-    //体验环境
-    ENV_CONFIG = require('.env.prod.js');
-    ENV_CONFIG.isCanvas2d = true
-}
-//#endif
-// #ifndef MP-WEIXIN
-console.log('其它环境验证')
-if (version === 'develop') {
-    //开发环境
-    // ENV_CONFIG = require('.env.dev.js');
-    ENV_CONFIG = require('.env.trial.js');
-    ENV_CONFIG.isCanvas2d = false
-    // ENV_CONFIG = require('.env.prod.js');
-}else if(version === 'trial'){
-    //体验环境
-    ENV_CONFIG = require('.env.trial.js');
-    ENV_CONFIG.isCanvas2d = true
-} else{
+// console.log('配置文件加载')
+// // #ifdef MP-WEIXIN
+// console.log('微信小程序验证')
+// console.log(__wxConfig.envVersion)
+// if (version === 'develop') {
+//     //开发环境
+//     ENV_CONFIG = require('.env.dev.js');
+//     ENV_CONFIG.isCanvas2d = false
+// }else if (__wxConfig.envVersion === 'release') {
+//     //生产环境
+//     ENV_CONFIG = require('.env.prod.js');
+//     ENV_CONFIG.isCanvas2d = true
+// }  else {
+//     //体验环境
+//     ENV_CONFIG = require('.env.prod.js');
+//     ENV_CONFIG.isCanvas2d = true
+// }
+// //#endif
+// // #ifndef MP-WEIXIN
+// console.log('其它环境验证')
+// if (version === 'develop') {
+//     //开发环境
+//     // ENV_CONFIG = require('.env.dev.js');
+//     ENV_CONFIG = require('.env.trial.js');
+//     ENV_CONFIG.isCanvas2d = false
+//     // ENV_CONFIG = require('.env.prod.js');
+// }else if(version === 'trial'){
+//     //体验环境
+//     ENV_CONFIG = require('.env.trial.js');
+//     ENV_CONFIG.isCanvas2d = true
+// } else{
 
-    //生产环境
-    ENV_CONFIG = require('.env.prod.js');
-    ENV_CONFIG.isCanvas2d = true
-}
-//#endif
-// #ifdef MP-WEIXIN
-//给环境变量process.uniEnv赋值
-if (ENV_CONFIG !== null) {
-    process.uniEnv = {};
-    for (let key in ENV_CONFIG) {
-        process.uniEnv[key] = ENV_CONFIG[key];
-    }
-    // #ifdef H5
-    if (nodeEnv !== 'development') {
-        process.uniEnv.baseUrl = window.location.hostname;
-    }
-    //#endif
-}
-//#endif
+//     //生产环境
+//     ENV_CONFIG = require('.env.prod.js');
+//     ENV_CONFIG.isCanvas2d = true
+// }
+// //#endif
+// // #ifdef MP-WEIXIN
+// //给环境变量process.uniEnv赋值
+// if (ENV_CONFIG !== null) {
+//     process.uniEnv = {};
+//     for (let key in ENV_CONFIG) {
+//         process.uniEnv[key] = ENV_CONFIG[key];
+//     }
+//     // #ifdef H5
+//     if (nodeEnv !== 'development') {
+//         process.uniEnv.baseUrl = window.location.hostname;
+//     }
+//     //#endif
+// }
+// //#endif

common/task/task_ima_tab.vue

@@ -119,7 +119,7 @@
 			},
 
 			changeTab(current) {
-				this.$emit('setProductId', this.navList[current].id)
+				// this.$emit('setProductId', this.navList[current].id)
 			},
 		}
 	}

components/en-utils/en-nav/en-nav.vue

@@ -16,7 +16,7 @@
 			</view>
 		</view>
 		<view :style="[{height:is_fixed? `${60+bgHeight}px`:`${60+fixedHeight}px`}]">
-      {{fixedHeight}}{{bgHeight}}
+			<!-- {{fixedHeight}}{{bgHeight}} -->
 		</view>
 		<!-- 带背景插槽 start-->
 		<slot></slot>
@@ -207,4 +207,4 @@
 	.nav-bg2 {
 		background-image: url("https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/index/index-bg.png?imageMogr2/quality/20");
 	}
-</style>
+</style>

pages/index/index.vue

@@ -25,6 +25,7 @@
 			<TaskItem :type="5" :taskList="backlogList" @heartBut="heartBut"></TaskItem>
 		</view>
 		<Tab class="tabs_height" :tab-index="1"></Tab>
+		<!-- 弹窗 -->
 		<popupModuleVue ref="popupModuleRef"></popupModuleVue>
 	</view>
 

pages/index/module/popup-module.vue

@@ -1,48 +1,64 @@
 <template>
-	<view class="">
-		<uni-popup background-color="#fff" ref="popup" type="bottom" border-radius="10px 10px 0 0">
-			<view class="p-24 box-border-box pop-box">
-				<view class="r-40 p-20 box-border-box flex-stretch mb-48 box-shadow" :class="colorType === 1?'bgc-F92A3B-E70073':colorType === 2?'':''">
-					<view class="mr-20 q-box fc-fff size-48" :class="colorType === 1?'bgc-F8516C':colorType === 2?'':''">
-						$
+	<uni-popup background-color="#fff" ref="popup" type="bottom" borderRadius="10px 10px 10px 10px">
+		<view class="p-24 box-border-box pop-box r-20">
+			<view class="r-40 p-20 box-border-box flex-stretch mb-48 box-shadow"
+				:class="colorType === 1?'bgc-F92A3B-E70073':colorType === 2?'bgc-AB46FF-8125FE':colorType === 3?'bgc-00B6DC-0F62FA':'bgc-00C651-009B65'">
+				<view class="mr-20 q-box fc-fff size-48"
+					:class="colorType === 1?'bgc-F8516C':colorType === 2?'bgc-B768FF':colorType === 3?'bgc-33B2EB':'bgc-34CC79'">
+					{{colorType === 1?'$':colorType === 2?'🏚':colorType === 3?'🛡':'🎁'}}
+				</view>
+				<view class="flex-direction flex-start">
+					<view class="size-24 fc-fff sys-weight-600 mb-10 zw-box"
+						:class="colorType === 1?'bgc-F8516C':colorType === 2?'bgc-B365FF':colorType === 3?'bgc-34B4EB':'bgc-34CA79'">
+						债务
 					</view>
-					<view class="flex-direction flex-start">
-						<view class="size-24 fc-fff sys-weight-600 mb-10 zw-box" :class="colorType === 1?'bgc-F8516C':colorType === 2?'':''">
-							债务
+					<view class="fc-fff size-32 text-overflow-ellipsis-one mb-10">
+						优先担保贷款#2024-001
+					</view>
+					<view class="fc-fff hy-box size-24">
+						活跃的
+					</view>
+				</view>
+			</view>
+			<view class="p-tb30 bt-EDEEF0">
+				<view class="p-30 box-border-box bgc-EEFAFF r-40 mb-48 box-shadow b-DBEAFE flex-stretch">
+					<view class="ok-box r-circle bgc-DBEAFE box-border-box mr-20 center justify-center">
+						<view class="checkmarkempty-box r-circle center justify-center">
+							<uni-icons type="checkmarkempty" size="12" color="#155DFB"></uni-icons>
 						</view>
-						<view class="fc-fff size-32 text-overflow-ellipsis-one mb-10">
-							优先担保贷款#2024-001
+					</view>
+					<view class="flex-direction flex-start">
+						<view class="center mb-10">
+							<view class="size-28 mr-18 fc-1B388E">
+								尽职调查状态
+							</view>
+							<view class="size-24 yz-box fc-008235 sys-weight-600">
+								已验证
+							</view>
 						</view>
-						<view class="fc-fff hy-box size-24">
-							活跃的
+						<view class="size-24 fc-1547E6">
+							所有要求的文件均已验证并为最新文件
 						</view>
 					</view>
 				</view>
-				<view class="p-tb30 bt-EDEEF0">
-					<view class="p-30 box-border-box bgc-EEFAFF r-40 mb-48 box-shadow b-DBEAFE flex-stretch">
-						<view class="ok-box r-circle bgc-DBEAFE box-border-box mr-20">
-							<view class="checkmarkempty-box r-circle center justify-center">
-								<uni-icons type="checkmarkempty" size="12" color="#155DFB"></uni-icons>
-							</view>
+			</view>
+			<view class="">
+				<view class="size-32 mb-20">
+					实体详情
+				</view>
+				<view class="b-F3F4F6-1 box-shadow sys-radius-20">
+					<view class="p-30 box-border-box b-b-F3F4F6 center row-justify-sb" v-for="(item) in 4">
+						<view class="size-28">
+							实体类型
 						</view>
-						<view class="flex-direction flex-start">
-							<view class="center mb-10">
-								<view class="size-28 mr-18 fc-1B388E">
-									尽职调查状态
-								</view>
-								<view class="size-24 yz-box fc-008235 sys-weight-600">
-									已验证
-								</view>
-							</view>
-							<view class="size-24 fc-1547E6">
-								所有要求的文件均已验证并为最新文件
-							</view>
+						<view class="size-28">
+							公司
 						</view>
 					</view>
 				</view>
 			</view>
-		</uni-popup>
-	</view>
+		</view>
+	</uni-popup>
 </template>
 
 <script>
@@ -50,7 +66,8 @@
 		components: {},
 		props: {
 			colorType: {
-				default: 1
+				// 颜色状态 1红 2紫 3蓝 4绿
+				default: 3
 			}
 		},
 		data() {
@@ -67,51 +84,61 @@
 </script>
 
 <style lang="scss" scoped>
-.pop-box{
-	border-radius: 20rpx 20rpx 0 0 ;
-}
-.box-shadow{
-	box-shadow: 5rpx 5rpx 5px 0 rgba(0, 0, 0, 0.2);
-}
-.q-box{
-	width: 88rpx;
-	height: 88rpx;
-	line-height: 88rpx;
-	text-align: center;
-	border-radius: 30rpx;
-}
-.zw-box{
-	padding: 4rpx 16rpx;
-	display: inline-block;
-	border-radius: 20rpx;
-}
-.hy-box{
-	padding: 4rpx 16rpx;
-	border-radius: 20rpx;
-	background: #00CA52;
-}
-.bt-EDEEF0{
-	border-top: .1rpx solid #EDEEF0;
-}
-.b-DBEAFE{
-	border: .1rpx solid #DBEAFE;
-}
-.yz-box{
-	background: #DBFCE7;
-	border-radius: 40rpx;
-	padding: 4rpx 16rpx;
-	border: .1rpx solid #B9F8CF;
-}
-.ok-box{
-	width: 72rpx;
-	height: 72rpx;
-	line-height: 72rpx;
-	text-align: center;
-	padding: 16rpx;
-}
-.checkmarkempty-box{
-	width: 100%;
-	height: 100%;
-	border: 1rpx solid #155DFB;
-}
+	.b-b-F3F4F6 {
+		border-bottom: .1rpx solid #F3F4F6;
+	}
+
+	.pop-box {
+		border-radius: 20rpx 20rpx 0 0;
+	}
+
+	.box-shadow {
+		box-shadow: 5rpx 5rpx 5px 0 rgba(0, 0, 0, 0.2);
+	}
+
+	.q-box {
+		width: 88rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		text-align: center;
+		border-radius: 30rpx;
+	}
+
+	.zw-box {
+		padding: 4rpx 16rpx;
+		display: inline-block;
+		border-radius: 20rpx;
+	}
+
+	.hy-box {
+		padding: 4rpx 16rpx;
+		border-radius: 20rpx;
+		background: #00CA52;
+	}
+
+	.bt-EDEEF0 {
+		border-top: .1rpx solid #EDEEF0;
+	}
+
+	.b-DBEAFE {
+		border: .1rpx solid #DBEAFE;
+	}
+
+	.yz-box {
+		background: #DBFCE7;
+		border-radius: 40rpx;
+		padding: 4rpx 16rpx;
+		border: .1rpx solid #B9F8CF;
+	}
+
+	.ok-box {
+		width: 72rpx;
+		height: 72rpx;
+	}
+
+	.checkmarkempty-box {
+		width: 32rpx;
+		height: 32rpx;
+		border: 1rpx solid #155DFB;
+	}
 </style>

static/css/common.css

@@ -748,7 +748,24 @@
 .bgc-DBEAFE {
 	background-color: #DBEAFE;
 }
-
+.bgc-B768FF {
+	background-color: #B768FF;
+}
+.bgc-B365FF {
+	background-color: #B365FF;
+}
+.bgc-33B2EB {
+	background-color: #33B2EB;
+}
+.bgc-34B4EB {
+	background-color: #34B4EB;
+}
+.bgc-34CC79 {
+	background-color: #34CC79;
+}
+.bgc-34CA79 {
+	background-color: #34CA79;
+}
 .bgc-00DC73-00BF7C {
 	background-image: linear-gradient(125deg, #00C858, #00BCA2);
 }
@@ -758,6 +775,15 @@
 .bgc-F92A3B-E70073 {
 	background-image: linear-gradient(125deg, #F92A3B , #E70073);
 }
+.bgc-AB46FF-8125FE {
+	background-image: linear-gradient(125deg, #AB46FF , #8125FE);
+}
+.bgc-00B6DC-0F62FA {
+	background-image: linear-gradient(125deg, #00B6DC , #0F62FA);
+}
+.bgc-00C651-009B65 {
+	background-image: linear-gradient(125deg, #00C651 , #009B65);
+}
 .fc-6A7383 {
 	color: #6A7383;
 }