qukaidi 4 rokov pred
rodič
commit
df589e11ea

+ 181 - 167
pages.json

@@ -15,26 +15,12 @@
 		{
 			"path": "pages/home/index",
 			"style": {
-				"navigationBarTitleText": "首页"
-			}
-
-		},
-		// 系统消息
-		{
-			"path": "pages/home/scancode/index",
-			"style": {
-				"navigationBarTitleText": "扫码入库",
-				"navigationBarBackgroundColor": "#0095FF",
-				"navigationBarTextStyle": "white",
 				"app-plus": {
-					"bounce": "none" ,//关闭窗口回弹效果
-					"scrollIndicator": "none"
+					"titleNView": false
 				}
-				// "app-plus": {"titleNView": false} //取消去掉导航栏顶部标题
 			}
 
 		},
-
 		// 消息
 		{
 			"path": "pages/msg/index",
@@ -49,7 +35,7 @@
 			"style": {
 				// "navigationBarTitleText": "我的",
 				"app-plus": {
-					"titleNView":false
+					"titleNView": false
 				}
 			}
 
@@ -59,175 +45,134 @@
 			"path": "pages/login/index",
 			"style": {
 				"app-plus": {
-					"titleNView":false
+					"titleNView": false
 				}
 			}
-		},
-		// 奖励明细
-		{
-			"path": "pages/Reward-details/index",
-			"style": {
-				"navigationBarTitleText": "奖励明细"
-			}
-
-		},
-		// 出库明细
-		{
-			"path": "pages/Delivery-details/index",
-			"style": {
-				"navigationBarTitleText": "出库明细"
-			}
-
-		},
-		// 入库明细
-		{
-			"path": "pages/Warehousing-details/index",
-			"style": {
-				"navigationBarTitleText": "入库明细"
-			}
-
-		},
-		// 结算中心页面
-		{
-			"path": "pages/Settlement-center/index",
-			"style": {
-				"navigationBarTitleText": "结算中心"
-			}
-
-		},
-		// 统计任务页面
-		{
-			"path": "pages/Statistical-task/index",
-			"style": {
-				"navigationBarTitleText": "任务统计"
-			}
-
-		},
-		// 订单详情页面
-		{
-			"path": "pages/Order-details/index",
-			"style": {
-				"navigationBarTitleText": "订单详情"
-			}
-
-		},
-		// 核销管理页面
-		{
-			"path": "pages/Write-off-management/index",
-			"style": {
-				"navigationBarTitleText": "核销管理"
-			}
-
 		}
 	],
 	"subPackages": [{
-			"root": "pages/home",
-			"pages": [
-				// 扫码入库确认
-				{
-					"path": "Scan-code-in/index",
-					"style": {
-						"navigationBarTitleText": "扫码入库确认"
-					}
-
-				},
-				// 扫码出库确认
-				{
-					"path": "Scan-code-out/index",
-					"style": {
-						"navigationBarTitleText": "扫码出库确认"
+		"root": "pages/home",
+		"pages": [{
+				"path": "scancode/index",
+				"style": {
+					"navigationBarTitleText": "扫码入库",
+					"navigationBarBackgroundColor": "#0095FF",
+					"navigationBarTextStyle": "white",
+					"app-plus": {
+						"bounce": "none", //关闭窗口回弹效果
+						"scrollIndicator": "none"
 					}
+					// "app-plus": {"titleNView": false} //取消去掉导航栏顶部标题
+				}
 
-				},
-				{
-					"path": "shopping/shopping_car",
-					"style": {
-						"navigationStyle": "custom", // 隐藏系统导航栏
-						"navigationBarTextStyle": "white"
-					}
-				}, {
-					"path": "shopping/integral_mall",
-					"style": {
-						"navigationBarTitleText": "积分商城"
-					}
-				}, {
-					"path": "shopping/inline_shop",
-					"style": {
-						"navigationStyle": "custom", // 隐藏系统导航栏
-						"navigationBarTextStyle": "white"
-					}
-				}, {
-					"path": "shopping/inline_shop_details",
-					"style": {
-						"navigationBarTitleText": "商品详情"
-					}
+			},
+			// 扫码入库确认
+			{
+				"path": "Scan-code-in/index",
+				"style": {
+					"navigationBarTitleText": "扫码入库确认"
 				}
-			]
-		},
-		{
-			"root": "pages/login",
-			"pages": [{
-				"path": "register",
+
+			},
+			// 扫码出库确认
+			{
+				"path": "Scan-code-out/index",
 				"style": {
-					"navigationBarTitleText": "零售店注销"
+					"navigationBarTitleText": "扫码出库确认"
 				}
 
+			},
+			{
+				"path": "shopping/shopping_car",
+				"style": {
+					"navigationStyle": "custom", // 隐藏系统导航栏
+					"navigationBarTextStyle": "white"
+				}
 			}, {
-				"path": "register_2",
+				"path": "shopping/integral_mall",
 				"style": {
-					"navigationBarTitleText": "零售店注销"
+					"navigationBarTitleText": "积分商城"
+				}
+			}, {
+				"path": "shopping/inline_shop",
+				"style": {
+					"navigationStyle": "custom", // 隐藏系统导航栏
+					"navigationBarTextStyle": "white"
 				}
-
 			}, {
-				"path": "register_3",
+				"path": "shopping/inline_shop_details",
+				"style": {
+					"navigationBarTitleText": "商品详情"
+				}
+			}
+		]
+	}, {
+		"root": "pages/msg",
+		"pages": [{
+				"path": "System-message/index",
+				"style": {
+					"navigationBarTitleText": "系统消息"
+				}
+			},
+			// 订单详情页面
+			{
+				"path": "Order-details/index",
 				"style": {
-					"navigationBarTitleText": "零售店注销"
+					"navigationBarTitleText": "订单详情"
 				}
 
-			}]
-		},
-		{
-			"root": "pages/me",
-			"pages": [
-				//我的供应商
-				{
-					"path": "suppliers",
-					"style": {
-						"navigationBarTitleText": "我的供应商",
-						"navigationBarBackgroundColor": "#1692F7"
-					}
-				},
-				//优惠卷
-				{
-					"path": "coupon",
-					"style": {
-						"navigationBarTitleText": "我的优惠卷"
-					}
-				},
-				//新建收货地址
-				{
-					"path": "modify",
-					"style": {
-						"navigationBarTitleText": "新建收货地址"
-					}
-				},
-				//收货地址
-				{
-					"path": "address",
-					"style": {
-						"navigationBarTitleText": "收货地址",
-						"app-plus": {
-							"titleNView": {
-								"buttons": [{
-									"text": "编辑",
-									"fontSize": "18px",
-									"float": "right"
-								}]
-							}
+			}
+		]
+	}, {
+		"root": "pages/me",
+		"pages": [
+			//我的供应商
+			{
+				"path": "suppliers",
+				"style": {
+					"navigationBarTitleText": "我的供应商",
+					"navigationBarBackgroundColor": "#1692F7"
+				}
+			},
+			//优惠卷
+			{
+				"path": "coupon",
+				"style": {
+					"navigationBarTitleText": "我的优惠卷"
+				}
+			},
+			//新建收货地址
+			{
+				"path": "modify",
+				"style": {
+					"navigationBarTitleText": "新建收货地址"
+				}
+			},
+			//收货地址
+			{
+				"path": "address",
+				"style": {
+					"navigationBarTitleText": "收货地址",
+					"app-plus": {
+						"titleNView": {
+							"buttons": [{
+								"text": "编辑",
+								"fontSize": "18px",
+								"float": "right"
+							}]
 						}
 					}
 				}
-			
+			},
+			//查询结果
+			{
+				"path": "scancodequery/scan",
+				"style": {
+					"navigationBarTitleText": "胎号查询",
+					"app-plus": {
+						"bounce": "none" //取消页面上的回弹效果
+					}
+				}
 			},
 			//查询结果
 			{
@@ -238,9 +183,78 @@
 						"bounce": "none" //取消页面上的回弹效果
 					}
 				}
-			]
-		}
-	],
+			},
+			//入库明细
+			{
+				"path": "Warehousing-details/index",
+				"style": {
+					"navigationBarTitleText": "入库明细"
+				}
+
+			},
+			// 出库明细
+			{
+				"path": "Delivery-details/index",
+				"style": {
+					"navigationBarTitleText": "出库明细"
+				}
+
+			},
+			// 奖励明细
+			{
+				"path": "Reward-details/index",
+				"style": {
+					"navigationBarTitleText": "奖励明细"
+				}
+
+			},
+			// 结算中心页面
+			{
+				"path": "Settlement-center/index",
+				"style": {
+					"navigationBarTitleText": "结算中心"
+				}
+
+			},
+			// 统计任务页面
+			{
+				"path": "Statistical-task/index",
+				"style": {
+					"navigationBarTitleText": "任务统计"
+				}
+
+			},
+			// 核销管理页面
+			{
+				"path": "Write-off-management/index",
+				"style": {
+					"navigationBarTitleText": "核销管理"
+				}
+
+			}
+		]
+	}, {
+		"root": "pages/login",
+		"pages": [{
+			"path": "register",
+			"style": {
+				"navigationBarTitleText": "零售店注销"
+			}
+
+		}, {
+			"path": "register_2",
+			"style": {
+				"navigationBarTitleText": "零售店注销"
+			}
+
+		}, {
+			"path": "register_3",
+			"style": {
+				"navigationBarTitleText": "零售店注销"
+			}
+
+		}]
+	}],
 	"preloadRule": {},
 	"globalStyle": {
 		"navigationBarBackgroundColor": "#0095FF",

+ 24 - 8
pages/home/index.vue

@@ -14,18 +14,18 @@
 				<u-notice-bar mode="horizontal" :list="noticebarList" :volume-icon="false" bg-color="#F4F4F4" color="#2B2B2B"></u-notice-bar>
 			</view>
 			<view class="u-flex u-row-around u-m-15">
-				<u-image width="330rpx" height="128rpx" src="../../static/sailun/scan_in.png"></u-image>
-				<u-image width="330rpx" height="128rpx" src="../../static/sailun/scan_out.png"></u-image>
+				<u-image width="330rpx" height="128rpx" src="../../static/sailun/scan_in.png" @click="scancodeIn"></u-image>
+				<u-image width="330rpx" height="128rpx" src="../../static/sailun/scan_out.png" @click="scancodeOut"></u-image>
 			</view>
 			<view>
 				<view class="u-m-l-30">
 					快捷服务
 				</view>
 				<view class="u-flex u-flex-wrap u-row-center">
-					<u-image width="340rpx" height="200rpx" src="../../static/sailun/1.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 25rpx;"></u-image>
+					<u-image width="340rpx" height="200rpx" src="../../static/sailun/1.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 25rpx;" @click="inStock"></u-image>
 					<u-image width="340rpx" height="200rpx" src="../../static/sailun/2.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 25rpx;"></u-image>
-					<u-image width="340rpx" height="200rpx" src="../../static/sailun/3.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 25rpx;"></u-image>
-					<u-image width="340rpx" height="200rpx" src="../../static/sailun/4.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 25rpx;"></u-image>
+					<u-image width="340rpx" height="200rpx" src="../../static/sailun/3.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 25rpx;" @click="inInlineshop"></u-image>
+					<u-image width="340rpx" height="200rpx" src="../../static/sailun/4.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 25rpx;" @click="inIntegral"></u-image>
 				</view>
 			</view>
 			<view class="u-flex u-row-center u-m-t-30">
@@ -80,12 +80,28 @@
 			};
 		},
 		methods: {
-			submit() {
+			scancodeIn(){
 				this.$u.route({
-					url: 'pages/login/index',
-					type: 'redirectTo'
+					url: 'pages/home/scancode/index',
 				})
 			},
+			scancodeOut(){
+				this.$u.route({
+					url: 'pages/home/scancode/index',
+				})
+			},
+			inStock(){
+			},
+			inInlineshop(){
+				this.$u.route({
+					url: 'pages/home/shopping/inline_shop',
+				})
+			},
+			inIntegral(){
+				this.$u.route({
+					url: 'pages/home/shopping/integral_mall',
+				})
+			}
 		}
 	}
 </script>

