From 0de6eabb231cf490d683c209e10f7c76777f5127 Mon Sep 17 00:00:00 2001
From: F5VT98DI7XY4X12\Administrator <765199919@qq.com>
Date: Wed, 4 Sep 2019 21:40:12 +0800
Subject: [PATCH] 参团商品名称没显示。提交订单提不了，订单总价

---
 pages/cart/cart2/cart2.js                 |  6 ++++--
 pages/cart/cart2_pt/cart2_pt.js           |  9 ++++++---
 pages/team/team_show/team_show.wxml       | 14 +++++++++++---
 pages/team/team_show/team_show.wxss       |  6 ++----
 pages/user/order_detail/order_detail.wxml |  2 +-
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 13a8eb4..c7af1cb 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -683,7 +683,9 @@ Page({
       console.log("buy_new");
 
       if(th.data.bn_exp_type == 0 && th.data.user_addr==null ){ 
-          ff = false; getApp().confirmBox("请新建收货地址"); }
+          ff = false; getApp().my_warnning("请选择收货地址",0,th); 
+         this.data.is_summit_ing = 0;
+      }
       if (!ff) return false;
       var addr = th.data.user_addr;
       if (th.data.bn_exp_type == 1) addr=null;
@@ -694,7 +696,7 @@ Page({
 
       if(th.data.bn_exp_type==0)
         if(th.data.wu_arr==null ||  th.data.wu_arr.length<=0){
-          getApp().confirmBox("读取物流失败");
+          getApp().my_warnning("读取物流失败",0,th);
           return false;
         }
 
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index dc2f8a5..7d7ffab 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -341,8 +341,10 @@ Page({
         //------------立即购买-------------
         console.log("buy_new");
 
-        if(th.data.bn_exp_type == 0 && th.data.user_addr==null ){ ff = false; 
-           getApp().confirmBox("请新建收货地址");
+        if(th.data.bn_exp_type == 0 && th.data.user_addr==null ){
+           ff = false; 
+           getApp().my_warnning("请选择收货地址",0,this);
+           this.data.is_summit_ing = 0;
         }
         if (!ff) return false;
         var addr = th.data.user_addr;
@@ -354,7 +356,8 @@ Page({
 
         if(th.data.bn_exp_type==0) {
           if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) {
-            getApp().confirmBox("读取物流失败");
+            getApp().my_warnning("读取物流失败",0,this);
+            this.data.is_summit_ing = 0;
             return false;
           }
         }
diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml
index 45abbfc..0b737c9 100644
--- a/pages/team/team_show/team_show.wxml
+++ b/pages/team/team_show/team_show.wxml
@@ -184,11 +184,19 @@
   <view class='buy-option'>
     <!--头部图片-->
     <view class='buy-top'>
-      <view class='buy-image'>
+      <view class='buy-image mimg'>
         <image src='{{image}}'></image>
-        <span class='t1'>¥</span>
-        <text class='t2'>{{teamlist.price}}</text>
+        <view style='float:left'>
+           <view>
+            <span class='t1'>¥</span><text class='t2'>{{teamlist.price}}</text>
+           </view> 
+           <view class="ellipsis-1">
+               {{goods.goods_name}}
+           </view>
+        </view>
+
       </view>
+
       <view class='buy-cou' bindtap='cbcou'>⊗</view>
       <view class='clear'></view>
     </view>
diff --git a/pages/team/team_show/team_show.wxss b/pages/team/team_show/team_show.wxss
index 6b3eba4..22a214a 100644
--- a/pages/team/team_show/team_show.wxss
+++ b/pages/team/team_show/team_show.wxss
@@ -589,7 +589,6 @@ flex-grow:1.7;
 }
 
 .buy-image text {
-  float: left;
   margin-left: 10rpx;
   color: red;
 }
@@ -709,7 +708,7 @@ flex-grow:1.7;
 
 .buy-image {
   margin-right: 20rpx;
-  width: 320rpx;
+  width: 630rpx;
   height: 200rpx;
   float: left;
 }
@@ -722,8 +721,8 @@ flex-grow:1.7;
   margin-right: 16rpx;
 }
 
+
 .buy-image text {
-  float: left;
   margin-left: 10rpx;
   color: red;
 }
@@ -742,7 +741,6 @@ flex-grow:1.7;
 }
 
 .t1 {
-  float: left;
   font-size: 28rpx;
   padding-left: 4rpx;
   color: red;
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index 2bc619b..9ebf674 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -99,7 +99,7 @@
                 <view>￥ {{order.order_prom_amount}}元</view>
             </view>
           
-            <view class="item" wx:if="{{order.pt_tail_money>0}}">
+            <view class="item">
               <view>订单总价</view>
               <view>￥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money)}}元</view>
             </view>
--
libgit2 0.21.4