From c23e1922a38c5a956f87a308f2a059d386ccfd58 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 26 Jun 2023 20:52:27 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A1=AE=E8=AE=A4=E9=A1=B5=EF=BC=8C?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=9C=B0=E5=9D=80=E3=80=91=201.=20=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/member/address.js               |   5 +
 api/user.js                         |  34 ----
 components/addressWindow/index.vue  |  65 ++++---
 pages/users/order_confirm/index.vue | 272 +++++++++++-----------------
 4 files changed, 144 insertions(+), 232 deletions(-)

diff --git a/api/member/address.js b/api/member/address.js
index 7b6a5b2e..861dad04 100644
--- a/api/member/address.js
+++ b/api/member/address.js
@@ -7,6 +7,11 @@ export function getAddress(id) {
   });
 }
 
+// 获得默认的用户收件地址
+export function getDefaultUserAddress() {
+  return request.get('app-api/member/address/get-default', {});
+}
+
 // 获得用户收件地址列表
 export function getAddressList() {
   return request.get('app-api/member/address/list', {});
diff --git a/api/user.js b/api/user.js
index 3ac9f17a..53854438 100644
--- a/api/user.js
+++ b/api/user.js
@@ -243,40 +243,6 @@ export function userLevelDetection(){
   return request.get('user/level/detection');
 }
 
-/**
- *
- * 地址列表
- * @param object data
-*/
-export function getAddressList(data){
-  return request.get('address/list',data);
-}
-
-/**
- * 设置默认地址
- * @param int id
-*/
-export function setAddressDefault(id){
-  return request.post('address/default/set',{id:id})
-}
-
-/**
- * 修改 添加地址
- * @param object data
-*/
-export function editAddress(data){
-  return request.post('address/edit',data);
-}
-
-/**
- * 删除地址
- * @param int id
- *
-*/
-export function delAddress(id){
-  return request.post('address/del',{id:id})
-}
-
 /**
  * 获取单个地址
  * @param int id
diff --git a/components/addressWindow/index.vue b/components/addressWindow/index.vue
index d079fb3a..274c023f 100644
--- a/components/addressWindow/index.vue
+++ b/components/addressWindow/index.vue
@@ -3,14 +3,17 @@
 		<view class="address-window" :class="address.address ? 'on' : ''">
 			<view class='title'>选择地址<text class='iconfont icon-guanbi' @tap='close'></text></view>
 			<view class='list'>
-				<view class='item acea-row row-between-wrapper' :class='active==index?"font-color":""' v-for="(item,index) in addressList"
-				 @tap='tapAddress(index,item.id)' :key='index'>
-					<text class='iconfont icon-ditu' :class='active==index?"font-color":""'></text>
+				<view class='item acea-row row-between-wrapper' :class='active === index?"font-color":""'
+              v-for="(item,index) in addressList" @tap='tapAddress(index,item.id)' :key='index'>
+					<text class='iconfont icon-ditu' :class='active===index?"font-color":""' />
 					<view class='address'>
-						<view class='name' :class='active==index?"font-color":""'>{{item.realName}}<text class='phone'>{{item.phone}}</text></view>
-						<view class='line1'>{{item.province}}{{item.city}}{{item.district}}{{item.detail}}</view>
+						<view class='name' :class='active==index?"font-color":""'>
+              {{ item.name }}
+              <text class='phone'>{{ item.mobile }}</text>
+            </view>
+						<view class='line1'>{{ item.areaName }} {{ item.detailAddress }}</view>
 					</view>
-					<text class='iconfont icon-complete' :class='active==index?"font-color":""'></text>
+					<text class='iconfont icon-complete' :class='active === index?"font-color":""' />
 				</view>
 			</view>
 			<!-- 无地址 -->
@@ -24,10 +27,8 @@
 </template>
 
 <script>
-	import {
-		getAddressList
-	} from '@/api/user.js';
-	export default {
+  import * as AddressApi from '@/api/member/address.js';
+  export default {
 		props: {
 			pagesUrl: {
 				type: String,
@@ -49,58 +50,54 @@
 		},
 		data() {
 			return {
-				active: 0,
+				active: 0, // 激活的 addressList 下标
 				is_loading: true,
 				addressList: []
 			};
 		},
 		methods: {
+      /**
+       * 选中某个地址
+       */
 			tapAddress: function(e, addressid) {
 				this.active = e;
-				let a = {};
-				for (let i = 0, leng = this.addressList.length; i < leng; i++) {
+				for (let i = 0; i < this.addressList.length; i++) {
 					if (this.addressList[i].id === addressid) {
-						a = this.addressList[i];
-					}
+            this.$emit('OnChangeAddress', this.addressList[i]);
+            break
+          }
 				}
-				this.$emit('OnChangeAddress', a);
 			},
 			close: function() {
 				this.$emit('changeClose');
-				this.$emit('changeTextareaStatus');
 			},
 			goAddressPages: function() {
 				this.$emit('changeClose');
-				this.$emit('changeTextareaStatus');
 				uni.navigateTo({
 					url: this.pagesUrl
 				});
 			},
 			getAddressList: function() {
-				let that = this;
-				getAddressList({
-					page: 1,
-					limit: 5
-				}).then(res => {
-					let addressList = res.data.list;
-					that.$set(that, 'addressList', addressList);
-					that.is_loading = false;
-					let defaultAddress = {};
-					//处理默认选中项
-					if(!that.address.addressId) return;
-					for (let i = 0, leng = addressList.length; i < leng; i++) {
-						if (addressList[i].id == that.address.addressId) {
-							that.active = i;
+        AddressApi.getAddressList().then(res => {
+					const addressList = res.data;
+					this.$set(this, 'addressList', addressList);
+					this.is_loading = false;
+          // 处理默认选中项
+					if (!this.address.addressId) {
+            return;
+          }
+          let defaultAddress = {};
+          for (let i = 0; i < addressList.length; i++) {
+						if (addressList[i].id === this.address.addressId) {
+							this.active = i;
 							defaultAddress = this.addressList[i];
 						}
 					}
-					this.$emit('OnDefaultAddress', defaultAddress);
 				})
 			}
 		}
 	}
 </script>
-
 <style scoped lang="scss">
 	.address-window {
 		background-color: #fff;
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 33043e6a..40da8c8f 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -8,15 +8,16 @@
 					<view class="item font-color" :class="shippingType == 1 ? 'on' : 'on2'" @tap="addressType(1)"
 						v-if='store_self_mention'></view>
 				</view>
-				<view class='address acea-row row-between-wrapper' @tap='onAddress' v-if='shippingType == 0' :style="store_self_mention ? '':'border-top-left-radius: 14rpx;border-top-right-radius: 14rpx;'">
-					<view class='addressCon' v-if="addressInfo.realName">
-						<view class='name'>{{addressInfo.realName}}
-							<text class='phone'>{{addressInfo.phone}}</text>
+        <!-- 收货地址的选择 -->
+				<view class='address acea-row row-between-wrapper' @tap='onAddress' v-if='shippingType === 0'
+              :style="store_self_mention ? '':'border-top-left-radius: 14rpx;border-top-right-radius: 14rpx;'">
+					<view class='addressCon' v-if="addressInfo.name">
+						<view class='name'>{{ addressInfo.name }}
+							<text class='phone'>{{ addressInfo.mobile }}</text>
 						</view>
 						<view class="acea-row">
-							<text class='default font-color'
-								v-if="addressInfo.isDefault">[默认]</text>
-							<text class="line2">{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.detail}}</text>	
+							<text class='default font-color' v-if="addressInfo.defaultStatus">[默认]</text>
+							<text class="line2">{{ addressInfo.areaName }} {{addressInfo.detailAddress}}</text>
 						</view>
 					</view>
 					<view class='addressCon' v-else>
@@ -24,6 +25,7 @@
 					</view>
 					<view class='iconfont icon-jiantou'></view>
 				</view>
+        <!-- TODO 芋艿：还在搞 -->
 				<view class='address acea-row row-between-wrapper' v-else @tap="showStoreList">
 					<block v-if="storeList.length>0">
 						<view class='addressCon'>
@@ -53,7 +55,7 @@
 							<text class='iconfont icon-jiantou'></text>
 						</view>
 					</view>
-					
+
 					<view class='item acea-row row-between-wrapper'
 						v-if="!orderInfoVo.bargainId && !orderInfoVo.combinationId && !orderInfoVo.seckillId && productType==='normal'">
 						<view>积分抵扣</view>
@@ -84,7 +86,7 @@
 							<view>联系人</view>
 							<view class="discount textR">
 								<input type="text" placeholder="请填写您的联系姓名" placeholder-style="color:#ccc;" placeholder-class="placeholder"
-									@blur='realName'></input>
+									@blur='realName' />
 							</view>
 						</view>
 						<view class="item acea-row row-between-wrapper">
@@ -151,17 +153,20 @@
 			</view>
 		</view>
 		<couponListWindow :coupon='coupon' @ChangCouponsClone="ChangCouponsClone" :openType='openType' @ChangCoupons="ChangCoupons" :orderShow="orderShow"></couponListWindow>
-		<addressWindow ref="addressWindow" @changeTextareaStatus="changeTextareaStatus" :address='address'
-			:pagesUrl="pagesUrl" @OnDefaultAddress="OnDefaultAddress"  @OnChangeAddress="OnChangeAddress" @changeClose="changeClose"></addressWindow>
-		<!-- #ifdef MP -->
-		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
-		<!-- #endif -->
+
+    <!-- 收货地址的弹窗选择 -->
+    <addressWindow
+      ref="addressWindow"
+      :address='address'
+			:pagesUrl="pagesUrl"
+      @OnChangeAddress="OnChangeAddress"
+      @changeClose="changeClose"
+    />
 		<home></home>
 	</view>
 </template>
 <script>
 	import {
-		//orderConfirm,
 		getCouponsOrderPrice,
 		orderCreate,
 		postOrderComputed,
@@ -169,42 +174,25 @@
 		wechatQueryPayResult,
 		loadPreOrderApi
 	} from '@/api/order.js';
-	import {
-		getAddressList,
-		getAddressDetail
-	} from '@/api/user.js';
+  import * as AddressApi from '@/api/member/address.js';
 	import {
 		openPaySubscribe
 	} from '@/utils/SubscribeMessage.js';
 	import {
 		storeListApi
 	} from '@/api/store.js';
-	import {
-		CACHE_LONGITUDE,
-		CACHE_LATITUDE
-	} from '@/config/cache.js';
 	import couponListWindow from '@/components/couponListWindow';
 	import addressWindow from '@/components/addressWindow';
 	import orderGoods from '@/components/orderGoods';
 	import home from '@/components/home';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from "vuex";
-	// #ifdef MP
-	import authorize from '@/components/Authorize';
-	// #endif
+	import { toLogin } from '@/libs/login.js';
+	import { mapGetters } from "vuex";
 	export default {
 		components: {
 			couponListWindow,
 			addressWindow,
 			orderGoods,
-			home,
-			// #ifdef MP
-			authorize
-			// #endif
+			home
 		},
 		data() {
 			return {
@@ -225,13 +213,6 @@
 						title: '可用余额:',
 						payStatus: 1,
 					}
-					// {
-					// 	"name": "线下支付", //offlinePayStatu：1开启线下支付；2关闭；offlinePostage：true有邮费
-					// 	"icon": "icon-yinhangqia",
-					// 	value: 'offline',
-					// 	title: '线下支付',
-					// 	payStatus: 1,
-					// },
 				],
 				payType: 'weixin', //支付方式
 				openType: 1, //优惠券打开方式 1=使用
@@ -241,12 +222,7 @@
 					list: [],
 					statusTile: '立即使用'
 				}, //优惠券组件
-				address: {
-					address: false,
-					addressId: 0
-				}, //地址组件
-				addressInfo: {}, //地址信息
-				addressId: 0, //地址id
+
 				couponId: 0, //优惠券id
 				cartId: '', //购物车id
 				userInfo: {}, //用户信息
@@ -259,7 +235,6 @@
 				ChangePrice: 0, //使用积分抵扣变动后的金额
 				formIds: [], //收集formid
 				status: 0,
-				is_address: false,
 				toPay: false, //修复进入支付时页面隐藏从新刷新页面
 				shippingType: 0,
 				system_store: {},
@@ -276,10 +251,7 @@
 				integralRatio: "0",
 				pagesUrl: "",
 				orderKey: "",
-				// usableCoupon: {},
 				offlinePostage: "",
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
 				payChannel: '',
 				news: true,
 				again: false,
@@ -290,8 +262,16 @@
 				orderInfoVo: {},
 				addressList: [], //地址列表数据
 				orderProNum: 0,
-				preOrderNo: '' //预下单订单号
-			};
+				preOrderNo: '', //预下单订单号
+
+        // ========== 收货地址 ==========
+        addressId: 0, // 页面传递的 param 对应的地址 id
+        addressInfo: {}, // 选中的地址信息
+        address: { // 地址组件
+          address: false, // 是否 addressWindow 展示
+          addressId: 0 // 真正选中的 address 编号，优先级大于 addressId
+        },
+      };
 		},
 		computed: mapGetters(['isLogin', 'systemPlatform', 'productType']),
 		watch: {
@@ -299,45 +279,39 @@
 				handler: function(newV, oldV) {
 					if (newV) {
 						this.getloadPreOrder();
-						//this.getaddressInfo();
+						this.getaddressInfo();
 					}
 				},
 				deep: true
 			}
 		},
 		onLoad(options) {
+      if (!this.isLogin) {
+        toLogin();
+        return
+      }
+
 			// #ifdef H5
 			this.payChannel = this.$wechat.isWeixin() ? 'public' : 'weixinh5';
 			// #endif
 			// #ifdef MP
 			this.payChannel = 'routine';
 			// #endif
-			// if (!options.cartId) return this.$util.Tips({
-			// 	title: '请选择要购买的商品'
-			// }, {
-			// 	tab: 3,
-			// 	url: 1
-			// });
-            this.preOrderNo = options.preOrderNo || 0;
-			this.addressId = options.addressId || 0;
-			this.is_address = options.is_address ? true : false;
-			if (this.isLogin) {
-				//this.getaddressInfo();
-				this.getloadPreOrder();
-			} else {
-				toLogin();
-			}
+      this.preOrderNo = options.preOrderNo || 0;
+      this.getloadPreOrder();
+
+      // 处理 address 地址
+      this.addressId = options.addressId || 0;
+      this.getaddressInfo();
 		},
 		/**
 		 * 生命周期函数--监听页面显示
 		 */
 		onShow: function() {
 			let _this = this
-			// wx.getLaunchOptionsSync 
 			this.textareaStatus = true;
-			if (this.isLogin && this.toPay == false) {
-				//this.getaddressInfo();
-				
+			if (this.isLogin && !this.toPay) {
+				this.getaddressInfo();
 			}
 
 			uni.$on("handClick", res => {
@@ -347,21 +321,7 @@
 				// 清除监听
 				uni.$off('handClick');
 			})
-
-			// let pages = getCurrentPages();
-			// let currPage = pages[pages.length - 1]; //当前页面
-			// if (currPage.data.storeItem) {
-			// 	let json = currPage.data.storeItem;
-			// 	this.$set(this, 'system_store', json);
-			// }
 		},
-		/**
-		 * 生命周期函数--监听页面隐藏
-		 */
-		// onHide: function() {
-		// 	console.log(999);
-		// 	this.isClose = true
-		// },
 		methods: {
 			// 订单详情
 			getloadPreOrder: function() {
@@ -375,24 +335,16 @@
 					this.cartArr[1].payStatus = parseInt(res.data.yuePayStatus) === 1 ? 1 : 2;
 					this.cartArr[0].payStatus = parseInt(res.data.payWeixinOpen) === 1 ? 1 : 0;
 					this.store_self_mention = res.data.storeSelfMention == 'true'&& this.productType === 'normal' ? true : false;
-					//调用子页面方法授权后执行获取地址列表
-					this.$nextTick(function() {
-						this.$refs.addressWindow.getAddressList();
-					})
-				}).catch(err => {
+
+          // 获得收件地址列表 TODO 芋艿：
+        }).catch(err => {
 					return this.$util.Tips({
 						title: err
 					});
 				})
-			},
-			/**
-			 * 授权回调事件
-			 * 
-			 */
-			onLoadFun: function() {
-				//this.getaddressInfo();
-				//调用子页面方法授权后执行获取地址列表
-				// this.$scope.selectComponent('#address-window').getAddressList();
+        this.$nextTick(function() {
+          this.$refs.addressWindow.getAddressList();
+        })
 			},
 			/**
 			 * 获取门店列表数据
@@ -416,15 +368,10 @@
 					});
 				})
 			},
-			// 关闭地址弹窗；
-			changeClose: function() {
-				this.$set(this.address, 'address', false);
-			},
 			/*
 			 * 跳转门店列表
 			 */
 			showStoreList: function() {
-
 				let _this = this
 				if (this.storeList.length > 0) {
 					uni.navigateTo({
@@ -485,7 +432,6 @@
 			},
 			/**
 			 * 处理点击优惠券后的事件
-			 * 
 			 */
 			ChangCoupons: function(e) {
 				// this.usableCoupon = e
@@ -524,32 +470,12 @@
 				this.useIntegral = !this.useIntegral;
 				this.computedPrice();
 			},
-			/**
-			 * 首次进页面展示默认地址
-			 */
-			OnDefaultAddress: function(e) {
-				this.addressInfo = e;
-				this.address.addressId = e.id;
-			},
-			/**
-			 * 选择地址后改变事件
-			 * @param object e
-			 */
-			OnChangeAddress: function(e) {
-				this.addressInfo = e;
-				this.address.addressId = e.id;
-				this.textareaStatus = true;
-				//this.orderInfoVo.addressId = e;
-				this.address.address = false;
-				//this.getaddressInfo();
-				this.computedPrice();
-			},
 			bindHideKeyboard: function(e) {
 				this.mark = e.detail.value;
 			},
 			/**
 			 * 获取当前金额可用优惠券
-			 * 
+			 *
 			 */
 			getCouponList: function() {
 				getCouponsOrderPrice(this.preOrderNo).then(res => {
@@ -557,31 +483,6 @@
 					this.openType = 1;
 				});
 			},
-			/*
-			 * 获取默认收货地址或者获取某条地址信息
-			 */
-			getaddressInfo: function() {
-				let that = this;
-				if (that.addressId) {
-					getAddressDetail(that.addressId).then(res => {
-						if (res.data) {
-							res.data.isDefault = parseInt(res.data.isDefault);
-							that.addressInfo = res.data || {};
-							that.addressId = res.data.id || 0;
-							that.address.addressId = res.data.id || 0;
-						}
-					})
-				} else {
-					getAddressDefault().then(res => {
-						if (res.data) {
-							res.data.isDefault = parseInt(res.data.isDefault);
-							that.addressInfo = res.data || {};
-							that.addressId = res.data.id || 0;
-							that.address.addressId = res.data.id || 0;
-						}
-					})
-				}
-			},
 			payItem: function(e) {
 				let that = this;
 				let active = e;
@@ -601,12 +502,6 @@
 				let that = this;
 				that.animated = false;
 			},
-			onAddress: function() {
-				let that = this;
-				that.textareaStatus = false;
-				that.address.address = true;
-				that.pagesUrl = '/pages/users/user_address_list/index?preOrderNo='+ this.preOrderNo;
-			},
 			realName: function(e) {
 				this.contacts = e.detail.value;
 			},
@@ -671,7 +566,7 @@
 											title: err
 										});
 									})