+ 6 - 1
pages/home/scancode/index.vue

@@ -35,7 +35,7 @@
 			</view>
 		</view>
 		<view class="determine">
-			<u-button type="primary" :ripple="true" shape="circle">扫码确认</u-button>
+			<u-button type="primary" :ripple="true" shape="circle" @click="scancodein">扫码确认</u-button>
 		</view>
 		<view>
 		</view>
@@ -81,6 +81,11 @@
 				this.number = val
 				this.tips = "胎号"
 				this.bug()
+			},
+			scancodein(){
+				this.$u.route({
+					url: 'pages/home/Scan-code-in/index',
+				})
 			}
 		}
 	}

+ 6 - 1
pages/home/shopping/inline_shop.vue

@@ -21,7 +21,7 @@
 			</u-sticky>
 			<u-waterfall v-model="flowList" ref="uWaterfall">
 				<template v-slot:left="{leftList}">
-					<view class="demo-warter" v-for="(item, index) in leftList" :key="index">
+					<view class="demo-warter" v-for="(item, index) in leftList" :key="index" @click="inDetails">
 						<!-- 警告:微信小程序中需要hx2.8.11版本才支持在template中结合其他组件,比如下方的lazy-load组件 -->
 						<u-lazy-load threshold="-450" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
 						<view class="demo-title">
