user

alipay/app.js

@@ -47,7 +47,7 @@ App({
 
     // 请求地址
     request_url: "https://demo.shopxo.net/",
-    request_url: 'http://localhost/project/shopxo/service/',
+    //request_url: 'http://localhost/project/shopxo/service/',
 
     // 基础信息
     application_title: "ShopXO电商系统",

alipay/pages/goods-search/goods-search.axml

@@ -50,11 +50,9 @@
       <input type="digit" placeholder="最高价" name="max_price" class="br fl" />
     </view>
     <view class="item keywords">
-      <view class="title cr-666">关键字
-      </view>
+      <view class="title cr-666">关键字</view>
       <input type="text" placeholder="关键字" name="keywords" value="{{(params.keywords || '')}}" class="br" />
     </view>
-    <button formType="submit" class="bg-main form-submit wh-auto" disabled="{{popup_form_loading_status}}" hover-class="none">确认
-    </button>
+    <button formType="submit" class="bg-main form-submit wh-auto" disabled="{{popup_form_loading_status}}" hover-class="none">确认</button>
   </form>
 </popup>
\ No newline at end of file

alipay/pages/goods-search/goods-search.js

@@ -99,8 +99,14 @@ Page({
             }
           } else {
             this.setData({
-              data_list_loding_status: 0
+              data_list_loding_status: 0,
             });
+            if (this.data.data_page <= 1) {
+              this.setData({
+                data_list: [],
+                data_bottom_line_status: false,
+              });
+            }
           }
         } else {
           this.setData({

alipay/pages/user/user.acss

 /* 头部 */
 .head-box{
-    padding: 30rpx 10rpx;
+    padding-top: 30rpx;
     font-size: 24rpx;
 }
 .head-item .avatar {
@@ -12,12 +12,42 @@
     font-size: 30rpx;
     margin-top: 10rpx;
 }
-
-.head-item .item-icon{
+.head-item .item-icon {
     width: 30rpx;
     margin-right: 20rpx;
 }
 
+/* 头部导航 */
+.head-nav {
+  padding: 5px 0;
+  background: rgba(0,0,0,0.1);
+  margin-top: 30rpx;
+}
+.head-nav-item {
+  width: 25%;
+  padding: 5rpx 0;
+}
+.head-nav-item view {
+  line-height: 38rpx;
+  color: #efeaea;
+  font-weight: 100;
+}
+.message-nav {
+  position: absolute;
+  top: 20rpx;
+  right: 20rpx;
+}
+.message-nav image {
+  width: 28rpx;
+  height: 28rpx;
+  vertical-align: middle;
+}
+.message-nav text {
+  margin-left: 5rpx;
+  font-weight: 100;
+  font-size: 24rpx;
+  color: #eee;
+}
 
 /* 导航列表 */
 .nav-box .nav-item{

alipay/pages/user/user.axml

+<!-- 头部 -->
 <view class="head-box bg-main">
     <view class="head-item oh tc">
-        <image onTap="preview_event" onError="user_avatar_error" class="avatar" src="{{avatar}}" mode="widthFix" />
-        <text class="item-name dis-block cr-fff">{{nickname}}</text>
+      <image onTap="preview_event" onError="user_avatar_error" class="avatar" src="{{avatar}}" mode="widthFix" />
+      <text class="item-name dis-block cr-fff">{{nickname}}</text>
+    </view>
+
+    <view a:if="{{head_nav_list.length > 0}}" class="head-nav oh wh-auto">
+      <block a:for="{{head_nav_list}}">
+        <navigator url="/pages/{{item.url}}/{{item.url}}" hover-class="none">
+          <view class="head-nav-item tc fl">
+            <view>{{item.count}}</view>
+            <view>{{item.name}}</view>
+          </view>
+        </navigator>
+      </block>
+    </view>
+
+    <view class="message-nav">
+      <navigator url="/pages/message/message" hover-class="none">
+        <image src="/images/user-head-message-icon.png" mode="aspectFill" />
+        <text>消息</text>
+        <text>{{message_total}}</text>
+      </navigator>
     </view>
 </view>
 
+<!-- 导航 -->
 <view class="nav-box bg-white">
   <block a:for="{{lists}}">
     <view a:if="{{item.is_show == 1}}">
-      <navigator url="/pages/{{item.url}}/{{item.url}}" class="nav-item br-b">
+      <navigator url="/pages/{{item.url}}/{{item.url}}" class="nav-item br-b" hover-class="none">
         <view class="arrow-right">
           <image src="/images/{{item.icon}}.png" class="item-icon" mode="widthFix" />
           <text class="item-name">{{item.name}}</text>
@@ -17,7 +38,7 @@
     </view>
     <view a:if="{{item.url == 'user-order' && user_order_status_list.length > 0}}" class="items-list br-b oh">
       <block a:for="{{user_order_status_list}}" a:for-item="items">
-        <navigator url="/pages/{{item.url}}/{{item.url}}?status={{items.status}}">
+        <navigator url="/pages/{{item.url}}/{{item.url}}?status={{items.status}}" hover-class="none">
           <view class="items fl tc">
             <badge a:if="{{items.count > 0}}" text="{{items.count}}" dot="{{false}}"></badge>
             <image src="/images/user-index-nav-order-icon-{{items.status}}.png" class="items-icon" mode="aspectFill" />

alipay/pages/user/user.js

@@ -3,11 +3,15 @@ Page({
   data: {
     avatar: app.data.default_user_head_src,
     nickname: "用户名",
-    integral: 0,
-    deadline: 0,
-    agreement_url: '',
     customer_service_tel: null,
     common_user_center_notice: null,
+    message_total: 0,
+    head_nav_list: [
+      { name: "订单总数", url: "user-order", count: 0 },
+      { name: "商品收藏", url: "user-faovr", count: 0 },
+      { name: "我的足迹", url: "user-goods-browse", count: 0 },
+      { name: "我的积分", url: "user-integral", count: 0 },
+    ],
     user_order_status_list: [
       { name: "待付款", status: 1, count: 0 },
       { name: "待发货", status: 2, count: 0 },
@@ -102,13 +106,21 @@ Page({
             }
           }
 
+          // 头部导航总数
+          var temp_head_nav_list = this.data.head_nav_list;
+          temp_head_nav_list[0]['count'] = ((data.user_order_count || 0) == 0) ? 0 : data.user_order_count;
+          temp_head_nav_list[1]['count'] = ((data.user_goods_favor_count || 0) == 0) ? 0 : data.user_goods_favor_count;
+          temp_head_nav_list[2]['count'] = ((data.user_goods_browse_count || 0) == 0) ? 0 : data.user_goods_browse_count;
+          temp_head_nav_list[3]['count'] = ((data.integral || 0) == 0) ? 0 : data.integral;
+
           this.setData({
             user_order_status_list: temp_user_order_status_list,
             customer_service_tel: data.customer_service_tel || null,
             common_user_center_notice: data.common_user_center_notice || null,
             avatar: (data.avatar != null) ? data.avatar : this.data.avatar,
             nickname: (data.nickname != null) ? data.nickname : this.data.nickname,
-            integral: (data.integral != null) ? data.integral : this.data.integral,
+            message_total: ((data.common_message_total || 0) == 0) ? 0 : data.common_message_total,
+            head_nav_list: temp_head_nav_list,
           });
         } else {
           my.showToast({

service/Application/Api/Controller/UserController.class.php

@@ -3,6 +3,8 @@
 namespace Api\Controller;
 
 use Service\OrderService;
+use Service\GoodsService;
+use Service\MessageService;
 
 /**
  * 用户
@@ -237,18 +239,39 @@ class UserController extends CommonController
         // 登录校验
         $this->Is_Login();
 
+        // 订单总数
+        $where = ['user_id'=>$this->user['id'], 'is_delete_time'=>0, 'user_is_delete_time'=>0];
+        $user_order_count = OrderService::OrderTotal($where);
+
+        // 商品收藏总数
+        $where = ['user_id'=>$this->user['id']];
+        $user_goods_favor_count = GoodsService::GoodsFavorTotal($where);
+
+        // 商品浏览总数
+        $where = ['user_id'=>$this->user['id']];
+        $user_goods_browse_count = GoodsService::GoodsBrowseTotal($where);
+
+        // 未读消息总数
+        $params = ['user'=>$this->user, 'is_more'=>1, 'is_read'=>0];
+        $common_message_total = MessageService::UserMessageTotal($params);
+        $common_message_total = ($common_message_total > 99) ? '99+' : $common_message_total;
+
         // 用户订单状态
         $user_order_status = OrderService::OrderStatusStepTotal(['user_type'=>'user', 'user'=>$this->user, 'is_comments'=>1]);
 
         // 初始化数据
         $result = array(
-            'integral'                          => $this->user['integral'],
+            'integral'                          => (int) $this->user['integral'],
             'avatar'                            => $this->user['avatar'],
             'nickname'                          => $this->user['nickname'],
             'username'                          => $this->user['username'],
-            'customer_service_tel'              => MyC('common_customer_service_tel'),
+            'customer_service_tel'              => MyC('common_app_mini_alipay_customer_service_tel'),
             'common_user_center_notice'         => MyC('common_user_center_notice'),
             'user_order_status'                 => $user_order_status['data'],
+            'user_order_count'                  => $user_order_count,
+            'user_goods_favor_count'            => $user_goods_favor_count,
+            'user_goods_browse_count'           => $user_goods_browse_count,
+            'common_message_total'              => $common_message_total,
         );
 
         // 返回数据