提交

miniprogram/api/index.ts

@@ -4,7 +4,7 @@ import request from "../utils/request";
  * 登录
  * @param params 
  */
-function login(params:WechatMiniprogram.requestParamsData) {
+function login(params: WechatMiniprogram.requestParamsData) {
   return request({
     url: "/v3/login",
     data: params.data,
@@ -16,11 +16,11 @@ function login(params:WechatMiniprogram.requestParamsData) {
  * 获取手机号
  * @param params 
  */
-function getPhone(params:WechatMiniprogram.requestParamsData) {
+function getPhone(params: WechatMiniprogram.requestParamsData) {
   return request({
     url: "/v3/getuserphonenumber",
     data: params.data,
-    header:{
+    header: {
       Authorization: wx.getStorageSync("token"),
       ...params.header
     },
@@ -32,11 +32,11 @@ function getPhone(params:WechatMiniprogram.requestParamsData) {
  * 下单
  * @param params 
  */
-function createOrder(params:WechatMiniprogram.requestParamsData) {
+function createOrder(params: WechatMiniprogram.requestParamsData) {
   return request({
     url: "/v3/jsApiPay",
     data: params.data,
-    header:{
+    header: {
       Authorization: wx.getStorageSync("token"),
       ...params.header
     },
@@ -48,13 +48,13 @@ function createOrder(params:WechatMiniprogram.requestParamsData) {
  * 获取状态
  * @param params 
  */
-function getUser(params:WechatMiniprogram.requestParamsData) {
-  if(!wx.getStorageSync("token")) return;
+function getUser(params: WechatMiniprogram.requestParamsData) {
+  if (!wx.getStorageSync("token")) return;
   return request({
     url: "/v3/user-state",
     data: params.data,
     noloading: params.noloading,
-    header:{
+    header: {
       Authorization: wx.getStorageSync("token"),
       ...params.header
     },
@@ -67,11 +67,11 @@ function getUser(params:WechatMiniprogram.requestParamsData) {
  * 获取视频结果
  * @param params 
  */
-function getVideo(params:WechatMiniprogram.requestParamsData) {
+function getVideo(params: WechatMiniprogram.requestParamsData) {
   return request({
     url: "/v3/getVideo",
     data: params.data,
-    header:{
+    header: {
       Authorization: wx.getStorageSync("token"),
       ...params.header
     },
@@ -83,12 +83,12 @@ function getVideo(params:WechatMiniprogram.requestParamsData) {
  * 保存用户信息
  * @param params 
  */
-function seaveUserData(params:WechatMiniprogram.requestParamsData) {
+function seaveUserData(params: WechatMiniprogram.requestParamsData) {
   return request({
     url: "/v3/save-info",
     data: params.data,
     method: params.method,
-    header:{
+    header: {
       Authorization: wx.getStorageSync("token"),
       ...params.header
     },
@@ -100,13 +100,30 @@ function seaveUserData(params:WechatMiniprogram.requestParamsData) {
  * 获取页面信息
  * @param params 
  */
-function getPageInfo(params:WechatMiniprogram.requestParamsData) {
+function getPageInfo(params: WechatMiniprogram.requestParamsData) {
   return request({
     url: "https://djweb.smcic.net/video/PageInfo.json",
     data: params.data,
     method: params.method,
     baseUrlNone: true,
-    header:{
+    header: {
+      ...params.header
+    },
+    success: params.success
+  })
+}
+
+/**
+ * 获取学校列表
+ * @param params 
+ */
+function getSchoolList(params: WechatMiniprogram.requestParamsData) {
+  return request({
+    url: "/v3/organization",
+    data: params.data,
+    method: params.method,
+    header: {
+      Authorization: wx.getStorageSync("token"),
       ...params.header
     },
     success: params.success
@@ -114,6 +131,7 @@ function getPageInfo(params:WechatMiniprogram.requestParamsData) {
 }
 
 export default {
+  getSchoolList,
   login,
   getPhone,
   createOrder,

miniprogram/pages/entry/index.scss

@@ -34,6 +34,7 @@
       border: 1rpx solid #E5E5E5;
       padding: 6rpx;
       height: 72rpx;
+      line-height: 72rpx;
       border-radius: 6rpx;
       font-size: 0;
 

miniprogram/pages/entry/index.ts

@@ -9,6 +9,8 @@ Page({
   data: {
     nickName: "",
     phoneNumber: "",
+    school: "",
+    schoolList: [],
     inputed: false
   },
 
@@ -34,8 +36,9 @@ Page({
     }
     app.seaveUserData({
       data: {
-        "name": this.data.nickName,
-        "phone": this.data.phoneNumber
+        name: this.data.nickName,
+        phone: this.data.phoneNumber,
+        organization: this.data.school || undefined
       },
       method: "POST",
       success: () => {
@@ -81,6 +84,11 @@ Page({
       }
     })
   },
+  bindchange(e:WechatMiniprogram.CustomEvent){
+    this.setData({
+      school: this.data.schoolList[e.detail.value] || ""
+    })
+  },
 
   /**
    * 生命周期函数--监听页面加载
@@ -92,6 +100,16 @@ Page({
         inputed: true
       })
     }
+    app.getSchoolList({
+      data: {},
+      method: "GET",
+      success: (res: any) => {
+        this.setData({
+          schoolList: (res || []).map((v:any) => v.organization),
+          school: (res || [])[0]?.organization
+        })
+      }
+    })
   },
 
   /**

miniprogram/pages/entry/index.wxml

@@ -8,17 +8,26 @@
     <view class="input">
       <input value="{{nickName}}" bindinput="bindKeyInput" type="text" style="width: 655rpx;" class="inputTool" placeholder-class="placeholder-style" placeholder="请输入姓名" />
     </view>
+    <view class="label">
+      学校
+    </view>
+    <view class="input">
+      <picker bindchange="bindchange" mode="selector" range="{{schoolList}}" style="width: 655rpx;" class="inputTool {{school ? '' : 'placeholder-style'}}">
+        {{school || "请选择学校"}}
+      </picker>
+    </view>
     <view class="label">
       手机号
     </view>
     <view class="input">
       <input disabled="{{inputed}}" value="{{phoneNumber}}" bindinput="phoneinput" type="number" class="inputTool" placeholder-class="placeholder-style" placeholder="请输入手机号" />
-      <button disabled="{{inputed}}" class="buttom" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">一键获取手机号</button>
+      <button wx:if="{{!inputed}}" class="buttom" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">一键获取手机号</button>
     </view>
 
     <view class="faceBtn" bindtap="toFace">
       进行人脸识别
     </view>
+
   </view>
 
 </view>

miniprogram/pages/faceRecognitionVK/index.ts

@@ -141,7 +141,8 @@ Page({
     })
     // 静态图片检测模式下，每调一次 detectFace 接口就会触发一次 updateAnchors 事件
     createVKSession?.on('updateAnchors', (anchors)=> {
-      anchors.forEach((anchor:any) => {
+      for (let I = 0; I < anchors.length; I++) {
+        const anchor = anchors[I];
         const W = anchor.size.width * 100;
         let titlet = "";
         if(W < 20 || W > 80 ) titlet = "请远离屏幕"
@@ -150,7 +151,7 @@ Page({
           icon: "none",
           title: titlet
         })
-      })
+      }
     })
     createVKSession?.on('removeAnchors', () => {
       wx.showToast({

project.private.config.json

@@ -15,13 +15,6 @@
           "launchMode": "default",
           "scene": null
         },
-        {
-          "name": "",
-          "pathName": "pages/tool/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
         {
           "name": "",
           "pathName": "pages/home/index",