From df91b4560ed0f60a2d9c5896770c97775eefeb9a Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Thu, 23 Feb 2023 13:42:04 +0800
Subject: [PATCH] =?UTF-8?q?2023-02-23=20=E4=BF=9D=E5=AD=98=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/coolc-coupon/coolc-coupon.vue  |  54 ++-
 .../components/w-select/readme.md             |  70 ++++
 .../components/w-select/w-select.vue          | 395 ++++++++++++++++++
 mallplusui-uniapp-app/package.json            |  32 +-
 .../pages/order/createOrder.vue               |   2 +-
 .../pages/order/createStoreOrder.vue          |   2 +-
 .../pagesU/address/address.vue                |   2 +-
 .../pagesU/address/addressManage.vue          |  56 ++-
 mallplusui-uniapp-app/store/index.js          |   6 +-
 9 files changed, 557 insertions(+), 62 deletions(-)
 create mode 100644 mallplusui-uniapp-app/components/w-select/readme.md
 create mode 100644 mallplusui-uniapp-app/components/w-select/w-select.vue

diff --git a/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue b/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
index 7fdae18..f2dae47 100644
--- a/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
+++ b/mallplusui-uniapp-app/components/coolc-coupon/coolc-coupon.vue
@@ -8,8 +8,8 @@
 				<view class="demand">满{{ item.minPoint }} 减 {{ item.amount }}</view>
 			</view>
 		</view>
-		<view class="get-btn"  :style="{color:color, borderColor:color, background:solid}"
-			@click="acceptCoupon(item)">立即领取</view>
+		<view class="get-btn" :style="{color:color, borderColor:color, background:solid}" @click="acceptCoupon(item)">
+			立即领取</view>
 		<!-- <navigator class="get-btn" v-if="types" :style="{color:color, borderColor:color, background:solid}"
 			:url='item.url' @click="useCoupon(item)">立即使用</navigator> -->
 	</view>
