套装内容调整

packageUser/pages/user/order/order.wxml

@@ -31,18 +31,26 @@
 	        <h6 class="ellipsisLn">
 	        	<b style="color:#F00" wx:if="{{item.send}}">[赠品]</b>
 	        {{item.product_name}}</h6>
-	        <view class="order-info__title ellipsisLn">{{item.color_name}} {{item.size_name}}</view>
+	        <view class="order-info__title ellipsisLn" wx:if="{{item.color_name || item.size_name}}">{{item.color_name}} {{item.size_name}}</view>
 	<!--         <view class="order-info__type ellipsis">{{item.detail}}</view> -->
+			<view class="project-pack-list" wx:if="{{item.package}}">
+				<view wx:for="{{item.package_list}}" wx:for-item="pack" wx:for-index="ind">
+					<p>{{pack.item_title}} x{{pack.nums}}</p>
+				</view>
+			</view>
+	
 	        <view class="order-info__price" wx:if="{{order.order_type == 3}}">
 	          <text style="    color: #eab86a;font-size: 24rpx;" wx:if="{{order.status === 'unpay'}}">{{item.price / 100}} 积分</text>
 	          <text style="    color: #eab86a;font-size: 24rpx;" wx:if="{{order.status !== 'unpay'}}">{{item.price / 100}} 积分</text>
+			  <view class="order-info__count">x{{item.count}}</view>
 	        </view>
 	        <view class="order-info__price" wx:else>
 	        	<currency symbol="￥" value="{{item.price}}" wx:if="{{order.status === 'unpay'}}" />
 	          <currency symbol="￥" value="{{item.price}}" wx:if="{{order.status !== 'unpay'}}" />
+			  <view class="order-info__count">x{{item.count}}</view>
 	        </view>
 	        
-	        <view class="order-info__count">x{{item.count}}</view>
+	        
 			<view wx:if="{{!item.commend}}" class="order-btn__black">
 				<navigator url="/packageUser/pages/user/comment/comment?id={{item.id}}&pid={{item.product_id}}" open-type="navigate">商品评论 </navigator>
 			</view>

packageUser/pages/user/order/order.wxss

@@ -45,28 +45,28 @@
 }
 .order-main {
   width: 710rpx;
-  height: 200rpx;
   background-color: #fcfcfc;
   margin-bottom:5px;
+  overflow: hidden;
 }
 .order-main__left {
   width: 200rpx;
   height: 200rpx;
-  display: block;
-  float: left;
+  display: inline-block;
+      vertical-align: top;
 }
 .order-main__right {
   position: relative;
-  width: 490rpx;
-  height: 200rpx;
-  float: right;
+      width: 490rpx;
+      height: 200rpx;
+      /* float: right; */
+      display: inline-block;
 }
 .order-info__title {
   color: #4c4c4c;
   padding-top: 5rpx;
   font-size: 24rpx;
   line-height: 36rpx;
-  height: 72rpx;
   -webkit-line-clamp: 2;
 }
 .order-info__type {
@@ -75,9 +75,6 @@
   color: #bbbbbb;
 }
 .order-info__price {
-  position: absolute;
-  bottom: 16rpx;
-  left: 0;
   font-size: 24rpx;
   color: #eab86a;
 }
@@ -85,11 +82,10 @@
   color: #bbbbbb;
 }
 .order-info__count {
-  /* position: absolute; */
-  bottom: 16rpx;
-  right: 0;
   font-size: 24rpx;
   color: #bbbbbb;
+  padding-left: 15rpx;
+  display: inline;
 }
 .orderDetail-project {
   padding: 20rpx;
@@ -239,4 +235,12 @@ font-size: 14px;
   margin-top: -15rpx;
   margin-left: 20rpx;
   border-radius: 5rpx;
+}
+
+.project-pack-list{
+	    background: #f7f7f7;
+	    font-size: 24rpx;
+	    padding: 15rpx;
+	    line-height: 36rpx;
+	    color: #666;
 }

packageUser/pages/user/orders/orders.wxml

