From b8e17f15934606f396bf15f5578d49e743104130 Mon Sep 17 00:00:00 2001 From: liupopo Date: Fri, 23 Jun 2023 13:56:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=8F=8A?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- supervise-wx-mp/common/request.api.js | 2 +- .../pages/index/enterpriseRisk.vue | 11 ++-- supervise-wx-mp/pages/index/index.vue | 17 +++-- supervise-wx-mp/pages/login/index.vue | 64 ++++++++++++------- .../supervise/rms/biz/tmp/SysuserRest.java | 38 +++++++++++ 5 files changed, 91 insertions(+), 41 deletions(-) create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/tmp/SysuserRest.java diff --git a/supervise-wx-mp/common/request.api.js b/supervise-wx-mp/common/request.api.js index dc706600..819cda8a 100644 --- a/supervise-wx-mp/common/request.api.js +++ b/supervise-wx-mp/common/request.api.js @@ -1,7 +1,7 @@ import request from '@/utils/requester.js' export default { - login: (params = {}) => request.post("/portal/v1/sysuser/login", params), + login: (params = {}) => request.post("/sysuser/login", params), sayhello: (params = {}) => request.get("/sayb", params), getSalesReport: (params = {}) => request.get("/system/reportCenter/getSalesReport", params), getGoodsOnWay: (params = {}) => request.get("/system/reportCenter/getGoodsOnWay", params), diff --git a/supervise-wx-mp/pages/index/enterpriseRisk.vue b/supervise-wx-mp/pages/index/enterpriseRisk.vue index f3cb003a..5a02e803 100644 --- a/supervise-wx-mp/pages/index/enterpriseRisk.vue +++ b/supervise-wx-mp/pages/index/enterpriseRisk.vue @@ -78,10 +78,12 @@ }, onLoad(option) { - // this.queryParams = JSON.stringify(option) + this.queryParams = JSON.stringify(option) + console.log('1111',this.queryParams) + this.getData() // console.log('App onLoad', JSON.stringify(option)) - this.title = JSON.stringify(option) + // this.title = JSON.stringify(option) // wx.showToast({ // title: 'onLoad成功>>>>>' + JSON.stringify(option), // icon: 'none', @@ -89,11 +91,6 @@ // }) }, - - created() { - this.getData() - }, - methods: { getData() { var _this = this diff --git a/supervise-wx-mp/pages/index/index.vue b/supervise-wx-mp/pages/index/index.vue index 5cc11d7e..1073d8f9 100644 --- a/supervise-wx-mp/pages/index/index.vue +++ b/supervise-wx-mp/pages/index/index.vue @@ -2,12 +2,9 @@ - 1 - 2 - 3 + 1 + 2 + 3 @@ -55,7 +52,9 @@ - + + + @@ -121,7 +120,7 @@ }, onLoad() { this.getServerData(); - + }, methods: { getServerData() { @@ -143,7 +142,7 @@ }, 100); }, jump(index) { - console.log("index>>",index) + console.log("index>>", index) switch (index) { case 1: diff --git a/supervise-wx-mp/pages/login/index.vue b/supervise-wx-mp/pages/login/index.vue index 1333303e..f8195df1 100644 --- a/supervise-wx-mp/pages/login/index.vue +++ b/supervise-wx-mp/pages/login/index.vue @@ -14,20 +14,19 @@ + + + + + - - - - - - - + @@ -46,29 +45,46 @@ }, rules: { // 对name字段进行必填验证 - name: { + userName: { rules: [{ required: true, errorMessage: '账号不可以为空' }] }, // 对passwd字段进行必填验证 - passwd: { + password: { rules: [{ required: true, errorMessage: '密码不可以为空' }] } }, + ty: 0 } }, created() {}, methods: { + checkboxChange(e) { + let values = e.detail.value + console.log('KKK', values) + if (values && values.length > 0) { + this.ty = 1 + } else { + this.ty = 0 + } + }, dologin() { let _this = this this.$refs.form .validate() .then(r => { + if (this.ty == 0) { + uni.showToast({ + title: '请选择同意服务协议与隐私政策', + icon: 'none' + }) + return; + } _this.$store .dispatch('login', _this.formData) .then(uinfo => { @@ -94,16 +110,16 @@ console.log('eeee:', err) }) }, - fwxy() { - uni.navigateTo({ - url: '/pages/login/fwxy' - }) - }, - yszc() { - uni.navigateTo({ - url: '/pages/login/yszc' - }) - } + fwxy() { + uni.navigateTo({ + url: '/pages/login/fwxy' + }) + }, + yszc() { + uni.navigateTo({ + url: '/pages/login/yszc' + }) + } } } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/tmp/SysuserRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/tmp/SysuserRest.java new file mode 100644 index 00000000..cc0160c3 --- /dev/null +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/tmp/SysuserRest.java @@ -0,0 +1,38 @@ +package com.supervise.rms.biz.tmp; + +import com.yxt.common.core.result.ResultBean; +import org.apache.commons.lang3.StringUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.Map; + +@RestController +@RequestMapping("/sysuser") +public class SysuserRest { + + @PostMapping("/login") + public ResultBean> dologin(@RequestBody Map param) { + ResultBean rb = ResultBean.fireFail(); + String userName = param.get("userName"); + String password = param.get("password"); + + if (StringUtils.isBlank(userName)) + return rb.setMsg("账号不可为空！"); + if (StringUtils.isBlank(password)) + return rb.setMsg("密码不可为空！"); + + if ("13131100001".equals(userName) && "123456".equals(password)) { + Map map = new HashMap<>(); + map.put("token", "abc987654321"); + map.put("name", "测试账号"); + return rb.success().setData(map); + } else { + return rb.setMsg("账号或密码错误"); + } + } + +}