gjy před 3 roky
rodič
revize
44c453b83a

+ 16 - 8
pages/grain_pulse/enter.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="center">
+		<image class='bg' src='../../static/img/liangmai/bg@3x.png'></image>
 		<!-- 	<view class=""> -->
 		<view class="back-btn cuIcon-back" @click="navBack"></view>
 		<!-- <view class='title1'>入驻</view> -->
@@ -117,7 +118,7 @@
 						checked: false
 					},
 					{
-						name: "烘干",
+						name: "烘干",
 						checked: false
 					},
 					{
@@ -197,6 +198,7 @@
 				})
 			},
 			perfect() {
+				this.show=false
 				uni.navigateTo({
 					url: `/pages/grain_pulse/perfect?deptList=`+JSON.stringify(this.deptList)
 				})
@@ -247,11 +249,14 @@
 		width: 100vw;
 		height: 100vh;
 		overflow: scroll;
-		background: url(../../static/img/liangmai/bg@3x.png);
-		background-size: 100%;
-		background-repeat: no-repeat;
+		position:relative;z-index:2;
+	}
+	.bg{
+		position:absolute;
+		width:100%;
+		left: 0;
+		top:0;
 	}
-
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -350,12 +355,13 @@
 
 	.modular {
 		background-color: #FFFFFF;
-		border-radius: 20px;
-		margin-top: 20px;
+		border-radius: 10px;
+		margin-top: 10px;
+		position:relative;z-index:2;
 	}
 
 	.forList {
-		margin-top: 40px;
+		margin-top: 20px;
 	}
 
 	.titleUp {
@@ -363,6 +369,8 @@
 		font-size: 44rpx;
 		margin-top: 80px;
 		margin-left: 10px;
+		position: relative;
+		z-index:2;
 	}
 
 	.upload {

+ 24 - 18
pages/grain_pulse/perfect.vue

@@ -3,14 +3,14 @@
 		<u-form>
 			<view class="modular">
 				<u-form-item label="公司名称" label-width="30%" class="title Medium" :border-bottom="topBorder">
-					<u-input v-model="deptList.name" input-align="right" class="write Regular" placeholder="请输入公司名称" />
+					<view style='width:100%;text-align:right;margin-right:10px;'>{{deptList.compName}}</view>
 				</u-form-item>
 			</view>
 			<view class="modular">
 				<view class="title Medium">企业概况</view>
 				<!-- <u-input v-model="value" :type="type"  :height="height" :auto-height="autoHeight" placeholder="请输入企业概况,如经营项目、产品类型、企业规模等,不超过300个字" /> -->
 				<textarea value="" placeholder="请输入企业概况,如经营项目、产品类型、企业规模等,不超过300个字" class="areaText Regular"
-					v-model="deptList.a" placeholder-style="color:#AFB3BF"/>
+					v-model="deptList.companyContant" placeholder-style="color:#AFB3BF"/>
 				<view class="title Regular">添加标签(标签应突出企业特色,最多6个)</view>
 				<view class="flex" style="width: 100%;">
 					<view class="forLists" v-for="(item,index) in label" :Key="index">
@@ -26,26 +26,26 @@
 					<u-button :type="types" class="inputOk" shape="circle" @click="addinput">确定</u-button>
 				</view>
 			</view>
-			<view class="modular">
+			<view style='padding-bottom:10px;' class="modular">
 				<view class="title Regular">场地照片(图片清晰,最多9张)</view>
 				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="9"
 					:size-type="['compressed']" :options="uploadOptions" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
 					@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
 			</view>
-			<view class="modular">
+			<view  style='padding-bottom:10px;' class="modular">
 				<view class="title Medium">联系方式</view>
 				<view v-for="(item,index) in Persons">
 					<view class="information flex">
 						<view class="xinxi">
 							<u-form-item label="姓名" label-width="30%" class="Regular" label-position="top"
 								style="font-size: 28rpx; color: #71747C;" :border-bottom="topBorder">
-								<u-input v-model="item.name" class="Regular" placeholder="请输入姓名" />
+								<u-input v-model="item.contacts" class="Regular" placeholder="请输入姓名" />
 							</u-form-item>
 						</view>
 						<view class="xinxi">
 							<u-form-item label="电话" label-width="30%" class="Regular" label-position="top"
 								style="font-size: 28rpx; color: #71747C;" :border-bottom="topBorder">
-								<u-input v-model="item.phone" class="Regular" placeholder="请输入电话" />
+								<u-input v-model="item.contactsPhone" class="Regular" placeholder="请输入电话" />
 							</u-form-item>
 						</view>
 						<div class="del" @click="delPerson(index)">
@@ -61,10 +61,10 @@
 			</view>
 			<view class="modular">
 				<u-form-item label="邮箱" label-width="30%" class="title Regular">
-					<u-input v-model="deptList.name" input-align="right" class="write Regular" placeholder="请输入电子邮箱" />
+					<u-input v-model="deptList.email" input-align="right" class="write Regular" placeholder="请输入电子邮箱" />
 				</u-form-item>
 				<u-form-item label="传真" label-width="30%" class="title Regular" :border-bottom="topBorder">
-					<u-input v-model="deptList.name" input-align="right" class="write Regular" placeholder="请输入传真号" />
+					<u-input v-model="deptList.fax" input-align="right" class="write Regular" placeholder="请输入传真号" />
 				</u-form-item>
 			</view>
 		</u-form>
@@ -91,15 +91,13 @@
 				action: 'https://www.zthymaoyi.com/upload/admin',
 				fileList: [],
 				imgList: [],
-				Persons: [{
-					name: "张良",
-					phone: "1365411111"
-				}],
+				Persons: [],
 				topBorder: false,
 			}
 		},
 		onLoad(options) {
-			console.log(options)
+			this.deptList=JSON.parse(options.deptList)
+			console.log(this.deptList)
 		},
 		methods: {
 			add() {
@@ -109,6 +107,10 @@
 					this.inputShow = true
 				}
 			},
