no message

pages/bind/bind.vue

@@ -9,7 +9,7 @@
 
 			<view class="body_row mt-30">
 				<view class="row_text">学号</view>
-				<input class="row_input" type="number" placeholder="请输入编号" placeholder-style="color:#CCCCCC" v-model="number" />
+				<input class="row_input" type="number" placeholder="请输入学号" placeholder-style="color:#CCCCCC" v-model="number" />
 			</view>
 
 			<!-- <view class="body_row mt-30">

pages/grade/grade.vue

@@ -69,6 +69,7 @@ const getData = async () => {
 				list.value = item.bookUserList
 				// 班级信息
 				className.value = arr[index].className
+
 				temlist = arr
 			}
 		})

pages/msgWarn/msgWarn.vue

@@ -14,7 +14,7 @@
 			<view class="box_card">
 				<view class="card_title">
 					<!-- <view class="title_read" v-if="item.isRead === 0"></view> -->
-					{{ item.type == 1 ? '预警推送' : '学生轨迹' }}
+					{{ item.type == 1 ? '设备安防预警通知' : '学生出入消息提醒' }}
 				</view>
 				<view class="card_msg" v-if="item.userName">姓名：{{ item.userName }}</view>
 				<view class="card_msg" v-if="item.typeName">类型：{{ item.typeName }}</view>
@@ -74,7 +74,7 @@ const total = ref(0)
 const currentIndex = ref(0)
 
 // 筛选框类型数组
-const array = ref(['全部通知', '预警推送', '学生轨迹'])
+const array = ref(['全部通知', '设备安防预警通知', '学生出入消息提醒'])
 
 // 信息列表
 const list = ref([])

pages/myMsg/myMsg.vue

@@ -159,16 +159,23 @@ import { decryptDes } from '@/utils/des.js'
 // 用户信息
 const userInfo = ref({})
 
