From a75b9e79649b91ee1566f166becb2a1d0426a457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Fri, 7 Jan 2022 16:28:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=95=86=E5=9F=8E=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E8=B4=AD=E4=B9=B0=EF=BC=8C=E5=93=81=E7=B1=BB=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E9=92=B1=E5=8C=85=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/interfaces/store.js                      |  34 ++-
 package-lock.json                             | 181 +++++++++++++++
 pages.json                                    |  16 +-
 pages/address/index.vue                       |   9 +-
 pages/store/buy.vue                           | 103 +++++++--
 pages/store/goods.vue                         |  15 +-
 pages/store/index.vue                         |   7 +-
 pages/store/list.vue                          |  53 ++++-
 pages/store/meals.vue                         |  74 ++++++
 router/index.js                               |   2 +-
 store/index.js                                |  18 +-
 .../components/oct-address/oct-address.vue    |  11 +-
 uni_modules/uni-number-box/changelog.md       |  25 +++
 .../uni-number-box/uni-number-box.vue         | 211 ++++++++++++++++++
 uni_modules/uni-number-box/package.json       |  85 +++++++
 uni_modules/uni-number-box/readme.md          |  13 ++
 wallet/Wallet.js                              | 126 +++++++++++
 wallet/_test.js                               |  29 +++
 wallet/index.js                               |  24 ++
 wallet/networks.js                            | 209 +++++++++++++++++
 20 files changed, 1176 insertions(+), 69 deletions(-)
 create mode 100644 pages/store/meals.vue
 create mode 100644 uni_modules/uni-number-box/changelog.md
 create mode 100644 uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
 create mode 100644 uni_modules/uni-number-box/package.json
 create mode 100644 uni_modules/uni-number-box/readme.md
 create mode 100644 wallet/Wallet.js
 create mode 100644 wallet/_test.js
 create mode 100644 wallet/index.js
 create mode 100644 wallet/networks.js

diff --git a/apis/interfaces/store.js b/apis/interfaces/store.js
index c34249d..e3c2a24 100644
--- a/apis/interfaces/store.js
+++ b/apis/interfaces/store.js
@@ -15,21 +15,49 @@ const mall = () =>{
 }
 
 // 商品详情
-const goods = (id) => {
+const goods = id => {
 	return request({
 		url: 'mall/goods/' + id
 	})
 }
 
 // 套餐列表
-const meals = (id) => {
+const meals = id => {
 	return request({
 		url: 'mall/meals/' + id
 	})
 }
 
+// 商品列表
+const lists = data => {
+	return request({
+		url: 'mall/goods',
+		data
+	})
+}
+
+// 确认订单
+const buy = data => {
+	return request({
+		url: 'mall/buy/goods',
+		data
+	})
+}
+
+// 商品下单
+const verify = data => {
+	return request({
+		url: 'mall/buy/goods',
+		method: 'POST',
+		data
+	})
+}
+
 export {
 	mall,
 	goods,
-	meals
+	meals,
+	lists,
+	buy,
+	verify
 }
diff --git a/package-lock.json b/package-lock.json
index 25e690b..c791e07 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,6 +2,182 @@
 	"requires": true,
 	"lockfileVersion": 1,
 	"dependencies": {
+		"base-x": {
+			"version": "3.0.9",
+			"resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz",
+			"integrity": "sha512-H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ==",
+			"requires": {
+				"safe-buffer": "^5.0.1"
+			}
+		},
+		"bech32": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/bech32/-/bech32-2.0.0.tgz",
+			"integrity": "sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg=="
+		},
+		"bigi": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/bigi/-/bigi-1.4.2.tgz",
+			"integrity": "sha1-nGZalfiLiwj8Bc/XMfVhhZ1yWCU="
+		},
+		"bip-schnorr": {
+			"version": "0.6.4",
+			"resolved": "https://registry.npmjs.org/bip-schnorr/-/bip-schnorr-0.6.4.tgz",
+			"integrity": "sha512-dNKw7Lea8B0wMIN4OjEmOk/Z5qUGqoPDY0P2QttLqGk1hmDPytLWW8PR5Pb6Vxy6CprcdEgfJpOjUu+ONQveyg==",
+			"requires": {
+				"bigi": "^1.4.2",
+				"ecurve": "^1.0.6",
+				"js-sha256": "^0.9.0",
+				"randombytes": "^2.1.0",
+				"safe-buffer": "^5.2.1"
+			}
+		},
+		"bitcore-lib": {
+			"version": "8.25.25",
+			"resolved": "https://registry.npmjs.org/bitcore-lib/-/bitcore-lib-8.25.25.tgz",
+			"integrity": "sha512-H6qNCVl4M8/MglXhvc04mmeus1d6nrmqTJGQ+xezJLvL7hs7R3dyBPtOqSP3YSw0iq/GWspMd8f5OOlyXVipJQ==",
+			"requires": {
+				"bech32": "=2.0.0",
+				"bip-schnorr": "=0.6.4",
+				"bn.js": "=4.11.8",
+				"bs58": "^4.0.1",
+				"buffer-compare": "=1.1.1",
+				"elliptic": "^6.5.3",
+				"inherits": "=2.0.1",
+				"lodash": "^4.17.20"
+			}
+		},
+		"bitcore-mnemonic": {
+			"version": "8.25.25",
+			"resolved": "https://registry.npmjs.org/bitcore-mnemonic/-/bitcore-mnemonic-8.25.25.tgz",
+			"integrity": "sha512-7HvRxHrmd+Rh0Ohl0SEDMKQBAM+FoevXbCFnxGju6H+uZjtWMOToHA8vUg0+B91pfEMjdt9mQVB/wSA8GMqnCA==",
+			"requires": {
+				"bitcore-lib": "^8.25.25",
+				"unorm": "^1.4.1"
+			}
+		},
+		"bn.js": {
+			"version": "4.11.8",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+			"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
+		},
+		"brorand": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+			"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+		},
+		"bs58": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
+			"integrity": "sha1-vhYedsNU9veIrkBx9j806MTwpCo=",
+			"requires": {
+				"base-x": "^3.0.2"
+			}
+		},
+		"buffer-compare": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/buffer-compare/-/buffer-compare-1.1.1.tgz",
+			"integrity": "sha1-W+e+hTr4kZjR9N3AkNHWakiu9ZY="
+		},
+		"ecurve": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/ecurve/-/ecurve-1.0.6.tgz",
+			"integrity": "sha512-/BzEjNfiSuB7jIWKcS/z8FK9jNjmEWvUV2YZ4RLSmcDtP7Lq0m6FvDuSnJpBlDpGRpfRQeTLGLBI8H+kEv0r+w==",
+			"requires": {
+				"bigi": "^1.1.0",
+				"safe-buffer": "^5.0.1"
+			}
+		},
+		"elliptic": {
+			"version": "6.5.4",
+			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+			"integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+			"requires": {
+				"bn.js": "^4.11.9",
+				"brorand": "^1.1.0",
+				"hash.js": "^1.0.0",
+				"hmac-drbg": "^1.0.1",
+				"inherits": "^2.0.4",
+				"minimalistic-assert": "^1.0.1",
+				"minimalistic-crypto-utils": "^1.0.1"
+			},
+			"dependencies": {
+				"bn.js": {
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+				},
+				"inherits": {
+					"version": "2.0.4",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+					"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+				}
+			}
+		},
+		"hash.js": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+			"requires": {
+				"inherits": "^2.0.3",
+				"minimalistic-assert": "^1.0.1"
+			},
+			"dependencies": {
+				"inherits": {
+					"version": "2.0.4",
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+					"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+				}
+			}
+		},
+		"hmac-drbg": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+			"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+			"requires": {
+				"hash.js": "^1.0.3",
+				"minimalistic-assert": "^1.0.0",
+				"minimalistic-crypto-utils": "^1.0.1"
+			}
+		},
+		"inherits": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+			"integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+		},
+		"js-sha256": {
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz",
+			"integrity": "sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA=="
+		},
+		"lodash": {
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+		},
+		"minimalistic-assert": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+		},
+		"minimalistic-crypto-utils": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+			"integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
+		},
+		"randombytes": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+			"requires": {
+				"safe-buffer": "^5.1.0"
+			}
+		},
+		"safe-buffer": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+		},
 		"uni-read-pages": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/uni-read-pages/-/uni-read-pages-1.0.5.tgz",
@@ -12,6 +188,11 @@
 			"resolved": "https://registry.npmjs.org/uni-simple-router/-/uni-simple-router-2.0.7.tgz",
 			"integrity": "sha512-8FKv5dw7Eoonm0gkO8udprrxzin0fNUI0+AvIphFkFRH5ZmP5ZWJ2pvnWzb2NiiqQSECTSU5VSB7HhvOSwD5eA=="
 		},