-								
+
 								},
 								fail: function(e) {
 									uni.hideLoading();
@@ -968,8 +863,57 @@
 				// #ifndef MP
 				that.payment(data);
 				// #endif
-			}
-		}
+			},
+
+      // ========== 收货地址 ==========
+      /**
+       * 打开选择地址的弹窗
+       */
+      onAddress: function() {
+        this.textareaStatus = false;
+        this.address.address = true;
+        this.pagesUrl = '/pages/users/user_address_list/index?preOrderNo='+ this.preOrderNo;
+      },
+      /**
+       * 选择地址后改变事件
+       */
+      OnChangeAddress: function(e) {
+        this.addressInfo = e;
+        this.address.addressId = e.id;
+        this.textareaStatus = true;
+        this.address.address = false;
+        this.getaddressInfo();
+        this.computedPrice();
+      },
+      /**
+			 * 获取默认收货地址或者获取某条地址信息
+			 */
+      getaddressInfo: function() {
+        if (this.addressId) {
+          AddressApi.getAddress(this.addressId).then(res => {
+            if (res.data) {
+              this.addressInfo = res.data || {};
+              this.addressId = res.data.id || 0;
+              this.address.addressId = res.data.id || 0;
+            }
+          })
+        } else {
+          AddressApi.getDefaultUserAddress().then(res => {
+            if (res.data) {
+              this.addressInfo = res.data || {};
+              this.addressId = res.data.id || 0;
+              this.address.addressId = res.data.id || 0;
+            }
+          })
+        }
+      },
+      /**
+       * 关闭地址弹窗
+       */
+      changeClose: function() {
+        this.$set(this.address, 'address', false);
+      },
+    }
 	}
 </script>