@@ -266,6 +266,11 @@
 			},
 			clear() {
 				this.$refs.uWaterfall.clear();
+			},
+			inDetails(){
+				this.$u.route({
+					url: 'pages/home/shopping/inline_shop_details',
+				})
 			}
 		}
 	}

+ 6 - 1
pages/home/shopping/inline_shop_details.vue

@@ -54,7 +54,7 @@
 				</view>
 			</view> -->
 			<view class="right">
-				<view class="cart btn u-line-1">加入购物车</view>
+				<view class="cart btn u-line-1" @click="inShopcar">加入购物车</view>
 				<view class="buy btn u-line-1">立即购买</view>
 			</view>
 		</view>
@@ -99,6 +99,11 @@
 			tabChange: function(params) {
 				this.tabCurrent = params
 				console.log(params)
+			},
+			inShopcar(){
+				this.$u.route({
+					url: 'pages/home/shopping/shopping_car',
+				})
 			}
 		}
 	}

+ 0 - 0
pages/Delivery-details/index.vue → pages/me/Delivery-details/index.vue


+ 0 - 0
pages/Reward-details/index.vue → pages/me/Reward-details/index.vue


+ 1 - 1
pages/Settlement-center/index.vue → pages/me/Settlement-center/index.vue

@@ -145,7 +145,7 @@
 	.top {
 		width: 750rpx;
 		height: 331rpx;
-		background: url(../../static/sailun/background.png) no-repeat;
+		background: url(../../../static/sailun/background.png) no-repeat;
 		background-size: 750rpx 331rpx;
 	}
 

