From 9c45b046e3ba12c4e4921c1becb0db3e87f9b0a8 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Sat, 24 Nov 2018 02:02:11 +0800
Subject: [PATCH] order

---
 alipay/app.js                               |  2 +-
 alipay/app.json                             |  4 +-
 alipay/pages/goods-search/goods-search.acss | 46 ++++++++++-----------
 alipay/pages/user-order/user-order.acss     |  6 +--
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/alipay/app.js b/alipay/app.js
index 96d26b5fa..63e19ff24 100755
--- a/alipay/app.js
+++ b/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电商系统",
diff --git a/alipay/app.json b/alipay/app.json
index 8ea78a510..c851a018e 100755
--- a/alipay/app.json
+++ b/alipay/app.json
@@ -1,5 +1,5 @@
 {
-  "pages": ["pages/user-order/user-order",
+  "pages": [
     "pages/index/index",
     "pages/goods-category/goods-category",
     "pages/cart/cart",
@@ -15,7 +15,7 @@
 
     "pages/user-address/user-address",
     "pages/user-address-save/user-address-save",
-    
+    "pages/user-order/user-order",
     "pages/user-order-detail/user-order-detail",
     "pages/user-faovr/user-faovr",
     "pages/user-answer-list/user-answer-list",
diff --git a/alipay/pages/goods-search/goods-search.acss b/alipay/pages/goods-search/goods-search.acss
index 9744f0c48..4c0158677 100755
--- a/alipay/pages/goods-search/goods-search.acss
+++ b/alipay/pages/goods-search/goods-search.acss
@@ -1,3 +1,26 @@
+/**
+ * 排序导航
+ */
+ .nav-sort {
+   background: #eee;
+ }
+.nav-sort-content .item {
+  height: 80rpx;
+  line-height: 80rpx;
+  width: 160rpx;
+}
+.nav-sort-content .item .icon {
+  width: 30rpx;
+  height: 30rpx;
+}
+.screening-submit {
+  width: 50rpx;
+  height: 50rpx;
+  position: absolute;
+  top: 15rpx;
+  right: 20rpx;
+}
+
 /**
  * 商品列表
  */
@@ -70,27 +93,4 @@
   left: 0;
   bottom: 0;
   border-radius: 0;
-}
-
-/**
- * 排序导航
- */
- .nav-sort {
-   background: #eee;
- }
-.nav-sort-content .item {
-  height: 80rpx;
-  line-height: 80rpx;
-  width: 160rpx;
-}
-.nav-sort-content .item .icon {
-  width: 30rpx;
-  height: 30rpx;
-}
-.screening-submit {
-  width: 50rpx;
-  height: 50rpx;
-  position: absolute;
-  top: 15rpx;
-  right: 20rpx;
 }
\ No newline at end of file
diff --git a/alipay/pages/user-order/user-order.acss b/alipay/pages/user-order/user-order.acss
index 5bca32ff1..eb8caec1c 100755
--- a/alipay/pages/user-order/user-order.acss
+++ b/alipay/pages/user-order/user-order.acss
@@ -3,8 +3,8 @@
  */
 .nav {
   background: #eee;
-  height: 70rpx;
-  line-height: 70rpx;
+  height: 80rpx;
+  line-height: 80rpx;
 }
 .nav .item {
   width: 16.66%;
@@ -14,7 +14,7 @@
  * 列表
  */
 .scroll-box{
-    height: calc(100vh - 70rpx);
+    height: calc(100vh - 80rpx);
 }
 .goods-base {
   min-height: 160rpx;
-- 
GitLab