Merge branch 'test' of git.echepei.com:sailun/sailun-tbr-web into test

.gitignore

@@ -1 +1,2 @@
-unpackage
+unpackage
+.idea

App.vue

@@ -27,4 +27,8 @@
 	.uni-input-placeholder {
 		color: #B2B2B2 !important;
 	}
+	page{
+		height: 100%;
+		background-color: #F4F4F4;
+	}
 </style>

manifest.json

@@ -89,6 +89,41 @@
                     }
                 }
             }
+        },
+        "nativePlugins" : {
+            "Mpaas-Scan" : {
+                "License" : "",
+                "WorkspaceId" : "",
+                "AppId" : "_UNI_0C3473D",
+                "__plugin_info__" : {
+                    "name" : "支付宝原生扫码插件",
+                    "description" : "支付宝原生扫码组件，包体积仅0.7MB，15分钟即可完成接入。同时，mPaaS提供「扫码分析」大盘",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=2636",
+                    "android_package_name" : "com.sailuntbr.store",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "2636",
+                    "parameters" : {
+                        "License" : {
+                            "des" : "Android平台的License,，请填写Android的config文件中的mpaasConfigLicense对应的值",
+                            "key" : "mpaasConfigLicense",
+                            "value" : ""
+                        },
+                        "WorkspaceId" : {
+                            "des" : "Android平台的WorkspaceId，请填写Android的config文件中的workspaceId对应的值",
+                            "key" : "workspaceId",
+                            "value" : ""
+                        },
+                        "AppId" : {
+                            "des" : "Android平台的AppId，请填写Android的config文件中的appId对应的值",
+                            "key" : "mobilegw.appid",
+                            "value" : ""
+                        }
+                    }
+                }
+            }
         }
     },
     "quickapp" : {},

pages.json

