10-12

pages/address/address.vue

@@ -62,7 +62,10 @@ export default {
 				return e
 			})
 			this.addressList[ind].is_default=1
-			addressEdit({
+			addressEdit({
+				type: 1,
+				longitude: data.longitude,
+				latitude: data.latitude,
 				real_name: data.real_name,
 				phone: data.phone,
 				address: {

pages/address/addressManage.vue

@@ -229,13 +229,13 @@ export default {
 					district: data.address.district
 				},
 				// detail: obj.addressLocation.name + ',' + data.area,
-				detail: '台州市椒江区政府(青年路北)' + ',' + data.area,
+				detail: "北京市东城区东长安街" + ',' + data.area,
 				is_default: data.default,
 				id: data.id || '',
 				// longitude: obj.addressLocation.longitude,121.430479
 				// latitude: obj.addressLocation.latitude,28.644847
-				longitude: '121.44297',
-				latitude: '28.67307'
+				longitude: '116.397827',
+				latitude: '39.90374'
 			}).then(function(e) {
 				uni.showToast({
 					title: '提交成功',

pages/money/pay.vue

@@ -287,7 +287,8 @@ export default {
 				from: 'weixinapp', //来源
 				// #endif
 				shipping_type: prepage.tabCurrentIndex + 1, //提货方式 1 快递 2自提
-				is_change: prepage.is_change ? 1 : 0 //判断是否全额抵扣0为否1为是
+				is_change: prepage.is_change ? 1 : 0, //判断是否全额抵扣0为否1为是
+				store_id: prepage.tabCurrentIndex == 1 ? prepage.shopAddress.id : ''
 			};
 			console.log(data);
 			console.log( obj.payName);

pages/order/createOrder.vue

@@ -25,7 +25,7 @@
 
 			<image class="a-bg" :src="addressImg"></image>
 		</navigator>
-		<navigator v-if="tabCurrentIndex == 1" url="/pages/address/shopList" class="address-section">
+		<navigator v-if="tabCurrentIndex == 1" url="/pages/shoping/list?type=4" class="address-section">
 			<view class="order-content" v-if="shopAddress.name">
 				<text class="iconfont iconlocation"></text>
 				<view class="cen">
@@ -33,7 +33,7 @@
 						<text class="name">{{ shopAddress.name }}</text>
 						<text class="mobile">{{ shopAddress.phone }}</text>
 					</view>
-					<text class="address">{{ shopAddress.address }}</text>
+					<text class="address">{{ shopAddress.detailed_address }}</text>
 				</view>
 				<text class="iconfont iconenter"></text>
 			</view>
@@ -264,6 +264,10 @@ export default {
 		is_change() {
 			this.integralShow = false;
 			this.payMoneyNub();
+		},
+		// 监听收货地址改变
+		addressData() {
+			this.payMoneyNub();
 		}
 	},
 	computed: {
@@ -327,7 +331,10 @@ export default {
 					orderkey: this.orderKey,
 					useIntegral: this.checkedPoints ? 1 : 0,
 					shipping_type: this.tabCurrentIndex + 1, //1是普通2是门店
-					is_change: this.is_change ? 1 : 0
+					is_change: this.is_change ? 1 : 0,
+					latitude: this.addressData.latitude,
+					longitude: this.addressData.longitude,
+					addressId: this.addressData.id
 				})
 					.then(({ data }) => {
 						this.payType = true;
@@ -373,7 +380,7 @@ export default {
 				obj.moneyAll = data.priceGroup; //金额数据
 				obj.orderKey = data.orderKey; //订单key
 				(obj.system_store = data.system_store), //到店自提列表
-					(obj.shopAddress = data.system_store[0]); //选中的地址
+					obj.shopAddress = data.system_store //选中的地址
 				// 计算金额
 				this.payMoneyNub().then(e => {
 					this.seriationCode(data.cartInfo);

pages/shoping/list.vue

@@ -34,7 +34,7 @@ export default {
 			keyword: '' ,//查询中的内容
 			longitude:121.436289,//经度
 			latitude:28.651485,//纬度
-			type: 0,//3->开通会员选择门店
+			type: 0,//3->开通会员选择门店  4->自提选择门店
 		};
 	},
 	watch: {
@@ -104,6 +104,12 @@ export default {
 				uni.navigateBack({
 					
 				})
+			}else if(this.type == 4) {
+				this.$api.prePage().shopAddress = item
+				uni.navigateBack({
+					
+				})
+				
 			}else {
 				this.setStoreInfo(item)
 				uni.navigateBack({

pages/user/user.vue

@@ -8,7 +8,6 @@
 			<view class="bg">
 				<image src="../../static/user/ground.png" mode=""></image>
 			</view>
-			
 			<!-- top -->
 			<view class="user-info-box ">
 				<view class="detail flex" @click="navTo('/pages/userinfo/userinfo')">
@@ -73,7 +72,7 @@
 			</view>
 		</view>
 		<!-- <view class="cover-container"> -->
-			<view class="vip" @click="navTo('/pages/wallet/openMember')">
+			<view class="vip" @click="navTo('/pages/wallet/openMember')" v-if="userInfo.level < 3">
 				<image src="../../static/user/upgrade.png" mode=""></image>
 			</view>
 		
@@ -496,7 +495,8 @@ export default {
 	}
 }
 	.vip{
-		margin-top: -110rpx;
+		margin-top: -110rpx;
+		margin-bottom: 110rpx;
 		padding: 0 30rpx;
 		height: 170rpx;
 		image{
@@ -543,7 +543,8 @@ export default {
 	border-radius: 10rpx;
 	background-color: white;
 	top: -130rpx;
-	margin: 0 30rpx;
+	margin: 0 30rpx;
+	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
 	.box-title {
 		line-height: 1;
 		padding: 30rpx;
@@ -556,13 +557,14 @@ export default {
 			color: $font-color-light;
 		}
 	}
-	.order{
-		margin-top: 70rpx;
-	}
+	// .order{
+	// 	margin-top: 70rpx;
+	// }
 	.order-section {
 		
 		@extend %section;
-		padding: 28rpx 0;
+		padding: 28rpx 0;
+		
 		.order-item {
 			@extend %flex-center;
 			// width: 120rpx;