积分模块

packageMemberIntegral/pages/integralIndex/integralIndex.js

@@ -8,7 +8,8 @@ Page({
    */
   data: {
     current: 1,
-    scoreProdList: []
+    scoreProdList: [],
+    scoreInfo:{},
   },
 
   /**
@@ -56,7 +57,9 @@ Page({
     var params = {
       url: '/p/score/scoreInfo',
       method: 'GET',
-      data: {},
+      data: {
+        platform:1
+      },
       callBack: res => {
         this.setData({
           scoreInfo: res
@@ -71,11 +74,12 @@ Page({
    */
   getScoreProdList() {
     var param = {
-      url: "/p/score/prodScorePage",
+      url: "/p/score/page",
       method: "GET",
       data: {
         current: this.data.current,
         size: 10,
+        platform:1
       },
       callBack: (res) => {
         wx.hideLoading()

packageMemberIntegral/pages/integralIndex/integralIndex.wxml

@@ -2,19 +2,19 @@
 <view class="integral-index">
   <view class="num-box">
     <view class="num-item">
-      <view class="num">100</view>
+      <view class="num">{{scoreInfo.totalRechargedPoints}}</view>
       <view class="desc">总充值积分</view>
     </view>
     <view class="num-item">
-      <view class="num">100</view>
+      <view class="num">{{scoreInfo.totalAvailablePoints}}</view>
       <view class="desc">当前可用积分</view>
     </view>
     <view class="num-item">
-      <view class="num">100</view>
+      <view class="num">{{scoreInfo.expiredPoints}}</view>
       <view class="desc">已过期积分</view>
     </view>
     <view class="num-item">
-      <view class="num">100</view>
+      <view class="num">{{scoreInfo.consumedPoints}}</view>
       <view class="desc">已消耗积分</view>
     </view>
   </view>
@@ -22,12 +22,12 @@
       <view class="title">可用积分记录</view>
       <view class="item" wx:for="{{scoreProdList}}" wx:key="prodId" >
         <view class="title-box">
-          <view class="title">购物</view>
-          <view class="num {{item.num>0?'green':''}}">{{item.num>0?'+':'-'}}{{item.num}}</view>
+          <view class="title">{{item.pointsTypeStr}}</view>
+          <view class="num {{item.variablePointsStr>0?'green':''}}">{{item.variablePointsStr}}</view>
         </view>
         <view class="time-box">
-          <view class="time">9月17日 12：48</view>
-          <view class="total">当前可用积分 100</view>
+          <view class="time">{{item.creationDateStr}}</view>
+          <view class="total">当前可用积分 {{item.totalAvailablePoints}}</view>
         </view>
       </view>
     <view class="empty" wx:if="{{!scoreProdList.length}}">暂无数据</view>

project.private.config.json

@@ -1,6 +1,6 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "%E5%B8%82%E6%B0%91%E8%AF%B7%E9%9B%86%E5%90%88%E5%95%86%E5%AE%B6%E7%AB%AF",
+  "projectname": "%25E5%25B8%2582%25E6%25B0%2591%25E8%25AF%25B7%25E9%259B%2586%25E5%2590%2588%25E5%2595%2586%25E5%25AE%25B6%25E7%25AB%25AF",
   "setting": {
     "compileHotReLoad": true,
     "urlCheck": false,
@@ -19,60 +19,6 @@
     "ignoreDevUnusedFiles": true,
     "bigPackageSizeSupport": false
   },
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "pages/chooseRefundWay/chooseRefundWay",
-          "pathName": "pages/chooseRefundWay/chooseRefundWay",
-          "query": "",
-          "scene": null,
-          "launchMode": "default"
-        },
-        {
-          "name": "售后详情页",
-          "pathName": "pages/DetailsOfRefund/DetailsOfRefund",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "申请售后",
-          "pathName": "pages/applyRefund/applyRefund",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/Review/Review",
-          "pathName": "pages/Review/Review",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "/pages/prodComm/prodComm",
-          "pathName": "/pages/prodComm/prodComm",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "订单详情",
-          "pathName": "pages/order-detail/order-detail",
-          "query": "orderNum=1879794296853499904",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/submit-order/submit-order",
-          "pathName": "pages/submit-order/submit-order",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        }
-      ]
-    }
-  },
+  "condition": {},
   "libVersion": "3.9.3"
 }

utils/config.js

@@ -2,13 +2,13 @@
 // var domain = "https://shop-h5.zswllife.cn/api"; //统一接口域名，正式环境 
 // var wsDomain = "wss://shop-h5.zswllife.cn/api"; //统一接口域名，正式环境 
 
-var domain = "https://bus.qlapp.cn"; //统一接口域名，测试环境 
-var wsDomain = "wss://shop-h5.dev.zswllife.cn/api"; //统一接口域名，测试环境 
+// var domain = "https://bus.qlapp.cn"; //统一接口域名，测试环境 
+// var wsDomain = "wss://shop-h5.dev.zswllife.cn/api"; //统一接口域名，测试环境 
 // var domain = "https://shop.haimamart.com/api"; //统一接口域名，正式环境 
 // var wsDomain = "wss://shop.haimamart.com/api"; //统一接口域名，正式环境 
 
-// var domain = "http://192.168.1.120:8086"; //统一接口域名，测试环境
-// var wsDomain = "ws://192.168.1.120:8086"; //统一接口域名，测试环境
+var domain = "http://192.168.1.205:8112"; //统一接口域名，测试环境
+var wsDomain = "ws://192.168.1.120:8112"; //统一接口域名，测试环境
 
 var picDomain = "http://img-test.gz-yami.com/";//图片域名