一级市场商品列表

App.vue

@@ -36,6 +36,7 @@
 	page{
 		background-color: #e2e2e2;
 		font-family: '宋体';
+		padding: 10px;
 	}
 
 	// 点击时背景灰色

apis/api.js

@@ -14,9 +14,13 @@ export default {
 	getBanner(data) {
 		return ajax.get('/level-one-server/app/TbBanner/getList', data)
 	},
+	// 根据职务获取菜单
+	getRoleMenu(data) {
+		return ajax.get('/sp-admin/ReRoleMenu/getList', data)
+	},
 	// 首页菜单
 	getMenu(data) {
-		return ajax.get('/sp-admin/ReRoleMenu/getList', data)
+		return ajax.get('/sp-admin/AppMenu/getList', data)
 	},
 	//登录
 	doLogin(data) {
@@ -37,5 +41,13 @@ export default {
 	//获取最新资讯
 	getNewestList(data) {
 		return ajax.get('/level-one-server/app/TbPortNews/getNewestList', data)
-	}
+	},
+	//获取商品列表
+	getGoodsList(data) {
+		return ajax.get('/level-one-server/TbGoodsTransit/getTransitList', data)
+	},
+	//查看商品详情
+	getGoodsDetails(data) {
+		return ajax.get('/level-one-server/TbGoodsTransit/getById', data)
+	},
 }

pages.json

@@ -74,7 +74,43 @@
 			}
 
 		}
