add： 积分商城页面

src/app.json

@@ -59,7 +59,8 @@
         "pages/noPermission/noPermission",
         "pages/scanCoupon/scanCoupon",
         "pages/scanCouponStoreList/scanCouponStoreList",
-        "pages/recordList/recordList"
+        "pages/recordList/recordList",
+        "pages/IntegralMallGoods/IntegralMallGoods"
       ]
     },
     {

src/project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 62,
+			"current": 63,
 			"list": [
 				{
 					"id": -1,
@@ -455,6 +455,12 @@
 					"pathName": "subPackage/page/pages/recordList/recordList",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "积分商城新",
+					"pathName": "subPackage/page/pages/IntegralMallGoods/IntegralMallGoods",
+					"scene": null
 				}
 			]
 		}

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

+// pages/userCenter.js
+const wxService = require('../../../../utils/wxService')
+
+wxService.page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    pageNo: 1,
+    pageSize: 10,
+    query: '',
+    totalPages: 0,
+    integralCouponList: [], // 积分兑换优惠券列表
+    noMore: false,
+    isExchange: false,
+    exchangeId: '',
+    exchangePoint: 0,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {},
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    this.initIntegralCouponList()
+  },
+
+  // 积分兑换优惠券列表
+  initIntegralCouponList() {
+    wx.showLoading({
+      title: '加载中'
+    })
+  //   wxService.get(`/coupon/pointsRedemptionCouponSetting/findPage?pageNo=${pageNo}&pageSize=${pageSize}&query=${this.data.query}`).then(res => {
+  //     const {result,data} = res.data
+  //     if(result == 0){
+  //        wx.hideLoading()
+  //        this.setData({
+  //         integralCouponList: this.data.pageNo == 1? [...data.content]: [...this.data.integralCouponList,...data.content],
+  //         totalPages: data.totalPages
+  //        })
+  //     }
+
+  //   }).finally(() => {
+  //     wx.hideLoading();
+  //   })
+    // 查询所有生效中的活动
+    wxService.get(`/coupon/pointsRedemptionCouponSetting/getAllValid`).then(res => {
+      if(res){
+        const {result,data} = res.data
+        if(result == 0){
+           wx.hideLoading()
+           this.setData({
+            integralCouponList: data.reverse()
+           })
+        }
+      }
+    }).finally(() => {
+      wx.hideLoading();
+    })
+  },
+  //立即兑换
+  exchange(e){
+    const {id, point} = e.currentTarget.dataset
+    this.setData({
+      isExchange :true,
+      exchangeId: id,
+      exchangePoint: point
+    })
+  },
+  // 点击跳转至会员规则页
+  handleGoMemberRulesRules() {
+    wxService.router(`/pages/memberRules/memberRules?type=2`)
+  },
+  goCouponDetail(e) {
+    const {id} = e.currentTarget.dataset
+    wxService.router(`/pages/integralMallDetail/integralMallDetail?id=${id}`)
+  },
+  /**
+  * 页面相关事件处理函数--监听用户下拉动作
+  */
+  onPullDownRefresh: function () {},
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    // if (this.data.pageNo < this.data.totalPages) {
+    //   this.setData({
+    //       pageNo: this.data.pageNo + 1,
+    //       pageSize: 10,
+    //       noMore: true
+    //   })
+    //   this.initIntegralCouponList(this.data.pageNo, this.data.pageSize)
+    // } else {
+    //   this.setData({
+    //     noMore: true
+    //   })
+    // }
+  },
+})
\ No newline at end of file

src/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.json

+{
+  "enablePullDownRefresh":true,
+  "navigationBarTitleText": "积分商城",
+  "usingComponents": {
+    "no-more": "/component/noMore/noMore",
+    "exchange-coupon-modal": "/component/exchange-coupon-modal/exchange-coupon-modal",
+    "go-home": "/component/goHome/goHome"
+  }
+}
\ No newline at end of file

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

