超值卡

src/app.js

@@ -115,9 +115,9 @@ App({
     imageUrl: envInfo.imgCtx, //图片地址
     isFullSucreen: false, // 当前设备是否为 FullSucreen
     commonFunc: commonFunc,
-    // brandId: 2711,
+    brandId: 2711,
     // brandId: 2005,
     // brandId: 1001,
-    brandId: 1002,
+    // brandId: 1002,
   }
 })

src/component/empty/empty.js

+// component/empty/empty.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    show : Boolean,
+    text : {
+      type : String,
+      default : '暂无数据~'
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})

src/component/empty/empty.json

+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file

src/component/empty/empty.wxml

+<!--component/empty/empty.wxml-->
+<view class='page-empty'>
+  <image src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/empty.png' mode='aspectFit'></image>
+  <view>{{text}}</view>
+</view>

src/component/empty/empty.wxss

+/* component/empty/empty.wxss */
+.page-empty{
+  width: 100%;
+  height: auto;
+  padding: 100rpx 40rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  font-size: 24rpx;
+  color: #999999;
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+}
+
+.page-empty image{
+  width: 200rpx;
+  height: 160rpx;
+  margin-bottom: 20rpx;
+}
\ No newline at end of file

src/config/index.js

-const PROJECT_ENV = 'test' // 生产 prod, 开发1 dev,开发2 dev2， 测试 test, 预生产 pre
+const PROJECT_ENV = 'prod' // 生产 prod, 开发1 dev,开发2 dev2， 测试 test, 预生产 pre
 const needMock = '' //
 
 // appid_dev_wx   wxc3b64b09b1d3dfc2

src/pages/userCenter/userCenter.js

@@ -154,7 +154,7 @@ wxService.page({
     })
    
     // 动态页面
