Merge branch 'wl_dev' of http://1.94.207.143:3000/chongqing/baby-app into wl_dev

src/pages/music/component/musicPlayback.vue

@@ -12,18 +12,14 @@
       <image
         @click="goBack"
         style="width: 60rpx; height: 60rpx"
-        src="/src/static/icon/Left.svg"
+        src="@/static/icon/Left.svg"
       ></image>
     </view>
 
     <view class="player-content">
       <!-- 播放图片 -->
       <view class="record-player">
-        <image
-          src="/src/static//icon/fi-rr-big-play.svg"
-          alt="Record Player"
-          class="record-image"
-        />
+        <image src="@/static/icon/fi-rr-big-play.svg" alt="Record Player" class="record-image" />
       </view>
       <!-- 播放按钮 -->
       <view class="track-info">
@@ -36,8 +32,8 @@
               style="width: 32rpx; height: 32rpx"
               :src="
                 song.favorite
-                  ? '/src/static/icon/fi-rr-heart-grey.svg'
-                  : '/src/static/icon/fi-rr-heart.svg'
+                  ? '@/static/icon/fi-rr-heart-grey.svg'
+                  : '@/static/icon/fi-rr-heart.svg'
               "
             ></image>
           </view>
@@ -66,48 +62,42 @@
           <view class="control-btn" @click="palyCycleBtn">
             <image
               style="width: 32rpx; height: 32rpx"
-              src="/src/static/icon/fi-rr-refresh.svg"
+              src="@/static/icon/fi-rr-refresh.svg"
             ></image>
           </view>
           <!-- 上一曲 -->
           <view class="control-btn" @click="previousSongBtn">
-            <image
-              style="width: 48rpx; height: 32rpx"
-              src="/src/static/icon/Group-left.svg"
-            ></image>
+            <image style="width: 48rpx; height: 32rpx" src="@/static/icon/Group-left.svg"></image>
           </view>
           <!-- 播放 暂停 -->
           <view class="control-paly" @click="togglePlayPause">
             <button class="control-btn pause-btn" v-if="isPlaying">
-              <image style="width: 40rpx; height: 40rpx" src="/src/static/icon/Vector.svg"></image>
+              <image style="width: 40rpx; height: 40rpx" src="@/static/icon/Vector.svg"></image>
             </button>
             <button class="control-btn pause-btn" v-else>
               <view class="control-Vector">
                 <image
                   style="width: 8rpx; height: 40rpx"
-                  src="/src/static/icon/Vector-paly.svg"
+                  src="@/static/icon/Vector-paly.svg"
                 ></image>
               </view>
               <view class="control-Vector">
                 <image
                   style="width: 8rpx; height: 40rpx"
-                  src="/src/static/icon/Vector-paly.svg"
+                  src="@/static/icon/Vector-paly.svg"
                 ></image>
               </view>
             </button>
           </view>
           <!-- 下一曲 -->
           <view class="control-btn" @click="nextSongBtn">
-            <image
-              style="width: 48rpx; height: 32rpx"
-              src="/src/static/icon/Group-right.svg"
-            ></image>
+            <image style="width: 48rpx; height: 32rpx" src="@/static/icon/Group-right.svg"></image>
           </view>
           <!--  -->
           <view class="control-btn">
             <image
               style="width: 32rpx; height: 32rpx"
-              src="/src/static/icon/fi-rr-shuffle.svg"
+              src="@/static/icon/fi-rr-shuffle.svg"
             ></image>
           </view>
         </view>

src/pages/music/component/musicRecommend.vue

@@ -15,8 +15,8 @@
 
       <!-- 循环播放 -->
       <view class="header-right" @click="cycleBtn">
-        <image v-if="isRefresh" class="imgIcon" src="/src/static/icon/fi-rr-refresh.svg"></image>
-        <image v-else class="imgIcon" src="/src/static/icon/fi-rr-shuffle.svg"></image>
+        <image v-if="isRefresh" class="imgIcon" src="@/static/icon/fi-rr-refresh.svg"></image>
+        <image v-else class="imgIcon" src="@/static/icon/fi-rr-shuffle.svg"></image>
       </view>
     </view>
 
@@ -24,17 +24,13 @@
     <view class="currently-playing" v-show="playDom">
       <view class="currently-playing-left">
         <view class="play-circle" @click="palyBtn">