@@ -58,28 +58,42 @@
 			},
 		},
 		computed: {
-			...mapState(['hasLogin', 'userInfo']),
+			...mapState(['hasLogin','hasVip', 'userInfo']),
 		},
 		methods: {
 			async acceptCoupon(item) {
 				if (this.hasLogin) {
-					this.types = !this.types
-					uni.showLoading({
-						title: '请稍后'
-					});
-
-					let params = {
-						couponId: item.id
-					};
-					this.clickSubMethod(item)
-					let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
-					// console.log("data?????", data);
-					// if (data) {
-					// 	// this.$api.msg(data);
-					// 	this.clickSubMethod(item)
-
-					// }
-					uni.hideLoading();
+					if(this.hasVip){
+						this.types = !this.types
+						uni.showLoading({
+							title: '请稍后'
+						});
+						
+						let params = {
+							couponId: item.id
+						};
+						this.clickSubMethod(item)
+						let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
+						// console.log("data?????", data);
+						// if (data) {
+						// 	// this.$api.msg(data);
+						// 	this.clickSubMethod(item)
+						
+						// }
+						uni.hideLoading();
+					}else{
+						uni.showModal({
+							title: '提示',
+							content: '您不属于惠农会员，暂不能领取此优惠券',
+							showCancel:false,
+							success: function(res) {
+								if (res.confirm) {
+									return;
+								} 
+							}
+						});
+					}
+					
 				} else {
 					uni.navigateTo({
 						url: '/pages/public/login'
diff --git a/mallplusui-uniapp-app/components/w-select/readme.md b/mallplusui-uniapp-app/components/w-select/readme.md
new file mode 100644
index 0000000..e7ec2d0
--- /dev/null
+++ b/mallplusui-uniapp-app/components/w-select/readme.md
@@ -0,0 +1,70 @@
+#### props
+
+|名称		|类型						|默认值																									|说明|
+|-			|-							|-																											|-|
+|width	|string					|'300rpx'																								|选择框宽度|
+|height	|string					|'60rpx'																								|选择框高度|
+|round	|boolean				|true																										|是否开启圆角|
+|bgColor|string					|'#fff'																									|选择框的背景颜色|
+|color	|string					|'#606266'																							|字体颜色|
+|placeholderColor|string					|'color:#bcbec4'																				|提示文字的字体颜色|
+|defaultValue			|string	|'请选择'				|默认显示的名称																					|	|
+|valueName|string					|'value'																								|显示的内容字段名,必传|
+|list		|array					|[]																											|展示的内容列表|
+|showClose|boolean				|true																										|是否显示删除按钮|
+|multiple|boolean				|false																									|是否开启多选|
+|filterable|boolean				|false																									|是否开启搜索功能，开启后直接输入值不选择也可以保存内容|
+
+
+#### events
+
+|事件名|说明|
+|-|-|
+|change|选择的内容改变时触发，返回的参数为列表的item|
+
+
+#### 使用举例
+
+需要绑定的值通过`v-model`绑定，如下面的`chooseValue`，需要获取item的值可以监听`@change`事件
+
+开启多选`multiple`时，双向绑定的值为数组类型，在change事件中根据自己需求进行处理。
+
+`valueName`属性必须传，告知组件需要显示的是什么值
+
+```html
+<template>
+  <view class="login">
+    <w-select style="margin-left: 20rpx;" 
+              v-model='chooseValue' 
+              defaultValue="所有审批人" 
+              :list='list'
+              valueName='content' 
+              @change='change'>
+    </w-select>
+  </view>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        chooseValue: "",
+        list: [{
+          id: 1,
+          content: '张三'
+        }, {
+          id: 2,
+          content: '李四'
+        }, {
+          id: 3,
+          content: '王五'
+        }],
+      };
+    },
+    methods: {
+      change(e) {
+        console.log('chooseValue', this.chooseValue)
+      }
+    },
+  }
+</script>
+```
\ No newline at end of file
diff --git a/mallplusui-uniapp-app/components/w-select/w-select.vue b/mallplusui-uniapp-app/components/w-select/w-select.vue
new file mode 100644
index 0000000..0cecc39
--- /dev/null
+++ b/mallplusui-uniapp-app/components/w-select/w-select.vue
@@ -0,0 +1,395 @@
+<template>
+	<view class="wSelect" :class="show ? 'active' : ''" :style="{
+			width: width,
+			height: height,
+			backgroundColor: bgColor,
+			borderRadius: round ? '6rpx' : 'none'
+		}">
+		<view @click="openSelect" class="pickerSelect">
+			<view :style="{ height: height }" v-if="multiple" class="multipleChoice">
+				<view class="defaultValue" :style="{ color: color }" v-if="!inputData && multiSelectList.length < 1">
+					{{ defaultValue }}
+				</view>
+				<view class="option" v-if="multiSelectList.length > 0">
+					<view class="">{{ multiSelectList[0][valueName] }}</view>
+					<image class="img" @click.stop="multiDelete" :src="refreshUrl" mode=""></image>
+				</view>
+				<view v-if="multiSelectList.length > 1" class="more">{{ multiLength }}</view>
+				<input :disabled="!filterable"
+					:style="{ height: height, paddingRight: '30rpx', fontSize: '28rpx', color: color }"
+					@input="inputChange" type="text" v-model="inputData" />
+			</view>
+			<input v-else :disabled="!filterable"
+				:style="{ height: height, paddingRight: '30rpx', fontSize: '30rpx', color:'#000' }" @input="inputChange"
+				:placeholder="defaultValue" :placeholder-style="placeholderColor" type="text" v-model="inputData" />
+			<view v-if="!inputData || !showClose" :class="show ? 'arrow-up' : 'arrow'"></view>
+			<view class="showClose" v-if="showClose && inputData">
+				<image @click.stop="refreshValue" :src="refreshUrl" mode=""></image>
+			</view>
+			<view v-show="show" :class="isShow ? 'animation-top' : 'animation-bottom'" class="tips"
+				:style="{ top: tipsPositon }"></view>
+		</view>
+		<!-- 单选时的下拉框 -->
+		<view v-if="!multiple" :style="{ width: '75%', color: '#737478' }" v-show="show"
+			:class="isShow ? 'animation-top' : 'animation-bottom'" class="content">
+			<view class="item" :class="value == item[valueName] ? 'choose' : ''" v-for="(item, index) in listData"
+				:key="index" @click="clickSelect(item)">
+				{{ item[valueName] }}
+			</view>
+			<view class="item" v-if="listData.length < 1">无匹配项</view>
+		</view>
+		<!-- 多选的下拉框 -->
+		<view v-else :style="{ width: width }" v-show="show" :class="isShow ? 'animation-top' : 'animation-bottom'"
+			class="content">
+			<view class="item" :class="multiSelectList.find(res => res[valueName] == item[valueName]) ? 'choose' : ''"
+				v-for="(item, index) in listData" :key="index" @click="multiSelect(item)">
+				{{ item[valueName] }}
+			</view>
+			<view class="item" v-if="listData.length < 1">无匹配项</view>
+		</view>
+		<view v-if="show" @click="closeContentSelect" class="contentMask"></view>
+	</view>
+</template>
+<script>
+	export default {
+		name: 'wSelect',
+		props: {
+			//是否多选
+			multiple: {
+				type: Boolean,
+				default: false
+			},
+			//是否可搜索
+			filterable: {
+				type: Boolean,
+				default: false
+			},
+			//是否显示关闭按钮
+			showClose: {
+				type: Boolean,
+				default: false
+			},
+			width: {
+				type: String,
+				default: '300rpx'
+			},
+			color: {
+				type: String,
+				default: '#606266'
+			},
+			placeholderColor: {
+				type: String,
+				default: 'color:#bcbec4'
+			},
+			bgColor: {
+				type: String,
+				default: '#fff'
+			},
+			height: {
+				type: String,
+				default: '60rpx'
+			},
+			//默认显示的内容
+			defaultValue: {
+				type: String,
+				default: '请选择'
+			},
+			//显示的内容
+			valueName: {
+				type: String,
+				required: true
+			},
+			list: {
+				type: Array,
+				default: () => [],
+				required: true
+			},
+			//双向绑定的值
+			value: {
+				type: String,
+				default: ''
+			},
+			round: {
+				type: Boolean,
+				default: true
+			}
+		},
+		watch: {
+			value: {
+				immediate: true,
+				handler(newValueData) {
+					if (!this.inputData) {
+						this.inputData = newValueData
+					}
+				}
+			}
+		},
+		data() {
+			return {
+				show: false,
+				isShow: false,
+				multiSelectList: [],
+				inputData: '',
+				listData: this.list,
+				refreshUrl: 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDQ4IDQ4IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxyZWN0IHdpZHRoPSI0OCIgaGVpZ2h0PSI0OCIgZmlsbD0id2hpdGUiIGZpbGwtb3BhY2l0eT0iMC4wMSIvPjxwYXRoIGQ9Ik0yNCA0NEMzNS4wNDU3IDQ0IDQ0IDM1LjA0NTcgNDQgMjRDNDQgMTIuOTU0MyAzNS4wNDU3IDQgMjQgNEMxMi45NTQzIDQgNCAxMi45NTQzIDQgMjRDNCAzNS4wNDU3IDEyLjk1NDMgNDQgMjQgNDRaIiBmaWxsPSJub25lIiBzdHJva2U9IiM3YzZlNmUiIHN0cm9rZS13aWR0aD0iNCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIvPjxwYXRoIGQ9Ik0yOS42NTY5IDE4LjM0MzFMMTguMzQzMiAyOS42NTY4IiBzdHJva2U9IiM3YzZlNmUiIHN0cm9rZS13aWR0aD0iNCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+PHBhdGggZD0iTTE4LjM0MzIgMTguMzQzMUwyOS42NTY5IDI5LjY1NjgiIHN0cm9rZT0iIzdjNmU2ZSIgc3Ryb2tlLXdpZHRoPSI0IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz48L3N2Zz4='
+			}
+		},
+		computed: {
+			multiLength() {
+				const length = this.multiSelectList.length - 1
+				return '+' + length
+			},
+			tipsPositon() {
+				let num = this.height.replace('rpx', '')
+				let numAdd = Number(num) + Number(10)
+				return numAdd + 'rpx'
+			}
+		},
+		methods: {
+			openSelect() {
+				this.listData = this.list
+				console.log("listData>>>", this.listData)
+				if (this.show === true) {
+					this.isShow = false
+				} else {
+					this.isShow = true
+				}
+				setTimeout(() => {
+					this.show = !this.show
+				}, 200)
+			},
+			clickSelect(item) {
+				this.$emit('input', item[this.valueName])
+				this.inputData = item[this.valueName]
+				this.$emit('change', item)
+				this.show = false
+			},
+			inputChange(e) {
+				console.log(e.detail.value)
+				let value = e.detail.value
+				this.$emit('input', value)
+				if (value) {
+					this.listData = this.listData.filter(item => item[this.valueName].includes(value))
+				} else {
+					this.listData = this.list
+				}
+			},
+			multiSelect(item) {
+				let index = this.multiSelectList.findIndex(res => res[this.valueName] == item[this.valueName])
+				if (index > -1) {
+					this.multiSelectList.splice(index, 1)
+				} else {
+					this.multiSelectList.push(item)
+				}
+				this.inputData = ''
+				this.listData = this.list
+				this.$emit('input', this.multiSelectList)
+				this.$emit('change', item)
+			},
+			refreshValue() {
+				this.$emit('input', '')
+				this.inputData = ''
+				this.listData = this.list
+				this.$emit('change', '')
+				this.show = false
+			},
+			multiDelete() {
+				this.multiSelectList.splice(0, 1)
+				this.$emit('input', this.multiSelectList)
+				if (this.multiSelectList.length < 1) {
+					this.show = false
+				}
+			},
+			closeContentSelect() {
+				this.isShow = false
+				setTimeout(() => {
+					this.show = false
+				}, 200)
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.wSelect {
+		// border: 2rpx solid #dcdfe6;
+		transition: all 0.5s;
+
+		.pickerSelect {
+			border-radius: 6rpx;
+			padding: 0 20rpx;
+			position: relative;
+			transition: all 0.6s;
+			display: flex;
+			align-items: center;
+
+			input {
+				flex: 1;
+			}
+
+			.tips {
+				position: absolute;
+				margin-left: 30rpx;
+				width: 0;
+				height: 0;
+				border-bottom: 12rpx solid #fff;
+				border-left: 12rpx solid transparent;
+				border-right: 12rpx solid transparent;
+				z-index: 1000;
+			}
+
+			.showClose {
+				width: 30rpx;
+				height: 30rpx;
+				position: absolute;
+				right: 14rpx;
+				top: 50%;
+				transform: translateY(-50%);
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.arrow {
+				transition: all 0.3s;
+				position: absolute;
+				top: 44%;
+				right: 20rpx;
+				border-left: 2rpx solid #999999;
+				border-bottom: 2rpx solid #999999;
+				height: 16rpx;
+				width: 16rpx;
+				transform: translateY(-50%) rotate(-45deg);
+				-webkit-transform: translateY(-50%) rotate(-45deg);
+				border-right: 2rpx solid transparent;
+				border-top: 2rpx solid transparent;
+				display: inline-block;
+			}
+
+			.arrow-up {
+				@extend .arrow;
+				transform: rotate(-235deg);
+			}
+
+			.multipleChoice {
+				display: flex;
+				align-items: center;
+
+				input {
+					flex: 1;
+				}
+
+				.defaultValue {
+					position: absolute;
+					left: 20rpx;
+				}
+
+				.option {
+					display: flex;
+					align-items: center;
+					background-color: #f4f4f5;
+					border-radius: 10rpx;
+					font-size: 24rpx;
+					color: #aa93b1;
+					padding: 6rpx 12rpx;
+
+					.img {
+						margin-left: 4rpx;
+						width: 30rpx;
+						height: 30rpx;
+					}
+				}
+
+				.more {
+					background-color: #f4f4f5;
+					border-radius: 10rpx;
+					font-size: 24rpx;
+					color: #aa93b1;
+					margin-left: 10rpx;
+					padding: 6rpx 12rpx;
+				}
+			}
+		}
+
+		.content {
+			position: absolute;
+			margin-top: 20rpx;
+			padding: 20rpx;
+			border-radius: 4px;
+			background-color: #fff;
+			box-shadow: rgba(0, 0, 0, 0.5) 0px 3px 8px;
+			z-index: 999;
+			max-height: 300rpx;
+			overflow-y: auto;
+
+			.item {
+				padding: 10rpx;
+				height: 60rpx;
+				line-height: 40rpx;
+				margin-bottom: 10rpx;
+				font-size: 28px;
+				color: #000;
+			}
+
+			.choose {
+				background-color: #f5f7fa;
+				color: #409eff;
+				font-weight: 700;
+			}
+		}
+
+		.animation-top {
+			animation-name: slide-top;
+			animation-duration: 0.5s;
+			animation-timing-function: ease-out;
+			animation-fill-mode: both;
+		}
+
+		.animation-bottom {
+			animation-name: slide-bottom;
+			animation-duration: 0.2s;
+			animation-timing-function: ease-out;
+			animation-fill-mode: both;
+		}
+
+		@keyframes slide-top {
+			0% {
+				opacity: 0;
+				transform: translateY(-20%);
+			}
+
+			100% {
+				opacity: 1;
+				transform: translateY(0);
+			}
+		}
+
+		@keyframes slide-bottom {
+			0% {
+				opacity: 1;
+				transform: translateY(0);
+			}
+
+			100% {
+				opacity: 0;
+				transform: translateY(-20%);
+			}
+		}
+	}
+
+	.active {
+		// border: 2rpx solid #409eff;
+	}
+
+	.contentMask {
+		position: fixed;
+		left: 0;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 998;
+	}
+</style>
diff --git a/mallplusui-uniapp-app/package.json b/mallplusui-uniapp-app/package.json
index 81b7506..a3fa822 100644
--- a/mallplusui-uniapp-app/package.json
+++ b/mallplusui-uniapp-app/package.json
@@ -1,17 +1,17 @@
 {
-  "name": "uniapp",
-  "version": "1.0.0",
-  "description": "宇运动商城",
-  "main": "main.js",
-  "dependencies": {
-    "amap-js": "^1.2.1",
-    "jweixin-module": "^1.6.0",
-    "weixin-js-sdk": "^1.4.0-test"
-  },
-  "devDependencies": {},
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC"
-}
+    "id": "w-select",
+    "displayName": "下拉选择框w-select",
+    "version": "1.1.3",
+    "description": "用于下拉选择，使用v-model双向绑定值",
+    "keywords": [
+        "下拉选择框",
+        "单选框",
+        "vue2"
+    ],
+    "dcloudext": {
+        "category": [
+            "前端组件",
+            "通用组件"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/mallplusui-uniapp-app/pages/order/createOrder.vue b/mallplusui-uniapp-app/pages/order/createOrder.vue
index 7b5b3a8..fd53e31 100644
--- a/mallplusui-uniapp-app/pages/order/createOrder.vue
+++ b/mallplusui-uniapp-app/pages/order/createOrder.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>
diff --git a/mallplusui-uniapp-app/pages/order/createStoreOrder.vue b/mallplusui-uniapp-app/pages/order/createStoreOrder.vue
index c5adb30..002fad7 100644
--- a/mallplusui-uniapp-app/pages/order/createStoreOrder.vue
+++ b/mallplusui-uniapp-app/pages/order/createStoreOrder.vue
@@ -9,7 +9,7 @@
 						<text class="name">{{ addressData.name }}</text>
 						<text class="mobile">{{ addressData.phoneNumber }}</text>
 					</view>
-					<text class="address">{{ addressData.province }}-{{ addressData.city }}-{{ addressData.region }}-{{ addressData.detailAddress }}</text>
+					<text class="address">{{ addressData.region }}-{{ addressData.detailAddress }}</text>
 				</view>
 				<view class="cen" v-else>
 					<text>请设置收货地址</text>
diff --git a/mallplusui-uniapp-app/pagesU/address/address.vue b/mallplusui-uniapp-app/pagesU/address/address.vue
index d70e754..c043eb2 100644
--- a/mallplusui-uniapp-app/pagesU/address/address.vue
+++ b/mallplusui-uniapp-app/pagesU/address/address.vue
@@ -8,7 +8,7 @@
 				</view>
 				<view class="address-box">
 					<text v-if="item.defaultStatus == 1" class="tag">默认</text>
-					<text class="address"> {{ item.province }}-{{ item.city }}-{{ item.region }}-{{ item.detailAddress }}</text>
+					<text class="address">{{ item.region }}-{{ item.detailAddress }}</text>
 				</view>
 				
 			</view>
diff --git a/mallplusui-uniapp-app/pagesU/address/addressManage.vue b/mallplusui-uniapp-app/pagesU/address/addressManage.vue
index 69492d2..03e0114 100644
--- a/mallplusui-uniapp-app/pagesU/address/addressManage.vue
+++ b/mallplusui-uniapp-app/pagesU/address/addressManage.vue
@@ -11,13 +11,17 @@
 			<input class="input" type="number" maxlength="11" v-model="addressData.phoneNumber" placeholder="收货人手机号码"
 				placeholder-class="placeholder" />
 		</view>
-		
+
 		<view class="row b-b">
 			<text class="tit">所在地</text>
-			<view class="input" >
-				<uni-data-select   v-model="value" :localdata="range" @change="change"></uni-data-select>
+			<view class="input">
+				<w-select style="" v-model='chooseValue' defaultValue="请选择所在地" :list='range' width="100%"
+					valueName='content' @change='change'>
+				</w-select>
+
+				<!-- <uni-data-select :placeholder="addressData.region"  v-model="value" :localdata="range" @change="change"></uni-data-select> -->
 			</view>
-			
+
 		</view>
 		<!-- <view class="row b-b">
 			<text class="tit">地图:</text>
@@ -48,13 +52,14 @@
 		data() {
 			return {
 				mapAddressName: '',
+				chooseValue: "",
 				addressData: {
 					name: '',
 					phoneNumber: '',
 					province: '',
 					city: '',
 					region: '',
-					detailAddress: '',
+					detailAddress: '王宫村服务站',
 					defaultStatus: 0,
 					def: false
 				},
@@ -66,16 +71,16 @@
 				},
 				value: 0,
 				range: [{
-						value: '1',
-						text: '王宫村'
+						id: 1,
+						content: '王宫村'
 					},
 					{
-						value: '2',
-						text: '土山村'
+						id: 2,
+						content: '土山村'
 					},
 					{
-						value: '3',
-						text: '马庄村'
+						id: 3,
+						content: '马庄村'
 					}
 				]
 			}
@@ -85,16 +90,24 @@
 			if (option.type === 'edit') {
 				title = '编辑收货地址'
 				this.addressData = JSON.parse(option.data)
+				this.chooseValue = JSON.parse(option.data).region
+				console.log('region》》》', this.addressData.region);
+				console.log('chooseValue》》》', this.chooseValue);
 			}
 			this.manageType = option.type;
 			uni.setNavigationBarTitle({
-				title
+				title:title
 			})
 		},
 		methods: {
 
 			change(res) {
 				console.log('res', res);
+				// let index = this.range.findIndex((item) => item.value == res)
+				this.addressData.region= res.content
+				this.chooseValue= res.content
+				console.log('region》》》', this.addressData.region);
+				console.log('chooseValue》》》', this.chooseValue);
 			},
 
 			switchChange(e) {
@@ -141,11 +154,12 @@
 			async confirm() {
 				const that = this
 				let data = this.addressData;
+				console.log('data》》》', data);
 				if (!data.name) {
 					this.$api.msg('请填写收货人姓名');
 					return;
 				}
-				if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(data.phoneNumber)) {
+				if (!/^1[1-9][0-9]\d{8}$/.test(data.phoneNumber)) {
 					that.$api.msg('请输入正确的手机号码');
 					return
 				}
@@ -157,14 +171,14 @@
 				// 	that.$api.msg('请选择二级城市')
 				// 	return
 				// }
-				// if (!data.region) {
-				// 	that.$api.msg('请选择三级区或县')
-				// 	return
-				// }
-				// if (!data.detailAddress) {
-				// 	that.$api.msg('请输入详细地址');
-				// 	return
-				// }
+				if (!data.region) {
+					that.$api.msg('请选择所在的')
+					return
+				}
+				if (!data.detailAddress) {
+					that.$api.msg('请输入取货点');
+					return
+				}
 
 				let data1 = await Api.apiCall('post', Api.goods.addressSave, that.addressData);
 				if (data1) {
diff --git a/mallplusui-uniapp-app/store/index.js b/mallplusui-uniapp-app/store/index.js
index 0dda8d6..83309ee 100644
--- a/mallplusui-uniapp-app/store/index.js
+++ b/mallplusui-uniapp-app/store/index.js
@@ -13,9 +13,11 @@ const store = new Vuex.Store({
 		login(state, provider) {
 			console.log(provider);
 			if (provider && provider != undefined) {
-				console.log("provider",provider);
+				console.log("provider", provider);
+				console.log("provider>>>", provider.userInfo.memberLevelId);
 				state.hasLogin = true;
-				state.hasVip = true;
+				state.hasVip = provider.userInfo.memberLevelId == 1 ? false : true;
+				console.log("state.hasVip >>>", state.hasVip);
 				uni.setStorage({ //缓存用户登陆状态
 					key: 'userInfo',
 					data: provider.userInfo