Browse Source

前端gjy

gjy 3 năm trước cách đây
mục cha
commit
a4e09d3023

+ 32 - 10
pages/grain_pulse/details.vue

@@ -20,13 +20,13 @@
 		</view>
 		<view class='company'>
 			<view style='padding:21px;'>
-				<view style='font-size:24px;' class='Medium'>中天昊元粮库中天昊元粮库</view>
+				<view style='font-size:24px;' class='Medium'>{{companylist.compName}}</view>
 				<view style='margin-top:3px;' class='flex'>
 					<view class='aptitude'>
 						<image class='aptitudeImage' :src="aptiutudeStatus?'../../static/img/liangmai/bg_no_check.png':'../../static/img/liangmai/bg_check.png'" mode=""></image>
 						<text class='aptitudeText Medium'>资质</text>
 					</view>
-					<view class='Regular' style='font-size:13px;'>主营:<text>烘干塔 粮库 加工厂</text></view>
+					<view class='Regular' style='font-size:13px;'>主营:<text v-for='item in mainBusiness'> {{item}} </text></view>
 				</view>
 				<view style='margin:12.5px 0;' class='flex'>
 					<view class="tag Regular">
@@ -45,8 +45,8 @@
 			<view class="generalSituation">
 				<view class="title Medium">企业概况</view>
 				<view class="content Regular">
-					黑龙江中天昊元贸易有限公司成立至今,从仅2名员工的人资力量以及从俭的办公条件,现以发展转型为员工70余人,年贸易周转量150余万吨的规模性粮食贸易公司…
-				</view>
+					{{companylist.companyContant}}
+					</view>
 			</view>
 			<view class='contactWay'>
 				<view class="title Medium">联系方式</view>
@@ -54,27 +54,27 @@
 					<view class='flex linkman'>
 						<view style='flex:1;' class='title Regular'>联系人</view>
 						<view style='flex:3;'>
-							<view class='Regular linkmanItem' v-for='item in linkmanList'>
-								{{item.name}} <a :href="item.phone"><image class="phone" src="../../static/img/liangmai/dianhau.png" mode=""></image></a>
+							<view class='Regular linkmanItem' v-for='item in companylist.settledCompanyContacts'>
+								{{item.contacts}} <a :href="item.contactsPhone"><image class="phone" src="../../static/img/liangmai/dianhau.png" mode=""></image></a>
 							</view>
 						</view>
 					</view>
 					<view class="flex mailbox">
 						<view style='flex:1;' class='title Regular'>邮箱</view>
 						<view class='Regular' style='font-size:14px;flex:3;'>
-							12345678@xx.com
+							{{companylist.email}}
 						</view>
 					</view>
 					<view class="flex fax">
 						<view style='flex:1;' class='title Regular'>传真</view>
 						<view class='Regular' style='font-size:14px;flex:3;'>
-							12345678@xx.com
+							{{companylist.fax}}
 						</view>
 					</view>
 					<view class="flex fax">
 						<view style='flex:1;' class='title Regular'>地址</view>
 						<view style='font-size:14px;flex:3;' class='Regular'>
-							12345678@xx.com
+							{{companylist.province}}{{companylist.city}}{{companylist.area}}{{companylist.detailedAddress}}
 						</view>
 					</view>
 				</view>
@@ -103,15 +103,37 @@
 					{name:'廖经理',phone:'18513069273'},
 					{name:'廖经理',phone:'18513069273'},
 				],
+				id:0,
 				dotStyle: false,
 				status: 0,
+				companylist:{
+					settledCompanyContacts:[]
+				},
 				show:false,
+				mainBusiness:[],
+				label:[],
 				selector:['纠错','举报'],
 				aptiutudeStatus:false,
 				iscollect:false
 			}
 		},
