From f471d0b55a455a73161f9758eeff3f59905a55c2 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 24 Jan 2019 10:00:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appmini/old/alipay/components/slider/slider.acss   |  9 ++++++++-
 public/appmini/old/alipay/pages/cart/cart.js           | 10 ++++++++--
 .../old/alipay/pages/goods-detail/goods-detail.js      |  2 +-
 .../appmini/old/weixin/components/slider/slider.wxss   |  6 ++++--
 .../old/weixin/pages/goods-detail/goods-detail.js      |  8 ++++----
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/public/appmini/old/alipay/components/slider/slider.acss b/public/appmini/old/alipay/components/slider/slider.acss
index c3a6ff6f0..07c9c0fc5 100755
--- a/public/appmini/old/alipay/components/slider/slider.acss
+++ b/public/appmini/old/alipay/components/slider/slider.acss
@@ -1,3 +1,10 @@
 .banner {
-    height: 320rpx!important;
+  background: #fff;
+  margin-bottom: 20rpx;
+}
+.banner image {
+  min-width: 100%;
+}
+.banner, .banner image {
+  height: 320rpx !important;
 }
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/cart/cart.js b/public/appmini/old/alipay/pages/cart/cart.js
index 298c18bea..36db0d74d 100755
--- a/public/appmini/old/alipay/pages/cart/cart.js
+++ b/public/appmini/old/alipay/pages/cart/cart.js
@@ -20,10 +20,11 @@ Page({
     var user = app.GetUserInfo(this, "init");
     if (user != false) {
       // 用户未绑定用户则转到登录页面
+      var msg = (user == false) ? '授权用户信息' : '绑定手机号码';
       if ((user.mobile || null) == null) {
         my.confirm({
           title: '温馨提示',
-          content: '绑定手机号码',
+          content: msg,
           confirmButtonText: '确认',
           cancelButtonText: '暂不',
           success: (result) => {
@@ -31,8 +32,13 @@ Page({
               my.navigateTo({
                 url: "/pages/login/login?event_callback=init"
               });
+            } else {
+              this.setData({
+                data_list_loding_status: 0,
+                data_bottom_line_status: false,
+                data_list_loding_msg: '请先' + msg,
+              });
             }
-            this.get_data();
           },
         });
       } else {
diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
index 766912249..c133e7270 100755
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
@@ -335,7 +335,7 @@ Page({
           }
         }
       }
-      this.setData({goods_specifications_choose: temp_data, goods_spec_base_images: temp_images, temp_buy_number: 1});
+      this.setData({goods_specifications_choose: temp_data, goods_spec_base_images: temp_images, temp_buy_number: this.data.goods.buy_min_number || 1});
 
       // 不能选择规格处理
       this.goods_specifications_choose_handle_dont(key);
diff --git a/public/appmini/old/weixin/components/slider/slider.wxss b/public/appmini/old/weixin/components/slider/slider.wxss
index 9feda56c4..07c9c0fc5 100755
--- a/public/appmini/old/weixin/components/slider/slider.wxss
+++ b/public/appmini/old/weixin/components/slider/slider.wxss
@@ -1,8 +1,10 @@
 .banner {
-  height: 320rpx!important;
   background: #fff;
   margin-bottom: 20rpx;
 }
 .banner image {
-  width: 100%;
+  min-width: 100%;
+}
+.banner, .banner image {
+  height: 320rpx !important;
 }
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
index 2c8c5a4d4..a2614eae1 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
@@ -83,7 +83,7 @@ Page({
               goods_specifications_choose: data.goods.specifications.choose || [],
               goods_content_app: data.goods.content_app,
               temp_buy_number: data.goods.buy_min_number || 1,
-              goods_favor_text: (data.goods.is_favor == 1) ? '已收藏' : '收藏',
+              goods_favor_text: (data.goods.is_favor == 1) ? '已收藏' : '收藏',
               goods_favor_icon: '/images/goods-detail-favor-icon-' + data.goods.is_favor+'.png',
               nav_submit_text: ((data.common_order_is_booking || 0) == 0) ? '立即购买' : '立即预约',
               data_bottom_line_status: true,
@@ -101,7 +101,7 @@ Page({
 
             if (data.goods.is_shelves != 1) {
               this.setData({
-                nav_submit_text: '商品已下架',
+                nav_submit_text: '商品已下架',
                 nav_submit_is_disabled: true,
               });
             } else {
@@ -225,7 +225,7 @@ Page({
             var status = (this.data.goods.is_favor == 1) ? 0 : 1;
             this.setData({
               'goods.is_favor': status,
-              goods_favor_text: (status == 1) ? '已收藏' : '收藏',
+              goods_favor_text: (status == 1) ? '已收藏' : '收藏',
               goods_favor_icon: '/images/goods-detail-favor-icon-'+status+'.png'
             });
             app.showToast(res.data.msg, "success");
@@ -309,7 +309,7 @@ Page({
           }
         }
       }
-      this.setData({ goods_specifications_choose: temp_data, goods_spec_base_images: temp_images, temp_buy_number: 1});
+      this.setData({ goods_specifications_choose: temp_data, goods_spec_base_images: temp_images, temp_buy_number: this.data.goods.buy_min_number || 1});
 
       // 不能选择规格处理
       this.goods_specifications_choose_handle_dont(key);