+		"unorm": {
+			"version": "1.6.0",
+			"resolved": "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz",
+			"integrity": "sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA=="
+		},
 		"uview-ui": {
 			"version": "2.0.19",
 			"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.19.tgz",
diff --git a/pages.json b/pages.json
index fcdfb4c..0729602 100644
--- a/pages.json
+++ b/pages.json
@@ -95,7 +95,7 @@
 		"path": "pages/address/index",
 		"name": "Address",
 		"style": {
-			"navigationBarTitleText": "地址"
+			"navigationBarTitleText": "收货地址"
 		}
 	}, {
 		"path": "pages/address/edit",
@@ -105,17 +105,25 @@
 			"enablePullDownRefresh": false
 		}
 	}, {
-		"path": "pages/pay/pay",
+		"path": "pages/pay/pay",
 		"name": "Pay",
 		"style": {
 			"navigationBarTitleText": "收银台",
 			"navigationBarBackgroundColor": "#FFFFFF"
 		}
 	}, {
-		"path": "pages/store/list",
+		"path": "pages/store/list",
 		"name": "StoreList",
 		"style": {
-			"navigationBarTitleText": "列表",
+			"navigationBarTitleText": "商品",
+			"navigationBarBackgroundColor": "#FFFFFF",
+			"enablePullDownRefresh": true
+		}
+	}, {
+		"path": "pages/store/meals",
+		"name": "StoreMeals",
+		"style": {
+			"navigationBarTitleText": "套餐",
 			"navigationBarBackgroundColor": "#FFFFFF",
 			"enablePullDownRefresh": true
 		}
diff --git a/pages/address/index.vue b/pages/address/index.vue
index 2f13d2f..73da631 100644
--- a/pages/address/index.vue
+++ b/pages/address/index.vue
@@ -1,15 +1,15 @@
 <template>
 	<view class="content">
 		<oct-address
+			:isTag="false"
 			:lists="addressList"
 			:isEdit="false"
 			:pattern="true"
 			editColor="#34CE98"
 			:btnStyle="{'backgroundColor': '#34CE98'}"
 			@onAddress="onInfo"
-			@onAdd="add"
-		>
-		</oct-address>
+			@onAdd="$Router.push({name: 'AddressEdit'})"
+		/>
 	</view>
 </template>
 
@@ -73,7 +73,8 @@ export default {
 	},
 	methods: {
 		onInfo(val){
-			console.log(val)
+			this.$store.commit('setAddress', val)
+			this.$Router.back()
 		},
 		add(){
 			console.log("新增地址")
diff --git a/pages/store/buy.vue b/pages/store/buy.vue
index ed136ab..37b140e 100644
--- a/pages/store/buy.vue
+++ b/pages/store/buy.vue
@@ -1,52 +1,97 @@
 <template>
 	<view class="content">
 		<!-- address -->
-		<view class="block address">
-			<uni-icons class="address-icon location" type="location-filled" size="24" color="#34CE98"></uni-icons>
-			<uni-icons class="address-icon arrows" type="right" size="20" color="#999"></uni-icons>
-			<view class="user"><text>唐明阳</text>18245180131</view>
-			<view class="city">黑龙江省哈尔滨市南岗区汉水路265号</view>
-		</view>
+		<block v-if="address != ''">
+			<view class="block address" @click="$Router.push({name: 'Address'})">
+				<uni-icons class="address-icon location" type="location-filled" size="24" color="#34CE98"></uni-icons>
+				<uni-icons class="address-icon arrows" type="right" size="20" color="#999"></uni-icons>
+				<view class="user"><text>{{address.name}}</text>{{address.phone}}</view>
+				<view class="city">{{address.address}}{{address.city}}</view>
+			</view>
+		</block>
+		<block v-else>
+			<view class="block address-new" @click="$Router.push({name: 'Address'})">
+				<uni-icons class="icon" type="plus" size="26" color="#34CE98"></uni-icons>添加收货地址
+			</view>
+		</block>
 		<!-- 订单产品 -->
 		<view class="block goods-box">
-			<view class="goods-item">
-				<image class="order-cover" src="https://yanxuan-item.nosdn.127.net/6d48e6ea51a06b1356ccda21497fdb14.png" mode="aspectFill"></image>
-				<view class="order-title">茅台王子酒 金王子 53度 500毫升</view>
-				<view class="order-count">
-					<view class="order-price"><text>￥</text>275.00</view>
-					<view class="order-sum">共1件</view>
+			<block v-for="(item, index) in goodsInfo" :key="index">
+				<view class="goods-item">
+					<image class="order-cover" :src="item.items[0].cover" mode="aspectFill"></image>
+					<view class="order-title">{{item.items[0].title}}</view>
+					<view class="order-count">
+						<view class="order-price"><text>￥</text>{{item.items[0].price}}</view>
+					</view>
 				</view>
-			</view>
+			</block>
 		</view>
 		<!-- 订单信息 -->
 		<view class="block info-box">
+			<view class="info-item">
+				<view class="label">购买数量</view>
+				<uni-number-box class="info-number" :value="qty" :min="1" :max="999" @change="numberChange" />
+			</view>
 			<view class="info-item">
 				<view class="label">配送方式</view>
 				<view class="nowrap">快递</view>
 			</view>
 			<view class="info-item">
-				<view class="label">优惠金额</view>
-				<view class="nowrap">无优惠</view>
+				<view class="label">配送费用</view>
+				<view class="nowrap">{{freight <= 0 ? '免费': freight}}</view>
 			</view>
 		</view>
 		<!-- footer -->
 		<view class="order-footer">
-		    <view class="total">总计：<text>￥1399.00</text></view>
+		    <view class="total">总计：<text>￥{{total}}</text></view>
 		    <button class="btn">确认订单</button>
 		</view>
 	</view>
 </template>
 
 <script>
+	import { buy, verify } from '@/apis/interfaces/store'
 	export default {
 		data() {
 			return {
-				goodsInfo			: {},
-				expressPickerValue  : 0,
-				addressId           : '',
-				paramsId            : '',
-				goodsNumber         : ''
+				qty		  : 1,
+				goodsInfo : [],
+				total	  : 0,
+				freight	  : 0,
+				address	  : ""
 			};
+		},
+		computed:{
+			
+		},
+		onShow(){
+			if(JSON.stringify(this.$store.getters.getAddress) !== '{}') this.address = this.$store.getters.getAddress
+		},
+		mounted() {
+			console.log(this.$Route.query)
+			this.getBuy()
+		},
+		methods:{
+			getBuy(){
+				buy({
+					goods_sku_id: this.$Route.query.skuId,
+					qty: this.qty
+				}).then(res => {
+					this.address   = res.address
+					this.freight   = res.freight
+					this.total     = res.total
+					this.goodsInfo = res.detail
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			},
+			numberChange(e){
+				this.qty = e
+				this.getBuy()
+			}
 		}
 	}
 </script>
@@ -99,6 +144,18 @@
 			}
 		}
 	}
+	.address-new{
+		padding: $padding;
+		text-align: center;
+		height: 90rpx;
+		line-height: 90rpx;
+		color: $main-color;
+		.icon{
+			vertical-align: middle;
+			margin-bottom: 8rpx;
+			margin-right: 10rpx;
+		}
+	}
 	// 订单列表
 	.goods-item{
 		display: flex;
@@ -130,8 +187,8 @@
 				}
 			}
 			.order-sum{
-				font-size: 26rpx;
-				color: #777;
+				font-size: $title-size-sm;
+				color: $text-gray;
 			}
 		}
 	}
diff --git a/pages/store/goods.vue b/pages/store/goods.vue
index d0638d9..5b828aa 100644
--- a/pages/store/goods.vue
+++ b/pages/store/goods.vue
@@ -23,11 +23,13 @@
 				</view>
 				<view class="sales">销量{{goods.sales}}</view>
 			</view>
-			<view class="hr">
+			<!-- <view class="hr">
 				<text>详情</text>
-			</view>
+			</view> -->
 			<view class="imgs">
-				<rich-text :nodes="goods.content"></rich-text>
+				<block v-for="(item, index) in goods.content" :key="index">
+					<image :src="item" mode="widthFix"></image>
+				</block>
 			</view>
 		</view>
 		<!-- 立即购买 -->
@@ -65,7 +67,12 @@
 				})
 			},
 			buy(){
-				console.log(buy)
+				this.$Router.push({
+					name: 'StoreBuy',
+					params: {
+						skuId: this.goods.skus[0].sku_id
+					}
+				})
 			}
 		}
 	}
diff --git a/pages/store/index.vue b/pages/store/index.vue
index 3c9f739..df84975 100644
--- a/pages/store/index.vue
+++ b/pages/store/index.vue
@@ -17,7 +17,7 @@
 		</view>
 		<!-- 健康产品分类 -->
 		<u-scroll-list class="classify-box" indicatorColor="#ddd" indicatorActiveColor="#34CE98">
