Commit 669616567637356b633764f47385876840c53674

Authored by 后端开发-许程
1 parent be765a40

加入购物车的样式排版

app.wxss
@@ -73,7 +73,7 @@ button { @@ -73,7 +73,7 @@ button {
73 .modal-close { 73 .modal-close {
74 position: absolute; 74 position: absolute;
75 right: 25rpx; 75 right: 25rpx;
76 - top: 25rpx; 76 + top:40rpx;
77 } 77 }
78 .no-data { 78 .no-data {
79 width: 100%; 79 width: 100%;
pages/goods/goodsInfo/goodsInfo.js
@@ -456,7 +456,7 @@ Page({ @@ -456,7 +456,7 @@ Page({
456 //-----商品详情--- 456 //-----商品详情---
457 a.wxParse("content", "html", t.data.data.goods_content, ee, 6); 457 a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
458 e.wxParseAddFullImageUrl(ee, "content"); 458 e.wxParseAddFullImageUrl(ee, "content");
459 - 459 + console.log("商品的名字是什么",t.data.data);
460 ee.setData({ 460 ee.setData({
461 data: t.data.data, 461 data: t.data.data,
462 sele_g: t.data.data, 462 sele_g: t.data.data,
pages/goods/goodsInfo/goodsInfo.wxml
@@ -323,9 +323,8 @@ @@ -323,9 +323,8 @@
323 </view> 323 </view>
324 </view> 324 </view>
325 <view class="fs20">地址:福建省泉州市鲤城区软件园4栋4层</view> 325 <view class="fs20">地址:福建省泉州市鲤城区软件园4栋4层</view>
  326 + </view>
326 327
327 -  
328 - </view>  
329 </view> 328 </view>
330 329
331 <!--许程 7.24暂时注释 --> 330 <!--许程 7.24暂时注释 -->
@@ -749,25 +748,46 @@ @@ -749,25 +748,46 @@
749 <view bindtap="closeSpecModal" class="cover-layer"></view> 748 <view bindtap="closeSpecModal" class="cover-layer"></view>
750 <view class="spec-model"> 749 <view class="spec-model">
751 <view class="pding"> 750 <view class="pding">
752 - <icon bindtap="closeSpecModal" class="modal-close" color="gray" size="22" type="cancel"></icon> 751 + <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>
753 <view class="spec-goods"> 752 <view class="spec-goods">
754 - <image class="wh100 spec-img" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image> 753 + <image class="wh100 spec-img xc-distance-bottom" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
755 <view class="spec-goods-info"> 754 <view class="spec-goods-info">
756 - <!--<view class="spec-goods-name">{{data.goods_name}}</view>-->  
757 - <view class="spec-goods-price" wx:if="{{prom_price==null}}">¥ {{sele_g.shop_price}}</view>  
758 - <view class="spec-goods-price" wx:else>¥ {{prom_price}}</view>  
759 - <block wx:if="{{prom_type==0}}"> 755 + <view class="spec-goods-name ellipsis-1">{{data.goods_name}}</view>
  756 + <view class="flex ai_end xc-val-money">
  757 + <view class="spec-goods-price" wx:if="{{prom_price==null}}"><text class="fs20">¥</text>{{sele_g.shop_price}}</view>
  758 + <view class="spec-goods-price" wx:else><text class="fs20">¥</text>{{prom_price}}</view>
  759 +
  760 + </view>
  761 + <view class="fs32 xc-ash flex ai_end">
  762 + <view>库存:</view>
  763 + <view class="xc-store-count">{{data.store_count}}
  764 + </view>
  765 + </view>
  766 + <!-- <block wx:if="{{prom_type==0}}">
760 <view class="spec-goods-stock">已售:{{sele_g.sales_sum}}</view> 767 <view class="spec-goods-stock">已售:{{sele_g.sales_sum}}</view>
761 <view class="spec-goods-stock">可售:{{sele_g.store_count}}</view> 768 <view class="spec-goods-stock">可售:{{sele_g.store_count}}</view>
762 <view class="spec-goods-stock">已选:{{sku_g[0].gg}}</view> 769 <view class="spec-goods-stock">已选:{{sku_g[0].gg}}</view>
763 - </block>  
764 - <block wx:if="{{prom_type==1}}"> 770 + </block> -->
  771 + <!-- <block wx:if="{{prom_type==1}}">
765 <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售:{{prom_act.buy_num+prom_act.virtual}}</view> 772 <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售:{{prom_act.buy_num+prom_act.virtual}}</view>
766 <view class="spec-goods-stock" wx:else >已售:{{prom_act.buy_num}}</view> 773 <view class="spec-goods-stock" wx:else >已售:{{prom_act.buy_num}}</view>
767 <view class="spec-goods-stock">可售:{{prom_act.goods_num-prom_act.buy_num}}</view> 774 <view class="spec-goods-stock">可售:{{prom_act.goods_num-prom_act.buy_num}}</view>
768 <view class="spec-goods-stock">已选:{{sku_g[0].gg}}</view> 775 <view class="spec-goods-stock">已选:{{sku_g[0].gg}}</view>
769 - </block> 776 + </block> -->
770 </view> 777 </view>
  778 + <view class="flex-space-between address ai_end xc-width ">
  779 + <view class="flex ai_end">
  780 + <text class="fs28 xc-black3 shop_name"> 泉州开源盛世</text>
  781 + <view class="distance fs20 xc-ash">
  782 + 距离:3754m
  783 + </view>
  784 + </view>
  785 + <view class="red-co fs28" bindtap="choice_store">
  786 + 更多门店
  787 + <text class="right-arrow"></text>
  788 + </view>
  789 + </view>
  790 + <view class="fs20 xc-ash xc-distance-top">地址:福建省泉州市鲤城区软件园4栋4层</view>
771 </view> 791 </view>
772 <!----商品的属性项目----> 792 <!----商品的属性项目---->
773 <view hidden="{{ismend==1}}" class="spec-name">商品属性</view> 793 <view hidden="{{ismend==1}}" class="spec-name">商品属性</view>
@@ -839,7 +859,7 @@ @@ -839,7 +859,7 @@
839 <view class="spec-goods"> 859 <view class="spec-goods">
840 <image class="wh100 spec-img" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image> 860 <image class="wh100 spec-img" src="{{data.original_img}}" binderror="pop_err_img" data-errorimg="data.original_img"></image>
841 <view class="spec-goods-info"> 861 <view class="spec-goods-info">
842 - <!--<view class="spec-goods-name">{{data.goods_name}}</view>--> 862 + <!-- <view class="spec-goods-name ellipsis-1">{{data.goods_name}}</view> -->
843 <view class="spec-goods-price" wx:if="{{is_normal==1}}">¥ {{sele_g.shop_price}}</view> 863 <view class="spec-goods-price" wx:if="{{is_normal==1}}">¥ {{sele_g.shop_price}}</view>
844 <view class="spec-goods-price" wx:else>¥ {{prom_price}}</view> 864 <view class="spec-goods-price" wx:else>¥ {{prom_price}}</view>
845 865
pages/goods/goodsInfo/goodsInfo.wxss
@@ -517,24 +517,23 @@ border-radius: 0 56rpx 55rpx 0; @@ -517,24 +517,23 @@ border-radius: 0 56rpx 55rpx 0;
517 /* padding: 0 30rpx; */ 517 /* padding: 0 30rpx; */
518 font-size: 32rpx; 518 font-size: 32rpx;
519 box-sizing: border-box; 519 box-sizing: border-box;
  520 + border-radius: 20rpx;
520 521
521 } 522 }
522 523
523 .spec-model .pding{padding: 0 30rpx;} 524 .spec-model .pding{padding: 0 30rpx;}
524 525
525 .spec-goods { 526 .spec-goods {
526 - padding: 15rpx 0 10rpx; 527 + padding: 30rpx 0 20rpx;
527 float: left; 528 float: left;
528 width: 100%; 529 width: 100%;
529 - border-bottom: 1px solid #f8f8f8; 530 + border-bottom:2rpx solid #eee;
530 } 531 }
531 532
532 .spec-img { 533 .spec-img {
533 float: left; 534 float: left;
534 height: 186rpx; 535 height: 186rpx;
535 width: 186rpx; 536 width: 186rpx;
536 - position: relative;  
537 - top:-40rpx;  
538 border: 4rpx solid #eee 537 border: 4rpx solid #eee
539 } 538 }
540 539
@@ -554,7 +553,7 @@ border-radius: 0 56rpx 55rpx 0; @@ -554,7 +553,7 @@ border-radius: 0 56rpx 55rpx 0;
554 } 553 }
555 554
556 .spec-goods-price { 555 .spec-goods-price {
557 - color: #ec5151; 556 + color: #d60021;
558 font-size: 33rpx; 557 font-size: 33rpx;
559 font-weight: bold; 558 font-weight: bold;
560 } 559 }
@@ -946,7 +945,6 @@ left:31rpx;} @@ -946,7 +945,6 @@ left:31rpx;}
946 border-right: 2rpx solid #d70026; 945 border-right: 2rpx solid #d70026;
947 transform: rotate(45deg);display:inline-block; 946 transform: rotate(45deg);display:inline-block;
948 margin-bottom:3rpx; 947 margin-bottom:3rpx;
949 -  
950 } 948 }
951 /* 顶部边框 */ 949 /* 顶部边框 */
952 .topframe{ 950 .topframe{
@@ -2435,4 +2433,25 @@ transform: rotate(45deg); @@ -2435,4 +2433,25 @@ transform: rotate(45deg);
2435 display: inline-block; 2433 display: inline-block;
2436 width: 20rpx; 2434 width: 20rpx;
2437 height: 20rpx; 2435 height: 20rpx;
  2436 +}
  2437 +.xc-val-money{
  2438 + height:80rpx;
  2439 +}
  2440 +.xc-store-count{
  2441 +height: 40rpx;
  2442 +}
  2443 +.xc-distance-bottom{
  2444 + margin-bottom: 40rpx;
  2445 +}
  2446 +.xc-distance-top{
  2447 +margin-top: 10rpx;
  2448 +}
  2449 +.xc-width{
  2450 + width: 100%;
  2451 +}
  2452 +.right-arrow{ width: 15rpx; height:15rpx;
  2453 + border-top: 2rpx solid #d70026;
  2454 + border-right: 2rpx solid #d70026;
  2455 + transform: rotate(45deg);display:inline-block;
  2456 + margin-bottom:3rpx;
2438 } 2457 }
2439 \ No newline at end of file 2458 \ No newline at end of file