fix

components/order/order.vue

@@ -93,7 +93,7 @@
 			},
 			// 返回
 			back() {
-				
+				this.$refs.popup.close()
 			},
 			// tab切换
 			tabChange(tab) {
@@ -123,7 +123,7 @@
 					
 					// 留言
 					const res = await orderSubmit({
-						leaveAMessage: this.remarks ? true : false,
+						leaveAMessage: hadOrder ? false : true,
 						orderShopParam: [
 							{
 								remarks: this.remarks,

components/sideSelect/sideSelect.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="sideSelect">
-		<view v-for="(item, i) in menus" :key="i" :class="['item', {active: cur === item.id }]" @click="menuChange(item)">{{ item.name }}</view>
+		<view v-for="(item, i) in menus" :key="i" :class="['item', {active: cur === item.id }]" @click="menuChange(item)">{{ item.classificationName }}</view>
 	</view>
 </template>
 

other/addGoods/addGoods.vue

@@ -92,11 +92,12 @@
 					prodName: '',
 					skuList: [
 						{
+							prodName: '',
 							status: 1,
 							oriPrice: '',
 							price: '',
 							skuName: '',
-							stocks: '',
+							stocks: 0,
 						}
 					],
 				},
@@ -185,11 +186,32 @@
 			// 提交
 			async submit(status) {
 				if (this.submiting) return false
-				const { form } = this
+				const form = JSON.parse(JSON.stringify((this.form)))
 				if (!form.prodName) return this.$util.errMsg(`请输入商品名称！`)
 				if (!this.pic.length) return this.$util.errMsg(`请上传封面图片！`)
 				if (!form.brief) return this.$util.errMsg(`请输入商品描述！`)
+				form.skuList = form.skuList.filter(e => e.skuName)
 				if (!form.skuList.length) return this.$util.errMsg(`请输入产品规格！`)
+				let invalid = 0
+				for (const e of form.skuList) {
+					if (!e.skuName) {
+						this.$util.errMsg(`请输入规格名称！`)
+						invalid = 1
+					}
+					if (!e.price) {
+						this.$util.errMsg(`请输入售价！`)
+						invalid = 1
+					}
+					if (!e.oriPrice) {
+						this.$util.errMsg(`请输入市场价！`)
+						invalid = 1
+					}
+					if (!e.stocks) {
+						this.$util.errMsg(`请输入库存！`)
+						invalid = 1
+					}
+				}
+				if (invalid) return false
 				this.submiting = true
 				form.pic = this.pic.map(e => e.url).join()
 				form.imgs = this.imgs.map(e => e.url).join()

other/procureDetail/procureDetail.vue

@@ -8,7 +8,8 @@
 				<view class="status">{{ info.authentication }}</view>
 			</view>
 		</view>
-		<view class="block">
+		
+		<view v-if="info.orderItemDtos.length" class="block">
 			<view class="title">采购内容</view>
 			<view class="content">
 				<view v-for="(item, i) in info.orderItemDtos" :key="i" class="item">
@@ -20,6 +21,12 @@
 				</view>
 			</view>
 		</view>
+		
+		<view v-if="info.remarks" class="block">
+			<view class="title">备注</view>
+			<view class="remarks">{{ info.remarks }}</view>
+		</view>
+		
 		<view class="block">
 			<view class="title">采购方信息</view>
 			<view class="info">
@@ -159,6 +166,10 @@
 		color: #333;
 	}
 }
+.remarks {
+	font-size: 26rpx;
+	color: #6d6d6d;
+}
 .info {
 	font-size: 28rpx;
 	color: #333;

other/supplierDetail/supplierDetail.vue

@@ -52,7 +52,7 @@
 				<image class="pic" :src="item.pic"></image>
 				<view class="texts">
 					<view class="name">{{ item.prodName }}</view>
-					<view class="price">￥12.8</view>
+					<view class="price">￥{{ item.price }}</view>
 				</view>
 			</view>
 		</view>

pages/supplier/supplier.vue

@@ -3,11 +3,11 @@
 		<view class="page">
 			<view class="search-wrap">
 				<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="initList" @clear="clearKeyword" />
-				<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="typeVisible = true"></uni-icons>
+				<!-- <uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="typeVisible = true"></uni-icons> -->
 			</view>
 			
 			<view class="wrap">
-				<!-- <sideSelect :menus="menus" @menuClick="menuClick" /> -->
+				<sideSelect :menus.sync="classifications" @menuClick="menuClick" />
 				<view class="list">
 					<view class="item" v-for="(item, i) in list" :key="i" @click="toDetail(item)">
 						<view class="pro-name">
@@ -15,16 +15,20 @@
 							{{ item.companyName }}
 						</view>
 						<view class="info">
-							<view v-if="item.briefIntroduction" class="intro ell">{{ item.briefIntroduction }}</view>
+							<view v-if="item.briefIntroduction" class="intro">
-							<view class="meta">{{ item.province }}-{{ item.city }}</view>
+								<image class="icon" src="http://124.71.79.122/images/miniProgram/intro.png" mode="widthFix" />
+								<view class="text ell">{{ item.briefIntroduction }}</view>
+							</view>
+							<view v-if="item.province || item.city" class="meta">
+								<image class="icon" src="http://124.71.79.122/images/miniProgram/address1.png" mode="widthFix" />
+								{{ item.province }}-{{ item.city }}
+							</view>
 							<view class="order" @click.stop="toOrder(item)">我想采购</view>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-		<view v-if="!per" class="per-mask">功能升级中，敬请期待...</view>
-		
 		
 		<view :class="['type-popup', {active: typeVisible}]">
 			<uni-icons class="close" type="closeempty" size="20" color="#757575" @click="closeType"></uni-icons>
@@ -43,6 +47,8 @@
 		</view>
 		
 		<order ref="order" />
+		
+		<view v-if="!per" class="per-mask">功能升级中，敬请期待...</view>
 	</view>
 </template>
 
@@ -55,6 +61,7 @@
 				Common,
 				per: true, // 是否有权限
 				teamId: uni.getStorageSync('teamId') || '',
+				platformId: uni.getStorageSync('platformId'),
 				menus: [
 					{
 						id: '',
@@ -121,9 +128,10 @@
 		onShow() {
 			this.active = ''
 			this.keyword = ''
-			this.per = true
 			this.typeVisible = false
-			this.initList()
+			this.per = this.platformId !== 6 // 供应商不能查看该页面
+			// this.per = true // 供应商不能查看该页面
+			this.per && this.initList()
 		},
 		methods: {
 			initList() {
@@ -159,7 +167,13 @@
 			// 获取分类
 			async getCategory() {
 				const { list } = await treeStructureList()
-				this.classifications = list[0].children
+				this.classifications = [
+					{
+						id: '',
+						classificationName: '全部'
+					},
+					...list[0].children
+				]
 			},
 			// 分类点击回调
 			classificationClick(item) {
@@ -183,7 +197,7 @@
 			},
 			// 切换
 			menuClick(tab) {
-				this.curTab = tab.id
+				this.active = tab.id
 				this.initList()
 			},
 			// 我想采购
@@ -247,14 +261,24 @@
 		color: #999;
 	}
 	.intro {
-		max-width: 70%;
+		display: flex;
-		margin: 10rpx 0;
+		align-items: center;
-		font-size: 24rpx;
+		margin: 10rpx 0 20rpx;
-		color: #777;
+		font-size: 26rpx;
+		color: #3c3c3c;
+		.text {
+			max-width: 49%;
+		}
 	}
 	.meta {
+		display: flex;
+		align-items: center;
 		font-size: 26rpx;
-		color: #333;
+		color: #3c3c3c;
+	}
+	.icon {
+		width: 30rpx;
+		margin-right: 10rpx;
 	}
 	.ell-wrap {
 		display: inline-flex;

styles/common.scss

@@ -311,6 +311,7 @@ ul {
 	-webkit-user-drag: none;
 	-webkit-user-select: none;
 	user-select: none;
+	background-color: #f1f1f1;
 	.mask {
 		position: relative;
 		width: 100%;