Merge branch 'dev' into 'test'

qa返回的bug修复 See merge request !683

Merge branch 'dev' into 'test'
qa返回的bug修复 See merge request !683
后端研发-苏明海
2 parents 8be79450 40e1a6ff
Showing 7 changed files with 19 additions and 18 deletions
components/diy_store_select/diy_store_select.wxss
pages/goods/goodsInfo/goodsInfo.wxss
pages/index/index/index.wxss
pages/team/team_show/team_show.js
pages/team/team_show/team_show.wxml
pages/team/team_show/team_show.wxss
pages/team/team_success/team_success.js
@@ -57,7 +57,7 @@
 	background: white;
 	width: 100%;
 	border-radius: 20rpx 20rpx 0 0;
-	height: 72%;
+	height: auto;
 }
@@ -102,9 +102,10 @@
 .store-list {
 	width: 95%;
-	height: 72%;
+	max-height: 610rpx;
 	overflow-y: scroll;
 	margin: auto;
+  min-height: 300rpx; 
 }
 .store-list .store_choose {
@@ -161,7 +162,7 @@
 .store-bottom {
 	width: 85%;
 	margin: auto;
-	height: 70rpx;
+	height: 90rpx;
 }
 .determine {
@@ -2430,13 +2430,12 @@ height: 91.9%;
 }
 .popup-frame{
-  position: fixed;
-bottom:99rpx;
+position: fixed;
 z-index: 20;
 background: white;
 width: 100%;
 border-radius: 20rpx 20rpx 0 0;
-height: 72%;
+height: auto;
 bottom: 0;
 }
 .popup-top{
@@ -2474,9 +2473,10 @@ bottom: 0;
 }
 .store-list{
   width: 95%;
-  height: 72%;
+  min-height: 300rpx;
   overflow-y: scroll;
   margin: auto;
+  max-height: 610rpx;
 }
 .store-list .store_choose{
   width: 100%;
@@ -2524,7 +2524,7 @@ line-height: 38rpx;
  .store-bottom{
    width: 85%;
    margin: auto;
-   height: 70rpx;
+   height: 90rpx;
  }
  .determine{
    width: 260rpx;
@@ -291,6 +291,7 @@
 	overflow: hidden;
 	font-size: 26rpx;
 	width: 200rpx;
+	word-break: break-all;
 }
 .seckill-list view.imgview {
@@ -514,7 +515,7 @@
 }
 .seckill-lists {
-	/* line-height: 30rpx; */
+	line-height: 14rpx;
 }
 .xc-marfin-right {
@@ -1087,7 +1087,7 @@ Page({
 	  var th = this,that=this;
 	  var timer_get = setInterval(function() {
 	    if (th.data.is_get_local_ok == 0) return false;
-	    if (th.data.goods) return false;
+	    if (!th.data.goods) return false;
 	    var dd = null,
 	        i = getApp().request;
 	    var g_distr_type = th.data.goods.distr_type;
@@ -401,7 +401,7 @@
            <text class="fs32 nearby_store">门店分类选择</text>
            <view>
               <view><icon bindtap="close_popup" class="modal-closes" color="black" size="22"  type="cancel"></icon></view>
-              <view class="felx choose_mores" bindtap="returns"><text class="fs26 red-co">返回--{{sort_store}}</text></view>
+              <view class="felx choose_mores" bindtap="returns"><text class="fs26 red-co">返回</text></view>
            </view>
          </view>
          <view class="sort_store_list"> 
@@ -2033,7 +2033,7 @@ page {
 	background: white;
 	width: 100%;
 	border-radius: 20rpx 20rpx 0 0;
-	height: 72%;
+	height: auto;
 }
 .popup-top{
@@ -2096,9 +2096,10 @@ page {
 .store-list{
   width: 95%;
-  height: 72%;
+  min-height:300rpx;
   overflow-y: scroll;
-  margin: auto;
+	margin: auto;
+	max-height: 610rpx;
 }
 .store-list .store_choose{
@@ -2135,7 +2136,7 @@ page {
 .store-bottom{
   width: 85%;
   margin: auto;
-  height: 70rpx;
+  height: 90rpx;
  }
  .determine{
@@ -464,14 +464,12 @@ Page({
 						context.fillText('强烈推荐', 152 * unit + width + 20 * unit, 76 * unit);
 					}
-					
-                   
                     //---产品名称---
                     context.setFontSize(21.3 * unit);
                     context.setFillStyle("black");
                     th.draw_Text(context, th.data.goods.goods_name,
-                        40 * unit, 180 * unit, 200 * unit, 380 * unit);
+                        38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
                     //------产品的价格-------
                     context.setFontSize(24 * unit)
                     context.setFillStyle("red")