Merge branch 'dev' into 'test'

等级卡会员中心的显示，开卡，续卡都要由默认图片 See merge request !133

Merge branch 'dev' into 'test'
等级卡会员中心的显示，开卡，续卡都要由默认图片 See merge request !133
后端研发-苏明海
2 parents 60032856 ad7caebe
Showing 4 changed files with 12 additions and 3 deletions
pages/user/cardinfo/cardinfo.js
pages/user/cardinfo/cardinfo.wxss
pages/user/index/index.wxml
pages/user/plus/plus.js
@@ -70,10 +70,12 @@ Page({
     }).then(res => {
       var plusCard = res.data.data;
+      if (plusCard[i].CardImg == "") plusCard[i].CardImg =  th.data.url + "/miniapp/images/plus/bg"+(i + 1)+ ".jpg?v=1";
       var big_card = null;
       var big_cards = null;
       console.log(plusCard, "数据什么的", res);
       for (var i = 0; i < plusCard.length; i++) {
+        if (plusCard[i].CardImg == "") plusCard[i].CardImg = th.data.url + "/miniapp/images/plus/bg" + (i + 1) + ".jpg?v=1";
         big_cards = Math.max(plusCard[i].CardFee)
         if (plusCard[i].CardFee == big_cards) {
           big_card = plusCard[i]
@@ -159,6 +161,12 @@ Page({
     await getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/get?storeId=" + os.stoid + "&CardId=" + ee.data.cardid, {
     }).then(res => {
      var user_card= res.data.data;
+      if (user_card.CardImg==""){
+         var index =parseInt(user_card.CorrPrice.replace("Price",""));
+         user_card.CardImg = th.data.url + "/miniapp/images/plus/bg" + index + ".jpg?v=1";
+
+      }
+
       console.log(user_card,"会员的卡类");
       ee.setData({user_card: user_card});
     })
@@ -23,7 +23,7 @@
   background-size: 100%;
   border-top-left-radius: 18rpx;
   border-top-right-radius: 18rpx; 
-  
+  margin-top: 20rpx
 }
 .renew {
   width: 190rpx;
@@ -77,10 +77,10 @@
 	<view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==3}}">
 	  <view class="xc-add-member flex-vertical four-level-word">
-	    <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image>
+	    <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png" style="margin-left:30rpx"></image>
 	    <view class="member"> 加入plus会员</view>
 	    <view class="t-c xc-save-money"> 预计可省3031元</view>
-	    <view class="xc-opening-button t-c" data-url="/pages/user/cardinfo/cardinfo" bindtap="goto" style="margin-left: 186rpx;">
+	    <view class="xc-opening-button t-c" data-url="/pages/user/cardinfo/cardinfo" bindtap="goto" style="margin-left: 165rpx;">
 	      <view class="xc-opening fs20">立即续费</view>
 	    </view>
 	  </view>
@@ -163,6 +163,7 @@ Page({
       var new_arr = new Array();
       for (var i = 0; i < plusCard.length; i++) {
         //plusCard[i].free=arr[i];
+        if (plusCard[i].CardImg == "") plusCard[i].CardImg =  th.data.url + "/miniapp/images/plus/bg"+(i + 1)+ ".jpg?v=1";
         var item = {"fee": plusCard[i].CardFee, 'index': i}
         new_arr.push(item);
       }