修改订单详情

App.vue

@@ -151,5 +151,6 @@
 		--fffColor: #ffffff;
 		--f3CColor: #007AFF;
 		--fFB1Color: #7A7E83;
+		--fF0Color: #FF0000;
 	}
 </style>

main.js

@@ -15,6 +15,7 @@ Vue.prototype.$api = requestBase;
 Vue.prototype.$apifile = requestFile;
 // 配置文件
 import config from '@/config.js';
+// import '@/common/computed.js';
 Vue.prototype.$config = config;
 
 Vue.config.productionTip = false;

pages.json

@@ -20,13 +20,15 @@
 		{
 			"path": "pages/home/index",
 			"style": {
-				"navigationBarTitleText": "首页"
+				"navigationBarTitleText": "首页",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/good/index",
 			"style": {
-				"navigationBarTitleText": "所有商品"
+				"navigationBarTitleText": "所有商品",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -154,6 +156,17 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "pagesGoods",
+			"pages": [ //分包
+				{
+					"path": "goods/index",
+					"style": {
+						"navigationBarTitleText": "商品详情"
+					}
+				}
+			]
 		}
 	],
 	"globalStyle": {

pages/good/index.vue

@@ -60,12 +60,17 @@
 				scrollTop: 0,
 			}
 		},
