更新

components/upload.vue

@@ -400,7 +400,7 @@ export default {
 					} else {
 						// 上传成功
 						this.lists[index].response = data;
-						this.lists[index].progress = 100;
+						this.lists[index].progress = 0;
 						this.lists[index].error = false;
 						this.$emit('on-success', data, index, this.lists);
 					}

pageD/warehousings/warehousings.vue

@@ -1,51 +1,50 @@
 <template>
 	<view class="container">
-		<view class="detail-desc">
-			<view class="d-header">
-				<text>发运信息</text>
+		<view class="center">
+			<view class="title_b ">发运信息</view>
+			<view class="c-row ">
+				<text class="tit">合同编号</text>
+				<view class="con-list">
+					<text>{{WarehouseInOutInfo.contractNo}}</text>
+				</view>
 			</view>
-
-			<view class="c-list">
-				<view class="c-row b-b">
-					<text class="tit">合同编号</text>
-					<view class="con-list">
-						<text>{{WarehouseInOutInfo.contractNo}}</text>
-					</view>
+			<view class="c-row ">
+				<text class="tit">货名</text>
+				<view class="con-list">
+					<text>{{WarehouseInOutInfo.goodsName}}</text>
 				</view>
-				<view class="c-row b-b">
-					<text class="tit">货名</text>
-					<view class="con-list">
-						<text>{{WarehouseInOutInfo.goodsName}}</text>
-					</view>
+			</view>
+			<view class="c-row ">
+				<text class="tit">发车净重(吨)</text>
+				<view class="con-list">
+					<text>{{WarehouseInOutInfo.startWeight}}</text>
 				</view>
+			</view>
+			<view class="c-row ">
+				<text class="tit">车牌号</text>
+				<view class="con-list">
+					<text>{{WarehouseInOutInfo1.carNo}}</text>
+				</view>
+			</view>
+		</view>
+		<view class="center">
+			<view class="title_c ">入库信息</view>
+			<view class="c-list">
 				<view class="c-row b-b">
-					<text class="tit">发车净重(吨)</text>
+					<text class="tit">毛重（吨）</text>
+					<view style="color: #ff0000; padding-left: 10rpx;">*</view>
 					<view class="con-list">
-						<text>{{WarehouseInOutInfo.startWeight}}</text>
+						<input placeholder-style="font-size:14px" placeholder="请输入毛重" name="input" v-model="WarehouseInOutInfo.grossWeight" @input="grossWeightInput"></input>
 					</view>
 				</view>
 				<view class="c-row b-b">
-					<text class="tit">车牌号</text>
+					<view class="tit">皮重（吨）</view>
+					<view style="color: #ff0000; padding-left: 10rpx;">*</view>
 					<view class="con-list">
-						<text>{{WarehouseInOutInfo1.carNo}}</text>
+						<input placeholder-style="font-size:14px" placeholder="请输入皮重" name="input" v-model="WarehouseInOutInfo.tare"
+							@input="tareInput"></input>
 					</view>
 				</view>
-			</view>
-
-			<view class="d-header">
-				<text>入库信息</text>
-			</view>
-			<view class="c-list">
-				<view class="cu-form-group align-start">
-					<view class="title">毛重(吨)</view>
-					<input placeholder="请输入毛重" name="input" v-model="WarehouseInOutInfo.grossWeight"
-						@input="grossWeightInput"></input>
-				</view>
-				<view class="cu-form-group align-start">
-					<view class="title">皮重(吨)</view>
-					<input placeholder="请输入皮重" name="input" v-model="WarehouseInOutInfo.tare"
-						@input="tareInput"></input>
-				</view>
 				<view class="c-row b-b">
 					<text class="tit">净重（吨）</text>
 					<view class="con-list">
@@ -54,107 +53,142 @@
 				</view>
 				<view class="c-row b-b">
 					<text class="tit">仓库</text>
+					<view style="color: #ff0000; padding-left: 10rpx;">*</view>
 					<view class="con-list">
 						<text>{{WarehouseInOutInfo.warehouseName}}</text>
 					</view>
 				</view>
