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] =?UTF-8?q?=E4=B8=8B=E5=8D=95=EF=BC=8C=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=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;