-		async onShow() {
+		onLoad: function() {
 			const that = this;
-			that.clearPage();
 			that.searchToken();
 			that.searchConfig();
+			that.search();
+		},
+		onPullDownRefresh: async function() {
+			const that = this;
+			that.clearPages();
 			await that.search();
+			uni.stopPullDownRefresh();
 		},
 		methods: {
 			searchToken() {
@@ -161,7 +166,6 @@
 			// 左侧一级选择
 			toChange(index, e) {
 				const that = this;
-				that.$set(that, `list`, []);
 				that.$set(that, `active`, index);
 				that.$set(that, `type`, e.value);
 				that.clearPage();
@@ -178,7 +182,6 @@
 			// 清空总信息
 			clearPages() {
 				const that = this;
-				that.$set(that, `list`, [])
 				that.$set(that, `marketList`, [])
 				that.$set(that, `typeList`, [])
 				that.$set(that, `active`, '0')
@@ -190,21 +193,9 @@
 			toBuy(e) {
 				const that = this;
 				uni.navigateTo({
-					url: `/pagesHome/order/detail?id=${e.id||e._id}`
-				})
-			},
-			// 菜单跳转
-			toPath(e) {
-				let url = `/${e.route}`;
-				if (e.type == '0') uni.redirectTo({
-					url
+					url: `/pagesGoods/goods/index?id=${e.id||e._id}`
 				})
-				else {
-					uni.navigateTo({
-						url
-					})
-				}
-			},
+			}
 		}
 	}
 </script>
@@ -278,7 +269,7 @@
 
 							.num {
 								font-size: var(--font14Size);
-								color: #858585;
+								color: var(--f85Color);
 								margin: 0 0 1vw 0;
 							}
 						}

pages/home/index.vue

@@ -148,6 +148,13 @@
 			async change(e) {
 				console.log(e);
 			},
+			// 购买
+			toBuy(e) {
+				const that = this;
+				uni.navigateTo({
+					url: `/pagesGoods/goods/index?id=${e.id||e._id}`
+				})
+			},
 			// 分页
 			toPage(e) {
 				const that = this;

pages/market/index.vue

@@ -1,7 +1,73 @@
 <template>
 	<view class="content">
-		<view class="text-area">
-			<text class="title">{{title}}</text>
+		<view class="top" v-if="list.length !=0">
+			<view class="text_1">
+				<checkbox class="checkbox" @click="selectAll(false)" :checked="isAll">全选</checkbox>
+			</view>
+			<view class="text_2" v-if="num==0" @click="edit(1)">编辑</view>
+			<view class="text_2" v-if="num==1" @click="edit(0)">完成</view>
+		</view>
+		<view class="one" v-if="list.length==0&&user._id">
+			<view class="logo"><text class="iconfont icon-gouwuche"></text></view>
+			<view class="one_1">购物车空空如也~</view>
+			<view class="btn">
+				<button type="primary" size="mini" @click="toCommon('/pages/home/index')">去逛逛</button>
+			</view>
+		</view>
+		<view class="two" v-if="list.length !=0">
+			<scroll-view scroll-y="true" class="scroll-view">
+				<view class="list-scroll-view">
+					<checkbox-group name="checkbox" @change="marketChange">
+						<view class="list" v-for="(item, index) in list" :key="index">
+							<view class="list_2">
+								<view class="title">
+									<checkbox :value="item.shop" :checked="item.check">
+										<text class="iconfont icon-shangdian"></text>
+										{{item.shop_name}}
+									</checkbox>
+								</view>
+								<checkbox-group name="checkbox" @change="goodsChange">
+									<view class="content" v-for="gs in item.goods" :key="gs.goodsSpec_id">
+										<view class="box">
+											<checkbox :value="gs.goodsSpec_id" :checked="gs.check" />
+										</view>
+										<view class="img">
+											<image :src="getFile(gs)"></image>
+										</view>
+										<view class="one_1" v-if="num==0"
+											@click="toCommon('/pagesHome/order/detail',gs)">
+											<view class="name">{{gs.goods_name}}</view>
+											<view class="info">
+												<view class="title_1" v-if="gs.goodsSpec_name">
+													<text>规格:{{gs.goodsSpec_name}}</text>
+												</view>
+											</view>
+										</view>
+										<view class="money" v-if="num==0">
+											<view>¥{{gs.price}}</view>
+											<view>x{{gs.num}}</view>
+										</view>
+										<view class="num" v-if="num==1">
+											<uni-number-box @change="changeValue(gs)" name="num" value="gs" :min="1"
+												v-model="gs.num" />
+										</view>
+										<view class="del" v-if="num==1">
+											<text class="iconfont icon-del-copy" @click="toDel(gs)"></text>
+										</view>
+									</view>
+								</checkbox-group>
+							</view>
+						</view>
+					</checkbox-group>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="foot" v-if="list.length !=0">
+			<view class="total">总价：<text>￥{{totalMoney}}(不含运费)</text></view>
+			<view class="btn" v-if="hasCheck()">
+				<button type="primary" size="mini" @click="toSettle()" v-if="num==0">提交订单</button>
+				<button type="primary" size="mini" @click="toDel()" v-if="num==1">删除</button>
+			</view>
 		</view>
 	</view>
 </template>
@@ -10,29 +76,651 @@
 	export default {
 		data() {
 			return {
-				title: '购物车'
+				// 用户
+				user: {},
+				// 购物车列表
+				list: [],
+				// 全选
+				isAll: false,
+				// 编辑/完成按钮传的数字
+				num: 0,
+				// 总额
+				totalMoney: 0,
 			}
 		},
-		onLoad() {
-
+		onShow() {
+			const that = this;
+			that.searchToken();
 		},
 		methods: {
-
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) {
+						that.$set(that, `user`, res);
+						that.searchMarket();
+					}
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			// 查询购物车信息
+			async searchMarket() {
+				const that = this;
+				const res = await that.$api(`/Cart`, 'GET', {
+					user: that.user._id
+				});
+				if (res.errcode == '0') that.$set(that, `list`, res.data)
+			},
+			// 编辑
+			edit(num) {
+				const that = this;
+				that.$set(that, `num`, num)
+			},
+			//全选
+			selectAll(e) {
+				const that = this;
+				const list = that.list;
+				const isAll = that.isAll;
+				let data = [];
+				for (const val of list) {
+					let a = isAll ? false : true;
+					val.check = a;
+					for (let s of val.goods) {
+						s.check = a
+					}
+					data.push(val);
+				}
+				that.$set(that, `list`, data)
+				// 计算总额
+				that.countMoney();
+				// 赋值是否全选
+				that.$set(that, `isAll`, isAll ? false : true)
+			},
+			// 选择店铺
+			marketChange(e) {
+				const that = this;
+				const list = this.list;
+				const {
+					value
+				} = e.detail;
+				for (const p1 of list) {
+					let p2;
+					// 判断是套装还是正常商品
+					if (p1.is_set == '0') p2 = value.find((i) => i == p1._id);
+					else p2 = value.find((i) => i == p1.shop);
+					let a = p2 ? true : false;
+					p1.check = a;
+					for (let s of p1.goods) {
+						s.check = a
+					}
+				}
+				that.$set(that, `list`, list);
+				that.marketAllChange();
+				// 计算总额
+				that.countMoney();
+			},
+			//店铺全部选择true，全选自动选择，
+			marketAllChange() {
+				const that = this;
+				let list = that.list;
+				for (let val of list) {
+					if (val.check == true) {
+						that.$set(that, `isAll`, true)
+					} else {
+						that.$set(that, `isAll`, false)
+					}
+				}
+				that.$set(that, `list`, list)
+				// 计算总额
+				that.countMoney();
+			},
+			//选择商品
+			goodsChange(e) {
+				const that = this;
+				let list = that.list;
+				const {
+					value
+				} = e.detail;
+				let shop = list.find(f => f.goods.find(i => value.find(s => s == i.goodsSpec_id)))
+				if (shop) {
+					for (let val of shop.goods) {
+						let p2 = value.find((i) => i == val.goodsSpec_id);
+						if (p2) val.check = true;
+						else val.check = false;
+					}
+				} else {
+					list = list.map(i => {
+						i.goods = i.goods.map(g => ({
+							...g,
+							check: false
+						}))
+						return i;
+					})
+				}
+				that.$set(that, `list`, list)
+				that.goodsAllChange();
+				// 计算总额
+				that.countMoney();
+			},
+			//商品全部选择true，店铺自动选择，
+			// 所有店铺为true,则全选为true
+			goodsAllChange() {
+				const that = this;
+				let list = that.list;
+				list = list.map(i => {
+					const isAllSelect = i.goods.every(f => f.check);
+					if (isAllSelect) i.check = true;
+					else i.check = false;
+					return i;
+				})
+				const allSelect = list.every(e => e.check)
+				if (allSelect) this.$set(this, `isAll`, true)
+				else this.$set(this, `isAll`, false)
+				// 计算总额
+				that.countMoney();
+			},
+			// 加减商品数量
+			async changeValue(value) {
+				const that = this;
+				this.$nextTick(async () => {
+					let res;
+					const {
+						goodsSpec_id: goodsSpecId,
+						num,
+						cart_id: cartId
+					} = value
+					res = await that.$api(`/cart/checkGoodsNum`, 'GET', {
+						cartId,
+						goodsSpecId,
+						num
+					});
+					if (res.errcode === 0) {
+						const {
+							enough,
+							total
+						} = res.data
+						if (!enough) {
+							uni.showToast({
+								title: `库存最大为${total}`,
+								icon: 'error',
+							});
+							// 将该商品的库存量修改为最大值
+							value.num = total;
+						}
+					}
+					// 计算总额
+					that.countMoney();
+				})
+			},
+			// 删除, 接口,购物车删除,然后将该数据移除
+			async toDel(e) {
+				let list = this.list;
+				let set_list = [];
+				let goods_list = [];
+				uni.showModal({
+					title: '提示',
+					content: '请选择要删除的商品',
+					success: async (res) => {
+						if (!res.confirm) return
+						if (e?.cart_id) {
+							const result = await this.$api(`/cart/${e.cart_id}`, 'Delete');
+							if (result.errcode === 0) {
+								// 判断是套装还是正常商品
+								set_list = list.filter(i => i.is_set == '0')
+								goods_list = list.filter(i => i.is_set !== '0')
+								set_list = set_list.filter(i => i.cart_id !== e.cart_id)
+								goods_list = goods_list.map(i => ({
+									...i,
+									goods: i.goods.filter(f => f.cart_id !== e.cart_id)
+								}))
+								this.$set(this, `list`, [...set_list, ...goods_list]);
+								// 检查店铺内是否还有商品
+								this.checkShopGoodsExist();
+								// 计算总额
+								this.countMoney();
+							}
+						} else {
+							let goodsList = [];
+							let cartIds = [];
+							for (let val of this.list) {
+								// 判断是套装还是正常商品
+								if (val.is_set == '0') goodsList.push(val)
+								else goodsList.push(val.goods)
+							}
+							for (let val of goodsList) {
+								// 判断是套装还是正常商品
+								if (val.is_set == '0') {
+									if (val.check) cartIds.push(val.cart_id)
+								} else {
+									for (let set of val) {
+										if (set.check) cartIds.push(set.cart_id)
+									}
+								}
+							}
+							set_list = list.filter(i => i.is_set == '0')
+							goods_list = list.filter(i => i.is_set !== '0')
+							for (let val of cartIds) {
+								const result = await this.$api(`/cart/${val}`, 'Delete');
+								if (result.errcode === 0) {
+									// 判断是套装还是正常商品
+									set_list = set_list.filter(i => i.cart_id !== val)
+									goods_list = goods_list.map(i => ({
+										...i,
+										goods: i.goods.filter(f => f.cart_id !== val)
+									}))
+									this.$set(this, `list`, [...set_list, ...goods_list]);
+									// 检查店铺内是否还有商品
+									this.checkShopGoodsExist();
+									// 计算总额
+									this.countMoney();
+								}
+							}
+						}
+					}
+				});
+			},
+			//检查店铺内是否还有商品
+			checkShopGoodsExist() {
+				let list = this.list;
+				list = list.filter(f => f.goods && f.goods.length > 0)
+				this.$set(this, `list`, list);
+			},
+			// 计算总额
+			countMoney() {
+				const that = this;
+				const list = that.list;
+				let totalMoney = 0;
+				// 渲染结束执行下面方法
+				that.$nextTick(() => {
+					for (const val of list) {
+						// 判断是套装还是正常商品
+						if (val.is_set == '0') {
+							if (val.check == true) {
+								let total = that.$multiply(val.sell_money, val.num);
+								totalMoney += Number(total);
+							}
+						} else {
+							for (let s of val.goods) {
+								if (s.check == true) {
+									let total = that.$multiply(s.price, s.num);
+									totalMoney += Number(total);
+							}
+								}
+						}
+					}
+					that.$set(that, `totalMoney`, totalMoney.toFixed(2))
+				})
+			},
+			getFile(data) {
+				const file = data.file;
+				if (!file) return '';
+				if (file.length && file.length > 0) return file[0].url
+			},
+			// 去结算
+			async toSettle() {
+				// 将选中的购物车放到数组中,传回服务端进行检查.然后拿着key去订单页请求数据
+				let goodsList = [];
+				let cartIds = [];
+				for (let val of this.list) {
+					// 判断是套装还是正常商品
+					if (val.is_set == '0') goodsList.push(val)
+					else goodsList.push(val.goods)
+				}
+				for (let val of goodsList) {
+					// 判断是套装还是正常商品
+					if (val.is_set == '0') {
+						if (val.check) cartIds.push(val.cart_id)
+					} else {
+						for (let set of val) {
+							if (set.check) cartIds.push(set.cart_id)
+						}
+					}
+				}
+				const res = await this.$api(`/util/checkCartBuy`, 'POST', {
+					cartIds
+				});
+				if (res.errcode == '0') {
+					const {
+						data
+					} = res
+					if (data.result) {
+						const key = data.key;
+						uni.navigateTo({
+							url: `/pagesHome/order/order?key=${key}`
+						})
+					}
+				}
+			},
+			// 是否选中商品,控制提交订单按钮
+			hasCheck() {
+				return this.list.some(e => e.goods.some(eg => eg.check))
+			},
+			// 公共跳转
+			toCommon(route, e) {
+				uni.navigateTo({
+					url: `${route}?id=${e && e.goods_id}`
+				})
+			},
 		}
 	}
 </script>
 
-<style>
+<style lang="scss">
 	.content {
 		display: flex;
 		flex-direction: column;
-		align-items: center;
-		justify-content: center;
+		width: 100vw;
+		height: 92vh;
+		background-color: var(--footColor);
+
+		.top {
+			display: flex;
+			flex-direction: row;
+			background-color: var(--mainColor);
+			height: 35px;
+			margin: 0 0 4px 0;
+			padding: 5px 4vw;
+
+			.text_1 {
+				flex-grow: 1;
+				line-height: 30px;
+			}
+
+			.text_2 {
+				line-height: 35px;
+			}
+		}
+
+		.one {
+			text-align: center;
+			margin: 2vw 0;
+
+			.logo {
+				margin: 10vw 0 2vw 0;
+
+				.iconfont {
+					font-size: 35vw;
+				}
+			}
+
+			.one_1 {
+				margin: 3vw 0;
+			}
+
+			button {
+				background-color: var(--f3CColor);
+			}
+		}
+
+		.two {
+			position: relative;
+			flex-grow: 1;
+			margin: 0 2vw;
+
+			.list_1 {
+				background-color: var(--mainColor);
+				margin: 2vw 0 2vw 0;
+				padding: 2vw 3vw;
+				border-radius: 4px;
+
+				.title {
+					border-bottom: 1px solid var(--fcColor);
+					padding: 0 0 2vw 0;
+					font-size: var(--font18Size);
+
+					text {
+						margin: 0 1vw;
+					}
+				}
+
+				.content {
+					display: flex;
+					flex-direction: row;
+					padding: 2vw 0;
+					font-size: var(--font16Size);
+					border-bottom: 1px dashed var(--fcColor);
+
+					.img {
+						width: 20vw;
+						height: 20vw;
+						border-radius: 2vw;
+						border: 1px solid var(--fcColor);
+
+						image {
+							width: 20vw;
+							height: 20vw;
+						}
+					}
+
+					.one_1 {
+						margin: 0 2.5vw;
+						flex-grow: 1;
+
+
+						.info {
+							width: 100%;
+							display: flex;
+							flex-direction: row;
+
+							.title_1 {
+								font-size: 12px;
+								color: #666;
+								margin-top: 10px;
+
+								text {
+									background-color: #eee;
+									padding: 5px;
+								}
+							}
+						}
+					}
+
+					.money {
+						font-size: 14px;
+						margin-top: 2vw;
+						text-align: right;
+						flex-grow: 1;
+					}
+				}
+
+				.total {
+					display: flex;
+					justify-content: space-between;
+					padding: 1vw;
+
+					.total_1 {
+						font-size: 20px;
+						color: var(--fFB1Color);
+
+						text {
+							font-size: 12px;
+
+						}
+					}
+
+					.total_2 {
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+
+						.del {
+							margin: 0 0 0 3vw;
+						}
+					}
+				}
+			}
+
+			.list_2 {
+				background-color: var(--mainColor);
+				margin: 2vw 0 2vw 0;
+				padding: 2vw 3vw;
+				border-radius: 4px;
+
+				.title {
+					border-bottom: 1px solid var(--fcColor);
+					padding: 0 0 2vw 0;
+					font-size: var(--font18Size);
+
+					text {
+						margin: 0 1vw;
+					}
+				}
+
+				.content {
+					display: flex;
+					flex-direction: row;
+					padding: 2vw 0;
+					font-size: var(--font16Size);
+					border-bottom: 1px dashed var(--fcColor);
+
+					.box {
+						line-height: 20vw;
+					}
+
+					.img {
+						width: 20vw;
+						height: 20vw;
+						border-radius: 2vw;
+						border: 1px solid var(--fcColor);
+
+						image {
+							width: 20vw;
+							height: 20vw;
+						}
+					}
+
+					.one_1 {
+						margin: 0 2.5vw;
+						flex-grow: 1;
+
+						.info {
+							width: 100%;
+							display: flex;
+							flex-direction: row;
+
+							.title_1 {
+								font-size: 12px;
+								color: #666;
+								margin-top: 10px;
+
+								text {
+									background-color: #eee;
+									padding: 5px;
+								}
+							}
+
+							.gift {
+								margin: 2vw 1vw 0 0;
+								font-size: 12px;
+								color: #FFA500;
+								border: 1px solid #FFA500;
+								border-radius: 5px;
+								padding: 0 1vw;
+							}
+
+							.act {
+								margin: 2vw 0 0 0;
+								font-size: 12px;
+								border-radius: 5px;
+								padding: 0 1vw;
+								border: 1px solid var(--fFB1Color);
+								color: var(--fFB1Color);
+							}
+						}
+					}
+
+					.money {
+						margin-top: 2vw;
+						text-align: right;
+						flex-grow: 1;
+					}
+
+					.num {
+						margin: 6vw 4vw;
+						font-size: 20px;
+					}
+
+					.del {
+						margin: 6vw 0;
+						text-align: right;
+						flex-grow: 1;
+					}
+				}
+			}
+		}
+
+		.foot {
+			background-color: var(--fffColor);
+			display: flex;
+			flex-direction: row;
+			justify-content: space-between;
+			height: 44px;
+			padding: 0 0 0 6vw;
+			border-right: 1px solid var(--f99Color);
+
+			.total {
+				flex-grow: 1;
+				display: flex;
+				align-content: flex-end;
+				line-height: 40px;
+
+				text {
+					color: var(--fFB1Color);
+				}
+			}
+
+			.btn {
+				button {
+					width: 30vw;
+					height: 44px;
+					line-height: 44px;
+					border-radius: 0px;
+					background-color: var(--fFB1Color);
+					text-align: center;
+					font-weight: normal;
+					font-size: var(--font15Size);
+					color: var(--fffColor);
+				}
+			}
+		}
 	}
 
-	.text-area {
-		display: flex;
-		justify-content: center;
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
 	}
 
+	// 复选框样式
+	checkbox .wx-checkbox-input {
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 50%;
+		border-color: var(--f99Color);
+		background-color: var(--mainColor);
+	}
+
+	// 复选框选中样式
+	checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+		border-color: var(--fFB1Color);
+		background-color: var(--fFB1Color);
+	}
+
+	// 复选框选中之后对号的样式
+	checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
+		color: var(--fffColor);
+	}
 </style>