-				<view class="cu-form-group align-start">
+				<view class="c-row b-b">
 					<view class="title">仓位号</view>
+					<view style="color: #ff0000; padding-left: 10rpx;">*</view>
 					<view class="con-list">
-						<input placeholder="请输入仓位号" name="input" v-model="WarehouseInOutInfo.binNumber"></input>
+						<input placeholder-style="font-size:14px" placeholder="请输入仓位号" name="input" v-model="WarehouseInOutInfo.binNumber"></input>
 					</view>
 				</view>
-
+			
 				<view class="c-row b-b">
 					<text class="tit">入库类型 </text>
 					<picker @change="ruChange" :value="ruIndex" :range="ruType" class="con-list">
-						<view class="con-list">
+						<view >
 							{{ruIndex>-1?ruType[ruIndex]:'请选择入库类型'}}
 						</view>
 					</picker>
 				</view>
-				<view class="cu-form-group align-start">
+				<view class="c-row b-b">
 					<view class="title">扣款金额</view>
-					<input placeholder="请输入扣款金额" name="input" v-model="WarehouseInOutInfo.deductionAmount"></input>
+					<view class="con-list">
+						<input placeholder-style="font-size:14px" placeholder="请输入扣款金额" name="input" v-model="WarehouseInOutInfo.deductionAmount"></input>
+					</view>
 				</view>
-				<view class="cu-form-group align-start">
+				<view class="c-row b-b">
 					<view class="title">扣款项</view>
-					<input placeholder="请输入扣款项" name="input" v-model="WarehouseInOutInfo.deductionItems"></input>
+					<view class="con-list">
+						<input placeholder-style="font-size:14px" placeholder="请输入扣款项" name="input" v-model="WarehouseInOutInfo.deductionItems"></input>
+					</view>
 				</view>
 				<view class="c-row b-b">
 					<text class="tit">入库日期</text>
-					<view class="con-list">
-						<text>{{WarehouseInOutInfo.inOutDate}}</text>
-					</view>
+					
+					<view @click="show = true">{{WarehouseInOutInfo.inOutDate!=''?WarehouseInOutInfo.inOutDate:time}}</view>
+					<u-picker  :params='params' :default-time='time' @confirm="DateChange" v-model="show" mode="time"></u-picker>
+					
 				</view>
-				<view class="padding flex flex-direction">
-					<button class="cu-btn bg-red margin-tb-sm lg">上传磅单照片</button>
+				<view class="c-row ">
+					<text class="tit">上传磅单照片</text>
 				</view>
+				<upload
+					class="upload"
+					ref="upload"
+					:action="action"
+					:max-size="maxSize"
+					:max-count="1"
+					:size-type="['compressed']"
+					@on-success="getImgUrl"
+					@on-remove="onRemove"
+					@on-uploaded="isAdd = true"
+					:before-upload="filterFileType"
+				></upload>
 			</view>
+		</view>
+			
 
-			<view class="d-header">
-				<text>化验信息</text>
-			</view>
+		<view class="center">
+			<view class="title_c ">化验信息</view>
 			<view class="c-list">
-				<view class="cu-form-group align-start">
+				<view class="c-row b-b">
 					<view class="title">质检员</view>
-					<input placeholder="请输入质检员姓名" name="input" v-model="list.qualityInspector"></input>
+					<view class="con-list">
+						<input placeholder-style="font-size:14px" placeholder="请输入质检员姓名" name="input" v-model="list.qualityInspector"></input>
+					</view>
 				</view>
-				<view class="cu-form-group align-start">
+				<view class="c-row b-b">
 					<view class="title">蛋白(%)>=</view>
-					<input placeholder="请输入蛋白占比" name="input" v-model="list.protein"></input>
+					<view class="con-list">
+						<input placeholder-style="font-size:14px" placeholder="请输入蛋白占比" name="input" v-model="list.protein"></input>
+					</view>
 				</view>
-				<view class="cu-form-group align-start">
+				<view class="c-row b-b">
 					<view class="title">水分(%)<= </view>
