category

.gitignore

@@ -8,8 +8,8 @@ temp
 Logs
 logs
 *.lock
-Upload
-upload
+#Upload
+#upload
 Cache
 cache
-.tea
+.tea

alipay/app.acss

@@ -22,7 +22,7 @@ textarea {
 /* 导航分割 */
 .spacing-nav-title {
     position: relative;
-    color: #ff6482;
+    color: #d2364c;
     text-align: center;
     background-color: #ffffff;
     height: 80rpx;
@@ -32,7 +32,7 @@ textarea {
     display: inline-block;
     width: 50%;
     height: 1px;
-    background: #ff6482;
+    background: #d2364c;
     position: absolute;
     left: 50%;
     top: 50%;
@@ -104,7 +104,7 @@ textarea {
 .dis-none { display: none; }
 .dis-block { display: block; }
 
-.cr-main { color: #ff6482; }
+.cr-main { color: #d2364c; }
 .cr-666 { color: #666; }
 .cr-888 { color: #888; }
 .cr-ccc { color: #ccc; }
@@ -114,7 +114,7 @@ textarea {
     font-size: 38rpx;
     color: #fff;
     border: none;
-    background-color:#ff6482;
+    background-color:#d2364c;
     border-radius: 2px;
 }
 .my-btn-default.btn-disabled{
@@ -199,19 +199,19 @@ textarea {
     position: fixed;
     left: 0;
     bottom: 0;
-    background: #ff6482;
+    background: #d2364c;
     color: #fff;
     border: none;
     width: 100%;
 }
 
 .bg-main {
-    background: #ff6482;
+    background: #d2364c;
     color: #fff;
     border: 0;
 }
 .bg-active-main {
-    background: #ff6482 !important;
+    background: #d2364c !important;
     color: #fff !important;
 }
 

alipay/app.js

@@ -46,7 +46,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/app.json

@@ -2,6 +2,7 @@
   "pages": [
     "pages/index/index",
     "pages/goods-category/goods-category",
+    "pages/cart/cart",
     "pages/user/user",
     "pages/web-view/web-view",
     "pages/login/login",
@@ -23,7 +24,7 @@
   ],
   "window": {
     "defaultTitle": "ShopXO电商系统",
-    "titleBarColor": "#ff6482"
+    "titleBarColor": "#d2364c"
   },
   "tabBar": {
     "textColor": "#8a8a8a",
@@ -38,10 +39,16 @@
       },
       {
         "pagePath": "pages/goods-category/goods-category",
-        "icon": "/images/nav-icon-answer.png",
-        "activeIcon": "/images/nav-icon-answer-active.png",
+        "icon": "/images/nav-icon-category.png",
+        "activeIcon": "/images/nav-icon-category-active.png",
         "name": "分类"
       },
+      {
+        "pagePath": "pages/cart/cart",
+        "icon": "/images/nav-icon-cart.png",
+        "activeIcon": "/images/nav-icon-cart-active.png",
+        "name": "购物车"
+      },
       {
         "pagePath": "pages/user/user",
         "icon": "/images/nav-icon-user.png",

alipay/pages/cart/cart.axml

@@ -0,0 +1,3 @@
+<view>
+  New Page
+</view>

alipay/pages/cart/cart.js

@@ -0,0 +1,4 @@
+Page({
+  data: {},
+  onLoad() {},
+});

alipay/pages/cart/cart.json

@@ -0,0 +1 @@
+{}

alipay/pages/goods-category/goods-category.acss

@@ -1,14 +1,20 @@
 .content {
     border-left: 1px solid #eee;
-    height: 100vh;
-    box-sizing: border-box
-}
-.content-items .title {
-    font-size: 32rpx;
-    line-height: 68rpx;
+    box-sizing: border-box;
+    overflow: hidden;
+    padding-bottom: 120rpx;
 }
 .content-items {
     float: left;
     width: calc(33.33% - 20rpx);
-    padding: 10rpx;
+    padding: 20rpx 10rpx;
+    text-align: center;
+}
+.content-items .text {
+    font-size: 28rpx;
+    line-height: 46rpx;
+}
+.content-items .icon {
+    width: 120rpx;
+    height: 120rpx;
 }

alipay/pages/goods-category/goods-category.axml

@@ -1,21 +1,21 @@
-<view>
-  <vtabs
-    tabs="{{tabs}}"
-    onChange="change_event"
-    activeTab="{{tab_active}}"
-    tabBarActiveTextColor="{{tab_active_text_color}}"
-    tabBarlineColor="{{tab_active_line_color}}"
-  >
-    <block a:for="{{tabs}}">
-      <vtab-content anchor="{{item.anchor}}">
-        <view class="content">
-          <block a:if="{{content.items.length > 0}}">
-            <view a:for="{{content.items}}" a:for-item="v" class="content-items">
-              <view class="title single-text">{{v.name}}</view>
-            </view>
+<vtabs
+  tabs="{{data_list}}"
+  onTabClick="handle_event"
+  onChange="change_event"
+  activeTab="{{tab_active}}"
+  tabBarActiveTextColor="{{tab_active_text_color}}"
+  tabBarlineColor="{{tab_active_line_color}}"
+>
+  <block a:for="{{data_list}}">
+    <vtab-content anchor="{{item.anchor}}">
+      <view class="content">
+        <block a:if="{{item.items.length > 0}}">
+          <view a:for="{{item.items}}" a:for-item="v" class="content-items" data-value="{{vs.id}}" onTap="category_event">
+            <image a:if="{{v.icon != null}}" src="{{v.icon}}" mode="aspectFit" class="icon" />
+            <view class="text single-text">{{v.name}}</view>
           </view>
-        </view>
-      </vtab-content>
-    </block>
-  </vtabs>
-</view>
+        </block>
+      </view>
+    </vtab-content>
+  </block>
+</vtabs>

alipay/pages/goods-category/goods-category.js

@@ -4,8 +4,6 @@ Page({
     tab_active: 0,
     tab_active_text_color: '#d2364c',
     tab_active_line_color: '#d2364c',
-    tabs: [],
-    content: [],
     data_list_loding_status: 1,
     data_bottom_line_status: false,
     data_list: [],
@@ -35,18 +33,17 @@ Page({
       data: this.data.params,
       dataType: "json",
       success: res => {
+        my.stopPullDownRefresh();
         if (res.data.code == 0) {
             var data = res.data.data;
             
             // tabs
-            var temp_tabs = [];
             for(var i in data) {
-              temp_tabs[i] = {"title": data[i]['name']};
+              data[i]['title'] = data[i]['name'];
+              data[i]['anchor'] = data[i]['id'];
             }
 
             this.setData({
-              tabs: temp_tabs,
-              content: data.length == 0 ? [] : data[0],
               data_list: data,
               data_list_loding_status: data.length == 0 ? 0 : 3,
               data_bottom_line_status: true,
@@ -64,6 +61,7 @@ Page({
           }
       },
       fail: () => {
+        my.stopPullDownRefresh();
         this.setData({
           data_list_loding_status: 2,
           data_bottom_line_status: true,
@@ -77,13 +75,27 @@ Page({
     });
   },
 
+  // 下拉刷新
+  onPullDownRefresh() {
+    this.init();
+  },
+
+  // 处理事件
+  handle_event(index) {
+    this.setData({
+      tab_active: index,
+    });
+  },
+
   // tab改变
   change_event(index) {
     this.setData({
       tab_active: index,
-      content: this.data.data_list[index],
     });
-
-    console.log('onChange', index, this.data.content);
   },
+
+  // 事件
+  category_event(e) {
+    my.navigateTo({url: '/pages/goods-search/goods-search?category_id='+e.target.dataset.value});
+  }
 });

alipay/pages/goods-category/goods-category.json

@@ -1,5 +1,4 @@
 {
-  "defaultTitle": "小程序AntUI组件库",
   "usingComponents": {
     "vtabs": "mini-antui/es/vtabs/index",
     "vtab-content": "mini-antui/es/vtabs/vtab-content/index"