-    wxService.post(`/merchant/modelPage/mainSetting/mall?brandId=${app.globalData.brandId}`).then(res => {
+    wxService.post(`/merchant/modelPage/mainSetting?brandId=${app.globalData.brandId}`).then(res => {
       if (!res) return false
       const { result, data } = res.data
       if (result == 0) {

src/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
-	"appid": "wxac09792264c49b5c",
+	"appid": "wx700028bf32a3be66",
 	"projectname": "7-11",
 	"debugOptions": {
 		"hidedInDevtools": []

src/subPackage/page/pages/myValueCard/myValueCard.js

@@ -8,12 +8,12 @@ wxService.page({
    * 页面的初始数据
    */
   data: {
-    no: '',
-    pageNum: 1,
-    pageSize: 10,
-    totalPage: 0,
-    isNoData: false,
-    myCardsList: []
+    no : '',
+    pageNum : 1,
+    pageSize  : 10,
+    totalPage : 0,
+    isNoData :false,
+    myCardsList : []
   },
 
   /**
@@ -32,17 +32,17 @@ wxService.page({
   },
 
   //barcode 失败回调
-  canvasIdErrorCallback(e) {
+  canvasIdErrorCallback(e){
 
   },
   //跳转到购买记录
-  onTapToBuyRecords() {
+  onTapToBuyRecords(){
     wx.navigateTo({
       url: '/subPackage/page/pages/valueCardRecords/valueCardRecords',
     });
   },
   //跳转到详情
-  onTapToInfoPage(e) {
+  onTapToInfoPage(e){
     let item = e.currentTarget.dataset.item;
     wx.navigateTo({
       url: '/subPackage/page/pages/myValueCardInfo/myValueCardInfo?id=' + item.id,
@@ -50,13 +50,13 @@ wxService.page({
   },
 
   //刷新no
-  onTapRefreshNo(e) {
+  onTapRefreshNo(e){
     let supValCardId = e.currentTarget.dataset.id;
     let index = e.currentTarget.dataset.index;
     let url = `/merchant/superValueCard/miniProgram/getChangeCode?supValCardId=${supValCardId}`;
     wxService.post(url).then(res => {
       if (res) {
-        if (res.data.data) {
+        if (res.data.data){
           let no = res.data.data;
           this.data.no = no;
           let canvasId = 'barcode' + index;
@@ -69,10 +69,10 @@ wxService.page({
             });
           });
         }
-        else {
+        else{
           wx.showToast({
             title: '刷新失败，请重试',
-            icon: ' none'
+            icon : ' none'
           })
         }
       }
@@ -80,7 +80,7 @@ wxService.page({
   },
 
   //获取我的超值卡列表
-  getMyValueCardList(refresh) {
+  getMyValueCardList(refresh){
     const { member } = wx.getStorageSync('_baseUserInfo');
     if (!member) {
       wx.showToast({
@@ -99,12 +99,12 @@ wxService.page({
     pageSize = this.data.pageSize;
     let url = `/merchant/superValueCard/miniProgram/getPageList?memberId=${memeberId}&pageNum=${pageNum}&pageSize=${pageSize}`;
     wxService.post(url).then(res => {
-      if (res) {
+      if(res){
         let data = res.data.data ? res.data.data : [];
-        if (data.length == 0 && this.data.pageNum > 1) {
+        if(data.length == 0 && this.data.pageNum > 1){
           this.data.isNoData = true;
         }
-        else {
+        else{
           this.data.isNoData = false;
         }
         //buyAwayType 1 现金 2 积分
@@ -114,7 +114,7 @@ wxService.page({
           item.no = item.supValCardCode ? item.supValCardCode : item.supValCardId;
           item.id = item.supValCardId;
           item.startTime = item.startTime.substring(0, 10);
-          item.endTime = item.endTime.substring(0, 10);
+          item.endTime = item.endTime.substring(0,10);
         });
 
         this.data.myCardsList = this.data.myCardsList.concat(data);
@@ -124,7 +124,7 @@ wxService.page({
         })
       }
 
-      if (refresh) {
+      if(refresh){
         wx.showToast({
           title: '刷新成功',
         });
@@ -135,8 +135,8 @@ wxService.page({
     
   },
   //生成条形码
-  generatorBarCode(canvasId) {
-    if (this.data.no) {
+  generatorBarCode(canvasId){
+    if (this.data.no){
       wxbarcode.barcode(canvasId, this.data.no, 500, 100);
       setTimeout(() => {
         wxbarcode.barcode(canvasId, this.data.no, 500, 100);
@@ -144,11 +144,11 @@ wxService.page({
     }
   },
   //展开
-  onTapShowMoreInfo(e) {
+  onTapShowMoreInfo(e){
     let item = e.currentTarget.dataset.item;
     let index = e.currentTarget.dataset.index;
-    if (item.isOpen) {
-      return;
+    if (item.isOpen){
+      return ;
     }
 
     this.data.myCardsList.forEach(item => {
@@ -168,7 +168,7 @@ wxService.page({
   },
 
   //关闭
-  onTapCloseExtro(e) {
+  onTapCloseExtro(e){
     let index = e.currentTarget.dataset.index;
     this.data.myCardsList[index].isOpen = false;
     this.data.no = '';
@@ -193,7 +193,7 @@ wxService.page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-    if (!this.data.isNoData) {
+    if(!this.data.isNoData){
       this.data.pageNum++;
       this.getMyValueCardList();
     }

src/subPackage/page/pages/myValueCard/myValueCard.wxml

 <!--subPackage/page/pages/myValueCard/myValueCard.wxml-->
 <view class='my-value-card-list'>
   <view class='my-value-card-item'
+  wx:if="{{myCardsList.length > 0 }}"
   wx:for="{{myCardsList}}"
   wx:for-item="item"
   wx:for-index="idx"
@@ -41,6 +42,8 @@
       </view>
     </view>
   </view>
+
+  <view class='empty' wx:if="{{myCardsList.length == 0 }}">您还未购买任何超值卡~</view>
 </view>
 <view class='no-more' wx:if="{{isNoData}}">-- 我也是有底线滴 --</view>
 

src/subPackage/page/pages/myValueCard/myValueCard.wxss

@@ -179,3 +179,12 @@ view{
 .buy-records:active{
   opacity: 0.7;
 }
+
+.empty{
+  padding: 30rpx;
+  padding-top: 80rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #999999;
+}
\ No newline at end of file

src/subPackage/page/pages/myValueCardInfo/myValueCardInfo.js

@@ -58,13 +58,14 @@ wxService.page({
         }
 
         obj.activityDesc = obj.activityDesc ? JSON.parse(obj.activityDesc) : []; 
+        obj.hasDate = obj.activityDesc.filter(item => item.type == 1).length > 0;
         let descArr = JSON.parse(JSON.stringify(obj.activityDesc));
         descArr = descArr.filter(item => item.type != 1);
-        let tempArr = descArr.map(item => {
-          return item.value;
-        });
+        // let tempArr = descArr.map(item => {
+        //   return item.value;
+        // });
 
-        obj.descArr = tempArr;
+        obj.descArr = descArr;
         this.data.valueCardInfo = obj;
         this.setData({
           valueCardInfo: this.data.valueCardInfo,

src/subPackage/page/pages/myValueCardInfo/myValueCardInfo.wxml

@@ -40,7 +40,7 @@
 
 
 <view class='card-info-body'>
-  <view class='card-desc-item'>
+  <view class='card-desc-item' wx:if="{{valueCardInfo.hasDate}}">
     <view class='lf'>活动时间</view>
     <view class='rg'>{{valueCardInfo.startTime}} 至 {{valueCardInfo.endTime}}</view>
   </view>
@@ -52,14 +52,15 @@
     <view class='lf'>积分兑换</view>
     <view class='rg'>{{valueCardInfo.buyIntegration}}积分</view>
   </view>
-  <view class='card-desc-item'>
-    <view class='lf'>使用说明</view>
-    <view class='rg'>
-      <view class='list-item' 
+  <view class='card-desc-item' 
     wx:for="{{valueCardInfo.descArr}}"
     wx:for-item="item"
     wx:for-index="idx"
-      wx:key="*this"> {{idx + 1}}、{{item}}</view>
+    wx:key="*this">
+    <view class='lf'>{{item.label ? item.label : '说明内容' }}</view>
+    <view class='rg'>
+      <view class='list-item' 
+      >{{item.value}}</view>
     </view>
   </view>
 </view>

src/subPackage/page/pages/myValueCardInfo/myValueCardInfo.wxss

 /* subPackage/page/pages/myValueCardInfo/myValueCardInfo.wxss */
 page{
-  background: #ffffff;
+  background: #f2f2f2;
   box-sizing: border-box;
   -webkit-box-sizing: border-box;
 }
@@ -42,7 +42,7 @@ view{
   width: 100%;
   height: auto;
   padding: 30rpx 90rpx;
-  background: #f2f2f2;
+  background: #ffffff;
 }
 
 .left-num-container .left-icons{

src/subPackage/page/pages/valueCard/valueCard.js

@@ -46,7 +46,7 @@ wxService.page({
         });
       }
       wx.hideLoading();
-      if (refresh) {
+      if(refresh){
         setTimeout(() => {
           wx.showToast({
             title: '刷新成功',

src/subPackage/page/pages/valueCard/valueCard.json

@@ -2,5 +2,7 @@
   "navigationBarTitleText": "超值卡",
   "backgroundTextStyle": "dark",
   "enablePullDownRefresh": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "empty" : "../../../../component/empty/empty"
+  }
 }
\ No newline at end of file

src/subPackage/page/pages/valueCard/valueCard.wxml

 <!--subPackage/page/pages/valueCard/valueCard.wxml-->
-<view class='cards-list'>
+<view class='cards-list' wx:if="{{cardList.length > 0}}">
   <view class='card-item' 
   wx:for="{{cardList}}"
   wx:for-item="item"
@@ -12,4 +12,6 @@
   </view>
 </view>
 
-<view class='no-more'>-- 我也是有底线滴 --</view>
+<empty text="暂无任何超值卡活动哦~" wx:else/>
\ No newline at end of file
+
+<!-- <view class='no-more'>-- 我也是有底线滴 --</view> -->
\ No newline at end of file

src/subPackage/page/pages/valueCardInfo/valueCardInfo.js

@@ -7,11 +7,11 @@ wxService.page({
    * 页面的初始数据
    */
   data: {
-    id: null,
-    checked: false,
-    showModal: false,
-    valueCardInfo: {},
-    buyType: '2',//现金支付 2 积分兑换
+    id : null,
+    checked : false,
+    showModal : false,
+    valueCardInfo : {},
+    buyType : '2',//现金支付 2 积分兑换
   },
 
   /**
@@ -32,7 +32,7 @@ wxService.page({
   },
 
   //获取活动详情
-  getValueCardActivityInfo() {
+  getValueCardActivityInfo(){
     wx.showLoading({
       title: '加载中..',
     });
@@ -40,20 +40,22 @@ wxService.page({
     wxService.post(`/merchant/superValueCardActivity/miniProgram/getDetail?id=${this.data.id}`).then(res => {
       if (res) {
         let obj = res.data.data ? res.data.data : null;
-        if (obj) {
+        if(obj){
           obj.activityDesc = obj.activityDesc ? JSON.parse(obj.activityDesc) : [];
           this.data.buyType = obj.payWayType;
           obj.acPayMoney = parseFloat(obj.moneyAmount / 10 / 10).toFixed(2);
           obj.startTime = obj.startTime.substring(0, 10);
-          obj.endTime = obj.endTime.substring(0, 10);
-
+          obj.endTime = obj.endTime.substring(0,10);
+          obj.hasDate = obj.activityDesc.filter(item => item.type == 1).length > 0;
           //处理说明文本
           let descArr = JSON.parse(JSON.stringify(obj.activityDesc));
           descArr = descArr.filter(item => item.type != 1);
-          let tempArr = descArr.map(item => {
-            return item.value;
-          });
-          obj.descArr = tempArr;
+          // let tempArr = descArr.map(item => {
+          //   return item.value;
+          // });
+          // console.log(obj)
+
+          obj.descArr = descArr;
           this.data.valueCardInfo = obj;
           this.setData({
             buyType: this.data.buyType,
@@ -66,44 +68,44 @@ wxService.page({
   },
 
   //修改选中状态
-  onTapSwitchChecked() {
+  onTapSwitchChecked(){
     this.data.checked = !this.data.checked;
     this.setData({
       checked: this.data.checked
     });
   },
   //关闭modal
-  onTapCloseModal() {
+  onTapCloseModal(){
     this.setData({
-      showModal: false,
+      showModal : false,
     });
   },
   //查看rule
-  onTapViewRule() {
+  onTapViewRule(){
     this.setData({
-      showModal: true
+      showModal : true
     })
   },
   //同意并阅读
-  onTapModalAgree() {
+  onTapModalAgree(){
     this.setData({
       showModal: false,
-      checked: true,
+      checked : true,
     });
   },
   //立即购买
-  onTapBuy() {
-    if (!this.data.checked) {
-      return;
+  onTapBuy(){
+    if(!this.data.checked){
+      return ;
     }
 
     const { member } = wx.getStorageSync('_baseUserInfo');
-    if (!member) {
+    if(!member){
       wx.showToast({
         title: '请先去登录',
-        icon: 'none'
+        icon : 'none'
       })
-      return;
+      return ;
     }
 
     let memeberId = member.id,
@@ -111,10 +113,10 @@ wxService.page({
       storeId = '';
     let activityId = this.data.id;  
     let url = '';
-    if (this.data.buyType == 1) {
+    if (this.data.buyType == 1){
       url = `/merchant/superValueCard/miniProgram/buy?activityId=${activityId}&memberId=${memeberId}&payType=1&storeId=${storeId}`;
     }
-    else {
+    else{
       url = `/merchant/superValueCard/miniProgram/buy?activityId=${activityId}&memberId=${memeberId}&storeId=${storeId}`;
     }
     
@@ -124,11 +126,14 @@ wxService.page({
 
     wxService.post(url).then(res => {
       wx.hideLoading();
-      if (res.data.result == 0) {
+      if(res.data.result == 0){
+        this.setData({
+          checked: false,
+        });
         //现金支付
-        if (this.data.buyType == 1) {
+        if (this.data.buyType == 1){
           let data = res.data.data ? res.data.data : null;
-          if (data) {
+          if(data){
             let wxParams = data.wxParams;
             wx.requestPayment({
               timeStamp: wxParams.timeStamp,
@@ -136,7 +141,7 @@ wxService.page({
               package: wxParams.package,
               signType: wxParams.signType,
               paySign: wxParams.paySign,
-              success: res => {
+              success : res => {
                 wx.showToast({
                   title: '支付成功!',
                 });
@@ -148,36 +153,38 @@ wxService.page({
                   wx.navigateTo({
                     url: '/subPackage/page/pages/myValueCard/myValueCard',
                   });
-                }, 500);
+                },500);
               },
-              fail: error => {
+              fail : error => {
                 wx.showToast({
                   title: '已取消支付',
-                  icon: 'none'
+                  icon : 'none'
                 });
               }
             })
           }
         }
-        else {
-          wx.showToast({
-            title: '支付成功!',
-          });
-          wx.showLoading({
-            title: '跳转中...',
-          });
-          setTimeout(() => {
-            wx.hideLoading();
+        else{
+          wx.showModal({
+            title: '购买成功',
+            content: '是否跳转到我的超值卡列表查看？',
+            confirmColor: '#ff2222',
+            success(res){
+              if (res.confirm) {
                 wx.navigateTo({
                   url: '/subPackage/page/pages/myValueCard/myValueCard',
                 });
-          }, 500);
+              } else if (res.cancel) {
+                
+              }
+            },
+          });
         }
       }
-      else {
+      else{
         wx.showToast({
           title: '购买失败，请稍后再试！',
-          icon: 'none'
+          icon : 'none'
         });
       }
     });

src/subPackage/page/pages/valueCardInfo/valueCardInfo.wxml

 <!--subPackage/page/pages/valueCardInfo/valueCardInfo.wxml-->
-<image src='{{valueCardInfo.listUrl}}' class='card-info' mode='widthFix'></image>
+<image src='{{valueCardInfo.infoUrl}}' class='card-info' mode='widthFix'></image>
 <view class='card-info-body'>
   <view class='card-title'>{{valueCardInfo.activityName}}</view>
-  <view class='card-desc-item'>
+  <view class='card-desc-item' wx:if="{{valueCardInfo.hasDate}}">
     <view class='lf'>活动时间</view>
     <view class='rg'>{{valueCardInfo.startTime}} 至 {{valueCardInfo.endTime}}</view>
   </view>
@@ -14,19 +14,19 @@
     <view class='lf'>积分兑换</view>
     <view class='rg'>{{valueCardInfo.integrationAmount}}积分</view>
   </view>
-  <view class='card-desc-item'>
-    <view class='lf'>使用说明</view>
-    <view class='rg'>
-      <view class='list-item' 
+  <view class='card-desc-item'
     wx:for="{{valueCardInfo.descArr}}"
     wx:for-item="item"
     wx:for-index="idx"
-      wx:key="*this"
-      > {{idx+1}}、{{item}}</view>
+    wx:key="*this">
+    <view class='lf'>{{item.label ? item.label : '说明内容'}}</view>
+    <view class='rg'>
+      <view class='list-item'> {{item.value}}</view>
     </view>
   </view>
 </view>
 
+
 <!-- 底部 -->
 <view class='bottom-buy'>
     <view class='lf-info'>
@@ -36,7 +36,7 @@
       </view>
       <view class='explain'>
         <label> 阅读并同意 </label>
-        <text bindtap='onTapViewRule'>《广东-7Eleven超值卡规则》</text>
+        <text bindtap='onTapViewRule'>《超值卡规则》</text>
       </view>
     </view>
     <view class='rg-button {{checked ? "" : "disabled"}}' bindtap='onTapBuy'>{{buyType == 1 ? "立即购买" : "立即兑换"}}</view>

src/subPackage/page/pages/valueCardInfo/valueCardInfo.wxss

@@ -51,6 +51,7 @@ view{
 
 .card-desc-item .rg .list-item{
   margin-bottom: 8rpx;
+  white-space: pre-line;
 }
 
 .bottom-buy{
@@ -63,6 +64,7 @@ view{
   height: 100rpx;
   display: flex;
   align-items: center;
+  background: #ffffff;
 }
 
 .bottom-buy .rg-button{

src/subPackage/page/pages/valueCardRecords/valueCardRecords.js

@@ -31,8 +31,8 @@ wxService.page({
   //获取购买记录
   getBuyRecordsList(refresh){
     const { memberId } = wx.getStorageSync('_baseUserInfo');
-    if (!memberId){
-      return ;
+    if (!memberId) {
+      return;
     }
     
     let pageNum = this.data.pageNum,

src/utils/Http.js

@@ -121,9 +121,9 @@ class Http {
         url,
         method: 'GET',
         header: {
-          'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
+          // 'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
           // 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产 3001
-          // 'tunnel-token' : '4c8d641cb2b8a576317ee5f6ead1f36474463041d61fb5d4289364565b0c6c63', // 生产 2711
+          'tunnel-token' : '4c8d641cb2b8a576317ee5f6ead1f36474463041d61fb5d4289364565b0c6c63', // 生产 2711
         },
         data: parmas
       })
@@ -147,9 +147,9 @@ class Http {
         url,
         method: 'POST',
         header: {
-          'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
+          // 'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
           // 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产 3001
-          // 'tunnel-token' : '4c8d641cb2b8a576317ee5f6ead1f36474463041d61fb5d4289364565b0c6c63', // 生产 2711
+          'tunnel-token' : '4c8d641cb2b8a576317ee5f6ead1f36474463041d61fb5d4289364565b0c6c63', // 生产 2711
         },
         data: parmas,
         channel: channel