修改积分兑换记录bug

src/pages/coupons/coupons.js

@@ -73,7 +73,9 @@ wxService.page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad () {},
+  onLoad () {
+    wx.hideShareMenu();
+  },
   /**
    * 生命周期函数--监听页面显示
    */

src/pages/integralWater/integralWater.js

@@ -23,7 +23,9 @@ wxService.page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad() {},
+  onLoad() {
+    wx.hideShareMenu();
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

src/project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 20,
+			"current": 21,
 			"list": [
 				{
 					"id": -1,
@@ -173,6 +173,11 @@
 					"name": "积分换物记录",
 					"pathName": "subPackage/page/pages/recordList/recordList",
 					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "积分商城新",
+					"pathName": "subPackage/page/pages/IntegralMallGoods/IntegralMallGoods"
 				}
 			]
 		}

src/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.js

@@ -27,6 +27,7 @@ wxService.page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) { 
+    wx.hideShareMenu();
     this.initIntegralCouponList();
     this.initIntegralProductList();
   },

src/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.wxml

 <!--pages/userCenter.wxml-->
-<view class='page-integral-mall' style="padding-bottom: {{currentTab =='goods' ? '70rpx' : '40rpx'}}">
-  <!-- 新布局 -->
-  <view class='new-container'>
-    <view class='new-container-lf'>
-      <view class='new-point-info'>
-        <image class="point-img" src='/assets/imgs/point.png' mode="widthFix" />
-        <label class='text-point'>{{memberPoint.total}}</label>
-      </view>
-      <view class='title-time-point' wx:if="{{memberPoint.expirePoint > 0}}">
-        {{memberPoint.expirePoint}} 积分将于 {{memberPoint.expireDate}} 清零
-      </view>
-      <view class='title-time-point' wx:if="{{memberPoint.expirePoint == 0}}">暂无将过期积分</view>
+<view class='page-integral-mall' style="padding-bottom: {{currentTab =='goods' ? '80rpx' : '40rpx'}}">
+	<!-- title -->
+	<view class='mall-title'>
+		<view class='title-num-point'>
+			<view class='title-img-point'>
+				<view class='img-point'>
+					<image class="point-img" src='/assets/imgs/integral_exchange/point.png' mode="widthFix" />
+				</view>
+				<view class='text-point'>
+					{{memberPoint.total}}
+				</view>
+			</view>
+			<view class='integral-vip-rules' wx:if="{{integralCouponList.length}}" bindtap="handleGoMemberRulesRules">会员规则</view>
+		</view>
+		<view class='title-time-point' wx:if="{{memberPoint.expirePoint > 0}}">
+      {{memberPoint.expirePoint}} 积分将于 {{memberPoint.expireDate}} 清零
     </view>
-    <view class='new-container-rg'>
-      <view class='new-integral-vip-rules' wx:if="{{integralCouponList.length}}" bindtap="handleGoMemberRulesRules">会员规则</view>
+    <view class='title-time-point' wx:if="{{memberPoint.expirePoint == 0}}">
+      暂无将过期积分
     </view>
-  </view>
+	</view>
 
 	<!-- tab -->
 	<view class='mall-tab' wx:if="{{integralGoodsList.length > 0}}">
@@ -110,6 +114,8 @@
 
 	<exchange-coupon-modal exchangeId="{{exchangeId}}" exchangePoint="{{exchangePoint}}" isExchange='{{isExchange}}' />
 	<!--<no-more wx:if="{{noMore}}"/>-->
+	<!--goHome-->
+	<go-home/>
 </view>
 <!-- 库存没了 -->
 <dialog-stock-empty show="{{dialogStockEmpty}}"/>

src/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.wxss

@@ -23,61 +23,6 @@ page {
   font-size: 28rpx;
 }
 