+ 1 - 1
pages/Statistical-task/index.vue → pages/me/Statistical-task/index.vue

@@ -192,7 +192,7 @@
 	.qiun-charts {
 		width: 750rpx;
 		height: 331rpx;
-		background: url(../../static/sailun/background.png) no-repeat;
+		background: url(../../../static/sailun/background.png) no-repeat;
 		background-size: 750rpx 331rpx;
 
 	}

+ 0 - 0
pages/Warehousing-details/index.vue → pages/me/Warehousing-details/index.vue


+ 0 - 0
pages/Write-off-management/index.vue → pages/me/Write-off-management/index.vue


+ 1 - 0
pages/me/address.vue

@@ -1,3 +1,4 @@
+<!-- 收货地址页面 -->
 <template>
 	<view>
 		<view class="item" v-for="(res, index) in siteList" :key="res.id">

+ 1 - 0
pages/me/coupon.vue

@@ -1,3 +1,4 @@
+<!-- 优惠价页面 -->
 <template>
 	<view>
 		<u-tabs class="switch" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>

+ 48 - 16
pages/me/index.vue

@@ -103,7 +103,7 @@
 					</view>
 					<view slot="body">
 						<view class="u-flex u-row-around u-flex-wrap">
-							<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="inInstore">
 								<view>
 									<u-image width="80rpx" height="80rpx" :src="src" :lazy-load="true" shape="circle">
 									</u-image>
@@ -112,40 +112,40 @@
 									入库明细
 								</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="inOutstore">
 								<view>
 									<u-image width="80rpx" height="80rpx" :src="src" :lazy-load="true" shape="circle">
 									</u-image>
 								</view>
 								<view style="font-weight: 500;color: #000000;">
-									库明细
+									库明细
 								</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="inReward">
 								<view>
 									<u-image width="80rpx" height="80rpx" :src="src" :lazy-load="true" shape="circle">
 									</u-image>
 								</view>
 								<view style="font-weight: 500;color: #000000;">
