diff --git a/src/pages/index/index.less b/src/pages/index/index.less index aa3df80..db760d0 100644 --- a/src/pages/index/index.less +++ b/src/pages/index/index.less @@ -519,9 +519,19 @@ page { .MembraneCloth { position: relative; width: 670rpx; - height: 840rpx; border-radius: 30rpx; background: #fff; + padding: 52rpx 20rpx 46rpx; + box-sizing: border-box; + + .title { + font-weight: bold; + text-align: center; + font-size: 36rpx; + margin-bottom: 36rpx; + color: #030000; + } + .btn1 { font-style: normal; width: 270rpx; @@ -532,28 +542,57 @@ page { border-radius: 45rpx; font-size: 32rpx; font-weight: bold; - margin-top: 55rpx; color: #ffffff; } - .center{ - height: 70%; - background-color: red; - .list{ + .center { + margin-bottom: 44rpx; + .list { width: 100%; - height: 117rpx; - background-color: #41a9fc; - border-bottom: 2rpx solid black; - display: flex; + height: 150rpx; + background: linear-gradient(90deg, #efdcc2, #fff2df); + border-radius: 30rpx; + margin-bottom: 20rpx; + padding: 20rpx 31rpx 20rpx 20rpx; + box-sizing: border-box; + justify-content: space-between; + Image { + width: 120rpx; + height: 120rpx; + border-radius: 20rpx; + } + .name_box { + margin-left: 24rpx; + .name { + font-family: PingFang SC; + font-weight: bold; + font-size: 26rpx; + color: #000000; + margin-bottom: 12rpx; + } + .subTitle { + font-family: PingFang SC; + font-weight: 500; + font-size: 22rpx; + color: #666666; + } + } + + .buy { + font-family: PingFang SC; + font-weight: 500; + font-size: 26rpx; + color: #666666; + display: flex; + align-items: center; + Image { + height: 20rpx; + width: 20rpx; + margin-left: 10rpx; + } + } } } } -.MembraneCloth .title { - font-weight: bold; - text-align: center; - font-size: 36rpx; - color: #030000; - padding-top: 39rpx; -} .popbox .title { font-weight: bold; text-align: center; diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index cb1e1e1..5fac2ce 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -1,5 +1,4 @@ import classnames from "classnames"; -setSerial; import dayjs from "dayjs"; import Taro from "@tarojs/taro"; import { Component } from "react"; @@ -12,8 +11,9 @@ import { SwiperItem, RichText, PageMeta, + Radio } from "@tarojs/components"; -import { Popup,Radio } from "@antmjs/vantui"; +import { Popup } from "@antmjs/vantui"; /*** redux ***/ import { connect } from "react-redux"; import { userRefresh, tokenRefresh } from "@/store/features/userInfo"; @@ -84,23 +84,14 @@ class Index extends Component { mobile: Taro.getStorageSync("mobile"), }, // 膜布列表 - MembraneClothList:[ { - name:'mox名字' + MembraneClothList: [{ + name: '集体美容仪' }, { - name:'mox名字' - }, - { - name:'mox名字' - }, { - name:'mox名字' - }, { - name:'mox名字' - },], - checkedMembraneCloth:'', - list: [ - - ], + name: 'M02美容仪' + }], + checkedMembraneCloth: '', + list: [], params: "", messageCount: Taro.getStorageSync("messageCount") || 0, offlineDialogType: 1, //1离线弹窗 2升级弹窗 @@ -204,7 +195,7 @@ class Index extends Component { } } - componentDidMount() {} + componentDidMount() { } componentWillUnmount() { // 页面卸载监听 @@ -278,7 +269,7 @@ class Index extends Component { this.isSancQrcodeEnter(); } }, - fail: () => {}, + fail: () => { }, complete: () => { // 授权完成运行页面初始化 }, @@ -535,7 +526,7 @@ class Index extends Component { this.setState({ isShowSiteSwiper: false }); }; - bannerSwiperchange() {} + bannerSwiperchange() { } gobanner(item) { // 跳转类型:0无跳转、1跳转内部链接、3跳转外部链接、4跳转小程序、5导向视频号、6导向视频号直播间', @@ -1109,6 +1100,8 @@ class Index extends Component { isCommonError, commonErrorText, MembraneClothList, + checkedMembraneCloth, + list, calendarComplete, calendarInComplete, currentDate, @@ -1153,7 +1146,7 @@ class Index extends Component { {commonErrorText.map((item) => { @@ -1161,60 +1154,60 @@ class Index extends Component { })} } - confirmButtonText="知道了" - textAlgin="center" + confirmButtonText='知道了' + textAlgin='center' close={this.onCommonErrorFun} confirm={this.onCommonErrorFun} /> 检测到您上一次护理的记录未生成, 是否重新读取 } - cancelButtonText="取消" - confirmButtonText="连接设备" - textAlgin="center" + cancelButtonText='取消' + confirmButtonText='连接设备' + textAlgin='center' close={this.closeReConnectDeviceRecordWL200} confirm={this.confirmReConnectDeviceRecordWL200} /> 序列号信息仍在更新,请联系微信小助理 协助您绑定仪器 } - confirmButtonText="知道了" - textAlgin="center" + confirmButtonText='知道了' + textAlgin='center' close={this.onBindErrorClose} confirm={this.onBindErrorConfirm} /> @@ -1233,54 +1226,54 @@ class Index extends Component { /> 序列号信息仍在更新,请联系微信小助理 协助您绑定仪器 } - confirmButtonText="知道了" - textAlgin="center" + confirmButtonText='知道了' + textAlgin='center' close={this.onBindErrorClose} confirm={this.onBindErrorConfirm} /> - + 仪器:{instrumentInfo.instrumentName} - 序列号:{instrumentInfo.serial} - 您需要完成注册登录才能进行一起绑定 + 序列号:{instrumentInfo.serial} + 您需要完成注册登录才能进行一起绑定 } - confirmButtonText="知道了" - textAlgin="center" + confirmButtonText='知道了' + textAlgin='center' close={this.onUnloginClose.bind(this)} confirm={this.onUnloginConfirm.bind(this)} > @@ -1288,9 +1281,9 @@ class Index extends Component { @@ -1310,15 +1303,15 @@ class Index extends Component { isLarge isClose isShow={isShowUpdateVersionTip} - title="提示" + title='提示' content={ 检测到设备有升级请求 是否进行升级? } - textAlgin="center" - confirmButtonText="确定" + textAlgin='center' + confirmButtonText='确定' close={this.cancelUpdateVersionTip} confirm={this.confirmUpdateVersionTip} /> @@ -1331,16 +1324,16 @@ class Index extends Component { )} - + } - confirmButtonText="知道了" - textAlgin="left" + confirmButtonText='知道了' + textAlgin='left' isClose close={this.onVersionUpgradFinish} confirm={this.onVersionUpgradFinish} @@ -1352,29 +1345,29 @@ class Index extends Component { leftSlot={ - {messagecount ? : ""} + {messagecount ? : ""} } /> - - - 护理记录 + + + 护理记录 - + { /> - + {instrumentList.length > 0 && ( - - 前往护理 + + 前往护理 - 添加新设备 + 添加新设备 - - + + {instrumentList.map((item, index) => { return ( - + {item.name} @@ -1431,28 +1424,28 @@ class Index extends Component { )} {instrumentList.length === 0 && ( - - 前往护理 + + 前往护理 - - - + + + - + 添加新设备 - 您暂时还没有绑定任何设备 + 您暂时还没有绑定任何设备 )} - + { key={"banner_" + index} onClick={this.gobanner.bind(this, item)} > - + ); })} - - - 你已绑定所有设备 + + + 你已绑定所有设备 - - - 膜布选择 - - {MembraneClothList.map((item, index) => { - return ( - - {item.name} - - - ); - })} + + + 膜布选择 + + {MembraneClothList.map((item, index) => { + return ( + + + + + + + {item.name} + + + 描述描述描述描述 + + + + + 前往购买 + + + + ); + })} - - + + 确认 - - - + + + {/* */} {/*