no message

pagesReservation/record/record.vue

@@ -9,7 +9,7 @@
 				<view class="box_title">
 					<view class="title_msg">
 						<view class="msg_name">{{ item.userName }}</view>
-						<view class="msg_time">/{{ item.createTime }}</view>
+						<view class="msg_time">/{{ time_format(item.createTime) }}</view>
 					</view>
 					<view class="title_type" v-if="item.statuStr == '待审核'">{{ item.statuStr }}</view>
 					<view class="title_type red" v-if="item.statuStr == '已拒绝'">{{ item.statuStr }}</view>
@@ -18,7 +18,7 @@
 				<view class="box_info">
 					<view class="info_box">
 						<view class="box_key">来访时间</view>
-						<view class="box_value">{{ item.visitorTime }}</view>
+						<view class="box_value">{{ time_format(item.visitorTime) }}</view>
 					</view>
 					<view class="info_box">
 						<view class="box_key">访问事由</view>
@@ -63,7 +63,7 @@
 
 				<view class="pop_info">
 					<view class="info_key">来访时间：</view>
-					<view class="info_value">{{ popObj.visitorTime }}</view>
+					<view class="info_value" v-if="popObj.visitorTime">{{ time_format(popObj.visitorTime) }}</view>
 				</view>
 
 				<view class="pop_info">
@@ -105,6 +105,7 @@ import Tabber from '@/components/tabber.vue'
 import NoData from '@/components/noData.vue'
 import { myRequest } from '@/utils/api.js'
 import { decryptDes } from '@/utils/des.js'
+import { time_format } from '@/utils/formatTime.js'
 
 // 分段器当前索引
 const activeCurrent = ref(0)

pagesReservation/register/register.vue

@@ -49,7 +49,7 @@
 			</view>
 
 			<!-- 证件号区域 -->
-			<view class="body_box">
+			<view class="body_box" v-if="type != 1">
 				<view class="box_key">
 					<text class="key_icon">*</text>
 					证件号
@@ -192,8 +192,7 @@ const btnFlag = computed(() => {
 		visName.value &&
 		visPhone.value &&
 		visStartTime.value &&
-		visEndTime.value &&
-		visIdNumber.value &&
+		visEndTime.value && [type.value === '1' && !visIdNumber.value] &&
 		visReason.value && [type.value === '1' && !list.value.length] && [type.value === '1' && !tem] && [type.value === '2' && !passiveName.value] && [
 			type.value === '2' && !passivePhone.value
 		] &&
@@ -373,14 +372,14 @@ const verifyValue = () => {
 		})
 		return false
 	}
