From 31dea37dac820ba4df6c0d427911262561714861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=96=BB=E9=B9=8F?= <1242402566@qq.com>
Date: Sun, 24 May 2020 17:26:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=AA=8C=E5=85=89=E5=8D=95?=
 =?UTF-8?q?=E5=92=8C=E4=BF=AE=E6=94=B9=E9=AA=8C=E5=85=89=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/addOpticsData/addOpticsData.vue |  25 ++-
 src/pages/newOpticsData/newOpticsData.vue | 299 ++++++++++++++++++++++++++----
 src/pages/user/user.vue                   |  85 ++++++++-
 src/store/modules/myLoveList.js           |  38 +++-
 src/store/url.js                          |   3 +-
 5 files changed, 401 insertions(+), 49 deletions(-)

diff --git a/src/pages/addOpticsData/addOpticsData.vue b/src/pages/addOpticsData/addOpticsData.vue
index e3e6f6f..6098740 100644
--- a/src/pages/addOpticsData/addOpticsData.vue
+++ b/src/pages/addOpticsData/addOpticsData.vue
@@ -26,9 +26,9 @@
 		<!-- 数据展示部分 -->
 		<view class="dataMenu">
 			<uni-collapse accordion="true">
-				<view class="item" v-for="(loveItem,index) in loveList" :key="index">
+				<view class="item" v-for="(loveItem,index) in loveList" :key="index" >
 					<uni-collapse-item :title='loveItem.name' :time='getRightTime(loveItem.in_time)' :iconText='getFirstName(loveItem.name)' showAnimation='true'>
-					    <view class="loveDataInfo">
+					    <view class="loveDataInfo" @click="toNewData(2,index)">
 							<view class="dataInfoItem">
 								<text>度数（SPH）：</text><text>左：{{loveItem.leftSph}}</text><text>右：{{loveItem.rightSph}}</text>
 							</view>
@@ -47,7 +47,7 @@
 			</uni-collapse>
 		</view>
 		<view class="footer">
-			<button class="btn" type="default" @click="toNewData">新建验光单</button>
+			<button class="btn" type="default" @click="toNewData(1)">新建验光单</button>
 		</view>
 	</view>
 </template>
