From c18d873b428c5cb364de7822dbebf96c3c2fbdb4 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 6 May 2026 15:28:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json               |    8 +-
 pages/index/index.vue       |  117 ++--
 pages/visit/addrecord.vue   |  375 ++++++++++--
 pages/visit/study.vue       |  311 ++++++----
 pages/visit/testStudy.vue   |  340 ++++++-----
 pages/visit/tostudy.vue     |   23 +-
 project.config.json         |    2 +-
 project.private.config.json |    2 +-
 utils/util.js               | 1104 +++++++++++++++++------------------
 9 files changed, 1355 insertions(+), 927 deletions(-)

diff --git a/manifest.json b/manifest.json
index 0a4ea89..94e42b0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
-    "name" : "wx-dangyuanjiaoyujidi",
-    "appid" : "__UNI__FC384E5",
+    "name" : "yxbd",
+    "appid" : "__UNI__2419A31",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -50,8 +50,8 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx35190cc07e73eda1",
-		"__usePrivacyCheck__": true,
+        "appid" : "wxdaa5d65b0714696d",
+        "__usePrivacyCheck__" : true,
         "setting" : {
             "urlCheck" : false,
             "minified" : false
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 21cc119..e3cd7bb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,18 +1,18 @@
 <template>
 	<view class="containers" :style="{'height':winHeight+'px'}">
-		<view class="title justify-between">
-			<text>BD访客</text>
-			<text @click="toUrl(0)" style="color: #f27707;">我的拜访记录</text>
+		<view class="title justify-between">
+			<text>BD访客</text>
+			<text @click="toUrl(0)" style="color: #f27707;">我的拜访记录</text>
 		</view>
 		<view class="bdfk">
 			<!-- <view>
 				<u--image :showLoading="true" :src="ptfk" width="315rpx" height="600rpx" @click="toUrl(1)"></u--image>
-			</view> -->
-			<view class="sgry">
-				<u--image :src="xxpx" width="315rpx" height="280rpx" @click="toUrl(5)"></u--image>
-				<view>
-					<u--image :src="ptfk" width="315rpx" height="280rpx" @click="toUrl(1)"></u--image>
-				</view>
+			</view> -->
+			<view class="sgry">
+				<u--image :src="xxpx" width="315rpx" height="280rpx" @click="toUrl(5)"></u--image>
+				<view>
+					<u--image :src="ptfk" width="315rpx" height="280rpx" @click="toUrl(1)"></u--image>
+				</view>
 			</view>
 			<view class="sgry">
 				<u--image :src="wlcl" width="315rpx" height="280rpx" @click="toUrl(3)"></u--image>
@@ -21,8 +21,11 @@
 				</view>
 			</view>
 		</view>
-		<view class="title  justify-between">
-			<text>BD管理员</text>
+		<view class="vip-entry" @click="toUrl(6)">
+			VIP访客预约入口
+		</view>
+		<view class="title  justify-between">
+			<text>BD管理员</text>
 		</view>
 		<view>
 			<u--image :src="bdgl" width="670rpx" height="336rpx" @click="toUrl(4)"></u--image>
@@ -37,34 +40,34 @@
 			return {
 				ptfk: require('../../static/img/ptfk.png'),
 				wlcl: require('../../static/img/wlcl1.png'),
-				sgry: require('../../static/img/sgry1.png'),
+				sgry: require('../../static/img/sgry1.png'),
 				xxpx: require('../../static/img/xxpx.png'),
 				bdgl: require('../../static/img/bdgl.png'),
-				winHeight: 0,
+				winHeight: 0,
 				isBd:""
 			}
 		},
 		onLoad() {
-			this.winHeight = uni.getSystemInfoSync().screenHeight - uni.getSystemInfoSync().statusBarHeight * 2-20;
+			this.winHeight = uni.getSystemInfoSync().screenHeight - uni.getSystemInfoSync().statusBarHeight * 2-20;
 		
-		},
-		onShow(){
-			this.isBd = uni.getStorageSync("userInfo_BD_token").token
-			console.log("bd",this.isBd)
-		},
-		onShareAppMessage() {
-			return {
-				title: 'BD访客系统',
-				path: '/pages/index/index',
-				// imageUrl: this.logoIndex
-			}
-		},
-		onShareTimeline() {
-			return {
-				title: 'BD访客系统',
-				path: '/pages/index/index',
-				// imageUrl: this.logoIndex
-			}
+		},
+		onShow(){
+			this.isBd = uni.getStorageSync("userInfo_BD_token").token
+			console.log("bd",this.isBd)
+		},
+		onShareAppMessage() {
+			return {
+				title: 'BD访客系统',
+				path: '/pages/index/index',
+				// imageUrl: this.logoIndex
+			}
+		},
+		onShareTimeline() {
+			return {
+				title: 'BD访客系统',
+				path: '/pages/index/index',
+				// imageUrl: this.logoIndex
+			}
 		},
 		methods: {
 			toUrl(type) {
@@ -78,24 +81,27 @@
 						break;
 					case 3:
 						url = "/pages/visit/addrecord?type=3"
-						break;
-					case 0:
-						url = "/pages/visit/visithistory"
-						break;
-					case 5:
-						url = "/pages/visit/tostudy"
 						break;
-					case 4:
-						if(!this.util.isNull(this.isBd)){
-							url = "/pages/bd/mine"
-						}else{
-							url = "/pages/index/login"
+					case 6:
+						url = "/pages/visit/addrecord?type=4"
+						break;
+					case 0:
+						url = "/pages/visit/visithistory"
+						break;
+					case 5:
+						url = "/pages/visit/tostudy"
+						break;
+					case 4:
+						if(!this.util.isNull(this.isBd)){
+							url = "/pages/bd/mine"
+						}else{
+							url = "/pages/index/login"
 						}
 						
 						break;
-				}
-				uni.navigateTo({
-					url:url
+				}
+				uni.navigateTo({
+					url:url
 				})
 			}
 		}
@@ -105,7 +111,7 @@
 <style scoped>
 	.containers {
 		background-color: #044ed7;
-		padding: 0 40rpx;
+		padding: 0 40rpx;
 		padding-bottom:20px;
 	}
 
@@ -115,8 +121,8 @@
 		padding: 40rpx 0;
 		padding-top: 70rpx
 	}
-	.title:first-child{
-		padding-top:30rpx
+	.title:first-child{
+		padding-top:30rpx
 	}
 	.bdfk {
 		display: flex;
@@ -126,4 +132,15 @@
 	.sgry view {
 		margin-top: 40rpx
 	}
-</style>
+	.vip-entry{
+		margin-top: 40rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		border-radius: 12rpx;
+		background: #f27707;
+		color: #fff;
+		text-align: center;
+		font-size: 30rpx;
+		font-weight: 600;
+	}
+</style>
diff --git a/pages/visit/addrecord.vue b/pages/visit/addrecord.vue
index ece39ce..b478390 100644
--- a/pages/visit/addrecord.vue
+++ b/pages/visit/addrecord.vue
@@ -1,6 +1,21 @@
 <template>
 	<page-meta :page-style="'overflow:'+(adminListShow||configshow||areaShow?'hidden':'visible')"></page-meta>
 	<view class="containers">
+		<!-- VIP：先核验名单内姓名+手机号 -->
+		<view v-if="form.type==4 && !vipGatePassed" class="vip-gate-wrap">
+			<view class="formtext">VIP 访客身份核验</view>
+			<view class="vip-gate-tip">请填写与后台 VIP 客户名单中一致的姓名与手机号</view>
+			<uni-forms labelWidth="100px">
+				<uni-forms-item label="姓名" required>
+					<uni-easyinput v-model="vipGateForm.name" placeholder="请输入姓名" />
+				</uni-forms-item>
+				<uni-forms-item label="联系电话" required>
+					<uni-easyinput v-model="vipGateForm.mobile" placeholder="请输入手机号" type="number" maxlength="11" />
+				</uni-forms-item>
+			</uni-forms>
+			<button type="primary" style="background-color: #044ed7; margin-top: 24rpx;" @click="submitVipGate">验证并继续</button>
+		</view>
+		<block v-else>
 		<!-- 拜访须知 -->
 		<u-popup :show="configshow" :mask-close-able="false" class="configwrap" mode="bottom">
 			<view class="configtitle">
@@ -9,11 +24,11 @@
 			<view class="configvalue">
 				<view v-html="configInfo.value">
 
-				</view>
-				<view style="text-align: center;">
-					<view class="configbtn" @click="closeConfig">
-						确认
-					</view>
+				</view>
+				<view style="text-align: center;">
+					<view class="configbtn" @click="closeConfig">
+						确认
+					</view>
 				</view>
 				
 			</view>
@@ -56,7 +71,7 @@
 				<uni-data-checkbox @change='changeVisitArea' v-model="form.visit_area_id" :localdata="visitArea"
 					:map="{text:'name',value:'id'}" />
 			</uni-forms-item>
-			<uni-forms-item label="到访事由" v-if="form.type==1">
+			<uni-forms-item label="到访事由" v-if="form.type==1||form.type==4">
 				<uni-data-select v-model="form.reason" :localdata="reasonList">
 				</uni-data-select>
 			</uni-forms-item>
@@ -75,12 +90,15 @@
 			<uni-forms-item label="备注">
 				<uni-easyinput type="textarea" v-model="form.remark" placeholder="请输入自我备注" />
 			</uni-forms-item>
-			<view class="formtext">拜访人信息</view>
+			<view class="formtext formtext-flex">
+				<text>拜访人信息</text>
+				<button v-if="form.type!=4" class="history-btn" type="primary" size="mini" @click="fillLatestVisitorInfo">拉取过往信息</button>
+			</view>
 			<uni-forms-item label="姓名" required name="name">
-				<uni-easyinput v-model="form.name" placeholder="请输入姓名" />
+				<uni-easyinput v-model="form.name" placeholder="请输入姓名" :disabled="form.type==4 && vipGatePassed" />
 			</uni-forms-item>
 			<uni-forms-item label="联系电话" required name="mobile">
-				<uni-easyinput v-model="form.mobile" placeholder="请输入联系电话" />
+				<uni-easyinput v-model="form.mobile" placeholder="请输入联系电话" :disabled="form.type==4 && vipGatePassed" />
 			</uni-forms-item>
 			<uni-forms-item label="证件类型" required name="credent">
 				<uni-data-select v-model="form.credent" :localdata="credentList">
@@ -95,7 +113,7 @@
 			<uni-forms-item label="单位名称" required name="company_name">
 				<uni-easyinput v-model="form.company_name" placeholder="请输入单位名称" />
 			</uni-forms-item>
-			<uni-forms-item label="CDA编号" required name="cda" v-if="form.type==1&&visitAreaText=='生产区'">
+			<uni-forms-item label="CDA编号" required name="cda" v-if="(form.type==1||form.type==4)&&visitAreaText=='生产区'">
 				<uni-easyinput type='textarea' v-model="form.cda" placeholder="请输入CDA编号(如无注明原因)" />
 			</uni-forms-item>
 			<uni-forms-item label="到访车辆" v-if="form.type!=3">
@@ -176,8 +194,8 @@
 					<uni-datetime-picker type="date" :start="toadyStart" return-type="string" v-model="form.end_date" />
 				</uni-forms-item>
 			</template> -->
-			<view class="formtext" v-if="form.type==1||form.type==2">被访人信息</view>
-			<uni-forms-item label="被访人" required name="acceptName" v-if="form.type==1||form.type==2">
+			<view class="formtext" v-if="form.type==1||form.type==2||form.type==4">被访人信息</view>
+			<uni-forms-item label="被访人" required name="acceptName" v-if="form.type==1||form.type==2||form.type==4">
 				<uni-easyinput @clear="clearAccept('accept')" disabled v-model="form.acceptName"
 					@tap="adminListShowOpen('accept')" placeholder="请选择联系人员" />
 			</uni-forms-item>
@@ -186,12 +204,12 @@
 			<uni-forms-item label="收货人" v-if="form.type==3" required name="goodsName">
 				<uni-easyinput @clear="clearAccept('goods')" disabled v-model="form.goodsName"
 					@tap="adminListShowOpen('goods')" placeholder="请选择联系人员" />
-			</uni-forms-item>
-			
-			<view class="formtext" v-if="visitAreaText=='生产区'">陪同人信息</view>
-			<uni-forms-item label="陪同人" required name="accompanyName" v-if="visitAreaText=='生产区'">
-				<uni-easyinput @clear="clearAccept('accompany')" disabled v-model="form.accompanyName"
-					@tap="adminListShowOpen('accompany')" placeholder="请选择联系人员" />
+			</uni-forms-item>
+			
+			<view class="formtext" v-if="visitAreaText=='生产区'">陪同人信息</view>
+			<uni-forms-item label="陪同人" required name="accompanyName" v-if="visitAreaText=='生产区'">
+				<uni-easyinput @clear="clearAccept('accompany')" disabled v-model="form.accompanyName"
+					@tap="adminListShowOpen('accompany')" placeholder="请选择联系人员" />
 			</uni-forms-item>
 			<qianziyu-select :show="adminListShow" type="radio" :popupTitle="'联系人员'" name="cworkStationName"
 				:dataLists="adminList" placeholder="输入陪同人具体姓名或手机号搜索" @search="selectSearch" @submit="submitAccept"
@@ -227,6 +245,7 @@
 					style="background-color: #044ed7;margin-left:8px">确认</button>
 			</view>
 		</uni-drawer>
+		</block>
 
 	</view>
 
@@ -463,7 +482,12 @@
 				adminList: [],
 				isCall: '', // 是否待邀约
 				goStudy: '提交',
-				isStudy: false
+				isStudy: false,
+				vipGatePassed: true,
+				vipGateForm: {
+					name: '',
+					mobile: ''
+				}
 
 			}
 		},
