no message

.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

components/en-utils/en-tab/en-tab.vue

@@ -49,23 +49,23 @@
 		data() {
 			return {
 				tabList: [{
-						name: '市场',
+						name: '首页',
 						path: '/pages/loan/loan',
 						iconPath: 'loan-default',
 						selectedIconPath: 'loan-select',
 					},
 					{
-						name: '我的',
+						name: '市场',
 						path: '/pages/index/index',
 						iconPath: 'home-default',
 						selectedIconPath: 'home-select',
 					},
-					// {
-					// 	name: '任务',
-					// 	path: '/pages/task/task',
-					// 	iconPath: 'task-default',
-					// 	selectedIconPath: 'task-select',
-					// },
+					{
+						name: '任务',
+						path: '/pages/task/task',
+						iconPath: 'task-default',
+						selectedIconPath: 'task-select',
+					},
 
 					// {
 					// 	name: '统计',
@@ -81,6 +81,7 @@
 		},
 		methods: {
 			setTab(path) {
+        console.log(path)
 				uni.switchTab({
 					url: path
 				})
@@ -152,4 +153,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/task/task.vue

@@ -1,174 +1,222 @@
 <template>
-	<view class="total-page page-box page-env-20 scroll_content task-bg">
-		<view>
-			<Search :placeholder="'客户姓名或电话'" @setSearch="setSearch"></Search>
-			<view style="height: 100rpx;">
-				<z-tabs ref="tabs" :list="tabsList" :active-style="{color:'#10B261',fontWeight:'bold',fontSize:'28rpx'}"
-					:bar-style="{background:'#10B261'}" :inactive-style="{fontWeight:'bold',fontSize:'28rpx'}"
-					:current="current" :bar-animate-mode="'worm'" @change="tabsChange" />
-			</view>
-		</view>
-		<task-ima-tab @setProductId="setProductId" :num-type="0"></task-ima-tab> 
-		<EnScroll ref="scroll" :navHeight="190" is_tabHeight @onRefresh="onRefresh" @onScrollBottom="onScrollBottom">
-			<view v-if="current===1">
-				<TaskItem :type="5" is_bottom :task-list="backlogList"></TaskItem>
-			</view>
-			<view v-else>
-				<TaskItem :type="1" is_bottom :task-list="taskList"></TaskItem>
-			</view>
-		</EnScroll>
-		<Tab :tab-index="1"></Tab>
-	</view>
+  <view class="total-page page-box task-bg">
+    <Nav title="法案查询" :genre="1" :toBack="true" is_fixed></Nav>
+    <view class="page-env-160">
+      <!-- 身份认证start -->
+      <view class="m-t20 m-lr30 text-color-12">
+
+        <view class="sys-background-fff r-20 p-lr30 p-t30">
+
+            <en-select v-model="propertyData.modelType" :local-data="typeOption" label="评估模型" placeholder="请选择评估模型"></en-select>
+            <en-input v-model="propertyData.address" label="评估地址" placeholder="请输入评估地址"></en-input>
+            <en-input v-model="propertyData.complexName" :label="'小区名称'" disabled="disabled" placeholder="请输入小区名称"> </en-input>
+            <en-input  :value="propertyData.lng+','+propertyData.lat"  disabled="disabled" label="评估坐标" placeholder="地址经纬度"></en-input>
+            <en-input v-model="propertyData.area" :label="'建筑面积'" placeholder="请输入建筑面积"> </en-input>
+            <en-select v-model="propertyData.district" :local-data="districtOption" :label="'所属区域'" placeholder="请选择所属区域"> </en-select>
+          </view>
+
+        </view>
+
+        <view class="sys-background-fff r-20 m-t20 p-lr30" v-if="propertyData.modelType===1">
+          <en-select v-model="propertyData.houseType" :local-data="houseTypeOption" label="房屋类型" placeholder="请选择房屋类型"></en-select>
+        </view>
+      <view class="sys-background-fff r-20 m-t20 p-lr30" v-if="propertyData.modelType===2">
+        <EnRadio v-model="propertyData.is_rent" label="是否出租" :list="statusOption"> </EnRadio>
+        <EnRadio v-model="propertyData.is_morgaged" label="是否抵押" :list="statusOption"> </EnRadio>
+        <EnRadio v-model="propertyData.is_occupied" label="是否占用" :list="statusOption"> </EnRadio>
+        <EnRadio v-model="propertyData.is_seizured" label="是否查封" :list="statusOption"> </EnRadio>
+      </view>
+      <view class="sys-background-fff r-20 m-t20 p-lr30" v-if="propertyData.modelType===3">
+        <en-select v-model="propertyData.level_id" :local-data="levelOption" :label="'土地等级'" placeholder="请选择土地等级"> </en-select>
+        <en-select v-model="propertyData.transfer_method" :local-data="transferMethodOption" :label="'出让方式'" placeholder="请选择出让方式"> </en-select>
+        <en-select v-model="propertyData.land_use" :local-data="landUseOption" :label="'土地用途'" placeholder="请选择土地用途"> </en-select>
+        <en-select v-model="propertyData.land_source" :local-data="landSourceOption" :label="'土地来源'" placeholder="请选择土地来源"> </en-select>
+        <en-input v-model="propertyData.age_limit" :label="'出让年限'" placeholder="请输入出让年限"> </en-input>
+        <en-input v-model="propertyData.investment" :label="'投资强度'" placeholder="请输入投资强度"> </en-input>
+        <en-input v-model="propertyData.plot_mix" :label="'最小容积'" placeholder="请输入最小容积率"> </en-input>
+        <en-input v-model="propertyData.plot_max" :label="'最大容积'" placeholder="请输入最大容积率"> </en-input>
+        <en-input v-model="propertyData.greening_mix" :label="'最小绿化'" placeholder="请输入最小绿化面积"> </en-input>
+        <en-input v-model="propertyData.greening_max" :label="'最大绿化'" placeholder="请输入最大绿化面积"> </en-input>
+        <en-input v-model="propertyData.height_mix" :label="'最小高度'" placeholder="请输入最小建筑高度"> </en-input>
+        <en-input v-model="propertyData.height_max" :label="'最大高度'" placeholder="请输入最大建筑高度"> </en-input>
+      </view>
+
+
+    </view>
+    <EnButton :text="'评估'" @onSubmit="onSubmit"></EnButton>
+    <uni-popup ref="consentObj">
+      <view class="iPhone-padding agreement-data sys-background-fff">
+
+      </view>
+
+    </uni-popup>
+  </view>
 </template>
+
 <script>
-	// 任务列表
-	import TaskItem from "@/common/task/task-item.vue";
-	import TaskImaTab from "@/common/task/task_ima_tab.vue";
-	import {
-		getDayBacklogList,
-		getTaskList
-	} from "@/api/task";
-
-	export default {
-		components: {
-			TaskImaTab,
-			TaskItem,
-		},
-		data() {
-			return {
-				tabHeight: uni.getStorageSync('tab_height'),
-				current: 0,
-				swiperCurrent: 0,
-				tabsList: [{
-					name: '全部',
-					dot_color: 'red',
-					disabled: false,
-					'id': 0,
-				}, {
-					name: '新进',
-					dot_color: 'yellow',
-					disabled: false,
-					'id': 6,
-				}, {
-					'id': 1,
-					name: '待办',
-					dot_color: '',
-					disabled: false
-				}, {
-					'id': 2,
-					name: '完成',
-					dot_color: '',
-					disabled: false
-				}, {
-					'id': 3,
-					name: '拒绝',
-					dot_color: '',
-					disabled: false
-				}],
-				selectStr: '',
-				startDate: '',
-				endDate: '',
-				phone: '',
-				name: '',
-				productId: 0,
-				stageId: [],
-				departmentId: [],
-				totalNum: 99999,
-				taskList: [],
-				page: 1,
-				isAjax: false,
-				backlogList: [],
-			}
-		},
-		onLoad() {},
-		mounted() {},
-		methods: {
-			setSearch(text) {
-				this.selectStr = text
-				this.startList()
-			},
-			setProductId(productId) {
-				console.log('productId:' + productId)
-				this.productId = productId
-				this.startList()
-			},
-			startList() {
-				if (this.current === 1) {
-					this.getDayBacklogList()
-				} else {
-					this.totalNum = 999;
-					this.taskList = [];
-					this.page = 1;
-					this.isAjax = false;
-					this.getTaskReceiving();
-				}
-
-			},
-			getDayBacklogList() {
-				if (this.isAjax || (this.totalNum <= this.backlogList.length)) {
-					return;
-				}
-				getDayBacklogList({
-					'selectStr': this.selectStr
-				}).then((res) => {
-					if (res.code === 1) {
-						this.backlogList = res.data.items
-						this.totalNum = res.data.totalNum
-					}
-				})
-			},
-			getTaskReceiving() {
-				if (this.isAjax || (this.totalNum <= this.taskList.length)) {
-					return;
-				}
-				this.isAjax = true;
-				getTaskList({
-					'status': this.tabsList[this.current].id,
-					'selectStr': this.selectStr,
-					'phone': this.phone,
-					'name': this.name,
-					'productId': this.productId,
-					'stageId': this.stageId,
-					'departmentId': this.departmentId,
-					'startDate': this.startDate,
-					'endDate': this.endDate,
-					'page': this.page,
-				}).then((res) => {
-					this.isAjax = false;
-					if (res.code === 1) {
-						this.totalNum = res.data.totalNum
-						this.taskList.push(...res.data.items)
-							++this.page;
-					}
-				})
-			},
-			tabsChange(index) {
-				if (index !== this.current) {
-					this.current = index;
-					this.startList()
-				}
-			},
-			// 下拉刷新
-			onRefresh() {
-				setTimeout(() => {
-					this.$refs.scroll.onEndPulling()
-				}, 200)
-				this.startList()
-			},
-			// 滚动到底部
-			onScrollBottom() {
-
-				if (this.current === 1) {
-					this.getDayBacklogList()
-				} else {
-					this.getTaskReceiving();
-				}
-
-			},
-
-		},
-	}
+
+import EnUpload from "@/components/en-from/en-upload/en-upload.vue";
+import EnSelect from "@/components/en-from/en-select/en-select.vue";
+import EnRadio from "@/components/en-from/en-radio/en-radio.vue";
+import EnInput from "@/components/en-from/en-input/en-input.vue";
+import AddIdentity from "@/page_task/identity_upload/add-identity.vue";
+
+
+export default {
+  components: {
+    AddIdentity,
+    EnInput,
+    EnSelect,
+    EnRadio,
+    EnUpload,
+  },
+  data() {
+    return {
+      typeOption:[{id:1,name:'住宅模型'},{id:2,name:'公建模型'},{id:3,name:'土地模型'},{id:4,name:'工业模型'}],
+      statusOption:[{id:1,name:'是'},{id:0,name:'否'}],
+      houseTypeOption:[],
+      levelOption:[],
+      transferMethodOption:[],
+      landUseOption:[],
+      landSourceOption:[],
+      districtOption:[{id:1,name:'甘井子区'},{id:2,name:'中山区'},{id:3,name:'西岗区'},{id:4,name:'沙河口区'},{id:5,name:'旅顺口区'},{id:6,name:'金州区'},{id:7,name:'瓦房店市'},{id:8,name:'庄河市'},{id:9,name:'普兰店区'}],
+      propertyData:{
+        level_id:1,
+        transfer_method:1,
+        land_use:1,
+        land_source:1,
+        investment:0,
+        plot_mix:0,
+        plot_max:0,
+        height_mix:0,
+        height_max:0,
+        greening_mix:0,
+        greening_max:0,
+        age_limit:0,
+        floor_area:0,
+        lat:0,
+        lng:0,
+        is_sold:0,
+        is_rent:0,
+        is_morgaged:0,
+        is_occupied:0,
+        is_seizured:0,
+        address:'',
+        modelType:'',
+        area:'',
+        district:'',
+        houseType:'',
+        complexName:'',
+      },
+      propertyRes:{
+        unit_price:'',
+        predict_msg:'',
+      }
+    };
+  },
+  onLoad(options) {
+
+  },
+  onShow() {
+
+  },
+  watch: {
+
+  },
+  mounted() {
+  },
+  methods: {
+    setOrderMoney() {
+
+    },
+    goToMoney() {
+      // uni.navigateTo({
+      //   url: '/page_subpack/recharge/index'
+      // });
+    },
+    async getMessage() {
+
+    },
+
+    setConsent() {
+
+    },
+    getMemberInfo() {
+
+    },
+    getModelOption() {
+
+    },
+    getVerifiedCode() {
+
+    },
+    onSubmit() {
+
+    }
+  },
+}
 </script>
+
 <style lang="scss" scoped>
+.input-item:last-child {
+  margin-top: 30rpx;
+}
+
+.input-send {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  border-bottom: 1px solid #E5E5E5;
+
+  .login-input {
+    width: calc(100% - 150rpx);
+  }
+
+  .login-send {
+    width: 100rpx;
+    text-align: center;
+    margin-left: 20rpx;
+    border: 1rpx solid #0FB160;
+    border-radius: 50rpx;
+  }
+}
+
+.left-w {
+  width: 210rpx;
+  min-width: 210rpx;
+  color: #333333;
+}
+
+.iconfont {
+  font-size: 36rpx;
+  color: #333333;
+}
+
+.class-c-6C6F93 {
+  color: #0FB160;
+}
+
+.agreement-data {
+  border-radius: 30rpx 30rpx 0 0;
+
+  .data-title {
+    width: 100%;
+    border-radius: 30rpx 30rpx 0 0;
+  }
+
+  .data-content {
+    padding: 20rpx 40rpx;
+
+    .content-box {
+      height: 600rpx;
+    }
+  }
 
-</style>
+  .data-but {
+    height: 96rpx;
+    line-height: 96rpx;
+    text-align: center;
+    margin: 0 75rpx;
+  }
+}
+</style>