@@ -22,16 +22,25 @@
           <view class="order-main__right">
             <view class="order-info__title ellipsisLn"><b style="color:#F00" wx:if="{{nitem.send}}">[赠品]</b>{{nitem.product_name}} <span wx:if="{{nitem.color_name || nitem.size_name}}">|</span> {{nitem.color_name}} {{nitem.size_name}}</view>
             <!-- <view class="order-info__type ellipsis">{{nitem.detail}}</view> -->
+			<view class="project-pack-list" wx:if="{{nitem.package}}">
+				<view wx:for="{{nitem.package_list}}" wx:for-item="pack" wx:for-index="ind">
+					<p>{{pack.item_title}} x{{pack.nums}}</p>
+				</view>
+			</view>
               <view class="order-info__price" wx:if="{{item.order_type == 3}}">
 			          <text style="    color: #eab86a;font-size: 24rpx;" wx:if="{{item.status === 'unpay'}}" >{{nitem.price / 100}} 积分</text>
 			          <text style="    color: #eab86a;font-size: 24rpx;" wx:if="{{item.status !== 'unpay'}}" >{{nitem.price / 100}} 积分</text>
+					  
+					  <view class="order-info__count">x{{nitem.count}}</view>
 			        </view>
 			        <view class="order-info__price" wx:else>
 			        	<currency symbol="￥" value="{{nitem.price}}" wx:if="{{item.status === 'unpay'}}" />
               	<currency symbol="￥" value="{{nitem.price}}" wx:if="{{item.status !== 'unpay'}}" />
+				
+				<view class="order-info__count">x{{nitem.count}}</view>
 			        </view>
               <!-- <currency wx:if="{{item.status == 'unpay' || item.pay_way == 'weixinpay'}}" symbol="￥" value="{{nitem.price}}"></currency><text style="color:#bbb"> <text wx:if="{{item.status == 'unpay' || item.pay_way == 'balance'}}"> <text wx:if="{{item.status == 'unpay'}}"> 或</text> {{nitem.price}}提货券</text></text><currency symbol="￥" value="{{nitem.price}}" ></currency><text class="order-info__point">（或{{nitem.price}}提货券）</text> -->
-            <view class="order-info__count">x{{nitem.count}}</view>
+            
 			<view wx:if="{{!nitem.commend}}" class="order-btn__black" catchtap="toCommend" data-id="{{nitem.id}}" data-pid="{{nitem.product_id}}">商品评论
 				<!-- <navigator url="/packageUser/pages/user/comment/comment?id={{nitem.id}}&pid={{nitem.product_id}}" open-type="navigate">商品评论 </navigator> -->
 			</view>

packageUser/pages/user/orders/orders.wxss

@@ -76,7 +76,7 @@
   font-size: 24rpx;
   line-height: 36rpx;
   padding-top: 5rpx;
-  height: 72rpx;
+  height: 40rpx;
   -webkit-line-clamp: 2;
 }
 .order-info__type {
@@ -85,21 +85,19 @@
   color: #bbbbbb;
 }
 .order-info__price {
-  position: absolute;
-  bottom: 16rpx;
-  left: 0;
-  font-size: 24rpx;
-  color: #eab86a;
+    font-size: 24rpx;
+    color: #eab86a;
 }
 .order-info__point {
   color: #bbbbbb;
 }
 .order-info__count {
-  /* position: absolute; */
-  bottom: 16rpx;
-  right: 0;
-  font-size: 24rpx;
-  color: #bbbbbb;
+bottom: 16rpx;
+    right: 0;
+    font-size: 24rpx;
+    color: #bbbbbb;
+    display: inline;
+	padding-left: 35rpx;
 }
 .order-allprice {
   width: 100%;
@@ -156,4 +154,12 @@
   font-size: 28rpx;
   margin-top: 25rpx;
   color: #cccccc;
+}
+
+.project-pack-list{
+	    background: #f7f7f7;
+	    font-size: 24rpx;
+	    padding: 15rpx;
+	    line-height: 36rpx;
+	    color: #666;
 }

pages/areacart/areacart.wxml

@@ -45,8 +45,8 @@
 	-->	
 		<view class="cartlist" wx:for="{{cartList}}" wx:key="id">
 			<view class="main_item">
