Merge branch 'dev' into feature-zyw

src/pages/integralWater/integralWater.js

@@ -9,9 +9,20 @@ wxService.page({
    * 页面的初始数据
    */
   data: {
-
+    integralNum: 1246
+  },
+  // 点击跳转至会员规则页
+  handleGoMemberRulesRules() {
+    wxService.router(`/pages/memberRules/memberRules`)
+  },
+   // 去积分商城
+  handleGoIntegralMall() {
+    wxService.router(`/pages/IntegralMall/IntegralMall`)
+  },
+  // 消费详情
+  handleGoDetail() {
+    wxService.router(`/pages/consumptionDetails/consumptionDetails`)
   },
-
   /**
    * 生命周期函数--监听页面加载
    */

src/pages/integralWater/integralWater.wxml

-<!--pages/userCenter.wxml-->
-<text>pages/userCenter.wxml</text>
+<!--pages/integralWater.wxml-->
+<view class='integral'>
+  <view class="integral-detail">
+      <view class="integral-num">
+        <view class="num-current">{{integralNum}}</view>
+        <view class="num-title">当前积分</view>
+      </view>
+      <view class="integral-vip-rules" bindtap="handleGoMemberRulesRules">会员规则</view>
+  </view>
+
+  <view class="detail-list-no">还没有任何积分记录</view>
+  <view>
+    <view class="integral-tips">
+      <view class="tips-detail">显示你最近30笔变动明细</view>
+      <span class="tips-much">这么多积分</span><span class="tips-gomall" bindtap="handleGoIntegralMall"> 去积分商城看看>>> </span>
+    </view>
+    <!--积分列表-->
+    <view>
+      <view class="detail-integral" bindtap="handleGoDetail">
+        <view>
+          <view class="detail-title">购物送积分</view>
+          <view class="detail-time">2019-01-01</view>
+        </view>
+        <view class="detail-num">+10</view>
+      </view>
+    </view>
+
+    <view class="detail-list-bottom">-已经到底啦-</view>
+
+  </view>
+</view>

src/pages/memberRules/memberRules.js

-// pages/userCenter.js
+// pages/memberRules.js
 const app = getApp()
 const wxService = require('../../utils/wxService')
 const utils = require('../../utils/util')
@@ -9,7 +9,20 @@ wxService.page({
    * 页面的初始数据
    */
   data: {
-
+    memberRules:[
+      {
+        rule: '注册会员赠送200积分'
+      },
+      {
+        rule: '消费1元积1分'
+      },
+      {
+        rule: '生日当月消费双倍积分'
+      },
+      {
+        rule: '积分可全场当现金抵用，每100积分抵1元'
+      }
+    ]
   },
 
   /**

src/pages/memberRules/memberRules.wxml

-<!--pages/userCenter.wxml-->
-<text>pages/userCenter.wxml</text>
+<!--pages/memberRules.wxml-->
+<view class="memberRules">
+  <view class="rules-title">会员积分规则</view>
+ <view class="rules-list">
+  <ul wx:for="{{memberRules}}" wx:for-item="item" wx:for-index="k" wx:key="{{k}}" >
+    <li class="rules-item">
+      <view>{{item.rule}}</view>
+    </li>
+  </ul>
+ </view>
+</view>

src/pages/memberRules/memberRules.wxss

-/* pages/userCenter.wxss */
+/* pages/memberRules.wxss */
\ No newline at end of file
+.memberRules{
+  padding: 20rpx 30rpx;
+}
+.rules-title {
+  font-size: 30rpx;
+  font-weight: 700;
+  margin-bottom: 40rpx;
+}
+.rules-list{
+  padding-left: 40rpx;
+}
+.rules-item {
+  font-size: 28rpx;
+}
\ No newline at end of file

src/project.config.json

@@ -37,12 +37,25 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 0,
+			"current": 2,
 			"list": [
 				{
 					"id": -1,
 					"name": "会员中心",
-					"pathName": "pages/userCenter/userCenter"
+					"pathName": "pages/userCenter/userCenter",
+					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "积分流水",
+					"pathName": "pages/integralWater/integralWater",
+					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "会员规则",
+					"pathName": "pages/memberRules/memberRules",
+					"query": ""
 				}
 			]
 		}