pagesGoods/goods/index.vue

@@ -0,0 +1,260 @@
+<template>
+	<view class="content">
+		<scroll-view scroll-y="true" class="scroll-view">
+			<view class="list-scroll-view">
+				<view class="one">
+					<view class="one_1">
+						<swiper class="swiper" circular :indicator-dots="true" indicator-color="#ffffff"
+							indicator-active-color="#007AFF" :interval="3000" :duration="1000">
+							<swiper-item class="list" v-for="(item,index) in fileList" :key="index">
+								<image class="image" :src="item.url" mode="aspectFit">
+								</image>
+							</swiper-item>
+						</swiper>
+					</view>
+					<view class="one_2">
+						<text class="money"><text>¥</text>{{info.money||0}}</text>
+					</view>
+					<view class="one_3">
+						<text class="num">已售{{info&&info.sell_num||0}}件</text>
+					</view>
+					<view class="one_4">
+						<view class="name">
+							{{info&&info.name}}
+						</view>
+						<view class="brief">
+							{{info&&info.brief||''}}
+						</view>
+					</view>
+					<view class="one_5">
+						<view class="list" v-for="(item,index) in fileList" :key="index">
+							<image class="image" :src="item.url" mode="aspectFit">
+							</image>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+		<view class="bottom">
+			<uni-goods-nav :fill="true" :options="options" :button-group="buttonGroup" @click="onClick"
+				@buttonClick="buttonClick" style="margin-top: 20px;" />
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 系统设置
+				config: {},
+				// 商品id
+				id: '',
+				// 当前用户信息
+				user: {},
+				// 商品详情
+				info: {},
+				// 轮播图
+				fileList: [],
+				// 底部商品导航
+				options: [{
+						icon: 'shop',
+						text: '店铺'
+					},
+					{
+						icon: 'cart',
+						text: '购物车',
+						info: 2,
+						infoBackgroundColor: '#007aff',
+						infoColor: "#f5f5f5"
+					}
+				],
+				buttonGroup: [{
+					text: '加入购物车',
+					backgroundColor: 'linear-gradient(90deg, #1E83FF, #0053B8)',
+					color: '#fff'
+				}],
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `id`, e.id || '');
+			that.searchConfig();
+			await that.search();
+		},
+		onShow: async function() {
+			const that = this;
+			that.searchToken();
+		},
+		methods: {
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) that.$set(that, `user`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			searchConfig() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('config');
+					if (res) that.$set(that, `config`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			// 查询商品详情
+			async search() {
+				const that = this;
+				let res;
+				res = await that.$api(`/Good/${that.id}`, 'GET', {})
+				if (res.errcode == '0') {
+					const arr = await that.$api(`/Specs`, 'GET', {
+						goods: res.data._id,
+						is_use: '0'
+					})
+					if (arr.errcode == '0') {
+						let data = arr.data.sort((a, b) => {
+							return a.money - b.money
+						})
+						if (data) res.data.money = data[0].money
+						that.$set(that, `info`, res.data);
+						that.$set(that, `fileList`, res.data.file);
+					}
+				}
+
+			},
+			onClick(e) {
+				uni.showToast({
+					title: `点击${e.content.text}`,
+					icon: 'none'
+				})
+			},
+			buttonClick(e) {
+				console.log(e)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+
+		.one {
+			position: relative;
+			flex-grow: 1;
+
+			.one_1 {
+				border-bottom: 0.5vw solid var(--f9Color);
+
+				swiper {
+					height: 44vh !important;
+				}
+
+				.list {
+					border-radius: 5px;
+
+					.image {
+						width: 100%;
+						height: 100%;
+						border-radius: 5px;
+						background-color: #fff;
+					}
+				}
+			}
+
+			.one_2 {
+				border-bottom: 0.5vw solid var(--f9Color);
+				padding: 2vw;
+
+				.money {
+					font-size: 20px;
+					padding: 0 1vw 0 0;
+					color: var(--fF0Color);
+					font-weight: bold;
+
+					text {
+						font-size: 14px;
+					}
+				}
+			}
+
+			.one_3 {
+				display: flex;
+				flex-wrap: wrap;
+				padding: 1vw;
+				border-bottom: 0.5vw solid var(--f9Color);
+			}
+
+
+			.one_4 {
+				border-bottom: 0.5vw solid var(--f9Color);
+				padding: 2vw;
+
+				.name {
+					width: 100%;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					word-break: break-all;
+					font-size: 17px;
+					font-weight: bold;
+					margin: 0 0 2vw 0;
+				}
+
+				.brief {
+					font-size: 14px;
+					color: var(--f85Color);
+					margin: 0 0 1vw 0;
+				}
+			}
+
+			.one_5 {
+				text-align: center;
+				margin: 0 0 15vw 0;
+
+				.list {
+
+					.image {
+						border-radius: 5px;
+						background-color: #fff;
+					}
+				}
+			}
+		}
+
+		.bottom {
+			width: 100vw;
+			position: fixed;
+			bottom: 0;
+			left: var(--window-left);
+			right: var(--window-right);
+		}
+	}
+
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
+	}
+</style>

unpackage/dist/dev/mp-weixin/app.json

@@ -29,6 +29,12 @@
         "spec/add",
         "shop/index"
       ]