-		      <movable-area>
-		        <movable-view damping="100" out-of-bounds="true" direction="horizontal" x="{{item.movex}}" id="{{index}}" animation="false" bindchange="handleMovableChange" capture-bind:touchstart="handleTouchestart" capture-bind:touchend="handleTouchend">
+		      <movable-area style="{{item.package?'height:'+(260+item.package_list.length * 20)+'rpx':''}}">
+		        <movable-view damping="100" out-of-bounds="true" direction="horizontal" x="{{item.movex}}" id="{{index}}" animation="false" bindchange="handleMovableChange" capture-bind:touchstart="handleTouchestart" capture-bind:touchend="handleTouchend" style="{{item.package?'height:'+(260+item.package_list.length * 20)+'rpx':''}}">
 		          <view class="main_item_content ">
 		          		  <view class="cartlist_item">
 						   	  <view class="cartlist_select {{item.IsBuy ? 'active' : ''}}" bindtap="itemselected" data-count="{{item.count}}" data-id='{{item.id}}' data-price="{{item.price}}" data-index="{{index}}">
@@ -57,6 +57,11 @@
 						      </view>
 						      <view class="cartlist_info">
 						        <view class="cartlist_title">{{item.name}} <span wx:if="{{item.color_name || item.size_name}}">|</span> {{item.color_name}} {{item.size_name}}</view>
+								<view class="project-pack-list" wx:if="{{item.package}}">
+									<view wx:for="{{item.package_list}}" wx:for-item="pack" wx:for-index="ind">
+										<p>{{pack.item_title}} x{{pack.nums}}</p>
+									</view>
+								</view>
 						        <view class="cartlist_type">零售价：<currency symbol="￥" value="{{item.user_sale_price}}" /> </view>
 						        <currency class="cartlist_price" symbol="￥" value="{{item.price}}" />
 						        <view class="cartlist_num">
@@ -71,7 +76,7 @@
 		          </view>
 		        </movable-view>
 		      </movable-area>
-		      <view class="delete_btn" data-productIndex="{{index}}" data-id='{{item.id}}' bindtap="delitem"></view>
+		      <view class="delete_btn" data-productIndex="{{index}}" data-id='{{item.id}}' bindtap="delitem"  style="{{item.package?'height:'+(260+item.package_list.length * 20)+'rpx;line-height:'+(260+item.package_list.length * 20)+'rpx':''}}"></view>
 		    </view>
 	    </view>
 	</view>

pages/areacart/areacart.wxss

@@ -570,4 +570,12 @@ movable-view {
 	color: #4caf50;
 	padding: 10rpx 50rpx 10rpx;
 	    line-height: 30rpx;
+}
+.project-pack-list{
+	    background: #f7f7f7;
+	    font-size: 24rpx;
+	    padding: 15rpx;
+	    line-height: 36rpx;
+	    color: #666;
+		margin: 10rpx 0 ;
 }

pages/cart/cart.wxml

@@ -45,19 +45,26 @@
 	-->	
 		<view class="cartlist" wx:for="{{cartList}}" wx:key="id">
 			<view class="main_item">
-		      <movable-area>
-		        <movable-view damping="100" out-of-bounds="true" direction="horizontal" x="{{item.movex}}" id="{{index}}" animation="false" bindchange="handleMovableChange" capture-bind:touchstart="handleTouchestart" capture-bind:touchend="handleTouchend">
+		      <movable-area style="{{item.package?'height:'+(210+item.package_list.length * 20)+'rpx':''}}">
+		        <movable-view damping="100" out-of-bounds="true" direction="horizontal" x="{{item.movex}}" id="{{index}}" animation="false" bindchange="handleMovableChange" capture-bind:touchstart="handleTouchestart" capture-bind:touchend="handleTouchend" style="{{item.package?'height:'+(210+item.package_list.length * 20)+'rpx':''}}">
 		          <view class="main_item_content ">
 		          		  <view class="cartlist_item">
 						   	  <view class="cartlist_select {{item.IsBuy ? 'active' : ''}}" bindtap="itemselected" data-count="{{item.count}}" data-id='{{item.id}}' data-price="{{item.original_price}}" data-index="{{index}}">
 						   	  	<text class="pay-circle"></text>