-							<input placeholder="请输入水分占比" name="input" v-model="list.waterContent"></input>
+					<view class="con-list">
+						<input placeholder-style="font-size:14px" placeholder="请输入水分占比" name="input" v-model="list.waterContent"></input>
 					</view>
-					<view class="cu-form-group align-start">
-						<view class="title">容重(克/升)>= </view>
-						<input placeholder="请输入容重" name="input" v-model="list.bulkDensity"></input>
+				</view>
+				<view class="c-row b-b">
+					<view class="title">容重(克/升)>= </view>
+					<view class="con-list">
+						<input placeholder-style="font-size:14px" placeholder="请输入容重" name="input" v-model="list.bulkDensity"></input>
 					</view>
-					<view class="cu-form-group align-start">
-						<view class="title">热损伤(%)<= </view>
-								<input placeholder="请输入热损伤占比" name="input" v-model="list.jiaorenli"></input>
-						</view>
-						<view class="cu-form-group align-start">
-							<view class="title">杂质(%)<= </view>
-									<input placeholder="请输入杂质占比" name="input" v-model="list.impurity"></input>
-							</view>
-							<view class="cu-form-group align-start">
-								<view class="title">霉变粒(%)<= </view>
-										<input placeholder="请输入霉变粒占比" name="input" v-model="list.mildewGrain"></input>
-								</view>
-								<view class="cu-form-group align-start">
-									<view class="title">不完整粒(%)<= </view>
-											<input placeholder="请输入不完整粒占比" name="input"
-												v-model="list.imperfectGrain"></input>
-									</view>
-									<view class="c-row b-b">
-										<text class="tit">品级 </text>
-										<picker @change="pinChange" :value="pinIndex" :range="pinType" class="con-list">
-											<view class="con-list">
-												{{pinIndex>-1?pinType[pinIndex]:'请选择品级'}}
-											</view>
-										</picker>
-									</view>
-								</view>
-
-							</view>
-							<!-- 底部操作菜单 -->
-							<view class="padding flex flex-direction">
-								<button class="cu-btn bg-red margin-tb-sm lg" @click="commit1">暂存</button>
-								<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">提交</button>
-							</view>
-						</view>
+				</view>
+				<view class="c-row b-b">
+					<view class="title">热损伤(%)<= </view>
+					<view class="con-list">
+						<input placeholder-style="font-size:14px" placeholder="请输入热损伤占比" name="input" v-model="list.jiaorenli"></input>
 					</view>
 				</view>
+				<view class="c-row b-b">
+					<view class="title">杂质(%)<= </view>
+					<view class="con-list">
+						<input placeholder-style="font-size:14px" placeholder="请输入杂质占比" name="input" v-model="list.impurity"></input>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<view class="title">霉变粒(%)<= </view>
+					<view class="con-list">
+						<input placeholder-style="font-size:14px" placeholder="请输入霉变粒占比" name="input" v-model="list.mildewGrain"></input>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<view class="title">不完整粒(%)<= </view>
+					<view class="con-list">
+						<input placeholder-style="font-size:14px" placeholder="请输入不完整粒占比" name="input"
+							v-model="list.imperfectGrain"></input>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">品级 </text>
+					<picker @change="pinChange" :value="pinIndex" :range="pinType" class="con-list">
+						<view >
+							{{pinIndex>-1?pinType[pinIndex]:'请选择品级'}}
+						</view>
+					</picker>
+				</view>
 			</view>
 		</view>
+	<!-- 底部操作菜单 -->
+	<view class="page-bottom1">
+		<view>
+			<button type="primary" @click="commit1">暂 存</button>
+			<button  @click="commit"  type="primary" class=" action-btn no-border add-cart-btn" >提 交</button>
+		</view>
 	</view>
+</view>
 
 </template>
 <script>
