临时上传测试

master
blak-kong 2 years ago
parent db459b10a2
commit fb085d4bb9

@ -0,0 +1,168 @@
import classnames from "classnames";
import { Component } from "react";
import {
Block,
View,
Image,
Text,
Button,
PageMeta,
Swiper,
SwiperItem,
} from "@tarojs/components";
import { Popup } from "@antmjs/vantui";
import "./popup.less";
import "./popup-site-swiper.less";
import { go } from "../../utils/traoAPI";
/*** props
* isLarge
* isShow
* isClose
* content
* confirmButtonText
* textAlgin left right center
* data
* @confirm
* ***/
export default class PopupSiteSwiper extends Component<any, any> {
constructor(props) {
super(props);
this.state = {
name: "确认组件",
};
}
async onLoad() {}
componentDidMount() {}
componentWillUnmount() {}
componentDidShow() {}
componentDidHide() {}
async initData() {}
onClose = () => {
this.props.close();
};
onConfirm = () => {
let { type } = this.props;
// switch (type) {
// case "1": // 未注册
// go("/pages/register/register");
// break;
// case "2": // 登录过期
// go("/pages/login/login");
// break;
// case "3": // 前端提示-关注公众号
// break;
// }
this.props.confirm();
};
onClickStop = (e) => {
e.stopPropagation();
};
render() {
let {
title,
content,
confirmButtonText,
textAlgin,
isShow,
isLarge,
// type,
} = this.props;
return (
<Block>
<PageMeta pageStyle={isShow ? "overflow: hidden;" : ""} />
<Popup
show={isShow}
closeOnClickOverlay={false}
round
overlayStyle="width: 100vw;padding: 0;"
onClick={this.onClickStop}
>
<View
className="at-icon at-icon-close common-close"
onClick={this.onClose}
></View>
<View
className={classnames("common-box", {
large: isLarge,
})}
>
{/* <View className="common-popup-title">{title}</View>
<View className="common-popup-content-box">
<View
className={classnames("common-popup-content", {
"text-left": textAlgin === "left",
"text-right": textAlgin === "right",
"text-center": textAlgin === "center",
})}
>
{content}
</View>
</View> */}
{/* <Swiper
className="absolutely"
current={current}
onChange={this.onChange.bind(this)}
onAnimationFinish={this.onFinish.bind(this)}
duration={800}
indicatorDots={true}
indicatorColor="#999"
indicatorActiveColor="#333"
>
{welcomeList.map((item, index) => {
return (
<SwiperItem
className="absolutely"
onClick={this.onClickSwiperItem.bind(this)}
key={"swiper_" + index}
>
<View
className="body FadeInFrame fadein"
style={{
top: menu.top + "px",
height: "calc(" + (100 % -menu.height) + "px)",
display: current === index ? "block" : "none",
}}
>
<View>
<Image
className="cover"
src={item.image}
mode="aspectFill"
></Image>
</View>
<View className="bottom-card">
<View className="text slide-left">{item.title}</View>
<View className="txt slide-left">{item.desc}</View>
</View>
</View>
</SwiperItem>
);
})}
</Swiper> */}
<View className="common-popup-btns">
<Button className="common-popup-btn" onClick={this.onConfirm}>
{confirmButtonText}
</Button>
</View>
</View>
</Popup>
</Block>
);
}
}