-          <image v-if="isRePaly" class="palyIcon" src="/src/static/icon/fi-rr-play.svg"></image>
-          <image v-else class="palyIcon" src="/src/static/icon/fi-rr-pause.svg"></image>
+          <image v-if="isRePaly" class="palyIcon" src="@/static/icon/fi-rr-play.svg"></image>
+          <image v-else class="imgIcon" src="@/static/icon/fi-rr-pause.svg"></image>
         </view>
         <text class="text-paly">继续播放: {{ songTitle }}</text>
       </view>
       <view style="display: flex; gap: 80rpx">
-        <image
-          @click="cleanBtn"
-          class="imgIcon"
-          src="/src/static/icon/fi-rr-cross-small.svg"
-        ></image>
+        <image @click="cleanBtn" class="imgIcon" src="@/static/icon/fi-rr-cross-small.svg"></image>
       </view>
     </view>
 
@@ -56,9 +52,7 @@
             style="width: 40rpx; height: 40rpx"
             v-if="type === 0"
             :src="
-              song.favorite
-                ? '/src/static/icon/fi-rr-heart-grey.svg'
-                : '/src/static/icon/fi-rr-heart.svg'
+              song.favorite ? '@/static/icon/fi-rr-heart-grey.svg' : '@/static/icon/fi-rr-heart.svg'
             "
             @click="toggleFavorite(song)"
           ></image>
@@ -66,7 +60,7 @@
           <image
             v-else
             style="width: 40rpx; height: 40rpx"
-            src="/src/static/icon/fi-rr-heart.svg"
+            src="@/static/icon/fi-rr-heart.svg"
             @click="toggHeartCancel(song)"
           ></image>
         </view>
@@ -169,17 +163,17 @@
 
   .text-gray {
     padding-left: 25rpx;
+    overflow: hidden;
     font-size: 32rpx;
     color: #333;
-    overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
   .text-paly {
     padding-left: 25rpx;
+    overflow: hidden;
     font-size: 24rpx;
     color: #333;
-    overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
@@ -196,7 +190,6 @@
       align-items: center;
     }
   }
-
   /* 列表 */
   .playlist {
     height: calc(100vh - 620rpx);

src/pages/myUser/component/babyInformation.vue

@@ -21,7 +21,7 @@
       <view class="card-container" @click="photoBtn">
         <view class="info-profile"><image :src="camera" /></view>
         <view class="info-camera">
-          <image src="/src/static/icon/camera.svg" />
+          <image src="@/static/icon/camera.svg" />
         </view>
       </view>
       <view class="card-item">
@@ -208,19 +208,19 @@
     padding: 12rpx 0px;
   }
   ::v-deep .wd-button {
-    gap: 10px;
     flex: 1 0 0;
+    gap: 10px;
   }
   ::v-deep .wd-message-box__actions {
     .custom-one {
       color: #000 !important;
-      border: none;
       background: #fff !important;
+      border: none;
     }
     .custom-two {
       color: #fb4848 !important;
-      border: none;
       background: #fff !important;
+      border: none;
     }
   }
 </style>

src/pages/myUser/component/headerTitle.vue

@@ -1,11 +1,11 @@
 <template>
   <view class="header">
     <view class="back-button" @click="goBack">
-      <image style="width: 60rpx; height: 60rpx" src="/src/static/icon/Left.svg"></image>
+      <image style="width: 60rpx; height: 60rpx" src="@/static/icon/Left.svg"></image>
     </view>
     <view class="header-title">{{ title }}</view>
     <view class="header-delete" v-if="isShow" @click="handleDelete">
-      <image class="w-[40rpx] h-[40rpx]" src="/src/static/icon/fi-rr-trash.svg"></image>
+      <image class="w-[40rpx] h-[40rpx]" src="@/static/icon/fi-rr-trash.svg"></image>
     </view>
     <view class="header-delete" v-else>
       <image class="w-[40rpx] h-[40rpx]"></image>

src/pages/myUser/component/myBaby.vue

@@ -11,7 +11,7 @@
     <headerTitle title="我的宝宝"></headerTitle>
     <view class="Empty-baby">
       <!-- <view>
-        <image class="Empty-baby" src="/src/static/icon/Empty.svg"></image>
+        <image class="Empty-baby" src="@/static/icon/Empty.svg"></image>
       </view> -->
       <view
         class="baby-center"
@@ -94,9 +94,9 @@
     .baby-font {
       display: flex;
       align-items: flex-end;
+      height: 48rpx;
       font-size: 28rpx;
       font-weight: 600;
-      height: 48rpx;
       color: #333;
     }
     .baby-year {
@@ -116,7 +116,7 @@
     padding: 16rpx 32rpx;
   }
   ::v-deep .wd-button {
-    gap: 10px;
     flex: 1 0 0;
+    gap: 10px;
   }
 </style>

src/pages/myUser/component/setFocus.vue

