tong 4 年之前
父節點
當前提交
9f1e379244

+ 9 - 0
pages.json

@@ -74,6 +74,7 @@
 				}
 
 			},
+			
 			// 扫码出库确认
 			{
 				"path": "Scan-code-out/index",
@@ -140,6 +141,14 @@
 					"navigationBarBackgroundColor": "#1692F7"
 				}
 			},
+			// 搜索页面
+			{
+				"path": "search/index",
+				"style": {
+					"navigationBarTitleText": "搜索"
+				}
+			
+			},
 			//优惠卷
 			{
 				"path": "coupon",

+ 1 - 1
pages/me/Delivery-details/index.vue

@@ -143,7 +143,7 @@
 		position: relative;
 		top: -40rpx;
 		left: 530rpx;
-		font-size: 13rpx;
+		font-size: 16rpx;
 		color: #626262;
 	}
 	.content-two {

+ 8 - 1
pages/me/Reward-details/index.vue

@@ -8,7 +8,9 @@
 				<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>
+				<view @click="search">
+					<u-search :show-action="true" :animation="true"></u-search>
+				</view>
 			</view>
 			<view class="content-one" v-for="(item,index) in datalist" :key="index">
 				<view class="content-one-view">
@@ -98,6 +100,11 @@
 				};
 			},
 			methods: {
+				search(){
+					this.$u.route({
+						url: 'pages/me/search/index',
+					})
+				},
 				change(index) {	
 					this.current = index;
 					if(this.current==1){

+ 11 - 5
pages/me/Warehousing-details/index.vue

@@ -2,20 +2,21 @@
 	<!-- 入库明细页面 -->
 	<view class="header">
 		<view class="header-one">
-			库存总量:<text>999</text>
+			库存总量:<text>9999</text>
 		</view>
 			<view class="content">
-				<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-tabs style="width: 750rpx;" 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>
+				<view @click="search"><u-search :show-action="true" :animation="true"></u-search></view>
+				
 			</view>
 			<view class="content-one" v-for="(item,index) in datalist" :key="index">
 				<view class="content-one-view">
 				</view>
 				<view class="content-one-text">单号:20200609135904795 - 20753</view>
 				<view class="content-one-time">2020-10-28</view>
-				<u-collapse class="content-two" body-style="color:red;">
+				<u-collapse class="content-two">
 						<u-collapse-item :title="item.head" v-for="(item, index) in itemList" :key="index">
 							<view class="content-two1">
 								物料描述:{{item.body}}
@@ -79,6 +80,11 @@
 				};
 			},
 			methods: {
+				search(){
+					this.$u.route({
+						url: 'pages/me/search/index',
+					})
+				},
 				change(index) {	
 					this.current = index;
 					if(this.current==1){
@@ -143,7 +149,7 @@
 		position: relative;
 		top: -40rpx;
 		left: 530rpx;
-		font-size: 13rpx;
+		font-size: 16rpx;
 		color: #626262;
 	}
 	.content-two {

+ 209 - 208
pages/me/agent-stock/agent-stock.vue

@@ -1,209 +1,210 @@
-<template>
-	<!-- 经销商库存页面 -->
-	<view class="header">
-		<view class="header-one">
-			库存是否充足:<text>充足</text>
-		</view>
-			<view class="content">
-				<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-select style=" color: #fff;" v-model="showmateriel" :list="materielList"></u-select>
-				<!-- <u-calendar style=" color: #fff;" v-model="showDate" :mode="mode"></u-calendar> -->
-				<u-search :show-action="true" :animation="true"></u-search>
-			</view>
-			<view class="content-one">
-				<view class="content-two" v-for="(item,index) in datalist" :key="index">
-					<view>
-						{{ item.name }}
-					</view>
-					<view>
-						{{ item.number}}
-					</view>
-					<view>
-						{{ item.state }}
-					</view>
-				</view>
-			</view>
-			
-			
-	</view>
-</template>
-
-<script>
-	export default {
-			data() {
-				return {
-					datalist: [
-						{
-							name: '赛轮',
-							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
-							state: '充足'
-						},{
-							name: '赛轮',
-							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
-							state: '紧张'
-						},
-						{
-							name: '赛轮',
-							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
-							state: '充足'
-						},
-						{
-							name: '赛轮',
-							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
-							state: '充足'
-						},
-						{
-							name: '赛轮',
-							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
-							state: '充足'
-						},
-						{
-							name: '赛轮',
-							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
-							state: '充足'
-						},
-						{
-							name: '赛轮',
-							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
-							state: '充足'
-						},
-						{
-							name: '赛轮',
-							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
-							state: '充足'
-						},
-						{
-							name: '赛轮',
-							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
-							state: '充足'
-						},
-					],
-					list: [{
-						name: '全部'
-					}, {
-						name: '品牌'
-					}, {
-						name: '物料',
-					}],
-					itemList: [{
-										head: "赛轮 12R22.5 18PR S838",
-										body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
-										open: true,
-										disabled: true
-									},{
-										head: "赛轮 12R22.5 18PR S838",
-										body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
-										open: false,
-									},{
-										head: "赛轮 12R22.5 18PR S838",
-										body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
-										open: false,
-									}],
-					brandList: [{
-							value: '1',
-							label: '赛轮'
-						},
-						{
-							value: '2',
-							label: '黑鹰'
-						}
-					],
-					materielList: [{
-							value: '1',
-							label: '物料1'
-						},
-						{
-							value: '2',
-							label: '物料2'
-						}
-					],
-					current: 0,
-					showBrand: false,
-					showmateriel: false,
-					showDate: false,
-					mode: 'date'
-				};
-			},
-			methods: {
-				change(index) {	
-					this.current = index;
-					if(this.current==1){
-						this.showBrand=true
-					}else if(this.current==2){
-						this.showmateriel=true
-					}
-				}
-			}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.header {
-		height: 400rpx;
-		width: 100%;
-		background: #0094FE;
-		color: #fff;
-		font-size: 28rpx;
-	}
-
-	.header-one {
-		text-align: center;
-		padding-top: 40rpx;
-	}
-
-	.header-one>text {
-		font-size: 52rpx;
-	}
-	.content {
-		display: flex;
-		justify-content: space-between;
-		width: 700rpx;
-		margin-top: 80rpx;
-	}
-	.content-one {
-		width: 690rpx;
-		// height: 305rpx;
-		background: #FFFFFF;
-		color: #000;
-		font-size: 24rpx;
-		box-shadow: 0px 0px 24px 0px rgba(101, 176, 249, 0.41);
-		border-radius: 20px;
-		margin: 0 auto;
-		margin-top: 50rpx;
-	}
-	.content-one-view {
-		width: 6rpx;
-		height: 30rpx;
-		background: #0292FD;
-		position: relative;
-		top: 20rpx;
-		left: 30rpx;
-	}
-	.content-one-text {
-		position: relative;
-		top: -8rpx;
-		left: 60rpx;
-		font-size: 24rpx;
-		font-weight: bold;
-		color: #000;
-	}
-	.content-one-time {
-		position: relative;
-		top: -40rpx;
-		left: 530rpx;
-		font-size: 13rpx;
-		color: #626262;
-	}
-	
-	.content-two {
-		display: flex;
        justify-content: space-between;
-		font-size: 24rpx;
-		color: #6A6A6A;
-		margin-left: 30rpx;
-		margin-right: 30rpx;
-		padding-top: 25rpx;
-		padding-bottom: 25rpx;
-	}
-	
+<template>
+	<!-- 经销商库存页面 -->
+	<view class="header">
+		<view class="header-one">
+			库存是否充足:<text>充足</text>
+		</view>
+			<view class="content">
+				<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-select style=" color: #fff;" v-model="showmateriel" :list="materielList"></u-select>
+				<!-- <u-calendar style=" color: #fff;" v-model="showDate" :mode="mode"></u-calendar> -->
+				<u-search :show-action="true" :animation="true"></u-search>
+			</view>
+			<view class="content-one">
+				<view class="content-two" v-for="(item,index) in datalist" :key="index">
+					<view>
+						{{ item.name }}
+					</view>
+					<view>
+						{{ item.number}}
+					</view>
+					<view>
+						{{ item.state }}
+					</view>
+				</view>
+			</view>
+			
+			
+	</view>
+</template>
+
+<script>
+	export default {
+			data() {
+				return {
+					datalist: [
+						{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '充足'
+						},{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '紧张'
+						},
+						{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '充足'
+						},
+						{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '充足'
+						},
+						{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '充足'
+						},
+						{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '充足'
+						},
+						{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '充足'
+						},
+						{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '充足'
+						},
+						{
+							name: '赛轮',
+							number: '12R22.5 152/149K 18PR S838 LBGSL 0L',
+							state: '充足'
+						},
+					],
+					list: [{
+						name: '全部'
+					}, {
+						name: '品牌'
+					}, {
+						name: '物料',
+					}],
+					itemList: [{
+										head: "赛轮 12R22.5 18PR S838",
+										body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
+										open: true,
+										disabled: true
+									},{
+										head: "赛轮 12R22.5 18PR S838",
+										body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
+										open: false,
+									},{
+										head: "赛轮 12R22.5 18PR S838",
+										body: "12R22.5 152/149K 18PR S838 LBGSL 0L",
+										open: false,
+									}],
+					brandList: [{
+							value: '1',
+							label: '赛轮'
+						},
+						{
+							value: '2',
+							label: '黑鹰'
+						}
+					],
+					materielList: [{
+							value: '1',
+							label: '物料1'
+						},
+						{
+							value: '2',
+							label: '物料2'
+						}
+					],
+					current: 0,
+					showBrand: false,
+					showmateriel: false,
+					showDate: false,
+					mode: 'date'
+				};
+			},
+			methods: {
+				change(index) {	
+					this.current = index;
+					if(this.current==1){
+						this.showBrand=true
+					}else if(this.current==2){
+						this.showmateriel=true
+					}
+				}
+			}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.header {
+		height: 400rpx;
+		width: 100%;
+		background: #0094FE;
+		color: #fff;
+		font-size: 28rpx;
+	}
+
+	.header-one {
+		text-align: center;
+		padding-top: 40rpx;
+	}
+
+	.header-one>text {
+		font-size: 52rpx;
+	}
+	.content {
+		display: flex;
+		justify-content: space-between;
+		width: 700rpx;
+		margin-top: 80rpx;
+	}
+	.content-one {
+		width: 690rpx;
+		// height: 305rpx;
+		background: #FFFFFF;
+		color: #000;
+		font-size: 24rpx;
+		box-shadow: 0px 0px 24px 0px rgba(101, 176, 249, 0.41);
+		border-radius: 20px;
+		margin: 0 auto;
+		margin-top: 50rpx;
+	}
+	.content-one-view {
+		width: 6rpx;
+		height: 30rpx;
+		background: #0292FD;
+		position: relative;
+		top: 20rpx;
+		left: 30rpx;
+	}
+	.content-one-text {
+		position: relative;
+		top: -8rpx;
+		left: 60rpx;
+		font-size: 24rpx;
+		font-weight: bold;
+		color: #000;
+	}
+	.content-one-time {
+		position: relative;
+		top: -40rpx;
+		left: 530rpx;
+		font-size: 13rpx;
+		color: #626262;
+	}
+	
+	.content-two {
+		display: flex;
+        justify-content: space-between;
+		font-size: 24rpx;
+		color: #6A6A6A;
+		margin-left: 30rpx;
+		margin-right: 30rpx;
+		padding-top: 25rpx;
+		padding-bottom: 25rpx;
+	}
+	
 </style>

+ 107 - 0
pages/me/search/index.vue

@@ -0,0 +1,107 @@
+<template>
+	<view>
+		<view class="content">
+			<u-search placeholder="请输入搜索内容" @click="data" v-model="keyword"></u-search>
+		</view>
+		
+		<view class="content-one" v-for="(item,index) in datalist" :key="index">
+			<view class="content-one-view">
+			</view>
+			<view class="content-one-text">单号:20200609135904795 - 20753</view>
+			<view class="content-one-time">2020-10-28</view>
+			<view class="content-two">
+				<view>
+					赛轮
+				</view>
+				<view>
+					aaaaaaaaaaabbbbbbbbb
+				</view>
+			</view>
+			<view class="content-two">
+				<view>
+					赛轮
+				</view>
+				<view>
+					aaaaaaaaaaabbbbbbbbb
+				</view>
+			</view>
+			<view class="content-two">
+				<view>
+					赛轮
+				</view>
+				<view>
+					aaaaaaaaaaabbbbbbbbb
+				</view>
+			</view>
+		</view>
+	</view>
+	
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				datalist: [
+					{},
+					{}
+				],
+				keyword: ''
+			}
+		},
+		methods: {
+			data() {
+				console.log("@@@")
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		margin-top: 30rpx;
+	}
+	.content-one {
+		width: 690rpx;
+		// height: 338rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 0px 24px 0px rgba(101, 176, 249, 0.41);
+		border-radius: 20px;
+		margin: 0 auto;
+		margin-top: 50rpx;
+	}
+	.content-one-view {
+		width: 6rpx;
+		height: 30rpx;
+		background: #0292FD;
+		position: relative;
+		top: 20rpx;
+		left: 30rpx;
+	}
+	.content-one-text {
+		position: relative;
+		top: -8rpx;
+		left: 60rpx;
+		font-size: 24rpx;
+		font-weight: bold;
+		color: #000;
+	}
+	.content-one-time {
+		position: relative;
+		top: -40rpx;
+		left: 530rpx;
+		font-size: 16rpx;
+		color: #626262;
+	}
+	.content-two {
+		display: flex;
+		justify-content: space-between;
+		width: 600rpx;
+		margin: 0 auto;
+	}
+	
+	.content-two>view:nth-child(2) {
+		margin-bottom: 30rpx;
+		
+	}
+</style>