-						   	  </view>
+						   	  </view> 
 						      <view class="cartlist_img">
 						        <image src="{{item.cover}}" />
 						      </view>
 						      <view class="cartlist_info">
 						        <view class="cartlist_title">{{item.product_name}} <span wx:if="{{item.color_name || item.size_name}}">|</span> {{item.color_name}} {{item.size_name}}</view>
-						        <view class="cartlist_type">---</view>
+						        
+								<view class="project-pack-list" wx:if="{{item.package}}">
+									<view wx:for="{{item.package_list}}" wx:for-item="pack" wx:for-index="ind">
+										<p>{{pack.item_title}} x{{pack.nums}}</p>
+									</view>
+								</view>
+								<view class="cartlist_type" wx:else>---</view>
+								
 						        <currency class="cartlist_price" symbol="￥" value="{{item.original_price}}" />
 						        <view class="cartlist_num">
 						        	<button bindtap="mius" data-id='{{item.id}}' data-count="{{item.count}}" data-index="{{index}}" class="mius">-</button>
@@ -70,7 +77,7 @@
 		          </view>
 		        </movable-view>
 		      </movable-area>
-		      <view class="delete_btn" data-productIndex="{{index}}" data-id='{{item.id}}' bindtap="delitem">删除</view>
+		      <view class="delete_btn" data-productIndex="{{index}}" data-id='{{item.id}}' bindtap="delitem" style="{{item.package?'height:'+(210+item.package_list.length * 20)+'rpx;line-height:'+(210+item.package_list.length * 20)+'rpx':''}}">删除</view>
 		    </view>
 	    </view>
 	</view>

pages/cart/cart.wxss

@@ -561,4 +561,12 @@ movable-view {
   font-size: 28rpx;
   text-align: center;
   line-height: 210rpx;
+}
+.project-pack-list{
+	    background: #f7f7f7;
+	    font-size: 24rpx;
+	    padding: 15rpx;
+	    line-height: 36rpx;
+	    color: #666;
+		margin: 10rpx 0 ;
 }

pages/centcart/centcart.wxml

@@ -55,8 +55,8 @@
 	-->	
 		<view class="cartlist" wx:for="{{cartList}}" wx:key="id">
 			<view class="main_item">
-		      <movable-area>
-		        <movable-view damping="100" out-of-bounds="true" direction="horizontal" x="{{item.movex}}" id="{{index}}" animation="false" bindchange="handleMovableChange" capture-bind:touchstart="handleTouchestart" capture-bind:touchend="handleTouchend">
+		      <movable-area  style="{{item.package?'height:'+(290+item.package_list.length * 20)+'rpx':''}}">
+		        <movable-view damping="100" out-of-bounds="true" direction="horizontal" x="{{item.movex}}" id="{{index}}" animation="false" bindchange="handleMovableChange" capture-bind:touchstart="handleTouchestart" capture-bind:touchend="handleTouchend"  style="{{item.package?'height:'+(290+item.package_list.length * 20)+'rpx':''}}">
 		          <view class="main_item_content ">
 		          		  <view class="cartlist_item">
 						   	  <view class="cartlist_select {{item.IsBuy ? 'active' : ''}}" bindtap="itemselected" data-count="{{item.count}}" data-id='{{item.id}}' data-price="{{item.price}}" data-index="{{index}}">
@@ -67,6 +67,11 @@
 						      </view>
 						      <view class="cartlist_info">
 						        <view class="cartlist_title">{{item.name}} <span wx:if="{{item.color_name || item.size_name}}">|</span> {{item.color_name}} {{item.size_name}}</view>
+								<view class="project-pack-list" wx:if="{{item.package}}">
+									<view wx:for="{{item.package_list}}" wx:for-item="pack" wx:for-index="ind">
+										<p>{{pack.item_title}} x{{pack.nums}}</p>
+									</view>
+								</view>
 						        <view class="cartlist_type">零售价：{{item.user_sale_price / 100}} 积分</view>
 						        <!--<currency class="cartlist_price" symbol="￥" value="{{item.price}}" />-->
 						        <text style="    color: #F44336;font-size: 32rpx;">{{item.price / 100}} 积分</text>
