Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents 4fd28465 ebde6ce4
Showing 2 changed files with 9 additions and 7 deletions
packageD/pages/AI-test-skin/success_result/goods.wxml
packageD/pages/AI-test-skin/success_result/success_result.wxss
@@ -9,9 +9,9 @@
     <!-- 显示正确的商品价格 -->
     <view style="display: flex;justify-content: space-between;">
         <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10}}">
-            <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text>
-            <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
             <text wx:if="{{item.prom_price}}" class="bold">￥{{item.shop_price}}</text>
+            <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
+           
         </block>
         <block wx:else>
             <block wx:if="{{s_filter.is_has_rank(rank_switch,item)}}">
@@ -36,4 +36,5 @@
         <view class="mm"><text class="iconfont icon-gouwuche"></text></view>
     </view>
+    <view wx:if="{{item.prom_integral}}"><text style="font-weight: bold;">{{item.prom_integral}}</text>积分</view>
 </view>
 \ No newline at end of file
@@ -384,13 +384,15 @@ page {
     font-size: 28rpx;
 }
-.analyse_classify_foot .product_item {
-    display: flex;
+.analyse_classify_foot .product_item:nth-child(1) {
     margin-right: 30rpx;
+}
+.analyse_classify_foot .product_item{
+    display: flex;
     flex-direction: column;
     border-radius: 30rpx;
     width: 40%;
-    padding: 5%;
+    padding: 5% ;
     background-color: #fff;
 }
@@ -592,8 +594,7 @@ page {
 .xc-coupon-frame {
     width: 100%;
     max-height: 560rpx;
-    overflow: auto;
-
+    /* overflow: auto; */
 }
 .xc-coupon-frame .rel:not(:first-child) {