From 0189b35680eb04aafc4f3f81d885bd6b82ef6793 Mon Sep 17 00:00:00 2001
From: 易尊强 <306277016@qq.com>
Date: Fri, 8 Mar 2024 17:24:25 +0800
Subject: [PATCH] 登录问题
---
pages.json | 16 ++++++++++++++++
pages/companyInfoList/addComInfo/Feedback.scss | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pages/companyInfoList/addComInfo/addComInfo.vue | 295 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pages/companyInfoList/companyInfoList.vue | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pages/companyInfoList/datain.scss | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pages/datain/datain.vue | 18 ++++++++++++++++++
pages/login/index.vue | 8 ++++++--
pages/postCompany/postCompany.vue | 2 +-
8 files changed, 749 insertions(+), 3 deletions(-)
create mode 100644 pages/companyInfoList/addComInfo/Feedback.scss
create mode 100644 pages/companyInfoList/addComInfo/addComInfo.vue
create mode 100644 pages/companyInfoList/companyInfoList.vue
create mode 100644 pages/companyInfoList/datain.scss
diff --git a/pages.json b/pages.json
index 6e13f13..ec13ed7 100644
--- a/pages.json
+++ b/pages.json
@@ -466,6 +466,22 @@
"navigationBarTitleText" : "分组列表和新建分组",
"enablePullDownRefresh" : false
}
+ },
+ {
+ "path" : "pages/companyInfoList/companyInfoList",
+ "style" :
+ {
+ "navigationBarTitleText" : "企业信息采集列表",
+ "enablePullDownRefresh" : false
+ }
+ },
+ {
+ "path" : "pages/companyInfoList/addComInfo/addComInfo",
+ "style" :
+ {
+ "navigationBarTitleText" : "企业信息表单",
+ "enablePullDownRefresh" : false
+ }
}
// {
diff --git a/pages/companyInfoList/addComInfo/Feedback.scss b/pages/companyInfoList/addComInfo/Feedback.scss
new file mode 100644
index 0000000..8c4297d
--- /dev/null
+++ b/pages/companyInfoList/addComInfo/Feedback.scss
@@ -0,0 +1,187 @@
+.page{
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ background-color: #f6f6f6;
+}
+.titleall-box {
+ display: flex;
+ justify-content: space-between;
+ padding: 40rpx 20rpx 20rpx 0;
+ .titleall-left {
+ font-size: 32rpx;
+ font-weight: bold;
+ display: flex;
+ align-items: center;
+ .titleall-left-line {
+ width: 14rpx;
+ height: 36rpx;
+ border-radius: 0 10rpx 10rpx 0;
+ background-color: #E60012;
+ box-shadow: 0 0 10rpx 5rpx #fbdadc;
+ margin-right: 20rpx;
+ }
+ text {
+ font-size: 28rpx;
+ color: #999999;
+ }
+ }
+}
+/* 反馈类型 */
+.feedback-type{
+ position: relative;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ width: 94%;
+ height: 100rpx;
+ margin: 20rpx auto;
+ background-color: #FFFFFF;
+ border-radius: 20rpx;
+ padding: 0 4%;
+ .feedback-type-left {
+ color: #909090;
+ }
+ .title{
+ display: flex;
+ align-items: center;
+ text{
+ font-size: 26rpx;
+ }
+ }
+ .picker{
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ opacity: 0;
+ }
+ .more{
+ display: flex;
+ align-items: center;
+ text{
+ color: #000;
+ font-size: 34rpx;
+ }
+ image {
+ width: 20rpx;
+ height: 20rpx;
+ margin-left: 10rpx;
+ }
+ }
+ .feedback-type-right {
+ display: flex;
+ align-items: center;
+ }
+}
+.example-body {
+ padding: 10px;
+ padding-top: 0;
+ }
+
+ .custom-image-box {
+ /* #ifndef APP-NVUE */
+ display: flex;
+ /* #endif */
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ }
+
+ .text {
+ font-size: 14px;
+ color: #333;
+ }
+.segmented-control {
+ margin-bottom: 15px;
+ }
+
+ .button-group {
+ margin-top: 15px;
+ display: flex;
+ justify-content: space-around;
+ }
+
+ .form-item {
+ display: flex;
+ align-items: center;
+ }
+
+ .button {
+ display: flex;
+ align-items: center;
+ height: 35px;
+ margin-left: 10px;
+ }
+/* 反馈内容 */
+.feedback-data{
+ width: 94%;
+ // height: 600rpx;
+ margin: 20rpx auto;
+ background-color: #FFFFFF;
+ border-radius: 20rpx;
+ .content{
+ padding: 20rpx;
+ textarea{
+ width: 94%;
+ height: 320rpx;
+ background-color: #f6f6f6;
+ border-radius: 20rpx;
+ padding: 20rpx;
+ font-size: 26rpx;
+ color: #222222;
+ }
+ }
+ .voucher-img{
+ display: flex;
+ align-items: center;
+ padding: 0 20rpx;
+ height: 240rpx;
+ margin-top: 20rpx;
+ .list{
+ width: 33%;
+ height: 100%;
+ image{
+ width: 160rpx;
+ height: 160rpx;
+ border-radius: 10rpx;
+ }
+ }
+ }
+}
+
+/* 联系方式 */
+.contact-way{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 94%;
+ height: 100rpx;
+ margin: 20rpx auto;
+ background-color: #FFFFFF;
+ border-radius: 20rpx;
+ input{
+ width: 100%;
+ height: 100%;
+ padding: 0 4%;
+ font-size: 26rpx;
+ color: #222222;
+ }
+}
+
+/* 提交 */
+.submit-btn{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 94%;
+ height: 80rpx;
+ margin: 30rpx auto;
+ background: #E60012;
+ border-radius: 80rpx;
+ text{
+ color: #FFFFFF;
+ font-size: 28rpx;
+ }
+}
\ No newline at end of file
diff --git a/pages/companyInfoList/addComInfo/addComInfo.vue b/pages/companyInfoList/addComInfo/addComInfo.vue
new file mode 100644
index 0000000..e7e350a
--- /dev/null
+++ b/pages/companyInfoList/addComInfo/addComInfo.vue
@@ -0,0 +1,295 @@
+
+
+
+
+
+
+ 企业信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/companyInfoList/companyInfoList.vue b/pages/companyInfoList/companyInfoList.vue
new file mode 100644
index 0000000..9b0e263
--- /dev/null
+++ b/pages/companyInfoList/companyInfoList.vue
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+ {{it.enterpriseName}}
+
+
+
+
+ {{it.creatorTime}}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/companyInfoList/datain.scss b/pages/companyInfoList/datain.scss
new file mode 100644
index 0000000..373701e
--- /dev/null
+++ b/pages/companyInfoList/datain.scss
@@ -0,0 +1,104 @@
+.page {
+ width: 100%;
+ height: 100vh;
+ overflow: scroll;
+ background-color: #F4F4F4 !important;
+}
+/* 搜索 */
+.search-head {
+ position: fixed;
+ left: 0;
+ // top: 86rpx;
+ z-index: 10;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 100%;
+ /* #ifdef APP-PLUS */
+ // height: calc(120rpx + var(--status-bar-height));
+ /* #endif */
+ padding: 20rpx;
+ background-color: #F4F4F4;
+ .search {
+ display: flex;
+ align-items: center;
+ width: 100%;
+ height: 80rpx;
+ background: rgba(255, 255, 255, 1);
+ border: 0;
+ border-radius: 30rpx;
+ padding:0 25rpx;
+ image {
+ width: 34rpx;
+ height: 34rpx;
+ }
+ text{
+ width: 2rpx;
+ height: 24rpx;
+ background-color:#D8D8D8;
+ margin: 0 18rpx;
+ }
+ input {
+ width: 58%;
+ height: 100%;
+ font-size: 28rpx;
+ color: #646464;
+ }
+ }
+ .btn {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: absolute;
+ right: 30rpx;
+ background-color: #D32D25;
+ border-radius: 100rpx;
+ padding: 12rpx 25rpx;
+ text {
+ font-size: 28rpx;
+ color: #fff;
+ }
+ }
+}
+.listBox{
+ position: relative;
+ z-index: 1;
+}
+.content {
+ width: 100%;
+}
+.item{
+ width: 98%;
+ padding: 30rpx;
+ border-radius: 20rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ background-color: white;
+ margin: 0 auto;
+ margin-top: 20rpx;
+ .comName{
+ margin-left: 20rpx;
+ font-size: 30rpx;
+ font-weight: bold;
+ }
+
+}
+.comTime{
+ margin-right: 20rpx;
+}
+.more-content{
+ display: flex;
+ align-items: center;
+ image{
+ width: 100rpx;
+ height: 100rpx;
+ border-radius: 100%;
+ }
+ .more-content-img {
+ image {
+ width: 24rpx;
+ height: 24rpx;
+ }
+ }
+ }
\ No newline at end of file
diff --git a/pages/datain/datain.vue b/pages/datain/datain.vue
index ebf36f0..69b88de 100644
--- a/pages/datain/datain.vue
+++ b/pages/datain/datain.vue
@@ -127,6 +127,18 @@
+
+
+
+ 企业信息采集列表查看
+
+
+
+
+
+
+
+
@@ -417,6 +429,12 @@
console.log(this.startDate, this.endDate)
this.getPostQing()
},
+ // 跳转到企业信息采集列表
+ toCompanyInfoList(){
+ uni.navigateTo({
+ url:'/pages/companyInfoList/companyInfoList'
+ })
+ },
// 跳转到选择通知企业页面
toTellInfo() {
uni.navigateTo({
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 3b162f7..5bd3e89 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -143,14 +143,18 @@
} else {
uni.showToast({
icon: "error",
- title: res.msg
+ title: '返回数据不为200'
})
this.loading = false
}
// uni.navigateTo({
// url:'/pages/tbDrugIftForm/index'
// })
- }).catch(() => {
+ }).catch((res) => {
+ uni.showToast({
+ icon:'error',
+ title:`${res}`
+ })
this.loading = false
})
}
diff --git a/pages/postCompany/postCompany.vue b/pages/postCompany/postCompany.vue
index 12879ce..c31ba2e 100644
--- a/pages/postCompany/postCompany.vue
+++ b/pages/postCompany/postCompany.vue
@@ -318,7 +318,7 @@ import utils from '../../service/utils';
imports:that.valiFormData.imports,
totalExportValue:that.valiFormData.totalExportValue,
mainProducts:that.valiFormData.mainProducts,
- creatorUserEnterprise:that.companyId,
+ creatorUserEnterprise:that.valiFormData.creatorUserEnterprise,
enterpriseScale:enterpriseScale
}
console.log(info)
--
libgit2 0.21.4