Commit 676da08d by 谢中龙

修改字段

parent 4251d06c
......@@ -32,7 +32,12 @@
"pages/valueCardInfo/valueCardInfo",
"pages/myValueCard/myValueCard",
"pages/myValueCardInfo/myValueCardInfo",
"pages/valueCardRecords/valueCardRecords",
"pages/valueCardRecords/valueCardRecords"
]
},
{
"root": "subPackageA/page",
"pages": [
"pages/pointActicityGroup/pointActivityGroup",
"pages/pointExchangeCoupon/pointExchangeCoupon",
"pages/pointExchangeGoods/pointExchangeGoods"
......
......@@ -3,7 +3,7 @@
<view class='body'>
<image bindtap='onTapClose'
class='close'
src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_tips_close.png' mode='aspectFit'></image>
src='https://img3.bigaka.com/prd/3001/202003/20200331/30018f5b020d-1486-4b92-b32c-7c5f38d1639a.png' mode='aspectFit'></image>
<view class='empty'>已抢光</view>
<view>很遗憾,你来晚了~</view>
<view class='view-btn' bindtap='onTapViewMore'>查看其它活动</view>
......
......@@ -3,8 +3,9 @@
<view class='body'>
<image bindtap='onTapClose'
class='close'
src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_tips_close.png' mode='aspectFit'></image>
<image class='tips-icon' src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/tips_icon.png' mode='aspectFit'></image>
src='https://img3.bigaka.com/prd/3001/202003/20200331/30018f5b020d-1486-4b92-b32c-7c5f38d1639a.png'
mode='aspectFit'></image>
<image class='tips-icon' src='https://img3.bigaka.com/prd/3001/202003/20200331/3001ed2dd3ad-2dfa-4e99-9702-5fd9758c00f1.png' mode='aspectFit'></image>
<view>您已达到兑换上限</view>
</view>
</view>
<!--component/empty/empty.wxml-->
<view class='page-empty'>
<image src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/empty.png' mode='aspectFit'></image>
<image src='https://img3.bigaka.com/prd/3001/202003/20200331/3001d0a28e03-be3f-4f81-92dd-14d229382c2f.png'
mode='aspectFit'></image>
<view>{{text}}</view>
</view>
const PROJECT_ENV = 'test' // 生产 prod, 开发1 dev,开发2 dev2, 测试 test, 预生产 pre
const PROJECT_ENV = 'prod' // 生产 prod, 开发1 dev,开发2 dev2, 测试 test, 预生产 pre
const needMock = '' //
const brandId = 1002 ; //1002 测试 2711 生产
const brandId = 2711 ; //1002 测试 2711 生产
// appid_dev_wx wxc3b64b09b1d3dfc2
// appid_test_wx wxac09792264c49b5c
// appid_pre_711 wx358b56af62edbde1
......
......@@ -130,7 +130,7 @@ wxService.page({
// wxService.router(`/pages/IntegralMall/IntegralMall`)
// wxService.router(`/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods`)
//现在修改为跳转到积分活动分组列表
wxService.router(`/subPackage/page/pages/pointActicityGroup/pointActivityGroup`);
wxService.router(`/subPackageA/page/pages/pointActicityGroup/pointActivityGroup`);
},
// 消费详情
handleGoDetail(e) {
......
......@@ -13,7 +13,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.8.2",
"appid": "wxac09792264c49b5c",
"appid": "wx700028bf32a3be66",
"projectname": "7-11",
"debugOptions": {
"hidedInDevtools": []
......@@ -218,21 +218,25 @@
"query": ""
},
{
"id": -1,
"id": 27,
"name": "活动积分分组",
"pathName": "subPackage/page/pages/pointActicityGroup/pointActivityGroup",
"query": ""
"pathName": "subPackageA/page/pages/pointActicityGroup/pointActivityGroup",
"query": "",
"scene": null
},
{
"id": -1,
"id": 28,
"name": "积分活动积分换物详情",
"pathName": "subPackage/page/pages/pointExchangeGoods/pointExchangeGoods",
"query": ""
"pathName": "subPackageA/page/pages/pointExchangeGoods/pointExchangeGoods",
"query": "",
"scene": null
},
{
"id": -1,
"id": 29,
"name": "积分活动积分兑券详情",
"pathName": "subPackage/page/pages/pointExchangeCoupon/pointExchangeCoupon"
"pathName": "subPackageA/page/pages/pointExchangeCoupon/pointExchangeCoupon",
"query": "",
"scene": null
}
]
}
......
......@@ -80,7 +80,7 @@ wxService.page({
// 判断有无开卡
const userInfo = wx.getStorageSync('_baseUserInfo')
// 新用户去激活领卡
if (userInfo && userInfo.member && !userInfo.member.mobile) {
if (userInfo && userInfo.member && !userInfo.member.mobile && !userInfo.member.cardNoWeixin) {
wxService.openCard()
return false
}
......@@ -168,6 +168,17 @@ wxService.page({
return ;
}
//判断是否开卡
if(!member.cardNoWeixin){
wx.showToast({
title: '请先开卡后购买',
icon : 'none'
});
wxService.openCard()
return ;
}
let memeberId = member.id,
// storeId = member.storeId;
storeId = '';
......
......@@ -112,13 +112,13 @@ wxService.page({
if (item.type == 1){
//积分换物
wx.navigateTo({
url: '/subPackage/page/pages/pointExchangeGoods/pointExchangeGoods?id=' + item.id,
url: '/subPackageA/page/pages/pointExchangeGoods/pointExchangeGoods?id=' + item.id,
});
}
else if(item.type == 2){
//积分兑换优惠券
wx.navigateTo({
url: '/subPackage/page/pages/pointExchangeCoupon/pointExchangeCoupon?id=' + item.id,
url: '/subPackageA/page/pages/pointExchangeCoupon/pointExchangeCoupon?id=' + item.id,
});
}
},
......
{
"navigationBarTitleText": "积分活动中心",
"navigationBarTitleText": "积分商城",
"enablePullDownRefresh": true,
"usingComponents": {
"empty": "/component/empty/empty"
......
......@@ -131,7 +131,7 @@ wxService.page({
if (result == 0) {
wx.hideLoading()
this.setData({
integralCouponList: data.reverse()
integralCouponList: data
});
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment