Ver código fonte

我的登录页面调整

kk.shi 3 anos atrás
pai
commit
4b5bac9318

+ 1 - 1
pages/welfareMall/order/orderCompletion.wxml

@@ -56,7 +56,7 @@
       <view class="order-refund flex-row" wx:if="{{orderDetail.status.value == 1}}" catchtap="goPay">
       <view class="order-refund flex-row" wx:if="{{orderDetail.status.value == 1}}" catchtap="goPay">
         <view class="lower-order-text">去支付</view>
         <view class="lower-order-text">去支付</view>
       </view>
       </view>
-      <view class="order-refund flex-row" wx:if="{{orderDetail.status.value == 2 || orderDetail.status.value == 5}}" catchtap="getMode">
+      <view class="order-refund flex-row" wx:if="{{(orderDetail.status.value == 2 || orderDetail.status.value == 5) && orderDetail.goodsList[0].activity.isPay == 1}}" catchtap="getMode">
         <view class="lower-order-text">申请退款</view>
         <view class="lower-order-text">申请退款</view>
       </view>
       </view>
     </view>
     </view>

+ 1 - 1
pages/welfareMall/personal/personal.json

@@ -2,6 +2,6 @@
   "usingComponents": {
   "usingComponents": {
    
    
   },
   },
-  "navigationBarBackgroundColor": "#FFF2F3",
+  "navigationStyle":"custom",
   "navigationBarTitleText": ""
   "navigationBarTitleText": ""
 }
 }

+ 2 - 2
pages/welfareMall/personal/personal.wxss

@@ -23,7 +23,7 @@
 
 
 .head{
 .head{
   width: 750rpx;
   width: 750rpx;
-  height: 536rpx;
+  height: 690rpx;
   background: #FFF2F3;
   background: #FFF2F3;
   border-radius: 0rpx 0rpx 40rpx 40rpx;
   border-radius: 0rpx 0rpx 40rpx 40rpx;
   justify-content: space-between;
   justify-content: space-between;
@@ -34,7 +34,7 @@
   height: 136rpx;
   height: 136rpx;
   justify-content: flex-start;
   justify-content: flex-start;
   margin-left: 35rpx;
   margin-left: 35rpx;
-  margin-top: 30rpx;
+  margin-top: 167rpx;
 }
 }
 .head-personal-logo{
 .head-personal-logo{
   width: 136rpx;
   width: 136rpx;