清空代码-初始化yudao

pages/goods/components/detail/detail-cell-params.vue

@@ -1,115 +0,0 @@
-<template>
-  <view>
-    <detail-cell
-      v-if="modelValue.length > 0"
-      label="参数"
-      :value="state.paramsTitle"
-      @click="state.show = true"
-    ></detail-cell>
-    <su-popup :show="state.show" round="10" :showClose="true" @close="close">
-      <view class="ss-modal-box bg-white">
-        <view class="modal-header">产品参数</view>
-        <scroll-view
-          class="modal-content ss-p-t-50"
-          scroll-y="true"
-          :scroll-with-animation="true"
-          :show-scrollbar="false"
-          @touchmove.stop
-        >
-          <view class="sale-item ss-flex ss-col-top" v-for="item in modelValue" :key="item.title">
-            <view class="item-title">{{ item.title }}</view>
-            <view class="item-value">{{ item.content }}</view>
-          </view>
-        </scroll-view>
-        <view class="modal-footer ss-flex ss-row-center ss-m-b-20">
-          <button class="ss-reset-button save-btn ui-Shadow-Main" @tap="state.show = false"
-            >确定</button
-          >
-        </view>
-      </view>
-    </su-popup>
-  </view>
-</template>
-
-<script setup>
-  import { reactive, computed } from 'vue';
-
-  import detailCell from './detail-cell.vue';
-  const props = defineProps({
-    modelValue: {
-      type: Object,
-      default() {
-        return [];
-      },
-    },
-  });
-  const state = reactive({
-    show: false,
-    paramsTitle: computed(() => {
-      let titleArray = [];
-      props.modelValue.map((item) => {
-        titleArray.push(item.title);
-      });
-      return titleArray.join(' · ');
-    }),
-  });
-
-  function close() {
-    state.show = false;
-  }
-</script>
-
-<style lang="scss" scoped>
-  .ss-modal-box {
-    border-radius: 30rpx 30rpx 0 0;
-    max-height: 730rpx;
-
-    .modal-header {
-      position: relative;
-      padding: 30rpx 20rpx 40rpx;
-      font-size: 36rpx;
-      font-weight: bold;
-    }
-
-    .modal-content {
-      padding: 0 30rpx;
-      max-height: 500rpx;
-      box-sizing: border-box;
-
-      .sale-item {
-        margin-bottom: 24rpx;
-        padding-bottom: 24rpx;
-        border-bottom: 2rpx solid rgba(#dfdfdf, 0.4);
-
-        .item-title {
-          font-size: 28rpx;
-          font-weight: 500;
-          line-height: 42rpx;
-          width: 120rpx;
-          white-space: normal;
-        }
-
-        .item-value {
-          font-size: 26rpx;
-          font-weight: 400;
-          color: $dark-9;
-          line-height: 42rpx;
-          flex: 1;
-          margin-left: 20rpx;
-        }
-      }
-    }
-
-    .modal-footer {
-      height: 120rpx;
-
-      .save-btn {
-        width: 710rpx;
-        height: 80rpx;
-        border-radius: 40rpx;
-        background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-        color: $white;
-      }
-    }
-  }
-</style>

pages/goods/components/detail/detail-cell-service.vue

@@ -1,121 +0,0 @@
-<template>
-  <view>
-    <detail-cell
-      v-if="modelValue.length > 0"
-      label="保障"
-      :value="state.paramsTitle"
-      @click="state.show = true"
-    >
-    </detail-cell>
-    <su-popup :show="state.show" round="10" :showClose="true" @close="state.show = false">
-      <view class="ss-modal-box">
-        <view class="modal-header">服务保障</view>
-        <scroll-view
-          class="modal-content"
-          scroll-y="true"
-          :scroll-with-animation="true"
-          :show-scrollbar="false"
-          @touchmove.stop
-        >
-          <view class="sale-item ss-flex ss-col-top" v-for="item in modelValue" :key="item.id">
-            <image
-              class="title-icon ss-m-r-14"
-              :src="sheep.$url.cdn(item.image)"
-              mode="aspectFill"
-            ></image>
-            <view class="title-box">
-              <view class="item-title ss-m-b-20">{{ item.name }}</view>
-              <view class="item-value">{{ item.description }}</view>
-            </view>
-          </view>
-        </scroll-view>
-        <view class="modal-footer ss-flex ss-row-center ss-m-b-20">
-          <button class="ss-reset-button save-btn ui-Shadow-Main" @tap="state.show = false"
-            >确定</button
-          >
-        </view>
-      </view>
-    </su-popup>
-  </view>
-</template>
-
-<script setup>
-  import { reactive, computed } from 'vue';
-  import sheep from '@/sheep';
-  import detailCell from './detail-cell.vue';
-  const props = defineProps({
-    modelValue: {
-      type: Object,
-      default() {},
-    },
-  });
-
-  const state = reactive({
-    show: false,
-    paramsTitle: computed(() => {
-      let nameArray = [];
-      props.modelValue.map((item) => {
-        nameArray.push(item.name);
-      });
-      return nameArray.join(' · ');
-    }),
-  });
-</script>
-
-<style lang="scss" scoped>
-  .ss-modal-box {
-    border-radius: 30rpx 30rpx 0 0;
-    max-height: 730rpx;
-
-    .modal-header {
-      position: relative;
-      padding: 30rpx 20rpx 40rpx;
-      font-size: 36rpx;
-      font-weight: bold;
-    }
-
-    .modal-content {
-      padding: 0 30rpx;
-      max-height: 500rpx;
-      box-sizing: border-box;
-
-      .sale-item {
-        margin-bottom: 44rpx;
-
-        .title-icon {
-          width: 36rpx;
-          height: 36rpx;
-        }
-		.title-box{
-			flex: 1;
-		}
-
-        .item-title {
-          font-size: 28rpx;
-          font-weight: 500;
-          line-height: normal;
-        }
-
-        .item-value {
-          font-size: 26rpx;
-          font-weight: 400;
-          color: $dark-9;
-          line-height: 42rpx;
-        }
-      }
-    }
-
-    .modal-footer {
-      height: 120rpx;
-      background-color: #fff;
-
-      .save-btn {
-        width: 710rpx;
-        height: 80rpx;
-        border-radius: 40rpx;
-        background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-        color: $white;
-      }
-    }
-  }
-</style>

pages/goods/components/detail/detail-cell.vue

@@ -1,3 +1,4 @@
+<!-- 商品详情：cell 组件 -->
 <template>
   <view class="detail-cell-wrap ss-flex ss-col-center ss-row-between" @tap="onClick">
     <view class="label-text">{{ label }}</view>
@@ -13,7 +14,6 @@
    * 详情 cell
    *
    */
-
   const props = defineProps({
     label: {
       type: String,

pages/goods/components/detail/detail-content-card.vue

@@ -1,3 +1,4 @@
+<!-- 商品详情：描述卡片 -->
 <template>
   <view class="detail-content-card bg-white ss-m-x-20 ss-p-t-20">
     <view class="card-header ss-flex ss-col-center ss-m-b-30 ss-m-l-20">
@@ -5,7 +6,7 @@
       <view class="title ss-m-l-20 ss-m-r-20">详情</view>
     </view>
     <view class="card-content">
-      <mp-html :content="content"></mp-html>
+      <mp-html :content="content" />
     </view>
   </view>
 </template>

pages/goods/components/detail/detail-navbar.vue

@@ -1,3 +1,4 @@
+<!-- 商品详情：商品/评价/详情的 nav -->
 <template>
   <su-fixed alway :bgStyles="{ background: '#fff' }" :val="0" noNav opacity :placeholder="false">
     <su-status-bar />

pages/goods/components/detail/detail-progress.vue

@@ -1,3 +1,4 @@
+<!-- 秒杀商品：抢购进度 -->
 <template>
   <view class="ss-flex ss-col-center">
     <view class="progress-title ss-m-r-10"> 已抢{{ percent }}% </view>

pages/goods/components/detail/detail-tabbar.vue

@@ -1,3 +1,4 @@
+<!-- 商品详情的底部导航 -->
 <template>
   <su-fixed bottom placeholder bg="bg-white">
     <view class="ui-tabbar-box">
@@ -12,7 +13,7 @@
               class="item-icon"
               :src="sheep.$url.static('/static/img/shop/goods/collect_1.gif')"
               mode="aspectFit"
-            ></image>
+            />
             <view class="item-title">已收藏</view>
           </block>
           <block v-else>
@@ -20,7 +21,7 @@
               class="item-icon"
               :src="sheep.$url.static('/static/img/shop/goods/collect_0.png')"
               mode="aspectFit"
-            ></image>
+            />
             <view class="item-title">收藏</view>
           </block>
         </view>
@@ -33,7 +34,7 @@
             class="item-icon"
             :src="sheep.$url.static('/static/img/shop/goods/message.png')"
             mode="aspectFit"
-          ></image>
+          />
           <view class="item-title">客服</view>
         </view>
         <view
@@ -45,7 +46,7 @@
             class="item-icon"
             :src="sheep.$url.static('/static/img/shop/goods/share.png')"
             mode="aspectFit"
-          ></image>
+          />
           <view class="item-title">分享</view>
         </view>
         <slot></slot>
@@ -63,13 +64,11 @@
    * @property {String} ui 			 			- 自定义样式Class
    * @property {Boolean} noFixed 		 			- 是否定位
    * @property {Boolean} topRadius 		 		- 上圆角
-   *
-   *
    */
-
-  import { computed, reactive } from 'vue';
+  import { reactive } from 'vue';
   import sheep from '@/sheep';
   import { showShareModal } from '@/sheep/hooks/useModal';
+  import FavoriteApi from '@/sheep/api/product/favorite';
 
   // 数据
   const state = reactive({});
@@ -114,25 +113,24 @@
       default: true,
     },
   });
-  const elStyles = computed(() => {
-    return {
-      'border-top-left-radius': props.topRadius + 'rpx',
-      'border-top-right-radius': props.topRadius + 'rpx',
-      overflow: 'hidden',
-    };
-  });
 
-  const tabbarheight = (e) => {
-    uni.setStorageSync('tabbar', e);
-  };
   async function onFavorite() {
-    const { error } = await sheep.$api.user.favorite.do(props.modelValue.id);
-    if (error === 0) {
-      if (props.modelValue.favorite) {
-        props.modelValue.favorite = 0;
-      } else {
-        props.modelValue.favorite = 1;
+    // 情况一：取消收藏
+    if (props.modelValue.favorite) {
+      const { code } = await FavoriteApi.deleteFavorite(props.modelValue.id);
+      if (code !== 0) {
+        return
       }
+      sheep.$helper.toast('取消收藏');
+      props.modelValue.favorite = false;
+    // 情况二：添加收藏
+    } else {
+      const { code } = await FavoriteApi.createFavorite(props.modelValue.id);
+      if (code !== 0) {
+        return
+      }
+      sheep.$helper.toast('收藏成功');
+      props.modelValue.favorite = true;
     }
   }