@@ -82,7 +87,7 @@
 		          </view>
 		        </movable-view>
 		      </movable-area>
-		      <view class="delete_btn" data-productIndex="{{index}}" data-id='{{item.id}}' bindtap="delitem"></view>
+		      <view class="delete_btn" data-productIndex="{{index}}" data-id='{{item.id}}' bindtap="delitem"  style="{{item.package?'height:'+(290+item.package_list.length * 20)+'rpx;line-height:'+(290+item.package_list.length * 20)+'rpx':''}}"></view>
 		    </view>
 	    </view>
 	</view>

pages/centcart/centcart.wxss

@@ -587,4 +587,12 @@ movable-view {
 	color: #4caf50;
 	padding: 10rpx 50rpx 10rpx;
 	    line-height: 30rpx;
+}
+.project-pack-list{
+	    background: #f7f7f7;
+	    font-size: 24rpx;
+	    padding: 15rpx;
+	    line-height: 36rpx;
+	    color: #666;
+		margin: 10rpx 0 ;
 }

pages/home/home.wxml

@@ -302,26 +302,57 @@
       <view class="newprojects-title"></view>
       <view><image src="http://fohow.oss-cn-shenzhen.aliyuncs.com/neverse/goods.png" class="newprojects-titleimg" /></view>
       <view class="projectbg">
-        <view class="project" wx:key="{{index}}" wx:for="{{productsList}}">
-         <view wx:if="{{!item.video_state}}" bindtap="toProject" data-val="{{item.id}}">
-          <view class="project-left">
-            <view class="project-title ellipsisLn">{{item.name}}</view>
+        <view wx:key="{{index}}" wx:for="{{productsList}}">
+			
+			
+        <view wx:if="{{!item.video_state}}" bindtap="toProject" data-val="{{item.id}}">
+			<view class="project-pack" wx:if="{{item.package}}">
+				<view class="project-left-pack">
+					<view class="project-title ellipsisLn" style="height: 48rpx;">{{item.name}}</view>
 
