Merge branch 'master' of http://git.lcpcp.cc/py/assess-app

common/task/loan-item.vue

@@ -1,9 +1,9 @@
 <template>
-	<view class="flex-1 flex-direction">
+	<view class="flex-direction" :style="{height: (commonHeight + 40) + 'px'}">
 		<swiper class="swiper-box flex-direction animate__animated animate__fadeInRight flex-1" circular
 			v-if="taskList.length>0">
 			<swiper-item v-for="(item,index) in taskList" :key="index"
-				class="flex-direction p-30 box-border-box flex-1">
+				class="swiper-item flex-direction p-30 box-border-box flex-1">
 				<view class="item-box flex-direction flex-1 page-box-bg-fff r-30 box-shadow-197">
 					<view class="item-top box-border-box" :style="{background:lineColor[item.id%2]}">
 						<view class="center row-justify-sb mb-24">
@@ -146,6 +146,10 @@
 				type: Array,
 				default: () => []
 			},
+			commonHeight: {
+				type: Number,
+				default: 0
+			},
 			iconStatus: {
 				type: Number,
 				default: 1
@@ -195,6 +199,12 @@
 </script>
 
 <style lang="scss" scoped>
+	// .swiper-box{
+	// 	height: 800rpx;
+	// }
+	// .swiper-item{
+	// 	height: 800rpx;
+	// }
 	.tiem-box {
 		width: 200rpx;
 		padding: 16rpx 32rpx;

common/task/task_ima_tab.vue

@@ -25,14 +25,34 @@
 		data() {
 			return {
 				current: 0,
-
 				navList: [{
-					id: 0,
-					name: '全部',
-					product_name: '全部',
-					icon: 'https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/task-all.png',
-					num: 0
-				}],
+						id: 0,
+						name: '全部',
+						product_name: '全部',
+						icon: 'https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/task-all.png',
+						num: 0
+					},
+					{
+						id: 2,
+						name: '住宅',
+						icon: 'https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/task-refund.png'
+					},
+					{
+						id: 1,
+						name: '公建',
+						icon: 'https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/task-loan.png'
+					},
+					{
+						id: 3,
+						name: '土地',
+						icon: 'https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/task-financial.png'
+					},
+					{
+						id: 4,
+						name: '工业用房',
+						icon: 'https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/task/task-else.png'
+					}
+				],
 				typeList: [{
 						id: 2,
 						name: '垫资还款',

pages.json

@@ -7,6 +7,12 @@
         "disableScroll": true
       }
     },
+	{
+	  "path": "pages/loan/loan",
+	  "style": {
+	    "navigationBarTitleText": ""
+	  }
+	},
     {
       "path": "pages/index/index",
       "style": {
@@ -49,12 +55,6 @@
         "navigationBarTitleText": ""
       }
     },
-    {
-      "path": "pages/loan/loan",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
     {
       "path": "pages/statistics/statistics",
       "style": {
@@ -255,30 +255,30 @@
   "condition": {
     "current": 0,
     "list": [
-      {
-        "name": "转换工具",
-        "path": "/page_subpack/transition/to_excel",
-        "query": "productId=1"
-      },
-      {
-        "name": "审核",
-        "path": "/pages/login/await-audit",
-        "query": "productId=1"
-      },
-      {
-        "name": "添加任务",
-        "path": "/page_task/information/information",
-        "query": "productId=1"
-      },
-      {
-        "name": "任务详情",
-        "path": "/page_task/task_details/task_details",
-        "query": "taskId=4290&isReturn=1"
-      },
-      {
-        "name": "文件识别",
-        "path": "page_subpack/transition/to_excel"
-      }
+      // {
+      //   "name": "转换工具",
+      //   "path": "/pages/loan/loan",
+      //   "query": ""
+      // },
+      // {
+      //   "name": "审核",
+      //   "path": "/pages/login/await-audit",
+      //   "query": "productId=1"
+      // },
+      // {
+      //   "name": "添加任务",
+      //   "path": "/page_task/information/information",
+      //   "query": "productId=1"
+      // },
+      // {
+      //   "name": "任务详情",
+      //   "path": "/page_task/task_details/task_details",
+      //   "query": "taskId=4290&isReturn=1"
+      // },
+      // {
+      //   "name": "文件识别",
+      //   "path": "page_subpack/transition/to_excel"
+      // }
     ]
   }
 }

pages/index/index.vue

@@ -8,24 +8,24 @@
 				:bar-style="{background:'#10B261'}" :inactive-style="{fontWeight:'bold',fontSize:'28rpx'}"
 				:current="current" :bar-animate-mode="'worm'" @change="tabsChange" />
 		</view> -->
-		
 		<view class="p-20">
 			<view class="personal m-lr10 row-justify-sb center">
 				<text class="sys-weight-600">精选系列</text>
-				<view class="row-justify-sb center">
+	<!-- 			<view class="row-justify-sb center">
 					<view class="personal_text">
 						<uni-datetime-picker type="date">
 							<view class="personal sys-background-fff size-24 sys-weight-600 p-lr30 r-40">{{indexTime}}
 							</view>
 						</uni-datetime-picker>
 					</view>
-				</view>
+				</view> -->
 			</view>
 		</view>
 		<view class="scroll-view-css flex-direction">
 			<TaskItem :type="5" :taskList="backlogList" @heartBut="heartBut"></TaskItem>
 		</view>
 		<Tab class="tabs_height" :tab-index="1"></Tab>
+		<popupModuleVue ref="popupModuleRef"></popupModuleVue>
 	</view>
 
 </template>
@@ -45,7 +45,7 @@
 	import {
 		date
 	} from "@/uni_modules/uv-ui-tools/libs/function/test";
-
+	import popupModuleVue from "./module/popup-module.vue"
 	export default {
 		components: {
 			TaskItem,
@@ -53,7 +53,8 @@
 			CircleChart,
 			IndexColumn,
 			IndexPersonal,
-			TaskImaTab
+			TaskImaTab,
+			popupModuleVue
 		},
 		data() {
 			return {
@@ -113,6 +114,9 @@
 		},
 		onReachBottom() {},
 		methods: {
+			setSearch() {
+				this.$refs.popupModuleRef.openPop()
+			},
 			heartBut(data) {
 				if (uni.getStorageSync('loanList')) {
 					this.loanList = uni.getStorageSync('loanList')

pages/index/module/popup-module.vue

@@ -0,0 +1,34 @@
+<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">
+	<!-- 			<view class="r-20" :class="colorType === 1?'':colorType === 2?'':''">
+					
+				</view> -->
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {},
+		props: {
+			colorType: {}
+		},
+		data() {
+			return {}
+		},
+		onLoad(data) {},
+		mounted() {},
+		methods: {
+			openPop() {
+				this.$refs.popup.open()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

pages/loan/components/clientType.vue

@@ -34,7 +34,7 @@
 		watch: {},
 
 		mounted() {
-			this.getClientType()
+			// this.getClientType()
 		},
 		methods: {
 			getClientType() {

pages/loan/loan.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="flex-common-css page-box task-bg">
-		<Nav title="" :back="false" :is_fixed="true" :justify="'left'" :color="'#fff'">
+		<Nav title=" " :back="false" :is_fixed="true" :justify="'left'" :color="'#fff'">
 			<view class="p-20">
 				<IndexPersonal ref="memberObj" @setMemberData="setMemberData"></IndexPersonal>
 				<IndexColumn ref="columnObj"></IndexColumn>
@@ -9,10 +9,10 @@
 		<!-- 			<EnScroll ref="scroll" :navHeight="100" is_tabHeight @onRefresh="onRefresh"
 				@onScrollBottom="onScrollBottom">
 			</EnScroll> -->
-		<view class="common-view-css flex-direction">
-			<LoanItem :task-list="list" @onCalculate="onCalculate"></LoanItem>
+		<view class="common-view-css common-view-box flex-direction" ref="commonView" id="commonView">
+			<LoanItem :task-list="list" @onCalculate="onCalculate" :commonHeight='commonHeight'></LoanItem>
 		</view>
-		<Tab :tab-index="0"></Tab>
+		<Tab class="tabView" :tab-index="0"></Tab>
 		<uni-popup ref="popup" type="bottom" @touchmove.stop.prevent="moveHandle">
 			<view class="page-env-160 sys-background-fff r-20">
 				<view class="row-justify-sb center p-lr30 p-t30">
@@ -105,7 +105,8 @@
 					id: 0,
 					new_rate: '',
 					client_id: '',
-				}
+				},
+				commonHeight: ''
 			}
 		},
 		watch: {},
@@ -113,8 +114,25 @@
 			this.getList()
 		},
 		onLoad() {},
-		mounted() {},
+		mounted() {
+			this.commonViewHeight()
+		},
 		methods: {
+			commonViewHeight() {
+				this.$nextTick(() => {
+					let tabView = ''
+					uni.createSelectorQuery().select('.tabView').boundingClientRect(data => {
+						// this.commonHeight = data.height;
+						tabView = data.height
+					}).exec()
+					uni.createSelectorQuery().select('.common-view-box').boundingClientRect(data => {
+						console.log(data.height,tabView,'1111111');
+						this.commonHeight = data.height - tabView;
+						console.log(this.commonHeight,'1111111');
+					}).exec()
+					
+				});
+			},
 			// setMemberData(memberData) {
 			// 	this.memberData = memberData
 			// 	this.$refs.columnObj.updateMemberData()