+import upload from '@/components/upload.vue';
 	export default {
+	components:{upload},
+	
 		data() {
 			return {
 				packingType: [],
@@ -177,8 +211,41 @@
 				ruIndex: '采购入库',
 				rutypes: '',
 				ruType: ['采购入库', '移库入库', '暂存入库', '贸易服务入库', '退库'],
+				action: this.$uploadUrl,
+				maxSize: 5 * 1024 * 1024,//限制文件大小 5M
+				btnLoading: false, //防止重复点击
+				imgUrls: [],
+				isAdd: true,
+				params:{
+					year: true,
+					month: true,
+					day: true,
+				},
+				time:'',
+				show:false
 			}
 		},
+		computed: {
+			
+				time() {
+					var date=new Date()
+					var year=date.getFullYear()
+					var month=date.getMonth()
+					var date1=date.getDate()
+					if(month+1<10){
+						month="0"+(month+1)
+					}
+					return year+'-'+month+"-"+date1
+				},
+				startDate() {
+				//限制开始时间;
+				//也可以直接限定为当天日期 var date= new Date(); return date
+					return new Date(new Date(new Date().toLocaleDateString()).getTime()-(1*60*60*1000))
+				},
+				endDate() {
+					return new Date()
+				}
+			},
 		onLoad(option) {
 			this.WarehouseInOutInfo.contractNo = option.contractNo
 			this.WarehouseInOutInfo.goodsName = option.goodsName
@@ -187,34 +254,110 @@
 			this.WarehouseInOutInfo.warehouseName = option.warehouseName
 			this.WarehouseInOutInfo.id = option.id
 			this.WarehouseInOutInfo.carNo = option.carNo
+			var date=new Date()
+			var year=date.getFullYear()
+			var month=date.getMonth()
+			var date1=date.getDate()
+			if(month+1<10){
+				month="0"+(month+1)
+			}
+			this.time = year+'-'+month+"-"+date1
 		},
 		methods: {
+			
+			DateChange(e) {
+				this.WarehouseInOutInfo.inOutDate=e.year+'-'+e.month+'-'+e.day
+			},
+			filterFileType(index, lists) {
+				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
+					lists.splice(index, 1);
+					// 当前文件不支持
+					uni.showModal({
+						title: '暂不支持当前图片类型',
+						showCancel: false
+					});
+				} else {
+					this.isAdd = false;
+				}
+			},
+			getImgUrl(res) {
+				this.imgUrls.push(res.data);
+			},
+			onRemove(index) {
+				this.imgUrls.splice(index, 1);
+			},
 			commit1() {
-				console.log(this.list)
+				uni.showLoading({
+					title:"正在暂存"
+				})
 				this.WarehouseInOutInfo.warehouseInOutDetail = this.list
 				this.WarehouseInOutInfo.statusFlag = 1
+				if(this.imgUrls.length > 0){
+					this.WarehouseInOutInfo.addressUrl = this.imgUrls[0]
+				}
 				this.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse', this.WarehouseInOutInfo).then(res => {
-
+					uni.showModal({
+						title: '提示',
+						content: "暂存成功",
+						showCancel: false,
+						confirmText: '确定',
+						success: () => {
+						}
+					})
+					uni.hideLoading()
+					
 				}).catch(res => {
 					uni.showToast({
 						title: res.data.message,
 						icon: 'none',
 						duration: 2000
 					})
+					uni.hideLoading()
 				})
 			},
 			commit() {
-				console.log(this.list)
+				if(!this.WarehouseInOutInfo.grossWeight){
+					this.$api.msg('毛重不能为空');
+					return;
+				}
+				if(!this.WarehouseInOutInfo.tare){
+					this.$api.msg('皮重不能为空');
+					return;
+				}
+				if(!this.WarehouseInOutInfo.binNumber){
+					this.$api.msg('仓位号不能为空');
+					return;
+				}
+				if(this.imgUrls.length > 0){
+					this.WarehouseInOutInfo.addressUrl = this.imgUrls[0]
+				}
 				this.WarehouseInOutInfo.warehouseInOutDetail = this.list
 				this.WarehouseInOutInfo.statusFlag = 3
+				uni.showLoading({
+					title:"正在提交"
+				})
+				
 				this.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse', this.WarehouseInOutInfo).then(res => {
-
+					uni.showModal({
+						title: '提示',
+						content: "提交成功",
+						showCancel: false,
+						confirmText: '确定',
+						success: () => {
+							uni.navigateBack({
+								delta: 1
+							})
+						}
+					})
+					uni.hideLoading()
+					
 				}).catch(res => {
 					uni.showToast({
 						title: res.data.message,
 						icon: 'none',
 						duration: 2000
 					})
+					uni.hideLoading()
 				})
 			},
 			numFilter(value) {
@@ -249,19 +392,32 @@
 
 	}
 </script>
