From 8e16350144526966a1f7aeee4b6c66ecd3aa0aa8 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Sat, 1 Nov 2025 16:37:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package_sub/pages/Shop/ProductDetail.vue | 145 ++++++++++++++---------
 pages/index/index.vue                    |  12 +-
 pages/me/me.vue                          |   4 +-
 3 files changed, 100 insertions(+), 61 deletions(-)

diff --git a/package_sub/pages/Shop/ProductDetail.vue b/package_sub/pages/Shop/ProductDetail.vue
index ecb0cd3..9f1c60b 100644
--- a/package_sub/pages/Shop/ProductDetail.vue
+++ b/package_sub/pages/Shop/ProductDetail.vue
@@ -42,15 +42,17 @@
                   'switch-type-item-active': form.product_sku_id === tag.id,
                 }"
                 :style="{
-                  'background': !tag.stock_num ? '#aaa' : ''
+                  background: !tag.stock_num ? '#aaa' : '',
                 }"
                 v-for="tag in detail.product_skus"
                 :key="tag.id"
-                @tap="() => {
-                  if (tag.stock_num) {
-                    form.product_sku_id = tag.id
+                @tap="
+                  () => {
+                    if (tag.stock_num) {
+                      form.product_sku_id = tag.id;
+                    }
                   }
-                }"
+                "
               >
                 {{ tag.name }}
               </view>
@@ -94,7 +96,7 @@
               name="arrow-left"
               :size="36"
               color="#333"
-              @tap="$u.route({type:'back'})"
+              @tap="$u.route({ type: 'back' })"
             ></u-icon>
             <view
               class="flex1"
@@ -106,19 +108,19 @@
                 placeholder="请输入搜索内容"
               ></u-search>
             </view>
-            <button class="clear-btn" style="padding: 0 14rpx;" open-type="share">
-              <u-icon
-                  name="share"
-                  :size="36"
-                  color="#333"
-              ></u-icon>
+            <button
+              class="clear-btn"
+              style="padding: 0 14rpx"
+              open-type="share"
+            >
+              <u-icon name="share" :size="36" color="#333"></u-icon>
             </button>
-            <button class="clear-btn" style="padding: 0 14rpx;" @click="$u.route({ url: '/package_sub/pages/Shop/Cart' })">
-              <u-icon
-                  name="shopping-cart"
-                  :size="36"
-                  color="#333"
-              ></u-icon>
+            <button
+              class="clear-btn"
+              style="padding: 0 14rpx"
+              @click="$u.route({ url: '/package_sub/pages/Shop/Cart' })"
+            >
+              <u-icon name="shopping-cart" :size="36" color="#333"></u-icon>
             </button>
           </view>
           <view
@@ -131,7 +133,7 @@
             {{ tab.text }}
           </view>
         </view>
-        <view class="comment">
+       <!-- <view class="comment">
           <view
             class="panel-title"
             @tap="
@@ -177,7 +179,8 @@
             </view>
           </view>
         </view>
-        <view class="detail">
+        -->
+		<view class="detail">
           <view class="panel-title"> 宝贝详情 </view>
           <view>
             <u-parse :html="detail.content" lazy-load />
@@ -190,7 +193,11 @@
               class="product-item"
               v-for="item in recommendPro"
               :key="item.id"
-              @tap="$u.throttle(() => {toDetail(item)}, 500)"
+              @tap="
+                $u.throttle(() => {
+                  toDetail(item);
+                }, 500)
+              "
             >
               <view class="top">
                 <image
@@ -209,20 +216,20 @@
                     <text>{{ item.price }}</text>
                     <text>起</text>
                   </view>
-<!--                  <u-button-->
-<!--                    :hair-line="false"-->
-<!--                    type="warning"-->
-<!--                    ripple-->
-<!--                    shape="circle"-->
-<!--                    :custom-style="{-->
-<!--                      height: '28rpx',-->
-<!--                      'line-height': '28rpx',-->
-<!--                      padding: '0 6rpx',-->
-<!--                      color: '#fff',-->
-<!--                      'font-size': '17rpx',-->
-<!--                    }"-->
-<!--                    >加入购物车</u-button-->
-<!--                  >-->
+                  <!--                  <u-button-->
+                  <!--                    :hair-line="false"-->
+                  <!--                    type="warning"-->
+                  <!--                    ripple-->
+                  <!--                    shape="circle"-->
+                  <!--                    :custom-style="{-->
+                  <!--                      height: '28rpx',-->
+                  <!--                      'line-height': '28rpx',-->
+                  <!--                      padding: '0 6rpx',-->
+                  <!--                      color: '#fff',-->
+                  <!--                      'font-size': '17rpx',-->
+                  <!--                    }"-->
+                  <!--                    >加入购物车</u-button-->
+                  <!--                  >-->
                 </view>
               </view>
             </view>
@@ -249,19 +256,32 @@
               }"
               v-for="item in detail.product_skus || []"
               :key="item.id"
-              @click="() => {
-                if (item.stock_num) {
-                  form.product_sku_id = item.id
+              @click="
+                () => {
+                  if (item.stock_num) {
+                    form.product_sku_id = item.id;
+                  }
                 }
-              }"
+              "
             >
               <view class="top">
                 <image
                   class="product-item__img"
