新增门店订单和小修改

pages.json

@@ -57,12 +57,7 @@
 				"style": {
 					"navigationBarTitleText": "扫码入库",
 					"navigationBarBackgroundColor": "#0095FF",
-					"navigationBarTextStyle": "white",
-					"app-plus": {
-						"bounce": "none", //关闭窗口回弹效果
-						"scrollIndicator": "none"
-					}
-					// "app-plus": {"titleNView": false} //取消去掉导航栏顶部标题
+					"navigationBarTextStyle": "white"
 				}
 
 			},
@@ -174,20 +169,14 @@
 			{
 				"path": "scancodequery/scan",
 				"style": {
-					"navigationBarTitleText": "胎号查询",
-					"app-plus": {
-						"bounce": "none" //取消页面上的回弹效果
-					}
+					"navigationBarTitleText": "胎号查询"
 				}
 			},
 			//查询结果
 			{
 				"path": "scancodequery/result",
 				"style": {
-					"navigationBarTitleText": "查询结果",
-					"app-plus": {
-						"bounce": "none" //取消页面上的回弹效果
-					}
+					"navigationBarTitleText": "查询结果"
 				}
 			},
 			//入库明细
@@ -284,7 +273,8 @@
 		"navigationBarBackgroundColor": "#0095FF",
 		"navigationBarTextStyle": "white",
 		"app-plus": {
-			"bounce": "none" //关闭窗口回弹效果
+			"bounce": "none" ,//关闭窗口回弹效果
+			"scrollIndicator": "none"//app页面不显示滚动条
 		}
 	},
 	"tabBar": {

pages/me/Warehousing-details/index.vue

@@ -8,7 +8,7 @@
 				<u-tabs style="width: 500rpx;" bg-color="#0095ff" inactive-color="#FFFFFF" active-color="#fff" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
 				<u-select style=" color: #fff;" v-model="showBrand" :list="brandList"></u-select>
 				<u-calendar style=" color: #fff;" v-model="showDate" :mode="mode"></u-calendar>
-				<u-search :show-action="true" :animation="true"></u-search>
+				<u-search :show-action="false"></u-search>
 			</view>
 			<view class="content-one" v-for="(item,index) in datalist">
 				<view class="content-one-view">
@@ -135,7 +135,7 @@
 		position: relative;
 		top: -8rpx;
 		left: 60rpx;
-		font-size: 24rpx;
+		font-size: 28rpx;
 		font-weight: bold;
 		color: #000;
 	}

pages/me/index.vue

@@ -149,7 +149,7 @@
 								</view>
 							</view>
 							
-							<view class="u-flex u-row-centter" style="flex-direction: column;width: 25%;">
+							<view class="u-flex u-row-centter" style="flex-direction: column;width: 25%;" @click="inorder">
 								<view>
 									<u-image width="80rpx" height="80rpx" :src="src" :lazy-load="true" shape="circle">
 									</u-image>
@@ -255,6 +255,11 @@
 					url: 'pages/me/scancodequery/scan',
 				})
 			},
