diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js
index e1f9c6e..7c51f29 100644
--- a/pages/user/plus/plus.js
+++ b/pages/user/plus/plus.js
@@ -5,11 +5,12 @@ var e = function(e) {
   }(require("../../../utils/LoadMore.js")),
   t = getApp(),
   a = t.request,
-  o = t.globalData.setting,
+  o = t.globalData.setting, 
   os = o,
   i = require("../../../utils/util.js"),
   ut = i,
   s = require("../../../utils/common.js"),
+  w = require("../../../utils/wxParse/wxParse.js"),
   n = new e.default();
 var regeneratorRuntime = require('../../../utils/runtime.js');
 var api = require('../../../api/api.js');
@@ -23,13 +24,16 @@ Page({
     images: [o.imghost + "/miniapp/images/plus/card_one.jpg", o.imghost + "/miniapp/images/plus/card_two.jpg", o.imghost + "/miniapp/images/plus/card_three.jpg"],
     currentId: 0,
     url: o.imghost,
-    j: false,
     screenWidth: 0,
     screenheight: 0,
     canvasHidden: true,
     shareImgPath: null,
-    plusCard: "",
-    imagePath: ""
+    is_plusCard: "",//卡的列表
+    imagePath: "",
+    is_pulscardname: "",//plus会员的名字
+    is_card:0,//用于判断是否是续费页和购买页面 0不是puls会员
+    content:"",//等级卡规则
+    is_card_rule: "",//等级卡规则判断用
   },
   swiperChange: function(e) {
     var currentId = e.detail.current;
@@ -42,7 +46,30 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+   console.log();
     var that = this;
+    getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
+      success: function (res) {
+       var user_information=res.data.data;
+        console.log(res, "会员个人信息");
+        //判断是是不是会员
+        if (user_information == null || user_information == ""){
+         
+       }
+       //判断是是不是plus会员
+        if (user_information.card_field == null || user_information.card_fiel == "")           {
+          that.setData({ is_card:1});
+
+       }
+        if (user_information.card_expiredate == null || user_information.card_expiredate == ""){
+
+       }
+       
+      }
+    });
+ 
+
+   
     //获取用户设备信息，屏幕宽度
     wx.getSystemInfo({
       success: res => {
@@ -53,14 +80,57 @@ Page({
     })
     this.getPlusCardType();
     this.saveImageToPhotosAlbum();
+    this.puls_user();
+    //-----------商家配置信息----- 等级卡规则------------
+    
+    getApp().request.get("/api/weshop/storeconfig/get/"+ os.stoid, {
+      success: function (res) {
+       var is_cardrule=res.data.data.cardrules;
+        w.wxParse("content", "html", is_cardrule, that, 6);
+      
+        console.log("等级卡规则8888888888888", is_cardrule);
+        that.setData({
+          is_card_rule: is_cardrule
+        });
+      }
+    });
   },
+
+  //-----Plus会员获取-----------
+  puls_user: function () {
+    var th = this;
+    getApp().request.get("/api/weshop/plus/vip/mem/list", {
+      data: {
+        storeId: os.stoid,
+        userId: getApp().globalData.user_id,
+      },
+      success: function (su) {
+        if (su.data.code == 0) {
+          var cardname = su.data.data[0].MemCardName;
+          console.log("卡的名字", cardname);
+          th.setData({ pulscardname: cardname });
+        }
+      }
+    });
+  },
+
+
+
+
+
   //获取卡类
   getPlusCardType: function(e) {
     var storid = o.stoid;
     var th = this;
     getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
+      var plusCard = res.data.data;
+      var arr = [1219, 2089, 3031];
+      for(var i = 0; i < plusCard.length;i++){
+        plusCard[i].free=arr[i];
+      }
+     
       th.setData({
-        plusCard: res.data.data
+        is_plusCard: plusCard 
       })
     })
 
diff --git a/pages/user/plus/plus.wxml b/pages/user/plus/plus.wxml
index 468cf4b..68905c5 100644
--- a/pages/user/plus/plus.wxml
+++ b/pages/user/plus/plus.wxml
@@ -1,8 +1,9 @@
 <!-- 我的会员背景图片 -->
+<import src="../../../utils/wxParse/wxParse.wxml"></import>
 <view>
   <image class="Member_bk" src="{{url}}/miniapp/images/plus/page_bk.png"></image>
 </view>
-
+ 
 <view class="plus">
   <!-- 开通会员模块 -->
   <view class="Opening_plus">
@@ -10,28 +11,30 @@
       <image src="{{url}}/miniapp/images/plus/card_bk.png"></image>
     </view>
     <view class="swiper">
-      <block wx:if="{{j}}">
+      <block wx:if="{{!is_card}}">
+  
         <!-- 未开通会员swiper-item -->
         <swiper current="{{currentId}}" current-item-id="{{currentId}}" next-margin="55rpx" previous-margin="55rpx" bindchange="swiperChange">
 
-          <swiper-item class="flex" item-id="{{index}}" data-item-id="{{index}}" wx:for="{{plusCard}}">
+          <swiper-item class="flex" item-id="{{index}}" data-item-id="{{index}}" wx:for="{{is_plusCard}}">
             <view class="Membership {{currentId==index?'enlarge':''}}" style=" background-image: url({{item.CardImg}});color:{{item.CardColor}}">
 
               <view class="flex-space-between Membership_go">
                 <view>
                   <view class="fs32">{{item.CardName}}</view>
-                  <view class="fs24 Membership_remarks">开通会员年卡仅199元</view>
+                  <view class="fs24 Membership_remarks">开通会员年卡仅{{item.CardFee}}元</view>
                 </view>
-                <view class="Opening fs24 xc-black" bindtap="Opening">立即开通
+                <view class="Opening fs24 xc-black"data-ind="{{index}}" style="background:{{item.CardColor}}" bindtap="Opening">立即开通
                 </view>
 
               </view>
 
               <view class="flex-vertical-between consumption">
 
-                <view class="flex-vertical fs22">
-                  <image class="Member" src="{{url}}/miniapp/images/plus/privilege_o.png"></image>
-                  <view>根据大家购买数据，您成为超级会员预计可省￥2899元
+                <view class="flex-vertical fs22" style="overflow:hidden">
+                  <!-- <image class="Member" src="{{url}}/miniapp/images/plus/privilege_o.png" style="filter:drop-shadow( 20rpx 0 0px {{item.CardColor}});"></image> -->
+                  <view class="Member"style="background-image:url('{{url}}/miniapp/images/plus/privilege_o.png');filter: drop-shadow( 40rpx 0rpx 0rpx {{item.CardColor}});"></view>
+                  <view>根据大家购买数据，您成为超级会员预计可省￥{{item.free}}元
                   </view>
                 </view>
               </view>
@@ -40,11 +43,8 @@
         </swiper>
       </block>
       <block wx:else>
+          
         <!-- 已开通 -->
-
-
-
-
         <view class="MemberPlus" style=" background-image: url({{url}}/miniapp/images/plus/card_one.jpg);">
 
           <view class="flex-space-between">
@@ -74,7 +74,7 @@
 
 
       </block>
-      <view wx:if="{{j==false}}" class="flex-vertical-between Invitation fs30">
+      <view wx:if="{{is_card}}" class="flex-vertical-between Invitation fs30">
 
         <view class="flex">
           已邀请
@@ -123,24 +123,13 @@
     </view>
 
     <!-- 会员权益内容 -->
-    <view class="Courtesy_comment fs24">
-
-      <view class="flex">
-        <view>1、</view>
-        <view>可以领取880元黑卡专享礼包</view>
-      </view>
-      <view class="flex-center">
-        <image class="t-c Equity_image" src="../../../images/plus/purchase_Bk.png"></image>
-      </view>
-      <view class="flex">
-        <view>2、</view>
-        <view>可以领取880元黑卡专享礼包</view>
-      </view>
+    <view class="Courtesy_comment " wx:if="{{is_card_rule!=null&&is_card_rule!=''}}">
 
-      <view class="flex">
-        <view>3、</view>
-        <view>可以领取880元黑卡专享礼包</view>
-      </view>
+     
+     <view class="wxParse">
+     <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
+     </view>
+    
     </view>
   </view>
 
@@ -190,14 +179,14 @@
   <!-- 弹框 -->
   <view class="Member_purchase">
     <view class="rel purchase_Bk" style="background-image: url({{url}}/miniapp/images/plus/card_one.jpg);">
-      <image class="abs write" src="../../../images/plus/write.png"></image>
+      <image class="abs write" src="{{url}}/miniapp/images/plus/write.png"></image>
     </view>
     <view class="fs26 inf_com">
       <view class="fs36 flex-level perfect">请完善下面信息</view>
       <view class="fillin">
         <!-- 输入推荐人手机号 -->
         <view class="flex ai_and Enter_phone">
-          <image class="phone_image" src="../../../images/plus/Invitation_code.png"></image>
+          <image class="phone_image" src="{{url}}/miniapp/images/plus/Invitation_code.png"></image>
           <view class="phone">
             <input placeholder="请输入邀请码(推荐人手机号)" type="number" maxlength="30" />
           </view>
@@ -205,7 +194,7 @@
 
         <!-- 输入营业员 -->
         <view class="flex ai_and enter_SalesClerk">
-          <image class="SalesClerk_image" src="../../../images/plus/Sales_Clerk.png"></image>
+          <image class="SalesClerk_image" src="{{url}}/miniapp/images/plus/Sales_Clerk.png"></image>
           <view class="SalesClerk">
             <input placeholder="请输入营业员" maxlength="30" />
           </view>
@@ -219,7 +208,7 @@
       </view>
     </view>
     <view class="flex-level">
-      <image class="purchaseClose" bindtap="OpeningClose" src="../../../images/plus/Close.png"></image>
+      <image class="purchaseClose" bindtap="OpeningClose" src="{{url}}/miniapp/images/plus/Close.png"></image>
     </view>
   </view>
 
@@ -228,14 +217,5 @@
 <!-- 画布 -->
 
 <canvas canvas-id='myCanvas' style="width:750rpx;height:1330rpx;"></canvas>
-<!-- < 分享图片 -->
-<!-- <view class="mc" wx:if="{{isshare}}" catchtap="isshare">
-  <!-- 蒙尘 -->
-  <!-- <view>
-    <image src="{{imagePath}}"></image>
-  </view>
-  <view class="flex-center Close">
-    <image src="../../../images/plus/Close.png" bindtap="isshare"></image>
-  </view>
-</view> -->  -->
+
 <warn id="warn"></warn>
\ No newline at end of file
diff --git a/pages/user/plus/plus.wxss b/pages/user/plus/plus.wxss
index c2500a2..22d930d 100644
--- a/pages/user/plus/plus.wxss
+++ b/pages/user/plus/plus.wxss
@@ -1,3 +1,4 @@
+@import "../../../utils/wxParse/wxParse.wxss";
 page {
   width: 100%;
   height: 100%;
@@ -161,6 +162,10 @@ swiper {
   width: 30rpx;
   height: 30rpx;
   margin-right: 5rpx;
+  background-size: 100% 100%;
+position: relative;
+left: -40rpx;
+
 }
 
 .Membership .Opening {
@@ -350,6 +355,7 @@ swiper {
 }
 
 input {
+
   overflow: visible;
   width: 360rpx;
 }