-			<view v-for="(item, index) in goodTabs" :key="index" class="classify-item">
+			<view v-for="(item, index) in goodTabs" :key="index" class="classify-item" @click="$Router.push({name: 'StoreList', params: {id: item.category_id, title: item.name}})">
 				<view class="classify-item-nav">
 					<image class="classify-item-cover" :src="item.cover"></image>
 					<view class="classify-item-title">{{item.name}}</view>
@@ -40,7 +40,7 @@
 		<!-- 推荐品类 -->
 		<view class="card-box">
 			<block v-for="(item, index) in meals" :key="index">
-				<view class="card-box-item" :style="{'backgrond': item.color}" @click="$Router.push({name: 'StoreList', params: {id: item.meal_id}})">
+				<view class="card-box-item" :style="{'backgrond': item.color}" @click="$Router.push({name: 'StoreMeals', params: {id: item.meal_id}})">
 					<view class="card-title">{{item.title}}</view>
 					<view class="card-subtitle">{{item.subtitle}}</view>
 					<image class="card-cover" :src="item.cover" mode="aspectFill"></image>
@@ -78,15 +78,12 @@
 		methods:{
 			getMall(){
 				mall().then(res => {
-					console.log(res)
 					this.banners 	= res.banners
 					this.goodsArr 	= res.goods
 					this.newGood 	= res.news
 					this.goodTabs 	= res.categories
 					this.meals	  	= res.meals
 					uni.stopPullDownRefresh()
-				}).catch(err => {
-					console.log(err)
 				})
 			}
 		},
diff --git a/pages/store/list.vue b/pages/store/list.vue
index 52df698..6f76550 100644
--- a/pages/store/list.vue
+++ b/pages/store/list.vue
@@ -1,5 +1,10 @@
 <template>
-	<view>
+	<view class="content">
+		<!-- 分类 -->
+		<u-sticky bgColor="#fff" zIndex="99">
+			<u-tabs :list="classify" lineColor="#34CE98" @click="onTabs()"></u-tabs>
+		</u-sticky>
+		<!-- 分类商品 -->
 		<oct-goods
 			:lists="goodsArr"
 			color="#e6576b"
@@ -9,24 +14,52 @@
 </template>
 
 <script>
