diff --git a/pages/home/jl/index.js b/pages/home/jl/index.js
index 418a169..f05f831 100644
--- a/pages/home/jl/index.js
+++ b/pages/home/jl/index.js
@@ -30,7 +30,9 @@ Page({
         showInject:false, //显示注入能量
         showInEnergy:false, //显示能量注入中
         showScsEnergy:false, //显示注册成功提示
-        showTiming:false //显示祈祷时间弹层
+        showTiming:false, //显示祈祷时间弹层
+        jmEnergy:false,
+        showInjectBkc: false //显示注入能量按钮动画
     },
     ShowOrNotLogoS(){
         this.setData({singleShow:!this.data.singleShow})
@@ -48,6 +50,9 @@ Page({
     doSetXxtFemale(){
         this.doSetXxt('female')
     },
+    closeJmEnergy(){
+        this.setData({jmEnergy: false})
+    },
     doSetXxt(e){
         req.patchRequest('/api/user/curt',{spriteType:e}).then((res)=>{
             if(res.data.code==200){
@@ -75,17 +80,16 @@ Page({
             console.log(err);
         })
     },
-    getXxObj(){/**获取形象对应的图片 */
-        req.getRequest('/api/dict/value/horoscope-resource',{}).then((res)=>{
-            if(res.data.code==200){
-                console.log(res.data.data);
-                const horoscopes = res.data.data
-                const type = this.data.userInfo.horoscope.name
-                this.setData({xingxiangtu: horoscopes[type].sprite})
-            }
-           }).catch((err)=>{
-            console.log(err);
+    /**获取形象对应的图片 */
+    getXxObj(){
+        const horoscopes = wx.getStorageSync('xy-static-img')
+        const type = this.data.userInfo.horoscope.name
+        console.log(horoscopes)
+        this.setData({
+            xingxiangtu: horoscopes[type].sprite,
+            elfAvatar:  horoscopes[type][`elf-avatar`]
         })
+        console.log(this.data.elfAvatar);
     },
     ShowOrNotLogo(){
         this.setData({showSexLogo:!this.data.showSexLogo})
@@ -153,6 +157,25 @@ Page({
         })
     },
     openInject(){
+        console.log('注入能量');
+        this.setData({
+            showInjectBkc: true
+        })
+        const touchTimer = setTimeout(() => {
+            this.setData({
+                showInject:!this.data.showInject
+            })
+        }, 3000);
+        this.setData({
+            touchTimer: touchTimer
+        })  
+    },
+    closeInject(){
+        console.log('结束');
+        this.setData({showInjectBkc: false})
+        clearInterval(this.data.touchTimer)
+    },
+    clostBtnInject(){
         this.setData({
             showInject:!this.data.showInject
         })
@@ -163,7 +186,8 @@ Page({
         if (this.data.userInfo.crystallineEnergy) {
             this.setData({
                 showInject:!this.data.showInject,
-                showInEnergy:!this.data.showInEnergy
+                showInEnergy:!this.data.showInEnergy,
+                crystallineEnergy: this.data.userInfo.crystallineEnergy
             })
             req.patchRequest('/api/user/curt/inject-energy-to-pendant',{}).then((res)=>{
                 console.log('能量注入成功');
@@ -175,7 +199,22 @@ Page({
                 })
                 this.getUserInfo()
             },2000)
+            // 计算守护时长
+            const energy = this.data.userInfo.pendantEnergy * 4.8
+            let minute = 0
+            let hour = 0
+            if (energy >= 60) {
+                hour = Math.floor(energy / 60)
+                minute = Math.floor(energy - (hour * 60 ))
+                if (minute < 10) {
+                    minute = '0' + minute
+                }
+            }
+            this.setData({
+                guarTime: `${hour}小时${minute}分钟`
+            })
         }else{
+            console.log('没有能量');
             this.setData({showInject: false})
             Toast({
                 context: this,
@@ -219,6 +258,12 @@ Page({
                         minutes:minute
                     })
                 }
+
+                // 技能集满显示提示
+                if(res.data.data.crystallineEnergy >= 100){
+                    this.setData({jmEnergy: true})
+                }
+
                 this.setData({
                     userInfo:res.data.data,
                     hours:hours,
@@ -381,7 +426,6 @@ Page({
      * 用户点击右上角分享
      */
     onShareAppMessage() {
-
     },
     
     ToastDialog(e) {
diff --git a/pages/home/jl/index.wxml b/pages/home/jl/index.wxml
index 954286a..9f24a21 100644
--- a/pages/home/jl/index.wxml
+++ b/pages/home/jl/index.wxml
@@ -1,145 +1,261 @@
 
 <swiper class="call" bindtap="closeEnergy">
-  <swiper-item class="call1"><!--单人页面-->
-    <t-image class="tx" src="{{userInfo.avatar}}"></t-image>
-    <view class="txtext">{{userInfo.nick}}</view><!--头像名字-->
-    <view class="gh"></view>
-
-    <div class="bkg3"></div><!--点点点，最底层背景图-->
-    <dic class="bkg1"></dic><!--黄色点背景图-->
-    <view class="gh"></view>
-    <view class="xxt" bindtap="ShowOrNotLogo">
-        <image src="{{xingxiangtu[userInfo.spriteType]}}"></image>
-    </view>
-    <view class="yan1"  wx:if="{{showSexLogo}}" data-yan="animal" bindtap="doSetXxtAnimal"><!--动物形象-->
-        <view class="yan11"></view>
-    </view>
-    <view class="yan2" wx:if="{{showSexLogo}}" data-yan="male" bindtap="doSetXxtMale"><!--男性形象-->
-        <view class="yan12"></view>
-    </view>
-    <view class="yan3" wx:if="{{showSexLogo}}" data-yan="female" bindtap="doSetXxtFemale"><!--女性形象-->
-        <view class="yan13"></view>
-    </view>
-
-    <view class="dcleft">
-    
-    <t-progress class="dcleft1" theme="circle"  percentage="{{userInfo.crystallineEnergy}}"  color="#f76229" label=""  t-class-bar="dcleft1" />
-    <view class="dcbs"></view>
-</view><!--下方左侧块-->
-<!--下方左侧块-->
-<t-progress class="dchx" percentage="{{userInfo.crystallineEnergy}}" trackColor="#EAC9FF" color="#f76229" label=""/><!--中间进度条-->
-<view class="dchxtxt">{{userInfo.crystallineEnergy}}%</view>
-<t-progress class="dcright1" theme="circle"  percentage="{{userInfo.pendantEnergy}}" color="#FBB093" label=""  t-class-bar="dcleft1" />
-<view class="dcright">
-    <view class="dcrightwjx" bindtap="openInject"></view><!--下方右侧五角星-->
-</view><!--下方左侧块-->
-
-<!-- 能量已满提示 -->
-<view class="energy-full" wx:if="{{userInfo.crystallineEnergy===100}}">
-    <view>能量已经集满啦！</view>
-    <view>可以注入到水晶中</view>
-    <view>增强运势哦！</view>
-</view>
-<!-- 能量注入成功提示 -->
-<view class="energy-complete" wx:if="{{showScsEnergy}}">
-    <view>能量已注入100%</view>
-    <view>守护时间为08小时00分</view>
-</view>
-
-<view class="dclefttxt">水晶能量</view><!--下方左侧块-->
-<view class="dcrighttxt">能量注入</view><!--下方左侧块-->
-</swiper-item>
-
-  <swiper-item class="call1" wx:if='{{userInfo.loverId}}'><!--情侣页面-->
-    <!-- 未祈祷页面 -->
-    <view wx:if="{{ !userInfo.prayerEndTime }}">
-        <t-image class="txl" src="{{userInfo.avatar}}"></t-image>
-        <view class="txtextl">{{userInfo.nick}}</view><!--头像名字1-->
-        <view class="jiuchan"></view>
-        <t-image class="txr" shape="circle" src="{{loverInfo.avatar}}"></t-image><!--头像2-->
-        <view class="txtextr">{{loverInfo.nick}}</view><!--头像名字2-->
-    </view>
-    <!-- 有祈祷页面 -->
-    <view wx:else>
-        <t-image class="txl txl-qd" src="{{userInfo.avatar}}"></t-image>
-        <view class="txtextl-qd">
-            <t-icon name="chevron-right-double" size="24" color="#DE868F"/>
-            <view class="text-qd">
-                <view class="top">{{ userInfo.prayerContent }}</view>
-                <view>你已为Ta祈祷  {{prayTime}}</view>
+    <t-toast id="t-toast" />
+    <!--单人页面-->
+    <swiper-item class="call1">
+        <!--头像名字-->
+        <view class="call1-header">
+            <image class="tx" src="{{elfAvatar}}"></image>
+            <view class="txtext">{{userInfo.nick ? userInfo.nick : userInfo.constellation}}</view>
+        </view>
+        <!-- 精灵图片 -->
+        <view class="bkg1">
+            <view class="bkg2">
+                <view class="bkg3">
+                    <view class="bkg4">
+                        <view class="bkg5">
+                            <view class="xxt" bindtap="ShowOrNotLogo">
+                                <image mode="heightFix" src="{{xingxiangtu[userInfo.spriteType]}}"></image>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view class="gh"></view>
+        </view>
+        <!-- 底部图标 -->
+        <view class="call1-btn">
+            <!--下方左侧块-->
+            <view class="dcleft">
+                <t-progress 
+                    class="dcleft1" 
+                    theme="circle" 
+                    percentage="{{userInfo.crystallineEnergy}}" 
+                    color="#f76229" label=""  
+                    t-class-bar="dcleft1" 
+                    stroke-width="10rpx" 
+                />
+                <view class="dcbs"></view>
+                <view class="dclefttxt">水晶能量</view>
+            </view>
+            <!--中间进度条-->
+            <view class="dcleft-middle">
+                <t-progress 
+                    class="dchx" 
+                    percentage="{{userInfo.crystallineEnergy}}" 
+                    trackColor="#E0E3EA" 
+                    color="#f76229" 
+                    label=""
+                    stroke-width="16rpx" 
+                />
+                <view class="dchx-box">
+                    <view class="dchx-box-cantainer" wx:if="{{showInjectBkc}}">
+                        <view class="box" wx:for="{{20}}" wx:key="index"></view>
+                    </view>
+                </view>
+                <view class="dchxtxt">{{userInfo.crystallineEnergy}}%</view>
+            </view>
+            <!--下方左侧块-->
+            <view class="dcleft-right">
+                <view class="dcright-bgc">
+                    <view class="dcright-bg" wx:if="{{showInjectBkc}}"></view>
+                </view>
+                <view class="dcright" bind:touchstart="openInject" bind:touchend="closeInject"><view class="dcrightwjx"></view></view>
+                <view class="dcrighttxt">能量注入</view>
+            </view>
+        </view>
+        <!-- 形象按钮 -->
+        <view class="call1-vivid" wx:if="{{showSexLogo}}" >
+            <!--男性形象-->
+            <view 
+                class="yan2" 
+                data-yan="male" 
+                bindtap="doSetXxtMale"
+            >
+                <view class="yan12"></view>
+            </view>
+            <!--动物形象-->
+            <view class="yan1"  
+                data-yan="animal" 
+                bindtap="doSetXxtAnimal"
+            >
+                <view class="yan11"></view>
+            </view>
+            <!--女性形象-->
+            <view 
+                class="yan3" 
+                data-yan="female" 
+                bindtap="doSetXxtFemale"
+            >
+                <view class="yan13"></view>
             </view>
-            <t-icon name="chevron-right-double" size="24" color="#DE868F"/>
         </view>
-        <t-image class="txr txr-qd" shape="circle" src="{{loverInfo.avatar}}"></t-image><!--头像2-->
-    </view>
-    <dic class="bkg1"></dic><!--黄色点背景图-->
-    <div class="bkg3"></div><!--点点点，最底层背景图-->
-    
-    <view class="xxtl" bindtap="ShowOrNotLogoS">
-        <image src="{{xingxiangtu[userInfo.spriteType]}}"></image><!--左侧人形象-->
-    </view>
-    <view class="xxtr" bindtap="ShowOrNotLogoL">
-        <image src="{{xingxiangtu[loverInfo.spriteType]}}"></image><!--右侧人形象-->
-    </view>
-    <view class="gh"></view><!--下方光环-->
-    <view class="yanql1" bindtap="doSetXxtFemale" wx:if="{{singleShow}}"><!--左侧女性按钮-->
-        <view class="yan13"></view>
-    </view>
-    <view class="yanql2" bindtap="doSetXxtAnimal" wx:if="{{singleShow}}"><!--左侧动物设置图标-->
-        <view class="yan11"></view>
-    </view>
-    <view class="yanql3" ></view>
-    <view class="yanql4" bindtap="doSetXxtFemaleS" wx:if="{{loverShow}}"><!--右侧女性图标设置-->
-        <view class="yan13"></view>
-    </view>
-    <view class="yanql5" bindtap="doSetXxtAnimalS" wx:if="{{loverShow}}"><!--右侧动物图标设置-->
-        <view class="yan11"></view>
-    </view>
-    <view class="yanql6"></view>
-    <view class="yan1" bindtap="doSetXxtMale" wx:if="{{singleShow}}"><!--设置个人男性图标-->
-        <view class="yan12"></view>
-    </view>
-    <view class="yan3" wx:if="{{loverShow}}" bindtap="doSetXxtMaleS"><!--设置右边男性图标-->
-        <view class="yan12"></view>
-    </view>
-
-    <view class="dcleft">
-        <t-progress class="dcleft1" theme="circle"  percentage="{{userInfo.crystallineEnergy}}"  color="#f76229" label=""  t-class-bar="dcleft1" />
-        <view class="dcbs"></view>
-    </view><!--下方左侧块-->
-    <!--下方左侧块-->
-    <view class="lovepic"></view>
-    <view class="dchxtxtql" bindtap="openPray" wx:if="{{ !userInfo.prayerEndTime }}">祈祷</view>
-    <view class="dchxtxtql" bindtap="openPray" wx:else>结束祈祷</view>
-    <view class="dcrightql">
-        <t-progress class="dcleft1" theme="circle"  percentage="{{loverInfo.crystallineEnergy}}"  color="#00A7FF" label=""  t-class-bar="dcleft1" />
-        <view class="dcrbs" bindtap="openEnergy"></view>
-    </view><!--下方左侧块-->
-    <view class="dclefttxt">{{userInfo.crystallineEnergy}}%</view><!--下方左侧块-->
-    <view class="dcrighttxt">{{loverInfo.crystallineEnergy}}%</view><!--下方左侧块-->
 
-  </swiper-item>
+        <!-- 能量已满提示 -->
+        <view class="energy-full-box" wx:if="{{ jmEnergy }}" bindtap="closeJmEnergy">
+            <view class="energy-full">
+                <view>能量已经集满啦！</view>
+                <view>可以注入到水晶中</view>
+                <view>增强运势哦！</view>
+            </view>
+        </view>
+        <!-- 能量注入成功提示 -->
+        <view class="energy-complete" wx:if="{{showScsEnergy}}">
+            <view>能量已注入{{crystallineEnergy}}%</view>
+            <view>守护时间为{{guarTime}}</view>
+        </view>
+    </swiper-item>
 
+    <!--情侣页面-->
+    <swiper-item class="call1" wx:if='{{userInfo.loverId}}'>
+        <!--未祈祷头像名字-->
+        <view class="call1-header" wx:if="{{ !userInfo.prayerEndTime }}">
+            <!-- 我的名字和头像 -->
+            <view class="txtextl">{{userInfo.nick}}</view>
+            <t-image class="txl" src="{{userInfo.avatar}}"></t-image>
+            <view class="jiuchan"></view>
+            <!-- 情侣名字和头像 --> 
+            <t-image class="txr" shape="circle" src="{{loverInfo.avatar}}"></t-image>
+            <view class="txtextr">{{loverInfo.nick}}</view>
+        </view>
+        <!--已祈祷头像名字-->
+        <view class="call1-header" wx:else>
+            <t-image class="txl" src="{{userInfo.avatar}}"></t-image>
+            <view class="txtextl-qd">
+                <t-icon name="chevron-right-double" size="24" color="#DE868F"/>
+                <view class="text-qd">
+                    <view class="top">{{ userInfo.prayerContent }}</view>
+                    <view>你已为Ta祈祷  {{prayTime}}</view>
+                </view>
+                <t-icon name="chevron-right-double" size="24" color="#DE868F"/>
+            </view>
+            <t-image class="txr" shape="circle" src="{{loverInfo.avatar}}"></t-image>
+        </view>
+        <!-- 精灵图片 -->
+        <view class="bkg1">
+            <view class="bkg2">
+                <view class="bkg3">
+                    <view class="bkg4">
+                        <view class="bkg5">
+                            <view class="xxt" bindtap="ShowOrNotLogo">
+                                <!--左侧人形象-->
+                                <view class="xxtl" bindtap="ShowOrNotLogoS">
+                                    <image mode="heightFix" src="{{xingxiangtu[userInfo.spriteType]}}"></image>
+                                    <!-- 形态切换 -->
+                                    <view class="xxtl-xt1" wx:if="{{singleShow}}">
+                                        <view class="yanql1" bindtap="doSetXxtFemale">
+                                            <view class="yan13"></view>
+                                        </view>
+                                        <view class="yanql2" bindtap="doSetXxtAnimal">
+                                            <view class="yan11"></view>
+                                        </view>
+                                        <view class="yanql3" bindtap="doSetXxtMale" wx:if="{{singleShow}}">
+                                            <view class="yan12"></view>
+                                        </view>
+                                    </view>
+                                </view>
+                                <!--右侧人形象-->
+                                <view class="xxtr" bindtap="ShowOrNotLogoL">
+                                    <image mode="heightFix" src="{{xingxiangtu[loverInfo.spriteType]}}"></image>
+                                    <!-- 形态切换 -->
+                                    <view class="xxtr-xt2" wx:if="{{loverShow}}">
+                                        <view class="yanql4" bindtap="doSetXxtFemaleS">
+                                            <view class="yan13"></view>
+                                        </view>
+                                        <view class="yanql5" bindtap="doSetXxtAnimalS">
+                                            <view class="yan11"></view>
+                                        </view>
+                                        <view class="yanql6" bindtap="doSetXxtMaleS">
+                                            <view class="yan12"></view>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view class="gh"></view>
+        </view>
+        <!-- 底部图标 -->
+        <view class="call1-btn">
+            <!--左侧图标-->
+            <view class="dcleft">
+                <t-progress 
+                    class="dcleft1" 
+                    theme="circle" 
+                    percentage="{{userInfo.crystallineEnergy}}" 
+                    color="#f76229" label=""  
+                    t-class-bar="dcleft1" 
+                    stroke-width="10rpx" 
+                />
+                <view class="dcbs"></view>
+                <view class="dclefttxt">{{userInfo.crystallineEnergy}}%</view>
+            </view>
+            <!--中间祈祷-->
+            <view class="call1-btn-qd">
+                <view class="lovepic"></view>
+                <view class="dchxtxtql" bindtap="openPray" wx:if="{{ !userInfo.prayerEndTime }}">祈祷</view>
+                <view class="dchxtxtql" bindtap="openPray" wx:else>结束祈祷</view>
+            </view>
+            <!--右侧图标-->
+            <view class="dcleft">
+                <view class="dcrightql">
+                    <t-progress 
+                        class="dcleft1" 
+                        theme="circle"  
+                        percentage="{{loverInfo.crystallineEnergy}}"  
+                        color="#00A7FF" 
+                        label=""  
+                        t-class-bar="dcleft1" 
+                    />
+                    <view class="dcrbs" bindtap="openEnergy"></view>
+                </view>
+                <view class="dcrighttxt">{{loverInfo.crystallineEnergy}}%</view>
+            </view>
+        </view>
+    </swiper-item>
 
-  <swiper-item class="call1" wx:if='{{userInfo.loverId}}'><!--对方个人页面-->
-    <t-image class="tx" shape="circle" src="{{loverInfo.avatar}}"></t-image>
-    <view class="txtext">{{loverInfo.nick}}</view><!--头像名字-->
-    <view class="gh"></view>
-    <div class="bkg3"></div><!--点点点，最底层背景图-->
-    <dic class="bkg1"></dic><!--黄色点背景图-->
-    <view class="gh"></view>
-    <view class="xxtq" bindtap="ShowOrNotLogo">
-        <image src="{{xingxiangtu[loverInfo.spriteType]}}"></image> <!--形象图-->
-    </view>
+    <!--对方个人页面-->
+  <swiper-item class="call1" wx:if='{{userInfo.loverId}}'>
+        <!--头像名字-->
+        <view class="call1-header">
+            <image class="tx" src="{{loverInfo.avatar}}"></image>
+            <view class="txtext">{{loverInfo.nick ? loverInfo.nick : userInfo.constellation}}</view>
+        </view>
+        <!-- 精灵图片 -->
+        <view class="bkg1">
+            <view class="bkg2">
+                <view class="bkg3">
+                    <view class="bkg4">
+                        <view class="bkg5">
+                            <view class="xxt" bindtap="ShowOrNotLogo">
+                                <image mode="heightFix" src="{{xingxiangtu[loverInfo.spriteType]}}"></image>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view class="gh"></view>
+        </view>
+        <view class="call1-btn">
+            <!--幸运数字-->
+            <view class="call1-btn-left">
+                <view class="k1">{{loverInfo.horoscope.number}}</view>
+                <view class="ktext1">幸运数字</view>
+            </view>
+            <!-- 运势 -->
+            <view class="call1-btn-middle">
+                <view class="k2" bindtap="ToastDialog"><view class="k11"></view></view>
+                <div class="ktext2">Ta的运势</div>
+            </view>
+            <!-- 幸运颜色 -->
+            <view class="call1-btn-right">
+                <view class="k3">{{loverInfo.horoscope.color}}</view>
+                <view class="ktext3">幸运颜色</view>
+            </view>
 
-    <div class="k1">{{loverInfo.horoscope.number}}</div><!--幸运数字-->
-    <div class="ktext1">幸运数字</div>
-    <div class="ktext2">Ta的运势</div>
-    <div class="ktext3">幸运颜色</div>
-    <div class="k2" bindtap="ToastDialog">
-        <div class="k11"></div>
-    </div>
-    <div class="k3">{{loverInfo.horoscope.color}}</div>
+        </view>
 
     <t-popup class="ttpopup" visible="{{visible}}" bind:visible-change="onVisibleChange" placement="{{'center'}}">
         <view class="ttpopup">
@@ -264,7 +380,7 @@
             <view>晶石将开启守护计时</view>
         </view>
         <view class="dialog-btn">
-            <button bindtap="openInject">取消</button>
+            <button bindtap="clostBtnInject">取消</button>
             <button bindtap="btnInject">开始注入</button>
         </view>
     </view>
diff --git a/pages/home/jl/index.wxss b/pages/home/jl/index.wxss
index 4c809e2..d5b2296 100644
--- a/pages/home/jl/index.wxss
+++ b/pages/home/jl/index.wxss
@@ -3,152 +3,302 @@ page {
     height: 100%;
 }
 
+.call{
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+}
+
+/* 单人头部样式 */
+.call1{
+    position: relative;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+}
+
+.call1-header {
+    width: 100%;
+    margin-top: 144rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
 .tx{
-    position:absolute;
     width:72rpx;
     height:72rpx;
-    margin-top:142.67rpx;
-    margin-left:249.33rpx;
+    border-radius: 50%;
+    margin-right: 18rpx;
     background-repeat: no-repeat;
-    background-size:100% 100%;
-    background-image: url(https://wish-assets.windymuse.com.cn/xy/tx.png);
+    background-size:cover;
+    /* background-image: url(https://wish-assets.windymuse.com.cn/xy/tx.png); */
 }
 
 .txtext{
-    position:absolute;
-    width:772rpx;
-    height:72rpx;
     line-height:72rpx;
     color: #9a9a9a;
-    margin-top:142.67rpx;
-    margin-left:338rpx;
+}
+/* 单人头部样式 */
+
+
+.bkg1{
+    position: relative;
+    top: -30rpx;
+    width:686rpx;
+    height:990rpx;
+    box-sizing: border-box;
+    background-size:cover;
+    background-image: url(https://ydxxkj-wish.oss-cn-hangzhou.aliyuncs.com/xy/Star.png);
+}
+
+.bkg2{
+    width:100%;
+    height:100%;
+    background-repeat: no-repeat;
+    background-size:cover;
+    background-image: url(https://ydxxkj-wish.oss-cn-hangzhou.aliyuncs.com/xy/bkg3.png);
+}
+
+.bkg3{
+    width:100%;
+    height:100%;
+    background-repeat: no-repeat;
+    background-size:100% 100%;
+    padding-top: 110rpx;
+    background-image: url(https://ydxxkj-wish.oss-cn-hangzhou.aliyuncs.com/xy/bkg1.png);
+}
+
+.bkg4{
+    width:100%;
+    height: 750rpx;
+    background-repeat: no-repeat;
+    background-size:cover;
+    background-image: url(https://ydxxkj-wish.oss-cn-hangzhou.aliyuncs.com/xy/Dust_2.png);
+}
+
+.bkg5{
+    width:100%;
+    height:100%;
+    background-repeat: no-repeat;
+    background-size:cover;
+    background-image: url(https://ydxxkj-wish.oss-cn-hangzhou.aliyuncs.com/xy/Dust_1.png);
+}
+
+.xxt{
+    width: 100%;
+    display: flex;
+    justify-content: center;
+}
+
+.xxt image {
+    height: 780rpx;
+    z-index: 1;
+}
+
+.gh{
+    position: absolute;
+    top: 854rpx;
+    left: -32rpx;
+    width:750rpx;
+    height:182rpx;
+    background-size: cover;
+    background-image: url(https://wish-assets.windymuse.com.cn/xy/gh.png);
+} 
+
+.call1-btn {
+    flex: 1;
+    width: 100%;
+    padding-top: 10rpx;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: center;
 }
 
 .dcleft{
-    position:absolute;
-    width:116.67rpx;
-    height:116.67rpx;
-    margin-left: 122rpx;
-    margin-top:1232rpx;
+    position: relative;
+    margin-top: 10rpx;
+    width:130rpx;
+    height:130rpx;
 }
 .dcleft1{
-    position:absolute;
+    width: 100%;
+    height: 100%;
 }
 
-.t-progress__canvas--circle{
-    width:125.67rpx!important;
-    height:125.67rpx !important;
+.call1-vivid {
+    position: absolute;
+    top: 760rpx;
+    width: 100%;
+    z-index: 2;
+    display: flex;
+    justify-content: space-evenly;
 }
 
+
+.t-progress__canvas--circle{
+    width:130rpx!important;
+    height:130rpx !important;
+}
+
+@keyframes breathe {
+    0% {
+        width: 130rpx;
+        height: 130rpx;
+    }
+    50% {
+        width: 140rpx;
+        height: 140rpx;
+    }
+    100% {
+        width: 130rpx;
+        height: 130rpx;
+    }
+  }
+
 .dcright{
-    position:absolute;
-    width: 100rpx;
-    height: 100rpx;
-    margin-left: 528rpx;
-    margin-top: 1240rpx;
-    /* background-color: #f76229; */
-    border-radius: 58.335rpx;
-    z-index: 1;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    margin: auto;
+    width: 116rpx;
+    height: 116rpx;
+    background-color: #F8632A;
+    border-radius: 50%;
+}
+
+.dcleft-right {
+    position: relative;
+    width:140rpx;
+    height:140rpx;
+}
+
+.dcright-bg {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    animation: breathe 1.5s infinite;
+    background-color: #FBB093;
+    border-radius: 50%;
+}  
+
+.dcright-bgc {
+    position: relative;
+    width: 140rpx;
+    height: 140rpx;
+    border-radius: 50%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
 }
 
 .dclefttxt{
-    position:absolute;
-    width:116.67rpx;
-    height:116.67rpx;
-    margin-left: 122rpx;
-    margin-top:1365.33rpx;
+    margin-top: 12rpx;
     text-align: center;
     color: #9a9a9a;
-    font-size: 27rpx;
+    font-size: 28rpx;
 }
 
 .dcrighttxt{
-    position:absolute;
-    width:116.67rpx;
-    height:116.67rpx;
-    margin-left: 520rpx;
-    margin-top:1365.33rpx;
     text-align: center;
     color: #9a9a9a;
-    font-size: 27rpx;
+    font-size: 28rpx;
 }
+
 .dcrightwjx{
-    position:absolute;
-    width:68rpx;
-    height:78.67rpx;
-    margin-left: 18rpx;
-    margin-top: 14rpx;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    margin: auto;
+    width:80rpx;
+    height:80rpx;
     background-repeat: no-repeat;
     background-size:100% 100%;
     background-image: url(https://wish-assets.windymuse.com.cn/xy/wjx.png);
 }
 
+.dcleft-middle {
+    margin: 0 34rpx;
+    height: 160rpx;
+    padding-top: 30rpx;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+}
+
 .dchx{
-    position:absolute;
     width:200rpx;
     height:16rpx;
-    margin-top:1282rpx;
-    margin-left: 275.33rpx;
 }
 
-.dchxtxt{
-    position:absolute;
+/* 定义和调用动画 */
+@keyframes move {
+
+    /* 动画的第一个状态和盒子的默认状态相同, 可以省略动画的开始状态代码 */
+    /* from {
+    transform: translateX(0);
+    } */
+    to {
+        transform: translateX(200rpx);
+        /* transform: translateX(-900px); */
+        /* transform: translateX(-800px); */
+    }
+}
+
+.dchx-box {
+    position: relative;
+    top: -16rpx;
     width:200rpx;
     height:16rpx;
-    margin-top:1320.67rpx;
-    margin-left: 275.33rpx;
-    text-align: center;
-    color: #f76229;
-    font-size: 27rpx;
+    border-radius: 8rpx;
+    overflow: hidden;
 }
 
-.dcbs{
-    position:absolute;
-    width:62.67rpx;
-    height:72rpx;
-    margin-top:26.30rpx;
-    margin-left: 29.33rpx;
-    background-repeat: no-repeat;
-    background-size:100% 100%;
-    background-image: url(https://wish-assets.windymuse.com.cn/xy/bs.png);
+.dchx-box-cantainer {
+    position: absolute;
+    left: -300rpx;
+    width:1000rpx;
+    height:16rpx;
+    display: flex;
 }
 
-.gh{
-    position:absolute;
-    width:750rpx;
-    height:182rpx;
-    margin-top:1070.67rpx;
-    background-repeat: no-repeat;
-    background-size:100% 100%;
-    background-image: url(https://wish-assets.windymuse.com.cn/xy/gh.png);
+.dchx-box .box {
+    width: 16rpx;
+    height: 16rpx;
+    margin-right: 36rpx;
+    background-size: cover;
+    animation: move 3s infinite linear;
+    background-image: url(https://ydxxkj-wish.oss-cn-hangzhou.aliyuncs.com/xy/iconPark-double-right.png);
 }
 
-.call{
-    position: absolute;
-    margin: 0;
-    padding: 0;
-    width:750rpx;
-    height: 100%;
-    /* height:1624rpx!important; */
-    overflow: hidden;
-    padding: 0!important;
-    margin: 0!important;
+.dchxtxt{
+    text-align: center;
+    color: #f76229;
+    font-size: 28rpx;
 }
 
-.call1{
-    margin-top:-50rpx;
-    padding: 0!important;
-    width:750rpx;
-    height:1624rpx;
-    overflow: hidden;
+.dcbs{
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width:72rpx;
+    height:72rpx;
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-image: url(https://wish-assets.windymuse.com.cn/xy/bs.png);
 }
 
 .dcrightql{
-    position:absolute;
-    width:116.67rpx;
-    height:116.67rpx;
-    margin-left: 520rpx;
-    margin-top:1232rpx;
+    width:100%;
+    height:100%;
     border-radius: 58.335rpx;
 }
 .dcrightql1{
@@ -156,85 +306,67 @@ page {
 }
 
 .dcrbs{
-    position:absolute;
-    width:62.67rpx;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width:64rpx;
     height:72rpx;
-    margin-top:29.30rpx;
-    margin-left: 32.33rpx;
     background-repeat: no-repeat;
     background-size:100% 100%;
     background-image: url(https://wish-assets.windymuse.com.cn/xy/rbs.png);
 }
 
+.call1-btn-qd {
+    height: 130rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
 .lovepic{
-    position: absolute;
     width:290rpx;
     height:50.67rpx;
-    margin-top:1264.67rpx;
-    margin-left:235.33rpx;
     background-repeat: no-repeat;
     background-size:100% 100%;
     background-image: url(https://wish-assets.windymuse.com.cn/xy/pulse.png);
 }
 
 .dchxtxtql{
-    position:absolute;
     width:200rpx;
     height:16rpx;
-    margin-top:1320.67rpx;
-    margin-left: 275.33rpx;
     text-align: center;
     color: #9a9a9a;
-    font-size: 27rpx;
+    font-size: 28rpx;
 }
 
 .txl{
-    position:absolute;
     width:72rpx;
     height:72rpx;
-    margin-top:142.67rpx;
-    margin-left:218rpx;
+    margin-left: 30rpx;
     background-repeat: no-repeat;
     background-size:100% 100%;
     background-image: url(https://wish-assets.windymuse.com.cn/xy/tx.png);
 }
 
-.txl-qd {
-    position: absolute;
-    left: 80rpx;
-    margin-left:0;
-}
-
 .txr{
-    position:absolute;
     width:72rpx;
     height:72rpx;
-    margin-top:142.67rpx;
-    margin-left:400.67rpx;
+    margin-right: 30rpx;
     background-repeat: no-repeat;
     background-size:100% 100%;
     background-image: url(https://wish-assets.windymuse.com.cn/xy/tx.png);
 }
 
-.txr-qd {
-    position: absolute;
-    right: 80rpx;
-}
-
 .txtextl{
-    position:absolute;
-    width:166rpx;
-    height:72rpx;
-    line-height:72rpx;
     color: #9a9a9a;
-    margin-top:142.67rpx;
-    margin-left:36rpx;
-    font-size: 27rpx;
+    font-size: 28rpx;
     text-align: right;
 }
 
 .txtextl-qd{
-    position: absolute;
     top: 130rpx;
     left: 154rpx;
     width: 444rpx;
@@ -260,11 +392,9 @@ page {
 }
 
 .jiuchan{
-    position: absolute;
-    width:47.33rpx;
+    width:48rpx;
     height:26rpx;
-    margin-top: 169.33rpx;
-    margin-left: 322.67rpx;
+    margin: 0 32rpx;
     background-repeat: no-repeat;
     background-size:100% 100%;
     background-image: url(https://wish-assets.windymuse.com.cn/xy/jiuchan.png);
@@ -272,44 +402,11 @@ page {
 }
 
 .txtextr{
-    position:absolute;
-    width:772rpx;
-    height:72rpx;
-    line-height:72rpx;
     color: #9a9a9a;
-    margin-top:142.67rpx;
-    margin-left:493.33rpx;
-    font-size: 27rpx;
-}
-
-.bkg3{
-    position: absolute;
-    width:47.33rpx;
-    height:26rpx;
-    margin-top: 169.33rpx;
-    margin-left: 322.67rpx;
-    background-repeat: no-repeat;
-    background-size:100% 100%;
-    background-image: url(https://wish-assets.windymuse.com.cn/xy/bkg3.png);
-}
-
-.xxt{
-    position: absolute;
-    width:326.67rpx;
-    height:771.33rpx;
-    margin-top: 326.67rpx;
-    margin-left: 212rpx;
-    background-repeat: no-repeat;
-    background-size:100% 100%;
-}
-
-.xxt image {
-    width: 100%;
-    height: 100%;
+    font-size: 28rpx;
 }
 
 .yan1{
-    position: absolute;
     width:114rpx;
     height:116rpx;
     display: flex;
@@ -317,12 +414,9 @@ page {
     justify-content: center;
     background-repeat: no-repeat;
     background-size:100% 100%;
-    margin-top: 837.33rpx;
-    margin-left:118.67rpx;
     background-image: url(https://wish-assets.windymuse.com.cn/xy/yan.png);
 }
 .yan2{
-    position: absolute;
     width:114rpx;
     height:116rpx;
     display: flex;
@@ -330,16 +424,11 @@ page {
     justify-content: center;
     background-repeat: no-repeat;
     background-size:100% 100%;
-    margin-top: 837.33rpx;
-    margin-left:318rpx;
     background-image: url(https://wish-assets.windymuse.com.cn/xy/yan.png);
 }
 .yan3{
-    position: absolute;
     width:114rpx;
     height:116.67rpx;
-    margin-top: 837.33rpx;
-    margin-left:517.33rpx;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -348,28 +437,6 @@ page {
     background-image: url(https://wish-assets.windymuse.com.cn/xy/yan.png);
 }
 
-.bkg1{
-    position: absolute;
-    width:684.67rpx;
-    height:988rpx;
-    margin-top: 169.33rpx;
-    margin-left:46rpx;
-    background-repeat: no-repeat;
-    background-size:100% 100%;
-    background-image: url(https://wish-assets.windymuse.com.cn/xy/bkg1.png);
-}
-
-.bkg3{
-    position: absolute;
-    width:660rpx;
-    height:952rpx;
-    margin-top: 205.33rpx;
-    margin-left:42rpx;
-    background-repeat: no-repeat;
-    background-size:100% 100%;
-    background-image: url(https://wish-assets.windymuse.com.cn/xy/bkg3.png);
-}
-
 .yan11{
     position: absolute;
     width:46rpx;
@@ -398,37 +465,61 @@ page {
 }
 
 .xxtl{
-    position: absolute;
-    width:326rpx;
+    position: relative;
+    right: -20rpx;
+    width:686rpx;
     height:772rpx;
-    margin-top: 326rpx;
-    margin-left: 88rpx;
-    background-repeat: no-repeat;
-    background-size:100% 100%;
+    display: flex;
+    justify-content: flex-end;
+    z-index: 2;
 }
 
 .xxtl image {
-    width: 100%;
     height: 100%;
 }
 
 .xxtr{
-    position: absolute;
-    width:326rpx;
-    height:782rpx;
-    margin-top: 326rpx;
-    margin-left: 356rpx;
-    background-repeat: no-repeat;
-    background-size:100% 100%;
+    position: relative;
+    left: -20rpx;
+    width:686rpx;
+    height:772rpx;
+    display: flex;
+    justify-content: flex-start;
+    z-index: 2;
 }
 
 .xxtr image {
-    width: 100%;
+    /* width: 100%; */
     height: 100%;
 }
 
-.yanql1{
+.xxtl-xt1 {
     position: absolute;
+    top: 176rpx;
+    left: 0;
+    width: 140rpx;
+    height: 440rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-end;
+    flex-direction: column;
+    z-index: 3;
+}
+
+.xxtr-xt2 {
+    position: absolute;
+    top: 176rpx;
+    right: 0;
+    width: 140rpx;
+    height: 440rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    flex-direction: column;
+    z-index: 3;
+}
+
+.yanql1{
     width:114rpx;
     height:116rpx;
     display: flex;
@@ -436,13 +527,22 @@ page {
     justify-content: center;
     background-repeat: no-repeat;
     background-size:100% 100%;
-    margin-top: 492rpx;
-    margin-left:86.67rpx;
     background-image: url(https://wish-assets.windymuse.com.cn/xy/yan.png);
 }
 
 .yanql2{
-    position: absolute;
+    width:114rpx;
+    height:116rpx;
+    margin-right: 40rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-repeat: no-repeat;
+    background-size:100% 100%;
+    background-image: url(https://wish-assets.windymuse.com.cn/xy/yan.png);
+}
+
+.yanql3 {
     width:114rpx;
     height:116rpx;
     display: flex;
@@ -450,13 +550,10 @@ page {
     justify-content: center;
     background-repeat: no-repeat;
     background-size:100% 100%;
-    margin-top: 663.33rpx;
-    margin-left:38.67rpx;
     background-image: url(https://wish-assets.windymuse.com.cn/xy/yan.png);
 }
 
 .yanql4{
-    position: absolute;
     width:114rpx;
     height:116rpx;
     display: flex;
@@ -464,13 +561,22 @@ page {
     justify-content: center;
     background-repeat: no-repeat;
     background-size:100% 100%;
-    margin-top: 492rpx;
-    margin-left:550.67rpx;
     background-image: url(https://wish-assets.windymuse.com.cn/xy/yan.png);
 }
 
 .yanql5{
-    position: absolute;
+    width:114rpx;
+    height:116rpx;
+    margin-left: 40rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-repeat: no-repeat;
+    background-size:100% 100%;
+    background-image: url(https://wish-assets.windymuse.com.cn/xy/yan.png);
+}
+
+.yanql6 {
     width:114rpx;
     height:116rpx;
     display: flex;
@@ -478,8 +584,6 @@ page {
     justify-content: center;
     background-repeat: no-repeat;
     background-size:100% 100%;
-    margin-top: 663.33rpx;
-    margin-left:598rpx;
     background-image: url(https://wish-assets.windymuse.com.cn/xy/yan.png);
 }
 
@@ -498,31 +602,31 @@ page {
     height: 100%;
 }
 
+/* .call1-btn-left {
+} */
+
+.call1-btn-middle {
+    margin: 0 100rpx;
+}
+
+/* .call1-btn-right {
+} */
+
 .k1{
-    position: absolute;
     width:116rpx;
     height:116rpx;
-    line-height:116rpx;
     text-align: center;
-    margin-top: 1232.67rpx;
-    margin-left: 114.67rpx;
     background-repeat: no-repeat;
     background-size:100% 100%;
     background-image: url(https://wish-assets.windymuse.com.cn/xy/circle.png);
-
-
-color: rgba(248, 99, 42, 1);
-font-size: 36px;
-font-family: SourceHanSansSC-regular;
-
+    color: rgba(248, 99, 42, 1);
+    font-size: 72rpx;
 }
 
 .k2{
-    position: absolute;
     width:116rpx;
     height:116rpx;
-    margin-top: 1232.67rpx;
-    margin-left: 318rpx;
+    margin-bottom: 8rpx;
     background-repeat: no-repeat;
     background-size:100% 100%;
     background-image: url(https://wish-assets.windymuse.com.cn/xy/yan.png);
@@ -530,19 +634,15 @@ font-family: SourceHanSansSC-regular;
 }
 
 .k3{
-    position: absolute;
     width:116rpx;
     height:116rpx;
     line-height:116rpx;
     text-align: center;
-    margin-top: 1232.67rpx;
-    margin-left: 520.67rpx;
     background-repeat: no-repeat;
     background-size:100% 100%;
     background-image: url(https://wish-assets.windymuse.com.cn/xy/circle.png);
     color: rgba(108, 108, 108, 1);
-font-size: 16px;
-
+    font-size: 32rpx;
 }
 
 .k11{
@@ -558,42 +658,36 @@ font-size: 16px;
 }
 
 .ktext1{
-    position: absolute;
     width:116rpx;
     height:116rpx;
-    margin-top: 1366rpx;
-    margin-left: 114.67rpx;
+    margin-top: 12rpx;
     text-align: center;
     color: #9a9a9a;
-    font-size: 27rpx;
+    font-size: 28rpx;
 }
 
 .ktext2{
-    position: absolute;
     width:116rpx;
     height:116rpx;
-    margin-top: 1366rpx;
-    margin-left: 318rpx;
+    margin-top: 12rpx;
     text-align: center;
     color: #9a9a9a;
-    font-size: 27rpx;
+    font-size: 28rpx;
 }
 
 .ktext3{
-    position: absolute;
     width:116rpx;
     height:116rpx;
-    margin-top: 1366rpx;
-    margin-left: 520.67rpx;
+    margin-top: 12rpx;
     text-align: center;
     color: #9a9a9a;
-    font-size: 27rpx;
+    font-size: 28rpx;
 }
 
 .ttpopup{
     width: 659.33rpx;
     height:804rpx;
-  background:rgba(255, 255, 255, 0.9);
+    background:rgba(255, 255, 255, 0.9);
     border-radius: 36rpx;
 }
 
@@ -883,6 +977,13 @@ picker-view-column {
     box-shadow: 1px 2px 6px 0px rgba(0, 0, 0, 0.4);
 }
 
+.energy-full-box {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    z-index: 4;
+}
+
 .energy-full {
     position: absolute;
     top: 500rpx;
@@ -897,6 +998,7 @@ picker-view-column {
     padding: 18rpx 0 0 20rpx;
     box-sizing: border-box;
     box-shadow: 1px 2px 6px 0px rgba(0, 0, 0, 0.4);
+    z-index: 999;
 }
 
 .energy-complete {
@@ -936,13 +1038,3 @@ picker-view-column {
     width: 200rpx;
     height: 200rpx;
 }
-
-.dcright1 {
-    position: absolute;
-    top: 1232rpx;
-    right: 109rpx;
-}
-
-.dcright1 .t-progress__canvas--inner {
-    background-color: #f76229 !important;
-}
\ No newline at end of file
diff --git a/pages/home/me/grzl/grzl.js b/pages/home/me/grzl/grzl.js
index ad09ad7..3635f07 100644
--- a/pages/home/me/grzl/grzl.js
+++ b/pages/home/me/grzl/grzl.js
@@ -8,15 +8,12 @@ Page({
      */
     data: {
         avatars:[
-            'https://wish-assets.windymuse.com.cn/xy/tx1.png',
-            'https://wish-assets.windymuse.com.cn/xy/tx2.png',
-            'https://wish-assets.windymuse.com.cn/xy/tx3.png',
-            'https://wish-assets.windymuse.com.cn/xy/tx4.png',
-            'https://wish-assets.windymuse.com.cn/xy/tx5.png',
-            'https://wish-assets.windymuse.com.cn/xy/tx6.png',
-            'https://wish-assets.windymuse.com.cn/xy/tx1.png',
-            'https://wish-assets.windymuse.com.cn/xy/tx2.png',
-            'https://wish-assets.windymuse.com.cn/xy/tx3.png',
+            'https://wish-assets.oss-cn-hangzhou.aliyuncs.com/xy/touxiang1.png',
+            'https://wish-assets.oss-cn-hangzhou.aliyuncs.com/xy/touxiang2.png',
+            'https://wish-assets.oss-cn-hangzhou.aliyuncs.com/xy/touxiang3.png',
+            'https://wish-assets.oss-cn-hangzhou.aliyuncs.com/xy/touxiang4.png',
+            'https://wish-assets.oss-cn-hangzhou.aliyuncs.com/xy/touxiang5.png',
+            'https://wish-assets.oss-cn-hangzhou.aliyuncs.com/xy/touxiang6.png'
         ],
         sexs:[{label:'男生',value:'male'},{label:'女生',value:'female'}],
         sexVisible:false,
diff --git a/pages/home/me/grzl/grzl.wxml b/pages/home/me/grzl/grzl.wxml
index aa617f0..9238310 100644
--- a/pages/home/me/grzl/grzl.wxml
+++ b/pages/home/me/grzl/grzl.wxml
@@ -16,7 +16,7 @@
     <view class="jltxtxt">精灵头像</view>
     <view class="txcheck-box">
       <view class="txcheck">
-        <view  wx:for="{{avatars}}" class="itemxx"><image class="iii" src="{{item}}" data-img="{{item}}" bindtap="changeAvatar"></image></view>
+        <view  wx:for="{{avatars}}" wx:key="index" class="itemxx"><image class="iii" src="{{item}}" data-img="{{item}}" bindtap="changeAvatar"></image></view>
       </view>
     </view>
   </view>
diff --git a/pages/home/me/indexx.wxml b/pages/home/me/indexx.wxml
index 756a857..1f2b1a8 100644
--- a/pages/home/me/indexx.wxml
+++ b/pages/home/me/indexx.wxml
@@ -4,9 +4,10 @@
 <view class="txk" bindtap="go2Grzl"></view><!--头像框-->
 <view class="txkx" bindtap="go2Grzl"> </view><!--头像框里面的图标-->
 <view class="nickname">{{userInfo.nick}}</view><!--用户昵称-->
-<view class="unhybs" wx:if="{{!userInfo.isChatVip}}" bindtap="go2Member"> </view><!--非会员图标-->
-<view class="hybs" wx:if="{{userInfo.isChatVip}}" bindtap="go2Member2"> </view><!--会员图标-->
-<view class="hydqr" wx:if="{{userInfo.isChatVip}}"> 还有21天到期</view><!--会员图标-->
+<view class="unhybs" wx:if="{{!userInfo.isChatVip}}" bindtap="go2Member"></view><!--非会员图标-->
+<view class="hydqr" wx:if="{{!userInfo.isChatVip}}"> 开通VIP会员</view><!--非会员提示-->
+<view class="hybs" wx:if="{{userInfo.isChatVip}}" bindtap="go2Member2"></view><!--会员图标-->
+<view class="hydqr" wx:if="{{userInfo.isChatVip}}"> 还有21天到期</view><!--会员提示-->
 
 <view class="gnk">
     <!-- <view class="smst" >说明书</view> -->
diff --git a/pages/home/me/indexx.wxss b/pages/home/me/indexx.wxss
index 5d5325f..436ec09 100644
--- a/pages/home/me/indexx.wxss
+++ b/pages/home/me/indexx.wxss
@@ -80,7 +80,7 @@
     height: 36rpx;
     color: rgba(248, 105, 50, 1);
     font-size: 24rpx;
-    text-align: left;
+    text-align: center;
     font-family: SourceHanSansSC-regular;
 }
 
diff --git a/pages/home/me/yjfk/yjfk.js b/pages/home/me/yjfk/yjfk.js
index 5026e13..0c2de0b 100644
--- a/pages/home/me/yjfk/yjfk.js
+++ b/pages/home/me/yjfk/yjfk.js
@@ -21,7 +21,7 @@ Page({
         const contactWay = e.detail.value.contactWay;
         if (!/^1[3456789]\d{9}$/.test(contactWay)) {
             wx.showToast({
-              title: '手机号码',
+              title: '请输入正确的手机号码',
               icon: 'none'
             });
             return;
diff --git a/pages/home/xx/index.js b/pages/home/xx/index.js
index 42baa8c..fefa166 100644
--- a/pages/home/xx/index.js
+++ b/pages/home/xx/index.js
@@ -12,7 +12,8 @@ Page({
         loverInfo:{},
         hasLover:false,// 是否单身
         userInfo:{},
-        Send:false
+        Send:false,
+        SendScs:false
 
     },
     closeSend(){
@@ -60,10 +61,12 @@ Page({
            }).catch((err)=>{
             console.log(err);
         })
-
-        ///api/user/curt/lover
-
-
+    },
+    // 关闭分享成功弹层
+    closeScsBtn(){
+        this.setData({
+            SendScs: false
+        })
     },
 
     /**
@@ -119,7 +122,10 @@ Page({
      * 用户点击右上角分享
      */
     onShareAppMessage() {
-
+        this.setData({
+            Send: false,
+            SendScs: true
+        })
     },
     toSend(){
         wx.navigateTo({
diff --git a/pages/home/xx/index.wxml b/pages/home/xx/index.wxml
index e891310..cb82e98 100644
--- a/pages/home/xx/index.wxml
+++ b/pages/home/xx/index.wxml
@@ -23,4 +23,18 @@
         <view class="btn" bindtap="closeSend">取消</view>
         <button open-type="share" class="btn">发送</button>
     </view>
+</view>
+
+<!-- 发送绑定情侣成功 -->
+<view class="openSend" wx:if="{{SendScs}}">
+    <view class="openSend-main">
+        <view class="openSend-main-img">
+        </view>
+        <view class="openSend-main-text1">发送成功</view>
+        <view class="openSend-main-text4">对方同意后</view>
+        <view class="openSend-main-text5">请刷新小程序查看</view>
+    </view>
+    <view class="openSend-btn">
+        <button class="btn" bindtap="closeScsBtn">好的</button>
+    </view>
 </view>
\ No newline at end of file
diff --git a/pages/home/xx/index.wxss b/pages/home/xx/index.wxss
index a163b34..4bf0406 100644
--- a/pages/home/xx/index.wxss
+++ b/pages/home/xx/index.wxss
@@ -595,4 +595,22 @@ font-family: SourceHanSansSC-regular;
     justify-content: center;
     align-items: center;
     margin-top: 20rpx;
+}
+
+.openSend-main-text4 {
+    color: rgba(108, 108, 108, 1);
+    font-size: 36rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 120rpx;
+}
+
+.openSend-main-text5 {
+    color: rgba(108, 108, 108, 1);
+    font-size: 36rpx;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 20rpx;
 }
\ No newline at end of file
diff --git a/pages/home/xy/index.js b/pages/home/xy/index.js
index 4fd8426..74cb192 100644
--- a/pages/home/xy/index.js
+++ b/pages/home/xy/index.js
@@ -92,6 +92,13 @@ Page({
         })
     },
 
+    // 获取系统默认图片列表
+    getDefaultAvatars(){
+        req.getRequest('/api/dict/value/horoscope-resource',{}).then(res => {
+            wx.setStorageSync('xy-static-img', res.data.data)
+        })
+    },
+
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
@@ -104,6 +111,7 @@ Page({
     onShow() {
         this.initXy()
         this.upImprove()
+        this.getDefaultAvatars()
     },
 
     /**
diff --git a/pages/home/xyc/index.js b/pages/home/xyc/index.js
index 105893f..347306f 100644
--- a/pages/home/xyc/index.js
+++ b/pages/home/xyc/index.js
@@ -37,8 +37,8 @@ Page({
         showCanvas:false
     },
     handleAdd(e){/**添加图片 */
-         const { fileList } = this.data;
-       const { files } = e.detail;
+      const { fileList } = this.data;
+      const { files } = e.detail;
 
        // 方法1：选择完所有图片之后，统一上传，因此选择完就直接展示
        this.setData({
diff --git a/pages/home/xyc/index.wxml b/pages/home/xyc/index.wxml
index 91a4327..ead5568 100644
--- a/pages/home/xyc/index.wxml
+++ b/pages/home/xyc/index.wxml
@@ -91,7 +91,7 @@
     </view> -->
       <canvas canvas-id="myCanvas" class="myCanvas" wx:if="{{showCanvas}}"></canvas>
       <view id="my-canvas" class="my_canvas" bindtap="closeDetail">
-        <image class="logosta my_draw_canvas" src="https://wish-assets.windymuse.com.cn/xy/jxzdt.gif" data-type="image" data-url="https://wish-assets.windymuse.com.cn/xy/jxzdt.gif"></image>
+        <image class="logosta my_draw_canvas" src="https://oss.wish.ydxxkj.top/xy/jt.gif" data-type="image" data-url="https://wish-assets.windymuse.com.cn/xy/jxzdt.gif"></image>
         <image class="popbox my_draw_canvas" src="https://wish-assets.windymuse.com.cn/xy/detailbkg.png" data-type="image" data-url="https://wish-assets.windymuse.com.cn/xy/detailbkg.png"/>
         <image class="yximg my_draw_canvas" src="{{item.img}}" data-type="image" data-url="{{item.img}}"/>
         <text class="ywwz2 my_draw_canvas" data-type="text" data-text="愿望">愿望</text>
@@ -100,8 +100,8 @@
         <view class="qwsjtxt2 my_draw_canvas" data-type="text" data-text="{{item.deadline}}">{{item.deadline}}</view>
     </view>
 
-    <view class="anwz1">
-      <view class="anwz1-tb" bindtap="openShare">
+    <view class="anwz1" bindtap="closeDetail">
+      <view class="anwz1-tb" catchtap="openShare">
         <t-image class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lfc.png"></t-image>
       </view>
       <view class="anwztxt1">分享</view>
diff --git a/pages/home/xyc/index.wxss b/pages/home/xyc/index.wxss
index ac2c7ee..a058ded 100644
--- a/pages/home/xyc/index.wxss
+++ b/pages/home/xyc/index.wxss
@@ -620,9 +620,9 @@
 .logosta {
     position: absolute;
     top: 20rpx;
-    left: 270rpx;
-    width: 50px;
-    height: 50px;
+    left: 280rpx;
+    width: 70rpx;
+    height: 70rpx;
     z-index: 1;
 }
 
diff --git a/pages/home/xyc/wdyw/wdyw.js b/pages/home/xyc/wdyw/wdyw.js
index 6e041fe..1ec9a84 100644
--- a/pages/home/xyc/wdyw/wdyw.js
+++ b/pages/home/xyc/wdyw/wdyw.js
@@ -144,9 +144,6 @@ startDraw() {
         this.setData({showDelDialog:false})
     },
     confirmDelDialog(e){
-        console.log(e.target.dataset.del)
-        console.log('确定删除')
-        console.log(this.data.detail.id)
         /**确定删除愿望 */
         this.setData({showDelDialog:false})
         req.deleteRequest('/api/user/curt/wish/'+this.data.detail.id,{}).then((res)=>{
@@ -155,7 +152,7 @@ startDraw() {
                 wx.showToast({
                     title:'愿望删除成功',
                     icon: 'none',
-                    duration: 1000
+                    duration: 1000,
                 })
                 this.getMyWish()
                 this.setData({
@@ -180,6 +177,8 @@ startDraw() {
                     icon: 'none',
                     duration: 1000
                 })
+                this.getMyWish()
+                this.setData({visible: false})
             }else{
                 wx.showToast({
                     title:res.data.msg,
@@ -200,9 +199,12 @@ startDraw() {
           visible: e.detail.visible,
         });
       },
-      changeVisible(){
-          this.setData({visible:false, showCanvas:false})
-      },
+    changeVisible(){
+        this.setData({visible:false, showCanvas:false})
+    },
+    closeVisible(){
+        this.setData({visible : false})
+    },
     go2Reback(){
         wx.navigateBack({ changed: true });
     },
diff --git a/pages/home/xyc/wdyw/wdyw.wxml b/pages/home/xyc/wdyw/wdyw.wxml
index 0bb0b80..6bbf464 100644
--- a/pages/home/xyc/wdyw/wdyw.wxml
+++ b/pages/home/xyc/wdyw/wdyw.wxml
@@ -50,7 +50,7 @@
   <canvas canvas-id="myCanvas" class="myCanvas" wx:if="{{showCanvas}}"></canvas>
   <view id="my-canvas" class="my_canvas" bindtap="changeVisible">
     <image class="logosta my_draw_canvas" src="https://wish-assets.windymuse.com.cn/xy/ywc.png" data-type="image" data-url="https://wish-assets.windymuse.com.cn/xy/ywc.png" wx:if="{{detail.status=='completed'}}"></image>
-    <image class="logosta my_draw_canvas" src="https://wish-assets.windymuse.com.cn/xy/jxzdt.gif" data-type="image" data-url="https://wish-assets.windymuse.com.cn/xy/jxzdt.gif" wx:if="{{detail.status=='processing'}}"></image>
+    <image class="logosta my_draw_canvas" src="https://oss.wish.ydxxkj.top/xy/jt.gif" data-type="image" data-url="https://oss.wish.ydxxkj.top/xy/jt.gif" wx:if="{{detail.status=='processing'}}"></image>
     <image class="logosta my_draw_canvas" src="https://wish-assets.windymuse.com.cn/xy/ygq.png" data-type="image" data-url="https://wish-assets.windymuse.com.cn/xy/ygq.png" wx:if="{{detail.status=='expired'}}"></image>
     <image class="popbox my_draw_canvas" src="https://wish-assets.windymuse.com.cn/xy/detailbkg.png" data-type="image" data-url="https://wish-assets.windymuse.com.cn/xy/detailbkg.png"/>
     <image class="yximg my_draw_canvas" src="{{detail.img}}" data-type="image" data-url="{{detail.img}}"/>
@@ -64,48 +64,56 @@
 
   <view class="ywcczk" wx:if="{{detail.status=='processing'}}"><!--进行中按钮展示-->
     <view class="anwz1">
-        <view class="yqq" bindtap="go2DelDialog"></view>
+        <view class="yqq" bindtap="go2DelDialog">
+          <t-image bindtap="go2DelDialog" class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lsc.png"></t-image>        
+        </view>
         <view class="anwztxt1">删除</view>
-        <t-image bindtap="go2DelDialog" class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lsc.png"></t-image>
     </view>
     <view class="anwz1">
-        <view class="yqq"></view>
+        <view class="yqq">
+          <t-image class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lxg.png"></t-image>       
+        </view>
         <view class="anwztxt1">修改</view>
-        <t-image class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lxg.png"></t-image>
     </view>
     <view class="anwz1">
-        <view class="yqq" bindtap="doFinishWish"></view>
+        <view class="yqq" bindtap="doFinishWish">
+          <t-image bindtap="doFinishWish" class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lydc.png"></t-image>
+        </view>
         <view class="anwztxt1" >已达成</view>
-        <t-image bindtap="doFinishWish" class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lydc.png"></t-image>
     </view>
     <view class="anwz1" bindtap="showShare">
-        <view class="yqq"></view>
+        <view class="yqq">
+          <t-image class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lfc.png"></t-image>        
+        </view>
         <view class="anwztxt1">分享</view>
-        <t-image class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lfc.png"></t-image>
     </view>
   </view>
-  <view class="ywcczk" wx:if="{{detail.status=='completed'}}"><!--已完成按钮展示-->
+  <view class="ywcczk" wx:if="{{detail.status=='completed'}}" bindtap="closeVisible"><!--已完成按钮展示-->
     <view class="anwz1">
-        <view class="yqq" bindtap="go2DelDialog"></view>
+        <view class="yqq" catchtap="go2DelDialog">
+          <t-image catchtap="go2DelDialog" class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lsc.png"></t-image>
+        </view>
         <view class="anwztxt1">删除</view>
-        <t-image bindtap="go2DelDialog" class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lsc.png"></t-image>
     </view>
     <view class="anwz1" bindtap="showShare">
-        <view class="yqq"></view>
+        <view class="yqq">
+          <t-image class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lfc.png"></t-image>
+        </view>
         <view class="anwztxt1">分享</view>
-        <t-image class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lfc.png"></t-image>
     </view>
   </view>
-  <view class="ywcczk" wx:if="{{detail.status=='expired'}}">
+  <view class="ywcczk" wx:if="{{detail.status=='expired'}}" bindtap="closeVisible">
     <view class="anwz1">
-        <view class="yqq" bindtap="go2DelDialog"></view>
+        <view class="yqq" catchtap="go2DelDialog">
+          <t-image catchtap="go2DelDialog" class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lsc.png"></t-image>
+        </view>
         <view class="anwztxt1">删除</view>
-        <t-image bindtap="go2DelDialog" class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lsc.png"></t-image>
     </view>
     <view class="anwz1">
-        <view class="yqq"></view>
+        <view class="yqq">
+          <t-image class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lxg.png"></t-image>
+        </view>
         <view class="anwztxt1">修改</view>
-        <t-image class="anzmlogo1" src="https://wish-assets.windymuse.com.cn/xy/lxg.png"></t-image>
     </view>
   </view><!--已过期按钮展示-->
 
@@ -113,16 +121,15 @@
 </t-popup>
 
 <!--确定删除对话框-->
-<t-dialog
-data-del="{{detail.id}}"
-  visible="{{showDelDialog}}"
-  content="确定要删除愿望吗？"
-  confirm-btn="{{ confirmBtn }}"
-  cancel-btn="取消"
-  confirm-btn="确定"
-  bind:confirm="confirmDelDialog"
-  bind:cancel="closeDelDialog"
-/>
+<view class="del-dialog" wx:if="{{showDelDialog}}">
+  <view class="del-dialog-box">
+      <view class="del-dialog-box-text">确定要删除愿望吗？</view>
+      <view class="del-dialog-box-btn">
+        <view class="btn" bindtap="closeDelDialog">取消</view>
+        <view class="btn" bindtap="confirmDelDialog" data-del="{{detail.id}}">确定</view>
+      </view>
+  </view>
+</view>
 
 <!-- 分享 -->
 <t-popup visible="{{shareVisible}}" placement="bottom">
diff --git a/pages/home/xyc/wdyw/wdyw.wxss b/pages/home/xyc/wdyw/wdyw.wxss
index a10bf79..7230d14 100644
--- a/pages/home/xyc/wdyw/wdyw.wxss
+++ b/pages/home/xyc/wdyw/wdyw.wxss
@@ -201,16 +201,19 @@
 .yqq{/*圆圈*/
     border-radius: 50%;
     position: absolute;
-    width: 60px;
-    height:60px;
+    width: 120rpx;
+    height: 120rpx;
     line-height: 120rpx;
     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;
+    font-size: 24rpx;
     text-align: center;
-    box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.4);
+    box-shadow: 0px 4rpx 12rpx 0px rgba(0, 0, 0, 0.4);
     font-family: Arial;
-    border: 3px solid rgba(255, 255, 255, 1);
+    border: 6rpx solid rgba(255, 255, 255, 1);
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 
 .sc{
@@ -241,7 +244,7 @@
 .anwz1{
     width: 120rpx;
     height: 192rpx;
-    margin-right: 40rpx;
+    margin-right: 50rpx;
 }
 
 .anwz1:last-child {
@@ -259,10 +262,8 @@
     font-family: SourceHanSansSC-regular;
 }
 .anzmlogo1{
-    position: absolute;
-    margin: 21rpx;
-    width: 42px;
-    height: 42px;
+    width: 74rpx;
+    height: 74rpx;
 }
 
 .popup-main {
@@ -361,6 +362,57 @@
     z-index: 1;
 }
 
+.del-dialog {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: rgba(255, 255, 255, 0.8);
+    z-index: 9999999;
+}
+
+.del-dialog-box {
+    width: 586rpx;
+    height: 434rpx;
+    border-radius: 30rpx;
+    background-color: rgba(255, 255, 255, 1);
+    color: rgba(16, 16, 16, 1);
+    font-size: 28rpx;
+    box-shadow: 2rpx 4rpx 12rpx 0px rgba(0, 0, 0, 0.4);
+}
+
+.del-dialog-box-text {
+    width: 100%;
+    margin-top: 136rpx;
+    display: flex;
+    justify-content: center;
+    color: #6c6c6c;
+    font-size: 36rpx;
+}
+
+.del-dialog-box-btn {
+    width: 100%;
+    display: flex;
+    justify-content: space-around;
+}
+
+.del-dialog-box-btn .btn {
+    width: 210rpx;
+    height: 70rpx;
+    margin-top: 130rpx;
+    border-radius: 20rpx;
+    background: linear-gradient(233.49deg, rgba(248,99,42,1) 10.48%,rgba(249,135,89,1) 89.2%);
+    box-shadow: 0px 4rpx 12rpx 0px rgba(0, 0, 0, 0.4);
+    border: 6rpx solid rgba(255, 255, 255, 1);
+    color: rgba(255, 255, 255, 1);
+    font-size: 28rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+} 
+
 
 .myCanvas-popup {
     height: 100vh;
@@ -388,8 +440,8 @@
     position: absolute;
     top: 20rpx;
     left: 270rpx;
-    width: 50px;
-    height: 50px;
+    width: 80rpx;
+    height: 80rpx;
     z-index: 1;
 }
 
@@ -399,4 +451,4 @@
     top: 166rpx;
     width: 620rpx;
     height: 1080rpx;
-}
\ No newline at end of file
+}
diff --git a/project.private.config.json b/project.private.config.json
index cda0b4e..9b95b39 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -10,7 +10,35 @@
             "list": [
                 {
                     "name": "",
-                    "pathName": "pages/home/xyc/index",
+                    "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/me/yjfk/yjfk",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/home/jl/jlai/jlai",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/home/me/grzl/grzl",
                     "query": "",
                     "launchMode": "default",
                     "scene": null