+    },
+    {
+      "root": "pagesGoods",
+      "pages": [
+        "goods/index"
+      ]
     }
   ],
   "window": {

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -2464,5 +2464,6 @@ page {
   --fffColor: #ffffff;
   --f3CColor: #007AFF;
   --fFB1Color: #7A7E83;
+  --fF0Color: #FF0000;
 }
 

unpackage/dist/dev/mp-weixin/pages/good/index.js

@@ -194,13 +194,18 @@ var _default =
       scrollTop: 0 };
 
   },
-  onShow: function onShow() {var _this = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {var that;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:
-              that = _this;
-              that.clearPage();
-              that.searchToken();
-              that.searchConfig();_context.next = 6;return (
-                that.search());case 6:case "end":return _context.stop();}}}, _callee);}))();
+  onLoad: function onLoad() {
+    var that = this;
+    that.searchToken();
+    that.searchConfig();
+    that.search();
   },
+  onPullDownRefresh: function () {var _onPullDownRefresh = _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {var that;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:
+              that = this;
+              that.clearPages();_context.next = 4;return (
+                that.search());case 4:
+              uni.stopPullDownRefresh();case 5:case "end":return _context.stop();}}}, _callee, this);}));function onPullDownRefresh() {return _onPullDownRefresh.apply(this, arguments);}return onPullDownRefresh;}(),
+
   methods: {
     searchToken: function searchToken() {
       var that = this;
@@ -229,8 +234,8 @@ var _default =
       }
     },
     // 查询左侧一级列表
