wgl пре 4 година
родитељ
комит
a5faa5bdcb

+ 4 - 2
src/apis/weixin.js

@@ -11,10 +11,12 @@ export function getDataByCode(code) {
 }
 
 //获取用户信息
-export function getDataByOpenId(params) {
+export function getDataByOpenId(openId) {
 	return request({
 		url: '/mobile/personInfoApi/findByOpenId',
-		data: Qs.stringify(params),
+		data: Qs.stringify({
+			openId: openId
+		}),
 		method: 'post',
 	})
 }

+ 1 - 1
src/assets/js/mui.js

@@ -7382,7 +7382,7 @@ Function.prototype.bind = Function.prototype.bind || function(to) {
 		        duration = durations['short'];
 		    }
 			var toast = document.createElement('div');
-			toast.style="bottom: 50%;";
+			toast.style="bottom: 10%;";
 			toast.classList.add('mui-toast-container');
 			toast.innerHTML = '<div class="' + 'mui-toast-message' + '">' + message + '</div>';
 			toast.addEventListener('webkitTransitionEnd', function() {

+ 18 - 0
src/projects/business/App.vue

@@ -4,10 +4,28 @@
 	</div>
 </template>
 
+<script>
+	export default {
+		name: 'Home',
+		mounted() {
+			mui('body').on('tap', '.kfz', function() {
+				mui.toast('开发中');
+			});
+		}
+	}
+</script>
+
 <style lang="scss">
 	#app {
 		font-family: Avenir, Helvetica, Arial, sans-serif;
 		-webkit-font-smoothing: antialiased;
 		-moz-osx-font-smoothing: grayscale;
 	}
+
+	.kfz,
+	.kfz span,
+	.kfz p,
+	.kfz div {
+		color: #ddd !important;
+	}
 </style>

+ 0 - 28
src/projects/business/utils/request.js

@@ -26,34 +26,6 @@ const service = axios.create({
 service.interceptors.request.use(config => {
 	let Authorization = getToken() ? getToken() : '';
 	config.headers['Authorization'] = Authorization;
-
-	//传递公共参数
-	if (config.method == 'post') {
-		if (typeof(config.data) == 'string') {
-			config.data = Qs.stringify({
-				...Qs.parse(config.data),
-				openId: getOpenId(),
-			})
-		} else {
-			config.data = {
-				...config.data,
-				openId: getOpenId(),
-			}
-		}
-	} else if (config.method == 'get') {
-		if (typeof(config.data) == 'string') {
-			config.params = Qs.stringify({
-				openId: getOpenId(),
-				...Qs.parse(config.params)
-			})
-		} else {
-			config.params = {
-				openId: getOpenId(),
-				...config.params
-			}
-		}
-	}
-
 	return config;
 }, error => {
 	//对请求错误处理

+ 2 - 1
src/projects/business/views/Common/Notice/Home.vue

@@ -49,12 +49,13 @@
 					pageIndex: 1,
 					pageSize: 20,
 					totalPage: 1,
+					openId: '',
 				},
 				recordList: [],
 			}
 		},
 		created() {
-
+			this.listForm.openId = this.openId;
 		},
 		methods: {
 			//获取列表

+ 7 - 7
src/projects/business/views/Master/Center.vue

@@ -22,42 +22,42 @@
 				</div>
 			</div>
 			<div class="vongi-me-list">
-				<ul class="mui-table-view mui-table-view-chevron vongi-news">
+				<ul class="mui-table-view mui-table-view-chevron vongi-news kfz">
 					<li class="mui-table-view-cell">
 						<a href="" class="mui-navigate-right">
 							<img src="~$project/assets/img/cicon23.png" width="18" /> 携出申请审核
 						</a>
 					</li>
 				</ul>
-				<ul class="mui-table-view mui-table-view-chevron vongi-news">
+				<ul class="mui-table-view mui-table-view-chevron vongi-news kfz">
 					<li class="mui-table-view-cell">
 						<a href="" class="mui-navigate-right">
 							<img src="~$project/assets/img/cicon32.png" width="18" /> 园区账单
 						</a>
 					</li>
 					<li class="mui-table-view-cell">
-						<a href="" class="mui-navigate-right">
+						<a href="" class="mui-navigate-right kfz">
 							<img src="~$project/assets/img/cicon07.png" width="18" /> 我的订单
 						</a>
 					</li>
 				</ul>
 				<ul class="mui-table-view mui-table-view-chevron vongi-news">
 					<li class="mui-table-view-cell">
-						<a href="" class="mui-navigate-right">
+						<a href="tel:4008899619" class="mui-navigate-right">
 							<img src="~$project/assets/img/cicon33.png" width="18" /> 客服热线
 							<span>400-8899-619</span>
 						</a>
 					</li>
 					<li class="mui-table-view-cell">
-						<a href="" class="mui-navigate-right">
+						<a href="../home/#/role" class="mui-navigate-right">
 							<img src="~$project/assets/img/cicon17.png" width="18" /> 切换身份
 						</a>
 					</li>
-					<li class="mui-table-view-cell">
+					<!-- <li class="mui-table-view-cell">
 						<a href="" class="mui-navigate-right">
 							<img src="~$project/assets/img/exit.png" width="18" /> 退出帐号
 						</a>
-					</li>
+					</li> -->
 				</ul>
 			</div>
 		</div>

+ 10 - 4
src/projects/business/views/Master/EditInfo.vue

@@ -10,7 +10,7 @@
 						<label style="width: 40%">人脸识别照片</label>
 						<button @click="chooseImage('faceImageUrl') " class="mui-btn mui-btn-block mui-navigate-right" type="button"
 						 style="width: 60%">
-							<img :src="person_data.faceImageUrl" />
+							<img :src="subForm.faceImageUrl" />
 						</button>
 					</div>
 					<div class="mui-input-row">
@@ -69,6 +69,7 @@
 					idCard: '',
 					faceImageUrl: '',
 					wechatNoticeEnabled: true,
+					openId: '',
 				},
 
 				imgBase64: ''
@@ -77,7 +78,9 @@
 		created() {
 			this.subForm.name = this.person_data.name;
 			this.subForm.phone = this.person_data.phone;
-			this.subForm.idCard = this.person_data.idCard
+			this.subForm.idCard = this.person_data.idCard;
+			this.subForm.faceImageUrl = this.person_data.faceImageUrl;
+			this.subForm.openId = this.openId;
 		},
 		methods: {
 			//保存
@@ -148,20 +151,23 @@
 				});
 			},
 			//上传图片
-			uploadpic() {
+			uploadpic(field) {
 				this.isLoading = true;
 				var _this = this;
 				var formData = new FormData();
 				formData.append('photoName', '1.jpg');
 				formData.append('photoBase64Data', this.imgBase64);
 
+				console.log(formData);
+				console.log(typeof formData);
+
 				API_Common.uploadBase64(formData).then(response => {
 					this.isLoading = false;
 
 					this.subForm[field] = response;
 				}).catch(error => {
 					this.isLoading = false;
-					this.mui.toast(error);
+					mui.toast(error);
 				})
 			},
 			asynCallBack() {

+ 25 - 25
src/projects/business/views/Master/Home.vue

@@ -7,25 +7,25 @@
 			<div class="vongi-icons">
 				<ul class="mui-table-view mui-grid-view mui-grid-9 vongi-grid-head">
 					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<a href="#">
+						<a href="javascript:void(0)">
 							<img src="~$project/assets/img/icon54.png" />
 							<div class="mui-media-body">健康证</div>
 						</a>
 					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<a href="#">
+						<a href="javascript:void(0)">
 							<img src="~$project/assets/img/icon41.png" />
-							<div class="mui-media-body">健康证</div>
+							<div class="mui-media-body">测温记录</div>
 						</a>
 					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<a href="#">
+						<a href="javascript:void(0)">
 							<img src="~$project/assets/img/icon39.png" />
 							<div class="mui-media-body">考勤记录</div>
 						</a>
 					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<a href="#">
+					<li class="mui-table-view-cell mui-media mui-col-xs-3 kfz">
+						<a href="javascript:void(0)">
 							<img src="~$project/assets/img/icon.png" />
 							<div class="mui-media-body">请假</div>
 						</a>
@@ -33,49 +33,49 @@
 				</ul>
 				<ul class="mui-table-view mui-grid-view mui-grid-9">
 					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<a href="#">
+						<a href="javascript:void(0)">
 							<img src="~$project/assets/img/cicon19.png" />
 							<div class="mui-media-body">疫情上报</div>
 						</a>
 					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<a href="#">
+					<li class="mui-table-view-cell mui-media mui-col-xs-3 kfz">
+						<a href="javascript:void(0)">
 							<img src="~$project/assets/img/cicon10.png" />
 							<div class="mui-media-body">访客审批</div>
 						</a>
 					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<a href="#">
+					<li class="mui-table-view-cell mui-media mui-col-xs-3 kfz">
+						<a href="javascript:void(0)">
 							<img src="~$project/assets/img/cicon01.png" />
 							<div class="mui-media-body">携物出厂</div>
 						</a>
 					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<a href="#">
+					<li class="mui-table-view-cell mui-media mui-col-xs-3 kfz">
+						<a href="javascript:void(0)">
 							<img src="~$project/assets/img/cicon27.png" />
 							<div class="mui-media-body">每周菜谱</div>
 						</a>
 					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<a href="#">
+						<a href="javascript:void(0)">
 							<img src="~$project/assets/img/cicon04.png" />
 							<div class="mui-media-body">申请补卡</div>
 						</a>
 					</li>
 					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<a href="#">
+						<a href="javascript:void(0)">
 							<img src="~$project/assets/img/cicon05.png" />
 							<div class="mui-media-body">异地打卡</div>
 						</a>
 					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<a href="#">
+					<li class="mui-table-view-cell mui-media mui-col-xs-3 kfz">
+						<a href="javascript:void(0)">
 							<img src="~$project/assets/img/cicon22.png" />
 							<div class="mui-media-body">用车申请</div>
 						</a>
 					</li>
-					<li class="mui-table-view-cell mui-media mui-col-xs-3">
-						<a href="#">
+					<li class="mui-table-view-cell mui-media mui-col-xs-3 kfz">
+						<a href="javascript:void(0)">
 							<img src="~$project/assets/img/cicon30.png" />
 							<div class="mui-media-body">全部</div>
 						</a>
@@ -119,13 +119,13 @@
 						<div class="mui-slider-group">
 							<!-- 第一张 -->
 							<div class="mui-slider-item">
-								<a href="#">
+								<a href="javascript:void(0)">
 									<img src="~$project/assets/img/02.jpg">
 								</a>
 							</div>
 							<!-- 第二张 -->
 							<div class="mui-slider-item">
-								<a href="#">
+								<a href="javascript:void(0)">
 									<img src="~$project/assets/img/02.jpg">
 								</a>
 							</div>
@@ -137,27 +137,27 @@
 					</div>
 				</div>
 			</div>
-			<div class="vongi-index-floor">
+			<div class="vongi-index-floor kfz">
 				<h4 class="vongi-floor-title">优品推荐</h4>
 				<div class="vongi-index-inter flew-sp">
 					<div class="mui-col-xs-12">
 						<ul class="mui-table-view mui-grid-view mui-grid-9 vongi-floor-padded">
 							<li class="mui-table-view-cell mui-media mui-col-xs-4">
-								<a href="#">
+								<a href="javascript:void(0)">
 									<div class="vongi-shop-img"><img src="~$project/assets/img/01.png" width="100%" /></div>
 									<div class="mui-media-body">老人防丢手环</div>
 									<div class="mui-media-body color-yellow">¥299.0</div>
 								</a>
 							</li>
 							<li class="mui-table-view-cell mui-media mui-col-xs-4">
-								<a href="#">
+								<a href="javascript:void(0)">
 									<div class="vongi-shop-img"><img src="~$project/assets/img/01.png" width="100%" /></div>
 									<div class="mui-media-body">老人防丢手环</div>
 									<div class="mui-media-body color-yellow">¥299.0</div>
 								</a>
 							</li>
 							<li class="mui-table-view-cell mui-media mui-col-xs-4">
-								<a href="#">
+								<a href="javascript:void(0)">
 									<div class="vongi-shop-img"><img src="~$project/assets/img/01.png" width="100%" /></div>
 									<div class="mui-media-body">老人防丢手环</div>
 									<div class="mui-media-body color-yellow">¥299.0</div>

+ 3 - 3
src/projects/business/views/Master/Message.vue

@@ -17,7 +17,7 @@
 				</li>
 			</ul>
 			<ul class="mui-table-view vongi-news">
-				<li class="mui-table-view-cell mui-media">
+				<li class="mui-table-view-cell mui-media kfz">
 					<a href="javascript:;">
 						<img class="mui-media-object mui-pull-left" src="~$project/assets/img/kaoqin1.png">
 						<div class="mui-media-body">
@@ -26,7 +26,7 @@
 						</div>
 					</a>
 				</li>
-				<li class="mui-table-view-cell mui-media">
+				<li class="mui-table-view-cell mui-media kfz">
 					<a href="javascript:;">
 						<img class="mui-media-object mui-pull-left" src="~$project/assets/img/audit1.png">
 						<div class="mui-media-body">
@@ -35,7 +35,7 @@
 						</div>
 					</a>
 				</li>
-				<li class="mui-table-view-cell mui-media">
+				<li class="mui-table-view-cell mui-media kfz">
 					<a href="javascript:;">
 						<img class="mui-media-object mui-pull-left" src="~$project/assets/img/home1.png">
 						<div class="mui-media-body">

+ 0 - 28
src/utils/request.js

@@ -26,34 +26,6 @@ const service = axios.create({
 service.interceptors.request.use(config => {
 	let Authorization = getToken() ? getToken() : '';
 	config.headers['Authorization'] = Authorization;
-
-	//传递公共参数
-	if (config.method == 'post') {
-		if (typeof(config.data) == 'string') {
-			config.data = Qs.stringify({
-				...Qs.parse(config.data),
-				openId: getOpenId(),
-			})
-		} else {
-			config.data = {
-				...config.data,
-				openId: getOpenId(),
-			}
-		}
-	} else if (config.method == 'get') {
-		if (typeof(config.data) == 'string') {
-			config.params = Qs.stringify({
-				openId: getOpenId(),
-				...Qs.parse(config.params)
-			})
-		} else {
-			config.params = {
-				openId: getOpenId(),
-				...config.params
-			}
-		}
-	}
-
 	return config;
 }, error => {
 	//对请求错误处理