@@ -14,7 +14,7 @@
         <view class="nickname">
           <view @click="phoneBtn" class="phone">1985258225</view>
           <view>
-            <image style="width: 48rpx; height: 48rpx" src="/src/static/icon/chevron-right.svg" />
+            <image style="width: 48rpx; height: 48rpx" src="@/static/icon/chevron-right.svg" />
           </view>
         </view>
       </view>
@@ -100,8 +100,8 @@
     padding: 16rpx 32rpx;
   }
   ::v-deep .wd-button {
-    gap: 10px;
     flex: 1 0 0;
+    gap: 10px;
     color: #fb4848 !important;
     background: #fff !important;
     border: 2rpx solid #fb4848;

src/pages/myUser/component/userInformation.vue

@@ -21,7 +21,7 @@
           <image :src="userAvatar" class="avatar-image" />
         </View>
         <view>
-          <image style="width: 48rpx; height: 48rpx" src="/src/static/icon/chevron-right.svg" />
+          <image style="width: 48rpx; height: 48rpx" src="@/static/icon/chevron-right.svg" />
         </view>
       </view>
 

src/pages/myUser/myuser.vue

@@ -15,7 +15,7 @@
       <view class="avatar-container" @click="modifyBtn">
         <image :src="userInfo.avatar" class="avatar" mode="aspectFill" />
         <view class="avatar-badge">
-          <image style="width: 52rpx; height: 52rpx" src="/src/static/icon/modify.svg"></image>
+          <image style="width: 52rpx; height: 52rpx" src="@/static/icon/modify.svg"></image>
         </view>
       </view>
       <text class="user-id">{{ userInfo.id }}</text>
@@ -48,20 +48,20 @@
     {
       key: 'baby',
       label: '我的宝宝',
-      icon: '/src/static/icon/fi-rr-child-head.svg',
-      right: '/src/static/icon/chevron-right.svg',
+      icon: '@/static/icon/fi-rr-child-head.svg',
+      right: '@/static/icon/chevron-right.svg',
     },
     {
       key: 'notification',
       label: '消息通知',
-      icon: '/src/static/icon/fi-rr-bell.svg',
-      right: '/src/static/icon/chevron-right.svg',
+      icon: '@/static/icon/fi-rr-bell.svg',
+      right: '@/static/icon/chevron-right.svg',
     },
     {
       key: 'settings',
       label: '设置中心',
-      icon: '/src/static/icon/setup.svg',
-      right: '/src/static/icon/chevron-right.svg',
+      icon: '@/static/icon/setup.svg',
+      right: '@/static/icon/chevron-right.svg',
     },
   ])
   //  页面跳转

src/pages/user/login.vue

@@ -18,12 +18,12 @@
         <!-- 账号 -->
         <view class="country-code">
           <view class="country-phone">
-            <image class="imgIcon" src="/src/static/icon/phone.svg"></image>
+            <image class="imgIcon" src="@/static/icon/phone.svg"></image>
             <view class="login-text">手机号</view>
           </view>
           <view class="phone-input">
             <view @click="replacePhone">{{ replacePoneValue }}</view>
-            <image class="w-[32rpx] h-[32rpx]" src="/src/static/icon/chevron-right.svg"></image>
+            <image class="w-[32rpx] h-[32rpx]" src="@/static/icon/chevron-right.svg"></image>
             <view>
               <input v-model="account" type="text" placeholder="请输入手机号" />
             </view>
@@ -32,7 +32,7 @@
         <!-- 验证码 -->
         <view class="country-password">
           <view class="country-phone">
-            <image class="imgIcon" src="/src/static/icon/Verification.svg"></image>
+            <image class="imgIcon" src="@/static/icon/Verification.svg"></image>
             <view class="login-text">验证码</view>
           </view>
           <view class="phone-input">
@@ -41,7 +41,7 @@
             </view>
             <image
               style="width: 2rpx; height: 32rpx; background: #e7e7e7"
-              src="/src/static/icon/textBor.svg"
+              src="@/static/icon/textBor.svg"
             ></image>
             <view class="send-btn" :disabled="isCountingDown" @click="sendVerificationCode">
               {{ buttonText }}
@@ -240,10 +240,10 @@
     justify-content: center;
     min-height: 100vh;
     // background: linear-gradient(0deg, #fff 0%, #ffac78 100%);
-    background-image: url('/src/static/icon/loginGg.svg');
-    background-size: cover;
-    background-position: center;
+    background-image: url('@/static/icon/loginGg.svg');
     background-repeat: no-repeat;
+    background-position: center;
+    background-size: cover;
   }
 
   .login-box {