前端gjy

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	// baseUrlNew: 'http://192.168.1.122:9100/',
-	baseUrlNew: 'http://api.eliangeyun.com/',
+	baseUrlNew: 'http://192.168.1.110:8090/',
+	// baseUrlNew: 'http://api.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

manifest.json

@@ -150,7 +150,7 @@
                 }
             }
         },
-        "nvueCompiler" : "weex",
+        "nvueCompiler" : "uni-app",
         "modules" : {
             "SQLite" : {},
             "Push" : {},

pages.json

@@ -107,6 +107,13 @@
 				"navigationBarTitleText": "搜索"
 			}
 		},
+		{
+			"path": "pages/grain_pulse/my_grain_pulse",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "我的粮脉"
+			}
+		},
 		{
 			"path": "pages/sale/portprice",
 			"style": {
@@ -533,14 +540,14 @@
 				"app-plus": {  
 				                "subNVues":[{  
 				                    "id": "popup", 
-				                    "path": "pages/grain_pulse/distribution/popup",
+				                    "path": "pages/grain_pulse/distribution/subNvue/popup.nvue",
 				                    "type": "popup",
 				                    "style": {  
 				                        "position": "absolute",  
 				                        "dock": "bottom",  
 				                        "width": "100upx",  
 				                        "height": "150upx",  
-				                        "background": "transparent"  
+				                        "background": "red"  
 				                    }  
 				                }]  
 				            } 

pages/grain_pulse/home.vue

@@ -34,15 +34,10 @@
 					</view>
 				</view>
 			</view>
-			<view class='list-type'>
-				<view :class='status==0?"Semibold active":"Regular"' class="typeitem">全部</view>
-				<view :class='status==0?"Semibold active":"Regular"' class="typeitem">粮库</view>
-				<view :class='status==0?"Semibold active":"Regular"' class="typeitem">加工厂</view>
-				<view :class='status==0?"Semibold active":"Regular"' class="typeitem">烘干塔</view>
-				<view :class='status==0?"Semibold active":"Regular"' class="typeitem">饲料厂</view>
-				<view :class='status==0?"Semibold active":"Regular"' class="typeitem">饲料厂</view>
-			</view>
-			<view @click='todetails' class="listitem">
+			<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>
+			</scroll-view>
+			<view @click='todetails' v-for='item in datalist' class="listitem">
 				<view class="flex">
 					<image class='listitem-left' src="../../static/img/authentication/bankup(2).png" mode=""></image>
 					<view class="listitem-right">
@@ -74,9 +69,26 @@
         },
 		data() {
 			return {
-				status:0
+				status:0,
+				mainBusinessType:'全部',
+				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'}
+				],
+				datalist:[]
 			}
 		},
+		onShow(){
+			this.$api.doRequest('get','/settledCompanyInfo/selectSettledCompanyInfo',{mainBusinessType:this.mainBusinessType,pageSize: this.pageSize,
+						currentPage: this.currentPage,pcFlag:2}).then(res => {
+				if(res.data.code==200){
+					this.datalist=res.data.data.records
+				}
+			})
+		},
 		onLoad(){
 			
 		},
