Merge branch 'dev-1.1.0' into jyb_20250506_dev

pages_home/pages/Volunteerside/goodsDetails.vue

@@ -15,7 +15,7 @@
         </template>
       </up-card>
     </view>
-    <view>
+    <view class="service-description-box">
       <up-card
         title="志愿者介绍"
         :head-style="{ height: '80rpx', padding: '20rpx', fontWeight: 'bold' }"
@@ -80,14 +80,14 @@
       >
         <template #body>
           <view class="certificate">
-            <image
+            <up-image
               v-for="item in certificationPictures"
               :key="item"
               :src="item"
-              mode=""
               style="width: 100%"
               class="certificate-img"
-            ></image>
+              mode="widthFix"
+            ></up-image>
           </view>
         </template>
       </up-card>
@@ -108,7 +108,7 @@
       <up-popup :show="show" @close="close" @open="open"> </up-popup>
       <up-popup :show="show" @open="upPopupOpen" :custom-style="popupStyle">
         <scroll-view scroll-y class="popup-scroll-content">
-          <view>
+          <!-- <view>
             <view class="Wrapper">
               <image src="/static/img/Location.png" class="Wrapper-img" />
               <span class="Wrapper-content">李四</span>
@@ -116,7 +116,7 @@
             </view>
             <span style="margin-left: 15rpx; margin-top: 50rpx">重庆永川区</span>
           </view>
-          <up-divider></up-divider>
+          <up-divider></up-divider> -->
           <view class="Wrap-content1">
             <up-avatar :src="src"></up-avatar>
             <text class="service-price">￥{{ businessPrice }}</text>
@@ -491,14 +491,14 @@ const handleAddressUpdate = (newAddress) => {
 }
 // 详情底部底部数据
 const options = ref([
-  {
-    icon: 'headphones',
-    text: '客服',
-  },
-  {
-    icon: 'shop',
-    text: '收藏',
-  },
+  // {
+  //   icon: 'headphones',
+  //   text: '客服',
+  // },
+  // {
+  //   icon: 'shop',
+  //   text: '收藏',
+  // },
 ])
 
 // 详情底部立即购买样式
@@ -511,9 +511,12 @@ const buttonGroup = ref([
 ])
 // 底部帮助客服方法
 const onClick = (e) => {
-  uni.showToast({
-    title: `敬请期待`,
-    icon: 'none',
+  // uni.showToast({
+  //   title: `敬请期待`,
+  //   icon: 'none',
+  // })
+  uni.navigateTo({
+                url: `/pages_orderuser/pages/talk/pages/index/index?customerService=true&conversationType=3`
   })
 }
 
@@ -1033,6 +1036,7 @@ onMounted(async () => {
 .Wrap-content1 {
   display: flex;
   justify-content: flex-start;
+  align-items: center;
   margin-left: 10rpx;
   margin-top: 10rpx;
 }
@@ -1305,7 +1309,7 @@ onMounted(async () => {
   flex-shrink: 0;
 }
 .service-label1{
-  width: 400rpx;
+  /* width: 400rpx; */
     font-size: 28rpx;
     color: #666;
     flex-shrink: 0;
@@ -1479,4 +1483,8 @@ onMounted(async () => {
   color: #666;
   line-height: 36rpx;
 }
+
+.service-description-box {
+  padding-bottom: 180rpx;
+}
 </style>