-/* 新布局开始 */
-.new-container{
-  height: 150rpx;
-  padding-left: 50rpx;
-  padding-right: 42rpx;
-  box-sizing: border-box;
-  background-color: rgba(255, 255, 255, 1);
-  box-shadow: 0px 0px 8px 5px rgba(0, 0, 0, 0.05),
-    0px 0px 3px 0px rgba(0, 0, 0, 0.03);
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.new-container .new-container-lf{
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-}
-
-.new-container .new-container-lf .new-point-info{
-  display: flex;
-  align-items: center;
-}
-
-.new-container .new-container-lf .new-point-info image{
-  width:28rpx;
-  height:36rpx;
-  margin-right: 10rpx;
-}
-
-.new-container .new-container-rg{
-
-}
-
-.new-container .new-container-rg .new-integral-vip-rules{
-    width: 133rpx;
-    height: 42rpx;
-    line-height: 42rpx;
-    border-radius: 34rpx;
-    font-size: 23rpx;
-    text-align: center;
-    border: 1px solid rgba(204, 204, 204, 1);
-}
-
-.title-time-point {
-  color: rgba(102, 102, 102, 1);
-  font-size: 22rpx;
-  text-align: left;
-  margin-top: 8rpx;
-}
-
-
-/* 新布局结束 */
-
 /* 卡劵列表 */
 .coupon-wrap {
   padding: 20rpx;
@@ -201,11 +146,11 @@ page {
   display: flex;
   justify-content: center;
   align-items: center;
-  height: 70rpx;
+  height: 80rpx;
   position: fixed;
   left: 0;
   bottom: 0;
-  background: red;
+  background: rgba(0, 0, 0, 0.65);
   z-index: 2;
   width: 100%;
 }
@@ -243,7 +188,13 @@ page {
   text-align: center;
   border: 1px solid rgba(204, 204, 204, 1);
 }
-
+.title-time-point {
+  color: rgba(102, 102, 102, 1);
+  font-size: 20rpx;
+  text-align: left;
+  padding-top: 3rpx;
+  margin-top: 15rpx;
+}
 
 .mall-tab {
   height: 80rpx;

src/subPackage/page/pages/IntegrateGoodsExchangeInfo/IntegrateGoodsExchangeInfo.js

@@ -11,7 +11,7 @@ wxService.page({
    */
   data: {
     isExchange: false,
-    dialogUserLimit : false,
+    dialogUserLimit: false,
     integralMallDetail: {}
   },
 
@@ -33,18 +33,18 @@ wxService.page({
       title: '检查兑换资格中..',
     });
     wxService.post(`/member/pointsRedemptionProductRecord/checkByMemberIdAndSettingId?memberId=${memberId}&settingId=${id}`).
-    then(res => {
-      if (res.data.data == -1) {
-        this.setData({
-          dialogUserLimit: true
-        })
-      }
-      else {
-        wx.navigateTo({
-          url: '/subPackage/page/pages/exchangeAddress/exchangeAddress?id=' + id,
-        });
-      }
-    });
+      then(res => {
+        if (res.data.data == -1) {
+          this.setData({
+            dialogUserLimit: true
+          })
+        }
+        else {
+          wx.navigateTo({
+            url: '/subPackage/page/pages/exchangeAddress/exchangeAddress?id=' + id,
+          });
+        }
+      });
   },
 
   //获取积分兑换优惠券详情

src/subPackage/page/pages/IntegrateGoodsExchangeInfo/IntegrateGoodsExchangeInfo.wxml

@@ -24,4 +24,6 @@
 <view class="position-bottom">
 	<button type='primary' class="redeem-now" bindtap='exchange'>立即兑换</button>
 </view>
+<!--goHome-->
+<go-home/>
 <dialog-user-limit show="{{dialogUserLimit}}"/>

src/subPackage/page/pages/recordList/recordList.js

@@ -11,13 +11,15 @@ wxService.page({
     pageSize : 10,
     totalPage : 0,
     recordList: [],
-    hasMore : false
+    hasMore : false,
+    userIsNotLogin : false
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    wx.hideShareMenu();
     wx.showLoading({
       title: '正在加载数据..',
     });
@@ -38,6 +40,15 @@ wxService.page({
     const { memberId } = wx.getStorageSync('_baseUserInfo')
     let pageNo = this.data.pageNo,
       pageSize = this.data.pageSize;
+    if(!memberId){
+      //提示错误
+      this.setData({
+        userIsNotLogin : true
+      });
+      
+      return ;
+    }
+
     wxService.post(`/member/pointsRedemptionProductRecord/page?pageNo=${pageNo}&pageSize=${pageSize}`,{
       memberId: memberId
     }).then(res => {

src/subPackage/page/pages/recordList/recordList.json

 {
-  "navigationBarTitleText": "兑换记录"
+  "navigationBarTitleText": "兑换记录",
+  "usingComponents": {
+    "authorization-modal": "/component/authorization-modal/authorization-modal"
+  }
 }
\ No newline at end of file

src/subPackage/page/pages/recordList/recordList.wxml

@@ -28,3 +28,6 @@
 </view>
 <view class='empty' wx:if="{{recordList.length == 0 }}">无任何兑换记录~</view>
 
+<!-- 登录 -->
+<authorization-modal isAuthorization='{{userIsNotLogin}}'/>
+