merge:合并冲突

src/pages/index/index.less

@@ -1015,3 +1015,37 @@ page {
     }
   }
 }
+ .custom-popup{
+  background: none !important;
+}
+.van-popup {
+  border-radius: 30rpx;
+  .popBox {
+    // box-sizing: border-box;
+    // width: 670rpx;
+    // height: 840rpx;
+    // background: #ffffff;
+    // border-radius: 30rpx;
+    // position: relative;
+    // padding: 42rpx 30rpx 0;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    width: 670rpx;
+    height: 250rpx;
+    background: rgba(0,0,0,0.6);
+    border-radius: 30rpx;
+    position: relative;
+    text-align: center;
+    color: #ffff;
+    line-height: 250rpx;
+    opacity: 0.8;
+    .close_icon {
+      position: absolute;
+      width: 50rpx;
+      height: 50rpx;
+      top: 34rpx;
+      right: 34rpx;
+    }
+    
+  }
+}

src/pages/index/index.tsx

@@ -11,7 +11,7 @@ import {
   SwiperItem,
   RichText,
 } from "@tarojs/components";
-
+import { Popup } from "@antmjs/vantui";
 /*** redux ***/
 import { connect } from "react-redux";
 import { userRefresh, tokenRefresh } from "@/store/features/userInfo";
@@ -135,6 +135,7 @@ class Index extends Component<any, any> {
 
       /** 已绑定仪器 */
       instrument_detail: {},
+      show: false,
       /* 已绑定仪器 END */
 
       /** 蓝牙相关 */
@@ -361,7 +362,10 @@ class Index extends Component<any, any> {
   goRegister() {
     go("/pages/register/register");
   }
-
+  // 查看所有设备是否绑定完
+  Alldevice = () => {
+    console.log(this.state.isDisabledClickAddDevic, "查看");
+  };
   // 新增设备
   addNewDevice = () => {
     if (this.isRegister("addNewDevice")) {
@@ -416,10 +420,27 @@ class Index extends Component<any, any> {
     go(`/pages/recording/recording?param=${ViewAddInstrument}`);
   };
 
-  gourl = (e) => {
+  gourl = async (e) => {
+    console.log("添加新设备", e);
+
     const { url } = e.currentTarget.dataset;
     if (this.isRegister()) {
-      go(url);
+      if (url === "/pages/instrument/instrument") {
+        let { data } = await InstrumentInfo.unbindingInstrumentInfoList();
+        console.log(data, "查看未绑定设备");
+        if (data.data.length === 0) {
+          this.setState({
+            show: true,
+          });
+          setTimeout(() => {
+            this.setState({ show: false });
+          }, 1000); // 2秒后将 show 变量置为 false
+        } else {
+          go(url);
+        }
+      } else {
+        go(url);
+      }
     }
   };
 
@@ -954,6 +975,7 @@ class Index extends Component<any, any> {
   };
   render() {
     let {
+      show,
       isCommonError,
       commonErrorText,
       calendarComplete,
@@ -1322,6 +1344,9 @@ class Index extends Component<any, any> {
           </Swiper>
         </View>
         <View style="height:200rpx"></View>
+        <Popup show={show} className="custom-popup" overlay={false}>
+          <View className="popBox">你已绑定所有设备</View>
+        </Popup>
       </Block>
     );
   }

src/pages/instrument/instrument.less

@@ -393,3 +393,4 @@ margin-right: 60rpx;
   border-radius: 45rpx;
   color: #fff;
 }
+ 

src/pages/instrument/instrument.tsx

@@ -50,6 +50,7 @@ export default class Instrument extends Component<any, any> {
         serialImage: "",
         serialCode: "",
       },
+      show: true,
       equipmentList: [
         {
           id: 1,
@@ -241,6 +242,8 @@ export default class Instrument extends Component<any, any> {
   // 未绑定列表
   unbindingInstrumentInfoList = async () => {
     let { data } = await InstrumentInfo.unbindingInstrumentInfoList();
+    console.log(data, "查看未绑定设备");
+
     if (data.code === 200) {
       if (data.data.length) {
         if (!this.isOnly) {
@@ -455,6 +458,7 @@ export default class Instrument extends Component<any, any> {
       isBindingError,
       isBindingError203,
       isBindingCheckError,
+      show,
       channelInfo,
       inputType,
       style,

src/pages/instrument_manage/index.less

@@ -83,7 +83,12 @@ page {
       }
     }
   }
-
+  .backColer{
+    background: linear-gradient(to bottom, #e3e3e3, #f8f8f8);
+    height: 211rpx;
+    padding: 0rpx 0rpx;
+    border-radius: 50px;
+  }
   .bind_cont {
     .title {
       text-align: center;

src/pages/instrument_manage/index.tsx

@@ -184,7 +184,7 @@ export default class InstrumentManage extends Component<any, any> {
                                 </View>
                               </View>
                             </View>
-                            <View className="bind_cont">
+                            <View className="bind_cont backColer">
                               <View className="title">{item.name}</View>
                               <View
                                 className="bindinfo"

src/pages/recording/recording.less

@@ -674,6 +674,8 @@ page {
       .img {
         position: relative;
         margin-right: 35rpx;
+        width: 180rpx;
+        height: 180rpx;
         .closeImg {
           position: absolute;
           top: 10rpx;
@@ -698,8 +700,8 @@ page {
         }
       }
       .showImg {
-        width: 180rpx;
-        height: 180rpx;
+        width: 100% !important;
+        height: 100% !important;
         border-radius: 20rpx;
       }
     }

src/pages/recording/recording.tsx

@@ -709,6 +709,7 @@ export default class Recording extends Component<any, any> {
                     className="showImg"
                     src={require("../../img/clock_in_upload/add-image.png")}
                     mode="widthFix"
+                  
                   ></Image>
                 </View>
               )}