kk.shi пре 3 година
родитељ
комит
2df92ba4ed

+ 3 - 9
pages/welfareMall/coupon/coupon.wxml

@@ -1,9 +1,6 @@
 <!--pages/welfareMall/coupon/coupon.wxml-->
-<view class="coupon flex-column">
-  <view class="coupon-style flex-column">
     <!-- 内容 -->
-    <view class="coupon-content flex-column" wx:for="{{couponList}}" wx:key="index" data-couponSn="{{item.couponSn}}">
-      <view class="{{item.couponType == 'C'?'coupon-list2 flex-row':'coupon-list flex-row'}}">
+    <view  class="{{item.couponType == 'C'?'coupon-list2 flex-row':'coupon-list flex-row'}}" wx:for="{{couponList}}" wx:key="index" data-couponSn="{{item.couponSn}}">
         <view class="coupon-info flex-column">
           <viwe class="coupon-info-tittle">{{item.couponTitle}}</viwe>
           <view class="coupon-center-bm flex-row">
@@ -26,9 +23,6 @@
           <!-- <jumpmallapp>去使用</jumpmallapp> -->
           <jumpmallapp class="coupon-num-text">立即使用</jumpmallapp>
         </view>
-      </view>
     </view>
-    <view class="no_result" wx:if="{{noResult}}">———— 抱歉,您暂无历史订单 ————</view>
-    <view class="no_result" wx:if="{{noMore}}">—— 人家也是有底线的 ——</view>
-  </view>
-</view>
+    <view class="no_result" wx:if="{{noResult}}">———— 抱歉,您暂可用优惠券 ————</view>
+    <view class="no_result" wx:if="{{noMore}}">—— 人家也是有底线的 ——</view>

+ 16 - 21
pages/welfareMall/coupon/coupon.wxss

@@ -1,11 +1,12 @@
 /* pages/welfareMall/coupon/coupon.wxss */
 page{
   background: #F7F7F7;
-}
-.coupon{
-  width: 375px;
-  height: auto;
-  padding-bottom: 120px; 
+  display:flex;
+  flex-flow: column nowrap;
+  justify-content: left;
+  align-items: center;
+  box-sizing: border-box;
+  padding-top: 13px;
 }
 
 /* 垂直方向布局,水平居中 **/
@@ -23,15 +24,9 @@ page{
   align-items: center;
   justify-content: center;
 }
-.coupon-style{
-  margin-top: 13px;
-  width: 352px;
-  height: auto;
-}
-
 .coupon-list{
-  width: 352px;
-  height: 101px;
+  width: 704rpx;
+  height: 202rpx;
   background-image: url(https://dy.shpr.top/welfareGo/discount.png);
   background-size: 100% 100%;
   margin-bottom: 17px;
@@ -39,8 +34,8 @@ page{
 }
 
 .coupon-list2{
-  width: 352px;
-  height: 101px;
+  width: 704rpx;
+  height: 202rpx;
   background-image: url(https://dy.shpr.top/welfareGo/cash.png);
   background-size: 100% 100%;
   margin-bottom: 17px;
@@ -48,13 +43,13 @@ page{
 }
 
 .coupon-info{
-  margin-left: 38px;
+  margin-left: 76rpx;
   align-items: flex-start;
 }
 
 .coupon-info-tittle{
-  width: 200px;
-  height: 19px;
+  width: 400rpx;
+  height: 38rpx;
   font-size: 17px;
   font-weight: bold;
   color: #000000;
@@ -97,8 +92,8 @@ page{
 }
 
 .coupon-info-date{
-  width: 200px;
-  height: 15px;
+  width: 400rpx;
+  height: 30rpx;
   font-size: 13px;
   font-weight: 400;
   color: #444444;
@@ -107,7 +102,7 @@ page{
 }
 
 .coupon-numText{
-  width: 100px;
+  width: 200rpx;
 }
 
 .coupon-num-num{

+ 2 - 6
pages/welfareMall/personal/personal.wxml

@@ -23,12 +23,10 @@
       </view>
     </view>
     <!-- 中部详细信息 -->
-    <view class="center">
       <!-- 内容 -->
       <view class="content flex-column">
       <!-- 导航栏遍历 -->
-        <view wx:for="{{navigationList}}" data-appid="{{item.appId}}"  wx:key="unique">
-          <view class="sign-in content-style flex-row">
+          <view class="sign-in content-style" wx:for="{{navigationList}}" data-appid="{{item.appId}}"  wx:key="unique">
             <button class="wx-isLogin" wx:if="{{!isLogin}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNav" data-path="{{item.path}}"></button>
             <view class="grant flex-row" bindtap="goToCoupon" data-path="{{item.path}}">
               <view class="content-img-text flex-row">
@@ -37,12 +35,10 @@
               </view>
               <image class="content-jump" src="/images/welfareMall/jump.png" />
             </view>
+            <view class="content-lower"></view>
           </view>
-          <view class="content-lower"></view>
-        </view>
         <view></view>
       </view>
-    </view>
   </view>
 </view>
 

+ 0 - 1
pages/welfareMall/personal/personal.wxss

@@ -109,7 +109,6 @@
 
 .content{
   width: 750rpx;
-  height: auto;
 }
 
 .content-style{