-									入库明细
+									奖励明细
 								</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="inStatistical">
 								<view>
 									<u-image width="80rpx" height="80rpx" :src="src" :lazy-load="true" shape="circle">
 									</u-image>
 								</view>
 								<view style="font-weight: 500;color: #000000;">
-									入库明细
+									任务统计
 								</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="inresult">
 								<view>
 									<u-image width="80rpx" height="80rpx" :src="src" :lazy-load="true" shape="circle">
 									</u-image>
 								</view>
 								<view style="font-weight: 500;color: #000000;">
-									入库明细
+									胎号查询
 								</view>
 							</view>
 							
@@ -155,25 +155,25 @@
 									</u-image>
 								</view>
 								<view style="font-weight: 500;color: #000000;">
-									入库明细
+									门店订单
 								</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="inCoupon">
 								<view>
 									<u-image width="80rpx" height="80rpx" :src="src" :lazy-load="true" shape="circle">
 									</u-image>
 								</view>
 								<view style="font-weight: 500;color: #000000;">
-									入库明细
+									我的优惠券
 								</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="inSuppliers">
 								<view>
 									<u-image width="80rpx" height="80rpx" :src="src" :lazy-load="true" shape="circle">
 									</u-image>
 								</view>
 								<view style="font-weight: 500;color: #000000;">
-									入库明细
+									我的供应商
 								</view>
 							</view>
 						</view>
@@ -192,7 +192,6 @@
 				</u-cell-group>
 			</view>
 		</view>
-		2
 		<!-- 与包裹页面所有内容的元素u-page同级, -->
 		<u-tabbar v-model="current" :list="list"></u-tabbar>
 	</view>
@@ -231,7 +230,40 @@
 			};
 		},
 		methods:{
-			inStore(){
+			inInstore(){
+				this.$u.route({
+					url: 'pages/me/Warehousing-details/index',
+				})
+			},
+			inOutstore(){
+				this.$u.route({
+					url: 'pages/me/Delivery-details/index',
+				})
+			},
+			inReward(){
+				this.$u.route({
+					url: 'pages/me/Reward-details/index',
+				})
+			},
+			inStatistical(){
+				this.$u.route({
+					url: 'pages/me/Statistical-task/index',
+				})
+			},
+			inresult(){
+				this.$u.route({
+					url: 'pages/me/scancodequery/scan',
+				})
+			},
+			inCoupon(){
+				this.$u.route({
+					url: 'pages/me/coupon',
+				})
+			},
+			inSuppliers(){
+				this.$u.route({
+					url: 'pages/me/suppliers',
+				})
 			}
 		}
 	}

+ 1 - 0
pages/me/modify.vue

@@ -1,3 +1,4 @@
+<!-- 修改,新增收货地址页面 -->
 <template>
 	<view class="wrap">
 		<view class="top">

+ 0 - 126
pages/me/result.vue