-<style scoped>
-	.cu-form-group input {
-		text-align: right;
+<style scoped lang='scss'>
+	.upload {
+		/deep/.u-list-item,
+		.u-add-wrap {
+			background-color: #eceae8;
+		}
 	}
-
-	.cu-form-group textarea {
-		text-align: right;
+	.center{
+		margin: 15rpx 15rpx 10rpx 15rpx;
+		padding:0rpx 10rpx 30rpx 10rpx;
+		background-color: #FFFFFF;
+		border-radius: 15px;
 	}
-
-	.margin-bottom {
-		margin-bottom: 30px;
+	.title_b{
+		margin: 20rpx 20rpx 0rpx 20rpx;
+		padding:20rpx 10rpx 20rpx 10rpx;
+		font-size: 18px;
+		font-weight: 550;
+		border-bottom: 1px solid #d6d6d6;
+	}
+	.title_c{
+		margin: 20rpx 20rpx 0rpx 20rpx;
+		padding:20rpx 10rpx 20rpx 10rpx;
+		font-size: 18px;
+		font-weight: 550;
 	}
-
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -317,4 +473,67 @@
 			border-bottom: 1px solid #ccc;
 		}
 	}
+	/* 底部操作菜单 */
+	.page-bottom1 {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 95;
+		width:100%;
+		height: 70px;
+		background: rgba(255, 255, 255, .9);
+		padding:15px;
+		border-radius: 0;
+		text-align:right;
+		button{
+			display:inline-block;
+			border-radius:18px;
+			margin:0 10px;
+			font-size:14px;background:#fff;
+			color:#333;
+			border:1px solid #333;
+			padding-left: 50rpx;
+			padding-right: 50rpx;
+		}
+		.action-btn{
+			background:#22C572;
+			color:#fff;
+			border:1px solid #22C572;
+		}
+		.p-b-btn {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			font-size: $font-sm;
+			color: $font-color-base;
+			width: 96upx;
+			height: 80upx;
+	
+			.yticon {
+				font-size: 40upx;
+				line-height: 48upx;
+				color: $font-color-light;
+			}
+	
+			&.active,
+			&.active .yticon {
+				color: $uni-color-primary;
+			}
+	
+			.icon-fenxiang2 {
+				font-size: 42upx;
+				transform: translateY(-2upx);
+			}
+	
+			.icon-shoucang {
+				font-size: 46upx;
+			}
+		}
+	
+		
+	}
+	.container{
+		padding-bottom: 160upx;
+	}
 </style>

pages/task/my_task.vue

@@ -1,26 +1,35 @@
 <template name="task">
 	<view class="content">
 		<view class="cu-bar search bg-white">
-			<view class="search-form round" @click="naviageToPage('/pageA/product/search?TabCur=')">
-				<text style='color: #ccc;' class="cuIcon-search"></text>
-				<input type="text" placeholder="请输入合同编号、车牌号或派车编号" confirm-type="search"></input>
+			<view class="search-form round" >
+				<u-search placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword"
+				@search="searchKeyWord()"
+				@custom="searchKeyWord()"
+				></u-search>
 			</view>
-
 		</view>
-		<view style='background:#fff;padding:0 145px;display:table-footer-group ;'>
+		<view style='background:#fff;padding:0 15px;'>
 			<view @click='tabcarchange(1)' class='line' :class='statusFlag==1?"active":""'>未完成</view>
-			<view @click='tabcarchange(3)' class='line' :class='statusFlag==3?"active":""'>已完成</view>
+			<view  @click='tabcarchange(3)' class='line'  :class='statusFlag==3?"active":""'>已完成</view>
 		</view>
 		<view class="introduce-section">
 			<view v-for="(item, index) in taskInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
-				<view class="price-box">
-					<view class='tag tag-bule radius line-pink'>入库任务</view>
-					<view class="title">{{item.carNo}}({{item.tranCarNo}})</view>
-					<view  class="title-tip" v-if="item.statusFlag==3">已完成</view>
+				<view class="title flex">
+					<text>
+						{{item.carNo}}({{item.tranCarNo}})
+					</text>
+					<view  class="title-tip-a" v-if="item.statusFlag==3">已完成</view>
 					<view  class="title-tip" v-if="item.statusFlag==1">未完成</view>
 				</view>
-				<view class="titles ">{{item.contractNo}}</view>
-				<view class="titles titleds_aa">{{item.inOutDate}}</view>
+				<view class="flex title_b">
+					<view class="title-tip">
+						{{item.contractNo}}
+					</view>
+					<view class="title-tip-b">{{item.inOutDate}}</view>
+					<!-- <view class="title-tip-b">2021-07-30</view> -->
+				</view>
+				<u-tag :text="item.taskType" type="success" />
+				<!-- <u-tag text="入库任务" type="primary" /> -->
 			</view>
 			<view v-show="isLoadMore">
 				<uni-load-more :status="loadStatus"></uni-load-more>
@@ -47,28 +56,58 @@
 				warehouseInOutInfo: {
 					pageSize: 10,
 					currentPage: 1
-				}
+				},
+				keyword:""
 			};
 		},
 		onLoad(options) {
-
 			this.getIndexBuyData();
-			this.getIndexBuyData()
 		},
 		methods: {
+			searchKeyWord(){
+				if(!this.keyword){
+					this.$api.msg('关键字不能为空')
+				}
+				this.warehouseInOutInfo.statusFlag = this.statusFlag
+				this.warehouseInOutInfo.keyWord = this.keyword
+				uni.showLoading({
+					title:"正在加载"
+				})
+				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfoByKeyWord', this.warehouseInOutInfo).then(res => {
+					console.log(res, "对象")
+					if (res.data.code == 200) {
+						this.taskInfo = res.data.data
+						uni.hideLoading()
+					} else {
+						uni.showToast({
+							title: res.data.message,
+							icon: 'none',
+							duration: 2000
+						})
+						uni.hideLoading()
+					}
+				}).catch(res => {
+					uni.showToast({
+						title: res.data.message,
+						icon: 'none',
+						duration: 2000
+					})
+					uni.hideLoading()
+				})
+			},
 			getIndexBuyData() {
-				console.log(11111)
 				const that = this
 				var pages = that.pages
 				var limit = that.limit
-				console.log(2112454)
+				uni.showLoading({
+					title:"正在加载"
+				})
 				this.warehouseInOutInfo.statusFlag = this.statusFlag
 				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfo', this.warehouseInOutInfo).then(res => {
 					console.log(res, "对象")
 					if (res.data.code == 200) {
 						let data = res.data.data.records
-						console.log(data, "13246")
 						//采购信息
 						if (data.length > 0) {
 							that.taskInfo = that.taskInfo.concat(data)
@@ -119,363 +158,80 @@
 </script>
 
 <style lang="scss" scoped>
-	page,
-	.content {
-		background: #F5F6FA;
-	}
-
-	.line {
-		display: inline-block;
-		padding: 5px;
-		position: relative;
-		font-size: 17px;
-		width: 187px;
-		padding-left: 68px;
-	}
-
-	.line.active {
-		font-size: 19px;
-		font-weight: 900;
-	}
-
-	.line.active:after {
-		content: '';
-		display: block;
-		position: absolute;
-		width: 18px;
-		left: 50%;
-		transform: translateX(-50%);
-		bottom: 0;
-		border-bottom: 1px solid #22C572;
-	}
-
-	.cu-tag.badge {
-		right: 26rpx;
-	}
-
-	.cu-item {
-		height: 80rpx;
-		display: inline-block;
-		line-height: 80rpx;
-	}
-
-	.search-form {
-		background: #fff;
-		box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-	}
-
-	.title-tip {
-		color: #00aa00;
-		text-align: center;
-		font-size: 7px;
-	}
-
-	.tag-bule {
-		background: #a8e4a5;
-		color: #000000;
-	}
 	.tag {
+		background:#F5F6F9;
 		padding: 5px;
+		color:#333333;
 		display: inline-flex;
 		font-size: 22rpx;
+		border-radius: 3px;
 		margin: 3px;
 	}
-
-	.text-white {
-		color: #fff;
+	.introduce-section .title_b .title-tip{
+		font-size: 13px;
+		height:40px;
+		line-height: 40px;
+		flex: 2.5;
 	}
-
-	.text-white text {
-		position: relative;
-		z-index: 2;
-		background: linear-gradient(45deg, #3DC146, #B2D612);
-		padding: 5px 10px;
-		border-radius: 38rpx;
+	.introduce-section .title_b .title-tip-b{
+		flex: 1;
+		font-size: 13px;
+		color: #878C9C;
+		height:40px;
+		line-height: 40px;
 	}
-
-	.guess-section {
-		padding-bottom: 100upx;
-		display: flex;
-		flex-wrap: wrap;
-		padding: 0 30upx;
-		background: #fff;
-
-		.guess-item {
-			display: flex;
-			flex-direction: column;
-			width: 98%;
-			border-bottom: 1px solid #ccc;
-		}
-
-		.image-wrapper {
-			width: 100%;
-			height: 330upx;
-			border-radius: 3px;
-			overflow: hidden;
-
-			image {
-				width: 100%;
-				height: 100%;
-				opacity: 1;
-			}
-		}
-
-		.title {
-			font-size: $font-lg;
-			color: #121212;
-		}
-
-		.price-orther {
-			font-size: $font-sm;
-			color: $font-color-base;
-		}
-
-		.price {
-			font-size: 64rpx;
-			color: #39b54a;
-			line-height: 1;
-			padding-right: 10upx;
-		}
-		.view-item {
-			width: 100%;
-			// line-height: 40upx;
-			padding-top: 10upx;
-		}
-
-		.confirm-btn {
-			margin-left: 20%;
-		}
-
-		.date-time {
-			margin-left: 30%;
-		}
-
-		.padding-xs-tmp {
-			padding: 15upx 10upx 10upx 10upx;
-		}
-	}
-
-	.navbar {
-		position: fixed;
-		left: 0;
-		top: var(--window-top);
-		display: flex;
-		width: 100%;
-		height: 80upx;
-		background: #fff;
-		box-shadow: 0 2upx 10upx rgba(0, 0, 0, .06);
-		z-index: 10;
-
-		.nav-item {
-			flex: 1;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 100%;
-			font-size: 30upx;
-			color: $font-color-dark;
-			position: relative;
-
-			&.current {
-				color: $base-color;
-
-				&:after {
-					content: '';
-					position: absolute;
-					left: 50%;
-					bottom: 0;
-					transform: translateX(-50%);
-					width: 120upx;
-					height: 0;
-					border-bottom: 4upx solid $base-color;
-				}
-			}
-		}
-
-		.p-box {
-			display: flex;
-			flex-direction: column;
-
-			.yticon {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 30upx;
-				height: 14upx;
-				line-height: 1;
-				margin-left: 4upx;
-				font-size: 26upx;
-				color: #888;
-
-				&.active {
-					color: $base-color;
-				}
-			}
-
-			.xia {
-				transform: scaleY(-1);
-			}
-		}
-
-		.cate-item {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			height: 100%;
-			width: 80upx;
-			position: relative;
-			font-size: 44upx;
-
-			&:after {
-				content: '';
-				position: absolute;
-				left: 0;
-				top: 50%;
-				transform: translateY(-50%);
-				border-left: 1px solid #ddd;
-				width: 0;
-				height: 36upx;
-			}
-		}
-	}
-
-	/* 分类 */
-	.cate-mask {
-		position: fixed;
-		left: 0;
-		top: var(--window-top);
-		bottom: 0;
-		width: 100%;
-		background: rgba(0, 0, 0, 0);
-		z-index: 95;
-		transition: .3s;
-
-		.cate-content {
-			width: 630upx;
-			height: 100%;
-			background: #fff;
-			float: right;
-			transform: translateX(100%);
-			transition: .3s;
-		}
-
-		&.none {
-			display: none;
-		}
-
-		&.show {
-			background: rgba(0, 0, 0, .4);
-
-			.cate-content {
-				transform: translateX(0);
-			}
-		}
-	}
-
-	.cate-list {
-		display: flex;
-		flex-direction: column;
-		height: 100%;
-
-		.cate-item {
-			display: flex;
-			align-items: center;
-			height: 90upx;
-			padding-left: 30upx;
-			font-size: 28upx;
-			color: #555;
-			position: relative;
-		}
-
-		.two {
-			height: 64upx;
-			color: #303133;
-			font-size: 30upx;
-			background: #f8f8f8;
-		}
-
-		.active {
-			color: $base-color;
-		}
-	}
-
-	/* 销售信息 */
-	.introduce-section {
+	.introduce-section .title text{
+		font-size: 17px;
+		font-weight: bold;
+		height:50px;
+		line-height: 50px;
+		flex: 2.5;
+		border-bottom:1px solid #EEEEEE;
+	}
+	.introduce-section .title .title-tip{
+		flex: 1;
+		font-size: 15px;
+		color: #FE6430;
+		font-weight: 500;
+		height:50px;
+		line-height: 50px;
+		border-bottom:1px solid #EEEEEE;
+	}
+	.introduce-section .title .title-tip-a{
+		flex: 1;
+		font-size: 15px;
+		color: #AFB3BF;
+		font-weight: 500;
+		height:50px;
+		line-height: 50px;
+		border-bottom:1px solid #EEEEEE;
+	}
+	.introduce-section .guess-item{
+		border-radius:4px;
 		background: #fff;
-		padding: 20upx 30upx;
-		padding-bottom: 100upx;
-
-		.guess-item {
-			padding-bottom: 20upx;
-			border-bottom: 1px solid #ccc;
-		}
-
-		.title {
-			font-size: 13upx;
-			color: $font-color-dark;
-			font-weight: bold;
-			height: 100upx;
-			line-height: 50upx;
-			flex: 2.5;
-			margin-left: -4px;
-			padding: 0px 24px;
-
-		}
-
-		.title-tip {
-			flex: 1;
-			-webkit-tap-highlight-color:transparent;
-		}
-
-		.price-box {
-			display: flex;
-			align-items: baseline;
-			height: 57px;
-			padding: 5px 0;
-			font-size: 13px;
-			color: #fa436a;
-		}
-
-		.price {
-			font-size: 15px;
-		}
-
-		.m-price {
-			margin: 0 12upx;
-			color: $font-color-light;
-			text-decoration: line-through;
-		}
-
-		.coupon-tip {
-			align-items: center;
-			padding: 4upx 10upx;
-			background: $uni-color-primary;
-			font-size: $font-sm;
-			color: #fff;
-			border-radius: 6upx;
-			line-height: 1;
-			transform: translateY(-4upx);
-		}
-
-		.bot-row {
-			display: flex;
-			align-items: center;
-			height: 50upx;
-			font-size: $font-sm;
-			color: $font-color-light;
-
-			view {
-				flex: 1;
-			}
-		}
-	}
-
-	.titles {
-		display: -webkit-inline-box;
-
+		padding: 0upx 30upx 20upx;
+		margin:10px;
+		padding-bottom: 20upx;
+		border-bottom: 1px solid #ccc;
+	}
+	.line{
+		display:inline-block;
+		padding:5px;
+		position:relative;
+		font-size:17px;
+	}
+	.line.active{
+		font-size:19px;
+		font-weight: 900;
 	}
-
-	.titleds_aa {
-		float: right;
+	.line.active:after{
+		content:'';
+		display:block;
+		position:absolute;
+		width:18px;
+		left:50%;
+		transform: translateX(-50%);
+		bottom:0;
+		border-bottom:1px solid #22C572;
 	}
 </style>