-	if (!visIdNumber.value) {
+	if (type.value != 1 && !visIdNumber.value) {
 		uni.showToast({
 			title: '请输入访客证件号',
 			icon: 'none'
 		})
 		return false
 	}
-	if (!regIdentity.test(visIdNumber.value)) {
+	if (type.value != 1 && !regIdentity.test(visIdNumber.value)) {
 		uni.showToast({
 			title: '证件号格式错误',
 			icon: 'none'

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1542,8 +1542,8 @@ function populateParameters(fromRes, toRes) {
     appVersion: "1.0.0",
     appVersionCode: "100",
     appLanguage: getAppLanguage(hostLanguage),
-    uniCompileVersion: "4.14",
-    uniRuntimeVersion: "4.14",
+    uniCompileVersion: "4.15",
+    uniRuntimeVersion: "4.15",
     uniPlatform: "mp-weixin",
     deviceBrand,
     deviceModel: model,

unpackage/dist/dev/mp-weixin/pagesReservation/record/record.js

@@ -2,6 +2,7 @@
 const common_vendor = require("../../common/vendor.js");
 const utils_api = require("../../utils/api.js");
 const utils_des = require("../../utils/des.js");
+const utils_formatTime = require("../../utils/formatTime.js");
 if (!Array) {
   const _easycom_uni_segmented_control2 = common_vendor.resolveComponent("uni-segmented-control");
   const _easycom_uni_popup2 = common_vendor.resolveComponent("uni-popup");
@@ -108,7 +109,7 @@ const _sfc_main = {
         c: common_vendor.f(list.value, (item, k0, i0) => {
           return common_vendor.e({
             a: common_vendor.t(item.userName),
-            b: common_vendor.t(item.createTime),
+            b: common_vendor.t(common_vendor.unref(utils_formatTime.time_format)(item.createTime)),
             c: item.statuStr == "待审核"
           }, item.statuStr == "待审核" ? {
             d: common_vendor.t(item.statuStr)
@@ -121,7 +122,7 @@ const _sfc_main = {
           }, item.statuStr == "已推送" ? {
             h: common_vendor.t(item.statuStr)
           } : {}, {
-            i: common_vendor.t(item.visitorTime),
+            i: common_vendor.t(common_vendor.unref(utils_formatTime.time_format)(item.visitorTime)),
             j: common_vendor.t(item.visitReason),
             k: item.statuStr == "待审核"
           }, item.statuStr == "待审核" ? {
@@ -148,18 +149,21 @@ const _sfc_main = {
       } : {}, {
         l: common_vendor.t(popObj.value.userName),
         m: common_vendor.t(popObj.value.userPhone),
-        n: common_vendor.t(popObj.value.visitorTime),
-        o: common_vendor.t(popObj.value.userNumber),
-        p: common_vendor.t(popObj.value.visitReason),
-        q: common_vendor.t(popObj.value.carNum ? popObj.value.carNum : "无"),
-        r: common_vendor.t(popObj.value.peerNum ? popObj.value.peerNum : "无"),
-        s: common_vendor.t(popObj.value.visitorType == 1 ? "受访学生" : "受访人"),
-        t: common_vendor.t(popObj.value.respondentName),
-        v: common_vendor.t(popObj.value.responcode || popObj.value.respondentPhone),
-        w: common_vendor.sr(popup, "00bd71c9-2", {
+        n: popObj.value.visitorTime
+      }, popObj.value.visitorTime ? {
+        o: common_vendor.t(common_vendor.unref(utils_formatTime.time_format)(popObj.value.visitorTime))
+      } : {}, {
+        p: common_vendor.t(popObj.value.userNumber),
+        q: common_vendor.t(popObj.value.visitReason),
+        r: common_vendor.t(popObj.value.carNum ? popObj.value.carNum : "无"),
+        s: common_vendor.t(popObj.value.peerNum ? popObj.value.peerNum : "无"),
+        t: common_vendor.t(popObj.value.visitorType == 1 ? "受访学生" : "受访人"),
+        v: common_vendor.t(popObj.value.respondentName),
+        w: common_vendor.t(popObj.value.responcode || popObj.value.respondentPhone),
+        x: common_vendor.sr(popup, "00bd71c9-2", {
           "k": "popup"
         }),
-        x: common_vendor.p({
+        y: common_vendor.p({
           type: "center",
           ["is-mask-click"]: false
         })

unpackage/dist/dev/mp-weixin/pagesReservation/register/register.js

@@ -30,7 +30,7 @@ const _sfc_main = {
     const authValue = common_vendor.ref(false);
     const btnFlag = common_vendor.computed(() => {
       const tem = list.value.some((item) => item.isChecked);
-      if (visName.value && visPhone.value && visStartTime.value && visEndTime.value && visIdNumber.value && visReason.value && [type.value === "1" && !list.value.length] && [type.value === "1" && !tem] && [type.value === "2" && !passiveName.value] && [
+      if (visName.value && visPhone.value && visStartTime.value && visEndTime.value && [type.value === "1" && !visIdNumber.value] && visReason.value && [type.value === "1" && !list.value.length] && [type.value === "1" && !tem] && [type.value === "2" && !passiveName.value] && [
         type.value === "2" && !passivePhone.value
       ] && authValue.value) {
         return true;
@@ -182,14 +182,14 @@ const _sfc_main = {
         });
         return false;
       }
-      if (!visIdNumber.value) {
+      if (type.value != 1 && !visIdNumber.value) {
         common_vendor.index.showToast({
           title: "请输入访客证件号",
           icon: "none"
         });
         return false;
       }
-      if (!regIdentity.test(visIdNumber.value)) {
+      if (type.value != 1 && !regIdentity.test(visIdNumber.value)) {
         common_vendor.index.showToast({
           title: "证件号格式错误",
           icon: "none"
@@ -285,34 +285,37 @@ const _sfc_main = {
         }),
         l: common_vendor.t(visEndTime.value || "来访时间为4小时"),
         m: visEndTime.value ? 1 : "",
-        n: type.value == 1,
-        o: visIdNumber.value,
-        p: common_vendor.o(($event) => visIdNumber.value = $event.detail.value),
-        q: visReason.value,
-        r: common_vendor.o(($event) => visReason.value = $event.detail.value),
-        s: visCarNumber.value,
-        t: common_vendor.o(($event) => visCarNumber.value = $event.detail.value),
-        v: visPeopleNum.value,
-        w: common_vendor.o(common_vendor.m(($event) => visPeopleNum.value = $event.detail.value, {
+        n: type.value != 1
+      }, type.value != 1 ? {
+        o: type.value == 1,
+        p: visIdNumber.value,
+        q: common_vendor.o(($event) => visIdNumber.value = $event.detail.value)
+      } : {}, {
+        r: visReason.value,
+        s: common_vendor.o(($event) => visReason.value = $event.detail.value),
+        t: visCarNumber.value,
+        v: common_vendor.o(($event) => visCarNumber.value = $event.detail.value),
+        w: visPeopleNum.value,
+        x: common_vendor.o(common_vendor.m(($event) => visPeopleNum.value = $event.detail.value, {
           number: true
         })),
-        x: type.value == 2
+        y: type.value == 2
       }, type.value == 2 ? {
-        y: type.value == 2,
-        z: passiveName.value,
-        A: common_vendor.o(($event) => passiveName.value = $event.detail.value)
+        z: type.value == 2,
+        A: passiveName.value,
+        B: common_vendor.o(($event) => passiveName.value = $event.detail.value)
       } : {}, {
-        B: type.value == 2
+        C: type.value == 2
       }, type.value == 2 ? {
-        C: type.value == 2,
-        D: passivePhone.value,
-        E: common_vendor.o(($event) => passivePhone.value = $event.detail.value)
+        D: type.value == 2,
+        E: passivePhone.value,
+        F: common_vendor.o(($event) => passivePhone.value = $event.detail.value)
       } : {}, {
-        F: type.value == 1
-      }, type.value == 1 ? {} : {}, {
         G: type.value == 1
+      }, type.value == 1 ? {} : {}, {
+        H: type.value == 1
       }, type.value == 1 ? {
-        H: common_vendor.f(list.value, (item, k0, i0) => {
+        I: common_vendor.f(list.value, (item, k0, i0) => {
           return {
             a: item.isChecked,
             b: common_vendor.t(item.name),
@@ -322,10 +325,10 @@ const _sfc_main = {
           };
         })
       } : {}, {
-        I: authValue.value,
-        J: common_vendor.o(handleAuth),
-        K: btnFlag.value ? 1 : "",
-        L: common_vendor.o(handleSubmit)
+        J: authValue.value,
+        K: common_vendor.o(handleAuth),
+        L: btnFlag.value ? 1 : "",
+        M: common_vendor.o(handleSubmit)
       });
     };
   }