2323-02-25

功能完善

mallplusui-uniapp-app/pages/order/createStoreOrder.vue

@@ -10,7 +10,7 @@
 						<text class="mobile">{{ addressData.phoneNumber }}</text>
 					</view>
 					<text
-						class="address">{{ addressData.province }}-{{ addressData.city }}-{{ addressData.region }}-{{ addressData.detailAddress }}</text>
+						class="address">{{ addressData.region }}-{{ addressData.detailAddress }}</text>
 				</view>
 				<view class="cen" v-else>
 					<text>请设置收货地址</text>

mallplusui-uniapp-app/pages/public/login.vue

@@ -184,7 +184,7 @@
 				};
 				let data = await Api.apiCall('post', Api.index.sendCodes, params);
 				if (data) {
-
+					console.log('验证码---data', data);
 				}
 			},
 			toLoginCode() {
@@ -705,7 +705,7 @@
 	}
 
 	.welcome {
-		margin-top: 150px;
+		margin-top: 50px;
 		position: relative;
 		left: 50upx;
 		top: -90upx;

mallplusui-uniapp-app/pagesU/address/address.vue

@@ -7,17 +7,19 @@
 					<text class="mobile">{{ item.phoneNumber }}</text>
 				</view>
 				<view class="address-box">
-					<text v-if="item.defaultStatus == 1" class="tag">默认</text>
+					<!-- <text v-if="item.defaultStatus == 1" class="tag">默认</text> -->
 					<text class="address">{{ item.region }}-{{ item.detailAddress }}</text>
 				</view>
 
 			</view>
 			<view class="" style="display: flex;flex-direction: row;width: 100%;justify-content: flex-end;">
-				<view class="" style="width: 20%;display: flex;align-items: center;justify-content: center;" @click="addAddress('edit', item)">
+				<view class="" style="width: 20%;display: flex;align-items: center;justify-content: center;"
+					@click="addAddress('edit', item)">
 					<text class="yticon icon-bianji"></text>
 					<text style="font-size: 30upx;margin-left: 10upx;">编辑</text>
 				</view>
-				<view class="" style="width: 20%;display: flex;align-items: center;justify-content: center;" @click="delAddress(item)">
+				<view class="" style="width: 20%;display: flex;align-items: center;justify-content: center;"
+					@click="delAddress(item)">
 					<text class="yticon icon-iconfontshanchu1"></text>
 					<text style="font-size: 30upx;">删除</text>
 				</view>
@@ -27,17 +29,17 @@
 			重要：添加和修改地址回调仅增加了一条数据做演示，实际开发中将回调改为请求后端接口刷新一下列表即可
 		</text>-->
 
-		<button class="add-btn" @click="addAddress('add')">新增地址</button>
+		<button v-if="addressList.length==0" class="add-btn" @click="addAddress('add')">新增地址</button>
 
 	</view>
 </template>
 
 <script>
-import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
 
-import Api from '@/common/api';
+	import Api from '@/common/api';
-export default {
+	export default {
-components: {
+		components: {
 			mallplusCopyright
 		},
 		data() {
@@ -50,13 +52,15 @@ components: {
 			this.source = option.source;
 			this.getListAddress()
 		},
-	async onShow(){
+		async onShow() {
 			this.getListAddress()
 		},
 		methods: {
-		async getListAddress(){
+			async getListAddress() {
 				let params = {};
 				this.addressList = await Api.apiCall('get', Api.goods.listAddress, params);
+				console.log("addressList>>>>>", this.addressList);
+				console.log("addressList>>>>>", this.addressList.length);
 			},
 			//选择地址
 			checkAddress(item) {
@@ -80,54 +84,61 @@ components: {
 				console.log(data, type);
 			},
 			// 删除地址
-		async delAddress(item){
+			async delAddress(item) {
 				console.log(item)
 				// let params = {
 				// 	id: item.id
 				// }
-			let data = await Api.apiCall('post', Api.goods.deleteAddress, {id: item.id});
+				let data = await Api.apiCall('post', Api.goods.deleteAddress, {
-			if(data){
+					id: item.id
+				});
+				if (data) {
 					uni.showToast({
 						title: '删除成功',
 					})
-			}else{
+				} else {
 					uni.showToast({
 						title: '删除失败',
 						icon: 'none'
 					})
 				}
 				this.getListAddress();
-			console.log("------删除-------",data)
+				console.log("------删除-------", data)
 			},
 		}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
+	page {
 		padding-bottom: 120upx;
-}
+	}
-.content {
+
+	.content {
 		position: relative;
-}
+	}
-.list {
+
+	.list {
 		display: flex;
 		align-items: center;
 		flex-direction: column;
 		padding: 20upx;
 		background: #fff;
 		position: relative;
-}
+	}
-.wrapper {
+
+	.wrapper {
 		width: 100%;
 		display: flex;
 		flex-direction: column;
 		flex: 1;
-}
+	}
-.address-box {
+
+	.address-box {
 		display: flex;
 		align-items: center;
 		margin: 10upx 0;
+
 		.tag {
 			font-size: 24upx;
 			color: $base-color;
@@ -138,29 +149,33 @@ page {
 			padding: 4upx 10upx;
 			line-height: 1;
 		}
+
 		.address {
 			font-size: 28upx;
 			color: $font-color-light;
 		}
-}
+	}
-.u-box {
+
+	.u-box {
 		font-size: 32upx;
 		color: $font-color-000;
+
 		// margin-top: 16upx;
 		.name {
 			margin-right: 30upx;
 		}
-}
+	}
-.icon-bianji {
+
+	.icon-bianji {
 		// display: flex;
 		// align-items: center;
 		// height: 80upx;
 		font-size: 36upx;
 		color: $font-color-light;
 		// padding-left: 30upx;
-}
+	}
 
-.add-btn {
+	.add-btn {
 		position: fixed;
 		left: 30upx;
 		right: 30upx;
@@ -176,5 +191,5 @@ page {
 		background-color: $base-color;
 		border-radius: 10upx;
 		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-}
+	}
 </style>

mallplusui-uniapp-app/pagesU/address/addressManage.vue

@@ -37,10 +37,10 @@
 			<text class="input">王宫村服务站</text>
 		</view>
 
-		<view class="row default-row">
+		<!-- <view class="row default-row">
 			<text class="tit">设为默认</text>
 			<switch :checked="addressData.defaultStatus" color="#fa436a" @change="switchChange" />
-		</view>
+		</view> -->
 		<button class="add-btn" @click="confirm">提交</button>
 	</view>
 </template>
@@ -60,7 +60,7 @@
 					city: '',
 					region: '',
 					detailAddress: '王宫村服务站',
-					defaultStatus: 0,
+					defaultStatus: 1,
 					def: false
 				},
 				lotusAddressData: {