+			getImgUrl(res) {
+				console.log(res)
+				this.imgList.push(res);
+			},
 			addinput() {
 				if (!this.value) {
 					this.$api.msg('标签内容不能为空')
@@ -141,13 +143,21 @@
 				this.imgList.push(e.url)
 			},
 			submit() {
+				var that=this
+				this.deptList.label=this.label.toString()
+				this.deptList.sitePhotoAddress=this.imgList.toString()
+				this.deptList.settledCompanyContacts=this.Persons
 				uni.showModal({
 					content: "详细的企业信息有助于客户了解您的企业,是否确定提交?",
 					showCancel: true,
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-
+							that.$api.doRequest('post', '/settledCompanyInfo/api/addSettledCompanyInfo', that.deptList).then(res => {
+								if (res.data.code == 200) {
+									uni.navigateBack(1)
+								}
+							})
 						}
 					}
 				})
@@ -234,7 +244,6 @@
 	}
 
 	.upload {
-		height: 250rpx;
 		text-align: center;
 		margin: 0px 0;
 		margin-bottom: 10px;
@@ -262,9 +271,6 @@
 
 	.xinxi {
 		margin-left: 70rpx;
-		.u-input input{
-			font-size:17px;
-		}
 	}
 
 	.del {

+ 0 - 1
pages/task/my_task.vue

@@ -185,7 +185,6 @@
 							that.isSole=false
 						}
 						uni.hideLoading()
-						this.taskInfo = res.data.data.records
 					} else {
 						uni.showToast({
 							title: res.data.message,

+ 10 - 10
pages/user/user.vue

@@ -104,15 +104,6 @@
 					},
 					{
 						num: 1,
-						name: '我的粮脉',
-						// icon: 'cuIcon-apps',
-						src:'../../static/img/sign/authentication@2x.png',
-						tips: 0,
-						url: '/pages/grain_pulse/my_grain_pulse',
-						show: true
-					},
-					{
-						num: 2,
 						name: '我的合同',
 						// icon: 'cuIcon-calendar',
 						src:'../../static/img/sign/myContract@2x.png',
@@ -121,7 +112,7 @@
 						show: true
 					},
 					{
-						num: 3,
+						num: 2,
 						name: '我的任务',
 						// icon: 'cuIcon-copy',
 						src:'../../static/img/sign/myTask@2x.png',
@@ -129,6 +120,15 @@
 						url: '/pages/task/my_task',
 						show: true
 					},
+					{
+						num: 3,
+						name: '我的粮脉',
+						// icon: 'cuIcon-apps',
+						src:'../../static/img/sign/authentication@2x.png',
+						tips: 0,
+						url: '/pages/grain_pulse/my_grain_pulse',
+						show: true
+					},
 					{
 						num: 4,
 						name: '我的发布',