-    search: function search() {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee2() {var that, res;return _regenerator.default.wrap(function _callee2$(_context2) {while (1) {switch (_context2.prev = _context2.next) {case 0:
-                that = _this2;_context2.next = 3;return (
+    search: function search() {var _this = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee2() {var that, res;return _regenerator.default.wrap(function _callee2$(_context2) {while (1) {switch (_context2.prev = _context2.next) {case 0:
+                that = _this;_context2.next = 3;return (
 
                   that.$api("/DictData", 'GET', {
                     is_use: '0',
@@ -245,8 +250,8 @@ var _default =
                 }case 5:case "end":return _context2.stop();}}}, _callee2);}))();
     },
     // 查询产品
-    searchMarket: function searchMarket(e) {var _this3 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee3() {var that, info, res, list;return _regenerator.default.wrap(function _callee3$(_context3) {while (1) {switch (_context3.prev = _context3.next) {case 0:
-                that = _this3;
+    searchMarket: function searchMarket(e) {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee3() {var that, info, res, list;return _regenerator.default.wrap(function _callee3$(_context3) {while (1) {switch (_context3.prev = _context3.next) {case 0:
+                that = _this2;
                 info = {
                   skip: that.skip,
                   limit: that.limit,
@@ -295,7 +300,6 @@ var _default =
     // 左侧一级选择
     toChange: function toChange(index, e) {
       var that = this;
-      that.$set(that, "list", []);
       that.$set(that, "active", index);
       that.$set(that, "type", e.value);
       that.clearPage();
@@ -312,7 +316,6 @@ var _default =
     // 清空总信息
     clearPages: function clearPages() {
       var that = this;
-      that.$set(that, "list", []);
       that.$set(that, "marketList", []);
       that.$set(that, "typeList", []);
       that.$set(that, "active", '0');
@@ -324,20 +327,8 @@ var _default =
     toBuy: function toBuy(e) {
       var that = this;
       uni.navigateTo({
-        url: "/pagesHome/order/detail?id=".concat(e.id || e._id) });
-
-    },
-    // 菜单跳转
-    toPath: function toPath(e) {
-      var url = "/".concat(e.route);
-      if (e.type == '0') uni.redirectTo({
-        url: url });else
+        url: "/pagesGoods/goods/index?id=".concat(e.id || e._id) });
 
-      {
-        uni.navigateTo({
-          url: url });
-
-      }
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

unpackage/dist/dev/mp-weixin/pages/good/index.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "所有商品",
+  "enablePullDownRefresh": true,
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/good/index.wxss

@@ -60,7 +60,7 @@
 }
 .content .one .one_2 .one_2_1 .list .info .num {
   font-size: var(--font14Size);
-  color: #858585;
+  color: var(--f85Color);
   margin: 0 0 1vw 0;
 }
 .scroll-view {

unpackage/dist/dev/mp-weixin/pages/home/index.js

@@ -98,13 +98,13 @@ var components
 try {
   components = {
     uniSearchBar: function() {
-      return Promise.all(/*! import() | uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue */ 242))
+      return Promise.all(/*! import() | uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue */ 250))
     },
     uniGrid: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-grid/components/uni-grid/uni-grid */ "uni_modules/uni-grid/components/uni-grid/uni-grid").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-grid/components/uni-grid/uni-grid.vue */ 253))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-grid/components/uni-grid/uni-grid */ "uni_modules/uni-grid/components/uni-grid/uni-grid").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-grid/components/uni-grid/uni-grid.vue */ 261))
     },
     uniGridItem: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-grid/components/uni-grid-item/uni-grid-item */ "uni_modules/uni-grid/components/uni-grid-item/uni-grid-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue */ 260))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-grid/components/uni-grid-item/uni-grid-item */ "uni_modules/uni-grid/components/uni-grid-item/uni-grid-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue */ 268))
     }
   }
 } catch (e) {
@@ -311,6 +311,13 @@ var _default =
     change: function change(e) {return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee8() {return _regenerator.default.wrap(function _callee8$(_context8) {while (1) {switch (_context8.prev = _context8.next) {case 0:
                 console.log(e);case 1:case "end":return _context8.stop();}}}, _callee8);}))();
     },
+    // 购买
+    toBuy: function toBuy(e) {
+      var that = this;
+      uni.navigateTo({
+        url: "/pagesGoods/goods/index?id=".concat(e.id || e._id) });
+
+    },
     // 分页
     toPage: function toPage(e) {
       var that = this;

unpackage/dist/dev/mp-weixin/pages/home/index.json

@@ -1,5 +1,6 @@
 {
   "navigationBarTitleText": "首页",
+  "enablePullDownRefresh": true,
   "usingComponents": {
     "uni-search-bar": "/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar",
     "uni-grid": "/uni_modules/uni-grid/components/uni-grid/uni-grid",

unpackage/dist/dev/mp-weixin/pages/login/index.js

@@ -98,13 +98,13 @@ var components
 try {
   components = {
     uniForms: function() {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 202))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 210))
     },
     uniFormsItem: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 211))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 219))
     },
     uniEasyinput: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 218))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 226))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/market/index.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "购物车",
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-number-box": "/uni_modules/uni-number-box/components/uni-number-box/uni-number-box"
+  }
 }

