zhengjinyi před 3 roky
rodič
revize
414754426c

+ 6 - 0
src/main/resources/static/css/user-center/dashboard.css

@@ -41,6 +41,12 @@ li{list-style:none}
     .user-content .section .user-main.account{height: 78px;}
     .user-content .section .user-main.account .account-cell{line-height: 34px;font-size:14px;color: #333333;float: left;margin-right: 80px;display: block;}
     .user-content .section .user-main.account .account-cell .red{font-size:16px;color: #f94b4b;font-weight: bold;}
+    .user-content .section .user-main.collec{height: 78px;padding: 10px 20px;}
+    .user-content .section .user-main.collec .account-collec{width: 72px;display: block;float: left;}
+    .user-content .section .user-main.collec .account-collec img{height: 26px;width: 26px;display: block;margin: 0 auto;margin-bottom: 2px;}
+    .user-content .section .user-main.collec .account-collec p{height: 26px;line-height: 26px;text-align: center;font-size: 14px;color: #333333;}
+
+
     .user-content .section .user-main .tabs-left{height: 100%;float: left;}
     .user-content .section .user-main .tabs-left .item{width: 50px;height: 100%;float: left;margin:0 40px;}
     .user-content .section .user-main .tabs-left .item a{width: 100%;height: 100%;display: block;}

binární
src/main/resources/static/img/account/icon-collection-empty@2x.png


binární
src/main/resources/static/img/account/icon-collection-none@2x.png


binární
src/main/resources/static/img/account/icon-collection@2x.png


+ 96 - 0
src/main/resources/templates/user-center/collection/collection.html

@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="https://www.thymeleaf.org ">
+<head>
+  <title>采美365网-商品列表</title>
+  <template th:replace="components/head-link"></template>
+  <link th:href="@{/css/product/product-coupon.css(v=${version})}" rel="stylesheet" type="text/css">
+  <template th:replace="components/analysis"></template>
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+
+<!-- 商品列表 -->
+<div id="productList">
+  <div v-if="listLoading" class="loading">
+    <img src="/img/base/loading.gif">
+  </div>
+  <template v-else>
+    <!--banner图-->
+    <div class="coupon-banner">
+      <a href='javascript:void(0)'>
+        <img :src="pcBanner" v-if="isPC">
+        <img :src="appletsBanner" v-else>
+      </a>
+    </div>
+    <!--商品列表-->
+    <div class="coupon-content clear">
+      <ul class="productList clear mfw">
+        <li class="productItem " v-for="p in listData">
+          <a class="image" :href="'/product-'+p.productId+'.html'">
+            <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
+            <p class="name" v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></p>
+            <p class="name" v-html="p.name" v-else></p>
+            <div class="price">
+              <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
+                <template v-if="p.priceFlag==1">
+                  <div class="price_text_tag">
+                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                  </div>
+                  <div class="main_price_unde">¥价格未公开</div>
+                </template>
+                <template v-else>
+                  <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || p.userIdentity==3">
+                    <div class="price_text_tag">
+                      <!--                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
+                      <p class="listTag" v-if="p.actStatus==1">
+                        {{p.promotions.name}}
+                        <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:¥{{p.price | NumFormat}}</span>
+                      </p>
+                    </div>
+                    <div class="main_price_show" :class="PromotionsFormat(p.promotions) ? 'none' : ''">
+                      ¥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}
+                    </div>
+                  </template>
+                  <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
+                    <div class="price_text_tag">
+                      <!--                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
+                      <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                    </div>
+                    <div class="main_price_unde">¥会员可见</div>
+                  </template>
+                  <template v-else>
+                    <div class="price_text_tag">
+                      <!--                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
+                      <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                    </div>
+                    <div class="price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
+                  </template>
+                </template>
+              </template>
+              <template v-else>
+                <div class="price_text_tag ">
+                  <!--                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
+                  <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                </div>
+                <div class="price_grade "><span class="bold">¥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
+              </template>
+            </div>
+          </a>
+        </li>
+      </ul>
+    </div>
+  </template>
+  <!--分页-->
+  <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
+
+</div>
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/product/product-coupon.js(v=${version})}"></script>
+</body>
+</html>

+ 11 - 0
src/main/resources/templates/user-center/dashboard.html

@@ -76,6 +76,17 @@
                             </div>
                         </div>
                     </div>
+                    <div class="user-content clear">
+                        <div class="title order">我的收藏</div>
+                        <div class="section">
+                            <div class="user-main collec">
+                                <a href="javascript:void(0);" class="account-collec">
+                                    <img src="/img/account/icon-collection@2x.png" alt="">
+                                    <p>收藏商品</p>
+                                </a>
+                            </div>
+                        </div>
+                    </div>
                     <div class="user-content clear">
                         <div class="title order">我的订单</div>
                         <div class="section">