-	],
+	    ,{
+            "path" : "pages/enterprise/enterprise",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/oneMarket/oneMarket",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/goodsDetails/goodsDetails",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/twoMarket/twoMarket",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "uni-app",

pages/enterprise/enterprise.vue

@@ -0,0 +1,56 @@
+<template>
+	<view>
+		<navigation-bar title="商家服务" background-color="#fff" front-color="#000000" />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [{
+						name: 'photo',
+						title: '图片'
+					},
+					{
+						name: 'lock',
+						title: '锁头'
+					},
+					{
+						name: 'star',
+						title: '星星'
+					},
+					{
+						name: 'hourglass',
+						title: '沙漏'
+					},
+					{
+						name: 'home',
+						title: '首页'
+					},
+					{
+						name: 'star',
+						title: '音量'
+					},
+				],
+			}
+		},
+		methods: {
+			click(name) {
+				this.$refs.uToast.success(`点击了第${name}个`)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+	.grid-text {
+		font-size: 14px;
+		color: #909399;
+		padding: 10rpx 0 20rpx 0rpx;
+		/* #ifndef APP-PLUS */
+		box-sizing: border-box;
+		/* #endif */
+	}
+</style>

pages/goodsDetails/goodsDetails.vue

@@ -0,0 +1,61 @@
+<template>
+	<view>
+		<navigation-bar background-color="#fff" front-color="#000000" />
+		<u-image width="100%" height="300rpx" :src="goods.goodsImg"></u-image>
+		<view class="title">
+			{{goods.goodsName}}
+		</view>
+		<view class="footer">
+			<u-button class="custom-style" type="warning">加入购物车</u-button>
+			<u-button class="custom-style" type="error">立即购买</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				goods: {}
+			}
+		},
+		onLoad(option) {
+			this.id = option.id
+			this.getGoodsDetails()
+		},
+		methods: {
+			getGoodsDetails() {
+				let params = {
+					id: this.id
+				}
+				this.$api.getGoodsDetails(params).then(res => {
+					this.goods = res.data
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		padding: 0;
+	}
+
+	.title {
+		margin: 10rpx;
+		font-size: 40rpx;
+	}
+
+	.custom-style {
+		width: 400rpx;
+		height: 100rpx;
+		font-size: 30rpx;
+	}
+
+	.footer {
+		display: flex;
+		position: absolute;
+		bottom: 1rpx;
+	}
+</style>

pages/index/index.vue

@@ -1,16 +1,17 @@
 <template>
 	<view>
 		<view class="wrap">
-			<u-swiper :list="bannerList" keyName="image" img-mode="scaleToFill" :effect3d="true"></u-swiper>
+			<u-swiper height="200" :list="bannerList" keyName="image" img-mode="scaleToFill" :effect3d="true"></u-swiper>
 		</view>
 		<view class="box menu-box">
-			<view class="menu-item">
+			<view class="menu-item" v-for="(item, index) in menuList" key="index" @click="navTo(item.path)">
 				<view class="menu-img">
-					<image src="../../static/icon/user.png"></image>
+					<!-- <image src="../../static/icon/user.png"></image> -->
+					<u-icon :name="item.icon" color="#2979ff" size="50"></u-icon>
 				</view>
-				<view class="menu-text">购买确认</view>
+				<view class="menu-text">{{item.menuName}}</view>
 			</view>
-			<view class="menu-item">
+		<!-- 	<view class="menu-item">
 				<view class="menu-img">
 					<image src="../../static/icon/user.png"></image>
 				</view>
@@ -51,14 +52,14 @@
 					<image src="../../static/icon/user.png"></image>
 				</view>
 				<view class="menu-text">购买确认确</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="box msg-box">
 			<view class="title">
 				<u-icon name="calendar" color="#ff0000" size="28"></u-icon>
 				<text>最新资讯</text>
 			</view>
-			<view class="news-box" v-for="(item,index) in newsList">
+			<view class="news-box" v-for="(item,index) in newsList" :key="index">
 				<view class="news-img">
 					<image src="https://www.leezon.net/uploads/news/20200314160130384800.jpg"></image>
 				</view>
@@ -79,12 +80,16 @@
 		data() {
 			return {
 				bannerList: [],
-				newsList: []
+				newsList: [],
+				roleMenu: [],
+				menuList: [],
 			}
 		},
 		onLoad() {
 			this.getBannerList();
 			this.getNewsList();
+			this.getRoleMenu();
+			this.getMenu();
 		},
 		methods: {
 			getBannerList() {
@@ -92,20 +97,45 @@
 					this.bannerList = resp.data;
 				})
 			},
+			getRoleMenu() {
+				let menu = uni.getStorageSync("menu")
+				this.$api.getRoleMenu().then(res => {
+					res.data.map((item1,index) => {
+						menu.map((item2,index1) => {
+							if(item1.appRoleId == item2){
+								this.roleMenu.push(item1.appMenuId)
+							}
+						})
+					})
+				})
+			},
+			getMenu() {
+				this.$api.getMenu().then(res => {
+					this.roleMenu.map((item2,index1) => {
+						res.data.map((item1,index) => {
+							if(parseInt(item1.id) == parseInt(item2)){
+								this.menuList.push(item1)
+							}
+						})
+					})
+				})
+			},
 			getNewsList() {
 				this.$api.getNewestList({
 					limit: 4
 				}).then(resp => {
 					this.newsList = resp.data;
 				})
+			},
+			navTo(path) {
+				this.$common.to(path)
 			}
-
 		}
 	}
 </script>
 <style scoped lang="scss">
 	.wrap {
-		padding: 10rpx;
+		// padding: 10rpx;
 	}
 
 	.menu-box {
@@ -121,6 +151,9 @@
 			text-align: center;
 
 			.menu-img {
+				display: flex;
+				align-items: center;
+				justify-content: center;
 				image {
 					height: 64rpx;
 					width: 64rpx;
@@ -136,7 +169,8 @@
 	.box {
 		padding: 20rpx 40rpx;
 		width: 90%;
-		margin: auto;
+		// margin: auto;
+		margin-top: 10rpx;
 		background: #fff;
 		border-radius: 30rpx;
 	}

pages/login/chooseRole.vue

@@ -26,8 +26,6 @@
 		},
 		methods: {
 			choose(data) {
-				// console.log("选择角色");
-				// console.log(data);
 				for (let i = 1; i <= this.roles.length; i++) {
 					if (this.roles[i].roleName == data.roleName) {
 						this.current = i;

pages/login/login.vue

@@ -56,7 +56,7 @@
 							validator: (rule, value, callback) => {
 								// 上面有说，返回true表示校验通过，返回false表示不通过
 								// uni.$u.test.mobile()就是返回true或者false的
-								return uni.$u.test.mobile(value);
+								// return uni.$u.test.mobile(value);
 							},
 							message: '手机号码不正确',
 							// 触发器可以同时用blur和change
@@ -89,6 +89,7 @@
 							let data = resp.data;
 							uni.setStorageSync('token', data.tokenInfo.tokenValue);
 							uni.setStorageSync('info', data.appUser)
+							uni.setStorageSync('menu', data.per_list)
 							this.$common.toBar('/pages/index/index')
 						}
 					})

pages/oneMarket/oneMarket.vue

@@ -0,0 +1,106 @@
+<template>
+	<view>
+		<navigation-bar title="一级市场" background-color="#fff" front-color="#000000" />
+		<u-list class="list" width="100%" @scrolltolower="scrolltolower">
+			<u-list-item v-for="(item, index) in goods" :key="index">
+				<view class="card" @click="toDetails(item.id)">
+					<view class="card-body">
+						<image
+							src="https://img11.360buyimg.com/n7/jfs/t1/94448/29/2734/524808/5dd4cc16E990dfb6b/59c256f85a8c3757.jpg"
+							mode="aspectFill" class="img"></image>
+						<view class="txt">
+							<view style="font-size: 30rpx;height: 140rpx;">{{item.goodsName}}</view>
+							<view class="piece">{{item.price}} 元</view>
+						</view>
+					</view>
+				</view>
+			</u-list-item>
+			<u-loadmore v-if="goods" :status="loadmoreStatus" margin-top="20" @loadmore="clickLoadMore" margin-bottom="50" />
+		</u-list>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				loadmoreStatus: 'loadmore',
+				goods: []
+			}
+		},
+		onLoad() {
+			this.getGoodsList()
+			// this.loadmore()
+		},
+		methods: {
+			getGoodsList() {
+				// let params = {
+				// 	goodsType: 1
+				// }
+				this.$api.getGoodsList().then(res => {
+					this.goods = res.data
+					this.goods.forEach((item, index) => {
+						if (index === this.goods.length - 1) {
+							this.loadmoreStatus = 'nomore'
+						} else {
+							this.loadmoreStatus = 'loadmore'
+						}
+					})
+				})
+			},
+			scrolltolower() {
+				this.getGoodsList()
+			},
+			// loadmore() {
+			// 	if (this.loadmoreStatus === 'loadmore') {
+			// 		this.pageNo++;
+			// 		this.loadmoreStatus = 'loading'
+			// 	}
+			// }
+			toDetails(id) {
+				console.log(11)
+				this.$common.to('/pages/goodsDetails/goodsDetails?id='+id)
+			}
+		}
+	}
+</script>
+
+<style>
+	.list {
+		height: 100%;
+		border-radius: 10rpx;
+		background-color: #fff;
+	}
+
+	.card {
+		padding: 10rpx;
+	}
+
+	.card-body {
+		display: flex;
+		height: 300rpx;
+		width: 100%;
+		/* border: #888 1rpx solid; */
+		box-shadow:  1rpx 1rpx #888;
+		border-radius: 10rpx;
+	}
+
+	.img {
+		height: 300rpx;
+		width: 300rpx;
+		margin-right: 10rpx;
+	}
+
+	.txt {
+		padding: 10rpx;
+		width: 300rpx;
+	}
+
+	.piece {
+		margin: 50rpx 10rpx;
+		color: red;
+		position: relative;
+		top: 50rpx;
+		/* left: 5rpx; */
+	}
+</style>

pages/twoMarket/twoMarket.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

utils/request.js

@@ -1,5 +1,5 @@
-const server = 'http://127.0.0.1:8080';
-// const server = 'http://192.168.88.34:8080';
+// const server = 'http://127.0.0.1:8080';
+const server = 'http://192.168.88.34:8080';