unpackage/dist/dev/mp-weixin/pages/market/index.wxss

@@ -1,13 +1,258 @@
-
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
 .content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 92vh;
+  background-color: var(--footColor);
 }
-.text-area {
-	display: flex;
-	justify-content: center;
+.content .top {
+  display: flex;
+  flex-direction: row;
+  background-color: var(--mainColor);
+  height: 35px;
+  margin: 0 0 4px 0;
+  padding: 5px 4vw;
+}
+.content .top .text_1 {
+  flex-grow: 1;
+  line-height: 30px;
+}
+.content .top .text_2 {
+  line-height: 35px;
+}
+.content .one {
+  text-align: center;
+  margin: 2vw 0;
+}
+.content .one .logo {
+  margin: 10vw 0 2vw 0;
+}
+.content .one .logo .iconfont {
+  font-size: 35vw;
+}
+.content .one .one_1 {
+  margin: 3vw 0;
+}
+.content .one button {
+  background-color: var(--f3CColor);
+}
+.content .two {
+  position: relative;
+  flex-grow: 1;
+  margin: 0 2vw;
+}
+.content .two .list_1 {
+  background-color: var(--mainColor);
+  margin: 2vw 0 2vw 0;
+  padding: 2vw 3vw;
+  border-radius: 4px;
+}
+.content .two .list_1 .title {
+  border-bottom: 1px solid var(--fcColor);
+  padding: 0 0 2vw 0;
+  font-size: var(--font18Size);
+}
+.content .two .list_1 .title text {
+  margin: 0 1vw;
+}
+.content .two .list_1 .content {
+  display: flex;
+  flex-direction: row;
+  padding: 2vw 0;
+  font-size: var(--font16Size);
+  border-bottom: 1px dashed var(--fcColor);
+}
+.content .two .list_1 .content .img {
+  width: 20vw;
+  height: 20vw;
+  border-radius: 2vw;
+  border: 1px solid var(--fcColor);
+}
+.content .two .list_1 .content .img image {
+  width: 20vw;
+  height: 20vw;
+}
+.content .two .list_1 .content .one_1 {
+  margin: 0 2.5vw;
+  flex-grow: 1;
+}
+.content .two .list_1 .content .one_1 .info {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+}
+.content .two .list_1 .content .one_1 .info .title_1 {
+  font-size: 12px;
+  color: #666;
+  margin-top: 10px;
+}
+.content .two .list_1 .content .one_1 .info .title_1 text {
+  background-color: #eee;
+  padding: 5px;
+}
+.content .two .list_1 .content .money {
+  font-size: 14px;
+  margin-top: 2vw;
+  text-align: right;
+  flex-grow: 1;
+}
+.content .two .list_1 .total {
+  display: flex;
+  justify-content: space-between;
+  padding: 1vw;
+}
+.content .two .list_1 .total .total_1 {
+  font-size: 20px;
+  color: var(--fFB1Color);
+}
+.content .two .list_1 .total .total_1 text {
+  font-size: 12px;
+}
+.content .two .list_1 .total .total_2 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.content .two .list_1 .total .total_2 .del {
+  margin: 0 0 0 3vw;
+}
+.content .two .list_2 {
+  background-color: var(--mainColor);
+  margin: 2vw 0 2vw 0;
+  padding: 2vw 3vw;
+  border-radius: 4px;
+}
+.content .two .list_2 .title {
+  border-bottom: 1px solid var(--fcColor);
+  padding: 0 0 2vw 0;
+  font-size: var(--font18Size);
+}
+.content .two .list_2 .title text {
+  margin: 0 1vw;
+}
+.content .two .list_2 .content {
+  display: flex;
+  flex-direction: row;
+  padding: 2vw 0;
+  font-size: var(--font16Size);
+  border-bottom: 1px dashed var(--fcColor);
+}
+.content .two .list_2 .content .box {
+  line-height: 20vw;
+}
+.content .two .list_2 .content .img {
+  width: 20vw;
+  height: 20vw;
+  border-radius: 2vw;
+  border: 1px solid var(--fcColor);
+}
+.content .two .list_2 .content .img image {
+  width: 20vw;
+  height: 20vw;
+}
+.content .two .list_2 .content .one_1 {
+  margin: 0 2.5vw;
+  flex-grow: 1;
+}
+.content .two .list_2 .content .one_1 .info {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+}
+.content .two .list_2 .content .one_1 .info .title_1 {
+  font-size: 12px;
+  color: #666;
+  margin-top: 10px;
+}
+.content .two .list_2 .content .one_1 .info .title_1 text {
+  background-color: #eee;
+  padding: 5px;
+}
+.content .two .list_2 .content .one_1 .info .gift {
+  margin: 2vw 1vw 0 0;
+  font-size: 12px;
+  color: #FFA500;
+  border: 1px solid #FFA500;
+  border-radius: 5px;
+  padding: 0 1vw;
+}
+.content .two .list_2 .content .one_1 .info .act {
+  margin: 2vw 0 0 0;
+  font-size: 12px;
+  border-radius: 5px;
+  padding: 0 1vw;
+  border: 1px solid var(--fFB1Color);
+  color: var(--fFB1Color);
+}
+.content .two .list_2 .content .money {
+  margin-top: 2vw;
+  text-align: right;
+  flex-grow: 1;
+}
+.content .two .list_2 .content .num {
+  margin: 6vw 4vw;
+  font-size: 20px;
+}
+.content .two .list_2 .content .del {
+  margin: 6vw 0;
+  text-align: right;
+  flex-grow: 1;
+}
+.content .foot {
+  background-color: var(--fffColor);
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  height: 44px;
+  padding: 0 0 0 6vw;
+  border-right: 1px solid var(--f99Color);
+}
+.content .foot .total {
+  flex-grow: 1;
+  display: flex;
+  align-content: flex-end;
+  line-height: 40px;
+}
+.content .foot .total text {
+  color: var(--fFB1Color);
+}
+.content .foot .btn button {
+  width: 30vw;
+  height: 44px;
+  line-height: 44px;
+  border-radius: 0px;
+  background-color: var(--fFB1Color);
+  text-align: center;
+  font-weight: normal;
+  font-size: var(--font15Size);
+  color: var(--fffColor);
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}
+checkbox .wx-checkbox-input {
+  width: 40rpx;
+  height: 40rpx;
+  border-radius: 50%;
+  border-color: var(--f99Color);
+  background-color: var(--mainColor);
+}
+checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+  border-color: var(--fFB1Color);
+  background-color: var(--fFB1Color);
+}
+checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
+  color: var(--fffColor);
 }