@@ -187,10 +199,11 @@
 	/* 《--类型 */
 	.list-type{
 		background: linear-gradient(180deg, #F5F6FA 0%, #FFFFFF 100%);
-		width:100%;
+		width:100vw;
 		padding-top:5px;
 		height:49px;
 		overflow-x: scroll;
+		white-space: nowrap;
 	}
 	.typeitem{
 		margin:10px;
@@ -250,6 +263,7 @@
 	.enter{
 		position:fixed;
 		right:0;
+		top:80%;
 		width:56.5px;height:28px;
 	}
 	.enter-content{

pages/grain_pulse/my_grain_pulse.vue

@@ -0,0 +1,230 @@
+<template>
+	<view>
+		<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 class="flex" v-if='mainBusinessType=="我的企业"'>
+				<image class='listitem-left' src="../../static/img/authentication/bankup(2).png" mode=""></image>
+				<view class="listitem-right">
+					<view class="flex justify-between">
+						<view class="companyname Medium">中天昊元粮库</view>
+						<view 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>
+						辽宁省营口市鲅鱼圈区xx路108号
+					</view>
+					<view>
+						<view class="button Regular">隐藏</view>
+						<view class="button Regular">编辑</view>
+						<view class="button Regular">删除</view>
+					</view>
+				</view>
+			</view>
+			<view v-else>
+				<view class="flex">
+					<image class='listitem-left' src="../../static/img/authentication/bankup(2).png" mode=""></image>
+					<view class="listitem-right">
+						<view class="flex justify-between">
+							<view class="companyname Medium">中天昊元粮库中天昊元粮库</view>
+							<image style='width:12px;height:12px;' :src="status1?'../../static/img/liangmai/my_shoucang1.png':'../../static/img/liangmai/my_shoucang.png'" mode=""></image>
+						</view>
+						<view class='Regular introduce'>我是企业介绍我是企业介绍我是企业介绍我是</view>
+					</view>
+				</view>
+				<view class="flex  align-item-center justify-between">
+					<view class='companylocation flex align-item-center Regular'>
+						<image class='location' src="../../static/img/liangmai/icon_ditu.png" mode=""></image>
+						辽宁省营口市鲅鱼圈区xx路108号
+					</view>
+					<view class='distance Regular'>50m</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+        components: {
+            
+        },
+		data() {
+			return {
+				status:0,
+				mainBusinessType:'我的企业',
+				pageSize: 10,
+				currentPage: 1,
+				datalist:[],
+				status1:true,
+				searchTypes:[
+				{name:'我的企业',value:'1'},{name:'我的收藏',value:'1'}
+				],
+			}
+		},
+		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
+			// 	}
+			// })
+		},
+		onLoad(){
+			
+		},
+		methods: {
+			friendcircle(){
+				uni.navigateTo({
+					url:'/pages/grain_pulse/friendcircle'
+				})
+			},
+			todetails(){
+				uni.navigateTo({
+					url:'/pages/grain_pulse/details'
+				})
+			},
+			naviageToPage(item){
+				uni.navigateTo({
+					url:item
+				})
+			},
+			changetype(item){
+				
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	/* 《--头部 */
+	.header{
+		padding:0 12.5px;
+		background:#fff;
+		border-radius:0 0 10px 10px;
+	}
+	/* 头部--》 */
+	/* 《--定位 */
+	.location{
+		width:15.5px;height:17.5px;margin-right:2.5px;
+	}
+	.locationwrap{
+		font-size:16px;
+	}
+	/* 定位 --》 */
+	/* 《--分布 */
+	.map{
+		padding:8.5px 0;
+	}
+	.cangku{
+		width:16.5px;height:16.5px;margin-right:5px;
+	}
+	.distribution{
+		background:#F5F6FA;
+		width: 71.5px;
+		height:32px;
+		border-radius:15px;
+		font-size:12px;
+	}
+	/* 分布--》 */
+	/* 《--搜索 */
+	.cu-bar .search-form{
+		background:#F5F6F9;
+		margin:0;
+		margin-bottom:18px;
+		padding:10px 18px;
+	}
+	.icon-scarch{
+		width:15px;
+		height:15px;
+		margin-right:5px;
+	}
+	/* 搜索--》 */
+	/* 《--内容 */
+	.content{
+		margin-top:13px;
+	}
+	/* 内容--》 */
+	/* 《--类型 */
+	.list-type{
+		background: #fff;
+		width:100vw;
+		padding-top:5px;
+		height:49px;
+		overflow-x: scroll;
+		white-space: nowrap;
+	}
+	.typeitem{
+		margin:10px;
+		position:relative;
+		display:inline-block;
+		padding-bottom:10px;
+		font-size:17px;
+	}
+	.typeitem.active:after{
+		content:'';
+		display:block;
+		position:absolute;
+		height:3px;
+		bottom:0;
+		background:#22C572;
+		width:18px;
+		left:50%;
+		transform: translateX(-50%);
+	}
+	/* 类型--》 */
+	/* 《--数据 */
+	.listitem{
+		background:#fff;
+		margin:10px;
+		padding:15px 19px;
+		border-radius:10px;
+	}
+	.listitem-left{
+		width:98.5px;
+		height:96.5px;
+		margin-right:8px;
+		border-radius:5px;
+	}
+	.companyname{
+		font-size:14px;
+		color:#333;
+	}
+	.introduce{
+		font-size:12px;
+		color:#676E80;
+	}
+	.companylocation{
+		color:#676E80;
+		font-size:12px;
+		margin-top:8px;
+		padding:4px 9px;
+	}
+	.distance{
+		color:#AFB3BF;
+		padding:4px;
+		margin-top:8px;
+	}
+	/* 数据--》 */
+	.button{
+		display:inline-block;
+		border:1px solid #CDCDCD;
+		padding:6px 15px;
+		border-radius:15px;
+		margin:5px 5px;
+	}
+	.listitemStatus{
+		margin-left:2px;
+	}
+	.listitemStatus.audit{
+		color:#FE6430;
+	}
+	.listitemStatus.notPass{
+		color:#FB1E1E;
+	}
+	.listitemStatus.pass{
+		color:#22C572;
+	}
+</style>
+

pages/user/user.vue

@@ -104,6 +104,15 @@
 					},
 					{
 						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',
@@ -112,7 +121,7 @@
 						show: true
 					},
 					{
-						num: 2,
+						num: 3,
 						name: '我的任务',
 						// icon: 'cuIcon-copy',
 						src:'../../static/img/sign/myTask@2x.png',
@@ -121,7 +130,7 @@
 						show: true
 					},
 					{
-						num: 3,
+						num: 4,
 						name: '我的发布',
 						// icon: 'cuIcon-news',
 						src:'../../static/img/sign/myRelease@2x.png',
@@ -130,7 +139,7 @@
 						show: true
 					},
 					{
-						num: 4,
+						num: 5,
 						name: '货运收发',
 						// icon: 'cuIcon-copy',
 						src:'../../static/img/sign/receiveGoods@2x.png',