地址管理

api/user.js

@@ -311,7 +311,7 @@ export function userLevelDetection() {
  * @param object data
  */
 export function getAddressList(data) {
-	return request.get('address/list', data);
+	return request.post('v1/address/list', data);
 }
 
 /**
@@ -319,9 +319,7 @@ export function getAddressList(data) {
  * @param int id
  */
 export function setAddressDefault(id) {
-	return request.post('address/default/set', {
-		id: id
-	})
+	return request.get('v1/address/defaultSet?id='+id, null)
 }
 
 /**
@@ -338,9 +336,7 @@ export function editAddress(data) {
  *
  */
 export function delAddress(id) {
-	return request.post('address/del', {
-		id: id
-	})
+	return request.get('v1/address/removeById?id='+id,null)
 }
 
 /**

pages.json

@@ -573,21 +573,21 @@
 				}
 			    ,{
                     "path" : "userAgreement/userAgreement",
-                    "style" :                                                                                    
+                    "style" :
                 {
                     "navigationBarTitleText": "用户协议",
                     "enablePullDownRefresh": false
                 }
-                
+
                 }
                 ,{
                     "path" : "privacyAgreement/privacyAgreement",
-                    "style" :                                                                                    
+                    "style" :
                 {
                     "navigationBarTitleText": "隐私协议",
                     "enablePullDownRefresh": false
                 }
-                
+
                 }
             ]
 		},
@@ -1603,7 +1603,7 @@
 				{
 					"path": "user_address",
 					"style": {
-						"navigationBarTitleText": "选择地址",
+						"navigationBarTitleText": "地址管理",
 						"app-plus": {
 							// #ifdef APP-PLUS
 							"titleNView": {

pages/points_mall/user_address.vue

@@ -6,18 +6,18 @@
 			</view>
 			<radio-group class="radio-group" @change="radioChange" v-if="addressList.length">
 				<view class='item' v-for="(item,index) in addressList" :key="index">
-					<view class='address' @click='goOrder(item.id)'>
-						<view class='consignee'>{{$t(`收货人`)}}：{{item.real_name}}<text class='phone'>{{item.phone}}</text></view>
+					<view class='address'>
+						<view class='consignee'>{{$t(`收货人`)}}：{{item.realName}}<text class='phone'>{{item.phone}}</text></view>
 						<view>{{$t(`收货地址`)}}：{{item.province}}{{item.city}}{{item.district}}{{item.detail}}</view>
 					</view>
 					<view class='operation acea-row row-between-wrapper'>
 						<!-- #ifndef MP -->
-						<radio class="radio" :value="index.toString()" :checked="item.is_default ? true : false">
+						<radio class="radio" :value="index.toString()" :checked="item.defaultState ===2">
 							<text>{{$t(`设为默认`)}}</text>
 						</radio>
 						<!-- #endif -->
 						<!-- #ifdef MP -->
-						<radio class="radio" :value="index" :checked="item.is_default ? true : false">
+						<radio class="radio" :value="index" :checked="item.defaultState ===2">
 							<text>{{$t(`设为默认`)}}</text>
 						</radio>
 						<!-- #endif -->
@@ -38,15 +38,17 @@
 			</view>
 			<view style='height:120rpx;'></view>
 			<view class='footer acea-row row-between-wrapper'>
+				<view class='addressBnt bg-color on' @click='addAddress'><text
+						class='iconfont icon-tianjiadizhi'></text>{{$t(`添加新地址`)}}</view>
 				<!-- #ifdef APP-PLUS -->
 				<view class='addressBnt bg-color on' @click='addAddress'><text
 						class='iconfont icon-tianjiadizhi'></text>{{$t(`添加新地址`)}}</view>
 				<!-- #endif -->
 				<!-- #ifdef MP-->
-				<view class='addressBnt bg-color' @click='addAddress'><text
-						class='iconfont icon-tianjiadizhi'></text>{{$t(`添加新地址`)}}</view>
-				<view class='addressBnt wxbnt' @click='getWxAddress'><text class='iconfont icon-weixin2'></text>{{$t(`导入微信地址`)}}
-				</view>
+<!--				<view class='addressBnt bg-color' @click='addAddress'><text-->
+<!--						class='iconfont icon-tianjiadizhi'></text>{{$t(`添加新地址`)}}</view>-->
+<!--				<view class='addressBnt wxbnt' @click='getWxAddress'><text class='iconfont icon-weixin2'></text>{{$t(`导入微信地址`)}}-->
+<!--				</view>-->
 				<!-- #endif -->
 				<!-- #ifdef H5-->
 				<view class='addressBnt bg-color' :class="this.$wechat.isWeixin()?'':'on'" @click='addAddress'><text
@@ -237,7 +239,7 @@
 			},
 			/**
 			 * 获取地址列表
-			 * 
+			 *
 			 */
 			getAddressList: function(isPage) {
 				let that = this;
@@ -251,8 +253,8 @@
 				that.loading = true;
 				that.loadTitle = '';
 				getAddressList({
-					page: that.page,
-					limit: that.limit
+					current: that.page,
+					size: that.limit
 				}).then(res => {
 					let list = res.data;
 					let loadend = list.length < that.limit;
@@ -340,17 +342,6 @@
 				uni.navigateTo({
 					url: '/pages/users/user_address/index?' + '&new=' + this.news
 				})
-			},
-			goOrder: function(id) {
-				let cartId = '';
-				let pinkId = '';
-				let couponId = '';
-				if (id) {
-					uni.redirectTo({
-						url: '/pages/points_mall/integral_order?is_address=1&new=' + this.news +
-							'&addressId=' + id + '&num=' + this.num + '&unique=' + this.unique
-					})
-				}
 			}
 		},
 		onReachBottom: function() {

pages/user/index.vue

@@ -332,6 +332,16 @@
 								</view>
 
 							</u-cell>
+
+							<navigator url="/pages/points_mall/user_address" hover-class="none">
+								<u-cell isLink>
+									<view slot="title" class="u-slot-title">
+										<image src="http://www.gzzzyd.com/groupon/regiment/编组 8@2x(1).png" mode=""></image>
+										<text class="u-cell-text">地址管理</text>
+									</view>
+								</u-cell>
+							</navigator>
+
 							<navigator url="/pages/groupbuying/aboutUs/index" hover-class="none">
 							<u-cell isLink>
 								<view slot="title" class="u-slot-title">