-	import { meals } from "@/apis/interfaces/store"
+	import { lists } from "@/apis/interfaces/store"
 	export default {
 		data() {
 			return {
-				goodsArr: []
+				goodsArr: [],
+				classify: [
+					{ name: "全部" },
+					{ name: "21天盒子" },
+					{ name: "7天盒子" },
+					{ name: "3天盒子" },
+					{ name: "复食餐" },
+				]
 			};
 		},
 		mounted(){
-			meals(this.$Route.query.id).then(res => {
-				uni.setNavigationBarTitle({
-					title: res.title
-				})
-				this.goodsArr = res.items
+			uni.setNavigationBarTitle({
+				title: this.$Route.query.title
 			})
+			this.getLists()
+		},
+		methods:{
+			// 商品列表
+			getLists() {
+				// {
+				// 	this.$Route.query.id
+				// }
+				lists({}).then(res => {
+					this.goodsArr = res.data
+					uni.stopPullDownRefresh()
+				})
+			},
+			// 二级分类筛选
+			onTabs(){
+				this.goodsArr = []
+				this.getLists()
+			}
+		},
+		onPullDownRefresh() {
+			this.getLists()
 		}
 	}
 </script>
 
-<style lang="scss">
-
+<style lang="scss" scoped>
+	.content{
+		background: $window-color;
+		min-height: 100vh;
+	}
 </style>
diff --git a/pages/store/meals.vue b/pages/store/meals.vue
new file mode 100644
index 0000000..a17c830
--- /dev/null
+++ b/pages/store/meals.vue
@@ -0,0 +1,74 @@
+<template>
+	<view class="content">
+		<!-- banner -->
+		<view class="banner">
+			<image v-if="banner.length > 0" class="banner-cover" :src="banner[0].cover || ''" mode="aspectFill"></image>
+		</view>
+		<!-- 套餐列表 -->
+		<oct-goods
+			:lists="goodsArr"
+			color="#e6576b"
+			@onGoods="$Router.push({ name: 'StoreGoods', params: {id: $event.goods_id}})"
+		/>
+	</view>
+</template>
+
+<script>
+	import { meals } from "@/apis/interfaces/store"
+	export default {
+		data() {
+			return {
+				banner  : [],
+				goodsArr: []
+			};
+		},
+		mounted(){
+			this.getMeals()
+		},
+		methods:{
+			getMeals(){
+				meals(this.$Route.query.id).then(res => {
+					console.log(res)
+					uni.setNavigationBarTitle({
+						title: res.meal.subtitle
+					})
+					this.banner   = res.banner
+					this.goodsArr = res.meal.goods
+					uni.stopPullDownRefresh()
+				})
+			},
+			click(){
+				console.log('筛选')
+			}
+		},
+		onPullDownRefresh() {
+			this.getMeals()
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		background: $window-color;
+		min-height: 100vh;
+	}
+	// banner
+	.banner{
+		position: relative;
+		width: 100%;
+		background-color: white;
+		padding-top: 40%;
+		&-text,
+		&-cover{
+			position: absolute;
+			top: 0;
+			left: 0;
+			height: 100%;
+			width: 100%;
+		}
+	}
+	// 筛选
+	.classify-tabs{
+		background: white;
+	}
+</style>
diff --git a/router/index.js b/router/index.js
index 67faa31..524be61 100644
--- a/router/index.js
+++ b/router/index.js
@@ -13,7 +13,7 @@ router.beforeEach((to, from, next) => {
 
 // 全局路由后置守卫
 router.afterEach((to, from) => {
-	console.log('跳转结束')
+	// console.log('跳转结束')
 })
 
 export {
diff --git a/store/index.js b/store/index.js
index 4483f7e..eddf8ed 100644
--- a/store/index.js
+++ b/store/index.js
@@ -13,18 +13,14 @@ Vue.use(Vuex)
 export default new Vuex.Store({
 	state: {
 		token 		: uni.getStorageSync('token') || '',
-		code		: uni.getStorageSync('wxCode') || '',
-		coupongoods	: []
+		address		: {}
 	},
 	getters: {
 		getToken: state => {
 			return state.token
 		},
-		getCoupongoods: state => {
-			return state.coupongoods
-		},
-		getCode: state => {
-			return state.code
+		getAddress: state => {
+			return state.address
 		}
 	},
 	mutations: {
@@ -32,12 +28,8 @@ export default new Vuex.Store({
 			state.token = tokenString
 			uni.setStorageSync('token', tokenString)
 		},
-		setCoupongoods(state, value) {
-			state.coupongoods = value
-		},
-		setCode(state, value) {
-			state.code = value
-			uni.setStorageSync('wxCode', value)
+		setAddress(state, value) {
+			state.address = value
 		}
 	}
 })
diff --git a/uni_modules/oct-address/components/oct-address/oct-address.vue b/uni_modules/oct-address/components/oct-address/oct-address.vue
index 1ac0564..c2f24b1 100644
--- a/uni_modules/oct-address/components/oct-address/oct-address.vue
+++ b/uni_modules/oct-address/components/oct-address/oct-address.vue
@@ -9,8 +9,10 @@
 			<view class="address--lists">
 				<view class="address--item" :class="[pattern ? 'chunk': 'broad', {'edit': isEdit}]" v-for="(item, index) in lists" :key="index">
 					<view class="city">
-						<text v-if="item.default" class="city--tag city--default">默认</text>
-						<text v-if="item.tag && item.tag != ''" class="city--tag city--type">{{item.tag}}</text>
+						<block v-if="isTag">
+							<text v-if="item.default" class="city--tag city--default">默认</text>
+							<text v-if="item.tag && item.tag != ''" class="city--tag city--type">{{item.tag}}</text>
+						</block>
 						{{item.city}}
 					</view>
 					<view class="address">{{item.address}}</view>
@@ -79,6 +81,11 @@
 				default : () => {
 					return require('../../static/null-icon.png')
 				}
+			},
+			// 是否显示地址标签
+			isTag: {
+				type	: Boolean,
+				default : true
 			}
 		}
 	}
diff --git a/uni_modules/uni-number-box/changelog.md b/uni_modules/uni-number-box/changelog.md
new file mode 100644
index 0000000..82b8656
--- /dev/null
+++ b/uni_modules/uni-number-box/changelog.md
@@ -0,0 +1,25 @@
+## 1.2.1（2021-11-22）
+- 修复 vue3中某些scss变量无法找到的问题
+## 1.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-number-box](https://uniapp.dcloud.io/component/uniui/uni-number-box)
+## 1.1.2（2021-11-09） 
+- 新增 提供组件设计资源，组件样式调整
+## 1.1.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.1.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-05-12）
+- 新增 组件示例地址
+## 1.0.6（2021-04-20）
+- 修复 uni-number-box 浮点数运算不精确的 bug
+- 修复 uni-number-box change 事件触发不正确的 bug
+- 新增 uni-number-box v-model 双向绑定
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范
+
+## 1.0.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 v-model
+- 新增 支持 focus、blur 事件
+- 新增 支持 PC 端
diff --git a/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
new file mode 100644
index 0000000..2d046cb
--- /dev/null
+++ b/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue
@@ -0,0 +1,211 @@
+<template>
+	<view class="uni-numbox">
+		<view @click="_calcValue('minus')" class="uni-numbox__minus uni-numbox-btns" :style="{background}">
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue <= min || disabled }" :style="{color}">-</text>
+		</view>
+		<input :disabled="disabled" @focus="_onFocus" @blur="_onBlur" class="uni-numbox__value" type="number"
+			v-model="inputValue" :style="{color}" />
+		<view @click="_calcValue('plus')" class="uni-numbox__plus uni-numbox-btns" :style="{background}">
+			<text class="uni-numbox--text" :class="{ 'uni-numbox--disabled': inputValue >= max || disabled }" :style="{color}">+</text>
+		</view>
+	</view>
+</template>
+<script>
+	/**
+	 * NumberBox 数字输入框
+	 * @description 带加减按钮的数字输入框
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=31
+	 * @property {Number} value 输入框当前值
+	 * @property {Number} min 最小值
+	 * @property {Number} max 最大值
+	 * @property {Number} step 每次点击改变的间隔大小
+	 * @property {String} background 背景色
+	 * @property {String} color 字体颜色（前景色）
+	 * @property {Boolean} disabled = [true|false] 是否为禁用状态
+	 * @event {Function} change 输入框值改变时触发的事件，参数为输入框当前的 value
+	 * @event {Function} focus 输入框聚焦时触发的事件，参数为 event 对象
+	 * @event {Function} blur 输入框失焦时触发的事件，参数为 event 对象
+	 */
+
+	export default {
+		name: "UniNumberBox",
+		emits: ['change', 'input', 'update:modelValue', 'blur', 'focus'],
+		props: {
+			value: {
+				type: [Number, String],
+				default: 1
+			},
+			modelValue: {
+				type: [Number, String],
+				default: 1
+			},
+			min: {
+				type: Number,
+				default: 0
+			},
+			max: {
+				type: Number,
+				default: 100
+			},
+			step: {
+				type: Number,
+				default: 1
+			},
+			background: {
+				type: String,
+				default: '#f5f5f5'
+			},
+			color: {
+				type: String,
+				default: '#333'
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				inputValue: 0
+			};
+		},
+		watch: {
+			value(val) {
+				this.inputValue = +val;
+			},
+			modelValue(val) {
+				this.inputValue = +val;
+			}
+		},
+		created() {
+			if (this.value === 1) {
+				this.inputValue = +this.modelValue;
+			}
+			if (this.modelValue === 1) {
+				this.inputValue = +this.value;
+			}
+		},
+		methods: {
+			_calcValue(type) {
+				if (this.disabled) {
+					return;
+				}
+				const scale = this._getDecimalScale();
+				let value = this.inputValue * scale;
+				let step = this.step * scale;
+				if (type === "minus") {
+					value -= step;
+					if (value < (this.min * scale)) {
+						return;
+					}
+					if (value > (this.max * scale)) {
+						value = this.max * scale
+					}
+				}
+
+				if (type === "plus") {
+					value += step;
+					if (value > (this.max * scale)) {
+						return;
+					}
+					if (value < (this.min * scale)) {
+						value = this.min * scale
+					}
+				}
+
+				this.inputValue = (value / scale).toFixed(String(scale).length - 1);
+				this.$emit("change", +this.inputValue);
+				// TODO vue2 兼容
+				this.$emit("input", +this.inputValue);
+				// TODO vue3 兼容
+				this.$emit("update:modelValue", +this.inputValue);
+			},
+			_getDecimalScale() {
+
+				let scale = 1;
+				// 浮点型
+				if (~~this.step !== this.step) {
+					scale = Math.pow(10, String(this.step).split(".")[1].length);
+				}
+				return scale;
+			},
+			_onBlur(event) {
+				this.$emit('blur', event)
+				let value = event.detail.value;
+				if (!value) {
+					// this.inputValue = 0;
+					return;
+				}
+				value = +value;
+				if (value > this.max) {
+					value = this.max;
+				} else if (value < this.min) {
+					value = this.min;
+				}
+				const scale = this._getDecimalScale();
+				this.inputValue = value.toFixed(String(scale).length - 1);
+				this.$emit("change", +this.inputValue);
+				this.$emit("input", +this.inputValue);
+			},
+			_onFocus(event) {
+				this.$emit('focus', event)
+			}
+		}
+	};
+</script>
+<style lang="scss" scoped>
+	$box-height: 40rpx;
+	$bg: #f5f5f5;
+	$br: 2px;
+	$color: #333;
+
+	.uni-numbox {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-numbox-btns {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		width: $box-height;
+		height: $box-height;
+		border-radius: 50%;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		background-color: $bg;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-numbox__value {
+		margin: 0 2px;
+		width: 40px;
+		height: $box-height;
+		text-align: center;
+		font-size: 14px;
+		border-left-width: 0;
+		border-right-width: 0;
+		color: $color;
+	}
+	
+	.uni-numbox--text {
+		// fix nvue
+		line-height: 20px;
+		font-size: 18px;
+		font-weight: 300;
+		margin-bottom: 6rpx;
+		color: $color;
+	}
+
+	.uni-numbox .uni-numbox--disabled {
+		color: #c0c0c0 !important;
+		/* #ifdef H5 */
+		cursor: not-allowed;
+		/* #endif */
+	}
+</style>
diff --git a/uni_modules/uni-number-box/package.json b/uni_modules/uni-number-box/package.json
new file mode 100644
index 0000000..e774c3f
--- /dev/null
+++ b/uni_modules/uni-number-box/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "uni-number-box",
+  "displayName": "uni-number-box 数字输入框",
+  "version": "1.2.1",
+  "description": "NumberBox 带加减按钮的数字输入框组件，用户可以控制每次点击增加的数值，支持小数。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "数字输入框"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-number-box/readme.md b/uni_modules/uni-number-box/readme.md
new file mode 100644
index 0000000..1037200
--- /dev/null
+++ b/uni_modules/uni-number-box/readme.md
@@ -0,0 +1,13 @@
+
+
+## NumberBox 数字输入框
+> **组件名：uni-number-box**
+> 代码块： `uNumberBox`
+
+
+带加减按钮的数字输入框。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-number-box)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
diff --git a/wallet/Wallet.js b/wallet/Wallet.js
new file mode 100644
index 0000000..217e7fc
--- /dev/null
+++ b/wallet/Wallet.js
@@ -0,0 +1,126 @@
+import Bitcore from "bitcore-lib"
+import Mnemonic from "bitcore-mnemonic"
+import secp256k1 from 'secp256k1'
+import {
+    Address,
+    pubToAddress,
+    toBuffer,
+    toChecksumAddress,
+    intToBuffer
+} from 'ethereumjs-util'
+import coinType from './networks.js'
+import basex from 'base-x'
+
+export default class Wallet {
+
+    static coinType = coinType
+
+    /**
+     * 生成助记词
+     * @param {Object} lang
+     */
+    static generateMnemonic(lang) {
+        if (lang) {
+            return (new Mnemonic(this.getLanguage(lang))).toString();
+        } else {
+            return (new Mnemonic()).toString();
+        }
+    }
+
+    /**
+     * 验证助记词
+     * @param {Object} code
+     * @param {Object} lang
+     */
+    static validMnemonic(code, lang) {
+        if (lang) {
+            return Mnemonic.isValid(code, this.getLanguage(lang));
+        } else {
+            return Mnemonic.isValid(code);
+        }
+    }
+
+    /**
+     * 获取助记词字典
+     * @param {Object} lang
+     */
+    static getLanguage(lang) {
+        return Mnemonic.Words[lang]
+    }
+
+    /**
+     * 转成硬钱包私钥
+     * @param {Object} code
+     */
+    static toHDPrivateKey(code) {
+        return (new Mnemonic(code)).toHDPrivateKey()
+    }
+
+    /**
+     * 验证地址是否合法
+     * @param {Object} addr
+     */
+    static isValidAddress(addr) {
+        return Bitcore.Address.isValid(addr)
+    }
+
+    /**
+     * 硬钱包私钥转成对应网络的 地址 和 私钥
+     * @param {Object} hdPrivateKey
+     * @param {Object} type
+     */
+    static HDPrivateKeyToAddress(hdPrivateKey, type) {
+        const derived = hdPrivateKey.derive("m/44'/" + type.type + "'/0'/0/0");
+        if (type.type === 195) {
+            const ethAddr = this.getEthereumAddress(derived)
+            const addressBuffer = Buffer.concat([intToBuffer(0x41), ethAddr.buf], 21)
+            return {
+                address: Bitcore.encoding.Base58Check.encode(addressBuffer),
+                public_key: derived.privateKey.publicKey.toString(),
+                private_key: derived.privateKey.toString()
+            }
+        }
+        if (type.type === 144) {
+            let addr = derived.privateKey.toAddress(type.network).toString()
+            let deco = Bitcore.encoding.Base58.decode(addr)
+
+            return {
+                address: basex('rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz').encode(deco),
+                public_key: derived.privateKey.publicKey.toString(),
+                private_key: derived.privateKey.toString()
+            }
+        }
+        if (this.networkIsEthereum(type)) {
+            return {
+                address: toChecksumAddress(this.getEthereumAddress(derived).toString()),
+                public_key: derived.privateKey.publicKey.toString(),
+                private_key: derived.privateKey.toString()
+            }
+        }
+        return {
+            address: derived.privateKey.toAddress(type.network).toString(),
+            public_key: derived.privateKey.publicKey.toString(),
+            private_key: derived.privateKey.toString()
+        }
+    }
+
+    /**
+     * 以太坊地址格式转换
+     * @param {Object} derived
+     */
+    static getEthereumAddress(derived) {
+        const publicKey = derived.hdPublicKey.publicKey.toBuffer()
+        const ethPublicKey = secp256k1.publicKeyConvert(publicKey, false)
+            .slice(1)
+        return Address.fromPublicKey(toBuffer(ethPublicKey))
+    }
+
+    /**
+     * 是否是以太坊网络
+     * @param {Object} type
+     */
+    static networkIsEthereum(type) {
+        return type.isEthereum
+    }
+
+}
diff --git a/wallet/_test.js b/wallet/_test.js
new file mode 100644
index 0000000..a8c2e43
--- /dev/null
+++ b/wallet/_test.js
@@ -0,0 +1,29 @@
+import {
+    Wallet
+} from "./Wallet.js"
+
+const code = Wallet.generateMnemonic(this.defaultLanguage)
+this.mnemonicCode = code
+const hdPrivateKey = Wallet.toHDPrivateKey(this.mnemonicCode)
+// const derived = hdPrivateKey.derive("m/44'/61'/0'/0/0");
+// const publicKey = derived.hdPublicKey.publicKey.toBuffer()
+// const ethPublicKey = secp256k1.publicKeyConvert(publicKey, false)
+//     .slice(1)
+
+// const ethAddr = Address.fromPublicKey(toBuffer(ethPublicKey)).toString();
+
+// console.log(toChecksumAddress(ethAddr));
+
+// console.log(Address.fromPrivateKey(hdPrivateKey.hdPublicKey.publicKey.toBuffer()));
+
+var addr = []
+for (var i in this.coinType) {
+    let whk = Wallet.HDPrivateKeyToAddress(hdPrivateKey, i)
+    let parmas = {
+        name: this.coinType[i],
+        address: whk.address,
+        private_key: whk.private_key,
+    }
+    addr.push(parmas)
+}
+this.address = addr
diff --git a/wallet/index.js b/wallet/index.js
new file mode 100644
index 0000000..62c9e5c
--- /dev/null
+++ b/wallet/index.js
@@ -0,0 +1,24 @@
+import store from "@/store/index.js"
+
+const USE_SOTER_AUTH_KEY = 'USE_SOTER_AUTH_KEY'
+
+/**
+ * 初始化配置
+ */
+const initWalletConfigs = () => {
+    // 生物识别
+    const USE_SOTER = Boolean(uni.getStorageSync(USE_SOTER_AUTH_KEY))
+    store.dispatch('wallet/setSoterAuth', USE_SOTER)
+    // 获取默认钱包
+}
+
+const setSoterAuthStatus = (opt) => {
+    uni.setStorageSync(USE_SOTER_AUTH_KEY, opt)
+    store.dispatch('wallet/setSoterAuth', opt)
+}
+
+export default {
+    USE_SOTER_AUTH_KEY,
+    setSoterAuthStatus,
+    initWalletConfigs
+}
\ No newline at end of file
diff --git a/wallet/networks.js b/wallet/networks.js
new file mode 100644
index 0000000..179e338
--- /dev/null
+++ b/wallet/networks.js
@@ -0,0 +1,209 @@
+import Bitcore from "bitcore-lib"
+
+export default [{
+        type: 0,
+        name: '比特币',
+        symbol: 'BTC',
+        code: 'btc',
+        isEthereum: false,
+        network: Bitcore.Networks.mainnet
+    },
+    {
+        type: 60,
+        name: '以太坊',
+        symbol: 'ETH',
+        code: 'eth',
+        isEthereum: true
+    },
+    {
+        type: 61,
+        name: '以太经典',
+        symbol: 'ETC',
+        code: 'etc',
+        isEthereum: true
+    },
+    {
+        type: 60,
+        name: '赤子心',
+        symbol: 'CZX',
+        code: 'eth_0x3a2a239b1bdaae768ffa06314d523e88e98d4d1f',
+        isEthereum: true
+    },
+    // {
+    //     type: 2,
+    //     name: '莱特币',
+    //     symbol: 'LTC',
+    //     isEthereum: false,
+    //     network: Bitcore.Networks.add({
+    //         name: 'LTC',
+    //         alias: 'LTC',
+    //         pubkeyhash: 0x30,
+    //         privatekey: 0x32,
+    //         scripthash: 0xb0,
+    //         bech32prefix: 'ltc',
+    //         xpubkey: 0x019da462,
+    //         xprivkey: 0x019d9cfe,
+    //         networkMagic: 0xdbb6c0fb
+    //     })
+    // },
+    {
+        type: 3,
+        name: '狗狗币',
+        symbol: 'DOGE',
+        code: 'doge',
+        isEthereum: false,
+        network: Bitcore.Networks.add({
+            name: 'DOGE',
+            alias: 'DOGE',
+            pubkeyhash: 0x1e,
+            privatekey: 0x16,
+            scripthash: 0x9e,
+            bech32prefix: 'doge',
+            xpubkey: 0x02facafd,
+            xprivkey: 0x02fac398,
+            networkMagic: 0xc0c0c0c0
+        })
+    },
+  
+    // {
+    //     type: 133,
+    //     name: '零币',
+    //     symbol: 'ZEC',
+    //     isEthereum: false,
+    //     network: Bitcore.Networks.add({
+    //         name: 'ZEC',
+    //         alias: 'ZEC',
+    //         pubkeyhash: 0x1e,
+    //         privatekey: 0x16,
+    //         scripthash: 0x9e,
+    //         bech32prefix: 'doge',
+    //         xpubkey: 0x02facafd,
+    //         xprivkey: 0x02fac398,
+    //         networkMagic: 0xc0c0c0c0
+    //     })
+    // },
+    // {
+    //     type: 144,
+    //     name: 'XPR - 瑞波币',
+    //     symbol: 'XPR',
+    //     isEthereum: false,
+    //     network: Bitcore.Networks.add({
+    //         name: 'XPR',
+    //         alias: 'XPR',
+    //         pubkeyhash: 0x1e,
+    //         privatekey: 0x16,
+    //         scripthash: 0x9e,
+    //         bech32prefix: 'doge',
+    //         xpubkey: 0x02facafd,
+    //         xprivkey: 0x02fac398,
+    //         networkMagic: 0xc0c0c0c0
+    //     })
+    // },
+    // {
+    //     type: 145,
+    //     name: '比特现金',
+    //     symbol: 'BCH',
+    //     isEthereum: false,
+    //     network: Bitcore.Networks.add({
+    //         name: 'BCH',
+    //         alias: 'BCH',
+    //         pubkeyhash: 0x00,
+    //         privatekey: 0x05,
+    //         scripthash: 0x80,
+    //         bech32prefix: 'bitcoincash',
+    //         xpubkey: 0x0488b21e,
+    //         xprivkey: 0x0488ade4,
+    //         networkMagic: 0xd9b4bef9
+    //     })
+    // },
+    // {
+    //     type: 195,
+    //     name: '波场',
+    //     symbol: 'TRX',
+    //     isEthereum: false,
+    //     network: Bitcore.Networks.add({
+    //         name: 'TRX',
+    //         alias: 'TRX',
+    //         pubkeyhash: 0x41,
+    //         privatekey: 0x05,
+    //         scripthash: 0x80,
+    //         bech32prefix: '',
+    //         xpubkey: 0x0488b21e,
+    //         xprivkey: 0x0488ade4
+    //     })
+    // },
+    {
+        type: 195,
+        name: 'USDT(TRC20)',
+        symbol: 'USDT',
+        code: 'trx_TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t',
+        isEthereum: false,
+        network: Bitcore.Networks.add({
+            name: 'USDT',
+            alias: 'USDT',
+            pubkeyhash: 0x41,
+            privatekey: 0x05,
+            scripthash: 0x80,
+            bech32prefix: '',
+            xpubkey: 0x0488b21e,
+            xprivkey: 0x0488ade4
+        })
+    },
+    {
+        type: 195,
+        name: 'USDT(ERC20)',
+        symbol: 'USDT',
+        code: 'eth_0xdac17f958d2ee523a2206206994597c13d831ec7',
+        isEthereum: true
+    },
+    {
+        type: 0,
+        name: 'USDT(OMNI)',
+        symbol: 'USDT',
+        code: 'usdt',
+        isEthereum: false,
+        network: Bitcore.Networks.mainnet
+    },
+    {
+        type: 13107,
+        name: '比特元',
+        symbol: 'BTY',
+        code: 'bty',
+        isEthereum: false,
+        network: Bitcore.Networks.add({
+            name: 'BTY',
+            alias: 'BTY',
+            pubkeyhash: 0x00,
+            privatekey: 0x05,
+            scripthash: 0x80,
+            bech32prefix: 'bityuan',
+            xpubkey: 0x0488b21e,
+            xprivkey: 0x0488ade4,
+            networkMagic: 0xd9b4bef9
+        })
+    },
+    // {
+    //     type: 60,
+    //     name: '元链',
+    //     symbol: 'YCC',
+    //     isEthereum: true
+    // },
+    {
+        type: 13107,
+        name: 'JZC',
+        symbol: 'JZC',
+        code: 'bty',
+        isEthereum: false,
+        network: Bitcore.Networks.add({
+            name: 'JZC',
+            alias: 'JZC',
+            pubkeyhash: 0x00,
+            privatekey: 0x05,
+            scripthash: 0x80,
+            bech32prefix: 'bityuan',
+            xpubkey: 0x0488b21e,
+            xprivkey: 0x0488ade4,
+            networkMagic: 0xd9b4bef9
+        })
+    }
+]

From 69328de0552c586a9a5cb417fd07d77adb43cb62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Mon, 10 Jan 2022 16:51:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8B=E5=8D=95=EF=BC=8C=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json                        |   4 +
 apis/interfaces/address.js                    |  65 ++++
 apis/interfaces/store.js                      |  11 +-
 pages.json                                    |   2 +-
 pages/address/edit.vue                        | 294 +++++++++++++++++-
 pages/address/index.vue                       |  99 ++----
 pages/store/buy.vue                           |  38 ++-
 pages/store/index.vue                         |   2 +-
 pages/store/list.vue                          |  59 ++--
 pages/store/meals.vue                         |   4 +-
 pages/user/index.vue                          |   2 +-
 static/icon/null-icon.png                     | Bin 0 -> 7062 bytes
 .../components/oct-address/oct-address.vue    |   8 +-
 13 files changed, 482 insertions(+), 106 deletions(-)
 create mode 100644 apis/interfaces/address.js
 create mode 100644 static/icon/null-icon.png

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 582561b..a97fd25 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -10,6 +10,10 @@
      	{
      		"launchtype" : "local"
      	},
+     	"h5" : 
+     	{
+     		"launchtype" : "local"
+     	},
      	"type" : "uniCloud"
      }
     ]
diff --git a/apis/interfaces/address.js b/apis/interfaces/address.js
new file mode 100644
index 0000000..783a14a
--- /dev/null
+++ b/apis/interfaces/address.js
@@ -0,0 +1,65 @@
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦，岁月迢迢华发增。
+ * 碌碌无为枉半生，一朝惊醒万事空。
+ * moduleName: 地址管理
+ */
+
+import { request } from '../index'
+
+// 地址列表
+const list = () =>{
+	return request({
+		url: 'mall/addresses'
+	})
+}
+
+// 添加地址
+const add = data => {
+	return request({
+		url: 'mall/addresses',
+		method: 'POST',
+		data
+	})
+}
+
+// 收货地址详情
+const info = id => {
+	return request({
+		url: 'mall/addresses/' + id
+	})
+}
+
+// 修改收货地址
+const edit = (id, data) => {
+	return request({
+		url: 'mall/addresses/' + id,
+		method: 'PUT',
+		data
+	})
+}
+
+// 删除收货地址
+const del = id => {
+	return request({
+		url: 'mall/addresses/' + id,
+		method: 'DELETE'
+	})
+}
+
+// 获取省市区
+const addresses = data => {
+	return request({
+		url: 'mall/addresses/create',
+		data
+	})
+}
+
+export {
+	list,
+	add,
+	info,
+	edit,
+	del,
+	addresses
+}
diff --git a/apis/interfaces/store.js b/apis/interfaces/store.js
index e3c2a24..846f3f1 100644
--- a/apis/interfaces/store.js
+++ b/apis/interfaces/store.js
@@ -30,6 +30,7 @@ const meals = id => {
 
 // 商品列表
 const lists = data => {
+	console.log(data)
 	return request({
 		url: 'mall/goods',
 		data
@@ -53,11 +54,19 @@ const verify = data => {
 	})
 }
 
+// 商城二级分类
+const classify = id => {
+	return request({
+		url: 'mall/categories/' + id + '/children'
+	})
+}
+
 export {
 	mall,
 	goods,
 	meals,
 	lists,
 	buy,
-	verify
+	verify,
+	classify
 }
diff --git a/pages.json b/pages.json
index 0729602..34b51aa 100644
--- a/pages.json
+++ b/pages.json
@@ -101,7 +101,7 @@
 		"path": "pages/address/edit",
 		"name": "AddressEdit",
 		"style": {
-			"navigationBarTitleText": "编辑",
+			"navigationBarTitleText": "编辑",
 			"enablePullDownRefresh": false
 		}
 	}, {
diff --git a/pages/address/edit.vue b/pages/address/edit.vue
index fb5fb47..271ab06 100644
--- a/pages/address/edit.vue
+++ b/pages/address/edit.vue
@@ -1,19 +1,303 @@
 <template>
-	<view>
-		编辑地址
+	<view class="content">
+		<!-- 表单 -->
+		<view class="form-block">
+			<view class="item">
+				<label>收货人</label>
+				<input class="form-input" type="text" v-model="name" placeholder="输入收货人姓名" />
+			</view>
+			<view class="item">
+				<label>手机号码</label>
+				<input class="form-input" type="number" v-model="phone" placeholder="输入手机号码"/>
+			</view>
+			<view class="item">
+				<label>所在地区</label>
+				<view class="picker-value" @click="show = true">
+					<block v-if="value.length > 0">
+						<text v-for="(item, index) in value" :key="index">{{item.name}}</text>
+					</block>
+					<block v-else>
+						<view class="picker-value-placeholder">请选择省市区</view>
+					</block>
+				</view>
+			</view>
+			<view class="item">
+				<label>详细地址</label>
+				<input class="form-input" type="text" v-model="street" placeholder="输入详细地址"/>
+			</view>
+		</view>
+		<view class="form-block">
+			<view class="item">
+				<label>设为默认</label>
+				<view class="form-switch">
+					<u-switch v-model="def" size="22" activeColor="#34CE98" />
+				</view>
+			</view>
+		</view>
+		<view class="form-block" v-if="this.$Route.query.id">
+			<view class="item remove" @click="deleteThis">
+				<label>删除地址</label>
+				<view class="form-switch">
+					<uni-icons type="forward" color="#999"></uni-icons>
+				</view>
+			</view>
+		</view>
+		<!-- 编辑信息 -->
+		<view class="footer">
+			<button type="default" @click="submit">{{this.$Route.query.id ? '保存' : '创建'}}</button>
+		</view>
+		<!-- 地址选择器 -->
+		<u-picker
+			:show="show"
+			ref="uPicker"
+			keyName="name"
+			:columns="columns"
+			confirmColor="#34CE98"
+			cancelColor="#666"
+			:defaultIndex="defaultIndex"
+			@cancel="show = false"
+			@confirm="confirm"
+			@change="changePicker"
+		></u-picker>
 	</view>
 </template>
 
 <script>
+	import { addresses, add, info, edit, del } from '@/apis/interfaces/address'
 	export default {
 		data() {
 			return {
-				
+				show		: false,
+				value		: [],
+				columns		: [
+					[{name: '省'}],
+					[{name: '市'}],
+					[{name: '区/县'}]
+				],
+				defaultIndex: [],
+				name		: "",
+				phone		: "",
+				street		: "",
+				def			: false,
 			};
+		},
+		created() {
+			uni.setNavigationBarTitle({
+				title: this.$Route.query.id ? '编辑地址': '创建地址'
+			})
+			if(this.$Route.query.id){
+				info(this.$Route.query.id).then(res =>{
+					let addressId = [
+						res.province.region_id,
+						res.city.region_id,
+						res.district.region_id,
+					]
+					this.name 		  = res.name
+					this.phone 		  = res.mobile
+					this.street		  = res.address
+					this.def		  = res.default
+					this.value  	  = [
+						{ name:res.province.name,  id: res.province.region_id},
+						{ name:res.city.name,  	   id: res.city.region_id},
+						{ name:res.district.name,  id: res.district.region_id}
+					]
+					this.getAddresses(addressId)
+				})
+			}else{
+				this.getAddresses()
+			}
+		},
+		methods:{
+			confirm(e){
+				this.show = false
+				
+				console.log(e.value)
+				
+				this.value = e.value
+			},
+			changePicker(e){
+				const { columnIndex, index, values } = e
+				const parentId = values[columnIndex][index].id
+				switch(columnIndex){
+					case 0:
+						this.getCity(parentId)
+						break;
+					case 1:
+						this.getCounty(parentId)
+						break;
+				}
+			},
+			async getAddresses(values){
+				let parentId 	= "",
+					columnsArr	= []
+					
+				for(let i in this.columns){
+					await addresses({parent_id:parentId}).then(res => {
+						if(values){
+							parentId = values[i]
+						}else{
+							parentId = res[0].id
+						}
+						columnsArr.push(res)
+						this.$refs.uPicker.setColumnValues(i, res)
+						if(i == 2 && values){
+							let defIndex = columnsArr.map((val,index) => {
+								return val.findIndex(v => v.id === values[index])
+							})
+							this.defaultIndex = defIndex
+						}
+					})
+				}
+			},
+			getCity(id) {
+				addresses({parent_id:id}).then(res => {
+					this.$refs.uPicker.setColumnValues(1, res)
+					this.getCounty(res[0].id)
+				})
+			},
+			getCounty(id){
+				addresses({parent_id:id}).then(res => {
+					this.$refs.uPicker.setColumnValues(2, res)
+				})
+			},
+			submit(){
+				let data = {
+					name		: this.name,
+					mobile		: this.phone,
+					province_id	: this.value[0].id,
+					city_id		: this.value[1].id,
+					district_id	: this.value[2].id,
+					address		: this.street,
+					is_default	: this.def ? 1 : 0
+				}
+				
+				let submitFun
+				
+				if(this.$Route.query.id){
+					submitFun = edit(this.$Route.query.id, data)
+				}else{
+					submitFun = add(data)
+				}
+				
+				submitFun.then(res => {
+					uni.showToast({
+						title: res,
+						icon : 'success',
+						mask : true
+					})
+					setTimeout(() => {
+						this.$Router.back()
+					},2000)
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			},
+			deleteThis(){
+				uni.showModal({
+					title		: '提示',
+					content		: '确定删除地址？',
+					cancelText	: '取消',
+					confirmText : '确认',
+					showCancel	: true,
+					confirmColor: '#34CE98',
+					success		: res => {
+						if(res.confirm){
+							del(this.$Route.query.id).then(res => {
+								uni.showToast({
+									title: res,
+									icon : 'success',
+									mask : true
+								})
+								setTimeout(() => {
+									this.$Router.back()
+								},2000)
+							})
+						}
+					}
+				})
+			}
 		}
 	}
 </script>
 
-<style lang="scss">
-
+<style lang="scss" scoped>
+	.content{
+		background: $window-color;
+		min-height: 100vh;
+		padding: $padding;
+		box-sizing: border-box;
+	}
+	// 提交按钮
+	.footer{
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 999;
+		padding: $padding;
+		background: white;
+		button{
+			border-radius: $radius/2;
+			height: 90rpx;
+			line-height: 90rpx;
+			font-size: $title-size;
+			background: $main-color;
+			padding: 0;
+			color: white;
+			&::after{
+				display: none;
+			}
+		}
+	}
+	// 表单
+	.form-block{
+		background-color: white;
+		border-radius: $radius;
+		margin-bottom: $margin;
+		.item{
+			position: relative;
+			padding: 0 $padding 0 200rpx;
+			border-bottom: solid 1rpx $border-color;
+			min-height: 90rpx;
+			&.remove{
+				color: $text-price;
+			}
+			&:last-child{
+				border-bottom: none;
+			}
+			label{
+				position: absolute;
+				left: 0;
+				top: 0;
+				padding-left: $padding;
+				line-height: 90rpx;
+				font-size: $title-size-lg;
+			}
+			.form-switch{
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+				height: 90rpx;
+			}
+			.form-input,
+			.picker-value{
+				min-height: 90rpx;
+				line-height: 90rpx;
+				font-size: $title-size-lg;
+				&-placeholder{
+					color: $text-gray-m;
+				}
+				@extend .nowrap;
+				text{
+					margin-right: 10rpx;
+					&:last-child{
+						margin-right: 0;
+					}
+				}
+			}
+		}
+	}
 </style>
diff --git a/pages/address/index.vue b/pages/address/index.vue
index 73da631..f328212 100644
--- a/pages/address/index.vue
+++ b/pages/address/index.vue
@@ -1,86 +1,51 @@
 <template>
 	<view class="content">
 		<oct-address
-			:isTag="false"
 			:lists="addressList"
-			:isEdit="false"
 			:pattern="true"
+			:isEdit="edit"
 			editColor="#34CE98"
 			:btnStyle="{'backgroundColor': '#34CE98'}"
 			@onAddress="onInfo"
 			@onAdd="$Router.push({name: 'AddressEdit'})"
 		/>
+		<!--  -->
 	</view>
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			addressList: [
-				{
-					name: '唐明明',
-					phone: '18245180131',
-					city: '黑龙江省哈尔滨市香坊区',
-					address: '旭升南街108号',
-					default: false,
-					tag: '公司'
-				},{
-					name: '张静',
-					phone: '18245180131',
-					city: '黑龙江省哈尔滨市香坊区',
-					address: '旭升南街108号',
-					default: true,
-					tag: '家'
-				},{
-					name: '法外狂徒张三',
-					phone: '18245180131',
-					city: '黑龙江省哈尔滨市香坊区',
-					address: '旭升南街108号',
-					default: false,
-					tag: ''
-				},{
-					name: '王尼玛',
-					phone: '18245180131',
-					city: '黑龙江省哈尔滨市香坊区',
-					address: '旭升南街108号',
-					default: false,
-					tag: ''
-				},{
-					name: '纸巾劳斯',
-					phone: '18245180131',
-					city: '黑龙江省哈尔滨市香坊区',
-					address: '旭升南街108号',
-					default: false,
-					tag: ''
-				},{
-					name: '张同学',
-					phone: '18245180131',
-					city: '黑龙江省哈尔滨市香坊区',
-					address: '旭升南街108号',
-					default: false,
-					tag: ''
-				},{
-					name: '大叔',
-					phone: '18245180131',
-					city: '黑龙江省哈尔滨市香坊区',
-					address: '旭升南街108号',
-					default: false,
-					tag: ''
-				}
-			]
-		};
-	},
-	methods: {
-		onInfo(val){
-			this.$store.commit('setAddress', val)
-			this.$Router.back()
+	import { list } from '@/apis/interfaces/address'
+	export default {
+		data() {
+			return {
+				edit	   : true,
+				addressList: []
+			};
 		},
-		add(){
-			console.log("新增地址")
+		onShow(){
+			this.edit = this.$Route.query.type === 'edit'
+			
+			list().then(res => {
+				this.addressList = res
+			})
+		},
+		methods: {
+			onInfo(val){
+				console.log(val)
+				if(this.edit){
+					this.$Router.push({
+						name	: 'AddressEdit',
+						params	: {
+							id	: val.address_id
+						}
+					})
+				}else{
+					this.$store.commit('setAddress', val)
+					this.$Router.back()
+				}
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
diff --git a/pages/store/buy.vue b/pages/store/buy.vue
index 37b140e..e18f730 100644
--- a/pages/store/buy.vue
+++ b/pages/store/buy.vue
@@ -5,8 +5,8 @@
 			<view class="block address" @click="$Router.push({name: 'Address'})">
 				<uni-icons class="address-icon location" type="location-filled" size="24" color="#34CE98"></uni-icons>
 				<uni-icons class="address-icon arrows" type="right" size="20" color="#999"></uni-icons>
-				<view class="user"><text>{{address.name}}</text>{{address.phone}}</view>
-				<view class="city">{{address.address}}{{address.city}}</view>
+				<view class="user"><text>{{address.name}}</text>{{address.mobile}}</view>
+				<view class="city">{{address.full_address}}</view>
 			</view>
 		</block>
 		<block v-else>
@@ -38,13 +38,19 @@
 			</view>
 			<view class="info-item">
 				<view class="label">配送费用</view>
-				<view class="nowrap">{{freight <= 0 ? '免费': freight}}</view>
+				<view class="nowrap">{{freight == 0 ? '免费': freight}}</view>
+			</view>
+		</view>
+		<view class="block info-box">
+			<view class="info-item">
+				<view class="label">订单备注</view>
+				<textarea class="info-textarea" v-model="remark" placeholder="订单备注"></textarea>
 			</view>
 		</view>
 		<!-- footer -->
 		<view class="order-footer">
 		    <view class="total">总计：<text>￥{{total}}</text></view>
-		    <button class="btn">确认订单</button>
+		    <button class="btn" @click="subOrder">确认订单</button>
 		</view>
 	</view>
 </template>
@@ -58,7 +64,8 @@
 				goodsInfo : [],
 				total	  : 0,
 				freight	  : 0,
-				address	  : ""
+				address	  : "",
+				remark	  : ""
 			};
 		},
 		computed:{
@@ -91,6 +98,21 @@
 			numberChange(e){
 				this.qty = e
 				this.getBuy()
+			},
+			// 确认订单
+			subOrder(){
+				verify({
+					goods_sku_id: this.$Route.query.skuId,
+					qty			: this.qty,
+					address_id	: this.address.address_id,
+					remark		: this.remark || ''
+				}).then(res => {
+					console.log(res)
+					this.$store.commit('setAddress', {})
+					this.$Router.replace({
+						name: 'Pay'
+					})
+				})
 			}
 		}
 	}
@@ -206,6 +228,12 @@
 				top: $margin;
 				color: $text-gray;
 			}
+			.info-textarea{
+				height: 120rpx;
+				width: 100%;
+				text-align: left;
+				font-size: $title-size-m;
+			}
 			&::after{
 				position: absolute;
 				left: $margin;
diff --git a/pages/store/index.vue b/pages/store/index.vue
index df84975..163b7a8 100644
--- a/pages/store/index.vue
+++ b/pages/store/index.vue
@@ -28,7 +28,7 @@
 		<view class="new-box">
 			<view class="title">上新精选</view>
 			<view class="news">
-				<view class="news-item" v-for="(item, index) in newGood" :key="index">
+				<view class="news-item" v-for="(item, index) in newGood" :key="index" @click="$Router.push({ name: 'StoreGoods', params: {id: item.goods_id}})">
 					<view class="news-cover">
 						<image :src="item.cover" mode="aspectFill"></image>
 					</view>
diff --git a/pages/store/list.vue b/pages/store/list.vue
index 6f76550..e7899fe 100644
--- a/pages/store/list.vue
+++ b/pages/store/list.vue
@@ -2,30 +2,39 @@
 	<view class="content">
 		<!-- 分类 -->
 		<u-sticky bgColor="#fff" zIndex="99">
-			<u-tabs :list="classify" lineColor="#34CE98" @click="onTabs()"></u-tabs>
+			<u-tabs :list="classify" lineColor="#34CE98" @click="onTabs"></u-tabs>
 		</u-sticky>
 		<!-- 分类商品 -->
-		<oct-goods
-			:lists="goodsArr"
-			color="#e6576b"
-			@onGoods="$Router.push({ name: 'StoreGoods', params: {id: $event.goods_id}})"
-		/>
+		<block v-if="goodsArr.length >= 1">
+			<oct-goods
+				:lists="goodsArr"
+				color="#e6576b"
+				@onGoods="$Router.push({ name: 'StoreGoods', params: {id: $event.goods_id}})"
+			/>
+		</block>
+		<block v-else>
+			<view class="vertical pages-empty">
+				<u-empty
+					icon="http://cdn.uviewui.com/uview/empty/data.png"
+					textColor="#999"
+					text="暂无数据"
+				>
+				</u-empty>
+			</view>
+		</block>
 	</view>
 </template>
 
 <script>
-	import { lists } from "@/apis/interfaces/store"
+	import { lists, classify } from "@/apis/interfaces/store"
 	export default {
 		data() {
 			return {
 				goodsArr: [],
 				classify: [
-					{ name: "全部" },
-					{ name: "21天盒子" },
-					{ name: "7天盒子" },
-					{ name: "3天盒子" },
-					{ name: "复食餐" },
-				]
+					{ name: "全部", category_id: "" }
+				],
+				cid		: ""
 			};
 		},
 		mounted(){
@@ -33,21 +42,29 @@
 				title: this.$Route.query.title
 			})
 			this.getLists()
+			this.getClassify()
 		},
 		methods:{
 			// 商品列表
-			getLists() {
-				// {
-				// 	this.$Route.query.id
-				// }
-				lists({}).then(res => {
+			getLists(cid) {
+				lists({
+					category_id	: this.$Route.query.id,
+					category_cid: this.cid
+				}).then(res => {
 					this.goodsArr = res.data
 					uni.stopPullDownRefresh()
 				})
 			},
+			// 获取二级分类
+			getClassify(){
+				classify(this.$Route.query.id).then(res => {
+					this.classify = this.classify.concat(res)
+				})
+			},
 			// 二级分类筛选
-			onTabs(){
+			onTabs(e){
 				this.goodsArr = []
+				this.cid	  = e.category_id
 				this.getLists()
 			}
 		},
@@ -62,4 +79,8 @@
 		background: $window-color;
 		min-height: 100vh;
 	}
+	
+	.pages-empty{
+		height: 70vh;
+	}
 </style>
diff --git a/pages/store/meals.vue b/pages/store/meals.vue
index a17c830..b839d16 100644
--- a/pages/store/meals.vue
+++ b/pages/store/meals.vue
@@ -28,11 +28,11 @@
 		methods:{
 			getMeals(){
 				meals(this.$Route.query.id).then(res => {
-					console.log(res)
 					uni.setNavigationBarTitle({
 						title: res.meal.subtitle
 					})
-					this.banner   = res.banner
+					console.log(res)
+					this.banner   = res.banners
 					this.goodsArr = res.meal.goods
 					uni.stopPullDownRefresh()
 				})
diff --git a/pages/user/index.vue b/pages/user/index.vue
index d7863f3..17d8b11 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -89,7 +89,7 @@
 				健康档案
 				<uni-icons class="forward" type="forward" color="#999"></uni-icons>
 			</view>
-			<view class="btns-box-item" @click="$Router.push({name: 'Address'})">
+			<view class="btns-box-item" @click="$Router.push({name: 'Address', params: {type: 'edit'}})">
 				<image class="icon" src="@/static/user/icon_02.png" mode="widthFix"></image>
 				地址管理
 				<uni-icons class="forward" type="forward" color="#999"></uni-icons>
diff --git a/static/icon/null-icon.png b/static/icon/null-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9883886dc7362d928e9662691d8255e2dcf88295
GIT binary patch
literal 7062
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
G!2bXRc!kpd

literal 0
HcmV?d00001

diff --git a/uni_modules/oct-address/components/oct-address/oct-address.vue b/uni_modules/oct-address/components/oct-address/oct-address.vue
index c2f24b1..bc1e286 100644
--- a/uni_modules/oct-address/components/oct-address/oct-address.vue
+++ b/uni_modules/oct-address/components/oct-address/oct-address.vue
@@ -11,12 +11,12 @@
 					<view class="city">
 						<block v-if="isTag">
 							<text v-if="item.default" class="city--tag city--default">默认</text>
-							<text v-if="item.tag && item.tag != ''" class="city--tag city--type">{{item.tag}}</text>
+							<!-- <text v-if="item.tag && item.tag != ''" class="city--tag city--type">{{item.tag}}</text> -->
 						</block>
-						{{item.city}}
+						{{item.province.name}}{{item.city.name}}{{item.district.name}}
 					</view>
 					<view class="address">{{item.address}}</view>
-					<view class="name">{{item.name}}<text>{{item.phone}}</text></view>
+					<view class="name">{{item.name}}<text>{{item.mobile}}</text></view>
 					<view class="edit" :style="{'color': editColor}" @click="$emit('onAddress', item)">{{isEdit ? '编辑' : '选择'}}</view>
 				</view>
 			</view>
@@ -153,7 +153,7 @@
 						margin-right: $margin/2;
 					}
 					.city--default{
-						background: #FF6160;
+						background: #e6576b;
 						color: white;
 						padding: 0 $margin/3;
 						border-radius: $radius;