From fa1bc1cf631668c83d1cae144a8b5c65c3cd47d6 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 17 Oct 2019 16:08:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=8A=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../old/alipay/pages/goods-detail/goods-detail.acss        | 7 +++++--
 .../appmini/old/baidu/pages/goods-detail/goods-detail.css  | 7 +++++--
 public/appmini/old/weixin/app.js                           | 2 +-
 public/appmini/old/weixin/app.json                         | 4 ++--
 .../appmini/old/weixin/pages/goods-detail/goods-detail.js  | 2 +-
 .../old/weixin/pages/goods-detail/goods-detail.wxss        | 7 +++++--
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
index 0895ec716..318d88496 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
@@ -277,7 +277,7 @@
   padding: 20rpx 10rpx;
 }
 .coupon-container scroll-view {
-  height: 174rpx;
+  height: 179rpx;
 }
 .coupon-container .item {
   display: inline-block;
@@ -292,8 +292,11 @@
 .coupon-container .item,
 .coupon-container .v-right,
 .coupon-container .v-right .circle {
-  height: 170rpx;
+  height: 175rpx;
 }
 .coupon-container .v-left .base .price {
   font-size: 46rpx;
+}
+.coupon-container .v-left .desc {
+  margin-top: 5rpx;
 }
\ No newline at end of file
diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.css b/public/appmini/old/baidu/pages/goods-detail/goods-detail.css
index bfbaf1910..e076a3c03 100755
--- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.css
+++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.css
@@ -306,7 +306,7 @@
   padding: 20rpx 10rpx;
 }
 .coupon-container scroll-view {
-  height: 174rpx;
+  height: 179rpx;
 }
 .coupon-container .item {
   display: inline-block;
@@ -321,8 +321,11 @@
 .coupon-container .item,
 .coupon-container .v-right,
 .coupon-container .v-right .circle {
-  height: 170rpx;
+  height: 175rpx;
 }
 .coupon-container .v-left .base .price {
   font-size: 46rpx;
+}
+.coupon-container .v-left .desc {
+  margin-top: 5rpx;
 }
\ No newline at end of file
diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js
index 54a82a2b5..b88af12f9 100755
--- a/public/appmini/old/weixin/app.js
+++ b/public/appmini/old/weixin/app.js
@@ -67,7 +67,7 @@ App({
     // 请求地址
     request_url: "{{request_url}}",
      request_url: 'http://tp5-dev.com/',
-    // request_url: 'https://test.shopxo.net/',
+     request_url: 'https://test.shopxo.net/',
 
     // 基础信息
     application_title: "{{application_title}}",
diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json
index c9b79e035..a48234485 100755
--- a/public/appmini/old/weixin/app.json
+++ b/public/appmini/old/weixin/app.json
@@ -1,5 +1,5 @@
 {
-  "pages": ["pages/goods-detail/goods-detail",
+  "pages": [
     "pages/index/index",
     "pages/goods-category/goods-category",
     "pages/cart/cart",
@@ -8,7 +8,7 @@
     "pages/login/login",
     "pages/paytips/paytips",
     "pages/goods-search/goods-search",
-    
+    "pages/goods-detail/goods-detail",
     "pages/goods-comment/goods-comment",
     "pages/goods-attribute/goods-attribute",
     "pages/buy/buy",
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 e0932bbaf..240e0b280 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
@@ -69,7 +69,7 @@ Page({
     params = app.launch_params_handle(params);
     
     // 参数赋值,初始化
-    params['goods_id']=2;
+    //params['goods_id']=2;
     this.setData({params: params});
     this.init();
   },
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
index 7da1b3dda..3d924c2f9 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
@@ -301,7 +301,7 @@
   padding: 20rpx 10rpx;
 }
 .coupon-container scroll-view {
-  height: 174rpx;
+  height: 179rpx;
 }
 .coupon-container .item {
   display: inline-block;
@@ -316,8 +316,11 @@
 .coupon-container .item,
 .coupon-container .v-right,
 .coupon-container .v-right .circle {
-  height: 170rpx;
+  height: 175rpx;
 }
 .coupon-container .v-left .base .price {
   font-size: 46rpx;
+}
+.coupon-container .v-left .desc {
+  margin-top: 5rpx;
 }
\ No newline at end of file