@@ -67,7 +67,7 @@
 		onLoad: function(option) {
 			//获取关心的人列表
 			store.dispatch('myLoveList/getLoveList', {
-				uid: "1",
+				uid: this.$store.state.user.userInfo.uid,
 			}); 
 		},
 		computed:{
@@ -99,9 +99,21 @@
 			getFirstName(name){
 				return name.substring(0,1)
 			},
-			toNewData(){
+			toNewData(item,index){
+				// const args={
+				// 	name:loveItem.name,
+				// 	pd:loveItem.pd,
+				// 	leftSph:loveItem.leftSph,
+				// 	rightSph:loveItem.rightSph,
+				// 	leftCyl:loveItem.leftCyl,
+				// 	rightCyl:loveItem.rightCyl,
+				// 	leftAxi:loveItem.leftAxi,
+				// 	rightAxi:loveItem.rightAxi
+				// }
 				uni.navigateTo({
-					url:'../newOpticsData/newOpticsData'
+					// kinds 参数为 1 表示添加新的验光单， 2 表示更新验光单
+					// name 表示修改的人名儿，pd瞳距
+					url:'../newOpticsData/newOpticsData?kinds='+item+'&index='+index
 				})
 			}
 		}
@@ -145,6 +157,7 @@
 			box-shadow: 0 0 4px 0 rgba(133,107,107,0.10);
 			width: 100%;
 			background-color: #FFFFFF;
+			margin-bottom: 120rpx;
 			.item{
 				padding: 0 40rpx;
 				.loveDataInfo{
diff --git a/src/pages/newOpticsData/newOpticsData.vue b/src/pages/newOpticsData/newOpticsData.vue
index a710c86..97e373d 100644
--- a/src/pages/newOpticsData/newOpticsData.vue
+++ b/src/pages/newOpticsData/newOpticsData.vue
@@ -8,6 +8,16 @@
 						填写验光数据
 					</view>
 					<text class="p2">没有验光数据？请到线下眼镜店验光哦～</text>
+					<view class="use_name">
+						<text>验光单取名:</text>
+						<input type="text" @change="handleInput" 
+						placeholder="请输入名称" maxlength="30" :value="name" />
+					</view>
+					<view class="use_pd">
+						<text>瞳距:</text>
+						<input type="number" @change="handleInputPd" 
+						placeholder="请输入瞳距,单位cm" maxlength="20" :value="pd" />
+					</view>
 					<view class="picker" >
 						<view class="picker-choice">
 							<view class="choice-left">
@@ -62,7 +72,7 @@
 							</picker>
 						</view>
 					</view>
-					<view class="picker" >
+<!-- 					<view class="picker" >
 						<view class="picker-choice">
 							<view class="choice-left">
 								<text class="p11">{{pickerInfoList[3].nameC}}</text>
@@ -79,31 +89,31 @@
 								<image src="../../static/detail-tabicon.png" ></image>
 							</picker>
 						</view>
-					</view>
+					</view> -->
 					<view class="picker" >
 						<view class="picker-choice">
 							<view class="choice-left">
-								<text class="p11">{{pickerInfoList[4].nameC}}</text>
+								<text class="p11">{{pickerInfoList[3].nameC}}</text>
 							</view>
 							<text class="p13-date">年&nbsp;&nbsp;&nbsp;(Y)</text>
-							<text class="p14" style="width: 34px;">{{pickerInfoList[4].nameArray1[pickerInfoList[4].nameIndex1]}}</text>
-							<picker @change="bindPickerChange41" :value="pickerInfoList[4].nameIndex1" :range="pickerInfoList[4].nameArray1">
+							<text class="p14" style="width: 34px;">{{pickerInfoList[3].nameArray1[pickerInfoList[3].nameIndex1]}}</text>
+							<picker @change="bindPickerChange41" :value="pickerInfoList[3].nameIndex1" :range="pickerInfoList[3].nameArray1">
 								<image src="../../static/detail-tabicon.png" ></image>
 							</picker>
 							<text class="p13-date">月&nbsp;&nbsp;&nbsp;(M)</text>
-							<text class="p14" style="width: 30px;">{{pickerInfoList[4].nameArray2[pickerInfoList[4].nameIndex2]}}</text>
-							<picker @change="bindPickerChange42" :value="pickerInfoList[4].nameIndex2" :range="pickerInfoList[4].nameArray2">
+							<text class="p14" style="width: 30px;">{{pickerInfoList[3].nameArray2[pickerInfoList[3].nameIndex2]}}</text>
+							<picker @change="bindPickerChange42" :value="pickerInfoList[3].nameIndex2" :range="pickerInfoList[3].nameArray2">
 								<image src="../../static/detail-tabicon.png" ></image>
 							</picker>
 							<text class="p13-date">日&nbsp;&nbsp;&nbsp;(D)</text>
-							<text class="p14" style="width: 30px;">{{pickerInfoList[4].nameArray3[pickerInfoList[4].nameIndex3]}}</text>
-							<picker @change="bindPickerChange43" :value="pickerInfoList[4].nameIndex3" :range="pickerInfoList[4].nameArray3">
+							<text class="p14" style="width: 30px;">{{pickerInfoList[3].nameArray3[pickerInfoList[3].nameIndex3]}}</text>
+							<picker @change="bindPickerChange43" :value="pickerInfoList[3].nameIndex3" :range="pickerInfoList[3].nameArray3">
 								<image src="../../static/detail-tabicon.png" ></image>
 							</picker>
 						</view>
 					</view>
 					<view class="confirm">
-						<image :src="tablist.confirm ? tabicon[0] : tabicon[1]" @click="changeConfirm"></image>
+						<image :src="confirm ? tabicon[0] : tabicon[1]" @click="changeConfirm"></image>
 						<text>确认以上输入信息来源于我的验光数据!</text>
 					</view>
 				</view>
@@ -112,72 +122,261 @@
 			</view>
 			
 			
-		<view class="footer">
+		<view class="footer" @click="handleSubmit">
 			<button class="btn" type="default">提 交</button>
 		</view>
 	</view>
 </template>
 
-<script>
+<script>
+	import store from '@/store';
+	
 	export default {
 		data() {
 			return {
 				pickerInfoList:[
-				{nameC:"度数",nameE:"(SPH)",nameArray1:[1.5,2.5,3.5,4.5],nameIndex1:0,nameArray2:[1.5,2.5,3.5,4.5],nameIndex2:0,key:0},
-				{nameC:"散光",nameE:"(CYL)",nameArray1:[1.5,2.5,3.5,4.5],nameIndex1:0,nameArray2:[1.5,2.5,3.5,4.5],nameIndex2:0,key:1},
-				{nameC:"散光轴位",nameE:"(AXI)",nameArray1:[1.5,2.5,3.5,4.5],nameIndex1:0,nameArray2:[1.5,2.5,3.5,4.5],nameIndex2:0,key:2},
-				{nameC:"双眼瞳距",nameE:"(PD)",nameArray1:[1.5,2.5,3.5,4.5],nameIndex1:0,nameArray2:[1.5,2.5,3.5,4.5],nameIndex2:0,key:3},
-				{nameC:"验光日期",nameE:'',nameArray1:[2017,2018,2019,2020,2021],nameIndex1:0,nameArray2:[1,2,3,4,5,6,7],nameIndex2:0,nameArray3:[1,2,3,4,5,6],nameIndex3:0}
+				{nameC:"度数",nameE:"(SPH)",nameArray1:[''],nameIndex1:0,nameArray2:[''],nameIndex2:0,key:0},
+				{nameC:"散光",nameE:"(CYL)",nameArray1:[''],nameIndex1:0,nameArray2:[''],nameIndex2:0,key:1},
+				{nameC:"散光轴位",nameE:"(AXI)",nameArray1:[''],nameIndex1:0,nameArray2:[''],nameIndex2:0,key:2},
+				{nameC:"验光日期",nameE:'',nameArray1:[''],nameIndex1:0,nameArray2:['',1,2,3,4,5,6,7,8,9,10,11,12],nameIndex2:0,nameArray3:[''],nameIndex3:0}
 				],
-				tablist: {
-				        // read: true,
-				        // seeLong: false,
-				        confirm: false
+				confirm: false, // 用户是否确认
+				tabicon:['/static/detail-button.png','/static/detail-button-unselected.png'],
+				name: '夏小花',
+				pickerInfoChioce:{
+					"leftSph": 0,
+					"rightSph": 0,
+					"leftCyl": 0,
+					"rightCyl": 0,
+					"leftAxi": 0,
+					"rightAxi": 0,
+					"time":{
+						"year":0,
+						"month": 0,
+						"day":0 ,
+					}
 				},
-				tabicon:['/static/detail-button.png','/static/detail-button-unselected.png'],
+				pd: '',// 瞳距
+				kinds:Number, // kinds=1，提交为新增验光，2为修改
+				mp_id: Number
 			};
 		},
+		onLoad: function (option) { 
+			//option为object类型，会序列化上个页面传递的参数
+			// 初始化SPL、CYL、AXI的值
+			for (let j = 0; j < 3; j++) {
+				for(let i=-12;i<6;i++){
+					this.pickerInfoList[j].nameArray1.push(i)
+					this.pickerInfoList[j].nameArray1.push(i+0.5)
+					this.pickerInfoList[j].nameArray2.push(i)
+					this.pickerInfoList[j].nameArray2.push(i+0.5)
+					if(i>=-6){
+						this.pickerInfoList[j].nameArray1.push(i+0.25)
+						this.pickerInfoList[j].nameArray1.push(i+0.75)
+						this.pickerInfoList[j].nameArray2.push(i+0.25)
+						this.pickerInfoList[j].nameArray2.push(i+0.75)
+					}
+					if(i==5){
+						this.pickerInfoList[j].nameArray1.push(i+1)
+						this.pickerInfoList[j].nameArray2.push(i+1)
+					}
+				}
+			}
+			// 初始化日期值
+			for (let i = 1; i < 32; i++){
+				this.pickerInfoList[3].nameArray3.push(i)
+			}
+			// 初始化年份前后五年
+			let myDate = new Date();
+			let nowYear = myDate.getFullYear();
+			for(let i=0;i<5;i++){
+				this.pickerInfoList[3].nameArray1.push(nowYear-i)
+			}
+			
+			this.kinds=option.kinds
+			if(option.kinds==1){
+				this.name= '';
+				this.pd= '';
+			} else{
+				console.log('args===>',option.index)
+				const loveList=Object.assign({},this.$store.state.myLoveList.loveList)
+				console.log('args===>',loveList[option.index].in_time)
+				console.log('args===>',loveList[option.index].in_time.toString().slice(0,4))
+				console.log('args===>',loveList[option.index].in_time.toString().slice(5,6)==0)
+				console.log('args===>',loveList[option.index].in_time.toString().slice(8,10))
+				this.name=loveList[option.index].name
+				this.pd=loveList[option.index].pd
+				this.mp_id=loveList[option.index].mp_id
+				// 将kinds =2时的值传到该页面
+				this.pickerInfoList[0].nameArray1.unshift(loveList[option.index].leftSph)
+				this.pickerInfoList[0].nameArray2.unshift(loveList[option.index].rightSph)
+				this.pickerInfoList[1].nameArray1.unshift(loveList[option.index].leftCyl)
+				this.pickerInfoList[1].nameArray2.unshift(loveList[option.index].rightCyl)
+				this.pickerInfoList[2].nameArray1.unshift(loveList[option.index].leftAxi)
+				this.pickerInfoList[2].nameArray2.unshift(loveList[option.index].rightAxi)
+				
+				this.pickerInfoList[3].nameArray1.unshift(loveList[option.index].in_time.toString().slice(0,4))
+				if(loveList[option.index].in_time.toString().slice(5,6)==0){
+					this.pickerInfoList[3].nameArray2.unshift(loveList[option.index].in_time.toString().slice(6,7))
+				} else{
+					this.pickerInfoList[3].nameArray2.unshift(loveList[option.index].in_time.toString().slice(5,7))
+				}
+				if(loveList[option.index].in_time.toString().slice(8,9)==0){
+					this.pickerInfoList[3].nameArray3.unshift(loveList[option.index].in_time.toString().slice(9,10))
+				} else{
+					this.pickerInfoList[3].nameArray3.unshift(loveList[option.index].in_time.toString().slice(8,10))
+				}
+			}
+		},
 		methods:{
+			handleInput(e){
+				this.name=e.target.value
+			},
+			handleInputPd(e){
+				// 只能输入正浮点数或正数
+				if(/^\d+(\.\d+)?$/.test(e.target.value)){
+					this.pd=e.target.value
+				} else {
+					uni.showToast({
+						title:"请输入有效数据;示例:89",
+						icon: "none",
+						duration: 3000,
+					})
+					this.pd = ''
+				}
+				
+			},
+			// 用户提交
+			handleSubmit(){
+				if(this.name==''){
+					uni.showToast({
+						title:"请输入验光单取名",
+						icon: "none",
+						duration: 3000,
+					})
+				}
+				if(this.pd==''){
+					uni.showToast({
+						title:"请输入瞳距",
+						icon: "none",
+						duration: 3000,
+					})
+				}
+				if(this.confirm){
+					if(this.kinds==1){
+						// 添加用户验光单
+						console.log('kinds====>',this.kinds)
+						store.dispatch('myLoveList/addMylove', {
+							
+							uid: this.$store.state.user.userInfo.uid,
+							openid: this.$store.state.user.userInfo.openid,
+							// mp_name: this.$store.state.user.userInfo.mp_name,
+							leftSph: this.pickerInfoChioce.leftSph,
+							rightSph: this.pickerInfoChioce.rightSph,
+							leftCyl: this.pickerInfoChioce.leftCyl,
+							rightCyl: this.pickerInfoChioce.rightCyl,
+							leftAxi: this.pickerInfoChioce.leftAxi,
+							rightAxi: this.pickerInfoChioce.rightAxi,
+							pd: this.pd,// 瞳距
+							mp_name:this.name,
+							// time: this.pickerInfoChioce.time,
+							// img_url2: "http://localhost:8087/images/shop_1/1/",
+						});
+						store.dispatch('myLoveList/getLoveList', {
+							uid: this.$store.state.user.userInfo.uid,
+						}); 
+						uni.navigateBack({
+							delta:1,
+							animationDuration:2000
+						}) 
+					}
+					if(this.kinds==2){
+						// console.log('kinds====>',this.kinds)
+						// console.log('pickerindex=====>',this.pickerInfoList[0].nameIndex1)
+						// console.log('this.pickerInfoChioce====>',type(this.pickerInfoChioce))
+						const leftList = ["leftSph","leftCyl","leftAxi"];
+						const rightList = ["rightSph", "rightCyl", "rigthAxi"];
+						for (let j=0; j<3; j++) {
+							if(this.pickerInfoList[j].nameIndex1!=0){
+
+								store.dispatch('myLoveList/updateMylove', {									
+									uid: this.$store.state.user.userInfo.uid,
+									openid: this.$store.state.user.userInfo.openid,
+									mp_id: this.mp_id,
+									keyname: leftList[j],
+									keyvalue: this.pickerInfoList[j].nameArray1[this.pickerInfoList[j].nameIndex1],
+								}); 
+							}
+							if(this.pickerInfoList[j].nameIndex2 !=0) {
+								store.dispatch('myLoveList/updateMylove', {
+									uid: this.$store.state.user.userInfo.uid,
+									openid: this.$store.state.user.userInfo.openid,
+									mp_id: this.mp_id,
+									keyname: rightList[j],
+									keyvalue: this.pickerInfoList[j].nameArray2[this.pickerInfoList[j].nameIndex2]
+								}); 
+							}
+						}
+						store.dispatch('myLoveList/getLoveList', {
+							uid: this.$store.state.user.userInfo.uid,
+						}); 
+						uni.navigateBack({
+							delta:1,
+							animationDuration:2000
+						}) 
+
+					}
+	
+				} else{
+					uni.showToast({
+						title:"请确认你的验光数据",
+						icon: "none",
+						duration: 3000,
+					})
+				}
+			},
 			changeConfirm() {
-			    this.tablist.confirm = !this.tablist.confirm
+			    this.confirm = !this.confirm
 			},
 			
 			bindPickerChange01: function(e) {
 			    this.pickerInfoList[0].nameIndex1 = e.target.value 
+				this.pickerInfoChioce.leftSph=this.pickerInfoList[0].nameArray1[e.target.value]
 			},
 			bindPickerChange02: function(e) {
 			    this.pickerInfoList[0].nameIndex2 = e.target.value 
+				this.pickerInfoChioce.rightSph=this.pickerInfoList[0].nameArray2[e.target.value]
 			},
 			
 			bindPickerChange11: function(e) {
 			    this.pickerInfoList[1].nameIndex1 = e.target.value 
+				this.pickerInfoChioce.leftCyl=this.pickerInfoList[1].nameArray1[e.target.value]
 			},
 			bindPickerChange12: function(e) {
 			    this.pickerInfoList[1].nameIndex2 = e.target.value 
+				this.pickerInfoChioce.rightCyl=this.pickerInfoList[1].nameArray2[e.target.value]
 			},
 			
 			bindPickerChange21: function(e) {
 			    this.pickerInfoList[2].nameIndex1 = e.target.value 
+				this.pickerInfoChioce.leftAxi=this.pickerInfoList[2].nameArray1[e.target.value]
 			},
 			bindPickerChange22: function(e) {
-			    this.pickerInfoList[2].nameIndex2 = e.target.value 
+			    this.pickerInfoList[2].nameIndex2 = e.target.value
+				 this.pickerInfoChioce.rightAxi=this.pickerInfoList[2].nameArray2[e.target.value]
 			},
 			
-			bindPickerChange31: function(e) {
-			    this.pickerInfoList[3].nameIndex1 = e.target.value 
-			},
-			bindPickerChange32: function(e) {
-			    this.pickerInfoList[3].nameIndex2 = e.target.value 
-			},   
-			
 			bindPickerChange41: function(e) {
-			    this.pickerInfoList[4].nameIndex1 = e.target.value 
+			    this.pickerInfoList[3].nameIndex1 = e.target.value 
+				this.pickerInfoChioce.time.year=this.pickerInfoList[3].nameArray1[e.target.value]
 			},
 			bindPickerChange42: function(e) {
-			    this.pickerInfoList[4].nameIndex2 = e.target.value 
+			    this.pickerInfoList[3].nameIndex2 = e.target.value
+				 this.pickerInfoChioce.time.month=this.pickerInfoList[3].nameArray2[e.target.value]
 			},         
 			bindPickerChange43: function(e) {
-			    this.pickerInfoList[4].nameIndex3 = e.target.value 
+			    this.pickerInfoList[3].nameIndex3 = e.target.value 
+				this.pickerInfoChioce.time.day=this.pickerInfoList[3].nameArray3[e.target.value]
 			},
 		}
 	}
@@ -237,6 +436,36 @@
 		        letter-spacing: -0.23px;
 		        margin-bottom: 18rpx;
 		    }
+			.use_pd{
+				display: flex;
+				height: 48rpx;
+				line-height: 48rpx;
+				margin-left: -298rpx;
+				margin-top: 30rpx;
+				margin-bottom: 40rpx;
+				align-items: center;
+				justify-content: center;
+				text{
+					font-size: 14px;
+					color: #333333;
+					margin-right: 44rpx;
+				}
+			}
+			.use_name{
+				display: flex;
+				height: 48rpx;
+				line-height: 48rpx;
+				margin-left: -220rpx;
+				margin-top: 20rpx;
+				align-items: center;
+				justify-content: center;
+				// text-align: center;
+				text{
+					font-size: 14px;
+					color: #333333;
+					margin-right: 44rpx;
+				}
+			}
 		    image{
 		        width: 28rpx;
 		        height: 26rpx;
@@ -307,6 +536,8 @@
 					text-align: center;
 					width: 124rpx;
 					border-bottom: 1px solid #CFCFCF;
+					height: 40rpx;
+
 				}
 		        
 			}
diff --git a/src/pages/user/user.vue b/src/pages/user/user.vue
index 9ebefef..c13806b 100644
--- a/src/pages/user/user.vue
+++ b/src/pages/user/user.vue
@@ -1,5 +1,26 @@
 <template>
 	<view class="wrap">
+		<!-- 弹窗 -->
+		<uni-popup ref="popup" type="center">
+			<!-- 给一个左边弹窗的样式 -->
+			<!-- 关闭弹窗按钮 -->
+			<view class="closeBtn" @click="this.$refs.popup.close()">x</view>
+			<view class="popUpWrap" v-if="whichTap==0">
+				<text>这是一款眼镜及周边产品的销售平台，我们将帮您进行建立全球销售网络，欢迎入驻。</text>
+
+				<!-- 左 -->
+				<!-- <image class="glassInfo" src="../../static/img/myOpticsData/glassInfo.png" v-if="whichTap == 0" mode="aspectFit"></image> -->
+				<!-- 右 -->
+				<!-- <image class="dataInfo" src="../../static/img/myOpticsData/dataInfo.png" v-else mode="aspectFit"></image> -->
+			</view>
+			<view class="popUpWrap" v-if="whichTap==1">
+				<text>本平台欢迎全国各地的眼镜工厂、品牌、眼镜店加入。请联系我们申请注册账号。</text>
+			</view>
+			<view class="popUpWrap" v-if="whichTap==2">
+				<button @click="chatOur(1)">客服1</button>
+				<button @click="chatOur(2)">客服2</button>
+			</view>
+		</uni-popup>
 		<view v-if="isAuth" class="content">
 			<view class="userInfo">
 				<view class="info">
@@ -54,21 +75,21 @@
 					</view>
 					<image src="../../static/right.png" mode="aspectFit"></image>
 				</view> -->
-				<view class="item">
+				<view class="item" @click="changeTap(0)">
 					<view class="left">
 						<image src="../../static/img/user/introduce.png" mode="aspectFit"></image>
 						<text>系统介绍</text>
 					</view>
 					<image src="../../static/right.png" mode="aspectFit"></image>
 				</view>
-				<view class="item">
+				<view class="item" @click="changeTap(1)">
 					<view class="left">
 						<image src="../../static/img/user/joinUs.png" mode="aspectFit"></image>
 						<text>加入我们</text>
 					</view>
 					<image src="../../static/right.png" mode="aspectFit"></image>
 				</view>
-				<view class="item">
+				<view class="item" @click="changeTap(2)">
 					<view class="left">
 						<image src="../../static/img/user/service.png" mode="aspectFit"></image>
 						<text>联系客服</text>
@@ -112,15 +133,18 @@
 <script>
 	import Card from "@/components/CommodityCard/CommodityCard.vue";
 	import store from '@/store';
+	import UniPopup from '@/components/UniPopup/uni-popup.vue'
 
 	export default {
 		components: {
-			'Card':Card
+			'Card':Card,
+			UniPopup
 			},
 		data() {
 			return {
 				isAuth: true, // 是否显示授权页面,
-				pagesnum:1 // 分页请求初始值
+				pagesnum:1, // 分页请求初始值
+				whichTap:0, // 弹窗渲染选择条件
 			}
 		},
 		onLoad() {
@@ -163,6 +187,22 @@
 		},
 
 		methods: {
+			// 弹窗
+			changeTap(item){
+				this.whichTap = item
+				this.$refs.popup.open()
+			},
+			chatOur(item){
+				if(item==1){
+					uni.makePhoneCall({
+						phoneNumber:13376189297, // 客服1 电话
+					})
+				} else{
+					uni.makePhoneCall({
+						phoneNumber:18014995101 // 客服2 电话
+					})
+				}
+			},
 			// 授权
 			onGotUserInfo(e) {
 				console.log('anthInfo', e);
@@ -477,5 +517,40 @@
 			border-radius: 30rpx;
 		}
 	}
+	
+	.popUpWrap{
+		height: 200rpx;
+		width: 542rpx;
+		background-color: #FFFFFF;
+		border-radius: 4px;
+		border: 1px solid #979797;
+		display: flex;
+		align-items: center;
+		justify-items: center;
+		box-sizing: border-box;
+		padding: 0 20rpx;
+		text{
+			font-size: 12px;
+			color: #333333;
+		}
+		button{
+			width: 150rpx;
+			height: 80rpx;
+			border-radius: 4px;
+			text-align: center;
+			line-height: 80rpx;
+			font-size: 14px;
+
+		}
+	}
+	.closeBtn{
+		height: 28rpx;
+		width: 28rpx;
+		// border: 1px solid red;
+		position: absolute;
+		top: 20rpx;
+		right: 10rpx;
+	}
+
 
 </style>
diff --git a/src/store/modules/myLoveList.js b/src/store/modules/myLoveList.js
index df9d908..715a5d1 100644
--- a/src/store/modules/myLoveList.js
+++ b/src/store/modules/myLoveList.js
@@ -2,7 +2,9 @@ import urlAlias from '../url';
 import request from '../request';
 
 const {
-  mylovelist
+  mylovelist,
+  myloveadd,
+  myloveupdate
 } = urlAlias;
 
 const state = {
@@ -12,7 +14,12 @@ const state = {
 const mutations = {
   INIT: (state, data) => {
     state.loveList = data;
-  },
+  },
+  // 更新关心人验光单
+  UPDATE:(state, data) => {
+	  // state.loveList.push(data)
+	  // console.log('UPDATA=====>',data)
+  }
 };
 
 const actions = {
@@ -25,7 +32,32 @@ const actions = {
           commit("INIT", res.data.data);
         },
     })
-  }
+  },
+  addMylove({ commit }, param) {
+
+	  console.log('myloveupdate-parm====>',param)
+      request({
+        url: myloveadd,
+        data: param,
+        success: (res) => {
+		console.log('addMylove-parm====>',param)
+        console.log(res.data);
+         // commit("ADD", args);
+        },
+    })
+  },
+  updateMylove({ commit }, param) {
+      request({
+        url: myloveupdate,
+        data: param,
+        success: (res) => {
+  		console.log('myloveupdate-parm====>',param)
+         console.log(res);
+         // commit("UPDATE", param);
+        },
+    })
+  },
+  
 }
 
 export default {
diff --git a/src/store/url.js b/src/store/url.js
index 267f47e..35d3440 100644
--- a/src/store/url.js
+++ b/src/store/url.js
@@ -40,7 +40,8 @@ const urlAlias = {
 
   // 用户数据
   mylovelist: '/app/user/mylovelist', // 关心的人的数据
-  myloveadd: '/app/user/myloveadd' // 添加关心的人
+  myloveadd: '/app/user/myloveadd', // 添加关心的人
+  myloveupdate: '/app/user/myloveupdate' // 更新关心人的数据
 }
 
 export default urlAlias
-- 
2.0.0