-            <view class="project-count">已售{{item.sold_count}}件</view>
-            <image wx:if="{{item.seckill_state === 'seckill'}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/miaosha.png" class="project-miaosha"/>
-            <view class="project-price" style="padding-top:20rpx;color: #999;text-decoration: line-through;font-size: 23rpx;">零售价：<currency symbol="￥" value="{{item.user_sale_price}}" /><!-- <currency symbol="￥" value="{{item.price}}" wx:if="{{balance === 0 || balance < item.price}}"></currency><text wx:if="{{balance !== 0 && balance >= item.price}}" class="project-point">{{item.price}}提货券</text> --></view>
-            <view class="project-price" style="float: left;padding-top:10rpx;width:50%;font-size: 35rpx;"><currency symbol="￥" value="{{item.price}}" /><!-- <currency symbol="￥" value="{{item.price}}" wx:if="{{balance === 0 || balance < item.price}}"></currency><text wx:if="{{balance !== 0 && balance >= item.price}}" class="project-point">{{item.price}}提货券</text> --></view>
-            <!--<image wx:if="{{item.mall_balance_price}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/integralpay_icon.png" style="float: right;width: 30rpx;height: 30rpx;margin-left: 5rpx;margin-top: 95rpx;"></image>
-            <image wx:if="{{item.robo_balance_price}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/rabbitpay_icon.png" style="float: right;width: 30rpx;height: 30rpx;margin-top: 94rpx;"></image>
-            <image wx:if="{{item.price}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/weixinpay.png" style="float: right;width: 30rpx;height: 30rpx;margin-top: 94rpx;margin-right: 5rpx;"></image>-->
-            <view class="clear"></view>
-          </view>
-          <image class="project-right" src="{{item.cover}}"></image>
-          <view class="project-out" wx:if="{{item.left_count <= 0}}"></view>
-          <view class="project-green" wx:if="{{item.is_support_poor === 1}}"></view>
-          <view class="project-stop" wx:if="{{todaysend < item.deliver_start_time && todaysend > item.deliver_stop_time}}">将于<format-time type="formatmonth2" value="{{item.deliver_start_time}}"></format-time>发货</view>
-          <view class="clean"></view>
-         </view>
+					<view class="project-pack-list">
+						<view wx:for="{{item.package_list}}" wx:for-item="pack" wx:for-index="ind">
+							<p wx:if="{{ind < 3}}">{{pack.item_title}} x{{pack.nums}}</p>
+							<p wx:if="{{item.package_list.length > 3 && ind == 3}}">...</p>
+						</view>
+					</view>
+					<image wx:if="{{item.seckill_state === 'seckill'}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/miaosha.png" class="project-miaosha"/>
+					
+					<view class="project-price" style="padding-top:10rpx;font-size: 35rpx;"><currency symbol="￥" value="{{item.price}}" />
+						<view class="project-price" style="padding-top:20rpx;color: #999;text-decoration: line-through;font-size: 23rpx;display: inline;padding-left: 10rpx;"><currency symbol="￥" value="{{item.user_sale_price}}" /></view>
+						
+						<view class="project-count" style="float: right;padding-top: 10rpx;font-size: 23rpx;">已售{{item.sold_count}}件</view>
+					</view>
+					<view class="clear"></view>
+				</view>
+				<image class="project-right" src="{{item.cover}}"></image>
+				<view class="project-out" wx:if="{{item.left_count <= 0}}"></view>
+				<view class="project-green" wx:if="{{item.is_support_poor === 1}}"></view>
+				<view class="project-stop" wx:if="{{todaysend < item.deliver_start_time && todaysend > item.deliver_stop_time}}">将于<format-time type="formatmonth2" value="{{item.deliver_start_time}}"></format-time>发货</view>
+				<view class="clean"></view>
+			</view>
+			<view  class="project" wx:else>
+				<view class="project-left">
+					<view class="project-title ellipsisLn">{{item.name}}</view>
+				
+					<view class="project-count">已售{{item.sold_count}}件</view>
+					<image wx:if="{{item.seckill_state === 'seckill'}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/miaosha.png" class="project-miaosha"/>
+					<view class="project-price" style="padding-top:20rpx;color: #999;text-decoration: line-through;font-size: 23rpx;">零售价：<currency symbol="￥" value="{{item.user_sale_price}}" /><!-- <currency symbol="￥" value="{{item.price}}" wx:if="{{balance === 0 || balance < item.price}}"></currency><text wx:if="{{balance !== 0 && balance >= item.price}}" class="project-point">{{item.price}}提货券</text> --></view>
+					<view class="project-price" style="float: left;padding-top:10rpx;width:50%;font-size: 35rpx;"><currency symbol="￥" value="{{item.price}}" /><!-- <currency symbol="￥" value="{{item.price}}" wx:if="{{balance === 0 || balance < item.price}}"></currency><text wx:if="{{balance !== 0 && balance >= item.price}}" class="project-point">{{item.price}}提货券</text> --></view>
+				<!--<image wx:if="{{item.mall_balance_price}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/integralpay_icon.png" style="float: right;width: 30rpx;height: 30rpx;margin-left: 5rpx;margin-top: 95rpx;"></image>
+				<image wx:if="{{item.robo_balance_price}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/rabbitpay_icon.png" style="float: right;width: 30rpx;height: 30rpx;margin-top: 94rpx;"></image>
+				<image wx:if="{{item.price}}" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/icon/weixinpay.png" style="float: right;width: 30rpx;height: 30rpx;margin-top: 94rpx;margin-right: 5rpx;"></image>-->
+					<view class="clear"></view>
+				</view>
+				<image class="project-right" src="{{item.cover}}"></image>
+				<view class="project-out" wx:if="{{item.left_count <= 0}}"></view>
+				<view class="project-green" wx:if="{{item.is_support_poor === 1}}"></view>
+				<view class="project-stop" wx:if="{{todaysend < item.deliver_start_time && todaysend > item.deliver_stop_time}}">将于<format-time type="formatmonth2" value="{{item.deliver_start_time}}"></format-time>发货</view>
+				<view class="clean"></view>
+			</view>
+        </view>
+		 
+		 
          <view wx:else class="video-box">
           <video class="project-video" custom-cache="{{false}}" bindtap='videoTap' data-index="{{index}}"  id='video{{index}}' show-fullscreen-btn="{{false}}" enable-progress-gesture="{{false}}" src="{{item.video_url}}" controls="{{false}}" show-center-play-btn='{{false}}'>
           	<cover-image class="playImg" src="../../images/footer/play.png"  wx:if="{{!item.video_play}}"></cover-image>
