Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev

src/moduleIOT/pages/iotCarePlan/FR200.tsx

@@ -2077,7 +2077,7 @@ class IotCarePlanFR200 extends Component<any, any> {
         let average: any = this.determineTier(maxName / 2);
         // let average = maxName / 2;
         if (average >= 1) {
-          average = average - 1;
+          // average = average - 1;
           average = average * 10;
         }
         // 将包含该组对象和平均数的对象添加到 groupedAa 数组中

src/moduleIOT/pages/iotCarePlan/components/popup-We/popup-CurrentCustomization.tsx

@@ -85,7 +85,7 @@ class PopupWe extends Component<any, any> {
       isShow,
       isClose,
       isLarge,
-      values,
+      close,
       myClassName,
       zIndex,
       Page,
@@ -93,7 +93,9 @@ class PopupWe extends Component<any, any> {
       handlepopupCheck,
       WeCurrent,
       PreviousStep,
-      NextStep
+      NextStep,
+      handleSteps,
+     
     } = this.props;
     if (!zIndex) zIndex = 10001;
     return (
@@ -122,7 +124,14 @@ class PopupWe extends Component<any, any> {
               >
                 {title}
               </View>
+              
             )}
+            <View
+            className="at-icon at-icon-close site-close"
+            onClick={() =>{
+              close()
+            }}
+          ></View>
 
             <View className="center">
               <View className="page">
@@ -131,25 +140,26 @@ class PopupWe extends Component<any, any> {
               <View className="titleSlogan">{WeCurrent[Page - 1].titleSlogan}</View>
               {Page > 3 ? <View>
                 <View className="img">22222</View>
-                <View>
+                <View className="drag_box">
-                  <Steps active={1} steps={[
+                <View className="line_left"></View>
-                    {
+                  <Steps active={WeCurrent[Page - 1].activeinde} onClickStep={(e) => {
-                      text: '步骤一',
+                    handleSteps(e)
-                      desc: '描述信息',
+                  }} direction="horizontal"
-                    },
+                    activeColor="#e6d3b0" inactiveColor="#f7f7f7" steps={[
-                    {
+                      { activeIcon: 'circle',},
-                      text: '步骤二',
+                      { activeIcon: 'circle',},
-                      desc: '描述信息',
+                      { activeIcon: 'circle',},
-                    },
+                      { activeIcon: 'circle',},
-                    {
+                    ]}>111111111111111111</Steps><View className={`line_right ${WeCurrent[Page - 1].activeinde === 3 ? 'orange' : ''}`}></View>
-                      text: '步骤三',
+                    <View className="box">
-                      desc: '描述信息',
+                       
-                    },
+                    <View className="box_item">无</View>
-                    {
+                    <View className="box_item">轻微</View>
-                      text: '步骤四',
+                    <View className="box_item">中度</View>
-                      desc: '描述信息',
+                    <View className="box_item">重度</View>
-                    },
+                     
-                  ]}></Steps>
+                    
+                    </View>
                 </View>
               </View> : <View>
                 <View className="img">
@@ -159,9 +169,9 @@ class PopupWe extends Component<any, any> {
 
 
                   <CheckboxGroup
-                    value={WeCurrent[Page - 1].values}
+                    value={WeCurrent[Page - 1].Checkbox}
                     onChange={(e) => {
-                      console.info(e, WeCurrent, Page)
+                      
                       handlepopupCheck(e)
 
                     }}
@@ -183,7 +193,7 @@ class PopupWe extends Component<any, any> {
                 上一步
               </Button> : null}
 
-              <Button className="alert-popup-btn" disabled={WeCurrent[Page - 1].values.length === 0 ? true : false} onClick={(e) => {
+              <Button className="alert-popup-btn"  onClick={(e) => {
                 NextStep()
               }}>
                 下一步

src/moduleIOT/pages/iotCarePlan/components/popup-We/popup-We.less

@@ -8,6 +8,45 @@
   }
 }
 
+.van-step--horizontal .van-step__circle-container {
+  position: absolute;
+  bottom: 12rpx;
+  z-index: 1;
+  -webkit-transform: translate3d(-50%, 50%, 0);
+  transform: translate3d(-50%, 50%, 0);
+  background-color: transparent !important;
+  // background-color: no !important; 
+  padding: 0 16rpx;
+  padding: 0 var(--padding-xs, 16rpx);
+}
+
+.van-step--horizontal .van-step__line {
+  height: 14rpx;
+  border-radius: 15rpx;
+  // background-color: #dedede !important;
+}
+
+.van-step--horizontal:first-child .van-step__circle-container {
+  padding: 0px 0rpx 0 0;
+}
+
+.van-step--finish {
+  // background-color: red;
+}
+
+.van-step__circle {
+  width: 25rpx;
+  height: 25rpx;
+}
+
+.van-steps--horizontal .van-step__wrapper {
+  overflow: unset;
+}
+// 图标样式
+.van-step--horizontal.van-step--process .van-step__icon {
+  font-size: var(--step-icon-size, 30rpx);
+}
+
 .step-absolutely {
   width: 600rpx;
   height: 720rpx;
@@ -38,6 +77,19 @@
 }
 
 .Newpop {
+  .site-close{
+    position: absolute;
+    right: 16rpx;
+    top: 44rpx;
+    color: #000;
+    font-size: 36rpx;
+    z-index: 100009;
+    background-color: transparent;
+    border-radius: 50%;
+    padding: 8rpx;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+  }
   .center {
     // background-color: red;
     height: 720rpx;
@@ -48,16 +100,73 @@
       font-size: 25rpx;
 
     }
-    .titleSlogan{
+
+    .titleSlogan {
       font-size: 30rpx;
       font-family: 700;
       margin-bottom: 17rpx;
     }
+
     .img {
       width: 100%;
       height: 500rpx;
       background-color: #666;
     }
+    .orange{
+      background-color: #e6d9bc !important;
+    }
+    .drag_box{
+      position: relative;
+      .line_left{
+        position: absolute;
+        left: 4rpx;
+        top: 68rpx;
+        width: 22rpx;
+        height: 14rpx;
+        background-color: #e6d9bc;
+        border-radius: 7rpx;
+      }
+      .line_right{
+           /* position: absolute; */
+    top: 68rpx;
+    right: 0rpx;
+    position: absolute;
+    /* left: 4rpx; */
+    /* top: 63rpx; */
+    width: 35rpx;
+    height: 14rpx;
+    background-color: #f7f7f7;
+    border-radius: 7rpx;
+      }
+    }
+    .box {
+      display: flex;
+
+      .box_item {
+        width: 25%;
+        // margin-left: 34rpx;
+        // .box_item:last-of-type{
+        //   background-color: red;
+        //  }
+      }
+
+      .box_item:nth-child(1) {
+        padding-left: 30rpx;
+      }
+
+      .box_item:nth-child(2) {
+        padding-left: 42rpx;
+      }
+
+      .box_item:nth-child(3) {
+        padding-left: 99rpx;
+      }
+
+      .box_item:nth-child(4) {
+        text-align: right;
+      }
+
+    }
 
     .text {
       margin: 20rpx;

src/pages/index/index.tsx

@@ -13,7 +13,7 @@ import {
   PageMeta,
   Radio
 } from "@tarojs/components";
-import { Popup } from "@antmjs/vantui";
+import { Popup,Toast  } from "@antmjs/vantui";
 /*** redux ***/
 import { connect } from "react-redux";
 import { userRefresh, tokenRefresh } from "@/store/features/userInfo";
@@ -41,7 +41,7 @@ import ConnectionBluetoot from "@/components/bluetoot/connection";
 import UpdateIotWL200 from "@/components/bluetoot/update-wl200/index";
 import UpdateIotFR200 from "@/components/bluetoot/update-fr200/index";
 // import PopupWe from "@/moduleIOT/pages/iotCarePlan/components/popup-We/popup-We";
-import PopupWe from "../../moduleIOT/pages/iotCarePlan/components/popup-We/popup-We";
+import PopupWe from "../../moduleIOT/pages/iotCarePlan/components/popup-We/popup-CurrentCustomization";
 
 
 /** 自定义组件 **/
@@ -75,49 +75,47 @@ class Index extends Component<any, any> {
   constructor(props) {
     super(props);
     this.state = {
-
       isDisabledClickAddDevice: false, // 是否禁止点击添加设备
       isCommonError: false, // 是否显示通用错误提示
       commonErrorText: [], // 通用错误提示
+
       WeCurrent: [
         {
-          values:[],
+          Checkbox: [],
-          text1:' 强效提拉额肌，淡化抬头纹',
+          text1: ' 强效提拉额肌，淡化抬头纹',
-          text2:'密集水光灌注，胶原直达肌底',
+          text2: '密集水光灌注，胶原直达肌底',
-          titleSlogan:'请选择额头区域的护理目标（可多选）'
+          titleSlogan: '请选择额头区域的护理目标（可多选）'
         },
         {
-          values:[],
+          Checkbox: [],
-          text1:' 强效提拉额肌，淡化抬头纹',
+          text1: ' 强效提拉额肌，淡化抬头纹',
-          text2:'密集水光灌注，胶原直达肌底',
+          text2: '密集水光灌注，胶原直达肌底',
-          titleSlogan:'请选择脸颊区域的护理目标（可多选）'
+          titleSlogan: '请选择脸颊区域的护理目标（可多选）'
         },
         {
-          values:[],
+          Checkbox: [],
-          text1:' 强效提拉轮廓，淡化木偶纹',
+          text1: ' 强效提拉轮廓，淡化木偶纹',
-          text2:'密集水光灌注，胶原直达肌底',
+          text2: '密集水光灌注，胶原直达肌底',
-          titleSlogan:'请选择下颌线区域的护理目标（可多选）'
+          titleSlogan: '请选择下颌线区域的护理目标（可多选）'
         },
         {
-          values:[],
+          Checkbox: [],
-          text1:' 444',
+          activeinde: 0,
-          text2:'444',
+          titleSlogan: '请选择额头区域的护理目标（可多选）'
-          titleSlogan:'请选择额头区域的护理目标（可多选）'
         },
         {
-          values:[],
+          Checkbox: [],
-          text1:' 55555',
+          activeinde: 0,
-          text2:'55555',
+          titleSlogan: '请选择额头区域的护理目标（可多选）'
-          titleSlogan:'请选择额头区域的护理目标（可多选）'
         },
         {
-          values:[],
+          Checkbox: [],
-          text1:' 6666',
+          activeinde: 0,
-          text2:'66666',
+          titleSlogan: '请选择额头区域的护理目标（可多选）'
-          titleSlogan:'请选择额头区域的护理目标（可多选）'
         }
       ],
-      WeCurrentPage: 4,
+      isModeLockWE: false,
+      WeCurrentPage: 1,
       showEquipment: false, // 扫码绑定设备弹窗
       isRegisterBoolean: false, // 是否已登录
       isShowPrivacyPopup: false,
@@ -128,7 +126,7 @@ class Index extends Component<any, any> {
       userinfo: {
         mobile: Taro.getStorageSync("mobile"),
       },
-      isModeLockWE: false,
+
       // 膜布列表
       MembraneClothList: [{
         name: '集体美容仪'
@@ -210,6 +208,7 @@ class Index extends Component<any, any> {
       // 设备是否重连弹窗
       isShowReConnectDeviceRecordWL200: false,
     };
+    
   }
 
   async onLoad(options) {
@@ -584,17 +583,27 @@ class Index extends Component<any, any> {
   }
   // 复选框
   handlepopupCheck = (e) => {
-    let WeCurrent =this.state.WeCurrent
+    let WeCurrent = this.state.WeCurrent
-    let WeCurrentPage =this.state.WeCurrentPage
+    let WeCurrentPage = this.state.WeCurrentPage
-    WeCurrent[WeCurrentPage -1].values=[...e.detail]
+    WeCurrent[WeCurrentPage - 1].Checkbox = [...e.detail]
     this.setState({ WeCurrent })
   }
+  // 进度条
+  handleSteps = (e) => {
+    let WeCurrent = this.state.WeCurrent
+    let WeCurrentPage = this.state.WeCurrentPage
+    WeCurrent[WeCurrentPage - 1].activeinde = e.detail
+
+    // console.log(e,'查看选择');
+    this.setState({ WeCurrent })
+
+  }
   // 上一步
   PreviousStep = () => {
-    console.log(1111111);
+
-    let WeCurrentPage =this.state.WeCurrentPage
+    let WeCurrentPage = this.state.WeCurrentPage
-    if(WeCurrentPage !== 1){
+    if (WeCurrentPage !== 1) {
-      WeCurrentPage=WeCurrentPage-1
+      WeCurrentPage = WeCurrentPage - 1
       this.setState({
         WeCurrentPage
       })
@@ -603,9 +612,16 @@ class Index extends Component<any, any> {
   }
   // 下一步
   NextStep = () => {
-    let WeCurrentPage =this.state.WeCurrentPage
+    let WeCurrentPage = this.state.WeCurrentPage
-    if(WeCurrentPage !== 6){
+    let WeCurrent = this.state.WeCurrent
-      WeCurrentPage=WeCurrentPage+1
+    if (WeCurrentPage === 1 || WeCurrentPage === 2 || WeCurrentPage === 3) {
+      if (WeCurrent[WeCurrentPage - 1].Checkbox.length === 0) {
+      
+        return
+      }
+    }
+    if (WeCurrentPage !== 6) {
+      WeCurrentPage = WeCurrentPage + 1
       this.setState({
         WeCurrentPage
       })
@@ -1637,8 +1653,10 @@ class Index extends Component<any, any> {
 
           Page={WeCurrentPage}
           WeCurrent={WeCurrent}
+
           confirm={this.handlepopup}
           handlepopupCheck={this.handlepopupCheck}
+          handleSteps={this.handleSteps}
           PreviousStep={this.PreviousStep}
           NextStep={this.NextStep}
         />