From bb7e270445716a31fbcdf0057d05813506e13e87 Mon Sep 17 00:00:00 2001
From: cheng.xu <cheng.xu@meidd.com>
Date: Thu, 19 Sep 2019 13:40:39 +0800
Subject: [PATCH] 小程序加入购物车排版

---
 pages/goods/goodsInfo/goodsInfo.js   |  1 +
 pages/goods/goodsInfo/goodsInfo.wxml | 37 ++++++++++++++++++++++---------------
 pages/goods/goodsInfo/goodsInfo.wxss | 40 ++++++++++++++++++++++++----------------
 pages/user/index/index.wxml          |  6 +++---
 4 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 5ec448a..456a659 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -210,6 +210,7 @@ Page({
     more_store:0,//选择门店
     sort_store:0,//门店分类
     choice_sort_store:0,//选择分类门店
+    new_user:0,//新用户
   },
 
   //------初始化加载----------
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 7f1a6e2..bbc07c1 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -313,7 +313,8 @@
                          <text class="bg_jj"></text>
                     </view>
                   </view>
-                  <view  class="flex-space-between address ai_end ">
+                  <view wx:if="{{new_user==1}}">
+                  <view  class="flex-space-between address ai_end  ">
                      <view>
                        <text class="fs32 xc-black3 shop_name"> 泉州开源盛世</text>
                        <text class="fs20">暂无库存</text>
@@ -323,6 +324,7 @@
                      </view>
                   </view>
                   <view class="fs20">地址:福建省泉州市鲤城区软件园4栋4层</view>
+                  </view>
                  </view>   
 
             </view>
@@ -669,7 +671,7 @@
         <view>购物车</view>
       </navigator>
     </view>
-    <!---<view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">立即购买</view>-->
+    <view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">立即购买</view>
     <block wx:if="{{prom_type==0}}">
       <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
       <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即购买</view>
@@ -790,15 +792,16 @@
                   <view class="fs20 xc-ash xc-distance-top">地址:福建省泉州市鲤城区软件园4栋4层</view>
       </view>
       <!----商品的属性项目---->
+      <view  class="xc-goods-attribute">
       <view hidden="{{ismend==1}}" class="spec-name">商品属性</view>
       <view hidden="{{ismend==1}}" class="flex">
         <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='item.goods_id' wx:for="{{sku_g}}" wx:key="sku_g">
           {{item.gg}}
         </view>
       </view>
-
+</view>
       <!----点击选择门店的时候要隐藏---->
-      <view hidden="{{ismend==1}}">
+      <!-- <view hidden="{{ismend==1}}">
         <view bindtap="getmendian" class="quhuo logistics-item">
           <view wx:if="{{sto_sele_name==''}}">取货门店
             <text class='small'>（选择门店）</text>
@@ -808,6 +811,8 @@
             <image class="wh100" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image>
           </view>
         </view>
+         </view> -->
+
         <view class="b_num">
           <view>购买数量</view>
           <view class="count">
@@ -817,6 +822,14 @@
           </view>
         </view>
       </view>
+       <view class="spec-cart-btns">
+   
+      <block>
+        <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
+        <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view>
+      </block>
+    </view>
+
       <view class="clear"></view>
       <!---选择门店的列表--->
       <view hidden="{{ismend==0}}" class="sto_v">
@@ -842,13 +855,7 @@
         </view>
       </view>
     </view>
-    <view class="spec-cart-btns">
-      <block>
-        <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" class="spec-cart-btn spec-buy" data-action="add">加入购物车</view>
-        <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view>
-      </block>
-    </view>
-  </view>
+   
 </view>
 <!----弹起来,选择规格数量,拼单商品购买------>
 <view hidden="{{!openSpecModal_pt}}">
@@ -876,8 +883,8 @@
         </view>
       </view>
       <!----商品的属性项目---->
+     <view> 
       <view hidden="{{ismend==1}}" class="spec-name">商品属性</view>
-
       <block wx:if="{{is_normal==0}}">
         <view hidden="{{ismend==1}}" class="flex">
           <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='item.goods_id' wx:for="{{sku_g}}" wx:key="sku_g">{{item.gg}}
@@ -892,7 +899,7 @@
         </view>
       </block>
       <view class="clear"></view>
-
+     </view>
       <view>
         <view bindtap="getmendian" class="quhuo logistics-item" hidden="{{ismend==1}}">
           <view wx:if="{{sto_sele_name==''}}">取货门店
@@ -907,7 +914,7 @@
           <view>购买数量</view>
           <view class="count">
             <view bindtap="subCartNum" class="sub">-</view>
-            <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>
+            <input bindblur="inputCartNum xc-val-fream" type="number" value="{{goodsInputNum}}"></input>
             <view bindtap="addCartNum" class="add">+</view>
           </view>
         </view>
@@ -937,7 +944,7 @@
           </view>
         </view>
       </view>
-    </view>
+    </view> 
     <view class="pt_qd">
       <view bindtap="addCart_pt" class="spec-cart-btn spec-buy w100" data-action="buy">确定</view>
     </view>
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index bfc1001..d73dd3d 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -518,7 +518,7 @@ border-radius: 0 56rpx 55rpx 0;
     font-size: 32rpx;
     box-sizing: border-box;
     border-radius: 20rpx;
-
+     height: 72%;
 }
 
 .spec-model .pding{padding: 0 30rpx;}