@@ -74,7 +74,8 @@
         "pages": [{
             "path" : "shopping_car/shopping_car",
             "style" : {
-                "navigationBarTitleText": "购物车"
+               "navigationStyle": "custom" ,// 隐藏系统导航栏
+               "navigationBarTextStyle": "white"
             }
         }
         ,{
@@ -91,18 +92,65 @@
             }
         }
         ,{
-            "path" : "mallMenu/index1",
+            "path" : "inline_shop_details/inline_shop_details",
             "style" : {
-                "navigationBarTitleText": "商品筛选"
-            }
-        }
-        ,{
-            "path" : "mallMenu/index2",
-            "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"
+							}]
+						}
+					}
+				}
+			
+			},
+			//查询结果
+			{
+				"path": "scancodequery/result",
+				"style": {
+					"navigationBarTitleText": "查询结果",
+					"app-plus": {
+						"bounce": "none" //取消页面上的回弹效果
+					}
+				}
+			}
+		]
+	}],
 	"preloadRule": {},
 	"globalStyle": {
 		"navigationBarBackgroundColor": "#0095FF",

pages/me/address.vue

@@ -0,0 +1,139 @@
+<template>
+	<view>
+		<view class="item" v-for="(res, index) in siteList" :key="res.id">
+			<view class="top">
+				<view class="name">{{ res.name }}</view>
+				<view class="phone">{{ res.phone }}</view>
+				<view class="tag">
+					<text v-for="(item, index) in res.tag" :key="index" :class="{red:item.tagText=='默认'}">{{ item.tagText }}</text>
+				</view>
+			</view>
+			<view class="bottom">
+				广东省深圳市宝安区 自由路66号
+				<u-icon name="edit-pen" :size="40" color="#999999"></u-icon>
+			</view>
+		</view>
+		<view class="addSite" @tap="toAddSite">
+			<view class="add">
+				<u-icon name="plus" color="#ffffff" class="icon" :size="30"></u-icon>新建收货地址
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			siteList: []
+		};
+	},
+	onLoad() {
+		this.getData();
+	},
+	methods: {
+		getData() {
+			this.siteList = [
+				{
+					id: 1,
+					name: '游X',
+					phone: '183****5523',
+					tag: [
+						{
+							tagText: '默认'
+						},
+						{
+							tagText: '家'
+						}
+					],
+					site: '广东省深圳市宝安区 自由路66号'
+				},
+				{
+					id: 2,
+					name: '李XX',
+					phone: '183****5555',
+					tag: [
+						{
+							tagText: '公司'
+						}
+					],
+					site: '广东省深圳市宝安区 翻身路xx号'
+				},
+				{
+					id: 3,
+					name: '王YY',
+					phone: '153****5555',
+					tag: [],
+					site: '广东省深圳市宝安区 平安路13号'
+				}
+			];
+		},
+		toAddSite(){
+			uni.navigateTo({
+			    url: '/pages/me/modify'
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.item {
+	padding: 40rpx 20rpx;
+	.top {
+		display: flex;
+		font-weight: bold;
+		font-size: 34rpx;
+		.phone {
+			margin-left: 60rpx;
+		}
+		.tag {
+			display: flex;
+			font-weight: normal;
+			align-items: center;
+			text {
+				display: block;
+				width: 60rpx;
+				height: 34rpx;
+				line-height: 34rpx;
+				color: #ffffff;
+				font-size: 20rpx;
+				border-radius: 6rpx;
+				text-align: center;
+				margin-left: 30rpx;
+				background-color:rgb(49, 145, 253);
+			}
+			.red{
+				background-color:red
+			}
+		}
+	}
+	.bottom {
+		display: flex;
+		margin-top: 20rpx;
+		font-size: 28rpx;
+		justify-content: space-between;
+		color: #999999;
+	}
+}
+.addSite {
+	display: flex;
+	justify-content: space-around;
+	width: 600rpx;
+	line-height: 100rpx;
+	position: absolute;
+	bottom: 30rpx;
+	left: 80rpx;
+	background-color: #0095FF;
+	border-radius: 60rpx;
+	font-size: 30rpx;
+	.add{
+		display: flex;
+		align-items: center;
+		color: #ffffff;
+		.icon{
+			margin-right: 10rpx;
+		}
+	}
+}
+</style>

pages/me/coupon.vue

@@ -0,0 +1,292 @@
+<template>
+	<view>
+		<u-tabs class="switch" :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+		<view class="u-wrap">
+			<view class="jingdong">
+				<view class="left">
+					<view class="sum">
+						￥
+						<text class="num">100</text>
+					</view>
+					<view class="type">
+						<image class="logo" src="../../static/sailun/sailun_coupon.png" mode=""></image>
+					</view>
+				</view>
+				<view class="right">
+					<view class="top">
+						<view class="title">
+							<h3>100元优惠卷</h3>
+						</view>
+						<view class="bottom">
+							<view class="date u-line-1">2020.10.31到期</view>
+							<view class="immediate-use">可使用</view>
+						</view>
+						<view class="Subhead">
+						</view>
+					</view>
+					<view class="Subhead_s">
+						详细信息
+					</view>
+				</view>
+			</view>
+			<view class="eject">
+				<u-collapse style="width: 98.9%;">
+					<u-collapse-item>
+						<view class="pullout_a">
+							<view class="pullout">
+								<view>扫码门店：某某门店</view>
+								<view class="left">
+									<view>扫码胎号: 45616516165</view>
+									<view>扫码时间: 2020-3-10 8:10:34</view>
+								</view>
+								<view class="right">
+									<view>领劵订单: 2020031001000001</view>
+									<view>入库条码：A93989895393</view>
+								</view>
+							</view>
+						</view>
+					</u-collapse-item>
+				</u-collapse>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [{
+					name: '未使用'
+				}, {
+					name: '已使用'
+				}, {
+					name: '已失效'
+				}],
+				current: 0,
+			}
+		},
+		methods: {
+			change(index) {
+				this.current = index;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.u-wrap {
+		padding: 24rpx;
+		margin-top: -50rpx;
+	}
+	.switch{
+		margin-bottom: 20rpx;
+	}
+
+	.pullout_a {
+		background-color: #FFFFFF;
+		height: 110rpx;
+		border-radius: 10rpx;
+		margin-top: -5rpx;
+	}
+
+	.pullout {
+		width: 96%;
+		margin: 0 auto;
+		font-size: 22rpx;
+
+		.left {
+			float: left;
+		}
+
+		.right {
+			float: right;
+		}
+	}
+
+	.pullout>view:nth-child(1) {
+		margin-top: 0rpx;
+		color: #0096DF;
+	}
+	.pullout>view{
+		margin-top: 10rpx;
+	}
+
+	.eject {
+		margin-top: -70rpx;
+
+		.u-collapse-title {
+			margin-left: 100rpx;
+		}
+	}
+
+	.Subhead {
+		margin-top: 70rpx;
+	}
+
+	.Subhead_s {
+		margin-top: 10rpx;
+	}
+
+	.meituan {
+		margin: 30rpx auto;
+		background-color: #ffffff;
+		width: 700rpx;
+		color: $u-type-warning;
+		font-size: 28rpx;
+
+		.content {
+			display: flex;
+			align-items: center;
+			padding: 80rpx 20rpx;
+			border: 10rpx;
+			background-color: #fff5f4;
+
+			.left {
+				.sum {
+					font-size: 32rpx;
+
+					.num {
+						font-size: 60rpx;
+						font-weight: bold;
+					}
+				}
+			}
+
+			.centre {
+				margin-left: 40rpx;
+
+				.title {
+					font-size: 32rpx;
+					font-weight: bold;
+					color: $u-main-color;
+					margin-bottom: 20rpx;
+				}
+			}
+
+			.right {
+				margin-left: 30rpx;
+
+				.immediate-use {
+					padding: 0 20rpx;
+					height: 50rpx;
+					border-radius: 25rpx;
+					line-height: 50rpx;
+					background-color: $u-type-warning !important;
+					color: #ffffff !important;
+					font-size: 24rpx;
+					border: none;
+					word-break: keep-all;
+				}
+			}
+		}
+	}
+
+	.jingdong {
+		margin-top: 20rpx;
+		width: 700rpx;
+		height: auto;
+		display: flex;
+
+		.left {
+			width: 250rpx;
+			padding: 0 30rpx;
+			background-image: url(../../static/sailun/coupon-background.png);
+			background-repeat: no-repeat;
+			background-size: 100% 100%;
+			text-align: center;
+			font-size: 28rpx;
+			color: #ffffff;
+
+			.sum {
+				margin-top: 50rpx;
+				font-weight: bold;
+				font-size: 32rpx;
+
+				.num {
+					font-size: 80rpx;
+				}
+			}
+
+			.type {
+				margin-bottom: 50rpx;
+				font-size: 24rpx;
+
+				.logo {
+					width: 180rpx;
+					height: 40rpx;
+				}
+			}
+		}
+
+		.right {
+			padding: 20rpx 20rpx 0;
+			width: 700rpx;
+			font-size: 28rpx;
+			border-bottom-right-radius: 10rpx;
+			border-top-right-radius: 10rpx;
+			background-color: #fff;
+
+			.top {
+				border-bottom: 2rpx dashed $u-border-color;
+
+				.title {
+					margin-right: 60rpx;
+					line-height: 40rpx;
+				}
+
+				.bottom {
+					display: flex;
+					margin-top: 20rpx;
+					align-items: center;
+					justify-content: space-between;
+					margin-bottom: 10rpx;
+
+					.date {
+						font-size: 20rpx;
+						flex: 1;
+					}
+
+					.immediate-use {
+						height: auto;
+						padding: 0 20rpx;
+						font-size: 24rpx;
+						border-radius: 40rpx;
+						line-height: 40rpx;
+						color: #3995FF;
+						border: 2px solid #3995FF;
+						margin-left: 130rpx;
+					}
+				}
+			}
+
+			.tips {
+				width: 100%;
+				line-height: 50rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				font-size: 24rpx;
+
+				.transpond {
+					margin-right: 10rpx;
+				}
+
+				.explain {
+					display: flex;
+					align-items: center;
+				}
+
+				.particulars {
+					width: 30rpx;
+					height: 30rpx;
+					box-sizing: border-box;
+					padding-top: 8rpx;
+					border-radius: 50%;
+					background-color: $u-type-info-disabled;
+					text-align: center;
+				}
+			}
+		}
+	}
+</style>

pages/me/modify.vue

@@ -0,0 +1,165 @@
+<template>
+	<view class="wrap">
+		<view class="top">
+			<view class="item">
+				<view class="left">收货人</view>
+				<input type="text" placeholder-class="line" placeholder="请填写收货人姓名" />
+			</view>
+			<view class="item">
+				<view class="left">手机号码</view>
+				<input type="text" placeholder-class="line" placeholder="请填写收货人手机号" />
+			</view>
+			<view class="item" @tap="showRegionPicker">
+				<view class="left">所在地区</view>
+				<input disabled type="text" placeholder-class="line" placeholder="省市区县、乡镇等" />
+			</view>
+			<view class="item address">
+				<view class="left">详细地址</view>
+				<textarea type="text" placeholder-class="line" placeholder="街道、楼牌等" />
+			</view>
+		</view>
+		<view class="bottom">
+			<view class="tag">
+				<view class="left">标签</view>
+				<view class="right">
+					<text class="tags">家</text>
+					<text class="tags">公司</text>
+					<view class="tags plus"><u-icon size="22" name="plus"></u-icon></view>
+				</view>
+			</view>
+			<view class="default">
+				<view class="left">
+					<view class="set">设置默认地址</view>
+					<view class="tips">提醒：每次默认推荐该地址</view>
+				</view>
+				<view class="right"><switch color="#0095FF" @change="setDefault" /></view>
+			</view>
+		</view>
+		<u-picker mode="region" ref="uPicker" v-model="show" />
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			show: false
+		};
+	},
+	methods: {
+		setDefault() {},
+		showRegionPicker() {
+			this.show = true;
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+/deep/ .line {
+	color: $u-light-color;
+	font-size: 28rpx;
+}
+.wrap {
+	background-color: #f2f2f2;
+	.top {
+		background-color: #ffffff;
+		border-top: solid 2rpx $u-border-color;
+		padding: 22rpx;
+		.item {
+			display: flex;
+			font-size: 32rpx;
+			line-height: 100rpx;
+			align-items: center;
+			border-bottom: solid 2rpx $u-border-color;
+			.left {
+				width: 180rpx;
+			}
+			input {
+				text-align: left;
+			}
+		}
+		
+		.address {
+			padding: 20rpx 0;
+			textarea {
+				// width: 100%;
+				height: 150rpx;
+				background-color: #f7f7f7;
+				line-height: 60rpx;
+				margin: 40rpx auto;
+				padding: 20rpx;
+			}
+		}
+		.site-clipboard {
+			padding-right: 40rpx;
+			textarea {
+				// width: 100%;
+				height: 150rpx;
+				background-color: #f7f7f7;
+				line-height: 60rpx;
+				margin: 40rpx auto;
+				padding: 20rpx;
+			}
+			.clipboard {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 26rpx;
+				color: $u-tips-color;
+				height: 80rpx;
+				.icon {
+					margin-top: 6rpx;
+					margin-left: 10rpx;
+				}
+			}
+		}
+	}
+	.bottom {
+		margin-top: 20rpx;
+		padding: 40rpx;
+		padding-right: 0;
+		background-color: #ffffff;
+		font-size: 28rpx;
+		.tag {
+			display: flex;
+			.left {
+				width: 160rpx;
+			}
+			.right {
+				display: flex;
+				flex-wrap: wrap;
+				.tags {
+					width: 140rpx;
+					padding: 16rpx 8rpx;
+					border: solid 2rpx $u-border-color;
+					text-align: center;
+					border-radius: 50rpx;
+					margin: 0 10rpx 20rpx;
+					display: flex;
+					font-size: 28rpx;
+					align-items: center;
+					justify-content: center;
+					color: $u-content-color;
+					line-height: 1;
+				}
+				.plus {
+					//padding: 10rpx 0;
+				}
+			}
+		}
+		.default {
+			margin-top: 50rpx;
+			display: flex;
+			justify-content: space-between;
+			border-bottom: solid 2rpx $u-border-color;
+			line-height: 64rpx;
+			.tips {
+				font-size: 24rpx;
+			}
+			.right {
+			}
+		}
+	}
+}
+</style>

pages/me/result.vue

@@ -0,0 +1,126 @@
+<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>

pages/me/scancodequery/result.vue

@@ -0,0 +1,126 @@
+<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>

pages/me/scancodequery/scan.vue

@@ -0,0 +1,11 @@
+<template>
+	<view class="">
+		11111111111
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

pages/me/suppliers.vue

@@ -0,0 +1,107 @@
+<template>
+	<view class="whole">
+		<view class="head">
+			<view class="behind">
+				<view class="content">
+					<view class="content_s">
+						<view class="title">
+							<view></view>
+							<h3>经销商基本信息</h3>
+						</view>
+						<view class="information">
+							<u-field style="margin-top: 5rpx;" v-model="mobile" label-width="10" icon="chat-fill" placeholder="暂无数据" disabled="disabled"></u-field>
+							<u-field style="margin-top: 5rpx;" v-model="code" label-width="10" icon="chat-fill" placeholder="暂无数据" disabled="disabled"></u-field>
+							<u-field style="margin-top: 5rpx;" v-model="code_s" label-width="10" icon="chat-fill" placeholder="暂无数据" disabled="disabled"></u-field>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="below">
+			<view class="content">
+				<view class="content_s">
+					<view class="title">
+						<view></view>
+						<h3>经销商基本信息</h3>
+					</view>
+					<view class="information_E">
+						<image src="../../static/sailun/anyu.png" mode=""></image>
+						<image src="../../static/sailun/heiqishi.png" mode=""></image>
+						<image src="../../static/sailun/anyu.png" mode=""></image>
+						<image src="../../static/sailun/heiqishi.png" mode=""></image>
+						<image src="../../static/sailun/anyu.png" mode=""></image>
+						<image src="../../static/sailun/heiqishi.png" mode=""></image>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+			data() {
+				return {
+					mobile: '经销商名称',
+					code: '张三',
+					code_s: '13412336446'
+				}
+			}
+		}
+</script>
+
+<style lang="scss" scoped>
+	.behind {
+		width: 750rpx;
+		// height: 462rpx;
+		height: auto;
+		background: url(../../static/sailun/behind.png) no-repeat;
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+		margin-top:-150rpx;
+		padding-top: 100px;
+	}
+	.below{
+		margin-top: 30rpx;
+	}
+	.content {
+		width: 667rpx;
+		height: auto;
+		background: #FFFFFF;
+		box-shadow: 0px 10px 40px 0px rgba(223, 223, 223, 0.51);
+		border-radius: 18px;
+		margin: 0 auto;
+		padding-top: 30rpx;
+		margin-top: -10rpx;
+		padding-bottom: 40rpx;
+
+		.content_s {
+			width: 92%;
+			// height: 330rpx;
+			height: auto;
+			margin: 0 auto;
+			margin-top: 10rpx;
+			.information{
+				margin-top: 10rpx;
+			}
+			.information_E{
+				image{
+					width: 48%;
+					height: 100rpx;
+				}
+			}
+			.title {
+				border-bottom: 1rpx solid #EBEBEB;
+				padding-bottom: 15rpx;
+				view {
+					width: 6px;
+					height: 20px;
+					background: #0292FD;
+					float: left;
+					margin-right: 10rpx;
+					margin-top: 5rpx;
+				}
+			}
+		}
+	}
+</style>

pages/shopping/inline_shop/inline_shop.vue

@@ -10,7 +10,7 @@
 			<u-sticky >
 				<view class="filter-wrap wrap-flex">
 					<u-button :custom-style="buttonCustomStyle" :hair-line="false" hover-class="none" @click="handleGo('mallMenu1')">全部</u-button>
-					<u-dropdown>
+					<u-dropdown style="position: static;">
 						<u-dropdown-item v-model="brandValue" title="品牌" :options="brandOptions"></u-dropdown-item>
 						<u-dropdown-item v-model="patternValue" title="花纹" :options="patternOptions"></u-dropdown-item>
 					</u-dropdown>
@@ -235,7 +235,7 @@
 			}, 1000)
 		},
 		methods: {
-			handleGoMeg: function(value) {
+			handleGo: function(value) {
 				var urlStr = ""
 				switch (value) {
 					case "msg":

pages/shopping/inline_shop_details/inline_shop_details.vue

@@ -0,0 +1,246 @@
+<template>
+	<view>
+		<!-- 线上订货详情页 -->
+		<view class="demo-warter">
+			<u-swiper height="750" :list="goodsDetails.imageList" image="image"></u-swiper>
+			<view class="demo-info">
+				<view class="demo-title">
+					{{goodsDetails.title}}
+				</view>
+				<!-- <view class="demo-price">
+					{{goodsDetails.price}}元
+				</view> -->
+				<!-- <view class="demo-tag">
+					<view class="demo-tag-owner">
+						自营
+					</view>
+					<view class="demo-tag-text">
+						放心购
+					</view>
+				</view> -->
+				<view class="demo-shop">
+					库存：{{goodsDetails.count}}
+				</view>
+				<view class="demo-count">
+					<view class="demo-count-seleced">
+						已选：{{selectedCount}}
+					</view>
+					<view class="demo-count-box">
+						<u-number-box v-model="selectedCount" :min="1" @change="selectedCountChange"></u-number-box>
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-sticky :enable="tabEnable" :offset-top="tabOffset">
+			<u-tabs class="tabCustomStyle" :list="tabList" :is-scroll="false" :current="tabCurrent" @change="tabChange"
+			 :bg-color="tabBg"></u-tabs>
+		</u-sticky>
+		<!-- 这里装商品和详情的内容 -->
+		<view style="height: 750px;"></view>
+		<view class="navigation">
+			<!-- <view class="left">
+				<view class="item">
+					<u-icon name="server-fill" :size="40" :color="$u.color['contentColor']"></u-icon>
+					<view class="text u-line-1">客服</view>
+				</view>
+				<view class="item">
+					<u-icon name="home" :size="40" :color="$u.color['contentColor']"></u-icon>
+					<view class="text u-line-1">店铺</view>
+				</view>
+				<view class="item car">
+					<u-badge class="car-num" :count="9" type="error" :offset="[-3, -6]"></u-badge>
+					<u-icon name="shopping-cart" :size="40" :color="$u.color['contentColor']"></u-icon>
+					<view class="text u-line-1">购物车</view>
+				</view>
+			</view> -->
+			<view class="right">
+				<view class="cart btn u-line-1">加入购物车</view>
+				<view class="buy btn u-line-1">立即购买</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				goodsDetails: {
+					price: 35,
+					title: '175/70R14 88T XL SH08 BGSL',
+					count: '100',
+					image: 'https://img12.360buyimg.com/n7/jfs/t16642/126/2693663818/450163/6879e8ce/5b06d93bN6305bd94.png',
+					imageList: [{
+						price: 35,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img12.360buyimg.com/n7/jfs/t16642/126/2693663818/450163/6879e8ce/5b06d93bN6305bd94.png',
+					}, {
+						price: 35,
+						title: '175/70R14 88T XL SH08 BGSL',
+						count: '100',
+						image: 'https://img12.360buyimg.com/n7/jfs/t1/47645/22/6120/140457/5d3d17deEec9f8e8d/3687ff03ca89b48c.jpg',
+					}],
+				},
+				selectedCount: 0, //选中的商品数量
+				tabList: [{
+					name: '商品'
+				}, {
+					name: '详情'
+				}],
+				tabCurrent: 0,
+				tabBg: "#ffffff",
+				tabEnable: false,
+				tabOffset: 0
+			}
+		},
+		methods: {
+			selectedCountChange: function() {},
+			tabChange: function(params) {
+				this.tabCurrent = params
+				console.log(params)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.demo-warter {
+		border-radius: 8px;
+		background-color: #ffffff;
+		position: relative;
+	}
+
+	.demo-info {
+		margin: 5px;
+		padding: 8px;
+	}
+
+	.u-close {
+		position: absolute;
+		top: 32rpx;
+		right: 32rpx;
+	}
+
+	.demo-image {
+		width: 100%;
+		border-radius: 4px;
+	}
+
+	.demo-title {
+		font-size: 30rpx;
+		margin-top: 5px;
+		color: $u-main-color;
+	}
+
+	.demo-tag {
+		display: flex;
+		margin-top: 5px;
+	}
+
+	.demo-tag-owner {
+		background-color: $u-type-error;
+		color: #FFFFFF;
+		display: flex;
+		align-items: center;
+		padding: 4rpx 14rpx;
+		border-radius: 50rpx;
+		font-size: 20rpx;
+		line-height: 1;
+	}
+
+	.demo-tag-text {
+		border: 1px solid $u-type-primary;
+		color: $u-type-primary;
+		margin-left: 10px;
+		border-radius: 50rpx;
+		line-height: 1;
+		padding: 4rpx 14rpx;
+		display: flex;
+		align-items: center;
+		border-radius: 50rpx;
+		font-size: 20rpx;
+	}
+
+	.demo-price {
+		font-size: 30rpx;
+		color: $u-type-error;
+		margin-top: 5px;
+	}
+
+	.demo-shop {
+		font-size: 22rpx;
+		color: $u-tips-color;
+		margin-top: 5px;
+	}
+
+	.demo-count {
+		display: flex;
+		font-size: 22rpx;
+		margin-top: 5px;
+		justify-content: space-between;
+		font-weight: 600;
+	}
+
+	.tabCustomStyle {
+		border-top: 8rpx solid #EFEFEF;
+		border-bottom: 8rpx solid #EFEFEF;
+	}
+
+	/* 底部提交栏目 */
+	.navigation {
+		display: flex;
+		width: 100%;
+		margin-top: 100rpx;
+		border: solid 2rpx #f2f2f2;
+		background-color: #ffffff;
+		padding: 16rpx 26rpx;
+		position: fixed;
+		bottom: 0;
+		z-index: 100;
+		.left {
+			display: flex;
+			font-size: 20rpx;
+
+			.item {
+				margin: 0 30rpx;
+
+				&.car {
+					text-align: center;
+					position: relative;
+
+					.car-num {
+						position: absolute;
+						top: -10rpx;
+						right: -10rpx;
+					}
+				}
+			}
+		}
+
+		.right {
+			display: flex;
+			font-size: 28rpx;
+			align-items: center;
+			width: 100%;
+			.btn {
+				line-height: 66rpx;
+				padding: 0 30rpx;
+				border-radius: 36rpx;
+				color: #ffffff;
+				text-align: center;
+			}
+
+			.cart {
+				background-color: #ed3f14;
+				width: 50%;
+				margin-right: 30rpx;
+			}
+
+			.buy {
+				width: 50%;
+				background-color: #ff7900;
+			}
+		}
+	}
+</style>

pages/shopping/integral_mall/integral_mall.vue

@@ -0,0 +1,373 @@
+<template>
+	<view>
+		<!-- 积分商城 -->
+		<u-sticky>
+			<view class="filter-wrap wrap-flex">
+				<u-button :custom-style="buttonCustomStyle" :hair-line="false" hover-class="none" @click="handleGo('mallMenu1')">精选</u-button>
+				<u-dropdown style="position: static;">
+					<u-dropdown-item v-model="brandValue" title="品牌" :options="brandOptions"></u-dropdown-item>
+				</u-dropdown>
+				<u-button :custom-style="buttonCustomStyle" :hair-line="false" hover-class="none" @click="showFilterPopup=true">分类
+					<u-icon name="grid"></u-icon>
+				</u-button>
+				<u-search placeholder="请输入商品名称或种类" :animation="true" :style="inputCustomStyle" :show-action="false" v-model="keyword" @focus="inputFocus" @blur="inputBlur"></u-search>
+			</view>
+		</u-sticky>
+		<view class="page-box">
+			<view class="order" >
+				<view class="item" v-for="(item, index) in goodsList" :key="index">
+					<view class="left"><image :src="item.goodsUrl" mode="aspectFill"></image></view>
+					<view class="content">
+						<view class="title u-line-2">{{ item.title }}</view>
+						<view class="type">{{ item.type }}</view>
+						<!-- <view class="delivery-time">发货时间 {{ item.deliveryTime }}</view> -->
+						<view class="price-row">
+							<view class="price">
+								{{ item.price }}积分
+							</view>
+							<view class="exchange">立即兑换</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<u-loadmore :status="loadStatus" bgColor="#f2f2f2"></u-loadmore>
+		</view>
+		<u-popup v-model="showFilterPopup" mode="right" width="60%">
+			<view class="filter-title">分类</view>
+			<block v-for="(item,index) in tabbar" :key="index">
+				<scroll-view scroll-y class="right-box">
+					<view class="page-view">
+						<view class="class-item">
+							<view class="item-title">
+								<text>{{item.name}}</text>
+							</view>
+							<view class="item-container">
+								<view class="thumb-box" v-for="(item1, index1) in item.foods" :key="index1">
+									<view class="item-menu-name">{{item1.value}}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</block>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				buttonCustomStyle: {
+					border: "none"
+				},
+				brandValue: "",
+				brandOptions: [{
+					label: "赛轮",
+					value: "SAILUN"
+				}, {
+					label: "金宇",
+					value: "jinyu"
+				}],
+				keyword: "",
+				inputCustomStyle: {},
+				showFilterPopup: false,
+				tabbar: [{
+					"name": "品牌",
+					"foods": [{
+							"value": "赛轮",
+							"label": "SAILUN",
+						},
+						{
+							"value": "金宇",
+							"label": "jinyu",
+						},
+					]
+				}],
+				loadStatus: "false",
+				goodsList: [],
+				list: [
+					{
+						goodsUrl: 'https://img12.360buyimg.com/n7/jfs/t16642/126/2693663818/450163/6879e8ce/5b06d93bN6305bd94.png',
+						title: '【胎动】T-M3蘑菇钉，24支/盒， 3mm ',
+						type: '胎动品牌；修补类型；普通积分',
+						deliveryTime: '付款后30天内发货',
+						price: '348.58',
+						number: 2
+					},
+					{
+						goodsUrl: 'https://img12.360buyimg.com/n7/jfs/t1/47645/22/6120/140457/5d3d17deEec9f8e8d/3687ff03ca89b48c.jpg',
+						title: '【胎动】T-M3蘑菇钉，24支/盒， 3mm ',
+						type: '胎动品牌；修补类型；普通积分',
+						deliveryTime: '付款后30天内发货',
+						price: '135.00',
+						number: 1
+					},
+					{
+						goodsUrl: 'https://img11.360buyimg.com/n7/jfs/t1/88990/24/4208/105799/5de4c6e9E24bc09d0/f810effb14c9c13a.jpg',
+						title: '【胎动】T-M3蘑菇钉，24支/盒， 3mm ',
+						type: '胎动品牌；修补类型；普通积分',
+						deliveryTime: '付款后7天内发货',
+						price: '128.05',
+						number: 1
+					},
+					{
+						goodsUrl: 'https://img12.360buyimg.com/n7/jfs/t1/93698/23/4500/114562/5de713dfEfc997085/e8deaa979909851d.jpg',
+						title: '【胎动】T-M3蘑菇钉，24支/盒， 3mm ',
+						type: '胎动品牌；修补类型；普通积分',
+						deliveryTime: '保质5年',
+						price: '1998',
+						number: 3
+					},
+					{
+						goodsUrl: 'https://img11.360buyimg.com/n7/jfs/t16642/126/2693663818/450163/6879e8ce/5b06d93bN6305bd94.png',
+						title: '【胎动】T-M3蘑菇钉，24支/盒， 3mm ',
+						type: '胎动品牌；修补类型；普通积分',
+						deliveryTime: '保质5年',
+						price: '2354',
+						number: 1
+					},
+					{
+						goodsUrl: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+						title: '【胎动】T-M3蘑菇钉，24支/盒， 3mm ',
+						type: '胎动品牌；修补类型；普通积分',
+						deliveryTime: '珍藏10年好酒',
+						price: '1543',
+						number: 3
+					},
+					{
+						goodsUrl: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+						title: '【胎动】T-M3蘑菇钉，24支/盒， 3mm ',
+						type: '胎动品牌；修补类型；普通积分',
+						deliveryTime: '口感好',
+						price: '120',
+						number: 1
+					},
+					{
+						goodsUrl: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+						title: '【胎动】T-M3蘑菇钉，24支/盒， 3mm ',
+						type: '胎动品牌；修补类型；普通积分',
+						deliveryTime: '使用方便',
+						price: '451',
+						number: 9
+					}
+				]
+			}
+		},
+		onLoad() {
+			this.addRandomData();
+		},
+		onReachBottom() {
+			this.loadStatus = 'loading';
+			// 模拟数据加载
+			setTimeout(() => {
+				this.addRandomData();
+				this.loadStatus = 'loadmore';
+			}, 1000)
+		},
+		methods: {
+			inputFocus: function(){
+				console.log(111);
+				this.inputCustomStyle = {
+					position: "absolute",
+					zIndex: "100",
+					width: "98%",
+					margin: "6rpx 1%"
+				};
+			},
+			inputBlur: function(){
+				this.inputCustomStyle = {};
+			},
+			handleGo: function(value) {
+				var urlStr = ""
+				switch (value) {
+					case "msg":
+						urlStr: "../../msg/index";
+						break;
+					case "mallMenu1":
+						urlStr: "../../mallMenu/index1";
+						break;
+					case "mallMenu2":
+						urlStr: "../../mallMenu2/index2";
+						break;
+				};
+				uni.switchTab({
+					url: urlStr
+				});
+			},
+			addRandomData() {
+				for (let i = 0; i < 10; i++) {
+					let index = this.$u.random(0, this.list.length - 1);
+					// 先转成字符串再转成对象，避免数组对象引用导致数据混乱
+					let item = JSON.parse(JSON.stringify(this.list[index]))
+					item.id = this.$u.guid();
+					this.goodsList.push(item);
+				}
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.wrap-flex {
+		display: flex;
+	}
+
+	.filter-wrap {
+		background: #ffffff;
+	}
+
+	.filter-title {
+		background: #F6F6F6;
+		padding: 16rpx;
+	}
+
+	.class-item {
+		margin-bottom: 30rpx;
+		background-color: #fff;
+		padding: 16rpx;
+		border-radius: 8rpx;
+	}
+
+	.class-item:last-child {
+		min-height: 100vh;
+	}
+
+	.item-title {
+		font-size: 26rpx;
+		color: $u-main-color;
+		font-weight: bold;
+	}
+
+	.item-menu-name {
+		font-weight: normal;
+		font-size: 24rpx;
+		color: $u-main-color;
+	}
+
+	.item-container {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.thumb-box {
+		width: 33.333333%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		margin: 20px 16rpx 0;
+		background: #f6f6f6;
+		padding: 8rpx;
+	}
+
+	.order {
+		width: 710rpx;
+		background-color: #ffffff;
+		margin: 20rpx auto;
+		border-radius: 20rpx;
+		box-sizing: border-box;
+		padding: 20rpx;
+		font-size: 28rpx;
+		.top {
+			display: flex;
+			justify-content: space-between;
+			.left {
+				display: flex;
+				align-items: center;
+				.store {
+					margin: 0 10rpx;
+					font-size: 32rpx;
+					font-weight: bold;
+				}
+			}
+			.right {
+				color: $u-type-warning-dark;
+			}
+		}
+		.item {
+			display: flex;
+			margin: 20rpx 0 0;
+			.left {
+				margin-right: 20rpx;
+				image {
+					width: 200rpx;
+					height: 200rpx;
+					border-radius: 10rpx;
+				}
+			}
+			.content {
+				.title {
+					font-size: 28rpx;
+					line-height: 50rpx;
+				}
+				.type {
+					margin: 10rpx 0;
+					font-size: 24rpx;
+					color: $u-tips-color;
+				}
+				.delivery-time {
+					color: #e5d001;
+					font-size: 24rpx;
+				}
+				.price-row{
+					display: flex;
+					justify-content: space-between;
+					margin: 10rpx 0;
+					font-size: 26rpx;
+					.price{
+						color: #FF0000;
+					}
+					.exchange{
+						background: #0094FE;
+						color: #FFFFFF;
+						padding: 4rpx 16rpx;
+						line-height: 1.5;
+					}
+				}
+			}
+			.right {
+				margin-left: 10rpx;
+				padding-top: 20rpx;
+				text-align: right;
+				.decimal {
+					font-size: 24rpx;
+					margin-top: 4rpx;
+				}
+				.number {
+					color: $u-tips-color;
+					font-size: 24rpx;
+				}
+			}
+		}
+		.total {
+			margin-top: 20rpx;
+			text-align: right;
+			font-size: 24rpx;
+			.total-price {
+				font-size: 32rpx;
+			}
+		}
+		.bottom {
+			display: flex;
+			margin-top: 40rpx;
+			padding: 0 10rpx;
+			justify-content: space-between;
+			align-items: center;
+			.btn {
+				line-height: 52rpx;
+				width: 160rpx;
+				border-radius: 26rpx;
+				border: 2rpx solid $u-border-color;
+				font-size: 26rpx;
+				text-align: center;
+				color: $u-type-info-dark;
+			}
+			.evaluate {
+				color: $u-type-warning-dark;
+				border-color: $u-type-warning-dark;
+			}
+		}
+	}
+</style>

pages/shopping/shopping_car/shopping_car.vue

@@ -0,0 +1,415 @@
+<template>
+	<view class="page">
+		<!-- 购物车 -->
+		<u-navbar title="购物车" :background="background" title-color="#ffffff" back-icon-color="#ffffff" is-fixed>
+			<template slot="right">
+				<text class="navbar-button" v-show="enbleEdit==false" @click="enbleEdit=true">编辑</text>
+				<text class="navbar-button" v-show="enbleEdit==true" @click="enbleEdit=false">完成</text>
+			</template>
+		</u-navbar>
+		<u-checkbox-group class="order" @change="checkboxGroupChange">
+			<u-checkbox @change="checkboxChange" style="width: 100%;" v-model="item.checked" shape="circle" v-for="(item,index) in goodsList" :key="item.id" :name="item.id">
+				<view class="item">
+					<view class="left">
+						<image :src="item.goodsUrl" mode="aspectFill"></image>
+					</view>
+					<view class="content">
+						<view class="title u-line-2">{{ item.title }}</view>
+						<view class="type">{{ item.type }}</view>
+						<!-- <view class="delivery-time">发货时间 {{ item.deliveryTime }}</view> -->
+						<view class="price-row">
+							<view class="brand">
+								{{ item.brand }}
+							</view>
+							<view class="demo-count-box">
+								<u-number-box v-model="selectedCount" :min="1" @change="selectedCountChange"></u-number-box>
+							</view>
+						</view>
+					</view>
+				</view>
+			</u-checkbox>
+		</u-checkbox-group>
+		<u-loadmore :status="loadStatus" bgColor="#f2f2f2"></u-loadmore>
+		<view class="navigation">
+			<view class="left">
+				<view class="item">
+					<u-checkbox shape="circle" @change="checkedAll" v-model="checkedAllValue">全选</u-checkbox>
+				</view>
+			</view>
+			<view class="right" v-show="enbleEdit==false">
+				<view class="total">合计：<text>2条</text></view>
+				<view class="buy btn u-line-1" @click="handleSubmit">立即下单</view>
+			</view>
+			<view class="right" v-show="enbleEdit==true">
+				<view class="buy btn u-line-1" @click="handleDel">删除</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				background: {
+					backgroundColor: "#0291FD",
+					color: "#ffffff"
+
+				},
+				buttonCustomStyle: {
+					color: "#ffffff",
+					background: "transparent",
+					border: "none"
+				},
+				selectedCount: 0,
+				checkedAllValue: false,
+				enbleEdit: false,
+				loadStatus: "false",
+				goodsList: [],
+				list: [{
+						id: "1",
+						goodsUrl: 'https://img12.360buyimg.com/n7/jfs/t16642/126/2693663818/450163/6879e8ce/5b06d93bN6305bd94.png',
+						title: '【胎动】T-M3蘑菇钉，24支/盒， 3mm ',
+						type: '胎动品牌；修补类型；普通积分',
+						deliveryTime: '付款后30天内发货',
+						price: '348.58',
+						number: 2,
+						checked: false,
+						disabled: false,
+						brand: "SAILUN"
+					},
+					{
+						id: "2",
+						goodsUrl: 'https://img12.360buyimg.com/n7/jfs/t1/47645/22/6120/140457/5d3d17deEec9f8e8d/3687ff03ca89b48c.jpg',
+						title: '【胎动】T-M3蘑菇钉，24支/盒， 3mm ',
+						type: '胎动品牌；修补类型；普通积分',
+						deliveryTime: '付款后30天内发货',
+						price: '135.00',
+						number: 1,
+						checked: false,
+						disabled: false,
+						brand: "SAILUN"
+					},
+					{
+						id: "3",
+						goodsUrl: 'https://img11.360buyimg.com/n7/jfs/t1/88990/24/4208/105799/5de4c6e9E24bc09d0/f810effb14c9c13a.jpg',
+						title: '【胎动】T-M3蘑菇钉，24支/盒， 3mm ',
+						type: '胎动品牌；修补类型；普通积分',
+						deliveryTime: '付款后7天内发货',
+						price: '128.05',
+						number: 1,
+						checked: false,
+						disabled: false,
+						brand: "SAILUN"
+					},
+					{
+						id: "4",
+						goodsUrl: 'https://img12.360buyimg.com/n7/jfs/t1/93698/23/4500/114562/5de713dfEfc997085/e8deaa979909851d.jpg',
+						title: '【胎动】T-M3蘑菇钉，24支/盒， 3mm ',
+						type: '胎动品牌；修补类型；普通积分',
+						deliveryTime: '保质5年',
+						price: '1998',
+						number: 3,
+						checked: false,
+						disabled: false,
+						brand: "SAILUN"
+					},
+					{
+						id: "5",
+						goodsUrl: 'https://img11.360buyimg.com/n7/jfs/t16642/126/2693663818/450163/6879e8ce/5b06d93bN6305bd94.png',
+						title: '【胎动】T-M3蘑菇钉，24支/盒， 3mm ',
+						type: '胎动品牌；修补类型；普通积分',
+						deliveryTime: '保质5年',
+						price: '2354',
+						number: 1,
+						checked: false,
+						disabled: false,
+						brand: "SAILUN"
+					},
+					{
+						id: "6",
+						goodsUrl: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+						title: '【胎动】T-M3蘑菇钉，24支/盒， 3mm ',
+						type: '胎动品牌；修补类型；普通积分',
+						deliveryTime: '珍藏10年好酒',
+						price: '1543',
+						number: 3,
+						checked: false,
+						disabled: false,
+						brand: "SAILUN"
+					},
+					{
+						id: "7",
+						goodsUrl: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+						title: '【胎动】T-M3蘑菇钉，24支/盒， 3mm ',
+						type: '胎动品牌；修补类型；普通积分',
+						deliveryTime: '口感好',
+						price: '120',
+						number: 1,
+						checked: false,
+						disabled: false,
+						brand: "SAILUN"
+					},
+					{
+						id: "8",
+						goodsUrl: 'https://img10.360buyimg.com/n7/jfs/t1/68753/35/2229/118427/5d089fb7Ee5b93887/2e3bbc7fec247fdc.jpg',
+						title: '【胎动】T-M3蘑菇钉，24支/盒， 3mm ',
+						type: '胎动品牌；修补类型；普通积分',
+						deliveryTime: '使用方便',
+						price: '451',
+						number: 9,
+						checked: false,
+						disabled: false,
+						brand: "SAILUN"
+					}
+				]
+			}
+		},
+		onLoad() {
+			this.addRandomData();
+		},
+		onReachBottom() {
+			this.loadStatus = 'loading';
+			// 模拟数据加载
+			setTimeout(() => {
+				this.addRandomData();
+				this.loadStatus = 'loadmore';
+			}, 1000)
+		},
+		methods: {
+			selectedCountChange: function(){},
+			checkboxGroupChange: function(params) {
+				console.log(1)
+				console.log(params)
+			},
+			checkboxChange: function(params) {
+				if(!params.value){
+					this.checkedAllValue = false;
+				}
+			},
+			checkedAll: function(params) {
+				console.log(this.checkedAllValue)
+				if(params.value){
+					this.list.map(val => {
+						val.checked = true;
+					})
+				}else{
+					this.list.map(val => {
+						val.checked = false;
+					})
+				}
+				
+			},
+			handleSubmit: function(){},
+			handleDel: function(){},
+			addRandomData() {
+				for (let i = 0; i < 10; i++) {
+					let index = this.$u.random(0, this.list.length - 1);
+					// 先转成字符串再转成对象，避免数组对象引用导致数据混乱
+					let item = JSON.parse(JSON.stringify(this.list[index]))
+					item.id = this.$u.guid();
+					this.goodsList.push(item);
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page{
+		padding-bottom: 100rpx;
+	}
+	.navbar-button {
+		padding: 24rpx 26rpx;
+		display: inline-block;
+	}
+
+	.order {
+		width: 710rpx;
+		background-color: #ffffff;
+		margin: 20rpx auto;
+		border-radius: 20rpx;
+		box-sizing: content-box;
+		padding: 20rpx;
+		font-size: 28rpx;
+		.top {
+			display: flex;
+			justify-content: space-between;
+
+			.left {
+				display: flex;
+				align-items: center;
+
+				.store {
+					margin: 0 10rpx;
+					font-size: 32rpx;
+					font-weight: bold;
+				}
+			}
+
+			.right {
+				color: $u-type-warning-dark;
+			}
+		}
+
+		.item {
+			display: flex;
+			margin: 20rpx 0 0;
+
+			.left {
+				margin-right: 20rpx;
+
+				image {
+					width: 200rpx;
+					height: 200rpx;
+					border-radius: 10rpx;
+				}
+			}
+
+			.content {
+				.title {
+					font-size: 28rpx;
+					line-height: 50rpx;
+				}
+
+				.type {
+					margin: 10rpx 0;
+					font-size: 24rpx;
+					color: $u-tips-color;
+				}
+
+				.delivery-time {
+					color: #e5d001;
+					font-size: 24rpx;
+				}
+
+				.price-row {
+					display: flex;
+					justify-content: space-between;
+					margin: 10rpx 0;
+					font-size: 26rpx;
+
+					.price {
+						color: #FF0000;
+					}
+					.brand{
+						color: #999999;
+						background: #F3F3F3;
+						padding: 0 8rpx;
+						border-radius: 5rpx;
+					}
+					.exchange {
+						background: #0094FE;
+						color: #FFFFFF;
+						padding: 4rpx 16rpx;
+						line-height: 1.5;
+					}
+				}
+			}
+
+			.right {
+				margin-left: 10rpx;
+				padding-top: 20rpx;
+				text-align: right;
+
+				.decimal {
+					font-size: 24rpx;
+					margin-top: 4rpx;
+				}
+
+				.number {
+					color: $u-tips-color;
+					font-size: 24rpx;
+				}
+			}
+		}
+
+		.total {
+			margin-top: 20rpx;
+			text-align: right;
+			font-size: 24rpx;
+
+			.total-price {
+				font-size: 32rpx;
+			}
+		}
+
+		.bottom {
+			display: flex;
+			margin-top: 40rpx;
+			padding: 0 10rpx;
+			justify-content: space-between;
+			align-items: center;
+
+			.btn {
+				line-height: 52rpx;
+				width: 160rpx;
+				border-radius: 26rpx;
+				border: 2rpx solid $u-border-color;
+				font-size: 26rpx;
+				text-align: center;
+				color: $u-type-info-dark;
+			}
+
+			.evaluate {
+				color: $u-type-warning-dark;
+				border-color: $u-type-warning-dark;
+			}
+		}
+	}
+
+	.navigation {
+		display: flex;
+		width: 100%;
+		justify-content: space-between;
+		margin-top: 100rpx;
+		border: solid 2rpx #f2f2f2;
+		background-color: #ffffff;
+		padding: 16rpx 0;
+		position: fixed;
+		bottom: 0;
+		z-index: 100;
+		.left {
+			display: flex;
+			font-size: 20rpx;
+
+			.item {
+				margin: 0 30rpx;
+
+				&.car {
+					text-align: center;
+					position: relative;
+
+					.car-num {
+						position: absolute;
+						top: -10rpx;
+						right: -10rpx;
+					}
+				}
+			}
+		}
+
+		.right {
+			display: flex;
+			font-size: 28rpx;
+			align-items: center;
+
+			.btn {
+				line-height: 66rpx;
+				padding: 0 30rpx;
+				border-radius: 36rpx;
+				color: #ffffff;
+			}
+
+			.cart {
+				background-color: #ed3f14;
+				margin-right: 30rpx;
+			}
+
+			.buy {
+				margin: 0 16rpx;
+				background-color: #ff7900;
+			}
+		}
+	}
+</style>