+<!--pages/userCenter.wxml-->
+<view class='page-integral-mall' style="padding-bottom: 40rpx">
+	<view class='integral-vip-rules' wx:if="{{integralCouponList.length}}" bindtap="handleGoMemberRulesRules">会员规则</view>
+	<view class='coupon-wrap' wx:if="{{integralCouponList.length}}">
+		<view
+		 class='coupon-list'
+		 wx:for="{{integralCouponList}}"
+		 wx:for-item="item"
+		 wx:for-index="k"
+		 wx:key="{{k}}"
+		 data-id="{{item.id}}"
+		 bindtap="goCouponDetail"
+		>
+			<view class="coupon-item">
+				<view class='coupon-img'>
+					<image wx:if="{{item.thumbnail}}" src='{{item.thumbnail}}' />
+					<image wx:else src='/assets/imgs/qr-code.png' />
+				</view>
+				<view class='coupon-info'>
+					<view class='coupon-time fs-24'>{{item.point}}积分</view>
+					<view class='coupon-name fs-28'>{{item.title}}</view>
+					<view class='coupon-desc fs-24'>查看详情 >>></view>
+				</view>
+				<view
+				 class='coupon-code fs-24'
+				 data-id="{{item.id}}"
+				 data-point="{{item.point}}"
+				 catchtap='exchange'
+				>立即兑换
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class='empty-wrap' wx:if="{{!integralCouponList.length}}">
+		<view class='empty-info'>
+			<image class='empty-img' src='/assets/imgs/empty-coupon.png' />
+			<view class='empty-text'>没有任何卡劵</view>
+		</view>
+	</view>
+	<exchange-coupon-modal exchangeId="{{exchangeId}}" exchangePoint="{{exchangePoint}}" isExchange='{{isExchange}}' />
+	<!--<no-more wx:if="{{noMore}}"/>-->
+	<!--goHome-->
+	<go-home/>
+</view>
+

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

+/* pages/userCenter.wxss */
+@import '/base/base.wxss';
+
+page {
+  background-color: rgba(0, 0, 0, 0.05);
+}
+.integral-vip-rules{
+  width:140rpx;
+  height:35rpx;
+  line-height: 35rpx;
+  text-align: center;
+  color: rgb(64, 205, 147);
+  font-size: 28rpx;
+  font-weight: 700;
+  border: 4rpx solid rgb(64, 205, 147);
+  padding: 5rpx 8rpx;
+  border-radius: 50rpx;
+  margin-top: 25rpx;
+  float: right;
+  margin-right: 20rpx;
+}
+.empty-wrap{
+  width: 300rpx;
+  margin: 190rpx auto 0;
+  text-align: center;
+}
+.empty-img{
+  width: 197rpx;
+  height: 176rpx;
+  margin-bottom: 48rpx;
+}
+.empty-text{
+  color: #cccccc;
+  font-size: 28rpx;
+}
+
+/* 卡劵列表 */
+.coupon-wrap{
+  padding: 20rpx;
+  clear: both;
+}
+.coupon-list{
+  margin-bottom: 20rpx;
+}
+.coupon-item {
+  display: flex;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 100% 100%;
+  background-image: url("data:image/png;base64,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")
+}
+
+.coupon-img {
+  padding: 15rpx;
+  box-sizing: border-box;
+}
+.coupon-img image{
+  width: 172rpx;
+  height: 172rpx;
+}
+.coupon-info{
+  padding: 42rpx 39rpx;
+  box-sizing: border-box;
+}
+.coupon-name{
+  color:#333;
+}
+.coupon-time{
+  color:#fc921e;
+  margin-bottom: 18rpx;
+  font-size: 26rpx;
+}
+.coupon-desc{
+  color:#999;
+  margin-top: 11rpx;
+  width: 360rpx;
+  font-size: 24rpx;
+}
+.coupon-code{
+  color: #ffffff;
+  word-wrap: break-word; 
+  font-weight: bold;
+  margin: 0 10rpx;
+  padding: 35rpx 20rpx;
+  box-sizing: content-box;
+  width: 40rpx;
+  line-height: 35rpx;
+}
+.invalid-coupon{
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  background-color: rgba(0,0,0,0.5);
+  z-index:3;
+  border-radius: 7rpx;
+}
+.invalid-img{
+  position: absolute;
+  width: 147rpx;
+  height: 147rpx;
+  right: 81rpx;
+  top: 31rpx;
+  z-index: 4;
+}