developer/template-10584
1
0
Fork 0
forked from gxwebsoft/mp-10550
Code Pull Requests Activity

修复已知问题

Browse Source
This commit is contained in:
赵忠林
2025-08-07 20:36:07 +08:00
parent bf99796d8c
commit 5dd0e97e3c
24 changed files with 519 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/index/Header.tsx
View File

@@ -93,7 +93,7 @@ const Header = (props: any) => {
success: function () {
if (code) {
Taro.request({
url: 'https://server.gxwebsoft.com/api/wx-login/loginByMpWxPhone',
url: 'https://server.websoft.top/api/wx-login/loginByMpWxPhone',
method: 'POST',
data: {
code,
@@ -143,7 +143,7 @@ const Header = (props: any) => {
<div className={'fixed top-0 header-bg'} style={{
height: !props.stickyStatus ? '180px' : '148px',
}}>
<MySearch done={reload}/>
<MySearch/>
{/*{!props.stickyStatus && <MySearch done={reload}/>}*/}
</div>
<NavBar

2
src/pages/index/Login.tsx
View File

@@ -16,7 +16,7 @@ const Login = (props:any) => {
success: function () {
if (code) {
Taro.request({
url: 'https://server.gxwebsoft.com/api/wx-login/loginByMpWxPhone',
url: 'https://server.websoft.top/api/wx-login/loginByMpWxPhone',
method: 'POST',
data: {
code,

18
src/pages/index/MySearch.tsx
View File

@@ -2,7 +2,8 @@ import {Search} from '@nutui/icons-react-taro'
import {Button, Input} from '@nutui/nutui-react-taro'
import {useState} from "react";
import Taro from '@tarojs/taro';
function MySearch(props) {
function MySearch() {
const [keywords, setKeywords] = useState<string>('')
const onKeywords = (keywords: string) => {
@@ -10,14 +11,24 @@ function MySearch(props) {
}
const onQuery = () => {
if(!keywords){
if(!keywords.trim()){
Taro.showToast({
title: '请输入关键字',
icon: 'none'
});
return false;
}
props.done(keywords);
// 跳转到搜索页面
Taro.navigateTo({
url: `/shop/search/index?keywords=${encodeURIComponent(keywords.trim())}`
});
}
// 点击搜索框跳转到搜索页面
const onInputFocus = () => {
Taro.navigateTo({
url: '/shop/search/index'
});
}
@@ -40,6 +51,7 @@ function MySearch(props) {
value={keywords}
onChange={onKeywords}
onConfirm={onQuery}
onFocus={onInputFocus}
style={{ padding: '9px 8px'}}
/>
<div

23
src/pages/order/components/OrderSearch.tsx
View File

@@ -7,13 +7,10 @@ import {
Cell,
CellGroup,
Radio,
Space,
DatePicker,
Picker
Space
} from '@nutui/nutui-react-taro';
import { Search, Filter, Close } from '@nutui/icons-react-taro';
import { ShopOrderParam } from '@/api/shop/shopOrder/model';
import dayjs from 'dayjs';
import './OrderSearch.scss';
interface OrderSearchProps {
@@ -94,14 +91,14 @@ const OrderSearch: React.FC<OrderSearchProps> = ({ onSearch, onReset }) => {
if (searchParams.phone?.trim()) {
filterParams.phone = searchParams.phone.trim();
}
if (searchParams.orderStatus !== undefined && searchParams.orderStatus !== '') {
filterParams.orderStatus = Number(searchParams.orderStatus);
if (searchParams.orderStatus !== undefined) {
filterParams.orderStatus = searchParams.orderStatus;
}
if (searchParams.payStatus !== undefined && searchParams.payStatus !== '') {
filterParams.payStatus = Number(searchParams.payStatus);
if (searchParams.payStatus !== undefined) {
filterParams.payStatus = searchParams.payStatus;
}
if (searchParams.payType !== undefined && searchParams.payType !== '') {
filterParams.payType = Number(searchParams.payType);
if (searchParams.payType !== undefined) {
filterParams.payType = searchParams.payType;
}
onSearch(filterParams);
@@ -186,7 +183,7 @@ const OrderSearch: React.FC<OrderSearchProps> = ({ onSearch, onReset }) => {
<View className="text-sm text-gray-600 mb-2">订单状态</View>
<Radio.Group
value={searchParams.orderStatus}
onChange={(value) => setSearchParams(prev => ({ ...prev, orderStatus: value }))}
onChange={(value) => setSearchParams(prev => ({ ...prev, orderStatus: Number(value) }))}
>
<View className="grid grid-cols-2 gap-2">
{orderStatusOptions.map((option) => (
@@ -205,7 +202,7 @@ const OrderSearch: React.FC<OrderSearchProps> = ({ onSearch, onReset }) => {
<View className="text-sm text-gray-600 mb-2">支付状态</View>
<Radio.Group
value={searchParams.payStatus}
onChange={(value) => setSearchParams(prev => ({ ...prev, payStatus: value }))}
onChange={(value) => setSearchParams(prev => ({ ...prev, payStatus: Number(value) }))}
>
<View className="flex flex-wrap gap-2">
{payStatusOptions.map((option) => (
@@ -224,7 +221,7 @@ const OrderSearch: React.FC<OrderSearchProps> = ({ onSearch, onReset }) => {
<View className="text-sm text-gray-600 mb-2">支付方式</View>
<Radio.Group
value={searchParams.payType}
onChange={(value) => setSearchParams(prev => ({ ...prev, payType: value }))}
onChange={(value) => setSearchParams(prev => ({ ...prev, payType: Number(value) }))}
>
<View className="grid grid-cols-2 gap-2">
{payTypeOptions.map((option) => (

2
src/pages/user/components/OrderIcon.tsx
View File

@@ -25,7 +25,7 @@ const OrderIcon = () => {
success: function () {
if (code) {
Taro.request({
url: 'https://server.gxwebsoft.com/api/wx-login/loginByMpWxPhone',
url: 'https://server.websoft.top/api/wx-login/loginByMpWxPhone',
method: 'POST',
data: {
code,

2
src/pages/user/components/UserCard.tsx
View File

@@ -107,7 +107,7 @@ function UserCard() {
success: function () {
if (code) {
Taro.request({
url: 'https://server.gxwebsoft.com/api/wx-login/loginByMpWxPhone',
url: 'https://server.websoft.top/api/wx-login/loginByMpWxPhone',
method: 'POST',
data: {
code,