@@ -579,7 +579,7 @@ border-radius: 0 56rpx 55rpx 0;
     position: fixed;
     display: flex;
     height: 50rpx;
-    border: 1rpx solid #f8f8f8;
+    border: 1rpx solid #000;
     font-size: 28rpx;
     right: 30rpx;
 }
@@ -592,15 +592,15 @@ border-radius: 0 56rpx 55rpx 0;
     text-align: center;
 }
 .spec_bt{
-  background: fff;color: #333; margin-left: 10rpx;padding: 8rpx 12rpx; border-radius:20rpx;font-size: 24rpx;border: 1rpx solid #ccc;
+  background: fff;color: #333; margin-left: 10rpx;padding: 4rpx 15rpx 4rpx; border-radius:30rpx;font-size: 24rpx;border: 1rpx solid #ccc;
 }
 .spec_bt.act{background: #d60021;color: #fff;border: 1rpx solid #d60021;}
 .sub {
-    border-right: 1px solid #ddd;
+    border-right: 1px solid #000;
 }
 
 .add {
-    border-left: 1px solid #ddd;
+    border-left: 1px solid #000;
 }
 
 .spec-btn {
@@ -622,22 +622,21 @@ border-radius: 0 56rpx 55rpx 0;
 }
 
 .spec-cart-btns {
-    /* background-color: #f8f8f8;
-    margin: 40rpx -30rpx 0;
-    padding: 20rpx 34rpx; */
-    float: left;
-    width: 100%;
-    line-height: 80rpx;
-	margin-top: 40rpx;
+    width: 92%;
+    line-height: 70rpx;
+    margin: 0rpx auto;
+	margin-top: 80rpx;
+  border-radius: 20rpx;
+
 }
 
 .spec-cart-btn {
-    float: left;
-    width: 100%;
+ 
+    width:100%;
     font-size: 30rpx;
     text-align: center;
     color: white;
-    border-radius: 4rpx;
+    border-radius: 40rpx;
 }
 
 .spec-add-cart {
@@ -2241,7 +2240,8 @@ right:17rpx; top:55rpx;
 .xc-address_frame{
   border-top:1rpx solid #eee;
   width: 100%;
-  height: 170rpx;
+  min-height: 90rpx;
+  height: auto;
 }
 .xc-address_frame .address_frame{
   width: 92%;
@@ -2454,4 +2454,12 @@ margin-top: 10rpx;
         border-right: 2rpx solid #d70026;
         transform: rotate(45deg);display:inline-block;
         margin-bottom:3rpx;
+}
+.xc-goods-attribute{
+  border-bottom: 1px solid #eee;
+padding-bottom: 15px;
+margin-bottom:40rpx;
+}
+.xc-val-fream{
+  width: 105rpx;
 }
\ No newline at end of file
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index 88f83b7..d512c54 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -105,7 +105,7 @@
 		<view class="xc-equity-title flex-level" bindtap="go_qy">
 			<view class="xc-title-frame flex-space-between">
 				<view class="flex-vertical xc-title-content"> 
-				<image class="xc-title-img" src="../../../images/medal.png"></image>
+				<image class="xc-title-img" src="{{iurl}}/miniapp/images/medal.png"></image>
 				 <view class="three-level-word" >
 					 我的权益
 				 </view>
@@ -167,7 +167,7 @@
 					<view class="fs26">秒杀活动</view>
 				</view>
 				<view class="item t-c" bindtap="go_qy" wx:if="{{qy_list!=null && is_init && gradeId}}">
-					<image class="xc-center-img " src="/images/quanyi2.png"></image>
+					<image class="xc-center-img " src="{{iurl}}/miniapp/images/quanyi2.png"></image>
 					<view class="fs26">我的权益</view>
 				</view>
 
@@ -188,7 +188,7 @@
 				</view>
 
         	<view class="item t-c" data-url="/pages/user/address_list/address_list" bindtap="goto" >
-					<image class="xc-center-img " src="/images/add2.png"></image>
+					<image class="xc-center-img " src="{{iurl}}/miniapp/images/add2.png"></image>
 					<view class="four-level-word">我的地址</view>
 				</view>
 
--
libgit2 0.21.4