机构个人中心

src/main/resources/templates/user-center/dashboard.html

@@ -12,7 +12,7 @@
 
 <!-- 我的采美 -->
 <div id="dashboard">
-    <div class="navLayout" th:object="${pageInfo}">
+    <div class="navLayout" :class="isRequset ? 'active':''" v-if="isRequset">
         <div class="crumbs">
             <span>我的交易</span>
             <span>&gt;</span>
@@ -24,17 +24,19 @@
             <div class="right">
                 <div class="user-header">
                     <div class="header-ml">
-                        <div class="logo"><img src="https://dss2.bdstatic.com/8_V1bjqh_Q23odCf/pacific/1884224890.jpg" alt=""></div>
+                        <div class="logo"><img :src="userInfo.image == null ? '' : userInfo.image" alt=""></div>
                         <div class="account">
-                            <div class="name">华熙生物信息技术有限公司</div>
-                            <div class="msg"><span>资料完整度:<em class="red">89%</em></span><a href="/user/setting/information.html">立即完善</a></div>
+                            <div class="name"><span>{{userInfo.name}}</span><a href="/" v-if="userInfo.userIdentity === 4">去升级会员机构</a></div>
+                            <div class="msg"><span>资料完整度:<em class="red">{{degree}}</em></span><a href="/user/setting/information.html">立即完善</a></div>
                         </div>
                     </div>
                     <div class="header-mr">
                         <div class="message">
-                            <i class="icon mIcon"><a href="">{{messageNum}}</a></i>
+                            <i class="icon mIcon">
+                                <a href="" v-if="unReadMessageCount>0">{{unReadMessageCount == 99 ? '99+' : unReadMessageCount}}</a>
+                            </i>
                         </div>
-                        <div class="money">余额: <span>0.00</span> 元</div>
+                        <div class="money">余额: <span>{{toFixedFn(userInfo.ableUserMoney)}}</span> 元</div>
                     </div>
                 </div>
                 <div class="user-content clear">
@@ -43,87 +45,71 @@
                         <div class="user-main tabs">
                             <div class="tabs-left">
                                 <div class="item">
-                                    <a href="javascript:void(0);"><i class="icon mIcon" :class=""><span>3</span></i><p>待确认</p></a>
+                                    <a href="javascript:void(0);">
+                                        <i class="icon mIcon"><span v-if="confirmedCount>0">{{confirmedCount == 99 ? '99+' : confirmedCount}}</span> </i>
+                                        <p>待确认</p>
+                                    </a>
                                 </div>
                                 <div class="item">
-                                    <a href="javascript:void(0);"><i class="icon mIcon" :class=""><span>3</span></i><p>待付款</p></a>
+                                    <a href="javascript:void(0);">
+                                        <i class="icon mIcon"><span v-if="paymentCount>0">{{paymentCount == 99 ? '99+' : paymentCount}}</span></i>
+                                        <p>待付款</p>
+                                    </a>
                                 </div>
                                 <div class="item">
-                                    <a href="javascript:void(0);"><i class="icon mIcon" :class=""><span>3</span></i><p>待发货</p></a>
+                                    <a href="javascript:void(0);">
+                                        <i class="icon mIcon"><span v-if="waitShipmentsCount>0">{{waitShipmentsCount == 99 ? '99+' : waitShipmentsCount}}</span></i>
+                                        <p>待发货</p>
+                                    </a>
                                 </div>
                                 <div class="item">
-                                    <a href="javascript:void(0);"><i class="icon mIcon" :class=""><span>3</span></i><p>已发货</p></a>
+                                    <a href="javascript:void(0);">
+                                        <i class="icon mIcon"><span v-if="shipmentsCount>0">{{shipmentsCount == 99 ? '99+' : shipmentsCount}}</span></i>
+                                        <p>已发货</p>
+                                    </a>
                                 </div>
                                 <div class="item">