+// 页面类型 1孩子信息 2登录账号信息
+const type = ref()
+
 onLoad((options) => {
 	if (options.id) {
+		type.value = 1
 		getUserInfo(options.id)
 	} else {
+		type.value = 2
 		userInfo.value = uni.getStorageSync('userInfo')
 	}
 })
 
 onShow(() => {
-	userInfo.value = uni.getStorageSync('userInfo')
+	if (type.value === 2) {
+		userInfo.value = uni.getStorageSync('userInfo')
+	}
 })
 
 const getUserInfo = async (id) => {

pages/quickMark/quickMark.vue

@@ -135,12 +135,21 @@ const setBrightness = (data) => {
 }
 
 // 提示信息函数
-const showTips = () => {
-	uni.showToast({
-		title: '不要把二维码给他人使用，否则将冻结账号',
-		icon: 'none',
-		duration: 3500
+const showTips = async () => {
+	setTimeout(() => {
+		uni.showToast({
+			title: '不要把二维码给他人使用，否则将冻结账号',
+			icon: 'none',
+			duration: 3500
+		})
+	}, 100)
+	const res = await myRequest({
+		url: '/wanzai/api/smartScreenshotRecord/userScreenshotRecord',
+		data: {
+			userId: uni.getStorageSync('userInfo').id
+		}
 	})
+	// console.log(res)
 }
 </script>
 

pagesReservation/register/register.vue

@@ -60,14 +60,18 @@
 			</view>
 
 			<!-- 访问事由区域 -->
-			<view class="body_box">
+			<view class="body_box no_border">
 				<view class="box_key">
 					<text class="key_icon">*</text>
 					访问事由
 				</view>
-				<view class="box_value">
-					<input class="value_input" type="text" placeholder="请输入访问事由" placeholder-style="color:#CCCCCC;" v-model="visReason" maxlength="100" />
-				</view>
+				<!-- <view class="box_value">
+					<input class="value_input" type="text" placeholder="请输入访问事由" placeholder-style="color:#CCCCCC;" v-model="visReason" maxlength="50" />
+				</view> -->
+			</view>
+
+			<view class="textarea">
+				<uni-easyinput type="textarea" :maxlength="50" placeholder="请输入访问事由(不超过50个字符)" v-model="visReason"></uni-easyinput>
 			</view>
 
 			<!-- 图片上传区域 -->
@@ -643,6 +647,11 @@ const handleLookImg = (urls, current) => {
 			}
 		}
 
+		.textarea {
+			padding-right: 20rpx;
+			width: 710rpx;
+		}
+
 		.filePicker {
 			display: flex;
 			margin-bottom: 20rpx;

unpackage/dist/dev/mp-weixin/pages/msgWarn/msgWarn.js

@@ -35,7 +35,7 @@ const _sfc_main = {
     const pageCount = common_vendor.ref(5);
     const total = common_vendor.ref(0);
     const currentIndex = common_vendor.ref(0);
-    const array = common_vendor.ref(["全部通知", "预警推送", "学生轨迹"]);
+    const array = common_vendor.ref(["全部通知", "设备安防预警通知", "学生出入消息提醒"]);
     const list = common_vendor.ref([]);
     const getData = async () => {
       const res = await utils_api.myRequest({
@@ -68,7 +68,7 @@ const _sfc_main = {
         e: common_vendor.f(list.value, (item, k0, i0) => {
           return common_vendor.e({
             a: common_vendor.t(item.dateTime),
-            b: common_vendor.t(item.type == 1 ? "预警推送" : "学生轨迹"),
+            b: common_vendor.t(item.type == 1 ? "设备安防预警通知" : "学生出入消息提醒"),
             c: item.userName
           }, item.userName ? {
             d: common_vendor.t(item.userName)

unpackage/dist/dev/mp-weixin/pages/myMsg/myMsg.js

@@ -8,15 +8,20 @@ const _sfc_main = {
   __name: "myMsg",
   setup(__props) {
     const userInfo = common_vendor.ref({});
+    const type = common_vendor.ref();
     common_vendor.onLoad((options) => {
       if (options.id) {
+        type.value = 1;
         getUserInfo(options.id);
       } else {
+        type.value = 2;
         userInfo.value = common_vendor.index.getStorageSync("userInfo");
       }
     });
     common_vendor.onShow(() => {
-      userInfo.value = common_vendor.index.getStorageSync("userInfo");
+      if (type.value === 2) {
+        userInfo.value = common_vendor.index.getStorageSync("userInfo");
+      }
     });
     const getUserInfo = async (id) => {
       const res = await utils_api.myRequest({

unpackage/dist/dev/mp-weixin/pages/quickMark/quickMark.js

@@ -98,11 +98,19 @@ const _sfc_main = {
         value: data
       });
     };
-    const showTips = () => {
-      common_vendor.index.showToast({
-        title: "不要把二维码给他人使用，否则将冻结账号",
-        icon: "none",
-        duration: 3500
+    const showTips = async () => {
+      setTimeout(() => {
+        common_vendor.index.showToast({
+          title: "不要把二维码给他人使用，否则将冻结账号",
+          icon: "none",
+          duration: 3500
+        });
+      }, 100);
+      await utils_api.myRequest({
+        url: "/wanzai/api/smartScreenshotRecord/userScreenshotRecord",
+        data: {
+          userId: common_vendor.index.getStorageSync("userInfo").id
+        }
       });
     };
     return (_ctx, _cache) => {

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

@@ -9,11 +9,13 @@ const utils_imageCompress = require("../../utils/imageCompress.js");
 const utils_cos = require("../../utils/cos.js");
 if (!Array) {
   const _easycom_uni_datetime_picker2 = common_vendor.resolveComponent("uni-datetime-picker");
-  _easycom_uni_datetime_picker2();
+  const _easycom_uni_easyinput2 = common_vendor.resolveComponent("uni-easyinput");
+  (_easycom_uni_datetime_picker2 + _easycom_uni_easyinput2)();
 }
 const _easycom_uni_datetime_picker = () => "../../uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.js";
+const _easycom_uni_easyinput = () => "../../uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js";
 if (!Math) {
-  _easycom_uni_datetime_picker();
+  (_easycom_uni_datetime_picker + _easycom_uni_easyinput)();
 }
 const _sfc_main = {
   __name: "register",
@@ -354,8 +356,13 @@ const _sfc_main = {
         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),
+        r: common_vendor.o(($event) => visReason.value = $event),
+        s: common_vendor.p({
+          type: "textarea",
+          maxlength: 50,
+          placeholder: "请输入访问事由(不超过50个字符)",
+          modelValue: visReason.value
+        }),
         t: type.value == 1
       }, type.value == 1 ? {
         v: common_vendor.t(maxImgCount.value)

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

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "访客预约",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "uni-datetime-picker": "../../uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker"
+    "uni-datetime-picker": "../../uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker",
+    "uni-easyinput": "../../uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput"
   }
 }

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

@@ -46,6 +46,10 @@
 .container .body .body_box .box_value .activeTime.data-v-0b2c2ae2 {
   color: #000;
 }
+.container .body .textarea.data-v-0b2c2ae2 {
+  padding-right: 20rpx;
+  width: 710rpx;
+}
 .container .body .filePicker.data-v-0b2c2ae2 {
   display: flex;
   margin-bottom: 20rpx;

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -8,6 +8,13 @@
     "miniprogram": {
       "list": [
         {
+          "name": "pagesReservation/register/register",
+          "pathName": "pagesReservation/register/register",
+          "query": "type=2",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "pagesReservation/backlog/backlog",
           "pathName": "pagesReservation/backlog/backlog",
           "query": "",

utils/api.js

@@ -12,7 +12,7 @@ export const myRequest = (options) => {
 			method: options.method || "GET",
 			header: options.header || {
 				'token': uni.getStorageSync('token'),
-				'userhead': uni.getStorageSync('userhead')
+				'user_head': uni.getStorageSync('userhead')
 			},
 			data: options.data || {},
 			timeout: 25000,