-                  :src="item.image ? item.image.url : (detail.image?detail.image.url:'')"
+                  :src="
+                    item.image
+                      ? item.image.url
+                      : detail.image
+                      ? detail.image.url
+                      : ''
+                  "
                   mode="aspectFill"
                 ></image>
-                <image class="product-item__soldout" v-if="!item.stock_num" src="~@/package_sub/static/Shop/yishouxing.png" mode="aspectFit"></image>
+                <image
+                  class="product-item__soldout"
+                  v-if="!item.stock_num"
+                  src="~@/package_sub/static/Shop/yishouxing.png"
+                  mode="aspectFit"
+                ></image>
               </view>
               <view class="bottom">
                 <view class="product-item__title">
@@ -284,9 +304,17 @@
             </view>
           </view>
         </scroll-view>
-        <view class="sku-num" style="padding-left: 10%;padding-top: 8rpx;" v-if="isSkuSubmit">
+        <view
+          class="sku-num"
+          style="padding-left: 10%; padding-top: 8rpx"
+          v-if="isSkuSubmit"
+        >
           <text>数量：</text>
-          <u-number-box v-model="form.num" :min="1" :max="productSku.stock_num"></u-number-box>
+          <u-number-box
+            v-model="form.num"
+            :min="1"
+            :max="productSku.stock_num"
+          ></u-number-box>
         </view>
         <view class="confirm-btn">
           <u-button
@@ -311,7 +339,10 @@
           <u-icon name="server-fill" :size="40" color="#333"></u-icon>
           <view class="text u-line-1">客服</view>
         </button>
-        <view class="item car" @tap="$u.route({ url: '/package_sub/pages/Shop/Cart' })">
+        <view
+          class="item car"
+          @tap="$u.route({ url: '/package_sub/pages/Shop/Cart' })"
+        >
           <u-badge
             class="car-num"
             :count="cartNum"
@@ -359,10 +390,10 @@ export default {
           text: "宝贝",
           targetClass: "content",
         },
-        {
-          text: "评价",
-          targetClass: "comment",
-        },
+        // {
+        //   text: "评价",
+        //   targetClass: "comment",
+        // },
         {
           text: "详情",
           targetClass: "detail",
@@ -406,11 +437,11 @@ export default {
   methods: {
     toDetail(item) {
       this.$u.route({
-        url: '/package_sub/pages/Shop/ProductDetail',
+        url: "/package_sub/pages/Shop/ProductDetail",
         params: {
-          id: item.id
-        }
-      })
+          id: item.id,
+        },
+      });
     },
     // 获取一个目标元素的高度
     getElRect(elClass, dataVal) {
@@ -579,14 +610,14 @@ export default {
               title: "请选择产品规格",
               type: "warning",
             });
-            return
+            return;
           }
           if (!this.form.num) {
             this.$refs.uToast.show({
               title: "请选择产品数量",
               type: "warning",
             });
-            return
+            return;
           }
           const res = await this.$u.api.cartSave(this.form);
           this.$refs.uToast.show({
@@ -597,8 +628,8 @@ export default {
         }
         if (this.isImmediateBuy) {
           this.$u.route({
-            url: '/package_sub/pages/Shop/Pay'
-          })
+            url: "/package_sub/pages/Shop/Pay",
+          });
         }
         this.showType = false;
       } catch (err) {}
@@ -990,7 +1021,7 @@ page {
       padding: 40rpx;
       box-sizing: border-box;
       background: #ffffff99;
-      opacity: .86;
+      opacity: 0.86;
       position: absolute;
       top: 0;
       left: 0;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d64efdf..464a1f6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -44,7 +44,7 @@
 			</view> -->
 
 			<view class="swiper" style="padding-top:30rpx">
-				<u-swiper :height="366" :list="banners" name="url"></u-swiper>
+				<u-swiper @click="goSwiper" :height="366" :list="banners" name="url"></u-swiper>
 			</view>
 			<view class="links-title">
 				<text></text><text>整合照护服务</text>
@@ -247,7 +247,15 @@
 				return getApp().globalData.navbarHeight;
 			},
 		},
-		methods: {
+		methods: {
+			goSwiper(e){
+				var data = this.banners[e]
+				if(data.jump_type==1 && data.jump_url){
+					uni.navigateTo({
+						url:data.jump_url
+					})
+				}
+			},
 			getElScrollTop() {
 				const query = uni.createSelectorQuery().in(this);
 				query
diff --git a/pages/me/me.vue b/pages/me/me.vue
index e3e2895..2b8cdf0 100644
--- a/pages/me/me.vue
+++ b/pages/me/me.vue
@@ -35,7 +35,7 @@
 			  }
 			}) -->
 				<image class="tab__icon" mode="aspectFit" src="~@/static/me/peizheng.png"></image>
-				<view>陪诊订单</view>
+				<view>服务订单</view>
 			</view>
 			<view class="tab" @click="$u.route({
 			  url: '/package_sub/pages/OrderList/OrderList',
@@ -44,7 +44,7 @@
 			  }
 			})">
 				<image class="tab__icon" mode="aspectFit" src="~@/static/me/shouhou.png"></image>
-				<view>陪诊售后</view>
+				<view>售后服务</view>
 			</view>
 			<view class="tab" @click="$u.throttle($u.route({ url: '/package_sub/pages/UserArchive/UserArchive' }))">
 				<image class="tab__icon" mode="aspectFit" src="~@/static/me/lianxiren.png"></image>