添加成员

api/baseurl.js

@@ -1,10 +1,12 @@
 // var baseurl = "https://quanyidaojia.xinelu.cn";
-// var baseurl = "http://192.168.16.48:8088";
+var baseurl = "http://192.168.16.48:8088";
 // 蒙
 // var baseurl = "http://8.131.93.145:54088";
 // 郝
 // var baseurl = "http://8.131.93.145:54010";
 
-var baseurl = "http://192.168.16.30:8088";
+// var baseurl = "http://192.168.16.76:8080";
+// var baseurl = "http://192.168.16.212:8088";
+
 
 export default baseurl

components/protocol/protocol.vue

@@ -12,7 +12,28 @@
 				<h4>乙方：</h4>
 				<h4 class="box-line">{{list.residentName}}</h4>
 			</view>
-			<uni-table border stripe emptyText="暂无更多数据">
+			<u-table width="80%">
+					<u-tr class="u-tr">
+						<u-th class="u-th">姓名</u-th>
+						<u-th class="u-th">性别</u-th>
+						<u-th class="u-th">年龄</u-th>
+						<u-th class="u-th">身份证号</u-th>
+						<u-th class="u-th">现住址</u-th>
+						<u-th class="u-th">选择签约基础服务包</u-th>
+						<u-th class="u-th">选择签约个性服务包</u-th>
+					</u-tr>
+					<u-tr class="u-tr">
+						<u-td class="u-th">{{list.residentName}}</u-td>
+						<u-td class="u-th">{{list.gender === '1' ? '男' : '女'}}</u-td>
+						<u-td class="u-th">{{list.age?list.age:''}}</u-td>
+						<u-td class="u-th">{{list.identity?list.identity:''}}</u-td>
+						<u-td class="u-th">{{list.address?list.address:''}}</u-td>
+						<u-td class="u-th">{{list.phone?list.phone:''}}</u-td>
+						<u-td class="u-th">{{list.BasePackage?list.BasePackage:''}} </u-td>
+						<u-td class="u-th">{{list.PersonalityPack?list.PersonalityPack:''}}</u-td>
+					</u-tr>
+				</u-table>
+			<!-- <uni-table border stripe emptyText="暂无更多数据">
 				<uni-tr>
 					<uni-th>姓名</uni-th>
 					<uni-th>性别</uni-th>
@@ -33,7 +54,7 @@
 					<uni-td>{{list.BasePackage?list.BasePackage:''}} </uni-td>
 					<uni-td>{{list.PersonalityPack?list.PersonalityPack:''}}</uni-td>
 				</uni-tr>
-			</uni-table>
+			</uni-table> -->
 			<view>
 				<p style='padding-top: 30rpx;line-height: 46rpx;'>甲乙双方本着平等、尊重和自愿的原则，签订此协议，接受以下条款的约定</p>
 				<p style='padding: 30rpx 0;line-height: 46rpx;'>甲乙双方共同确定

pagesB/AddMembers/AddMembers.vue

@@ -98,6 +98,13 @@
 							<u-input v-model="form.address" placeholder="请输入居住地址" />
 						</view>
 					</u-form-item>
+					<view class="name">
+						所在位置
+						<view class="selectdata" @tap='getAddress'>
+							<text v-if="form.locationName ==''">请选择所在位置</text>
+							<text class="testitem">{{form.locationName}}</text>
+						</view>
+					</view>
 					<u-form-item prop="phone" :border-bottom="false">
 						<view class="name">
 							手机号
@@ -115,7 +122,8 @@
 			<!-- 民族 -->
 			<u-select v-model="showNation" :list="actions" @confirm="nationSelect"></u-select>
 			<!-- 与户主关系 -->
-			<u-select v-model="showRelationshipWithHouseholder" :list="relationship" @confirm="relationshipSelect"></u-select>
+			<u-select v-model="showRelationshipWithHouseholder" :list="relationship"
+				@confirm="relationshipSelect"></u-select>
 
 			<!-- 出生日期 -->
 			<u-picker mode="time" v-model="timeshow" :params="params" @confirm='timechange' @canel='timeshow=false'>
@@ -176,8 +184,10 @@
 					address: '',
 					phone: '',
 					birthDate: '',
-
 					householdRelationship: '',
+					locationName: '',
+					homeLongitude: '',
+					homeLatitude: '',
 				},
 				householdRelationship: '',
 				userinfo: {},
@@ -358,6 +368,20 @@
 			})
 		},
 		methods: {
+			//获取所在位置
+			getAddress() {
+				var that = this;
+				uni.chooseLocation({
+					success: function(location) {
+						that.form.locationName = location.address
+						that.form.homeLongitude = location.longitude;
+						that.form.homeLatitude = location.latitude;
+					},
+					fail(err) {
+						console.log(err)
+					}
+				});
+			},
 			//选择出生日期
 			timechange(e) {
 				this.form.birthDate = e.year + '-' + e.month + '-' + e.day
@@ -472,6 +496,7 @@
 				}
 
 			}
+
 			.u-form-item {
 				padding: 0 0 !important;
 			}
@@ -624,6 +649,51 @@
 
 				}
 
+				// .selectdata{
+
+				// }
+				.selectdata {
+					width: 636rpx;
+					height: 63rpx;
+					background: #F6F6F6;
+					margin: 12rpx auto;
+					border-radius: 5rpx;
+					display: flex;
+					position: relative;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+
+
+					.testitem {
+						font-size: 26rpx;
+						font-family: Source Han Sans CN;
+						font-weight: 400;
+						color: #000000;
+
+
+					}
+
+					text {
+						padding-left: 20rpx;
+						line-height: 63rpx;
+						font-size: 20rpx;
+						font-family: Source Han Sans CN;
+						font-weight: 400;
+						color: #8E8E8E;
+					}
+
+					image {
+						width: 9rpx;
+						height: 17rpx;
+						position: absolute;
+						right: 40rpx;
+						top: 50%;
+						-webkit-transform: translateY(-50%);
+						transform: translateY(-50%);
+					}
+				}
+
 				.select {
 					width: 636rpx;
 					height: 63rpx;
@@ -632,6 +702,7 @@
 					border-radius: 5rpx;
 					display: flex;
 					position: relative;
+
 					.testitem {
 						font-size: 26rpx;
 						font-family: Source Han Sans CN;

pagesB/performancedetails/performancedetails.vue

@@ -24,6 +24,7 @@
 		data() {
 			return {
 				itemlist: [],
+				userinfo:{},
 			};
 		},
 		watch: {},
@@ -33,7 +34,10 @@
 			},
 			info() {
 				// getPerformance(uni.getStorageSync('userinfo').cardNo, '1').then(res => {
-				getPerformance('372424194703207523', '1').then(res => {
+				this.cityCode = uni.getStorageSync('region');
+				this.userinfo = uni.getStorageSync('userinfo')
+				var identity=this.userinfo.cardNo
+				getPerformance(identity).then(res => {
 					res.data.forEach(e => {
 						e.check = false
 					})