@@ -472,36 +496,60 @@
 			// 	url:'/pages/visit/testStudy?type=3'
 			// })
 			// return
-			this.toadyStart = new Date()
-			this.form.type = options.type
-			this.areaShow = options.type == 1 ? true : false
-			this.configKey = options.type == 1 ? 'ptfk' : (options.type == 2 ? 'sgfk' : 'wlcl')
+			const now = new Date()
+			this.toadyStart =
+				now.getFullYear() +
+				'-' +
+				String(now.getMonth() + 1).padStart(2, '0') +
+				'-' +
+				String(now.getDate()).padStart(2, '0')
+			const visitType = parseInt(options.type || 1)
+			this.form.type = visitType
+			if (visitType == 4) {
+				this.vipGatePassed = false
+				this.areaShow = false
+			} else {
+				this.areaShow = (visitType == 1)
+			}
+			// VIP 访客：拜访须知使用后台配置 key「vipxz」；普通访客初始 ptfk（选区后在 closeArea 切换）
+			this.configKey =
+				visitType == 4 ? 'vipxz' :
+				visitType == 1 ? 'ptfk' :
+				visitType == 2 ? 'sgfk' : 'wlcl'
 			this.isCall = options.iscall ? options.iscall : ''
 			// this.goStudy = this.isCall == 'call' ? '提交' : ''
 			this.form.audit_status = this.isCall == 'call' ? 1 : 0
-			this.showStudy()
-			if (options.type == 2 || options.type == 3) {
+			if (visitType !== 4) {
+				this.showStudy()
+			}
+			if (visitType == 2 || visitType == 3) {
 				this.getConfig()
 			}
 			this.init()
 			if (uni.getStorageSync('formdata')) {
 				this.form = uni.getStorageSync('formdata')
 			}
+			if (parseInt(this.form.type, 10) === 4) {
+				this.vipGatePassed = false
+				this.areaShow = false
+				this.vipGateForm.name = (this.form.name || '').trim()
+				this.vipGateForm.mobile = (this.form.mobile || '').trim()
+			}
 			// this.getAdminList()
-		},
-		onShareAppMessage() {
-			return {
-				title: 'BD访客系统',
-				path: '/pages/index/index',
-				// imageUrl: this.logoIndex
-			}
-		},
-		onShareTimeline() {
-			return {
-				title: 'BD访客系统',
-				path: '/pages/index/index',
-				// imageUrl: this.logoIndex
-			}
+		},
+		onShareAppMessage() {
+			return {
+				title: 'BD访客系统',
+				path: '/pages/index/index',
+				// imageUrl: this.logoIndex
+			}
+		},
+		onShareTimeline() {
+			return {
+				title: 'BD访客系统',
+				path: '/pages/index/index',
+				// imageUrl: this.logoIndex
+			}
 		},
 
 		onReady() {},
@@ -541,9 +589,54 @@
 					this.form.accompanyName = ''
 				}
 			},
