From b4a26916dda36c898af8fb5a0d107aae76a8c810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E9=A3=9E=E6=B4=8B?= <15778543+xufeiyang6017@user.noreply.gitee.com> Date: Tue, 2 Dec 2025 16:17:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BE=8E=E5=8C=96seller=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=BC=98=E5=8C=96=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E3=80=81=E8=A1=A8=E5=8D=95=E5=92=8C=E4=BA=A4=E4=BA=92=E6=95=88?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/seller/index.wxml | 129 ++++----- pages/seller/index.wxss | 619 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 630 insertions(+), 118 deletions(-) diff --git a/pages/seller/index.wxml b/pages/seller/index.wxml index 2c5cb80..41bf3a4 100644 --- a/pages/seller/index.wxml +++ b/pages/seller/index.wxml @@ -1,16 +1,16 @@ - + 我的货源 - + - + {{partnerstatus === 'approved' ? '已入驻' : '未入驻'}} - + + + - + + + - - + + - × + × 编辑货源 diff --git a/pages/seller/index.wxss b/pages/seller/index.wxss index 7c08cb3..12c92fb 100644 --- a/pages/seller/index.wxss +++ b/pages/seller/index.wxss @@ -1,4 +1,45 @@ /* pages/seller/index.wxss */ +/* 全局样式重置 */ +page { + background-color: #f5f7fa; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif; +} + +/* 主色调定义 */ +:root { + --primary-color: #1677ff; + --success-color: #52c41a; + --warning-color: #faad14; + --error-color: #f5222d; + --text-primary: #333333; + --text-secondary: #666666; + --text-tertiary: #999999; + --border-color: #e8e8e8; + --background-color: #ffffff; + --light-background: #f5f7fa; + --shadow-sm: 0 2rpx 8rpx rgba(0, 0, 0, 0.08); + --shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.12); + --shadow-lg: 0 8rpx 32rpx rgba(0, 0, 0, 0.16); + --border-radius-sm: 8rpx; + --border-radius-md: 12rpx; + --border-radius-lg: 16rpx; + --transition: all 0.3s ease; +} + +/* 容器样式优化 */ +.container { + background-color: var(--light-background); + min-height: 100vh; +} + +/* 页面标题样式 */ +.title { + font-size: 40rpx; + font-weight: 700; + color: var(--text-primary); + margin-bottom: 24rpx; +} + /* 立体玻璃质感按钮基础样式 */ .glass-btn { position: relative; @@ -7,13 +48,10 @@ padding: 28rpx 40rpx; font-size: 32rpx; font-weight: 600; - border-radius: 16rpx; - box-shadow: - 0 8rpx 24rpx rgba(0, 0, 0, 0.15), - 0 0 0 1rpx rgba(255, 255, 255, 0.3) inset, - 0 1rpx 0 rgba(255, 255, 255, 0.2) inset; + border-radius: var(--border-radius-lg); + box-shadow: var(--shadow-md); text-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.2); - transition: all 0.3s ease; + transition: var(--transition); background: rgba(255, 255, 255, 0.8); backdrop-filter: blur(10rpx); -webkit-backdrop-filter: blur(10rpx); @@ -26,47 +64,118 @@ /* 按压效果 */ .glass-btn:active { transform: translateY(2rpx); - box-shadow: - 0 4rpx 12rpx rgba(0, 0, 0, 0.1), - 0 0 0 1rpx rgba(255, 255, 255, 0.2) inset, - 0 1rpx 0 rgba(255, 255, 255, 0.1) inset; + box-shadow: var(--shadow-sm); } /* 主按钮 - 蓝色玻璃效果 */ .primary-glass-btn { - background: rgba(22, 119, 255, 0.7); + background: linear-gradient(135deg, var(--primary-color), #4096ff); + color: white; + box-shadow: 0 8rpx 24rpx rgba(22, 119, 255, 0.3); +} + +/* 按钮基础样式 */ +.btn { + display: inline-flex; + align-items: center; + justify-content: center; + padding: 16rpx 32rpx; + font-size: 28rpx; + font-weight: 500; + border-radius: var(--border-radius-md); + border: none; + transition: var(--transition); + cursor: pointer; + text-align: center; + box-sizing: border-box; +} + +/* 按钮变体 */ +.btn-primary { + background-color: var(--primary-color); + color: white; + box-shadow: var(--shadow-sm); +} + +.btn-primary:active { + background-color: #4096ff; + box-shadow: var(--shadow-sm); +} + +.btn-success { + background-color: var(--success-color); color: white; - box-shadow: - 0 8rpx 24rpx rgba(22, 119, 255, 0.3), - 0 0 0 1rpx rgba(255, 255, 255, 0.3) inset, - 0 1rpx 0 rgba(255, 255, 255, 0.2) inset; + box-shadow: var(--shadow-sm); +} + +.btn-success:active { + background-color: #73d13d; +} + +.btn-warning { + background-color: var(--warning-color); + color: white; + box-shadow: var(--shadow-sm); +} + +.btn-warning:active { + background-color: #ffc53d; +} + +.btn-danger { + background-color: var(--error-color); + color: white; + box-shadow: var(--shadow-sm); +} + +.btn-danger:active { + background-color: #ff4d4f; +} + +.btn-outline { + background-color: transparent; + color: var(--primary-color); + border: 2rpx solid var(--primary-color); +} + +.btn-outline:active { + background-color: rgba(22, 119, 255, 0.1); +} + +/* 按钮尺寸 */ +.btn-sm { + padding: 12rpx 24rpx; + font-size: 24rpx; + border-radius: var(--border-radius-sm); +} + +.btn-lg { + padding: 20rpx 48rpx; + font-size: 32rpx; + border-radius: var(--border-radius-lg); } /* 联系客服按钮样式 */ .customer-service-btn { - background: #f0f0f0; - color: black; - font-size: 30rpx; - width: 70rpx; - height: 80rpx; - line-height: 70rpx; + background: var(--background-color); + color: var(--text-primary); + font-size: 28rpx; + width: 120rpx; + height: 64rpx; + line-height: 64rpx; padding: 0; - border-radius: 500rpx; - border: 1rpx solid #d9d9d9; - box-shadow: - 0 4rpx 16rpx rgba(0, 0, 0, 0.1), - 0 1rpx 0 rgba(255, 255, 255, 0.5) inset; - transition: all 0.3s ease; + border-radius: var(--border-radius-full, 32rpx); + border: 2rpx solid var(--border-color); + box-shadow: var(--shadow-sm); + transition: var(--transition); white-space: nowrap; text-align: center; } .customer-service-btn:active { transform: translateY(2rpx); - background: #f5f5f5; - box-shadow: - 0 2rpx 8rpx rgba(0, 0, 0, 0.08), - 0 1rpx 0 rgba(255, 255, 255, 0.3) inset; + background: var(--light-background); + box-shadow: var(--shadow-sm); } /* 服务区域容器 */ @@ -76,31 +185,405 @@ gap: 20rpx; } -/* 未入驻状态样式 */ -.no-settlement-status { +/* 入驻状态样式 */ +.settlement-status { font-size: 24rpx; - color: #ff4d4f; - padding: 0 10rpx; + padding: 4rpx 16rpx; + border-radius: 16rpx; + font-weight: 500; +} + +.settlement-status.approved { + color: var(--success-color); + background-color: rgba(82, 196, 26, 0.1); +} + +.settlement-status.pending { + color: var(--warning-color); + background-color: rgba(250, 173, 20, 0.1); } /* 入驻按钮样式 */ .apply-settlement-btn { - background: #1677ff; + background: var(--primary-color); color: white; font-size: 28rpx; - padding: 10rpx 20rpx; - border-radius: 8rpx; + padding: 12rpx 24rpx; + border-radius: var(--border-radius-md); border: none; - box-shadow: none; - transition: all 0.2s ease; - min-width: 100rpx; + box-shadow: var(--shadow-sm); + transition: var(--transition); + min-width: 120rpx; text-align: center; } .apply-settlement-btn:active { background: #4096ff; - transform: none; - box-shadow: none; + transform: translateY(2rpx); + box-shadow: var(--shadow-sm); +} + +/* 搜索框样式 */ +.search-container { + display: flex; + align-items: center; + width: 100%; + margin-bottom: 32rpx; + background-color: var(--background-color); + border-radius: var(--border-radius-lg); + padding: 12rpx 20rpx; + box-shadow: var(--shadow-sm); + box-sizing: border-box; +} + +.search-input { + flex: 1; + border: none; + outline: none; + font-size: 28rpx; + color: var(--text-primary); + background: transparent; + padding: 12rpx 0; +} + +.search-input::placeholder { + color: var(--text-tertiary); +} + +.search-btn { + background-color: var(--primary-color); + color: white; + border: none; + border-radius: var(--border-radius-md); + padding: 12rpx 24rpx; + font-size: 28rpx; + font-weight: 500; + box-shadow: var(--shadow-sm); + transition: var(--transition); +} + +.search-btn:active { + background-color: #4096ff; + transform: translateY(2rpx); +} + +/* 卡片样式 */ +.card { + background-color: var(--background-color); + border-radius: var(--border-radius-lg); + box-shadow: var(--shadow-sm); + margin-bottom: 24rpx; + overflow: hidden; + transition: var(--transition); +} + +.card:hover { + box-shadow: var(--shadow-md); + transform: translateY(-2rpx); +} + +/* 分类标题样式 */ +.category-title { + display: flex; + justify-content: space-between; + align-items: center; + font-size: 32rpx; + font-weight: 600; + color: var(--text-primary); + margin-bottom: 20rpx; + padding: 0 4rpx; +} + +.category-title .count { + font-size: 24rpx; + font-weight: 400; + color: var(--text-secondary); +} + +.category-title .toggle-btn { + width: 48rpx; + height: 48rpx; + display: flex; + align-items: center; + justify-content: center; + font-size: 28rpx; + color: var(--text-tertiary); + transition: var(--transition); +} + +.category-title .toggle-btn:active { + color: var(--primary-color); + transform: rotate(180deg); +} + +/* 模态框样式 */ +.modal { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, 0.5); + display: flex; + justify-content: center; + align-items: center; + z-index: 999; + backdrop-filter: blur(4rpx); + animation: fadeIn 0.3s ease; +} + +.modal-content { + width: 92%; + max-width: 600rpx; + background: white; + padding: 40rpx; + border-radius: var(--border-radius-lg); + max-height: 85vh; + position: relative; + box-shadow: var(--shadow-lg); + transform: translateZ(0); + -webkit-transform: translateZ(0); + animation: slideUp 0.3s ease; +} + +/* 表单元素样式 */ +.form-group { + margin-bottom: 30rpx; +} + +.form-label { + display: block; + font-size: 28rpx; + font-weight: 500; + color: var(--text-primary); + margin-bottom: 12rpx; + margin-left: 10rpx; +} + +.form-input { + width: 100%; + height: 90rpx; + line-height: 90rpx; + padding: 0 24rpx; + font-size: 30rpx; + border: 2rpx solid var(--border-color); + border-radius: var(--border-radius-md); + box-sizing: border-box; + background: white; + transition: var(--transition); + outline: none; +} + +.form-input:focus { + border-color: var(--primary-color); + box-shadow: 0 0 0 4rpx rgba(22, 119, 255, 0.1); +} + +/* 上传区域样式 */ +.upload-area { + width: 100%; + margin: 0 auto 30rpx; + border: 2rpx dashed var(--border-color); + border-radius: var(--border-radius-md); + padding: 24rpx; + box-sizing: border-box; + background-color: #fafafa; + transition: var(--transition); +} + +.upload-area:hover { + border-color: var(--primary-color); + background-color: rgba(22, 119, 255, 0.05); +} + +.upload-item { + position: relative; + width: 160rpx; + height: 160rpx; + margin: 10rpx; + border-radius: var(--border-radius-md); + overflow: hidden; + box-shadow: var(--shadow-sm); + transition: var(--transition); +} + +.upload-item:hover { + box-shadow: var(--shadow-md); +} + +.upload-item .delete-icon { + position: absolute; + top: 8rpx; + right: 8rpx; + background-color: rgba(0, 0, 0, 0.6); + color: white; + width: 44rpx; + height: 44rpx; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + font-size: 28rpx; + transition: var(--transition); + cursor: pointer; +} + +.upload-item .delete-icon:active { + background-color: rgba(0, 0, 0, 0.8); + transform: scale(0.9); +} + +.upload-btn { + width: 160rpx; + height: 160rpx; + margin: 10rpx; + border: 2rpx dashed var(--primary-color); + border-radius: var(--border-radius-md); + display: flex; + align-items: center; + justify-content: center; + background-color: rgba(22, 119, 255, 0.05); + transition: var(--transition); + cursor: pointer; +} + +.upload-btn:hover { + background-color: rgba(22, 119, 255, 0.1); + transform: scale(1.05); +} + +.upload-btn:active { + transform: scale(0.95); +} + +/* 选择器样式 */ +.selector { + width: 100%; + height: 90rpx; + line-height: 90rpx; + padding: 0 24rpx; + font-size: 30rpx; + border: 2rpx solid var(--border-color); + border-radius: var(--border-radius-md); + box-sizing: border-box; + background: white; + display: flex; + justify-content: space-between; + align-items: center; + transition: var(--transition); + cursor: pointer; +} + +.selector:hover { + border-color: var(--primary-color); +} + +.selector:active { + background-color: rgba(22, 119, 255, 0.05); +} + +.selector .arrow { + color: var(--text-tertiary); + font-size: 24rpx; + transition: var(--transition); +} + +.selector:active .arrow { + transform: rotate(180deg); +} + +/* 动画效果 */ +@keyframes fadeIn { + from { + opacity: 0; + } + to { + opacity: 1; + } +} + +@keyframes slideUp { + from { + opacity: 0; + transform: translateY(40rpx); + } + to { + opacity: 1; + transform: translateY(0); + } +} + +@keyframes pulse { + 0%, 100% { + opacity: 1; + } + 50% { + opacity: 0.5; + } +} + +/* 加载更多样式 */ +.load-more { + text-align: center; + padding: 32rpx 0; + color: var(--text-tertiary); + font-size: 28rpx; +} + +.load-more .loading-text { + display: flex; + align-items: center; + justify-content: center; + gap: 12rpx; +} + +.load-more .loading-text::before { + content: ''; + width: 24rpx; + height: 24rpx; + border: 2rpx solid var(--text-tertiary); + border-top-color: var(--primary-color); + border-radius: 50%; + animation: spin 1s linear infinite; +} + +.load-more .load-more-text { + color: var(--primary-color); + cursor: pointer; + transition: var(--transition); +} + +.load-more .load-more-text:active { + opacity: 0.7; +} + +@keyframes spin { + to { + transform: rotate(360deg); + } +} + +/* 空状态样式 */ +.empty-state { + text-align: center; + padding: 80rpx 0; + color: var(--text-tertiary); +} + +.empty-state .icon { + font-size: 120rpx; + margin-bottom: 24rpx; + opacity: 0.5; +} + +.empty-state .text { + font-size: 28rpx; + margin-bottom: 16rpx; +} + +.empty-state .subtext { + font-size: 24rpx; + opacity: 0.8; } /* 登录授权弹窗样式 - 专门用于登录相关弹窗 */ @@ -115,13 +598,16 @@ justify-content: center; align-items: center; z-index: 999; + animation: fadeIn 0.3s ease; } .auth-modal-container { - background-color: white; - border-radius: 16rpx; + background-color: var(--background-color); + border-radius: var(--border-radius-lg); width: 80%; padding: 40rpx; + box-shadow: var(--shadow-lg); + animation: slideUp 0.3s ease; } .auth-modal-title { @@ -132,12 +618,13 @@ .auth-modal-title text { font-size: 36rpx; font-weight: bold; + color: var(--text-primary); } .auth-modal-content { text-align: center; margin-bottom: 40rpx; - color: #666; + color: var(--text-secondary); } .auth-modal-content text { @@ -149,18 +636,35 @@ } .auth-primary-button { - background-color: #1677ff; + background-color: var(--primary-color); color: white; width: 100%; - border-radius: 8rpx; + border-radius: var(--border-radius-md); margin-bottom: 20rpx; border: none; + padding: 20rpx; + font-size: 32rpx; + font-weight: 500; + box-shadow: var(--shadow-sm); + transition: var(--transition); +} + +.auth-primary-button:active { + background-color: #4096ff; + transform: translateY(2rpx); } .auth-cancel-button { background: none; - color: #666; + color: var(--text-secondary); border: none; + padding: 16rpx; + font-size: 28rpx; + transition: var(--transition); +} + +.auth-cancel-button:active { + color: var(--text-primary); } /* 头像选择样式 */ @@ -179,6 +683,7 @@ width: 160rpx; height: 160rpx; border-radius: 50%; + box-shadow: var(--shadow-sm); } /* 表单样式 */ @@ -190,14 +695,26 @@ font-size: 28rpx; margin-bottom: 10rpx; display: block; + color: var(--text-primary); } .auth-form-input { - border: 1rpx solid #eee; - border-radius: 8rpx; + border: 2rpx solid var(--border-color); + border-radius: var(--border-radius-md); padding: 20rpx; width: 100%; max-width: 100%; + font-size: 28rpx; + color: var(--text-primary); + transition: var(--transition); + box-sizing: border-box; +} + +.auth-form-input:focus { + border-color: var(--primary-color); + box-shadow: 0 0 0 4rpx rgba(22, 119, 255, 0.1); + outline: none; +} box-sizing: border-box; font-size: 28rpx; } From 0cfe63e05f155302766ce7c83f6020f7e052ed24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E9=A3=9E=E6=B4=8B?= <15778543+xufeiyang6017@user.noreply.gitee.com> Date: Tue, 2 Dec 2025 17:07:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B3=95=E4=BA=BA?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E4=B8=8A=E4=BC=A0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E5=85=B6=E4=B8=8E=E5=8A=A8=E7=89=A9=E6=A3=80?= =?UTF-8?q?=E7=96=AB=E5=90=88=E6=A0=BC=E8=AF=81=E6=98=8E=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=88=B0=E5=90=8C=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5proofurl?= =?UTF-8?q?=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/seller/index.wxml | 129 ++++---- pages/seller/index.wxss | 619 +++--------------------------------- pages/settlement/index.js | 21 +- pages/settlement/index.wxml | 4 +- 4 files changed, 130 insertions(+), 643 deletions(-) diff --git a/pages/seller/index.wxml b/pages/seller/index.wxml index 41bf3a4..2c5cb80 100644 --- a/pages/seller/index.wxml +++ b/pages/seller/index.wxml @@ -1,16 +1,16 @@ - + 我的货源 - + - + {{partnerstatus === 'approved' ? '已入驻' : '未入驻'}} + + + + + - + + + - - + + - × + × 编辑货源 diff --git a/pages/seller/index.wxss b/pages/seller/index.wxss index 12c92fb..7c08cb3 100644 --- a/pages/seller/index.wxss +++ b/pages/seller/index.wxss @@ -1,45 +1,4 @@ /* pages/seller/index.wxss */ -/* 全局样式重置 */ -page { - background-color: #f5f7fa; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif; -} - -/* 主色调定义 */ -:root { - --primary-color: #1677ff; - --success-color: #52c41a; - --warning-color: #faad14; - --error-color: #f5222d; - --text-primary: #333333; - --text-secondary: #666666; - --text-tertiary: #999999; - --border-color: #e8e8e8; - --background-color: #ffffff; - --light-background: #f5f7fa; - --shadow-sm: 0 2rpx 8rpx rgba(0, 0, 0, 0.08); - --shadow-md: 0 4rpx 16rpx rgba(0, 0, 0, 0.12); - --shadow-lg: 0 8rpx 32rpx rgba(0, 0, 0, 0.16); - --border-radius-sm: 8rpx; - --border-radius-md: 12rpx; - --border-radius-lg: 16rpx; - --transition: all 0.3s ease; -} - -/* 容器样式优化 */ -.container { - background-color: var(--light-background); - min-height: 100vh; -} - -/* 页面标题样式 */ -.title { - font-size: 40rpx; - font-weight: 700; - color: var(--text-primary); - margin-bottom: 24rpx; -} - /* 立体玻璃质感按钮基础样式 */ .glass-btn { position: relative; @@ -48,10 +7,13 @@ page { padding: 28rpx 40rpx; font-size: 32rpx; font-weight: 600; - border-radius: var(--border-radius-lg); - box-shadow: var(--shadow-md); + border-radius: 16rpx; + box-shadow: + 0 8rpx 24rpx rgba(0, 0, 0, 0.15), + 0 0 0 1rpx rgba(255, 255, 255, 0.3) inset, + 0 1rpx 0 rgba(255, 255, 255, 0.2) inset; text-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.2); - transition: var(--transition); + transition: all 0.3s ease; background: rgba(255, 255, 255, 0.8); backdrop-filter: blur(10rpx); -webkit-backdrop-filter: blur(10rpx); @@ -64,118 +26,47 @@ page { /* 按压效果 */ .glass-btn:active { transform: translateY(2rpx); - box-shadow: var(--shadow-sm); + box-shadow: + 0 4rpx 12rpx rgba(0, 0, 0, 0.1), + 0 0 0 1rpx rgba(255, 255, 255, 0.2) inset, + 0 1rpx 0 rgba(255, 255, 255, 0.1) inset; } /* 主按钮 - 蓝色玻璃效果 */ .primary-glass-btn { - background: linear-gradient(135deg, var(--primary-color), #4096ff); - color: white; - box-shadow: 0 8rpx 24rpx rgba(22, 119, 255, 0.3); -} - -/* 按钮基础样式 */ -.btn { - display: inline-flex; - align-items: center; - justify-content: center; - padding: 16rpx 32rpx; - font-size: 28rpx; - font-weight: 500; - border-radius: var(--border-radius-md); - border: none; - transition: var(--transition); - cursor: pointer; - text-align: center; - box-sizing: border-box; -} - -/* 按钮变体 */ -.btn-primary { - background-color: var(--primary-color); - color: white; - box-shadow: var(--shadow-sm); -} - -.btn-primary:active { - background-color: #4096ff; - box-shadow: var(--shadow-sm); -} - -.btn-success { - background-color: var(--success-color); + background: rgba(22, 119, 255, 0.7); color: white; - box-shadow: var(--shadow-sm); -} - -.btn-success:active { - background-color: #73d13d; -} - -.btn-warning { - background-color: var(--warning-color); - color: white; - box-shadow: var(--shadow-sm); -} - -.btn-warning:active { - background-color: #ffc53d; -} - -.btn-danger { - background-color: var(--error-color); - color: white; - box-shadow: var(--shadow-sm); -} - -.btn-danger:active { - background-color: #ff4d4f; -} - -.btn-outline { - background-color: transparent; - color: var(--primary-color); - border: 2rpx solid var(--primary-color); -} - -.btn-outline:active { - background-color: rgba(22, 119, 255, 0.1); -} - -/* 按钮尺寸 */ -.btn-sm { - padding: 12rpx 24rpx; - font-size: 24rpx; - border-radius: var(--border-radius-sm); -} - -.btn-lg { - padding: 20rpx 48rpx; - font-size: 32rpx; - border-radius: var(--border-radius-lg); + box-shadow: + 0 8rpx 24rpx rgba(22, 119, 255, 0.3), + 0 0 0 1rpx rgba(255, 255, 255, 0.3) inset, + 0 1rpx 0 rgba(255, 255, 255, 0.2) inset; } /* 联系客服按钮样式 */ .customer-service-btn { - background: var(--background-color); - color: var(--text-primary); - font-size: 28rpx; - width: 120rpx; - height: 64rpx; - line-height: 64rpx; + background: #f0f0f0; + color: black; + font-size: 30rpx; + width: 70rpx; + height: 80rpx; + line-height: 70rpx; padding: 0; - border-radius: var(--border-radius-full, 32rpx); - border: 2rpx solid var(--border-color); - box-shadow: var(--shadow-sm); - transition: var(--transition); + border-radius: 500rpx; + border: 1rpx solid #d9d9d9; + box-shadow: + 0 4rpx 16rpx rgba(0, 0, 0, 0.1), + 0 1rpx 0 rgba(255, 255, 255, 0.5) inset; + transition: all 0.3s ease; white-space: nowrap; text-align: center; } .customer-service-btn:active { transform: translateY(2rpx); - background: var(--light-background); - box-shadow: var(--shadow-sm); + background: #f5f5f5; + box-shadow: + 0 2rpx 8rpx rgba(0, 0, 0, 0.08), + 0 1rpx 0 rgba(255, 255, 255, 0.3) inset; } /* 服务区域容器 */ @@ -185,405 +76,31 @@ page { gap: 20rpx; } -/* 入驻状态样式 */ -.settlement-status { +/* 未入驻状态样式 */ +.no-settlement-status { font-size: 24rpx; - padding: 4rpx 16rpx; - border-radius: 16rpx; - font-weight: 500; -} - -.settlement-status.approved { - color: var(--success-color); - background-color: rgba(82, 196, 26, 0.1); -} - -.settlement-status.pending { - color: var(--warning-color); - background-color: rgba(250, 173, 20, 0.1); + color: #ff4d4f; + padding: 0 10rpx; } /* 入驻按钮样式 */ .apply-settlement-btn { - background: var(--primary-color); + background: #1677ff; color: white; font-size: 28rpx; - padding: 12rpx 24rpx; - border-radius: var(--border-radius-md); + padding: 10rpx 20rpx; + border-radius: 8rpx; border: none; - box-shadow: var(--shadow-sm); - transition: var(--transition); - min-width: 120rpx; + box-shadow: none; + transition: all 0.2s ease; + min-width: 100rpx; text-align: center; } .apply-settlement-btn:active { background: #4096ff; - transform: translateY(2rpx); - box-shadow: var(--shadow-sm); -} - -/* 搜索框样式 */ -.search-container { - display: flex; - align-items: center; - width: 100%; - margin-bottom: 32rpx; - background-color: var(--background-color); - border-radius: var(--border-radius-lg); - padding: 12rpx 20rpx; - box-shadow: var(--shadow-sm); - box-sizing: border-box; -} - -.search-input { - flex: 1; - border: none; - outline: none; - font-size: 28rpx; - color: var(--text-primary); - background: transparent; - padding: 12rpx 0; -} - -.search-input::placeholder { - color: var(--text-tertiary); -} - -.search-btn { - background-color: var(--primary-color); - color: white; - border: none; - border-radius: var(--border-radius-md); - padding: 12rpx 24rpx; - font-size: 28rpx; - font-weight: 500; - box-shadow: var(--shadow-sm); - transition: var(--transition); -} - -.search-btn:active { - background-color: #4096ff; - transform: translateY(2rpx); -} - -/* 卡片样式 */ -.card { - background-color: var(--background-color); - border-radius: var(--border-radius-lg); - box-shadow: var(--shadow-sm); - margin-bottom: 24rpx; - overflow: hidden; - transition: var(--transition); -} - -.card:hover { - box-shadow: var(--shadow-md); - transform: translateY(-2rpx); -} - -/* 分类标题样式 */ -.category-title { - display: flex; - justify-content: space-between; - align-items: center; - font-size: 32rpx; - font-weight: 600; - color: var(--text-primary); - margin-bottom: 20rpx; - padding: 0 4rpx; -} - -.category-title .count { - font-size: 24rpx; - font-weight: 400; - color: var(--text-secondary); -} - -.category-title .toggle-btn { - width: 48rpx; - height: 48rpx; - display: flex; - align-items: center; - justify-content: center; - font-size: 28rpx; - color: var(--text-tertiary); - transition: var(--transition); -} - -.category-title .toggle-btn:active { - color: var(--primary-color); - transform: rotate(180deg); -} - -/* 模态框样式 */ -.modal { - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - background: rgba(0, 0, 0, 0.5); - display: flex; - justify-content: center; - align-items: center; - z-index: 999; - backdrop-filter: blur(4rpx); - animation: fadeIn 0.3s ease; -} - -.modal-content { - width: 92%; - max-width: 600rpx; - background: white; - padding: 40rpx; - border-radius: var(--border-radius-lg); - max-height: 85vh; - position: relative; - box-shadow: var(--shadow-lg); - transform: translateZ(0); - -webkit-transform: translateZ(0); - animation: slideUp 0.3s ease; -} - -/* 表单元素样式 */ -.form-group { - margin-bottom: 30rpx; -} - -.form-label { - display: block; - font-size: 28rpx; - font-weight: 500; - color: var(--text-primary); - margin-bottom: 12rpx; - margin-left: 10rpx; -} - -.form-input { - width: 100%; - height: 90rpx; - line-height: 90rpx; - padding: 0 24rpx; - font-size: 30rpx; - border: 2rpx solid var(--border-color); - border-radius: var(--border-radius-md); - box-sizing: border-box; - background: white; - transition: var(--transition); - outline: none; -} - -.form-input:focus { - border-color: var(--primary-color); - box-shadow: 0 0 0 4rpx rgba(22, 119, 255, 0.1); -} - -/* 上传区域样式 */ -.upload-area { - width: 100%; - margin: 0 auto 30rpx; - border: 2rpx dashed var(--border-color); - border-radius: var(--border-radius-md); - padding: 24rpx; - box-sizing: border-box; - background-color: #fafafa; - transition: var(--transition); -} - -.upload-area:hover { - border-color: var(--primary-color); - background-color: rgba(22, 119, 255, 0.05); -} - -.upload-item { - position: relative; - width: 160rpx; - height: 160rpx; - margin: 10rpx; - border-radius: var(--border-radius-md); - overflow: hidden; - box-shadow: var(--shadow-sm); - transition: var(--transition); -} - -.upload-item:hover { - box-shadow: var(--shadow-md); -} - -.upload-item .delete-icon { - position: absolute; - top: 8rpx; - right: 8rpx; - background-color: rgba(0, 0, 0, 0.6); - color: white; - width: 44rpx; - height: 44rpx; - border-radius: 50%; - display: flex; - align-items: center; - justify-content: center; - font-size: 28rpx; - transition: var(--transition); - cursor: pointer; -} - -.upload-item .delete-icon:active { - background-color: rgba(0, 0, 0, 0.8); - transform: scale(0.9); -} - -.upload-btn { - width: 160rpx; - height: 160rpx; - margin: 10rpx; - border: 2rpx dashed var(--primary-color); - border-radius: var(--border-radius-md); - display: flex; - align-items: center; - justify-content: center; - background-color: rgba(22, 119, 255, 0.05); - transition: var(--transition); - cursor: pointer; -} - -.upload-btn:hover { - background-color: rgba(22, 119, 255, 0.1); - transform: scale(1.05); -} - -.upload-btn:active { - transform: scale(0.95); -} - -/* 选择器样式 */ -.selector { - width: 100%; - height: 90rpx; - line-height: 90rpx; - padding: 0 24rpx; - font-size: 30rpx; - border: 2rpx solid var(--border-color); - border-radius: var(--border-radius-md); - box-sizing: border-box; - background: white; - display: flex; - justify-content: space-between; - align-items: center; - transition: var(--transition); - cursor: pointer; -} - -.selector:hover { - border-color: var(--primary-color); -} - -.selector:active { - background-color: rgba(22, 119, 255, 0.05); -} - -.selector .arrow { - color: var(--text-tertiary); - font-size: 24rpx; - transition: var(--transition); -} - -.selector:active .arrow { - transform: rotate(180deg); -} - -/* 动画效果 */ -@keyframes fadeIn { - from { - opacity: 0; - } - to { - opacity: 1; - } -} - -@keyframes slideUp { - from { - opacity: 0; - transform: translateY(40rpx); - } - to { - opacity: 1; - transform: translateY(0); - } -} - -@keyframes pulse { - 0%, 100% { - opacity: 1; - } - 50% { - opacity: 0.5; - } -} - -/* 加载更多样式 */ -.load-more { - text-align: center; - padding: 32rpx 0; - color: var(--text-tertiary); - font-size: 28rpx; -} - -.load-more .loading-text { - display: flex; - align-items: center; - justify-content: center; - gap: 12rpx; -} - -.load-more .loading-text::before { - content: ''; - width: 24rpx; - height: 24rpx; - border: 2rpx solid var(--text-tertiary); - border-top-color: var(--primary-color); - border-radius: 50%; - animation: spin 1s linear infinite; -} - -.load-more .load-more-text { - color: var(--primary-color); - cursor: pointer; - transition: var(--transition); -} - -.load-more .load-more-text:active { - opacity: 0.7; -} - -@keyframes spin { - to { - transform: rotate(360deg); - } -} - -/* 空状态样式 */ -.empty-state { - text-align: center; - padding: 80rpx 0; - color: var(--text-tertiary); -} - -.empty-state .icon { - font-size: 120rpx; - margin-bottom: 24rpx; - opacity: 0.5; -} - -.empty-state .text { - font-size: 28rpx; - margin-bottom: 16rpx; -} - -.empty-state .subtext { - font-size: 24rpx; - opacity: 0.8; + transform: none; + box-shadow: none; } /* 登录授权弹窗样式 - 专门用于登录相关弹窗 */ @@ -598,16 +115,13 @@ page { justify-content: center; align-items: center; z-index: 999; - animation: fadeIn 0.3s ease; } .auth-modal-container { - background-color: var(--background-color); - border-radius: var(--border-radius-lg); + background-color: white; + border-radius: 16rpx; width: 80%; padding: 40rpx; - box-shadow: var(--shadow-lg); - animation: slideUp 0.3s ease; } .auth-modal-title { @@ -618,13 +132,12 @@ page { .auth-modal-title text { font-size: 36rpx; font-weight: bold; - color: var(--text-primary); } .auth-modal-content { text-align: center; margin-bottom: 40rpx; - color: var(--text-secondary); + color: #666; } .auth-modal-content text { @@ -636,35 +149,18 @@ page { } .auth-primary-button { - background-color: var(--primary-color); + background-color: #1677ff; color: white; width: 100%; - border-radius: var(--border-radius-md); + border-radius: 8rpx; margin-bottom: 20rpx; border: none; - padding: 20rpx; - font-size: 32rpx; - font-weight: 500; - box-shadow: var(--shadow-sm); - transition: var(--transition); -} - -.auth-primary-button:active { - background-color: #4096ff; - transform: translateY(2rpx); } .auth-cancel-button { background: none; - color: var(--text-secondary); + color: #666; border: none; - padding: 16rpx; - font-size: 28rpx; - transition: var(--transition); -} - -.auth-cancel-button:active { - color: var(--text-primary); } /* 头像选择样式 */ @@ -683,7 +179,6 @@ page { width: 160rpx; height: 160rpx; border-radius: 50%; - box-shadow: var(--shadow-sm); } /* 表单样式 */ @@ -695,26 +190,14 @@ page { font-size: 28rpx; margin-bottom: 10rpx; display: block; - color: var(--text-primary); } .auth-form-input { - border: 2rpx solid var(--border-color); - border-radius: var(--border-radius-md); + border: 1rpx solid #eee; + border-radius: 8rpx; padding: 20rpx; width: 100%; max-width: 100%; - font-size: 28rpx; - color: var(--text-primary); - transition: var(--transition); - box-sizing: border-box; -} - -.auth-form-input:focus { - border-color: var(--primary-color); - box-shadow: 0 0 0 4rpx rgba(22, 119, 255, 0.1); - outline: none; -} box-sizing: border-box; font-size: 28rpx; } diff --git a/pages/settlement/index.js b/pages/settlement/index.js index ddf62d8..d8515c4 100644 --- a/pages/settlement/index.js +++ b/pages/settlement/index.js @@ -28,7 +28,7 @@ Page({ // 上传资料 businesslicenseurl: null, // 营业执照URL (原businessLicenseFile) proofurl: null, // 动物检疫证明URL (原animalQuarantineFile) - idCardFile: null, // 身份证文件 (保持不变) + // idCardFile: null, // 已移除，法人身份证现在使用proofurl字段 brandurl: null, // 品牌授权链URL (原brandAuthFile) // 审核状态 @@ -122,7 +122,7 @@ Page({ cooperation: settlementData.cooperation || settlementData.selectedCooperation, businesslicenseurl: settlementData.businesslicenseurl || settlementData.businessLicenseFile, proofurl: settlementData.proofurl || settlementData.animalQuarantineFile, - idCardFile: settlementData.idCardFile, + // idCardFile: settlementData.idCardFile, // 已移除，法人身份证现在使用proofurl字段 brandurl: settlementData.brandurl || settlementData.brandAuthFile, agreementChecked: settlementData.agreementChecked, partnerstatus: settlementData.partnerstatus || settlementData.auditStatus @@ -145,8 +145,7 @@ Page({ detailedaddress: this.data.detailedaddress, // 详细地址 (原detailAddress) cooperation: this.data.cooperation, // 合作模式 (原selectedCooperation) businesslicenseurl: this.data.businesslicenseurl, // 营业执照URL (原businessLicenseFile) - proofurl: this.data.proofurl, // 动物检疫证明URL (原animalQuarantineFile) - idCardFile: this.data.idCardFile, + proofurl: this.data.proofurl, // 动物检疫证明或法人身份证URL (原animalQuarantineFile) brandurl: this.data.brandurl, // 品牌授权链URL (原brandAuthFile) agreementChecked: this.data.agreementChecked, partnerstatus: this.data.partnerstatus // 合作商状态 (原auditStatus) @@ -416,7 +415,7 @@ Page({ success: (res) => { const tempFilePaths = res.tempFilePaths; this.setData({ - idCardFile: { + proofurl: { // 使用与动物检疫合格证明相同的字段名 path: tempFilePaths[0], name: `法人身份证_${new Date().getTime()}.jpg` } @@ -427,7 +426,7 @@ Page({ // 删除法人身份证 deleteIdCard() { - this.setData({ idCardFile: null }); + this.setData({ proofurl: null }); // 使用与动物检疫合格证明相同的字段名 }, // 上传品牌授权链文件 @@ -528,14 +527,14 @@ Page({ ); } - // 上传动物检疫合格证明 + // 上传动物检疫合格证明或法人身份证（两者共用一个字段） if (this.data.proofurl) { // 使用数据库字段名 uploadedFiles.animalQuarantineFile = await this.uploadFileToServer( this.data.proofurl.path, - 'animalQuarantine' + 'animalQuarantine' // 保持原有的文件类型，或者可以根据实际情况调整 ); } - + // 上传品牌授权链文件 if (this.data.brandurl) { // 使用数据库字段名 uploadedFiles.brandAuthFile = await this.uploadFileToServer( @@ -588,7 +587,7 @@ Page({ cooperation: this.data.cooperation === '货源委托' ? 'wholesale' : this.data.cooperation, // 合作模式映射为后端期望的值 phoneNumber: contactPhone, // 后端期望的字段名是phoneNumber businesslicenseurl: uploadedFiles.businessLicenseFile || '', // 营业执照URL - proofurl: uploadedFiles.animalQuarantineFile || '', // 动物检疫证明URL + proofurl: uploadedFiles.animalQuarantineFile || '', // 动物检疫证明或法人身份证URL（两者共用一个字段） brandurl: uploadedFiles.brandAuthFile || '', // 品牌授权链URL userId: userId }; @@ -1147,7 +1146,7 @@ Page({ showCooperationError: false, businesslicenseurl: null, // 使用数据库字段名 (原businessLicenseFile) proofurl: null, // 使用数据库字段名 (原animalQuarantineFile) - idCardFile: null, + // idCardFile: null, // 已移除，法人身份证现在使用proofurl字段 brandurl: null, // 使用数据库字段名 (原brandAuthFile) partnerstatus: 'underreview', // 使用数据库字段名 (原auditStatus) showAuthModal: false, diff --git a/pages/settlement/index.wxml b/pages/settlement/index.wxml index 16e5bdb..46fc908 100644 --- a/pages/settlement/index.wxml +++ b/pages/settlement/index.wxml @@ -232,10 +232,10 @@ 点击上传法人身份证正反面 支持jpg、png格式，大小不超过5M - + 📄 - {{idCardFile.name}} + {{proofurl.name}} 删除