-
 

unpackage/dist/dev/mp-weixin/pages/my/index.js

@@ -98,7 +98,7 @@ var components
 try {
   components = {
     uniBadge: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-badge/components/uni-badge/uni-badge */ "uni_modules/uni-badge/components/uni-badge/uni-badge").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-badge/components/uni-badge/uni-badge.vue */ 267))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-badge/components/uni-badge/uni-badge */ "uni_modules/uni-badge/components/uni-badge/uni-badge").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-badge/components/uni-badge/uni-badge.vue */ 282))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/register/index.js

@@ -98,19 +98,19 @@ var components
 try {
   components = {
     uniForms: function() {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 202))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 210))
     },
     uniFormsItem: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 211))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 219))
     },
     uniEasyinput: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 218))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 226))
     },
     uniDataCheckbox: function() {
-      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 225))
+      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 233))
     },
     uniDataSelect: function() {
-      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 235))
+      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 243))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pagesGoods/goods/index.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "商品详情",
+  "usingComponents": {
+    "uni-goods-nav": "/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav"
+  }
+}

unpackage/dist/dev/mp-weixin/pagesGoods/goods/index.wxss

@@ -0,0 +1,92 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.content {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.content .one {
+  position: relative;
+  flex-grow: 1;
+}
+.content .one .one_1 {
+  border-bottom: 0.5vw solid var(--f9Color);
+}
+.content .one .one_1 swiper {
+  height: 44vh !important;
+}
+.content .one .one_1 .list {
+  border-radius: 5px;
+}
+.content .one .one_1 .list .image {
+  width: 100%;
+  height: 100%;
+  border-radius: 5px;
+  background-color: #fff;
+}
+.content .one .one_2 {
+  border-bottom: 0.5vw solid var(--f9Color);
+  padding: 2vw;
+}
+.content .one .one_2 .money {
+  font-size: 20px;
+  padding: 0 1vw 0 0;
+  color: var(--fF0Color);
+  font-weight: bold;
+}
+.content .one .one_2 .money text {
+  font-size: 14px;
+}
+.content .one .one_3 {
+  display: flex;
+  flex-wrap: wrap;
+  padding: 1vw;
+  border-bottom: 0.5vw solid var(--f9Color);
+}
+.content .one .one_4 {
+  border-bottom: 0.5vw solid var(--f9Color);
+  padding: 2vw;
+}
+.content .one .one_4 .name {
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-all;
+  font-size: 17px;
+  font-weight: bold;
+  margin: 0 0 2vw 0;
+}
+.content .one .one_4 .brief {
+  font-size: 14px;
+  color: var(--f85Color);
+  margin: 0 0 1vw 0;
+}
+.content .one .one_5 {
+  text-align: center;
+  margin: 0 0 15vw 0;
+}
+.content .one .one_5 .list .image {
+  border-radius: 5px;
+  background-color: #fff;
+}
+.content .bottom {
+  width: 100vw;
+  position: fixed;
+  bottom: 0;
+  left: 0px;
+  right: 0px;
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}
+

unpackage/dist/dev/mp-weixin/pagesMy/account/info.js

@@ -98,19 +98,19 @@ var components
 try {
   components = {
     uniForms: function() {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 202))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 210))
     },
     uniFormsItem: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 211))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 219))
     },
     uniEasyinput: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 218))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 226))
     },
     uniDataCheckbox: function() {
-      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 225))
+      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 233))
     },
     uniDataSelect: function() {
-      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 235))
+      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 243))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pagesMy/account/update.js