+			inorder(){
+				this.$u.route({
+					url: 'pages/me/my-order/my-order',
+				})
+			},
 			inCoupon(){
 				this.$u.route({
 					url: 'pages/me/coupon',

pages/me/my-order/my-order.vue

@@ -1,6 +1,146 @@
+<!-- 我的订单 -->
 <template>
 	<view>
-		<!-- 我的订单 -->
+		<view class="top">
+			<view class="head">
+				<view></view>
+				<view>订单号：{{number}}</view>
+				<view>
+					<view>{{state}}</view>
+					<view class="triangle"></view>
+				</view>
+			</view>
+			<view class="content">
+				<view>
+					<text>订单类型</text>
+					<text>普通订单</text>
+				</view>
+				<view>
+					<text>物料描述</text>
+					<text>185/65R15 92H XL BH15 BGBL</text>
+				</view>
+				<view>
+					<text>轮胎条数</text>
+					<text>100<text>条</text></text>
+				</view>
+				<view>
+					<text>创建时间</text>
+					<text>2020-11-06 14:25:30</text>
+				</view>
+			</view>
+		</view>
+		<view class="top">
+			<view class="head">
+				<view style="background-color: #FC1E1E;"></view>
+				<view>订单号：{{number}}</view>
+				<view>
+					<view style="background-color: #FC1E1E;">{{state}}</view>
+					<view class="triangle1"></view>
+				</view>
+			</view>
+			<view class="content">
+				<view>
+					<text>订单类型</text>
+					<text>普通订单</text>
+				</view>
+				<view>
+					<text>物料描述</text>
+					<text>185/65R15 92H XL BH15 BGBL</text>
+				</view>
+				<view>
+					<text>轮胎条数</text>
+					<text>100<text>条</text></text>
+				</view>
+				<view>
+					<text>创建时间</text>
+					<text>2020-11-06 14:25:30</text>
+				</view>
+			</view>
+		</view>
+		<view class="top">
+			<view class="head">
+				<view style="background-color: #0094FE;"></view>
+				<view>订单号：{{number}}</view>
+				<view>
+					<view style="background-color: #0094FE;">{{state}}</view>
+					<view class="triangle2"></view>
+				</view>
+			</view>
+			<view class="content">
+				<view>
+					<text>订单类型</text>
+					<text>普通订单</text>
+				</view>
+				<view>
+					<text>物料描述</text>
+					<text>185/65R15 92H XL BH15 BGBL</text>
+				</view>
+				<view>
+					<text>轮胎条数</text>
+					<text>100<text>条</text></text>
+				</view>
+				<view>
+					<text>创建时间</text>
+					<text>2020-11-06 14:25:30</text>
+				</view>
+			</view>
+		</view>
+		<view class="top">
+			<view class="head">
+				<view style="background-color: #14EBBB;"></view>
+				<view>订单号：{{number}}</view>
+				<view>
+					<view style="background-color: #14EBBB;">{{state}}</view>
+					<view class="triangle3"></view>
+				</view>
+			</view>
+			<view class="content">
+				<view>
+					<text>订单类型</text>
+					<text>普通订单</text>
+				</view>
+				<view>
+					<text>物料描述</text>
+					<text>185/65R15 92H XL BH15 BGBL</text>
+				</view>
+				<view>
+					<text>轮胎条数</text>
+					<text>100<text>条</text></text>
+				</view>
+				<view>
+					<text>创建时间</text>
+					<text>2020-11-06 14:25:30</text>
+				</view>
+			</view>
+		</view>
+		<view class="top">
+			<view class="head">
+				<view style="background-color: #14EBBB;"></view>
+				<view>订单号：{{number}}</view>
+				<view>
+					<view style="background-color: #14EBBB;">{{state}}</view>
+					<view class="triangle3"></view>
+				</view>
+			</view>
+			<view class="content">
+				<view>
+					<text>订单类型</text>
+					<text>普通订单</text>
+				</view>
+				<view>
+					<text>物料描述</text>
+					<text>185/65R15 92H XL BH15 BGBL</text>
+				</view>
+				<view>
+					<text>轮胎条数</text>
+					<text>100<text>条</text></text>
+				</view>
+				<view>
+					<text>创建时间</text>
+					<text>2020-11-06 14:25:30</text>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -8,15 +148,106 @@
 	export default {
 		data() {
 			return {
-				
+				number: '137678199412137865',
+				state: '状态是'
 			}
 		},
 		methods: {
-			
+
 		}
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	.top {
+		width: 702rpx;
+		margin: 0 auto;
+		padding-top: 20rpx;
+		background-color: #FFFFFF;
+		margin-top: 20rpx;
+		border-radius: 10rpx;
+		box-shadow: 0px 6px 24px 0px rgba(0, 0, 0, 0.1);
+		padding-bottom: 20rpx;
+	}
+
+	.content {
+		width: 642rpx;
+		background-color: #fff;
+		margin: 0 auto;
+		margin-top: 80rpx;
+		border-top: 1rpx solid #E7E8EA;
+		padding-top: 20rpx;
+	}
+	.content>view{
+		margin-bottom: 10rpx;
+	}
+	.content>view>text{
+		color: #303134;
+		font-size: 28rpx;
+	}
+	.content>view>text:nth-child(2) {
+		float: right;
+	}
+
+	.head {
+		width: 702rpx;
+	}
+
+	.head>view:nth-child(1) {
+		width: 16rpx;
+		height: 60rpx;
+		background: #F6CF19;
+		float: left;
+	}
+
+	.head>view:nth-child(2) {
+		width: 500rpx;
+		height: 60rpx;
+		font-size: 30rpx;
+		float: left;
+		line-height: 60rpx;
+		overflow: hidden;
+		font-weight: bold;
+		margin-left: 10rpx;
+	}
+
+	.head>view:nth-child(3) {
+		width: 190rpx;
+		float: right;
+		margin-right: -20rpx;
+	}
+
+	.head>view:nth-child(3)>view:nth-child(1) {
+		width: 190rpx;
+		height: 60rpx;
+		background: #F6CF19;
+		border-radius: 500rpx 0px 0px 500rpx;
+		float: right;
+		text-align: center;
+		color: #FFFFFF;
+		line-height: 60rpx;
+		overflow: hidden;
+	}
 
+	.triangle,.triangle1,.triangle2,.triangle3 {
+		width: 0px;
+		height: 0px;
+		margin-top: 60rpx;
+		margin-right: -190rpx;
+		border: 10rpx solid;
+		transform: rotate(270deg);
+		float: right;
+	}
+	.triangle{
+		border-color: #B89804 #B89804 transparent transparent;
+	}
+	.triangle1 {
+		border-color: #960000 #960000 transparent transparent;
+	}
+	.triangle2 {
+		border-color: #0F519C #0F519C transparent transparent;
+	}
+	.triangle3 {
+		border-color: #01A07D #01A07D transparent transparent;
+	}
 </style>