修改

common/request/api_list.js

@@ -24,9 +24,9 @@ export default {
 		},
 	},
 	signs: {
-		// 获取已绑定福位 
-		getOpenidBlessingPosition: {
-			url: '/business/app/getOpenidBlessingPosition',
+		// 获取已绑定福位
+		getOpenidCabinetPosition: {
+			url: '/business/app/getOpenidCabinetPosition',
 			auth: true,
 			method: 'POST',
 		},
@@ -49,14 +49,14 @@ export default {
 			method: 'POST',
 		},
 		// 未绑定阁位区域
-		getBlessingArea: {
-			url: '/business/app/getBlessingArea',
+		getCabinetArea: {
+			url: '/business/app/getCabinetArea',
 			auth: true,
 			method: 'POST',
 		},
 		// 未绑定阁位
-		getBlessingPosition: {
-			url: '/business/app/getBlessingPosition',
+		getCabinetPosition: {
+			url: '/business/app/getCabinetPosition',
 			auth: true,
 			method: 'POST',
 		},

common/request/index.js

@@ -18,15 +18,16 @@ export default function api(url, data = {}, showToast = true) {
 			 config.header.openid = getStorage('openid')
 		} 
 		
-		if (getStorage('token')) {
-			if(config.data.openid == null){
+		if (getStorage('openid')) {
+			if(config.data.openid === null){
 				delete config.data.openid
+				delete config.data.phone
 				config.data = { ...config.data}
 			}else{
-				config.data = { openid: getStorage('token'), ...config.data}
+				config.data = { openid: getStorage('openid'), ...config.data}
 			}
 			
-		    config.header.token = getStorage('token');
+		    config.header.token = getStorage('openid');
 		}
 		
 		return config

env.js

@@ -3,10 +3,10 @@
  *  @version 1.0.0
  */
 // 本地缓存前缀
-export const STORAGE_NAME = 'DiTie_app_'
+export const STORAGE_NAME = 'sign_app_'
 
 const ENV_BASE_URL = {
-	development: 'https://h5.youfukeji.cn/prod-api/', //开发环境
+	development: 'http://118.190.148.113:10070', //开发环境
 	production: 'https://h5.youfukeji.cn/prod-api/', //生产环境
 }
 	

pages/signs/address/address.vue

@@ -2,17 +2,32 @@
 	<view class="sign-page">
 		<view class="view-wrap">
 			<view class="card">
-				<view class="form-item">
+				<!-- <view class="form-item">
 					<view class="form-item__title">
 						<view class="name">区域</view>
 						<view class="extra"></view>
 					</view>
 					<view class="form-item__input__wrap">
 						<view class="form-item__input" @click="showArea">
-							<input placeholder-class="input-placeholder" class="input" type="text" :value="form.blessingAreaName" placeholder="请选择区域" disabled />
+							<input placeholder-class="input-placeholder" class="input" type="text" :value="form.AreaName" placeholder="请选择区域" disabled />
 							<view class="icon"><image style="width: 16rpx;height: 16rpx;" src="/static/app/page3/arrow-down.png" mode="aspectFit"></image></view>
 						</view>
 					</view>
+				</view> -->
+				<view class="form-item">
+					<view class="form-item__title">
+						<view class="name">经办人姓名/电话/逝者姓名</view>
+						<view class="extra"></view>
+					</view>
+					<view class="form-item__input__wrap">
+						<view class="form-item__input">
+							<input placeholder-class="input-placeholder" class="input" type="text" v-model="form.inputSearch" placeholder="经办人姓名或电话或逝者姓名" />
+							<view class="inlne-button-wrap">
+								<button class="u-reset-button button" type="default" @click="showPos">查询</button>
+							</view>
+							<!-- <view class="icon"><image style="width: 16rpx;height: 16rpx;" src="/static/app/page3/arrow-down.png" mode="aspectFit"></image></view> -->
+						</view>
+					</view>
 				</view>
 				<view class="form-item">
 					<view class="form-item__title">
@@ -21,7 +36,7 @@
 					</view>
 					<view class="form-item__input__wrap">
 						<view class="form-item__input" @click="showPos">
-							<input placeholder-class="input-placeholder" class="input" type="text" :value="form.blessingPositionName" placeholder="请选择阁位" disabled />
+							<input placeholder-class="input-placeholder" class="input" type="text" :value="form.cabinetPositionName" placeholder="请选择阁位" disabled />
 							<view class="icon"><image style="width: 16rpx;height: 16rpx;" src="/static/app/page3/arrow-down.png" mode="aspectFit"></image></view>
 						</view>
 					</view>
@@ -30,7 +45,7 @@
 					<view class="form-item__title">
 						<view class="name">经办人验证码</view>
 						<view class="extra">
-							
+
 						</view>
 					</view>
 					<view class="form-item__input__wrap">
@@ -74,10 +89,11 @@
 				seconds: 60,
 				send: false,
 				form: {
-					blessingAreaId: '',
-					blessingAreaName: '',
-					blessingPositionId: '',
-					blessingPositionName: '',
+					inputSearch: '',
+					cabinetAreaId: '',
+					cabinetAreaName: '',
+					cabinetPositionId: '',
+					cabinetPositionName: '',
 					code: '',
 				},
 			};
@@ -87,37 +103,48 @@
 		},
 		methods: {
 			async getArea(keyWord){
-				const res = await this.$api('signs.getBlessingArea', {})
+				const res = await this.$api('signs.getCabinetPosition', {phone: this.form.inputSearch})
 				if(res.code != 200) {
 					throw new Error("")
 				}
 				return res.data.map(item => {
-					return { ...item, id: item.blessingAreaId, name: item.blessingAreaName }
+					return { ...item, id: item.cabinetAreaId, name: item.cabinetAreaName }
 				})
 			},
+			async search(){
+				const res = await this.$api('signs.getCabinetPosition', {phone: this.form.inputSearch})
+				console.log(res)
+			},
 			showArea() {
+				if(!this.form.inputSearch){
+					this.$refs.uToast.show({type: 'error', message: '请输入查询内容', position: 'top'})
+					return 
+				}
 				this.$refs.area.$open().then(res => {
 					if(res.arr && res.arr.length > 0){
-						this.form.blessingAreaId = res.arr[0].blessingAreaId
-						this.form.blessingAreaName = res.arr[0].blessingAreaName
+						this.form.cabinetAreaId = res.arr[0].cabinetAreaId
+						this.form.cabinetAreaName = res.arr[0].cabinetAreaName
 					}
 				})
-				
 			},
 			async getPos(){
-				const res = await this.$api('signs.getBlessingPosition', {blessingAreaId: this.form.blessingAreaId})
+				const res = await this.$api('signs.getCabinetPosition', {phone: this.form.inputSearch})
 				if(res.code != 200) {
 					throw new Error("")
 				}
 				return res.data.map(item => {
-					return { ...item, id: item.blessingPositionId, name: item.blessingPositionName }
+					return { ...item, id: item.cabinetPositionId, name: item.cabinetPositionName }
 				})
 			},
 			showPos() {
+				if(!this.form.inputSearch){
+					this.$refs.uToast.show({type: 'error', message: '请输入查询内容', position: 'top'})
+					return 
+				}
 				this.$refs.pos.$open({}).then(res => {
 					if(res.arr && res.arr.length > 0){
-						this.form.blessingPositionId = res.arr[0].blessingPositionId
-						this.form.blessingPositionName = res.arr[0].blessingPositionName
+						this.form.cabinetPositionId = res.arr[0].cabinetPositionId
+						this.form.cabinetPositionName = res.arr[0].cabinetPositionName
 					}
 				})
 			},
@@ -131,21 +158,21 @@
 				this.tips = text;
 			},
 			getCode() {
-				
-				if(!this.form.blessingPositionId){
+
+				if(!this.form.cabinetPositionId){
 					this.$refs.uToast.show({type: 'error', message: '请选择阁位', position: 'top'})
 					return;
 				}
-				
+
 				if(this.$refs.uCode.canGetCode) {
 					// 模拟向后端请求验证码
 					this.$refs.uToast.show({
 						type: 'loading',
 						message: '正在获取验证码',
 					})
-					
-					// TODO 发起请求: 
-					this.$api('signs.sendCode', {blessingPositionId: this.form.blessingPositionId}).then(res => {
+
+					// TODO 发起请求:
+					this.$api('signs.sendCode', {cabinetPositionId: this.form.cabinetPositionId}).then(res => {
 						this.$refs.uToast.hide()
 						if(res.code == 200){
 							// 这里此提示会被this.start()方法中的提示覆盖
@@ -156,13 +183,13 @@
 							this.$refs.uToast.show({type: 'error', message: res.msg, position: 'top'})
 						}
 					})
-					
+
 				} else {
 					uni.$u.toast('倒计时结束后再发送');
 				}
 			},
 			confirm(){
-				if(!this.form.blessingPositionId){
+				if(!this.form.cabinetPositionId){
 					this.$refs.uToast.show({type: 'error', message: '请选择阁位', position: 'top'})
 					return;
 				}
@@ -170,13 +197,13 @@
 					this.$refs.uToast.show({type: 'error', message: '请填写经办人验证码', position: 'top'})
 					return;
 				}
-				
+
 				this.$refs.uToast.show({
 					type: 'loading',
 					message: '请稍后',
 				})
-				
-				this.$api('signs.openidBinding', {blessingPositionId: this.form.blessingPositionId, code: this.form.code}).then(res => {
+
+				this.$api('signs.openidBinding', {cabinetPositionId: this.form.cabinetPositionId, code: this.form.code}).then(res => {
 					this.$refs.uToast.hide()
 					if(res.code == 200){
 						// 这里此提示会被this.start()方法中的提示覆盖
@@ -188,7 +215,7 @@
 						this.$refs.uToast.show({type: 'error', message: res.msg, position: 'top'})
 					}
 				})
-				
+
 			}
 		}
 	}
@@ -196,4 +223,4 @@
 
 <style lang="scss" scoped>
 	@import "./index.scss";
-</style>
+</style>

pages/signs/address/index.scss

@@ -62,6 +62,28 @@
 		}
 	}
 	
+	.inlne-button-wrap{
+		padding-right: 15rpx;
+		padding-left: 15rpx;
+		align-self: center;
+		.button{
+			padding: 10rpx 20rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background: #79A9CE;
+			font-size: 30rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #FEFEFE;
+			border-radius: 10rpx;
+			&.button-hover{
+				position: relative;
+				top: 3px;
+			}
+		}
+	}
+	
 	.button-wrap{
 		padding-top: 30rpx;
 	}

pages/signs/me/me.vue

@@ -25,7 +25,7 @@
 			<view class="box-head">
 				<view class="name">预约记录</view>
 			</view>
-			
+
 			<view class="records-body">
 				<!-- <scroll-view style="height: 100%;width: 100%;" :scroll-y="true"> -->
 					<view class="record-item" v-for="(item,index) in list" :key="item.id" @click="navToDetail(item)">
@@ -41,7 +41,7 @@
 							</view>
 							<view class="row">
 								<view class="label">预约阁位：</view>
-								<view class="text">{{item.blessingAreaName}}-{{item.blessingPositionName}}阁位</view>
+								<view class="text">{{item.cabinetAreaName}}-{{item.cabinetPositionName}}阁位</view>
 							</view>
 							<view class="row" v-if="item.updateTime">
 								<view class="label">到访时间：</view>
@@ -49,30 +49,30 @@
 							</view>
 						</view>
 					</view>
-					
+
 					<view class="empty-wrap" v-if="list.length == 0">
 						<image class="inner-img" src="/static/app/data_empty.png" mode="widthFix"></image>
 						<view class="text">暂无预约</view>
 					</view>
 				<!-- </scroll-view> -->
 			</view>
-			
+
 		</view>
-			
+
 		<view style="height: 60rpx;"></view>
-		
+
 		<!-- 授权 -->
 		<c-pop-auth ref="modelAuth"></c-pop-auth>
-		
+
 		<!-- 手机号 -->
 		<c-pop-phone ref="modelPhone"></c-pop-phone>
-		
+
 		<!-- 年龄询问 -->
 		<!-- <c-pop-adulthood ref="modelAdulthood"></c-pop-adulthood> -->
-		
+
 		<!-- 默认loading -->
 		<u-toast ref="uToast"></u-toast>
-		
+
 		<!-- 客户 -->
 		<!-- <c-service></c-service> -->
 	</view>
@@ -138,11 +138,11 @@
 				})
 			},
 			async loadData() {
-				
+
 				const res = await this.$api('signs.getOpenidVisitList', {...this.form})
-				
+
 				this.$refs.uToast.hide()
-				
+
 				if(res.code == 200){
 					// 预约列表
 					this.list = res.data.map(item => {

pages/signs/subscribe/subscribe.vue

@@ -9,7 +9,7 @@
 					</view>
 					<view class="form-item__input__wrap" @click="showPos">
 						<view class="form-item__input">
-							<input placeholder-class="input-placeholder" class="input" type="text" :value="form.blessingPositionName" placeholder="请选择阁位" disabled />
+							<input placeholder-class="input-placeholder" class="input" type="text" :value="form.cabinetPositionName" placeholder="请选择阁位" disabled />
 							<view class="icon"><image style="width: 16rpx;height: 16rpx;" src="/static/app/page3/arrow-down.png" mode="aspectFit"></image></view>
 						</view>
 					</view>
@@ -59,14 +59,14 @@
 				</button>
 			</view>
 		</view>
-		
+
 		<!-- 阁位 -->
 		<c-form-type-action-sheet ref="pos" title="请选择阁位" :loadData="getPos">
 			<template v-slot="{item}">
 				<view>{{item.name}}</view>
 			</template>
 		</c-form-type-action-sheet>
-		
+
 		<!-- 提示框 -->
 		<u-toast ref="uToast"></u-toast>
 	</view>
@@ -78,8 +78,8 @@
 		data() {
 			return {
 				form: {
-					blessingPositionId: '',
-					blessingPositionName: '',
+					cabinetPositionId: '',
+					cabinetPositionName: '',
 					num: '',
 					beginDate: dayjs().format('YYYY-MM-DD'),
 					visitDate: dayjs().format('YYYY-MM-DD'),
@@ -97,7 +97,7 @@
 			* 比较时间大小 时间
 			* @param {dayjs} time1
 			* @param {dayjs} time2
-			*/	
+			*/
 		   isLittleTime(time1, time2){
 			   const diff = time1.diff(time2,'minutes' )
 			   if(diff >= 0){
@@ -105,19 +105,19 @@
 			   }else{
 				   return true
 			   }
-		   },	
+		   },
 		   async initTimes(date = '') {
 			    try{
 			    	const res = await this.$api('signs.getOpenidVisitDateTime', {visitDate: date})
 					const timeStr = dayjs().unix()
 					this.current = null;
 					let isfuzhi = false
-					
+
 					const time1 = dayjs()
 					const time2YMD = dayjs(date)
 			    	const times = res.data.map((item, index) => {
 						let isCheck = false // 点击
-						const _time2 = dayjs().year(time2YMD.year()).month(time2YMD.month()).day(time2YMD.day()).hour(item.visitTime.split(':')[0]).minute(item.visitTime.split(':')[1]).second(0);
+						const _time2 = dayjs().year(time2YMD.year()).month(time2YMD.month()).date(time2YMD.date()).hour(item.visitTime.split(':')[0]).minute(item.visitTime.split(':')[1]).second(0);
 						// 自动选中未录满
 						if(this.isLittleTime(time1 , _time2) && item.max > item.num) {
 							// 可以点击
@@ -132,25 +132,26 @@
 						return { id: timeStr + '' + index, text: item.visitTime, visitTime: item.visitTime, max: item.max, num: item.num, isCheck: isCheck}
 					})
 			    	this.times = times
-					console.log(times, '---------')
+					// console.log(times, '---------')
 			    }catch(e){
+					console.log(e)
 			    	//TODO handle the exception
 			    }
 			},
 			async getPos(){
-				const res = await this.$api('signs.getOpenidBlessingPosition', {})
+				const res = await this.$api('signs.getOpenidCabinetPosition', {})
 				if(res.code != 200) {
 					throw new Error("")
 				}
 				return res.data.map(item => {
-					return { ...item, id: item.blessingPositionId, name: item.blessingPositionName }
+					return { ...item, id: item.cabinetPositionId, name: item.cabinetPositionName || '' }
 				})
 			},
 			showPos() {
 				this.$refs.pos.$open().then(res => {
 					if(res.arr && res.arr.length > 0){
-						this.form.blessingPositionId = res.arr[0].blessingPositionId
-						this.form.blessingPositionName = res.arr[0].blessingPositionName
+						this.form.cabinetPositionId = res.arr[0].cabinetPositionId
+						this.form.cabinetPositionName = res.arr[0].cabinetPositionName
 					}
 				})
 			},
@@ -174,8 +175,8 @@
 			},
 			// 确认预约
 		    async bindDate(){
-				
-				if(!this.form.blessingPositionId){
+
+				if(!this.form.cabinetPositionId){
 					this.$refs.uToast.show({type: 'error', message: '请选择阁位', position: 'top'})
 					return;
 				}
@@ -183,28 +184,28 @@
 					this.$refs.uToast.show({type: 'error', message: '请输入随访人数量', position: 'top'})
 					return;
 				}
-				
+
 				if(!this.current && this.current != 0){
 					this.$refs.uToast.show({type: 'error', message: '请选择随访时间', position: 'top'})
 					return;
 				}
-				
-				
+
+
 				this.$refs.uToast.show({
 					type: 'loading',
 					message: '请稍后',
 				})
-				
+
 				const res = await this.$api('signs.addOpenidVisit', {...this.form})
-				
+
 				this.$refs.uToast.hide()
-				
+
 				if(res.code == 200){
 					// 这里此提示会被this.start()方法中的提示覆盖
 					this.$refs.uToast.show({type: 'success', message: res.msg, position: 'top'})
-					
-					 const {code, visitDate, visitTime, openid, blessingPositionId, blessingPositionName} = res.data;
-					 
+
+					 const {code, visitDate, visitTime, openid, cabinetPositionId, cabinetPositionName} = res.data;
+
 					 this.$st(() => {
 					 	this.$u.route({
 					 		url: '/pages/signs/invitation/invitation',
@@ -216,7 +217,7 @@
 					 		}
 					 	})
 					 })
-					 
+
 				}else{
 					this.$refs.uToast.show({type: 'error', message: res.msg, position: 'top'})
 				}
@@ -227,7 +228,7 @@
 						url: '/pages/signs/address/address',
 						type: "navigateTo",
 						params: {
-							
+
 						}
 					})
 				})
@@ -238,4 +239,4 @@
 
 <style lang="scss" scoped>
 	@import "./index.scss";
-</style>
+</style>

store/modules/user.js

@@ -128,8 +128,11 @@ const actions = {
 		if(config['getPhone'] && state.sessionKey){
 			commit('USER_GETPHONE', true);
 		}else {
-			await dispatch('login', {openid: state.openid, phone: ''})
-			
+			const res = await dispatch('login', {openid: state.openid})
+			if(res.code == 500){
+				commit('USER_GETPHONE', true);
+				return 1
+			}
 			return 2
 		}
 	},
@@ -177,7 +180,7 @@ const actions = {
 			// 刷新地图
 			// await store.dispatch('initMap')10.190.35.204
 			
-			return res.data
+			return res
 			
 		}catch(e){
 			console.log(e)

unpackage/dist/build/mp-weixin/pages/signs/address/address-c-form-type-action-sheet-default.wxml

@@ -1 +1 @@
-<view class="data-v-2eae978f">{{item.name}}</view>
+<view class="data-v-094d4605">{{item.name}}</view>

unpackage/dist/build/mp-weixin/pages/signs/address/address-c-form-type-action-sheet-default1.wxml

@@ -1 +1 @@
-<view class="data-v-2eae978f">{{item.name}}</view>
+<view class="data-v-094d4605">{{item.name}}</view>

unpackage/dist/build/mp-weixin/pages/signs/subscribe/subscribe-c-form-type-action-sheet-default.wxml

@@ -1 +1 @@
-<view class="data-v-3b74281b">{{item.name}}</view>
+<view class="data-v-c2ee8382">{{item.name}}</view>