-		onLoad(){
+		
+		onLoad(options){
+			this.id=options.id
+		},
+		onShow(){
+			var that=this
+			this.$nextTick(function(){
+				that.$api.doRequest('get','/settledCompanyInfo/getSettledCompanyInfo',{id:that.id,pcFlag:2}).then(res => {
+				if(res.data.code==200){
+					that.companylist=res.data.data
+					that.mainBusiness=res.data.data.mainBusinessType.split(',')
+					if(res.data.data.label){
+						that.label=res.data.data.label.split(',')
+					}
+				}
+			})
+			})
 			
 		},
 		methods: {

+ 57 - 32
pages/grain_pulse/enter.vue

@@ -9,32 +9,32 @@
 		<u-form class="forList">
 			<view class="modular">
 				<u-form-item label="公司名称" label-width="30%" class="title Regular">
-					<u-input v-model="deptList.name" input-align="right" class="write Medium" placeholder="请输入公司名称" />
+					<u-input v-model="deptList.compName" input-align="right" class="write Medium" placeholder="请输入公司名称" />
 				</u-form-item>
 				<view>
 					<view class="title Regular" style="margin-top: 15rpx;">主要类型(可多选,必须为真实经营类型)</view>
 					<view v-for="(item,index) in management" class="choice">
 						<!-- 	<u-tag :type="types[index] == null ? 'info' : types[index]" :text="item" show="show"
 							@click="singleClick(index)"></u-tag> -->
-						<view :class="anNiuCss[index] == null ? 'types' : anNiuCss[index]" @click="singleClick(index)">
-							{{item}}
+						<view :class="!item.checked ? '' : 'types1'" class='types' @click="singleClick(item)">
+							{{item.name}}
 						</view>
 					</view>
 				</view>
 			</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"
+					<u-input v-model="deptList.title" input-align="right" class="write Regular"
 						placeholder="用于封面展示,2-16个字" />
 				</u-form-item>
 				<u-form-item label="公司简介" label-width="30%" class="title Regular">
-					<u-input v-model="deptList.name" input-align="right" class="write Regular" type="textarea"
+					<u-input v-model="deptList.companyProfile" input-align="right" class="write Regular" type="textarea"
 						placeholder="请输入企业简介,如经营项目、产品类型、企业规模等,10-60个字" />
 				</u-form-item>
 			</view>
 			<view class="modular">
 				<u-form-item label="上传坐标" label-width="30%" class="title Regular">
-					<text @click="upload"
+					<text
 						class="con-list Regular">{{deptList.buyer == null ? "未上传":deptList.buyer}}<text
 							class='tip_text cuIcon-right'></text></text>
 				</u-form-item>
@@ -43,20 +43,20 @@
 						placeholder="自动获取" />
 				</u-form-item>
 				<u-form-item label="详细地址" label-width="30%" class="title Regular">
-					<u-input v-model="deptList.name" input-align="right" class="write Regular"
+					<u-input v-model="deptList.detailedAddress" input-align="right" class="write Regular"
 						placeholder="如街道和门牌号,2-12个字" maxlength="12" />
 				</u-form-item>
 				<view>
 					<view class="title Regular" style="margin-top: 15rpx;">上传图片</view>
-					<view v-if="license1 != ''">
+		<view v-if="license1 != ''">
 						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
 							:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError"
 							@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
 							:options="uploadOptions" :custom="uploadCustom" @on-progress="onProgress"></upload>
 					</view>
-					<view v-if="license2 != ''">
+								<view v-if="license2 != ''">
 						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-							:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError"
+							:size-type="['compressed']" @on-success="getImgUrl1" @on-error="onError"
 							@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
 							:options="uploadOptions1" :custom="uploadCustom" @on-progress="onProgress"></upload>
 					</view>
@@ -103,9 +103,18 @@
 					"text": "上传营业执照",
 					"bgc": ""
 				},
+				mainBusinessType:[],
 				uploadCustom: true,
 				deptList: {},
-				management: ["粮库", "加工厂", "烘干厂", "饲料厂", "养殖场", "粮贸", "期货"],
+				management: [
+					{name:"粮库",checked:false},
+					{name:"加工厂",checked:false},
+					{name:"烘干厂",checked:false},
+					{name:"饲料厂",checked:false},
+					{name:"养殖场",checked:false},
+					{name:"粮贸",checked:false},
+					{name:"期货",checked:false},
+					 ],
 				types: [],
 				show: false,
 				// anNiuCss:"types",
@@ -116,16 +125,18 @@
 			}
 		},
 		methods: {
-			singleClick(index) {
-				for (let i = 0; i < this.management.length; i++) {
-					this.anNiuCss[i] = "types"
-				}
-				if (this.anNiuCss[index] == null) {
-					this.anNiuCss[index] = "types1"
-				} else if (this.anNiuCss[index] == "types") {
-					this.anNiuCss[index] = "types1"
-				} else if (this.anNiuCss[index] == "types1") {
-					this.anNiuCss[index] = "types"
+			getImgUrl(res){
+				console.log(res)
+				this.deptList.attachmentAddress=res
+			},
+			getImgUrl1(res){
+				console.log(res)
+				this.deptList.licenseAddress=res
+			},
+			singleClick(item) {
+				if(this.mainBusinessType.indexOf(item)==-1){
+					this.mainBusinessType.push(item.name)
+					item.checked=true
 				}
 			},
 			filterFileType(index, lists) {
@@ -141,7 +152,11 @@
 				}
 			},
 			navBack() {
-				uni.navigateBack(1)
+				this.$api.doRequest('post','/settledCompanyInfo/api/addSettledCompanyInfo',this.deptList).then(res => {
+					if(res.data.code==200){
+						uni.navigateBack(1)
+					}
+				})
 			},
 			upload() {
 				uni.navigateTo({
@@ -154,26 +169,36 @@
 				})
 			},
 			submit() {
+				var that = this
 				// if (!this.deptList.title) {
 				// 	this.$api.msg('标题不能为空')
 				// 	return
 				// }
-				this.show = true
-				return
+				// this.show = true
+				// return
+				this.deptList.mainBusinessType=this.mainBusinessType.toString()
+				this.deptList.longitude='40.22077'
+				this.deptList.latitude='116.23128'
 				uni.showModal({
 					content: "确定提交企业信息??",
 					showCancel: true,
 					confirmText: '确定',
 					success: function(res) {
 						if (res.confirm) {
-							//成功后
-							if (res.data.code == 200) {
-								uni.showToast({
-									title: '提交成功',
-									icon: 'none',
-									duration: 2000
-								})
-							}
+							this.show = true
+							// that.$api.doRequest('post','/settledCompanyInfo/api/addSettledCompanyInfo',that.deptList).then(res => {
+							// 	if(res.data.code==200){
+									
+							// 	}
+							// })
+							// //成功后
+							// if (res.data.code == 200) {
+							// 	uni.showToast({
+							// 		title: '提交成功',
+							// 		icon: 'none',
+							// 		duration: 2000
+							// 	})
+							// }
 						}
 					},
 				})

+ 21 - 12
pages/grain_pulse/home.vue

@@ -35,14 +35,14 @@
 				</view>
 			</view>
 			<scroll-view  scroll-x="true" scroll-with-animation="true" class='list-type'>
-				<view  v-for='item in searchTypes' :class='mainBusinessType==item.name?"Semibold active":"Regular"' class="typeitem">{{item.name}}</view>
+				<view  v-for='item in searchTypes' @click='mainBusinessTypecahnge(item)' :class='mainBusinessTypeKey==item.value?"Semibold active":"Regular"' class="typeitem">{{item.name}}</view>
 			</scroll-view>
-			<view @click='todetails' v-for='item in datalist' class="listitem">
+			<view v-for='item in datalist' @click='todetails(item)' class="listitem">
 				<view class="flex">
-					<image class='listitem-left' src="../../static/img/authentication/bankup(2).png" mode=""></image>
+					<image class='listitem-left' :src="item.attachmentAddress" mode=""></image>
 					<view class="listitem-right">
-						<view class="companyname Medium">中天昊元粮库中天昊元粮库</view>
-						<view class='Regular introduce'>我是企业介绍我是企业介绍我是企业介绍我是</view>
+						<view class="companyname Medium">{{item.compName}}</view>
+						<view class='Regular introduce'>{{item.companyProfile}}</view>
 					</view>
 				</view>
 				<view class="flex  align-item-center justify-between">
@@ -54,7 +54,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="enter" @click="enter">
+		<view v-if='datalist.length==0' class="enter" @click="enter">
 			<image style='width:56.5px;height:28px;' src="../../static/img/liangmai/ruzhu.png" mode=""></image>
 			<view class='enter-content'>入驻</view>
 		</view>
@@ -70,13 +70,14 @@
 		data() {
 			return {
 				status:0,
-				mainBusinessType:'全部',
+				mainBusinessType:'',
+				mainBusinessTypeKey:'0',
 				pageSize: 10,
 				currentPage: 1,
 				searchTypes:[
-				{name:'全部',value:'1'},{name:'粮库',value:'1'},{name:'加工厂',value:'1'},
-				{name:'烘干塔',value:'1'},{name:'饲料厂',value:'1'},{name:'养殖场',value:'1'},
-				{name:'粮贸',value:'1'},{name:'期货',value:'1'}
+				{name:'全部',value:'0'},{name:'粮库',value:'1'},{name:'加工厂',value:'2'},
+				{name:'烘干塔',value:'3'},{name:'饲料厂',value:'4'},{name:'养殖场',value:'5'},
+				{name:'粮贸',value:'6'},{name:'期货',value:'7'}
 				],
 				datalist:[]
 			}
@@ -93,6 +94,14 @@
 			
 		},
 		methods: {
+			mainBusinessTypecahnge(item){
+				if(item.name!='全部'){
+					this.mainBusinessType=item.name
+				}else{
+					this.mainBusinessType=''
+				}
+				this.mainBusinessTypeKey=item.value
+			},
 			enter(){
 				//入驻
 				uni.navigateTo({
@@ -104,9 +113,9 @@
 					url:'/pages/grain_pulse/friendcircle'
 				})
 			},
-			todetails(){
+			todetails(item){
 				uni.navigateTo({
-					url:'/pages/grain_pulse/details'
+					url:'/pages/grain_pulse/details?id='+item.id
 				})
 			},
 			naviageToPage(item){

+ 31 - 11
pages/grain_pulse/my_grain_pulse.vue

@@ -3,13 +3,13 @@
 		<scroll-view  scroll-x="true" scroll-with-animation="true" class='list-type'>
 			<view  v-for='item in searchTypes' @click='changetype(item)' :class='mainBusinessType==item.name?"Semibold active":"Regular"' class="typeitem">{{item.name}}</view>
 		</scroll-view>
-		<view class="listitem">
+		<view v-for='item in datalist' class="listitem">
 			<view class="flex" v-if='mainBusinessType=="我的企业"'>
-				<image class='listitem-left' src="../../static/img/authentication/bankup(2).png" mode=""></image>
+				<image class='listitem-left' :src="item.attachmentAddress" mode=""></image>
 				<view class="listitem-right">
 					<view class="flex justify-between">
-						<view class="companyname Medium">中天昊元粮库</view>
-						<view class='listitemStatus audit Regular'>审核中</view>
+						<view class="companyname Medium">{{item.compName}}</view>
+						<view v-if='item.status=="待审核"' class='listitemStatus audit Regular'>审核中</view>
 					</view>
 					<view class='companylocation flex align-item-center Regular'>
 						<image class='location' src="../../static/img/liangmai/icon_ditu.png" mode=""></image>
@@ -46,6 +46,9 @@
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	export default {
         components: {
             
@@ -64,17 +67,33 @@
 			}
 		},
 		onShow(){
-			// this.$api.doRequest('get','/settledCompanyInfo/selectSettledCompanyInfo',{mainBusinessType:'全部',pageSize: this.pageSize,
-			// 			currentPage: this.currentPage,pcFlag:2}).then(res => {
-			// 	if(res.data.code==200){
-			// 		this.datalist=res.data.data.records
-			// 	}
-			// })
+			this.getList()
+			
 		},
 		onLoad(){
 			
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
 		},
 		methods: {
+			getList(){
+				if(this.mainBusinessType=='我的企业'){
+					this.$api.doRequest('get','/settledCompanyInfo/selectSettledCompanyInfo',{mainBusinessType:'',pageSize: this.pageSize,
+							currentPage: this.currentPage,pcFlag:2}).then(res => {
+					if(res.data.code==200){
+						this.datalist=res.data.data.records
+					}
+				})
+				}else{
+					this.$api.doRequest('get','/settledCompanyInfo/myCollection',{commonId:this.userInfo.id,phone:this.userInfo.phone,pageSize:this.pageSize,
+							currentPage: this.currentPage,pcFlag:2}).then(res => {
+					if(res.data.code==200){
+						this.datalist=res.data.data.records
+					}
+					})
+				}
+			},
 			friendcircle(){
 				uni.navigateTo({
 					url:'/pages/grain_pulse/friendcircle'
@@ -91,7 +110,8 @@
 				})
 			},
 			changetype(item){
-				
+				this.mainBusinessType=item.name
+				this.getList()
 			}
 		}
 	}