+			fillLatestVisitorInfo() {
+				const mobile = (this.form.mobile || '').trim()
+				const idcard = this.form.credent == 2 ? (this.form.passcard || '').trim() : (this.form.idcard || '').trim()
+				if (!mobile && !idcard) {
+					this.util.alert('请先填写手机号或证件号，再拉取过往信息')
+					return
+				}
+				let that = this
+				this.util.request({
+					api: '/api/mobile/visit/latest-visitor',
+					method: 'GET',
+					data: {
+						mobile: mobile,
+						idcard: idcard
+					},
+					utilSuccess: function(res) {
+						that.form.name = res.name || that.form.name
+						that.form.mobile = res.mobile || that.form.mobile
+						that.form.credent = res.credent || that.form.credent
+						if (parseInt(that.form.credent) === 2) {
+							that.form.passcard = res.idcard || that.form.passcard
+							that.form.idcard = res.idcard || that.form.idcard
+						} else {
+							that.form.idcard = res.idcard || that.form.idcard
+						}
+						that.form.company_name = res.company_name || that.form.company_name
+						that.form.cda = res.cda || that.form.cda
+						if (Array.isArray(res.cars)) {
+							that.form.cars = res.cars
+						}
+						uni.showToast({
+							title: '已回填最近一条信息',
+							icon: 'none',
+							duration: 1500
+						})
+					},
+					utilFail: function(errMsg) {
+						uni.showToast({
+							title: errMsg || '未获取到历史数据',
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				})
+			},
 			submitAccept(e) {
-				console.log(e)
-				this.form.accompany_id = e.id
+				console.log(e)
+				this.form.accompany_id = e.id
 				this.form.accompanyName = e.name
 				if (this.acceptType == 'accept') {
 					this.form.accept_admin_id = e.id
@@ -578,11 +671,72 @@
 			closeConfig() {
 				this.configshow = false
 			},
+			submitVipGate() {
+				const name = (this.vipGateForm.name || '').trim()
+				const mobile = (this.vipGateForm.mobile || '').trim()
+				if (!name) {
+					uni.showToast({
+						title: '请输入姓名',
+						icon: 'none'
+					})
+					return
+				}
+				if (!mobile || !/^[1][3-9][\d]{9}$/.test(mobile)) {
+					uni.showToast({
+						title: '请输入正确手机号',
+						icon: 'none'
+					})
+					return
+				}
+				const that = this
+				this.util.request({
+					api: '/api/mobile/user/is-vip',
+					method: 'GET',
+					data: {
+						mobile,
+						name
+					},
+					customLoading: true,
+					utilSuccess: function(res) {
+						if (parseInt(res?.is_vip || 0) !== 1) {
+							uni.showModal({
+								title: '提示',
+								content: '您当前还不在vip客户名单中，可先联系管理员录入',
+								showCancel: false,
+								success: function() {
+									uni.reLaunch({
+										url: '/pages/index/index'
+									})
+								}
+							})
+							return
+						}
+						that.vipGatePassed = true
+						that.form.name = name
+						that.form.mobile = mobile
+						that.areaShow = true
+						that.showStudy()
+					},
+					utilFail: function(err) {
+						uni.showToast({
+							title: err || '验证失败',
+							icon: 'none'
+						})
+					}
+				})
+			},
 			closeArea() {
 				if (!this.form.visit_area_id) {
 					this.util.alert("请先选择前往区域")
 					return
 				}
+				// VIP 访客统一走拜访须知「vipxz」，不按区域切换 ptfk/cjfk/yffk
+				if (Number(this.form.type) === 4) {
+					this.configKey = 'vipxz'
+					this.getConfig()
+					this.areaShow = false
+					return
+				}
 				if (this.visitAreaText == "生产区") {
 					this.configKey = 'cjfk'
 					this.getConfig()
@@ -801,15 +955,48 @@
 					id_arr.push(k.idcard)
 				}
 				this.$refs['formdata'].validate().then(res => {
+					// 录入后先按手机号匹配 VIP，供学习流程判断「仅观看/需答题」
+					this.checkVipByMobile(this.form.mobile).then(vipRes => {
+						const isVip = parseInt(vipRes?.is_vip || 0) === 1 ? 1 : 0
+						uni.setStorageSync('studydata', {
+							type: this.form.type,
+							name: this.form.name,
+							mobile: this.form.mobile,
+							idcard: this.form.credent == 2 ? this.form.passcard : this.form.idcard,
+							is_vip: isVip
+						})
+					}).catch(() => {
+						uni.setStorageSync('studydata', {
+							type: this.form.type,
+							name: this.form.name,
+							mobile: this.form.mobile,
+							idcard: this.form.credent == 2 ? this.form.passcard : this.form.idcard
+						})
+					})
 					this.util.request({
 						api: '/api/mobile/visit/idcard-check',
 						method: "post",
 						data: {
-							idcard: id_arr
+							idcard: id_arr,
+							type: that.form.type
 						},
 						utilSuccess: function(res) {
-							if (res.length > 0) {
-								let str = res.join("，") + '未完成学习培训'
+							const missing = Array.isArray(res?.missing) ? res.missing : []
+							const expired = Array.isArray(res?.expired) ? res.expired : []
+							const invalidLegacy = Array.isArray(res?.invalid) ? res.invalid : (Array.isArray(res) ? res : [])
+							const hasInvalid = missing.length > 0 || expired.length > 0 || invalidLegacy.length > 0
+							if (hasInvalid) {
+								let messageArr = []
+								if (missing.length > 0) {
+									messageArr.push(`未学习：${missing.join("，")}`)
+								}
+								if (expired.length > 0) {
+									messageArr.push(`已过期：${expired.join("，")}`)
+								}
+								if (messageArr.length === 0 && invalidLegacy.length > 0) {
+									messageArr.push(`异常：${invalidLegacy.join("，")}`)
+								}
+								let str = messageArr.join("；") + '。请先完成当前访客类型的学习流程'
 								that.util.alert(str)
 								uni.setStorageSync('formdata', that.form)
 							} else {
@@ -852,8 +1039,28 @@
 						this.submitNoStudy()
 					} else {
 						uni.setStorageSync('formdata', this.form)
-						uni.redirectTo({
-							url: '/pages/visit/study?type=' + this.form.type
+						this.checkVipByMobile(this.form.mobile).then(vipRes => {
+							const isVip = parseInt(vipRes?.is_vip || 0) === 1 ? 1 : 0
+							uni.setStorageSync('studydata', {
+								type: this.form.type,
+								name: this.form.name,
+								mobile: this.form.mobile,
+								idcard: this.form.credent == 2 ? this.form.passcard : this.form.idcard,
+								is_vip: isVip
+							})
+							uni.redirectTo({
+								url: '/pages/visit/study?type=' + this.form.type
+							})
+						}).catch(() => {
+							uni.setStorageSync('studydata', {
+								type: this.form.type,
+								name: this.form.name,
+								mobile: this.form.mobile,
+								idcard: this.form.credent == 2 ? this.form.passcard : this.form.idcard
+							})
+							uni.redirectTo({
+								url: '/pages/visit/study?type=' + this.form.type
+							})
 						})
 					}
 
@@ -861,9 +1068,43 @@
 					console.log('err', err);
 				})
 			},
+			checkVipByMobile(mobile) {
+				const that = this
+				return new Promise((resolve, reject) => {
+					if (!mobile) {
+						resolve({
+							is_vip: 0
+						})
+						return
+					}
+					const data = {
+						mobile: mobile
+					}
+					if (parseInt(this.form.type, 10) === 4) {
+						const n = (this.form.name || '').trim()
+						if (n) {
+							data.name = n
+						}
+					}
+					that.util.request({
+						api: '/api/mobile/user/is-vip',
+						method: 'GET',
+						data: data,
+						customLoading: true,
+						utilSuccess: function(res) {
+							resolve(res || {
+								is_vip: 0
+							})
+						},
+						utilFail: function(err) {
+							reject(err)
+						}
+					})
+				})
+			},
 			submitForm() {
-				let that = this
-				console.log("form",this.form)
+				let that = this
+				console.log("form",this.form)
 				// return
 				this.util.request({
 					api: '/api/admin/visit/save',
@@ -926,8 +1167,9 @@
 						} else {
 							// 用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息
 							uni.requestSubscribeMessage({
-								tmplIds: ['DmzNRREPFdZrMWconNDdbj_ebtVPRWufq27kRQ25eNg',
-									'IczaKkCmwf55tAAzCcxb_fbbf5L25SWrSKvaBrkIyk4'
+								tmplIds: [
+									'O898NDrqGUUeSR42uraqr2PLEg05sNbYVu46I0qLkhE',
+									'Caa0O6pPtQDHQMPsqE6PHyzueeI11JvlpenbgwkYC0s'
 								],
 								success(res) {
 									console.log("res", res)
@@ -962,19 +1204,30 @@
 	.formtext {
 		margin-bottom: 20rpx
 	}
+	.formtext-flex{
+		display:flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.history-btn{
+		background-color:#044ed7 !important;
+		font-size:24rpx;
+		line-height:1.8;
+		padding:0 16rpx;
+	}
 
-	/deep/ .uni-table-td {
+	::v-deep .uni-table-td {
 		vertical-align: middle;
 	}
 
-	/deep/ .uni-drawer__content {
+	::v-deep .uni-drawer__content {
 		padding: 40rpx
 	}
 
 	.configtitle {
 		font-size: 40rpx;
 		text-align: center;
-		margin-top: 36rpx;
+		margin-top: 36rpx;
 		padding-bottom: 20rpx;
 	}
 
@@ -1007,12 +1260,10 @@
 		margin-right: 20rpx
 	}
 
-	/deep/ .u-popup__content__close .u-icon__icon {
+	::v-deep .u-popup__content__close .u-icon__icon {
 		color: #fff !important
 	}
 
-	.areavalue {}
-
 	.areabtn {
 		background-color: #044ed7;
 		/* margin-left: 8px; */
@@ -1023,7 +1274,17 @@
 		border-radius: 0;
 	}
 
-	/deep/ .areavalue .uni-data-checklist .checklist-group .checklist-box.is--button {
+	::v-deep .areavalue .uni-data-checklist .checklist-group .checklist-box.is--button {
 		padding: 30rpx
 	}
+
+	.vip-gate-wrap {
+		padding: 24rpx 12rpx;
+	}
+	.vip-gate-tip {
+		font-size: 28rpx;
+		color: #666;
+		margin-bottom: 32rpx;
+		line-height: 1.5;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/visit/study.vue b/pages/visit/study.vue
index 07b1699..0c6dbcb 100644
--- a/pages/visit/study.vue
+++ b/pages/visit/study.vue
@@ -4,38 +4,38 @@
 			<uni-steps :options="steps" :active="stepActive" active-color="#044ed7" />
 		</view>
 		<view class="study" style="padding:0 20rpx">
-			<view class="service-show" v-if="studyInfo.file_detail.length>0">
-				<view v-if="picList.length>0&&showSwiperFlag==0">
-					<u-swiper :list="picList" @change="changeImg" keyName="url"
-						:height="'360rpx'" :interval='4000' :duration='500' :autoplay='false' circular>
-						<view slot="indicator" class="indicator">
-							<view class="indicator__dot" v-for="(item, index) in picList" :key="index"
-								:class="[index === imgcurrent && 'indicator__dot--active']">
-							</view>
-						</view>
-					</u-swiper>
-				</view>
-				<view v-if="videoList.length>0&&showSwiperFlag==1">
-					<u-swiper :list="videoList" @change="changeVideo" keyName="url"
-						:height="'360rpx'" :interval='4000' :duration='500' :autoplay='false' circular>
-					
-						<view slot="indicator" class="indicator">
-							<view class="indicator__dot" v-for="(item, index) in videoList" :key="index"
-								:class="[index === videocurrent && 'indicator__dot--active']">
-							</view>
-						</view>
-					</u-swiper>
-				</view>
-				
-				<view class="changePicVideo">
-					<view @click='changeSwiperImg' v-if="picList.length>0">
-						<image src="../../static/img/pic.png">
-						</image>{{picList.length}}
-					</view>
-					<view @click='changeSwiperVideo' v-if="videoList.length>0">
-						<image src="../../static/img/video.png">
-						</image>{{videoList.length}}
-					</view>
+			<view class="service-show" v-if="studyInfo.file_detail && studyInfo.file_detail.length>0">
+				<view v-if="picList.length>0&&showSwiperFlag==0">
+					<u-swiper :list="picList" @change="changeImg" keyName="url"
+						:height="'360rpx'" :interval='4000' :duration='500' :autoplay='false' circular>
+						<view slot="indicator" class="indicator">
+							<view class="indicator__dot" v-for="(item, index) in picList" :key="index"
+								:class="[index === imgcurrent && 'indicator__dot--active']">
+							</view>
+						</view>
+					</u-swiper>
+				</view>
+				<view v-if="videoList.length>0&&showSwiperFlag==1">
+					<u-swiper :list="videoList" @change="changeVideo" keyName="url"
+						:height="'360rpx'" :interval='4000' :duration='500' :autoplay='false' circular>
+					
+						<view slot="indicator" class="indicator">
+							<view class="indicator__dot" v-for="(item, index) in videoList" :key="index"
+								:class="[index === videocurrent && 'indicator__dot--active']">
+							</view>
+						</view>
+					</u-swiper>
+				</view>
+				
+				<view class="changePicVideo">
+					<view @click='changeSwiperImg' v-if="picList.length>0">
+						<image src="../../static/img/pic.png">
+						</image>{{picList.length}}
+					</view>
+					<view @click='changeSwiperVideo' v-if="videoList.length>0">
+						<image src="../../static/img/video.png">
+						</image>{{videoList.length}}
+					</view>
 				</view>
 				
 			</view>
@@ -47,8 +47,8 @@
 		</view>
 
 		<button @click="goTest" :class="studyMin==-1?'goTest':'noTest'" :disabled="studyMin==-1?false:true">
-			<text v-if="studyMin==-1">去测验</text>
-			<text v-else>需要学习{{studyInfo.minute?studyInfo.minute:""}}分钟可去测验({{studyTime}})</text>
+			<text v-if="studyMin==-1">{{ quizRequired ? '去测验' : '完成学习' }}</text>
+			<text v-else>{{ quizRequired ? ('需要学习'+(studyInfo.minute?studyInfo.minute:'')+'分钟可去测验('+studyTime+')') : ('请观看学习资料（'+studyTime+'）') }}</text>
 
 		</button>
 	</view>
@@ -67,104 +67,191 @@
 					title: '完成'
 				}],
 				stepActive: 1,
-				studyInfo: {},
-				picList:[],
-				videoList:[],
+				studyInfo: {},
+				picList:[],
+				videoList:[],
 				showSwiperFlag:0,
-				imgcurrent: 0,
+				imgcurrent: 0,
 				videocurrent:0,
 				studyTime: "00:00", // 学习时间
-				studyMin: -1, // 倒计时
+				// null：尚未拉取学习配置，避免定时器在 getStudy 返回前误 clear
+				studyMin: null,
 				timer: null,
+				quizRequired: true,
 			}
 		},
-		onLoad(options) {
-			// uni.navigateTo({
-			// 	url:'/pages/visit/testStudy?type=1'
-			// })
+		onLoad(options) {
+			// uni.navigateTo({
+			// 	url:'/pages/visit/testStudy?type=1'
+			// })
 			// return
-			let that = this
+			const that = this
 			this.type = options.type
+			if (this.timer) {
+				clearInterval(this.timer)
+				this.timer = null
+			}
+			this.timer = setInterval(function() {
+				that.loadTime()
+			}, 1000)
 			this.getStudy()
+		},
+		onUnload() {
 			if (this.timer) {
 				clearInterval(this.timer)
-			} else {
-				this.timer = setInterval(function() {
-					that.loadTime()
-				}, 1000)
+				this.timer = null
+			}
+		},
+		onShareAppMessage() {
+			return {
+				title: 'BD访客系统',
+				path: '/pages/index/index',
+				// imageUrl: this.logoIndex
+			}
+		},
+		onShareTimeline() {
+			return {
+				title: 'BD访客系统',
+				path: '/pages/index/index',
+				// imageUrl: this.logoIndex
 			}
-
-		},
-		onShareAppMessage() {
-			return {
-				title: 'BD访客系统',
-				path: '/pages/index/index',
-				// imageUrl: this.logoIndex
-			}
-		},
-		onShareTimeline() {
-			return {
-				title: 'BD访客系统',
-				path: '/pages/index/index',
-				// imageUrl: this.logoIndex
-			}
 		},
 
 		methods: {
 			async getStudy() {
 				let that = this
+				const fd = uni.getStorageSync('formdata') || {}
+				const sd = uni.getStorageSync('studydata') || {}
+				const mobileParam = fd.mobile || sd.mobile || ''
 				this.util.request({
 					api: '/api/mobile/visit/get-ask',
 					data: {
-						type: that.type
+						type: that.type,
+						mobile: mobileParam
 					},
 					utilSuccess: function(res) {
-						that.studyInfo = res
-						for(var k of res.file_detail){
-							if(k.extension=='mp4'){
-								that.videoList.push(k)
-							}else{
-								that.picList.push(k)
-							}
-						}
+						that.studyInfo = res
+						that.quizRequired = !(
+							res.quiz_required === 0 ||
+							res.quiz_required === false ||
+							res.quiz_required === '0'
+						)
+						const files = res.file_detail || []
+						for(var k of files){
+							if(k.extension=='mp4'){
+								that.videoList.push(k)
+							}else{
+								that.picList.push(k)
+							}
+						}
 						that.showSwiperFlag = that.picList.length==0? 1 : 0
-						that.studyMin = res.minute * 60
-						// that.studyMin = .1 * 60
+						const minute = res.minute ? parseFloat(res.minute) : 0
+						// VIP 也强制最短观看时长：若未配置分钟数，默认最短 1 分钟
+						if (!that.quizRequired && (!minute || minute <= 0)) {
+							that.studyMin = 60
+						} else {
+							that.studyMin = Math.max(0, Math.round(minute * 60))
+						}
 					},
 					utilFail: function(res) {}
 				})
 			},
 			loadTime() {
+				if (this.studyMin === null || this.studyMin === undefined) {
+					return
+				}
 				if (this.studyMin >= 0) {
 					let minutes = Math.floor(this.studyMin / 60);
 					let seconds = Math.floor(this.studyMin % 60);
 					minutes = minutes < 10 ? "0" + minutes : minutes
 					seconds = seconds < 10 ? "0" + seconds : seconds
 					this.studyTime = minutes + ":" + seconds
-						--this.studyMin;
-				} else {
-					clearInterval(this.timer);
+					this.studyMin--
+				} else if (this.studyMin === -1) {
+					if (this.timer) {
+						clearInterval(this.timer)
+						this.timer = null
+					}
 				}
 			},
 			goTest() {
+				if (!this.quizRequired) {
+					this.submitWatchOnly()
+					return
+				}
+				const form = uni.getStorageSync('formdata') || {}
+				const base = {
+					type: parseInt(this.type),
+					name: form.name,
+					mobile: form.mobile,
+					idcard: form.idcard || form.passcard,
+					expire_day: this.studyInfo.expire_day
+				}
+				const prev = uni.getStorageSync('studydata') || {}
+				uni.setStorageSync('studydata', Object.assign({}, prev, base))
 				uni.redirectTo({
 					url: '/pages/visit/testStudy?type=' + this.type
 				})
-			},
-			changeImg(e){
-				this.imgcurrent = e.current
-			},
-			changeImg(e){
-				this.videocurrent = e.current
-			},
-			changeSwiperImg(){
-				this.showSwiperFlag=0
-				this.imgcurrent=0
-			},
-			changeSwiperVideo(){
-				this.showSwiperFlag=1
-				this.videocurrent=0
-			}
+			},
+			submitWatchOnly() {
+				const form = uni.getStorageSync('formdata') || uni.getStorageSync('studydata') || {}
+				const that = this
+				this.util.request({
+					api: '/api/mobile/visit/ask-save',
+					method: 'POST',
+					data: {
+						type: parseInt(this.type),
+						name: form.name,
+						mobile: form.mobile,
+						idcard: form.idcard || form.passcard,
+						expire_day: this.studyInfo.expire_day,
+						content: [],
+						ask: []
+					},
+					utilSuccess: function(res) {
+						if (uni.getStorageSync('studydata')) {
+							uni.removeStorageSync('studydata')
+						}
+						uni.showToast({
+							title: '学习已完成',
+							duration: 1500,
+							icon: 'none'
+						})
+						setTimeout(function() {
+							if (uni.getStorageSync('formdata')) {
+								uni.redirectTo({
+									url: '/pages/visit/addrecord'
+								})
+							} else {
+								uni.redirectTo({
+									url: '/pages/index/index'
+								})
+							}
+						}, 1500)
+					},
+					utilFail: function(res) {
+						uni.showToast({
+							title: res || '提交失败',
+							duration: 2000,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			changeImg(e) {
+				this.imgcurrent = e.current
+			},
+			changeVideo(e) {
+				this.videocurrent = e.current
+			},
+			changeSwiperImg(){
+				this.showSwiperFlag=0
+				this.imgcurrent=0
+			},
+			changeSwiperVideo(){
+				this.showSwiperFlag=1
+				this.videocurrent=0
+			}
 			
 
 		}
@@ -224,24 +311,24 @@
 		width: 100%;
 		height: 360rpx;
 		position: relative;
-	}
-	.service-show .changePicVideo{
-		    position: absolute;
-		    right: 80rpx;
-		    bottom: 25rpx;
-	}
-	.service-show .changePicVideo view{
-		    background: rgba(0,0,0,0.5);
-		        display: inline-block;
-		        padding: 5rpx 20rpx;
-		        margin: 6rpx;
-		        border-radius: 15rpx;
-		        color: #fff;
-		        font-size: 28rpx;
-	}
-	.service-show .changePicVideo view image{
-		width:24rpx;
-		height:21rpx;
-		margin-right: 10rpx;
 	}
-</style>
+	.service-show .changePicVideo{
+		    position: absolute;
+		    right: 80rpx;
+		    bottom: 25rpx;
+	}
+	.service-show .changePicVideo view{
+		    background: rgba(0,0,0,0.5);
+		        display: inline-block;
+		        padding: 5rpx 20rpx;
+		        margin: 6rpx;
+		        border-radius: 15rpx;
+		        color: #fff;
+		        font-size: 28rpx;
+	}
+	.service-show .changePicVideo view image{
+		width:24rpx;
+		height:21rpx;
+		margin-right: 10rpx;
+	}
+</style>
diff --git a/pages/visit/testStudy.vue b/pages/visit/testStudy.vue
index 952a817..d8aa44c 100644
--- a/pages/visit/testStudy.vue
+++ b/pages/visit/testStudy.vue
@@ -2,9 +2,9 @@
 	<view class="containers">
 		<view class="steps">
 			<uni-steps :options="steps" :active="stepActive" active-color="#044ed7" />
-		</view>
-		<view class="expire" v-if="studyInfo.expire_day">
-			通过测验后，{{studyInfo.expire_day}}天内可不再重复学习。
+		</view>
+		<view class="expire" v-if="studyInfo.expire_day">
+			通过测验后，{{studyInfo.expire_day}}天内可不再重复学习。
 		</view>
 		<view class="asks">
 			<view v-for="(item,index) in askList">
@@ -18,7 +18,7 @@
 						:localdata="item.answer" :wrap='true' multiple :map="{text:'content',value:'content'}" />
 				</view>
 			</view>
-		</view>
+		</view>
 		
 		<view disabled class="justify-between submitBtn">
 			<text>需要正确率达{{rate}}%</text>
@@ -48,68 +48,117 @@
 				answerList: [], 
 				result: {}, //单选
 				resultArr: [], // 多选
-				formData: {},
-				askData:{},
+				formData: {},
+				askData:{},
 				askContent:[],
 
 			}
 		},
 		onLoad(options) {
-			let that = this
-			this.type = options.type
-			this.askData.type = parseInt(options.type)
-			// for(let i=0;i<20;i++){
-			// 	this.resultArr.push([])
-			// }
+			this.type = options.type
 			this.getFormdata()
-			this.getStudy()
-			
-		},
-		onShareAppMessage() {
-			return {
-				title: 'BD访客系统',
-				path: '/pages/index/index',
-				// imageUrl: this.logoIndex
-			}
-		},
-		onShareTimeline() {
-			return {
-				title: 'BD访客系统',
-				path: '/pages/index/index',
-				// imageUrl: this.logoIndex
-			}
+			if (!this.askData || typeof this.askData !== 'object') {
+				this.askData = {}
+			}
+			this.askData.type = parseInt(options.type)
+			this.getStudy()
+		},
+		onShareAppMessage() {
+			return {
+				title: 'BD访客系统',
+				path: '/pages/index/index',
+				// imageUrl: this.logoIndex
+			}
+		},
+		onShareTimeline() {
+			return {
+				title: 'BD访客系统',
+				path: '/pages/index/index',
+				// imageUrl: this.logoIndex
+			}
 		},
 
-		methods: {
-			getFormdata(){
-				// let res = uni.getStorageSync('formdata')
-				// this.formData = res
-				let res = uni.getStorageSync('studydata')
-				this.askData = res
+		methods: {
+			getFormdata(){
+				let res = uni.getStorageSync('studydata') || {}
+				this.askData = res
 			},
 			async getStudy() {
 				let that = this
+				const fd = uni.getStorageSync('formdata') || {}
+				const sd = uni.getStorageSync('studydata') || {}
+				const mobileParam = (that.askData && that.askData.mobile) || fd.mobile || sd.mobile || ''
 				this.util.request({
 					api: '/api/mobile/visit/get-ask',
 					data: {
-						type: that.type
+						type: that.type,
+						mobile: mobileParam
 					},
 					utilSuccess: function(res) {
+						if (Number(res.quiz_required) === 0) {
+							that.submitWatchOnlyFromTest(res)
+							return
+						}
 						that.studyInfo = res
-						that.askList = res.asks
-						that.rate = parseInt(res.rate)
-						that.askData.ask = res.asks
-						that.askData.expire_day = res.expire_day
-						for(let i=0;i<res.asks.length;i++){
-							that.resultArr.push([])
+						that.askList = res.asks || []
+						that.rate = parseInt(res.rate)
+						that.askData.ask = res.asks
+						that.askData.expire_day = res.expire_day
+						for(let i=0;i<(res.asks || []).length;i++){
+							that.resultArr.push([])
 						}
 					},
 					utilFail: function(res) {}
 				})
 			},
+			submitWatchOnlyFromTest(studyRes) {
+				const form = uni.getStorageSync('formdata') || this.askData || {}
+				const that = this
+				this.util.request({
+					api: '/api/mobile/visit/ask-save',
+					method: 'POST',
+					data: {
+						type: parseInt(this.type),
+						name: form.name,
+						mobile: form.mobile,
+						idcard: form.idcard || form.passcard,
+						expire_day: studyRes.expire_day,
+						content: [],
+						ask: []
+					},
+					utilSuccess: function(res) {
+						if (uni.getStorageSync('studydata')) {
+							uni.removeStorageSync('studydata')
+						}
+						uni.showToast({
+							title: '学习已完成',
+							duration: 1500,
+							icon: 'none'
+						})
+						setTimeout(function() {
+							if (uni.getStorageSync('formdata')) {
+								uni.redirectTo({
+									url: '/pages/visit/addrecord'
+								})
+							} else {
+								uni.redirectTo({
+									url: '/pages/index/index'
+								})
+							}
+						}, 1500)
+					},
+					utilFail: function(res) {
+						uni.showToast({
+							title: res || '提交失败',
+							duration: 2000,
+							icon: 'none'
+						})
+					}
+				})
+			},
 			// 获取选择的答案
 			radioAnswer(e, index) {
-				this.correctNum[index] = e.detail.data.result
+				this.correctNum[index] = e.detail.data.result
 				this.askContent[index] = e.detail.data.content
 			},
 			chenckAnswer(e, item, index) {
@@ -137,7 +186,7 @@
 			},
 			// 匹配答案正确率
 			submitAnswer() {
-				let correctLength = 0
+				let correctLength = 0
 				console.log("this.correctNum",this.correctNum)
 				for (var key in this.correctNum) {
 					if (this.correctNum[key] == 1) {
@@ -153,101 +202,110 @@
 
 			},
 			submitForm() {
-				let that = this
-				this.resultArr.map((k,index)=>{
-					if(k.length>0){
-						this.askContent[index] = k
-					}
-				})
-				this.askData.content = this.askContent
-				console.log(this.result,this.resultArr,'---',this.askContent)
-				console.log("askdata",this.askData)
-				that.submitStudy()
+				let that = this
+				this.resultArr.map((k,index)=>{
+					if(k.length>0){
+						this.askContent[index] = k
+					}
+				})
+				this.askData.content = this.askContent
+				console.log(this.result,this.resultArr,'---',this.askContent)
+				console.log("askdata",this.askData)
+				that.submitStudy()
 				return
 				this.util.request({
 					api: '/api/mobile/visit/visit-save',
 					method: "POST",
 					data: that.formData,
 					utilSuccess: function(res) {
-						uni.showToast({
-							title: res.msg,
-							duration: 2000,
-							icon: 'none'
-						})
+						uni.showToast({
+							title: res.msg,
+							duration: 2000,
+							icon: 'none'
+						})
 						that.newsSubscription()
 					},
-					utilFail: function(res) {
-						console.log(res)
-						uni.showToast({
-							title: res,
-							duration: 2000,
-							icon: 'none'
-						})
+					utilFail: function(res) {
+						console.log(res)
+						uni.showToast({
+							title: res,
+							duration: 2000,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			submitStudy() {
+				let that = this
+				console.log("that.askData",that.askData)
+				// return
+				this.util.request({
+					api: '/api/mobile/visit/ask-save',
+					method: "POST",
+					data: that.askData,
+					utilSuccess: function(res) {
+						if(uni.getStorageSync('studydata')){
+							uni.removeStorageSync('studydata')
+						}
+						
+						uni.showToast({
+							title: '提交成功',
+							duration: 1500,
+							icon: 'none'
+						})
+						setTimeout(function(){
+							if (uni.getStorageSync('formdata')) {
+								uni.redirectTo({
+									url: '/pages/visit/addrecord'
+								})
+							} else {
+								uni.redirectTo({
+									url: '/pages/index/index'
+								})
+							}
+						},1500)
+					},
+					utilFail: function(res) {
+						uni.showToast({
+							title: res,
+							duration: 2000,
+							icon: 'none'
+						})
 					}
 				})
-			},
-			submitStudy() {
-				let that = this
-				console.log("that.askData",that.askData)
-				// return
-				this.util.request({
-					api: '/api/mobile/visit/ask-save',
-					method: "POST",
-					data: that.askData,
-					utilSuccess: function(res) {
-						if(uni.getStorageSync('studydata')){
-							uni.removeStorageSync('studydata')
-						}
-						
-						uni.showToast({
-							title: '提交成功',
-							duration: 1500,
-							icon: 'none'
-						})
-						setTimeout(function(){
-							uni.redirectTo({
-								url: '/pages/index/index'
-							})
-						},1500)
-					},
-					utilFail: function(res) {
-						uni.showToast({
-							title: res,
-							duration: 2000,
-							icon: 'none'
-						})
-					}
-				})
-			},
-			
-			
-			newsSubscription() {
-				uni.getSetting({
-					withSubscriptions: true, //是否获取用户订阅消息的订阅状态，默认false不返回
-					success(res) {
-						if (res.authSetting['scope.subscribeMessage']) {
-							uni.removeStorageSync('formdata')
-							uni.redirectTo({
-								url: '/pages/visit/successform'
-							})
-						} else {
-							// 用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息
-							uni.requestSubscribeMessage({
-								tmplIds: ['DmzNRREPFdZrMWconNDdbj_ebtVPRWufq27kRQ25eNg','IczaKkCmwf55tAAzCcxb_fbbf5L25SWrSKvaBrkIyk4'],
-								success(res) {
-									console.log("res", res)
-									uni.showToast({
-										title:'订阅成功'
-									})
-									uni.removeStorageSync('formdata')
-									uni.redirectTo({
-										url: '/pages/visit/successform'
-									})
-								}
-							})
-						}
-					}
-				});
+			},
+			
+			
+			newsSubscription() {
+				uni.getSetting({
+					withSubscriptions: true, //是否获取用户订阅消息的订阅状态，默认false不返回
+					success(res) {
+						if (res.authSetting['scope.subscribeMessage']) {
+							uni.removeStorageSync('formdata')
+							uni.redirectTo({
+								url: '/pages/visit/successform'
+							})
+						} else {
+							// 用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息
+							uni.requestSubscribeMessage({
+								tmplIds: [
+									'O898NDrqGUUeSR42uraqr2PLEg05sNbYVu46I0qLkhE',
+									'Caa0O6pPtQDHQMPsqE6PHyzueeI11JvlpenbgwkYC0s'
+								],
+								success(res) {
+									console.log("res", res)
+									uni.showToast({
+										title:'订阅成功'
+									})
+									uni.removeStorageSync('formdata')
+									uni.redirectTo({
+										url: '/pages/visit/successform'
+									})
+								}
+							})
+						}
+					}
+				});
 			},
 
 		}
@@ -259,14 +317,14 @@
 		background-color: #fff;
 		padding: 20rpx;
 		padding-bottom: 60rpx;
-		position: relative;
+		position: relative;
 		overflow: hidden;
 	}
 
-	.asks {
-		min-height: 80vh;
-		overflow-y: auto;
-		padding-bottom:60rpx
+	.asks {
+		min-height: 80vh;
+		overflow-y: auto;
+		padding-bottom:60rpx
 	}
 
 	.asks>view,
@@ -277,7 +335,7 @@
 	.containers>.submitBtn {
 		position: fixed;
 		bottom: 0;
-		width: 100%;
+		width: 100%;
 		left:0
 	}
 
@@ -306,11 +364,11 @@
 
 	.steps {
 		margin-bottom: 40rpx
-	}
-	.expire{
-		text-align: center;
-		font-size: 40rpx;
-		/* padding: 10px; */
-		margin-bottom: 40rpx;
 	}
-</style>
+	.expire{
+		text-align: center;
+		font-size: 40rpx;
+		/* padding: 10px; */
+		margin-bottom: 40rpx;
+	}
+</style>
diff --git a/pages/visit/tostudy.vue b/pages/visit/tostudy.vue
index e6a92d2..15e059d 100644
--- a/pages/visit/tostudy.vue
+++ b/pages/visit/tostudy.vue
@@ -95,12 +95,12 @@
 		},
 		
 		onLoad() {
-			this.isStudy()
-			let res = uni.getStorageSync('studydata')
-			if(res){
+			const res = uni.getStorageSync('studydata')
+			if (res) {
 				console.log(res)
 				this.form = res
 			}
+			this.isStudy()
 		},
 		onShareAppMessage() {
 			return {
@@ -115,7 +115,7 @@
 				path: '/pages/index/index',
 				// imageUrl: this.logoIndex
 			}
-		},
+		},
 
 		methods:{
 			onAgreePrivacy() {
@@ -145,12 +145,17 @@
 			},
 			isStudy(){
 				let that = this
+				const data = {
+					type: that.form.type
+				}
+				const idcard = (that.form.idcard || '').trim()
+				if (idcard) {
+					data.idcard = idcard
+				}
 				this.util.request({
 					api: '/api/mobile/visit/ask-log',
 					method: "get",
-					data:{
-						type:that.form.type
-					},
+					data: data,
 					utilSuccess: function(res) {
 						if(res.msg=='学习有效中'){
 							uni.showToast({
@@ -183,8 +188,8 @@
 		padding: 20rpx;
 		padding-bottom: 60rpx;
 	}	
-	.formtext {
-		margin-bottom: 20rpx
+	.formtext {
+		margin-bottom: 20rpx
 	}
 	.steps {
 		margin-bottom: 40rpx
diff --git a/project.config.json b/project.config.json
index 9c90be0..d2c1753 100644
--- a/project.config.json
+++ b/project.config.json
@@ -20,6 +20,6 @@
     "ignore": [],
     "include": []
   },
-  "appid": "wx35190cc07e73eda1",
+  "appid": "wxdaa5d65b0714696d",
   "editorSetting": {}
 }
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 333438a..4893b00 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,6 +1,6 @@
 {
   "libVersion": "3.14.3",
-  "projectname": "szbd-vistor-wx",
+  "projectname": "yxbd-vistor-wx",
   "setting": {
     "urlCheck": true,
     "coverView": true,
diff --git a/utils/util.js b/utils/util.js
index 5ec8a6d..5dbce03 100755
--- a/utils/util.js
+++ b/utils/util.js
@@ -1,63 +1,63 @@
-import md5 from "./md5.min";
-const HOSTARR = {
-	'development': 'https://bd-fangke.ali251.langye.net',
-	'production': 'https://bd-fangke.ali251.langye.net'
-}; // 审核状态
-
-const HOST = HOSTARR[process.env
-	.NODE_ENV]; //"https://tiantianxinye.365care.langye.net/";//HOSTARR[process.env.NODE_ENV];//
-
-
-const formatTime = date => {
-	const year = date.getFullYear();
-	const month = date.getMonth() + 1;
-	const day = date.getDate();
-	return [year, month, day].map(formatNumber).join('-');
-};
-
+import md5 from "./md5.min";
+const HOSTARR = {
+	'development': 'https://yxbd-fangke.ali251.langye.net',
+	'production': 'https://yxbd-fangke.ali251.langye.net'
+}; // 审核状态
+
+const HOST = HOSTARR[process.env
+	.NODE_ENV]; //"https://tiantianxinye.365care.langye.net/";//HOSTARR[process.env.NODE_ENV];//
+
+
+const formatTime = date => {
+	const year = date.getFullYear();
+	const month = date.getMonth() + 1;
+	const day = date.getDate();
+	return [year, month, day].map(formatNumber).join('-');
+};
+
 const user_info_key = "userInfo_token";
-const userInfo_BD_token = "userInfo_BD_token"
-const user_key = "userInfo";
-
-const getUserInfo = (cb, refresh) => {
-	cb = cb || function() {}
-	refresh = refresh || false
-	if (!refresh) {
-		let user_info = uni.getStorageSync(user_key)
-		if (!isNull(user_info)) {
-			cb(user_info)
-			return
-		}
-	}
-	request({
-		api: '/api/mobile/user/show',
-		utilSuccess: function(res) {
-			uni.setStorageSync(user_key, res)
-			cb(res)
-		},
-		utilFail: function(res) {}
-	})
-}
-
-const getOpenidInfo = (cb, refresh) => {
-	cb = cb || function() {}
-	refresh = refresh || false
-	if (!refresh) {
-		let user_info = uni.getStorageSync(user_info_key)
-		if (!isNull(user_info)) {
-			cb(user_info)
-			return
-		}
-	}
-
-	uni.login({
-		provider: 'weixin',
-		success: (res) => {
-			console.log(res.code);
-			let url = HOST + '/api/mobile/user/login?code=' + res.code;
-			uni.request({
-				url: url,
-				method: 'GET',
+const userInfo_BD_token = "userInfo_BD_token"
+const user_key = "userInfo";
+
+const getUserInfo = (cb, refresh) => {
+	cb = cb || function() {}
+	refresh = refresh || false
+	if (!refresh) {
+		let user_info = uni.getStorageSync(user_key)
+		if (!isNull(user_info)) {
+			cb(user_info)
+			return
+		}
+	}
+	request({
+		api: '/api/mobile/user/show',
+		utilSuccess: function(res) {
+			uni.setStorageSync(user_key, res)
+			cb(res)
+		},
+		utilFail: function(res) {}
+	})
+}
+
+const getOpenidInfo = (cb, refresh) => {
+	cb = cb || function() {}
+	refresh = refresh || false
+	if (!refresh) {
+		let user_info = uni.getStorageSync(user_info_key)
+		if (!isNull(user_info)) {
+			cb(user_info)
+			return
+		}
+	}
+
+	uni.login({
+		provider: 'weixin',
+		success: (res) => {
+			console.log(res.code);
+			let url = HOST + '/api/mobile/user/login?code=' + res.code;
+			uni.request({
+				url: url,
+				method: 'GET',
 				success: result => {
 					// if(result.errmsg){
 					// 	uni.showToast({
@@ -65,114 +65,114 @@ const getOpenidInfo = (cb, refresh) => {
 					// 		duration:2000
 					// 	})
 					// 	return
-					// }
-					let user_info = result.data
-					uni.setStorageSync(user_info_key, user_info)
-					cb(user_info)
-				}
-			});
-		}
-	});
-}
-
-
-
-const getUserProfile = (cb) => {
-	cb = cb || function() {}
-
-	wx.getUserProfile({
-		desc: '用于完善会员资料',
-		success: (res) => {
-			uni.setStorageSync('user_profile', res.userInfo)
-			cb(res.userInfo)
-		}
-	})
-}
-
-
-
-
-
-
-const formatTimeAll = date => {
-	const year = date.getFullYear();
-	const month = date.getMonth() + 1;
-	const day = date.getDate();
-	const hour = date.getHours();
-	const minute = date.getMinutes();
-	const second = date.getSeconds();
-	return [year, month, day].map(formatNumber).join('-') + ' ' + [hour, minute, second].map(formatNumber).join(
-		':');
-};
-
-const formatNumber = n => {
-	n = n.toString();
-	return n[1] ? n : '0' + n;
-}; // 快捷显示alert
-
-
-const alert = msg => {
-	uni.showModal({
-		title: '',
-		content: msg,
-		showCancel: false
-	});
-}; // 订单状态
-
-const toast = msg => {
-	// setTimeout(function() {
-	// 	uni.showToast({
-	// 		icon: "none",
-	// 		title: msg,
-	// 		duration: 2000
-	// 	})
-	// }, 2000)
-
-	uni.showModal({
-		title: '',
-		content: msg,
-		showCancel: false
-	});
-
-}; // 订单状态
-
-
-const orderStatusDic = {
-	'0': '待确认',
-	'10': '待派单',
-	'20': '进行中',
-	'100': '已完成'
-}; // 审核状态
-
-const auditStatusDic = {
-	'0': '待审核',
-	'1': '已审核',
-	'-1': '已拒绝'
-}; // 请求封装
-
-const request = options => {
-	if (!options.customLoading) {
-		uni.showLoading({
-			title: '正在加载'
-		});
-	} else {
-		// 当前页面请求数量+1
-		// if (options.bindThis) {
-		// 	options.bindThis.setData({
-		// 		//loadingCount: options.bindThis.data.loadingCount + 1
-		// 	});
-		// }
-	}
-
-	options.url = HOST + options.api;
-	options.header = {
-		...options.header,
-		//'Accept': 'application/json',
-		//'Connection': 'keep-alive'
-		//'content-type': 'application/json'
-	}; // 如果已登录,请求中拼openId
-
-	var access_token = uni.getStorageSync(user_info_key).token;
+					// }
+					let user_info = result.data
+					uni.setStorageSync(user_info_key, user_info)
+					cb(user_info)
+				}
+			});
+		}
+	});
+}
+
+
+
+const getUserProfile = (cb) => {
+	cb = cb || function() {}
+
+	wx.getUserProfile({
+		desc: '用于完善会员资料',
+		success: (res) => {
+			uni.setStorageSync('user_profile', res.userInfo)
+			cb(res.userInfo)
+		}
+	})
+}
+
+
+
+
+
+
+const formatTimeAll = date => {
+	const year = date.getFullYear();
+	const month = date.getMonth() + 1;
+	const day = date.getDate();
+	const hour = date.getHours();
+	const minute = date.getMinutes();
+	const second = date.getSeconds();
+	return [year, month, day].map(formatNumber).join('-') + ' ' + [hour, minute, second].map(formatNumber).join(
+		':');
+};
+
+const formatNumber = n => {
+	n = n.toString();
+	return n[1] ? n : '0' + n;
+}; // 快捷显示alert
+
+
+const alert = msg => {
+	uni.showModal({
+		title: '',
+		content: msg,
+		showCancel: false
+	});
+}; // 订单状态
+
+const toast = msg => {
+	// setTimeout(function() {
+	// 	uni.showToast({
+	// 		icon: "none",
+	// 		title: msg,
+	// 		duration: 2000
+	// 	})
+	// }, 2000)
+
+	uni.showModal({
+		title: '',
+		content: msg,
+		showCancel: false
+	});
+
+}; // 订单状态
+
+
+const orderStatusDic = {
+	'0': '待确认',
+	'10': '待派单',
+	'20': '进行中',
+	'100': '已完成'
+}; // 审核状态
+
+const auditStatusDic = {
+	'0': '待审核',
+	'1': '已审核',
+	'-1': '已拒绝'
+}; // 请求封装
+
+const request = options => {
+	if (!options.customLoading) {
+		uni.showLoading({
+			title: '正在加载'
+		});
+	} else {
+		// 当前页面请求数量+1
+		// if (options.bindThis) {
+		// 	options.bindThis.setData({
+		// 		//loadingCount: options.bindThis.data.loadingCount + 1
+		// 	});
+		// }
+	}
+
+	options.url = HOST + options.api;
+	options.header = {
+		...options.header,
+		//'Accept': 'application/json',
+		//'Connection': 'keep-alive'
+		//'content-type': 'application/json'
+	}; // 如果已登录,请求中拼openId
+
+	var access_token = uni.getStorageSync(user_info_key).token;
 	var access_bd_token = uni.getStorageSync(userInfo_BD_token).token;
 	
 	var request_token = access_token
@@ -180,37 +180,37 @@ const request = options => {
 		request_token = access_bd_token
 	}
 	// var request_token = access_bd_token?access_bd_token:access_token
-	// console.log(request_token)
-	if (isLogin()) {
-		options.data = {
-			...options.data,
-			'token': request_token
-		};
-	} // 如果是POST方法
-
-
-	if (options.method == 'POST' && !isNull(request_token)) {
-		// 拼时间戳
-		options.data.ts = new Date().getTime();
-	}
-
-	uni.request({
-		...options,
-		success: function(res) {
-			uni.hideLoading();
-			if (res.statusCode != 200) {
+	// console.log(request_token)
+	if (isLogin()) {
+		options.data = {
+			...options.data,
+			'token': request_token
+		};
+	} // 如果是POST方法
+
+
+	if (options.method == 'POST' && !isNull(request_token)) {
+		// 拼时间戳
+		options.data.ts = new Date().getTime();
+	}
+
+	uni.request({
+		...options,
+		success: function(res) {
+			uni.hideLoading();
+			if (res.statusCode != 200) {
 				if (options.utilFail != undefined) {
-					
-					if (res.statusCode == 401) {
-						uni.clearStorageSync();
-						uni.navigateTo({
-							url: '/pages/index/index'
-						});
-					} else {
-						options.utilFail('TODO: 特殊处理非200错误(' + res.statusCode + ')');
-					}
-				}
-			} else {
+					
+					if (res.statusCode == 401) {
+						uni.clearStorageSync();
+						uni.navigateTo({
+							url: '/pages/index/index'
+						});
+					} else {
+						options.utilFail('TODO: 特殊处理非200错误(' + res.statusCode + ')');
+					}
+				}
+			} else {
 				if (res.data.hasOwnProperty("errcode")) {
 					// token鉴权失败
 					if (res.data?.errcode === 40001) {
@@ -272,7 +272,7 @@ const request = options => {
 							return
 						}
 						
-					} 
+					} 
 					if (options.utilFail != undefined) {
 						// console.log("res",res.data.errmsg)
 						options.utilFail(res.data.errmsg || '接口发生未知错误');
@@ -283,369 +283,369 @@ const request = options => {
 						// 			url: '/pages/index/index'
 						// 		});
 						// 	}
-						// },1000)
-					} else {
-						options.utilFail(res.data.errmsg);
-					}
-				} else {
-					if (options.utilSuccess != undefined) {
-						options.utilSuccess(res.data);
-					}
-				}
-			}
-		},
-		fail: options.utilFail,
-		complete: function(res) {
-			if (!options.customLoading) {
-				uni.hideNavigationBarLoading();
-
-			} else {
-				// 当前页面请求数量-1
-				// if (options.bindThis) {
-				// 	options.bindThis.setData({
-				// 		loadingCount: options.bindThis.data.loadingCount - 1
-				// 	});
-				// }
-			}
-		}
-	});
-}; // 提交formID封装
-
-
-
-const payOrder = (orderID, orderType, success, fail) => {
-	uni.request({
-		url: HOST + 'WxPay/ToPay?openId=' + uni.getStorageSync(user_info_key).WeChatOpenID +
-			'&orderId=' +
-			orderID + '&OrderType=' + orderType,
-		method: 'GET',
-		header: {
-			'content-type': 'application/json'
-		},
-		success: function(res) {
-			// 内容为空, 代表失败
-			if (res.data == '') {
-				fail('当前网络状况不好');
-				return;
-			} // 去掉转义字符
-
-
-			var pureStr = res.data.replace(/\\/g, '');
-			res.data = JSON.parse(pureStr);
-			var index = res.data.package.indexOf('=') + 1;
-			var prepayId = res.data.package.substring(index); // wxpay
-
-			uni.requestPayment({
-				timeStamp: res.data.timeStamp,
-				nonceStr: res.data.nonceStr,
-				package: res.data.package,
-				signType: res.data.signType,
-				paySign: res.data.paySign,
-				success: function(res) {
-					success(res); // 发送成功通知
-
-					request({
-						api: 'WxPay/PayTemplateMsg',
-						data: {
-							prepay_id: prepayId,
-							orderId: orderID,
-							isSuccess: 1,
-							failMsg: '',
-							xType: orderType
-						}
-					});
-				},
-				fail: function(res) {
-					fail(res);
-					var errMsg = res == 'requestPayment:fail cancel' ? '用户取消支付' :
-						res; // 发送失败通知
-
-					request({
-						api: 'WxPay/PayTemplateMsg',
-						data: {
-							prepay_id: prepayId,
-							orderId: orderID,
-							isSuccess: 0,
-							failMsg: errMsg,
-							xType: orderType
-						}
-					});
-				}
-			});
-		},
-		fail: function(err) {
-			fail('当前网络状况不好');
-		}
-	});
-}; // 判断是否已登录（同时有open-id和PhoneNum, 则认为已登录）
-
-const isLogin = () => {
+						// },1000)
+					} else {
+						options.utilFail(res.data.errmsg);
+					}
+				} else {
+					if (options.utilSuccess != undefined) {
+						options.utilSuccess(res.data);
+					}
+				}
+			}
+		},
+		fail: options.utilFail,
+		complete: function(res) {
+			if (!options.customLoading) {
+				uni.hideNavigationBarLoading();
+
+			} else {
+				// 当前页面请求数量-1
+				// if (options.bindThis) {
+				// 	options.bindThis.setData({
+				// 		loadingCount: options.bindThis.data.loadingCount - 1
+				// 	});
+				// }
+			}
+		}
+	});
+}; // 提交formID封装
+
+
+
+const payOrder = (orderID, orderType, success, fail) => {
+	uni.request({
+		url: HOST + 'WxPay/ToPay?openId=' + uni.getStorageSync(user_info_key).WeChatOpenID +
+			'&orderId=' +
+			orderID + '&OrderType=' + orderType,
+		method: 'GET',
+		header: {
+			'content-type': 'application/json'
+		},
+		success: function(res) {
+			// 内容为空, 代表失败
+			if (res.data == '') {
+				fail('当前网络状况不好');
+				return;
+			} // 去掉转义字符
+
+
+			var pureStr = res.data.replace(/\\/g, '');
+			res.data = JSON.parse(pureStr);
+			var index = res.data.package.indexOf('=') + 1;
+			var prepayId = res.data.package.substring(index); // wxpay
+
+			uni.requestPayment({
+				timeStamp: res.data.timeStamp,
+				nonceStr: res.data.nonceStr,
+				package: res.data.package,
+				signType: res.data.signType,
+				paySign: res.data.paySign,
+				success: function(res) {
+					success(res); // 发送成功通知
+
+					request({
+						api: 'WxPay/PayTemplateMsg',
+						data: {
+							prepay_id: prepayId,
+							orderId: orderID,
+							isSuccess: 1,
+							failMsg: '',
+							xType: orderType
+						}
+					});
+				},
+				fail: function(res) {
+					fail(res);
+					var errMsg = res == 'requestPayment:fail cancel' ? '用户取消支付' :
+						res; // 发送失败通知
+
+					request({
+						api: 'WxPay/PayTemplateMsg',
+						data: {
+							prepay_id: prepayId,
+							orderId: orderID,
+							isSuccess: 0,
+							failMsg: errMsg,
+							xType: orderType
+						}
+					});
+				}
+			});
+		},
+		fail: function(err) {
+			fail('当前网络状况不好');
+		}
+	});
+}; // 判断是否已登录（同时有open-id和PhoneNum, 则认为已登录）
+
+const isLogin = () => {
 	var userInfo = uni.getStorageSync(user_info_key);
-	var userInfoBDtoken = uni.getStorageSync(userInfo_BD_token);
-	return !isNull(userInfo.token) || !isNull(userInfoBDtoken.token);
-}; // 判断是否为空
-
-
-const isNull = p => {
-	return p == '' || p == undefined || p == null || p == 'undefined' || p == 'null';
+	var userInfoBDtoken = uni.getStorageSync(userInfo_BD_token);
+	return !isNull(userInfo.token) || !isNull(userInfoBDtoken.token);
+}; // 判断是否为空
+
+
+const isNull = p => {
+	return p == '' || p == undefined || p == null || p == 'undefined' || p == 'null';
 }; // 正则
 
-
-
-const phoneRegex = /^1[3456789]\d{9}$/;
-const idCardRegex = /^\d{17}([0-9]|X)$/; // 去掉特殊字符
-
-const filterSpecialChars = str => {
-	return str.replace(/[^\u4e00-\u9fa5a-zA-Z0-9\w]/g, '');
-}; // 生成随机字符串
-
-
-const randomStr = length => {
-	var ret = '';
-	var arr = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
-		'i', 'j',
-		'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C',
-		'D', 'E',
-		'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
-		'Y', 'Z'
-	];
-
-	for (var i = 0; i < length; i++) {
-		var randomIndex = Math.round(Math.random() * (arr.length - 1));
-		ret += arr[randomIndex];
-	}
-
-	return ret;
-}; // proType对应的中文描述
-
-const weekdayArr = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']; // 是否合法的身份证
-
-const isValidCardID = cardID => {
-	// Step1: 先判断格式
-	if (!idCardRegex.test(cardID)) return false; // Step2: 校验最后一位
-
-	var code = cardID.split(''); //加权因子
-
-	var factor = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]; //校验位
-
-	var parity = [1, 0, 'X', 9, 8, 7, 6, 5, 4, 3, 2];
-	var sum = 0;
-	var ai = 0;
-	var wi = 0;
-
-	for (var i = 0; i < 17; i++) {
-		ai = code[i];
-		wi = factor[i];
-		sum += ai * wi;
-	}
-
-	var last = parity[sum % 11];
-	return parity[sum % 11] == code[17];
+
+
+const phoneRegex = /^1[3456789]\d{9}$/;
+const idCardRegex = /^\d{17}([0-9]|X)$/; // 去掉特殊字符
+
+const filterSpecialChars = str => {
+	return str.replace(/[^\u4e00-\u9fa5a-zA-Z0-9\w]/g, '');
+}; // 生成随机字符串
+
+
+const randomStr = length => {
+	var ret = '';
+	var arr = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
+		'i', 'j',
+		'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C',
+		'D', 'E',
+		'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+		'Y', 'Z'
+	];
+
+	for (var i = 0; i < length; i++) {
+		var randomIndex = Math.round(Math.random() * (arr.length - 1));
+		ret += arr[randomIndex];
+	}
+
+	return ret;
+}; // proType对应的中文描述
+
+const weekdayArr = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']; // 是否合法的身份证
+
+const isValidCardID = cardID => {
+	// Step1: 先判断格式
+	if (!idCardRegex.test(cardID)) return false; // Step2: 校验最后一位
+
+	var code = cardID.split(''); //加权因子
+
+	var factor = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]; //校验位
+
+	var parity = [1, 0, 'X', 9, 8, 7, 6, 5, 4, 3, 2];
+	var sum = 0;
+	var ai = 0;
+	var wi = 0;
+
+	for (var i = 0; i < 17; i++) {
+		ai = code[i];
+		wi = factor[i];
+		sum += ai * wi;
+	}
+
+	var last = parity[sum % 11];
+	return parity[sum % 11] == code[17];
 };
 
 const shareInfo = {
 	title:"",
 	imageUrl:"/static/share.jpg"
-}
-/**  
- * UTF16和UTF8转换对照表  
- * U+00000000 – U+0000007F   0xxxxxxx  
- * U+00000080 – U+000007FF   110xxxxx 10xxxxxx  
- * U+00000800 – U+0000FFFF   1110xxxx 10xxxxxx 10xxxxxx  
- * U+00010000 – U+001FFFFF   11110xxx 10xxxxxx 10xxxxxx 10xxxxxx  
- * U+00200000 – U+03FFFFFF   111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx  
- * U+04000000 – U+7FFFFFFF   1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx  
- */
-
-
-var Base64 = {
-	// 转码表  
-	table: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
-		'T', 'U',
-		'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-		'o', 'p',
-		'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8',
-		'9', '+',
-		'/'
-	],
-	UTF16ToUTF8: function(str) {
-		var res = [],
-			len = str.length;
-
-		for (var i = 0; i < len; i++) {
-			var code = str.charCodeAt(i);
-
-			if (code > 0x0000 && code <= 0x007F) {
-				// 单字节，这里并不考虑0x0000，因为它是空字节  
-				// U+00000000 – U+0000007F  0xxxxxxx  
-				res.push(str.charAt(i));
-			} else if (code >= 0x0080 && code <= 0x07FF) {
-				// 双字节  
-				// U+00000080 – U+000007FF  110xxxxx 10xxxxxx  
-				// 110xxxxx  
-				var byte1 = 0xC0 | code >> 6 & 0x1F; // 10xxxxxx  
-
-				var byte2 = 0x80 | code & 0x3F;
-				res.push(String.fromCharCode(byte1), String.fromCharCode(byte2));
-			} else if (code >= 0x0800 && code <= 0xFFFF) {
-				// 三字节  
-				// U+00000800 – U+0000FFFF  1110xxxx 10xxxxxx 10xxxxxx  
-				// 1110xxxx  
-				var byte1 = 0xE0 | code >> 12 & 0x0F; // 10xxxxxx  
-
-				var byte2 = 0x80 | code >> 6 & 0x3F; // 10xxxxxx  
-
-				var byte3 = 0x80 | code & 0x3F;
-				res.push(String.fromCharCode(byte1), String.fromCharCode(byte2), String.fromCharCode(
-					byte3));
-			} else if (code >= 0x00010000 && code <= 0x001FFFFF) { // 四字节  
-				// U+00010000 – U+001FFFFF  11110xxx 10xxxxxx 10xxxxxx 10xxxxxx  
-			} else if (code >= 0x00200000 && code <= 0x03FFFFFF) { // 五字节  
-				// U+00200000 – U+03FFFFFF  111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx  
-			} else
-			/** if (code >= 0x04000000 && code <= 0x7FFFFFFF)*/
-			{ // 六字节  
-				// U+04000000 – U+7FFFFFFF  1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx  
-			}
-		}
-
-		return res.join('');
-	},
-	UTF8ToUTF16: function(str) {
-		var res = [],
-			len = str.length;
-		var i = 0;
-
-		for (var i = 0; i < len; i++) {
-			var code = str.charCodeAt(i); // 对第一个字节进行判断  
-
-			if ((code >> 7 & 0xFF) == 0x0) {
-				// 单字节  
-				// 0xxxxxxx  
-				res.push(str.charAt(i));
-			} else if ((code >> 5 & 0xFF) == 0x6) {
-				// 双字节  
-				// 110xxxxx 10xxxxxx  
-				var code2 = str.charCodeAt(++i);
-				var byte1 = (code & 0x1F) << 6;
-				var byte2 = code2 & 0x3F;
-				var utf16 = byte1 | byte2;
-				res.push(Sting.fromCharCode(utf16));
-			} else if ((code >> 4 & 0xFF) == 0xE) {
-				// 三字节  
-				// 1110xxxx 10xxxxxx 10xxxxxx  
-				var code2 = str.charCodeAt(++i);
-				var code3 = str.charCodeAt(++i);
-				var byte1 = code << 4 | code2 >> 2 & 0x0F;
-				var byte2 = (code2 & 0x03) << 6 | code3 & 0x3F;
-				utf16 = (byte1 & 0x00FF) << 8 | byte2;
-				res.push(String.fromCharCode(utf16));
-			} else if ((code >> 3 & 0xFF) == 0x1E) { // 四字节  
-				// 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx  
-			} else if ((code >> 2 & 0xFF) == 0x3E) { // 五字节  
-				// 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx  
-			} else
-			/** if (((code >> 1) & 0xFF) == 0x7E)*/
-			{ // 六字节  
-				// 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx  
-			}
-		}
-
-		return res.join('');
-	},
-	encode: function(str) {
-		if (!str) {
-			return '';
-		}
-
-		var utf8 = this.UTF16ToUTF8(str); // 转成UTF8  
-
-		var i = 0; // 遍历索引  
-
-		var len = utf8.length;
-		var res = [];
-
-		while (i < len) {
-			var c1 = utf8.charCodeAt(i++) & 0xFF;
-			res.push(this.table[c1 >> 2]); // 需要补2个=  
-
-			if (i == len) {
-				res.push(this.table[(c1 & 0x3) << 4]);
-				res.push('==');
-				break;
-			}
-
-			var c2 = utf8.charCodeAt(i++); // 需要补1个=  
-
-			if (i == len) {
-				res.push(this.table[(c1 & 0x3) << 4 | c2 >> 4 & 0x0F]);
-				res.push(this.table[(c2 & 0x0F) << 2]);
-				res.push('=');
-				break;
-			}
-
-			var c3 = utf8.charCodeAt(i++);
-			res.push(this.table[(c1 & 0x3) << 4 | c2 >> 4 & 0x0F]);
-			res.push(this.table[(c2 & 0x0F) << 2 | (c3 & 0xC0) >> 6]);
-			res.push(this.table[c3 & 0x3F]);
-		}
-
-		return res.join('');
-	},
-	decode: function(str) {
-		if (!str) {
-			return '';
-		}
-
-		var len = str.length;
-		var i = 0;
-		var res = [];
-
-		while (i < len) {
-			var code1 = this.table.indexOf(str.charAt(i++));
-			var code2 = this.table.indexOf(str.charAt(i++));
-			var code3 = this.table.indexOf(str.charAt(i++));
-			var code4 = this.table.indexOf(str.charAt(i++));
-			var c1 = code1 << 2 | code2 >> 4;
-			var c2 = (code2 & 0xF) << 4 | code3 >> 2;
-			var c3 = (code3 & 0x3) << 6 | code4;
-			res.push(String.fromCharCode(c1));
-
-			if (code3 != 64) {
-				res.push(String.fromCharCode(c2));
-			}
-
-			if (code4 != 64) {
-				res.push(String.fromCharCode(c3));
-			}
-		}
-
-		return this.UTF8ToUTF16(res.join(''));
-	}
-};
-module.exports = {
-	HOST: HOST,
-	formatTime: formatTime,
-	formatTimeAll: formatTimeAll,
-	formatNumber: formatNumber,
-	alert: alert,
-	getOpenidInfo: getOpenidInfo,
-	request: request,
-	payOrder: payOrder,
-	isLogin: isLogin,
-	isNull: isNull,
-	phoneRegex: phoneRegex,
-	idCardRegex: idCardRegex,
-	filterSpecialChars: filterSpecialChars,
-	randomStr: randomStr,
-	weekdayArr: weekdayArr,
-	Base64: Base64,
-	orderStatusDic: orderStatusDic,
-	auditStatusDic: auditStatusDic,
-	getUserProfile: getUserProfile,
-	getUserInfo: getUserInfo,
+}
+/**  
+ * UTF16和UTF8转换对照表  
+ * U+00000000 – U+0000007F   0xxxxxxx  
+ * U+00000080 – U+000007FF   110xxxxx 10xxxxxx  
+ * U+00000800 – U+0000FFFF   1110xxxx 10xxxxxx 10xxxxxx  
+ * U+00010000 – U+001FFFFF   11110xxx 10xxxxxx 10xxxxxx 10xxxxxx  
+ * U+00200000 – U+03FFFFFF   111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx  
+ * U+04000000 – U+7FFFFFFF   1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx  
+ */
+
+
+var Base64 = {
+	// 转码表  
+	table: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+		'T', 'U',
+		'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+		'o', 'p',
+		'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8',
+		'9', '+',
+		'/'
+	],
+	UTF16ToUTF8: function(str) {
+		var res = [],
+			len = str.length;
+
+		for (var i = 0; i < len; i++) {
+			var code = str.charCodeAt(i);
+
+			if (code > 0x0000 && code <= 0x007F) {
+				// 单字节，这里并不考虑0x0000，因为它是空字节  
+				// U+00000000 – U+0000007F  0xxxxxxx  
+				res.push(str.charAt(i));
+			} else if (code >= 0x0080 && code <= 0x07FF) {
+				// 双字节  
+				// U+00000080 – U+000007FF  110xxxxx 10xxxxxx  
+				// 110xxxxx  
+				var byte1 = 0xC0 | code >> 6 & 0x1F; // 10xxxxxx  
+
+				var byte2 = 0x80 | code & 0x3F;
+				res.push(String.fromCharCode(byte1), String.fromCharCode(byte2));
+			} else if (code >= 0x0800 && code <= 0xFFFF) {
+				// 三字节  
+				// U+00000800 – U+0000FFFF  1110xxxx 10xxxxxx 10xxxxxx  
+				// 1110xxxx  
+				var byte1 = 0xE0 | code >> 12 & 0x0F; // 10xxxxxx  
+
+				var byte2 = 0x80 | code >> 6 & 0x3F; // 10xxxxxx  
+
+				var byte3 = 0x80 | code & 0x3F;
+				res.push(String.fromCharCode(byte1), String.fromCharCode(byte2), String.fromCharCode(
+					byte3));
+			} else if (code >= 0x00010000 && code <= 0x001FFFFF) { // 四字节  
+				// U+00010000 – U+001FFFFF  11110xxx 10xxxxxx 10xxxxxx 10xxxxxx  
+			} else if (code >= 0x00200000 && code <= 0x03FFFFFF) { // 五字节  
+				// U+00200000 – U+03FFFFFF  111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx  
+			} else
+			/** if (code >= 0x04000000 && code <= 0x7FFFFFFF)*/
+			{ // 六字节  
+				// U+04000000 – U+7FFFFFFF  1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx  
+			}
+		}
+
+		return res.join('');
+	},
+	UTF8ToUTF16: function(str) {
+		var res = [],
+			len = str.length;
+		var i = 0;
+
+		for (var i = 0; i < len; i++) {
+			var code = str.charCodeAt(i); // 对第一个字节进行判断  
+
+			if ((code >> 7 & 0xFF) == 0x0) {
+				// 单字节  
+				// 0xxxxxxx  
+				res.push(str.charAt(i));
+			} else if ((code >> 5 & 0xFF) == 0x6) {
+				// 双字节  
+				// 110xxxxx 10xxxxxx  
+				var code2 = str.charCodeAt(++i);
+				var byte1 = (code & 0x1F) << 6;
+				var byte2 = code2 & 0x3F;
+				var utf16 = byte1 | byte2;
+				res.push(Sting.fromCharCode(utf16));
+			} else if ((code >> 4 & 0xFF) == 0xE) {
+				// 三字节  
+				// 1110xxxx 10xxxxxx 10xxxxxx  
+				var code2 = str.charCodeAt(++i);
+				var code3 = str.charCodeAt(++i);
+				var byte1 = code << 4 | code2 >> 2 & 0x0F;
+				var byte2 = (code2 & 0x03) << 6 | code3 & 0x3F;
+				utf16 = (byte1 & 0x00FF) << 8 | byte2;
+				res.push(String.fromCharCode(utf16));
+			} else if ((code >> 3 & 0xFF) == 0x1E) { // 四字节  
+				// 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx  
+			} else if ((code >> 2 & 0xFF) == 0x3E) { // 五字节  
+				// 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx  
+			} else
+			/** if (((code >> 1) & 0xFF) == 0x7E)*/
+			{ // 六字节  
+				// 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx  
+			}
+		}
+
+		return res.join('');
+	},
+	encode: function(str) {
+		if (!str) {
+			return '';
+		}
+
+		var utf8 = this.UTF16ToUTF8(str); // 转成UTF8  
+
+		var i = 0; // 遍历索引  
+
+		var len = utf8.length;
+		var res = [];
+
+		while (i < len) {
+			var c1 = utf8.charCodeAt(i++) & 0xFF;
+			res.push(this.table[c1 >> 2]); // 需要补2个=  
+
+			if (i == len) {
+				res.push(this.table[(c1 & 0x3) << 4]);
+				res.push('==');
+				break;
+			}
+
+			var c2 = utf8.charCodeAt(i++); // 需要补1个=  
+
+			if (i == len) {
+				res.push(this.table[(c1 & 0x3) << 4 | c2 >> 4 & 0x0F]);
+				res.push(this.table[(c2 & 0x0F) << 2]);
+				res.push('=');
+				break;
+			}
+
+			var c3 = utf8.charCodeAt(i++);
+			res.push(this.table[(c1 & 0x3) << 4 | c2 >> 4 & 0x0F]);
+			res.push(this.table[(c2 & 0x0F) << 2 | (c3 & 0xC0) >> 6]);
+			res.push(this.table[c3 & 0x3F]);
+		}
+
+		return res.join('');
+	},
+	decode: function(str) {
+		if (!str) {
+			return '';
+		}
+
+		var len = str.length;
+		var i = 0;
+		var res = [];
+
+		while (i < len) {
+			var code1 = this.table.indexOf(str.charAt(i++));
+			var code2 = this.table.indexOf(str.charAt(i++));
+			var code3 = this.table.indexOf(str.charAt(i++));
+			var code4 = this.table.indexOf(str.charAt(i++));
+			var c1 = code1 << 2 | code2 >> 4;
+			var c2 = (code2 & 0xF) << 4 | code3 >> 2;
+			var c3 = (code3 & 0x3) << 6 | code4;
+			res.push(String.fromCharCode(c1));
+
+			if (code3 != 64) {
+				res.push(String.fromCharCode(c2));
+			}
+
+			if (code4 != 64) {
+				res.push(String.fromCharCode(c3));
+			}
+		}
+
+		return this.UTF8ToUTF16(res.join(''));
+	}
+};
+module.exports = {
+	HOST: HOST,
+	formatTime: formatTime,
+	formatTimeAll: formatTimeAll,
+	formatNumber: formatNumber,
+	alert: alert,
+	getOpenidInfo: getOpenidInfo,
+	request: request,
+	payOrder: payOrder,
+	isLogin: isLogin,
+	isNull: isNull,
+	phoneRegex: phoneRegex,
+	idCardRegex: idCardRegex,
+	filterSpecialChars: filterSpecialChars,
+	randomStr: randomStr,
+	weekdayArr: weekdayArr,
+	Base64: Base64,
+	orderStatusDic: orderStatusDic,
+	auditStatusDic: auditStatusDic,
+	getUserProfile: getUserProfile,
+	getUserInfo: getUserInfo,
 	toast: toast,
 	isValidCardID:isValidCardID,
 	shareInfo:shareInfo
-	
+	
 };