@ -8,12 +8,14 @@ import { Block, View, Text, Image, PageMeta, Button } from "@tarojs/components";
import { connect } from "react-redux";
import { userRefresh } from "../../store/features/userInfo";
import { otherSettingRefresh } from "../../store/features/otherSetting";
import { setIndexFlag } from "../../store/features/global";
/*** redux end ***/
/** 自定义组件 **/
import AtCalendar from "../../components/calendar";
import PopupPrivacy from "../../components/popup/popup-privacy";
import PopupAlert from "../../components/popup/popup-alert";
import PopupSiteSwiper from "../../components/popup/popup-site-swiper";
import type CustomTabBar from "../../custom-tab-bar";
import Navbar from "../../components/navbar/navbar";
/** 自定义组件 **/
@ -24,6 +26,7 @@ import {
RefreshWxUserInfo,
GetNoReadMessageNum,
GetOtherSetting,
GetSitePopupList,
} from "../../utils/Interface";
// css引入
@ -39,6 +42,10 @@ class Index extends Component<any, any> {
super(props);
this.state = {
isShowPrivacyPopup: false,
isShowSiteSwiper: false,
isNotRegister: false, // 是否未注册
isDev: false, // 正在开发提示
sitePopupList: [], // 站点管理列表
// imgUrl: this.app.globalData.imgUrl,
userinfo: {
mobile: this.props.mobile,
@ -59,9 +66,6 @@ class Index extends Component<any, any> {
info: {}, // 护理推荐点击参与活动的信息
weekinfo: undefined,
currentDate: dayjs().format("YYYY-MM-DD"),
isNotRegister: false, // 是否未注册
isDev: false, // 正在开发提示
};
}
@ -98,6 +102,7 @@ class Index extends Component<any, any> {
if (mobile) {
this.GetNoReadMessageNum(); // 查询是否有消息
this.RefreshWxUserInfo();
this.GetSitePopupList();
}
}
}
@ -152,6 +157,15 @@ class Index extends Component<any, any> {
}
};
// 获取站点管理-弹窗列表 1-首页 2-发现模块 3-活动模块
GetSitePopupList = async () => {
let res = await GetSitePopupList(1);
if (res.data.code === 200) {
// console.log("GetSitePopupList", res);
this.setState({ sitePopupList: res.data.data, isShowSiteSwiper: true });
}
};
goRegister() {
go("/pages/register/register");
}
@ -218,12 +232,18 @@ class Index extends Component<any, any> {
this.setState({ isDev: false });
};
closeSiteSwiper = () => {
this.setState({ isShowSiteSwiper: false });
};
render() {
let {
currentDate,
messagecount,
sitePopupList,
isShowPrivacyPopup,
isNotRegister,
messagecount,
isShowSiteSwiper,
isDev,
} = this.state;
return (
@ -251,6 +271,17 @@ class Index extends Component<any, any> {
isShow={isShowPrivacyPopup}
closePrivacy={this.closePrivacy}
/>
<PopupSiteSwiper
isShow={isShowSiteSwiper}
data={sitePopupList}
title="提示"
content="暂未授权注册,请点击注册"
confirmButtonText="确定"
textAlgin="center"
type="1"
close={this.closeSiteSwiper}
confirm={this.closeSiteSwiper}
/>
<Navbar
leftSlot={
<Block>
@ -330,5 +361,8 @@ const mapDispatchToProps = (dispatch) => ({
otherSettingRefresh(data) {
dispatch(otherSettingRefresh(data));
},
setIndexFlag(data) {
dispatch(setIndexFlag(data));
},
});
export default connect(mapStateToProps, mapDispatchToProps)(Index);

@ -241,8 +241,8 @@ class UserInfo extends Component<any, any> {
};
onSkip = () => {
go("/pages/instrument/instrument");
// this.goUser();
// go("/pages/instrument/instrument");
this.goUser();
};
pickerChange = (event) => {

@ -8,14 +8,21 @@ const globalReducer = createSlice({
domain: "http://110.41.134.131:8080", // 请求地址
// domain: "http://192.168.10.147:8080", // 请求地址
token: "",
// 是否首次进入首页
isShowIndexFlag: false,
},
reducers: {
setToken(state, { payload }) {
// Taro.setStorageSync.setItem("token", payload);
state.token = payload;
},
setIndexFlag(state, { payload }) {
// Taro.setStorageSync.setItem("token", payload);
state.isShowIndexFlag = payload;
},
},
});
export const { setToken } = globalReducer.actions;
export const { setToken, setIndexFlag } = globalReducer.actions;
export default globalReducer.reducer;

@ -52,6 +52,26 @@ const userInfoReducer = createSlice({
Taro.setStorageSync("mobile", state.mobile);
// Taro.setStorageSync("token", state.token);
},
tokenRefresh(state, { payload }) {
state.id = payload.id || "001";
state.mobile = payload.mobile || "";
state.nickname = payload.nickname || "";
state.headimg = payload.headimg || "";
state.birthday = payload.birthday || dayjs().format("YYYY-MM-DD");
state.province = payload.province || "";
state.provinceId = payload.provinceId || "";
state.city = payload.city || "";
state.cityId = payload.cityId || "";
state.area = payload.area || "";
state.areaId = payload.areaId || "";
state.token = payload.token || "";
state.credit = payload.credit || 0;
state.expireCredit = payload.expireCredit || 0;
state.integralText = payload.integralText || "";
Taro.setStorageSync("mobile", state.mobile);
Taro.setStorageSync("token", state.token);
},
},
});

@ -180,7 +180,7 @@ export const GetCloseOfficialAccount = (data) => {
};
export const GetSitePopupList = (data) => {
// 站点管理-弹窗列表
// 站点管理-弹窗列表 1-首页 2-发现模块 3-活动模块
return Ajax({
url: "/hzwx/siteInfo/popup/" + data,
data,
@ -196,7 +196,7 @@ export const GetSiteCarousel = (data) => {
});
};
export const GetSiteAddTag = (data) => {
// 站点管理-轮播图-添加标签
// 站点管理-轮播图-添加标签 传值是id
return Ajax({
url: "/hzwx/addTag/" + data,
data,

@ -39,7 +39,7 @@ export const Ajax = (params) => {
data: params.data,
success(res) {
if (res.statusCode !== 200) {
if (res.statusCode == 403) {
if (res.statusCode == 401) {
Taro.showModal({
title: "提示",
content: "登录已过期,请重新登录",
@ -80,7 +80,7 @@ export const Ajax = (params) => {
showCancel: false,
}).then(() => {
reject(res);
if (res.data.code == 403 || res.data.msg === "登录状态已过期") {
if (res.data.code == 401 || res.data.msg === "登录状态已过期") {
Taro.setStorageSync("token", null);
Taro.reLaunch({
// url: "/pages/login/login",
@ -194,7 +194,7 @@ export const AjaxFormData = (params) => {
data: params.data.buffer,
success(res) {
if (res.statusCode !== 200) {
if (res.statusCode == 403) {
if (res.statusCode == 401) {
Taro.showModal({
title: "提示",
content: "登录已过期,请重新登录",
@ -229,7 +229,7 @@ export const AjaxFormData = (params) => {
showCancel: false,
}).then(() => {
reject(res);
if (res.data.code == 403 || res.data.msg === "登录状态已过期") {
if (res.data.code == 401 || res.data.msg === "登录状态已过期") {
Taro.setStorageSync("token", null);
Taro.reLaunch({
url: "/pages/login/login",

Loading…
Cancel
Save