From 2968bbc44d7c2f3952a6839c8f006e202a3e6539 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 20 Mar 2023 17:33:33 +0800
Subject: [PATCH] upup

---
 manifest.json          |   2 +-
 pages/bd/mine.vue      | 186 +++++++++++++++++++++++---------
 pages/bd/record.vue    | 240 +++++++++++++++++++++++++----------------
 pages/index/index.vue  |  17 +--
 pages/index/login.vue  |  71 +++++++++---
 pages/visit/detail.vue | 161 +++++++++++++++++----------
 static/css/bd.css      |   7 +-
 utils/util.js          |  17 +--
 8 files changed, 479 insertions(+), 222 deletions(-)

diff --git a/manifest.json b/manifest.json
index a1ade3b..5abab88 100644
--- a/manifest.json
+++ b/manifest.json
@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxd7b6631f1d3bc6bd",
+        "appid" : "wx35190cc07e73eda1",
         "setting" : {
             "urlCheck" : false,
             "minified" : false
diff --git a/pages/bd/mine.vue b/pages/bd/mine.vue
index f2b5b6c..10a8c76 100644
--- a/pages/bd/mine.vue
+++ b/pages/bd/mine.vue
@@ -7,7 +7,7 @@
 						Hi ~ {{userName}}
 					</view>
 					<view>
-						www.bd.@mail.com
+						{{userEmail}}
 					</view>
 				</view>
 				<u--image :src="logo" width="164rpx" height="65rpx"></u--image>
@@ -33,60 +33,63 @@
 			</view>
 			<view class="db">
 				<view>待办</view>
+
 				<view class="dblist">
 					<view>
-						<view  v-for="(item, index) in iconList" :key="index">
-							<view class="dbitem" @click="toDetail">
-								<text class="dbtype">普通访客</text>
-								<view class="dbstatus bm">
-									<view>待审核</view>
-									<view>
-										<text>访问时间 2023-03-06</text>
-										<text>10:00至11:00</text>
-									</view>
-								</view>
-								<view class="dbinfo justify-left">
-									<view>
-										<view>被访人：<text>章三</text></view>
-										<view>被访人部门：<text>生产</text></view>
-										<view>长期访客申请：<text>是</text></view>
-									</view>
-									<view>
-										<view>访问区域：<text>章三</text></view>
-										<view>拜访人：<text>生产</text></view>
-										<view>事由：<text>是</text></view>
-									</view>
-								</view>
+						<view v-for="(item, index) in list" :key="index">
+							<view class="dbitem" @click="toDetail(item.id)">
+								<text class="dbtype">{{item.type_text}}</text>
+								<view class="dbstatus bm">
+									<view>{{item.audit_status_text}}</view>
+									<view>
+										<text style="margin-right:10px">访问时间：{{item.date}}</text>
+										<text>{{item.visit_time.start_time}}至{{item.visit_time.end_time}}</text>
+									</view>
+								</view>
+								<view class="dbinfo justify-left">
+									<view>
+										<view>被访人：<text>{{item.accept_admin_id}}</text></view>
+										<view>部门：<text>生产</text></view>
+										<view>访问区域：<text>{{item.visit_area_id}}</text></view>
+									</view>
+									<view>
+										<view>拜访人：<text>{{item.name}}</text></view>
+										<view>电话：{{item.mobile}}</view>
+										<view v-if="item.type=='1'">事由：<text>{{item.reason}}</text></view>
+										<view v-else-if="item.type=='3'">车牌：<text>{{item.plate}}</text></view>
+									</view>
+								</view>
 								<view class="dblong">
-									长期访问时间：2023-01-01 至 2023-12-31
-								</view>
+									<view>长期访客申请：<text>{{item.long_time==0?'否':'是'}}</text></view>
+									<text v-if="item.long_time==1">长期访问时间：{{item.start_date}} 至 {{item.end_date}}</text>
+								</view>
 							</view>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-
 	</view>
 </template>
 
-<script>
+<script>
 	import '@/static/css/bd.css'
 	export default {
 		data() {
 			return {
-				userName: "12333",
+				userName: "",
+				userEmail: "",
 				logo: require("../../static/img/logo.png"),
 				searchlogo: require("../../static/img/search.png"),
 				iconList: [{
 						src: require("../../static/img/wdsh.png"),
 						text: '我的审核',
-						url: "/pages/bd/check"
+						url: "/pages/bd/record?type=mycheck"
 					},
 					{
 						src: require("../../static/img/bfjl.png"),
 						text: '被访记录',
-						url: "/pages/bd/record"
+						url: "/pages/bd/record?type=myrecord"
 					},
 					{
 						src: require("../../static/img/yy.png"),
@@ -98,27 +101,114 @@
 						text: '代邀约记录',
 						url: "/pages/bd/replace"
 					}
-				],
-				data:[],
+				],
+				list: [],
+				select: {
+					page: 1,
+					page_size: 5,
+					total: 0,
+					audit_status:0,
+					keyword:""
+				}
 			}
 		},
 		onLoad() {
-
+			this.getBdInfo()
+			this.loadList()
+		},
+		onPullDownRefresh() {
+			this.select.page = 1
+			this.loadList()
+			uni.stopPullDownRefresh();
+		},
+		//上拉加载
+		onReachBottom() {
+			//当当前列表数据长度>=数据总长度时
+			if (this.list.length >= this.select.total) {
+				//提示
+				uni.showToast({
+					title: '没有更多了',
+					duration: 1000,
+					icon: 'none'
+				})
+			} else {
+				//否则，页码+1，继续请求列表
+				this.select.page++
+				this.loadList()
+			}
 		},
-		methods: {
-			toUrl(url){
-				uni.navigateTo({
-					url:url
-				})
-			},
-			toDetail(){
-				uni.navigateTo({
-					url:'/pages/visit/detail'
-				})
+		methods: {
+			toUrl(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
+			toDetail(id) {
+				uni.navigateTo({
+					url: '/pages/visit/detail?id=' + id
+				})
 			},
-			searchList(val) {},
-			// scrolltolower(){},
-			
+			getBdInfo() {
+				let that = this
+				this.util.request({
+					api: '/api/admin/auth/me',
+					method: "POST",
+					utilSuccess: function(res) {
+						console.log(res)
+						that.userName = res.name
+						that.userEmail = res.email
+						uni.showToast({
+							title: res.errmsg,
+							duration: 2000,
+							icon: 'none'
+						})
+					},
+					utilFail: function(res) {
+						uni.showToast({
+							title: res.errmsg,
+							duration: 2000,
+							icon: 'none'
+						})
+					}
+				})
+
+			},
+			loadList() {
+				let that = this
+				this.util.request({
+					api: '/api/admin/visit/index',
+					method: "get",
+					data: {
+						page: this.select.page,
+						page_size: this.select.page_size,
+						audit_status:this.select.audit_status,
+						keyword:this.select.keyword
+					},
+					utilSuccess: function(res) {
+						if (that.select.page == 1) {
+							that.list = res.data
+						} else {
+							that.list.push(...res.data)
+						}
+						that.select.total = res.total
+
+					},
+					utilFail: function(res) {
+						uni.showToast({
+							title: res.errmsg,
+							duration: 2000,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			searchList(val) {
+				this.select.keyword = val
+				this.select.page = 1
+				this.loadList()
+			},
+			// scrolltolower(){},
+
 		}
 	}
 </script>
@@ -181,7 +271,5 @@
 	.mine .icontext {
 		text-align: center;
 		margin-top: 15rpx
-	}
-	
-	
+	}
 </style>
diff --git a/pages/bd/record.vue b/pages/bd/record.vue
index 8f369c1..9c717ab 100644
--- a/pages/bd/record.vue
+++ b/pages/bd/record.vue
@@ -1,92 +1,148 @@
-<template>
-	<view class="containers">
-		<view class="dbbtns justify-between">
-			<text v-for="item in btnList" :class="{'active':btnActive===item.value}" @click="btnActive=item.value">
-			{{item.label}}
-			</text>
-			<!-- <text >已完成</text>
-			<text>待完成</text> -->
-		</view>
-		<view class="db">
-			<view class="dblist">
-					<view>
-						<view  v-for="(item, index) in iconList" :key="index">
-							<view class="dbitem" @click="toDetail">
-								<text class="dbtype">普通访客</text>
-								<view class="dbstatus bm">
-									<view>待审核</view>
-									<view>
-										<text>访问时间 2023-03-06</text>
-										<text>10:00至11:00</text>
-									</view>
-								</view>
-								<view class="dbinfo justify-left">
-									<view>
-										<view>被访人：<text>章三</text></view>
-										<view>被访人部门：<text>生产</text></view>
-										<view>长期访客申请：<text>是</text></view>
-									</view>
-									<view>
-										<view>访问区域：<text>章三</text></view>
-										<view>拜访人：<text>生产</text></view>
-										<view>事由：<text>是</text></view>
-									</view>
-								</view>
-								<view class="dblong">
-									长期访问时间：2023-01-01 至 2023-12-31
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			
-		</view>
-		
-		
-		
-	</view>
-</template>
-
-<script>
-	import '@/static/css/bd.css'
-	export default{
-		data(){
-			return{
-				iconList:[1,2,3,4],
-				btnActive:"all",
-				btnList:[
-					{
-						label:"全部",
-						value:'all'
-					},
-					{
-						label:"已完成",
-						value:'complete'
-					},
-					{
-						label:"待完成",
-						value:'going'
-					}
-				]
-			}
-		},
-		onLoad(){
-			
-		},
-		methods:{
-			toDetail(){
-				uni.navigateTo({
-					url:'/pages/visit/detail'
-				})
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	.containers{
-		background-color: #eceefe;
-		min-height: 100vh;
-		/* padding-top:20rpx; */
-	}
-</style>
\ No newline at end of file
+<template>
+	<view class="containers">
+		<view class="dbbtns justify-between">
+			<text v-for="item in btnList" :class="{'active':btnActive===item.value}" @click="btnActive=item.value">
+				{{item.label}}
+			</text>
+			<!-- <text >已完成</text>
+			<text>待完成</text> -->
+		</view>
+		<view class="db">
+			<view class="dblist">
+				<view>
+					<view v-for="(item, index) in list" :key="index">
+						<view class="dbitem" @click="toDetail(item.id)">
+							<text class="dbtype">{{item.type_text}}</text>
+							<view class="dbstatus bm">
+								<view>{{item.audit_status_text}}</view>
+								<view>
+									<text style="margin-right:10px">访问时间：{{item.date}}</text>
+									<text>{{item.visit_time.start_time}}至{{item.visit_time.end_time}}</text>
+								</view>
+							</view>
+							<view class="dbinfo justify-left">
+								<view>
+									<view>被访人：<text>{{item.accept_admin_id}}</text></view>
+									<view>部门：<text>生产</text></view>
+									<view>访问区域：<text>{{item.visit_area_id}}</text></view>
+								</view>
+								<view>
+									<view>拜访人：<text>{{item.name}}</text></view>
+									<view>电话：{{item.mobile}}</view>
+									<view v-if="item.type=='1'">事由：<text>{{item.reason}}</text></view>
+									<view v-else-if="item.type=='3'">车牌：<text>{{item.plate}}</text></view>
+								</view>
+							</view>
+							<view class="dblong">
+								<view>长期访客申请：<text>{{item.long_time==0?'否':'是'}}</text></view>
+								<text v-if="item.long_time==1">长期访问时间：{{item.start_date}} 至 {{item.end_date}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+		</view>
+
+
+
+	</view>
+</template>
+
+<script>
+	import '@/static/css/bd.css'
+	export default {
+		data() {
+			return {
+				btnActive: "all",
+				btnList: [{
+						label: "全部",
+						value: 'all'
+					},
+					{
+						label: "已完成",
+						value: 'complete'
+					},
+					{
+						label: "待完成",
+						value: 'going'
+					}
+				],
+				list: [],
+				select: {
+					page: 1,
+					page_size: 5,
+					total: 0,
+					audit_status: 0
+				}
+			}
+		},
+		onLoad() {
+			this.loadList()
+		},
+		onPullDownRefresh() {
+			this.select.page = 1
+			this.loadList()
+			uni.stopPullDownRefresh();
+		},
+		//上拉加载
+		onReachBottom() {
+			//当当前列表数据长度>=数据总长度时
+			if (this.list.length >= this.select.total) {
+				//提示
+				uni.showToast({
+					title: '没有更多了',
+					duration: 1000,
+					icon: 'none'
+				})
+			} else {
+				//否则，页码+1，继续请求列表
+				this.select.page++
+				this.loadList()
+			}
+		},
+		methods: {
+			toDetail() {
+				uni.navigateTo({
+					url: '/pages/visit/detail'
+				})
+			},
+			loadList() {
+				let that = this
+				this.util.request({
+					api: '/api/admin/visit/index',
+					method: "get",
+					data: {
+						page: this.select.page,
+						page_size: this.select.page_size,
+						audit_status: this.select.audit_status
+					},
+					utilSuccess: function(res) {
+						if (that.select.page == 1) {
+							that.list = res.data
+						} else {
+							that.list.push(...res.data)
+						}
+						that.select.total = res.total
+
+					},
+					utilFail: function(res) {
+						uni.showToast({
+							title: res.errmsg,
+							duration: 2000,
+							icon: 'none'
+						})
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.containers {
+		background-color: #eceefe;
+		min-height: 100vh;
+		/* padding-top:20rpx; */
+	}
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index acdb5a3..bbd99e3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -29,13 +29,13 @@
 				wlcl: require('../../static/img/wlcl1.png'),
 				sgry: require('../../static/img/sgry1.png'),
 				bdgl: require('../../static/img/bdgl.png'),
-				winHeight: 0
+				winHeight: 0,
+				isBd:""
 			}
 		},
 		onLoad() {
-			console.log(uni.getSystemInfoSync().statusBarHeight)
-			this.winHeight = uni.getSystemInfoSync().screenHeight - uni.getSystemInfoSync().statusBarHeight * 2-20;
-			console.log(this.winHeight)
+			this.winHeight = uni.getSystemInfoSync().screenHeight - uni.getSystemInfoSync().statusBarHeight * 2-20;
+			this.isBd = uni.getStorageSync("userInfo_BD_token").token
 		},
 		methods: {
 			toUrl(type) {
@@ -51,8 +51,13 @@
 						url = "/pages/visit/addrecord?type=3"
 						// url = "/pages/visit/study?type=3"
 						break;
-					case 4:
-						url = "/pages/index/login"
+					case 4:
+						if(!this.util.isNull(this.isBd)){
+							url = "/pages/bd/mine"
+						}else{
+							url = "/pages/index/login"
+						}
+						
 						break;
 				}
 				console.log(url)
diff --git a/pages/index/login.vue b/pages/index/login.vue
index 35761ad..dec05ff 100644
--- a/pages/index/login.vue
+++ b/pages/index/login.vue
@@ -4,19 +4,20 @@
 			<view>
 				<u--image :showLoading="true" :src="logo" width="336rpx" height="336rpx"></u--image>
 			</view>
-		</view>
-		<view class="login">
-			<u--form labelPosition="top" :labelStyle="labelStyle" :labelWidth="'auto'" :model="form" :rules="rules" ref="form">
-				<u-form-item label="用户名" prop="form.name"  ref="item1">
-					<u--input v-model="form.name" border="bottom" placeholder="请输入用户名"></u--input>
-				</u-form-item>
-				<u-form-item label="密码" prop="form.password" ref="item1">
-					<u--input type="password" v-model="form.password" border="bottom" placeholder="请输入密码"></u--input>
-				</u-form-item>
+		</view>
+		
+		<view class="login">
+			<uni-forms ref="formdata" :model="form" :border="true" :rules="rules" labelWidth="100px" label-position="top">
+				<uni-forms-item label="用户名" name="name">
+					<uni-easyinput :inputBorder="false" v-model="form.name" placeholder="请输入用户名" />
+				</uni-forms-item>
+				<uni-forms-item label="密码" name="password">
+					<uni-easyinput :inputBorder="false" type="password" v-model="form.password" placeholder="请输入密码" />
+				</uni-forms-item>
+			</uni-forms>
 				<view class="sbtn">
 					<u-button type="primary" size="large" @click="submit">登录</u-button>
 				</view>
-			</u--form>
 		</view>
 	</view>
 </template>
@@ -28,7 +29,20 @@
 				logo: require("../../static/img/bdlogo.png"),
 				winHeight: 0,
 				form: {},
-				rules: {},
+				rules: {
+					name: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入用户名'
+						}]
+					},
+					password: {
+						rules: [{
+							required: true,
+							errorMessage: '请输入密码'
+						}]
+					}
+				},
 				labelStyle:{
 					fontSize:'12px',
 					color:"#ccc"
@@ -41,9 +55,40 @@
 		methods: {
 			
 			submit(){
-				uni.navigateTo({
-					url:"/pages/bd/mine"
+				let that = this
+				this.$refs['formdata'].validate().then(res => {
+					this.util.request({
+						api: '/api/admin/auth/login',
+						data: {
+							username:this.form.name,
+							password:this.form.password
+						},
+						method:'POST',
+						utilSuccess: function(res) {
+							console.log(res)
+							uni.setStorageSync("userInfo_BD_token", {
+								token:res.access_token
+							})
+							uni.showToast({
+								title:"登录成功",
+								success() {
+									uni.navigateTo({
+										url:"/pages/bd/mine"
+									})
+								}
+							})
+						},
+						utilFail: function(res) {}
+					})
+				}).catch(err => {
+					console.log('err', err);
 				})
+				
+				
+				
+				// uni.navigateTo({
+				// 	url:"/pages/bd/mine"
+				// })
 			}
 		}
 	}
diff --git a/pages/visit/detail.vue b/pages/visit/detail.vue
index feb3105..35eecf7 100644
--- a/pages/visit/detail.vue
+++ b/pages/visit/detail.vue
@@ -4,67 +4,86 @@
 			<view class="dblist">
 				<view>
 					<view class="dbitem">
-						<text class="dbtype">普通访客</text>
+						<text class="dbtype">{{info.type_text}}</text>
 						<view class="dbstatus bm">
-							<view>待审核</view>
+							<view>{{info.audit_status_text}}</view>
 							<view>
-								<text>访问时间 2023-03-06</text>
-								<text>10:00至11:00</text>
-							</view>
-						</view>
-						<view class="dbinfo justify-left">
-							<view>
-								<view>被访人：<text>章三</text></view>
-								<view>被访人部门：<text>生产</text></view>
-								<view>长期访客申请：<text>是</text></view>
-							</view>
-							<view>
-								<view>访问区域：<text>章三</text></view>
-								<view>拜访人：<text>生产</text></view>
-								<view>事由：<text>是</text></view>
-							</view>
-						</view>
-						<view class="dblong">
-							长期访问时间：2023-01-01 至 2023-12-31
+								<text style="margin-right:10px">访问时间：{{info.date}}</text>
+								<text>{{info.visit_time.start_time}}至{{info.visit_time.end_time}}</text>
+							</view>
+							<view v-if="info.type=='2'">施工时段：{{info.work_start_time}}至{{info.work_end_time}}</view>
 						</view>
+						<view class="dbinfo justify-left">
+							<view>
+								<view>被访人：<text>{{info.accept_admin_id}}</text></view>
+								<view>部门：<text>生产</text></view>
+								<view>访问区域：<text>{{info.visit_area_id}}</text></view>
+							</view>
+							<view>
+								<view>拜访人：<text>{{info.name}}</text></view>
+								<view>电话：{{info.mobile}}</view>
+								<view v-if="info.type=='1'">事由：<text>{{info.reason}}</text></view>
+								<view v-else-if="info.type=='3'">车牌：<text>{{info.plate}}</text></view>
+							</view>
+						</view>
+						<view class="dblong">
+							<view>长期访客申请：<text>{{info.long_time==0?'否':'是'}}</text></view>
+							<view v-if="info.long_time==1">长期访问时间：{{info.start_date}} 至 {{info.end_date}}</view>
+						</view>
+						
 					</view>
 				</view>
 			
 				<view class="dbtext">随访人员</view>
 				<view class="dbitem sfyritem">
-					<view class="dbinfo sfry">
-						<view class="justify-between">
+					<template v-if="info.follw_people">
+						<view class="dbinfo justify-left" v-for="people in info.follw_people">
 							<view>
-								被访人：<text>章三</text>
+								<view>
+									随访人：<text>{{people.name}}</text>
+								</view>
+								<view>证件类型：<text>{{people.credent_name}}</text></view>
+								<view>证件号：<text>{{people.idcard}}</text></view>
 							</view>
 							<view>
-								联系电话：<text>18914071203</text>
+								联系电话：<text>{{people.mobile}}</text>
 							</view>
 						</view>
-						<view>证件类型：<text>生产</text></view>
-						<view>证件号：<text>是</text></view>
-					</view>
+					</template>
+					<template>
+						<view class="dbinfo justify-left">
+							无
+						</view>
+					</template>
+					
 				</view>
 				<view class="dbtext">到访车辆</view>
 				<view class="dbitem sfyritem">
-					<view class="dbinfo sfry">
-						<view class="justify-between">
-							<view>
-								车牌：<text>章三</text>
-							</view>
+					<view class="dbinfo">
+						<view class="onechild">
+							车牌：<text>{{info.cars}}</text>
+						</view>
+					</view>
+				</view>
+				<view class="dbtext">收货人</view>
+				<view class="dbitem sfyritem">
+					<view class="dbinfo justify-left">
+						<view>
+							部门：<text>{{info.accpet_department_id}}</text>
+						</view>
+						<view>
+							人员：<text>{{info.accept_goods_admin_id}}</text>
 						</view>
 					</view>
 				</view>
 				<view class="dbtext">被访人员</view>
 				<view class="dbitem sfyritem">
-					<view class="dbinfo sfry">
-						<view class="justify-between">
-							<view>
-								部门：<text>章三</text>
-							</view>
-							<view>
-								人员：<text>18914071203</text>
-							</view>
+					<view class="dbinfo justify-left">
+						<view>
+							部门：<text>{{info.accept_admin_sign}}</text>
+						</view>
+						<view>
+							人员：<text>{{info.accept_admin_id}}</text>
 						</view>
 					</view>
 				</view>
@@ -76,7 +95,54 @@
 </template>
 
 <script>
-	import '@/static/css/bd.css'
+	import '@/static/css/bd.css'
+	export default{
+		data(){
+			return{
+				id:"",
+				info:{}
+			}
+		},
+		onReady() {
+			
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.loadDetail()
+		},
+		methods:{
+			loadDetail(){
+				let that = this
+				this.util.request({
+					api: '/api/admin/visit/show',
+					method: "get",
+					data: {
+						id:that.id
+					},
+					utilSuccess: function(res) {
+						
+						that.info = res
+					},
+					utilFail: function(res) {
+						uni.showToast({
+							title: res.errmsg,
+							duration: 2000,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			isnull(p){
+				if(p == '' || p == undefined || p == null || p == 'undefined' || p == 'null'){
+					return ""
+				}else{
+					return p
+				}
+			}
+		}
+		
+		
+	}
 </script>
 
 <style scoped>
@@ -95,19 +161,6 @@
 	.sfyritem{
 		padding-bottom:10rpx
 	}
-	.sfry{
-		padding-bottom:0
-	}
-	.sfry>view{
-		padding-right:0;
-		padding-bottom:20rpx
-	}
-	.sfry>view:last-child {
-		padding-left:0
-	}
-	.sfry>view view {
-	    padding-bottom: 0rpx;
-	}
 	.dbinfo>view text {
 	    color: #8f9596;
 	}
diff --git a/static/css/bd.css b/static/css/bd.css
index 58acd08..3faa60e 100644
--- a/static/css/bd.css
+++ b/static/css/bd.css
@@ -36,7 +36,8 @@
 		padding:30rpx 0
 	}
 	.dbinfo>view{
-		padding-right:60rpx;
+		/* padding-right:60rpx; */
+		    width: 50%;
 	}
 	.dbinfo>view:first-child{
 		border-right: 1px solid #f0f4f7;
@@ -54,6 +55,10 @@
 	.dbinfo>view view text{
 		color:#8f9596;
 	}
+	.dbinfo view.onechild:first-child{
+		    padding-left: 0;
+		    border-right: none;
+	}
 	.dblong{
 		color:#8f9596;
 		font-size: 30rpx;
diff --git a/utils/util.js b/utils/util.js
index 64a3570..fe80af8 100755
--- a/utils/util.js
+++ b/utils/util.js
@@ -15,7 +15,8 @@ const formatTime = date => {
 	return [year, month, day].map(formatNumber).join('-');
 };
 
-const user_info_key = "userInfo_token";
+const user_info_key = "userInfo_token";
+const userInfo_BD_token = "userInfo_BD_token"
 const user_key = "userInfo";
 
 const getUserInfo = (cb, refresh) => {
@@ -165,16 +166,19 @@ const request = options => {
 	}; // 如果已登录,请求中拼openId
 
 	var access_token = uni.getStorageSync(user_info_key).token;
-
+	var access_token_bd = uni.getStorageSync(userInfo_BD_token).token;
+	
+	var request_token = access_token_bd?access_token_bd:access_token
+	console.log(request_token)
 	if (isLogin()) {
 		options.data = {
 			...options.data,
-			'token': access_token
+			'token': request_token
 		};
 	} // 如果是POST方法
 
 
-	if (options.method == 'POST' && !isNull(access_token)) {
+	if (options.method == 'POST' && !isNull(request_token)) {
 		// 拼时间戳
 		options.data.ts = new Date().getTime();
 	}
@@ -295,8 +299,9 @@ const payOrder = (orderID, orderType, success, fail) => {
 }; // 判断是否已登录（同时有open-id和PhoneNum, 则认为已登录）
 
 const isLogin = () => {
-	var userInfo = uni.getStorageSync(user_info_key);
-	return !isNull(userInfo.token);
+	var userInfo = uni.getStorageSync(user_info_key);
+	var userInfoBDtoken = uni.getStorageSync(userInfo_BD_token);
+	return !isNull(userInfo.token) || !isNull(userInfoBDtoken.token);
 }; // 判断是否为空