-                                    <a href="javascript:void(0);"><i class="icon mIcon" :class=""><span>3</span></i><p>退货/款</p></a>
+                                    <a href="javascript:void(0);">
+                                        <i class="icon mIcon"><span v-if="salesReturnCount>0">{{salesReturnCount == 99 ? '99+' : salesReturnCount}}</span></i>
+                                        <p>退货/款</p>
+                                    </a>
                                 </div>
                             </div>
                             <div class="tabs-right"><a href="">全部订单<span class="icon mIcon"></span></a></div>
                         </div>
-                        <div class="user-main order">
-                            <div class="order-title">
-                                <span class="bag">自主</span>
-                                 <div class="title-name">
-                                     <p>订单编号(标识)：C155382764847081(1002)</p>
-                                     <p class="state">待确认</p>
-                                 </div>
-                                <div class="title-type"></div>
-                                <div class="title-time">
-                                    <p>下单时间:2019-04-03 16:45</p>
-                                </div>
-                            </div>
-                            <div class="order-content">
-                                <div class="order-item">
-                                    <p>税费: <span>￥100000.00</span> </p>
-                                    <p>运费:<span>￥100000.00</span> </p>
-                                    <p>经理折扣:<span>￥10000.00</span> </p>
-                                    <p>促销满减:<span>￥100000.00</span> </p>
-                                    <p>赠品数:10</p>
-                                </div>
-                                <div class="order-item">
-                                    <p>订单总额:<span class="red">￥10000.00</span> </p>
-                                </div>
-                                <div class="order-item">
-                                    <p>应付总额:<span class="red">￥10000.00</span> </p>
-                                    <p>已支付:<span class="red">￥10000.00</span> </p>
-                                    <p>待付金额:<span class="red">￥10000.00</span> </p>
-                                </div>
-                                <div class="order-botton">
-                                    <a class="btn cancel" href="javascript: void(0);" @click="editGoodFn()">取消订单</a>
-                                    <a class="btn primary" href="javascript: void(0);"  @click="ItemDownshelf()">确认订单</a>
-                                    <a class="btn cancel" href="javascript: void(0);" @click="AddPushHotFn()">删除订单</a>
-                                    <a class="btn primary" href="javascript: void(0);"  @click="DeletePushHotFn()">查看物流</a>
-                                    <a class="btn primary" href="javascript: void(0);"  @click="DeletePushHotFn()">确认收货</a>
-                                    <a class="btn cancel" href="javascript: void(0);" @click="pageLinkDetils()">订单详情</a>
-                                    <a class="btn primary" href="javascript: void(0);" @click="pageLinkDetils()">支付订单</a>
-                                </div>
-                            </div>
-                        </div>
                     </div>
                 </div>
                 <div class="user-content">
                     <div class="title">今日推荐</div>
                     <div class="section">
                         <div class="user-main product">
-                            <div class="product-item" v-for="(item, index) in productList" :key="index">
-                                <div class="product-img"><img :src="item.image" :alt="item.name"></div>
-                                <div class="product-name"><p>{{item.name}}</p></div>
-                            </div>
+                            <a class="product-item" v-for="(item, index) in productList" :key="index" :href="item.link" target="_blank">
+                                <div class="product-img">
+                                    <img :src="item.image" :alt="item.title">
+                                </div>
+                                <div class="product-name"><p>{{item.title}}</p></div>
+                            </a>
                         </div>
                     </div>
                 </div>
                 <div class="user-content">
-                    <div class="title">
-                        <p>最新动态</p>
-                        <p><a href="">全部动态</a></p>
-                    </div>
+                    <div class="title">最新动态<a href="/info/center-3-1.html">全部动态<i class="icon mIcon"></i></a></div>
                     <div class="section">
-                        <div class="user-main news"></div>
+                        <div class="user-main news">
+                            <a class="new-list" v-for="(item, index) in newsList" :key="index" :href="item.link" target="_blank">
+                                <p class="text">{{item.title}}</p>
+                                <p class="time">{{item.addTime}}</p>
+                            </a>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
+    <!--loading-->
+    <div v-else class="loading">
+        <img src="/img/base/loading.gif">
+    </div>
 </div>
 
 <!-- 引入底部 -->

src/main/resources/templates/user-center/message/list.html

