diff --git a/pages/home/jl/index.js b/pages/home/jl/index.js
index 0a43c3b..11e2dd4 100644
--- a/pages/home/jl/index.js
+++ b/pages/home/jl/index.js
@@ -166,6 +166,8 @@ Page({
             this.getUserInfo()
         },2000)
     },
+    // 关闭注入弹层
+    closeEnergy(){this.setData({showScsEnergy:false})},
     getUserInfo(){
         req.getRequest('/api/user/curt',{}).then((res)=>{
             if(res.data.code===200){
diff --git a/pages/home/jl/index.wxml b/pages/home/jl/index.wxml
index bdd87a8..b3135f6 100644
--- a/pages/home/jl/index.wxml
+++ b/pages/home/jl/index.wxml
@@ -1,5 +1,5 @@
 
-<swiper class="call">
+<swiper class="call" bindtap="closeEnergy">
   <swiper-item class="call1"><!--单人页面-->
     <t-image class="tx" src="{{userInfo.avatar}}"></t-image>
     <view class="txtext">{{userInfo.nick}}</view><!--头像名字-->
diff --git a/pages/home/jl/index.wxss b/pages/home/jl/index.wxss
index 791bba0..6b350d4 100644
--- a/pages/home/jl/index.wxss
+++ b/pages/home/jl/index.wxss
@@ -877,6 +877,7 @@ picker-view-column {
     padding: 36rpx 0 0 20rpx;
     box-sizing: border-box;
     box-shadow: 1px 2px 6px 0px rgba(0, 0, 0, 0.4);
+    z-index: 999;
 }
 
 .in-energy {
diff --git a/pages/home/jl/jlai/jlai.wxml b/pages/home/jl/jlai/jlai.wxml
index 5e3a7e7..8db719d 100644
--- a/pages/home/jl/jlai/jlai.wxml
+++ b/pages/home/jl/jlai/jlai.wxml
@@ -70,11 +70,13 @@
 </view>
 <!--是会员或者剩余聊天次数不为0 加号没有缩回 快捷键-->
 <view class="myshkjj" wx:if="{{isAdd}}">
-    <view class="myshkjjco myshkjjxzys" data-lt="星座运势" bindtap="doLt">星座运势</view>
-    <view class="myshkjjco myshkjjxxzb" data-lt="星座占卜" bindtap="doLt">星座占卜</view>
-    <view class="myshkjjco myshkjjtlzb" data-lt="塔罗占卜" bindtap="doLt">塔罗占卜</view>
-    <view class="myshkjjco myshkjjwzmxyx" data-lt="文字冒险游戏" bindtap="doLt">文字冒险游戏</view>
-    <view class="myshkjjco myshkjjbwxyfqs" data-lt="帮我写一封情书" bindtap="doLt">帮我写一封情书</view>
-    <view class="myshkjjco myshkjjwhtwlhzy" data-lt="我和Ta未来会怎样" bindtap="doLt">我和Ta未来会怎样</view>
-    <view class="myshkjjco myshkjjqgqs" data-lt="情感倾诉" bindtap="doLt">情感倾诉</view>
+    <view class="myshkjj-container">
+        <view class="myshkjjco myshkjjxzys" data-lt="星座运势" bindtap="doLt">星座运势</view>
+        <view class="myshkjjco myshkjjxxzb" data-lt="星座占卜" bindtap="doLt">星座占卜</view>
+        <view class="myshkjjco myshkjjtlzb" data-lt="塔罗占卜" bindtap="doLt">塔罗占卜</view>
+        <view class="myshkjjco myshkjjwzmxyx" data-lt="文字冒险游戏" bindtap="doLt">文字冒险游戏</view>
+        <view class="myshkjjco myshkjjbwxyfqs" data-lt="帮我写一封情书" bindtap="doLt">帮我写一封情书</view>
+        <view class="myshkjjco myshkjjwhtwlhzy" data-lt="我和Ta未来会怎样" bindtap="doLt">我和Ta未来会怎样</view>
+        <view class="myshkjjco myshkjjqgqs" data-lt="情感倾诉" bindtap="doLt">情感倾诉</view>
+    </view>
 </view>
diff --git a/pages/home/jl/jlai/jlai.wxss b/pages/home/jl/jlai/jlai.wxss
index f9c2bda..4e24f9b 100644
--- a/pages/home/jl/jlai/jlai.wxss
+++ b/pages/home/jl/jlai/jlai.wxss
@@ -292,9 +292,9 @@
     position: absolute;
     left: 0;
     top: 1224rpx;
-    width: 375px;
-    height: 90px;
-    line-height: 20px;
+    width: 100%;
+    height: 110rpx;
+    line-height: 40rpx;
     background-color: rgba(248, 248, 248, 1);
     text-align: center;
     border: 1px solid rgba(255, 0, 0, 0);
@@ -302,61 +302,48 @@
 .myshkjj{
     position: absolute;
     top: 1340rpx;
-    width: 1924rpx;
-    height: 108px;
-    line-height: 20px;
-    background-color: rgba(255, 255, 255, 1);
-    text-align: center;
-    overflow: auto;
+    width: 100%; /* 容器宽度 */
+    overflow-x: scroll; /* 横向滚动 */
+}
+
+.myshkjj-container {
+    width: 990rpx;
+    height: 200rpx;
+    padding-top: 20rpx;
+    display: flex;
+    flex-wrap: wrap;
 }
+
 .myshkjjco{
-    position: absolute;
-    height: 30px;
-    line-height: 55rpx;
-    opacity: 0.9;
-    border-radius: 24px;
+    margin-left: 30rpx;
+    height: 60rpx;
+    border-radius: 48rpx;
     background: linear-gradient(222.69deg, rgba(248,99,42,1) 14.04%,rgba(249,135,89,1) 88.56%);
-    font-size: 12px;
-    text-align: center;
     box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.4);
-    font-family: Arial;
     color: rgba(255, 255, 255, 1);
-    font-size: 14px;
-    text-align: center;
-    font-family: SourceHanSansSC-regular;
+    font-size: 28rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 .myshkjjxzys{
-    left: 14px;
-    top: 17px;
-    width: 88px;
+    width: 176rpx;
 }
 .myshkjjxxzb{
-    left: 118px;
-    top: 17px;
-    width: 88px;
+    width: 176rpx;
 }
 .myshkjjtlzb{
-    left: 222px;
-    top: 17px;
-    width: 88px;
+    width: 178rpx;
 }
 .myshkjjwzmxyx{
-    left: 326px;
-    top: 17px;
-    width: 137px;
+    width: 274rpx;
 }
 .myshkjjbwxyfqs{
-    left: 14px;
-top: 63px;
-width: 153px;
+    width: 306rpx;
 }
 .myshkjjwhtwlhzy{
-    left: 183px;
-top: 63px;
-width: 167px;
+    width: 334rpx;
 }
 .myshkjjqgqs{
-    left: 366px;
-top: 63px;
-width: 118px;
+    width: 236rpx;
 }
\ No newline at end of file
diff --git a/pages/home/me/indexx.wxml b/pages/home/me/indexx.wxml
index 99252b0..9fccbb4 100644
--- a/pages/home/me/indexx.wxml
+++ b/pages/home/me/indexx.wxml
@@ -9,19 +9,19 @@
 <view class="hydqr" wx:if="{{userInfo.isChatVip}}"> 还有21天到期</view><!--会员图标-->
 
 <view class="gnk">
-    <view class="smst" >说明书</view>
-    <view class="jrsqt">加入社群</view>
+    <!-- <view class="smst" >说明书</view> -->
+    <!-- <view class="jrsqt">加入社群</view> -->
     <view class="wdsbt">我的设备</view>
     <view class="sx"></view>
-    <view class="circle k1" bindtap="go2Manual">
-        <view class="sms"></view>
-    </view>
+    <!-- <view class="circle k1" bindtap="go2Manual"> -->
+        <!-- <view class="sms"></view>
+    </view> -->
     <view class="circle k2" bindtap="go2Device">
         <view class="sq"></view>
     </view>
-    <view class="circle k3" bindtap="go2Sq">
+    <!-- <view class="circle k3" bindtap="go2Sq">
         <view class="sb"></view>
-    </view>
+    </view> -->
 </view>
 <!--功能操作框-->
 <view class="mycell"  bindtap="ljXzjl" >
diff --git a/pages/home/me/mydevice/device.wxss b/pages/home/me/mydevice/device.wxss
index 03ae180..b9ddbcc 100644
--- a/pages/home/me/mydevice/device.wxss
+++ b/pages/home/me/mydevice/device.wxss
@@ -649,13 +649,15 @@
     position: absolute;
     left: 152rpx;
     top: 778rpx;
-    width: 370rpx;
+    width: 410rpx;
     height: 88rpx;
     line-height: 88rpx;
+    text-align: center;
     color: rgba(108, 108, 108, 1);
     font-size: 32rpx;
-    text-align: center;
-    font-family: SourceHanSansSC-regular;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 .fz{
diff --git a/pages/home/xy/index.js b/pages/home/xy/index.js
index 224db90..238c6a3 100644
--- a/pages/home/xy/index.js
+++ b/pages/home/xy/index.js
@@ -10,10 +10,8 @@ Page({
         xzInfo:{},
         userInfo:{},
         xyNfc:true,
-        xyInfo:{
-
-        }
-
+        xyInfo:{},
+        visible:false
     },
 
     /**
@@ -38,6 +36,13 @@ Page({
             if(res.data.code==200){
                 this.setData({userInfo:res.data.data})
             }
+            if(res.data.data.horoscope){
+                this.setData({visible: true})
+                const showVisible = setTimeout(() => {
+                    this.setData({visible: false})
+                    clearTimeout(showVisible)
+                }, 1000)
+            }
            }).catch((err)=>{
             console.log(err);
         })
@@ -89,45 +94,5 @@ Page({
      * 用户点击右上角分享
      */
     onShareAppMessage() {
-
-    },
-    ToastDialog(e) {
-        const { item } = e.currentTarget.dataset;
-    
-        this.setData(
-            {
-            },
-            () => {
-            this.setData({ visible: true });
-            },
-        );
-    }
-    ,
-    onVisibleChange(e) {
-    this.setData({
-        visible: e.detail.visible,
-    });
     }
-
-    // ,
-    // methods:{
-    //     ToastDialog(e) {
-    //         console.log('999999999')
-    //         const { item } = e.currentTarget.dataset;
-      
-    //         this.setData(
-    //           {
-    //             cur: item,
-    //           },
-    //           () => {
-    //             this.setData({ visible: true });
-    //           },
-    //         );
-    //       },
-    //       onVisibleChange(e) {
-    //         this.setData({
-    //           visible: e.detail.visible,
-    //         });
-    //       }
-    // }
 })
\ No newline at end of file
diff --git a/pages/home/xy/index.wxml b/pages/home/xy/index.wxml
index 2fe19cc..7be6436 100644
--- a/pages/home/xy/index.wxml
+++ b/pages/home/xy/index.wxml
@@ -19,14 +19,10 @@
 
 <t-image class="xzy" src="{{xzInfo[userInfo.horoscope.name].avatar}}"></t-image>
 
-<t-popup class="ttpopup" visible="{{visible}}" bind:visible-change="onVisibleChange" placement="{{'center'}}">
-  <view class="ttpopup">
+  <view class="ttpopup" wx:if="{{visible}}">
     <view class="ztys">{{userInfo.horoscope.summary}}</view>
-    <view class="rjkzs"><t-rate value="3"  icon="{{ ['star-filled', 'star'] }}" color="#FCFC32"  /></view>
-    <view class="jkzs"></view>
-    <view class="aqzs"></view>
-    <view class="raqzs"><t-rate value="3"  icon="{{ ['star-filled', 'star'] }}" color="#FFFF00"  /></view>
-    <view class="cyzs"></view>
-    <view class="rcyzs"><t-rate value="3"   icon="{{ ['star-filled', 'star'] }}" color="#FFFF00"  /></view>
+    <view class="ttpopup-img"/>
+    <view class="rjkzs">健康指数<t-rate value="{{userInfo.horoscope.health / 20}}"  icon="{{ ['star-filled', 'star'] }}" color="#FCFC32"  /></view>
+    <view class="raqzs">爱情指数<t-rate value="{{userInfo.horoscope.love / 20}}"  icon="{{ ['star-filled', 'star'] }}" color="#FCFC32"  /></view>
+    <view class="rcyzs">财运指数<t-rate value="{{userInfo.horoscope.money / 20}}"   icon="{{ ['star-filled', 'star'] }}" color="#FCFC32"  /></view>
   </view>
-</t-popup>
diff --git a/pages/home/xy/index.wxss b/pages/home/xy/index.wxss
index 1b3de2d..945466c 100644
--- a/pages/home/xy/index.wxss
+++ b/pages/home/xy/index.wxss
@@ -213,104 +213,76 @@
   }
 
   .ttpopup{
-      width: 659.33rpx;
-      height:804rpx;
-    background:rgba(255, 255, 255, 0.9);
-      border-radius: 36rpx;
+    position: absolute;
+    top: 374rpx;
+    left: 44rpx;
+    width: 660rpx;
+    height: 804rpx;
+    padding: 98rpx 46rpx 0 46rpx;
+    box-sizing: border-box;
+    border-radius: 30rpx;
+    background-color: rgba(255, 255, 255, 0.9);
+    color: rgba(16, 16, 16, 1);
+    font-size: 28rpx;
+    text-align: center;
+    box-shadow: 2rpx 4rpx 12rpx 0px rgba(0, 0, 0, 0.4);
+    z-index: 999;
+  }
+
+  .ttpopup-img {
+    width: 480rpx;
+    height: 22rpx;
+    margin: 70rpx auto;
+    background-size: cover;
+    background-image: url(https://wk921-1316969570.cos.ap-nanjing.myqcloud.com/xy/xy-toast.png);
   }
 
   .ztys{
-    position: absolute;
-    width: 542.67rpx;
-    height: 290rpx;
-    line-height:56rpx;
+    width: 596rpx;
+    height: 318rpx;
+    color: #6C6C6C;
     display: flex;
     flex-direction: column;
     left: 0;
     right: 0;
-    margin: 84rpx auto;
     color: rgba(108, 108, 108, 1);
     font-size: 32rpx;
     text-align: left;
     font-family: SourceHanSansSC-regular;
   }
 
-  .jkzs{
-    position: absolute;
-    width: 111.33rpx;
-    height: 26.67rpx;
-    display: flex;
-    flex-direction: column;
-    background-repeat: no-repeat;
-    background-size:100% 100%;
-    margin-left:97.33rpx;
-    margin-top: 589.33rpx;
-    background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xy/jkzs.png);
-  }
-
-  .aqzs{
-    position: absolute;
-    width: 111.33rpx;
-    height: 26.67rpx;
-    display: flex;
-    flex-direction: column;
-    background-repeat: no-repeat;
-    background-size:100% 100%;
-    margin-left:97.33rpx;
-    margin-top: 653.33rpx;
-    background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xy/aqzs.png);
-  }
-
-  .cyzs{
-    position: absolute;
-    width: 111.33rpx;
-    height: 26.67rpx;
-    display: flex;
-    flex-direction: column;
-    background-repeat: no-repeat;
-    background-size:100% 100%;
-    margin-left:97.33rpx;
-    margin-top: 717.33rpx;
-    background-image: url(https://xzjl-1257436036.cos.ap-nanjing.myqcloud.com/xy/cyzs.png);
-  }
-
   .rjkzs{
-    position: absolute;
-    width: 311.33rpx;
-    height: 26.67rpx;
-    line-height: 26.67rpx;
+    margin-bottom: 24rpx;
     display: flex;
-    flex-direction: column;
-    margin-left:279.33rpx;
-    margin-top: 580.33rpx;
+    align-items: center;
+    color: #6C6C6C;
+    font-size: 14px;
+    padding-left: 68rpx;
+    box-sizing: border-box;
   }
 
   .raqzs{
-    position: absolute;
-    width: 111.33rpx;
-    height: 26.67rpx;
-    line-height:26.67rpx;
+    margin-bottom: 24rpx;
     display: flex;
-    flex-direction: column;
-    background-repeat: no-repeat;
-    background-size:100% 100%;
-    margin-left:279.33rpx;
-    margin-top: 644.33rpx;
+    align-items: center;
+    color: #6C6C6C;
+    font-size: 14px;
+    padding-left: 68rpx;
+    box-sizing: border-box;
   }
 
   .rcyzs{
-    position: absolute;
-    width: 111.33rpx;
-    height: 26.67rpx;
-    line-height:26.67rpx;
     display: flex;
-    flex-direction: column;
-    background-repeat: no-repeat;
-    background-size:100% 100%;
-    margin-left:279.33rpx;
-    margin-top: 708.33rpx;
+    align-items: center;
+    color: #6C6C6C;
+    font-size: 14px;
+    padding-left: 68rpx;
+    box-sizing: border-box;
   }
 
+  .t-rate {
+    margin-left: 62rpx;
+  }
 
   .nlj{
     position: absolute;
diff --git a/pages/home/xyc/index.js b/pages/home/xyc/index.js
index ab872e5..400a644 100644
--- a/pages/home/xyc/index.js
+++ b/pages/home/xyc/index.js
@@ -19,6 +19,7 @@ Page({
             link:'',
             img:''
         },
+        minDate:new Date().getTime() + 24 * 60 * 60 * 1000,
         cvisible: false,
         note: '',
         xyForm:{},
@@ -104,6 +105,7 @@ Page({
         console.log('执行选择时间')
     },
     handleConfirm(e) {
+        console.log(e,'111');
         const { value } = e.detail;
         const format = (val) => {
           const date = new Date(val);
diff --git a/pages/home/xyc/index.wxml b/pages/home/xyc/index.wxml
index 7fed1e1..4b14ee5 100644
--- a/pages/home/xyc/index.wxml
+++ b/pages/home/xyc/index.wxml
@@ -22,7 +22,7 @@
     <view class="xylj">许愿链接</view>
     <view class="xytp">许愿图片</view>
     <t-textarea class="xynrf" model:value="{{xyContent}}" t-class="external-class" placeholder="内容限制30个字"  />
-    <t-textarea  class="qwsjt" placeholder="请选择到期时间" bindtap="doXzTime" value="{{note}}" disabled />
+    <t-textarea class="qwsjt" placeholder="请选择到期时间" bindtap="doXzTime" value="{{note}}" disabled />
     <view class="xltb"></view>
     <t-textarea  class="xyljt" model:value="{{xyLink}}" placeholder="愿望链接(可不填)" />
 
@@ -42,7 +42,7 @@
   </view>
 </t-popup>
 
-<t-calendar visible="{{cvisible}}" bind:confirm="handleConfirm" bind:close="onClose" />
+<t-calendar visible="{{cvisible}}" bind:confirm="handleConfirm" bind:close="onClose" min-date="{{minDate}}"/>
 
 <!-- 提示 -->
 <view class="xyc-toast">
diff --git a/pages/home/xyc/index.wxss b/pages/home/xyc/index.wxss
index 32f1a15..1e52343 100644
--- a/pages/home/xyc/index.wxss
+++ b/pages/home/xyc/index.wxss
@@ -330,9 +330,9 @@ border: 1px solid rgba(187, 187, 187, 1);
     width: 196px!important;
     height: 80rpx!important;
     line-height: 80rpx!important;
-    border-radius: 10px;
+    border-radius: 20rpx;
     color: rgba(136, 136, 136, 1);
-    font-size: 14px;
+    font-size: 28rpx;
     text-align: left;
     font-family: Microsoft Yahei;
     border: 1px solid rgba(187, 187, 187, 1);
diff --git a/pages/home/xyc/wdyw/wdyw.wxss b/pages/home/xyc/wdyw/wdyw.wxss
index 195dee2..643e4b1 100644
--- a/pages/home/xyc/wdyw/wdyw.wxss
+++ b/pages/home/xyc/wdyw/wdyw.wxss
@@ -234,16 +234,16 @@
     border-radius: 64rpx;
     position: absolute;
     left: 21px;
-top: 644px;
-width: 60px;
-height: 60px;
-background: linear-gradient(222.54deg, rgba(248,99,42,1) 14.03%,rgba(249,135,89,1) 85.21%);
-color: rgba(16, 16, 16, 1);
-font-size: 12px;
-text-align: center;
-box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.4);
-font-family: Arial;
-border: 3px solid rgba(255, 255, 255, 1);
+    top: 644px;
+    width: 60px;
+    height: 60px;
+    background: linear-gradient(222.54deg, rgba(248,99,42,1) 14.03%,rgba(249,135,89,1) 85.21%);
+    color: rgba(16, 16, 16, 1);
+    font-size: 12px;
+    text-align: center;
+    box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.4);
+    font-family: Arial;
+    border: 3px solid rgba(255, 255, 255, 1);
 }
 
 .ywcczk{
diff --git a/project.private.config.json b/project.private.config.json
index f5da2c1..1033261 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -17,42 +17,7 @@
                 },
                 {
                     "name": "",
-                    "pathName": "pages/home/jl/index",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/home/me/indexx",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/home/xx/xz/xz",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/xz/index",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/home/xx/hy/index",
-                    "query": "",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/home/xx/hy/hx/hx",
+                    "pathName": "pages/home/xy/index",
                     "query": "",
                     "launchMode": "default",
                     "scene": null