@@ -337,6 +368,8 @@
           <view class="clean"></view>
           <button bindtap="toProject" data-val="{{item.id}}" class="video-buybtn">立即购买</button>
          </view>
+		 
+		 
         </view>
       </view>
     </view>

pages/home/home.wxss

@@ -177,6 +177,14 @@
   margin-bottom: 20rpx;
   border-radius: 8rpx;
 }
+.project-pack {
+  position: relative;
+  margin: 0 auto;
+  width: 710rpx;
+  height: auto;
+  margin-bottom: 20rpx;
+  border-radius: 8rpx;
+}
 .project1 {
   position: relative;
   margin: 0 auto;
@@ -193,6 +201,20 @@
   padding-left: 20rpx;
   padding-top: 15rpx;
 }
+.project-left-pack{
+	float: left;
+	padding-left: 20rpx;
+	padding-top: 15rpx;
+	width: 390rpx;
+	height: 258rpx;
+}
+.project-pack-list{
+	    background: #f7f7f7;
+	    font-size: 24rpx;
+	    padding: 15rpx;
+	    line-height: 36rpx;
+	    color: #666;
+}
 .project-describe {
   width: 710rpx;
   /* height: 130rpx; */

pages/pay/pay.wxml

@@ -25,6 +25,11 @@
       <image class="pay-project-img" src="{{item.cover}}"></image>
       <view class="pay-project-info">
         <text class="pay-project-title ellipsisLn">{{item.product_name}}</text>
+		<view class="project-pack-list" wx:if="{{item.package}}">
+			<view wx:for="{{item.package_list}}" wx:for-item="pack" wx:for-index="ind">
+				<p>{{pack.item_title}} x{{pack.nums}}</p>
+			</view>
+		</view>
         <text class="pay-project-spec" wx:if="{{item.color_name || item.size_name}}">规格:{{item.color_name}} {{item.size_name}}</text>
         <view class="product-info">
           <view class="pay-project-price fl">

pages/pay/pay.wxss

@@ -416,3 +416,11 @@ background-color: #FFFFFF;
 text-align: right;
 color:#4c4c4c;
 }
+.project-pack-list{
+	    background: #f7f7f7;
+	    font-size: 24rpx;
+	    padding: 15rpx;
+	    line-height: 36rpx;
+	    color: #666;
+		    margin: 10rpx 0 40rpx;
+}

pages/projects/project-detail/project-detail.wxml

@@ -35,7 +35,12 @@
       <currency symbol="￥" value="{{project.price}}" class="detail-price"></currency>
     </view>-->
 
-
+	<view class="project-pack-list" wx:if="{{project.package}}">
+		<view wx:for="{{project.package_list}}" wx:for-item="pack" wx:for-index="ind">
+			<p>{{pack.item_title}} x{{pack.nums}}</p>
+		</view>
+	</view>
+	
     <view class="detail-width">
       <view  style="color: #999;text-decoration: line-through;font-size: 23rpx;">
         <text class="detail-normal detail-mr" style="color: #999;text-decoration: line-through;font-size: 23rpx;margin-right:0">零售价：</text>

pages/projects/project-detail/project-detail.wxss

@@ -674,4 +674,12 @@ width: 14rpx;
 	    padding-left: 50rpx;
 	    float: left;
 		color: #eab86a;
+}
+.project-pack-list{
+	    background: #f7f7f7;
+	    font-size: 24rpx;
+	    padding: 15rpx;
+	    line-height: 36rpx;
+	    color: #666;
+		margin: 20rpx;
 }