@@ -0,0 +1,23 @@
+<!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>
+
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+
+<!-- 我的采美 -->
+<div>
+
+</div>
+
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+
+</body>
+</html>

src/main/resources/templates/user-center/order/list.html

@@ -4,20 +4,99 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
     <template th:replace="components/head-link"></template>
-
+    <link th:href="@{/css/user-center/orderlist.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div>
+<div id="dashboard">
+    <div class="navLayout" th:object="${pageInfo}">
+        <div class="crumbs">
+            <span>我的交易</span>
+            <span>&gt;</span>
+            <span>我的首页</span>
+        </div>
+        <div class="wrap clear mf">
+            <!--左侧面包屑-->
+            <template th:replace="user-center/components/tableft"></template>
+            <div class="right">
+                <div class="user-header">
 
+                </div>
+                <div class="user-content clear">
+                    <div class="section">
+                        <div class="user-main tabs">
+                            <div class="tabs-left">
+                                <div class="item">
+                                    <a href="javascript:void(0);"><i class="icon mIcon" :class=""><span>3</span></i><p>待确认</p></a>
+                                </div>
+                                <div class="item">
+                                    <a href="javascript:void(0);"><i class="icon mIcon" :class=""><span>3</span></i><p>待付款</p></a>
+                                </div>
+                                <div class="item">
+                                    <a href="javascript:void(0);"><i class="icon mIcon" :class=""><span>3</span></i><p>待发货</p></a>
+                                </div>
+                                <div class="item">
+                                    <a href="javascript:void(0);"><i class="icon mIcon" :class=""><span>3</span></i><p>已发货</p></a>
+                                </div>
+                                <div class="item">
+                                    <a href="javascript:void(0);"><i class="icon mIcon" :class=""><span>3</span></i><p>退货/款</p></a>
+                                </div>
+                            </div>
+                            <div class="tabs-right"><a href="">全部订单<span class="icon mIcon"></span></a></div>
+                        </div>
+                        <div class="user-main order">
+                            <div class="order-title">
+                                <span class="bag">自主</span>
+                                <div class="title-name">
+                                    <p>订单编号(标识)：C155382764847081(1002)</p>
+                                    <p class="state">待确认</p>
+                                </div>
+                                <div class="title-type"></div>
+                                <div class="title-time">
+                                    <p>下单时间:2019-04-03 16:45</p>
+                                </div>
+                            </div>
+                            <div class="order-content">
+                                <div class="order-item">
+                                    <p>税费: <span>￥100000.00</span> </p>
+                                    <p>运费:<span>￥100000.00</span> </p>
+                                    <p>经理折扣:<span>￥10000.00</span> </p>
+                                    <p>促销满减:<span>￥100000.00</span> </p>
+                                    <p>赠品数:10</p>
+                                </div>
+                                <div class="order-item">
+                                    <p>订单总额:<span class="red">￥10000.00</span> </p>
+                                </div>
+                                <div class="order-item">
+                                    <p>应付总额:<span class="red">￥10000.00</span> </p>
+                                    <p>已支付:<span class="red">￥10000.00</span> </p>
+                                    <p>待付金额:<span class="red">￥10000.00</span> </p>
+                                </div>
+                                <div class="order-botton">
+                                    <a class="btn cancel" href="javascript: void(0);" @click="editGoodFn()">取消订单</a>
+                                    <a class="btn primary" href="javascript: void(0);"  @click="ItemDownshelf()">确认订单</a>
+                                    <a class="btn cancel" href="javascript: void(0);" @click="AddPushHotFn()">删除订单</a>
+                                    <a class="btn cancel" href="javascript: void(0);"  @click="DeletePushHotFn()">查看物流</a>
+                                    <a class="btn primary" href="javascript: void(0);"  @click="DeletePushHotFn()">确认收货</a>
+                                    <a class="btn cancel" href="javascript: void(0);" @click="pageLinkDetils()">订单详情</a>
+                                    <a class="btn primary" href="javascript: void(0);" @click="pageLinkDetils()">支付订单</a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </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/user.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/dashboard.js(v=${version})}"></script>
 </body>
 </html>