@@ -1,126 +0,0 @@
-<template>
-	<view>
-		<view class="head">
-			<view class="tips">
-				<image src="../../../static/sailun/successful.png" mode=""></image>
-				<view>查询成功</view>
-			</view>
-			<view class="stripe"></view>
-			<view class="roll">
-				<view>232654561651</view>
-				<view>
-					<view></view>
-					<view></view>
-					<u-line color="#f4f4f4" border-style="dashed" :hair-line="true" length="94%" style="margin: 0 auto;padding-top: 30rpx;" />
-				</view>
-				<view class="Exhibition">
-					<view><text>轮胎胎号</text><text>232654561651</text></view>
-					<view><text>轮胎类型</text><text>扫码出库</text></view>
-					<view><text>轮胎品牌</text><text>赛轮轮胎</text></view>
-					<view><text>轮胎规格</text><text>12R22.5</text></view>
-					<view><text>创建时间</text><text>2020-02-22 10:22:23</text></view>
-				</view>
-			</view>
-			<u-button type="primary" shape="circle" class="button">继续查询</u-button>
-		</view>
-	</view>
-</template>
-
-<script>
-</script>
-
-<style lang="scss" scoped>
-	.button {
-		width: 90%;
-		margin-top: 200rpx;
-	}
-
-	.head {
-		width: 750rpx;
-		height: 440rpx;
-		background-color: #0095FF;
-
-		.stripe {
-			width: 650rpx;
-			height: 30rpx;
-			background: rgba(0, 0, 0, 0.2);
-			border-radius: 12rpx;
-			margin: 0 auto;
-			margin-top: 40rpx;
-		}
-
-		.roll>view:nth-child(1) {
-			font-size: 42rpx;
-			font-weight: bold;
-			color: #0192FD;
-			text-align: center;
-			margin-bottom: 50rpx;
-		}
-
-		.roll {
-			width: 600rpx;
-			height: auto;
-			background: #FFFFFF;
-			margin: 0 auto;
-			margin-top: -15rpx;
-			box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(101, 176, 249, 0.3);
-			border-bottom-left-radius: 10rpx;
-			border-bottom-right-radius: 10rpx;
-			padding-top: 50rpx;
-			padding-bottom: 40rpx;
-
-			view:nth-child(2) {
-				width: 100%;
-				height: auto;
-
-				view:nth-child(1),
-					{
-					width: 50rpx;
-					height: 50rpx;
-					background-color: #F4F4F4;
-					border-radius: 100%;
-					float: left;
-					margin-left: -30rpx;
-				}
-
-				view:nth-child(2) {
-					width: 50rpx;
-					height: 50rpx;
-					background-color: #F4F4F4;
-					border-radius: 100%;
-					float: right;
-					margin-right: -30rpx;
-				}
-			}
-		}
-
-		.tips {
-			text-align: center;
-
-			image {
-				margin-top: 60rpx;
-				width: 106rpx;
-				height: 112rpx;
-			}
-
-			view {
-				margin-top: 50rpx;
-				color: #FFFFFF;
-				font-size: 32rpx;
-				font-weight: bold;
-			}
-		}
-	}
-
-	.Exhibition {
-		width: 94%;
-		margin: 0 auto;
-		margin-top: 25rpx;
-	}
-	.Exhibition>view{
-		margin-bottom: 10rpx;
-	}
-	.Exhibition>view>text:nth-child(2) {
-		float: right;
-	}
-</style>

+ 1 - 0
pages/me/scancodequery/result.vue

@@ -1,3 +1,4 @@
+<!-- 胎号查询成功页面 -->
 <template>
 	<view>
 		<view class="head">

+ 20 - 1
pages/me/scancodequery/scan.vue

@@ -1,10 +1,29 @@
 <template>
 	<view class="">
-		11111111111
+		<view class="" @click="inResult">
+			扫码
+		</view>
+
 	</view>
 </template>
 
 <script>
+	export default {
+		data() {
+			return {
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			inResult(){
+				this.$u.route({
+					url: 'pages/me/scancodequery/result',
+				})
+			}
+		},
+	}
 </script>
 
 <style>

+ 1 - 0
pages/me/suppliers.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 经销商基本信息 -->
 	<view class="whole">
 		<view class="head">
 			<view class="behind">

+ 0 - 0
pages/Order-details/index.vue → pages/msg/Order-details/index.vue


+ 6 - 2
pages/System-message/index.vue → pages/msg/System-message/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 系统消息页面 -->
 	<view class="header">
-		<view class="content" v-for="(item,index) in datalist">
+		<view class="content" v-for="(item,index) in datalist" @click="inDetails">
 			<view class="content-one">
 				<text class="content-one-first">{{item.title}}</text>
 				<text class="content-one-second">{{item.data}}</text>
@@ -154,7 +154,11 @@
 		},
 
 		methods: {
-
+			inDetails(){
+				this.$u.route({
+					url: 'pages/msg/Order-details/index',
+				})	
+			}
 		},
 	}
 </script>

+ 6 - 1
pages/msg/index.vue

@@ -2,7 +2,7 @@
 	<view>
 
 		<view class="u-page">
-			<u-swipe-action :show="item.show" :index="index" v-for="(item, index) in msgList" :key="item.id" @click="click" @open="open"
+			<u-swipe-action :show="item.show" :index="index" v-for="(item, index) in msgList" :key="item.id" @click="click" @content-click="inSystem" @open="open"
 			 :options="options">
 				<view class="item u-border-bottom">
 					<image mode="aspectFill" :src="item.images" />
@@ -121,6 +121,11 @@
 				this.list.map((val, idx) => {
 					if (index != idx) this.list[idx].show = false;
 				})
+			},
+			inSystem(){
+				this.$u.route({
+					url: 'pages/msg/System-message/index',
+				})
 			}
 		}
 	};