@@ -98,13 +98,13 @@ var components
 try {
   components = {
     uniForms: function() {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 202))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 210))
     },
     uniFormsItem: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 211))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 219))
     },
     uniEasyinput: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 218))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 226))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  },
+  "component": true
+}

unpackage/dist/dev/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.wxss

@@ -0,0 +1,88 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.flex {
+  display: flex;
+  flex-direction: row;
+}
+.uni-goods-nav {
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+}
+.uni-tab__cart-box {
+  flex: 1;
+  height: 50px;
+  background-color: #fff;
+  z-index: 900;
+}
+.uni-tab__cart-sub-left {
+  padding: 0 5px;
+}
+.uni-tab__cart-sub-right {
+  flex: 1;
+}
+.uni-tab__right {
+  margin: 5px 0;
+  margin-right: 10px;
+  border-radius: 100px;
+  overflow: hidden;
+}
+.uni-tab__cart-button-left {
+  display: flex;
+  position: relative;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  margin: 0 10px;
+}
+.uni-tab__icon {
+  width: 18px;
+  height: 18px;
+}
+.image {
+  width: 18px;
+  height: 18px;
+}
+.uni-tab__text {
+  margin-top: 3px;
+  font-size: 12px;
+  color: #646566;
+}
+.uni-tab__cart-button-right {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  justify-content: center;
+  align-items: center;
+}
+.uni-tab__cart-button-right-text {
+  font-size: 14px;
+  color: #fff;
+}
+.uni-tab__cart-button-right:active {
+  opacity: 0.7;
+}
+.uni-tab__dot-box {
+  display: flex;
+  flex-direction: column;
+  position: absolute;
+  right: -2px;
+  top: 2px;
+  justify-content: center;
+  align-items: center;
+}
+.uni-tab__dot {
+  padding: 0 4px;
+  line-height: 15px;
+  color: #ffffff;
+  text-align: center;
+  font-size: 12px;
+  background-color: #ff0000;
+  border-radius: 15px;
+}
+.uni-tab__dots {
+  padding: 0 4px;
+  border-radius: 15px;
+}
+

unpackage/dist/dev/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/dev/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.wxss

@@ -0,0 +1,44 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.uni-numbox {
+  display: flex;
+  flex-direction: row;
+}
+.uni-numbox-btns {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  padding: 0 8px;
+  background-color: #f5f5f5;
+}
+.uni-numbox__value {
+  margin: 0 2px;
+  background-color: #f5f5f5;
+  width: 40px;
+  height: 26px;
+  text-align: center;
+  font-size: 14px;
+  border-left-width: 0;
+  border-right-width: 0;
+  color: #333;
+}
+.uni-numbox__minus {
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+}
+.uni-numbox__plus {
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+.uni-numbox--text {
+  line-height: 20px;
+  font-size: 20px;
+  font-weight: 300;
+  color: #333;
+}
+.uni-numbox .uni-numbox--disabled {
+  color: #c0c0c0 !important;
+}
+