Commit d41ee4f1 by 谢中龙

支付宝修改

parent 3c881336
{"layout":{"left":{"currentId":"explorer","size":310},"right":{"currentId":""},"bottom":{"currentId":"devtools","size":280}},"storageVersion":"1.5.7"} {"layout":{"left":{"currentId":"explorer","size":310},"right":{"currentId":""},"bottom":{"currentId":""}},"storageVersion":"1.5.7"}
\ No newline at end of file \ No newline at end of file
{"OPENED_FILE":["file:///e%3A/works/dy/711/7_Eleven_Alipay/config/index.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/project.config.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardRecords/valueCardRecords.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/memberOfOwn/memberOfOwn.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/memberOfOwn/memberOfOwn.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/utils/Http.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/wx2my.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/app.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/app.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/Behavior.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/app.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardRecords/valueCardRecords.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardRecords/valueCardRecords.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardRecords/valueCardRecords.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/component/personCenter/personCenter.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/component/authorization-modal/authorization-modal.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/component/authorization-modal/authorization-modal.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/coupons/coupons.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/pointList/pointList.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/mySpend/mySpend.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/integralWater/integralWater.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/recordList/recordList.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/pointGoodsList/pointGoodsList.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard/valueCard.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard/valueCard.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/userCenter/userCenter.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/subPage/subPage.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/IntegrateGoodsExchangeInfo/IntegrateGoodsExchangeInfo.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/integralWater/integralWater.js"],"SEARCH_WORD":["person-center","memberId","pullRefresh"],"storageVersion":"1.5.7"} {"OPENED_FILE":["file:///e%3A/works/dy/711/7_Eleven_Alipay/component/personCenter/personCenter.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/config/index.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/app.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/utils/Http.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/project.config.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardRecords/valueCardRecords.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardRecords/valueCardRecords.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardRecords/valueCardRecords.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/memberOfOwn/memberOfOwn.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/memberOfOwn/memberOfOwn.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/wx2my.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/app.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/Behavior.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/app.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardRecords/valueCardRecords.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/component/personCenter/personCenter.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/component/authorization-modal/authorization-modal.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/component/authorization-modal/authorization-modal.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard.acss","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCard/myValueCard.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/coupons/coupons.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/pointList/pointList.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/mySpend/mySpend.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/integralWater/integralWater.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/myValueCardInfo/myValueCardInfo.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/recordList/recordList.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/pointGoodsList/pointGoodsList.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard/valueCard.axml","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCard/valueCard/valueCard.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/userCenter/userCenter.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/subPage/subPage.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/pages/pointDetail/pointDetail.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/IntegrateGoodsExchangeInfo/IntegrateGoodsExchangeInfo.js"],"SEARCH_WORD":["person-center","memberId","pullRefresh"],"storageVersion":"1.5.7"}
\ No newline at end of file \ No newline at end of file
{"grid":{"editorGroup":{"uris":["file:///e%3A/works/dy/711/7_Eleven_Alipay/project.config.json","file:///e%3A/works/dy/711/7_Eleven_Alipay/config/index.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/subPackage/page/pages/valueCardInfo/valueCardInfo.js"],"current":"file:///e%3A/works/dy/711/7_Eleven_Alipay/config/index.js","previewIndex":-1}},"storageVersion":"1.5.7"} {"grid":{"editorGroup":{"uris":["file:///e%3A/works/dy/711/7_Eleven_Alipay/config/index.js","file:///e%3A/works/dy/711/7_Eleven_Alipay/component/personCenter/personCenter.axml"],"current":"file:///e%3A/works/dy/711/7_Eleven_Alipay/component/personCenter/personCenter.axml","previewIndex":-1}},"storageVersion":"1.5.7"}
\ No newline at end of file \ No newline at end of file
...@@ -46,19 +46,13 @@ ...@@ -46,19 +46,13 @@
<view class="point-number" style="color:{{personCenter.fontColor}};">{{integralNum}}</view> <view class="point-number" style="color:{{personCenter.fontColor}};">{{integralNum}}</view>
<view class="point-desc" style="color:{{personCenter.fontColor}};">积分</view> <view class="point-desc" style="color:{{personCenter.fontColor}};">积分</view>
</view> </view>
<view <!-- class="df-1 point {{valueCardNum > 0 ? 'person-right' : ''}}" -->
class="df-1 point {{valueCardNum > 0 ? 'person-right' : ''}}" <view class="df-1 point person-right" onTap="toCouponList" a:if="{{personCenter.coupon == 0}}">
onTap="toCouponList"
a:if="{{personCenter.coupon == 0}}"
>
<view class="point-number" style="color:{{personCenter.fontColor}};">{{couponNum}}</view> <view class="point-number" style="color:{{personCenter.fontColor}};">{{couponNum}}</view>
<view class="point-desc" style="color:{{personCenter.fontColor}};">优惠券</view> <view class="point-desc" style="color:{{personCenter.fontColor}};">优惠券</view>
</view> </view>
<view <!-- a:if="{{valueCardNum > 0}}" 修改为长显示 -->
class="df-1 point" <view class="df-1 point" onTap="toMyValueCardPage">
onTap="toMyValueCardPage"
a:if="{{valueCardNum > 0}}"
>
<view class="point-number" style="color:{{personCenter.fontColor}};">{{valueCardNum}}</view> <view class="point-number" style="color:{{personCenter.fontColor}};">{{valueCardNum}}</view>
<view class="point-desc" style="color:{{personCenter.fontColor}};">超值卡</view> <view class="point-desc" style="color:{{personCenter.fontColor}};">超值卡</view>
</view> </view>
......
...@@ -2,6 +2,7 @@ const wx2my = require('../wx2my'); ...@@ -2,6 +2,7 @@ const wx2my = require('../wx2my');
const Behavior = require('../Behavior'); const Behavior = require('../Behavior');
const PROJECT_ENV = 'prod'; // 生产 prod, 开发 dev, 测试 test, 预生产 pre const PROJECT_ENV = 'prod'; // 生产 prod, 开发 dev, 测试 test, 预生产 pre
const needMock = ''; // const needMock = ''; //
// appid_dev_wx wxc3b64b09b1d3dfc2 // appid_dev_wx wxc3b64b09b1d3dfc2
// appid_test_wx wx857ea77f4f7f4f34 // appid_test_wx wx857ea77f4f7f4f34
......
...@@ -39,7 +39,7 @@ wxService.page({ ...@@ -39,7 +39,7 @@ wxService.page({
title: '加载中..', title: '加载中..',
}); });
wxService.post(`/merchant/superValueCardActivity/miniProgram/getPageList`).then(res => { wxService.post(`/merchant/superValueCardActivity/miniProgram/getPageList`,{},null,true).then(res => {
if(res){ if(res){
let list = res.data.data ? res.data.data : []; let list = res.data.data ? res.data.data : [];
this.data.cardList = list; this.data.cardList = list;
......
...@@ -111,7 +111,7 @@ wxService.page({ ...@@ -111,7 +111,7 @@ wxService.page({
title: '加载中..', title: '加载中..',
}); });
wxService.post(`/merchant/superValueCardActivity/miniProgram/getDetail?id=${this.data.id}`).then(res => { wxService.post(`/merchant/superValueCardActivity/miniProgram/getDetail?id=${this.data.id}`,{},null,true).then(res => {
if (res) { if (res) {
let obj = res.data.data ? res.data.data : null; let obj = res.data.data ? res.data.data : null;
if(obj){ if(obj){
......
...@@ -52,9 +52,24 @@ view{ ...@@ -52,9 +52,24 @@ view{
.records-desc{ .records-desc{
font-size: 24rpx; font-size: 24rpx;
color: #999999; color: #999999;
margin-bottom: 4rpx; margin-bottom: 8rpx;
display: flex;
align-items: center;
} }
.records-desc .copy{
display: block;
font-size: 22rpx;
padding: 2rpx 10rpx;
border: solid 1rpx #ff2222;
color: #ff2222;
border-radius: 4rpx;
margin-left: 10rpx;
}
.records-desc .copy:active{
opacity: 0.7;
}
.no-more{ .no-more{
width: 100%; width: 100%;
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
a:key="*this"> a:key="*this">
<view class='records-item-lf'> <view class='records-item-lf'>
<view class='records-title'>{{item.activityName}}</view> <view class='records-title'>{{item.activityName}}</view>
<view class="records-desc">超值卡号:{{item.supValCardId}}</view> <view class="records-desc">超值卡号:{{item.supValCardId}}
<text class="copy" data-value="{{item.supValCardId}}" onTap="onTapCopy">复制</text> </view>
<view class="records-desc">购买时间:{{item.payOrderTime}}</view> <view class="records-desc">购买时间:{{item.payOrderTime}}</view>
<view class="records-desc">有效时间:{{item.startTime}} 至 {{item.endTime}}</view> <view class="records-desc">有效时间:{{item.startTime}} 至 {{item.endTime}}</view>
</view> </view>
......
...@@ -30,6 +30,21 @@ wxService.page({ ...@@ -30,6 +30,21 @@ wxService.page({
}, },
//复制
onTapCopy(e){
let value = e.currentTarget.dataset.value;
wx2my.setClipboardData({
//准备复制的数据
data: value,
success: function (res) {
wx2my.showToast({
title: '复制成功',
icon: 'none'
});
}
});
},
//获取购买记录 //获取购买记录
getBuyRecordsList(refresh){ getBuyRecordsList(refresh){
const { memberId } = wx2my.getStorageSync('_baseUserInfo').data ? wx2my.getStorageSync('_baseUserInfo').data : {}; const { memberId } = wx2my.getStorageSync('_baseUserInfo').data ? wx2my.getStorageSync('_baseUserInfo').data : {};
......
...@@ -109,7 +109,8 @@ class Http { ...@@ -109,7 +109,8 @@ class Http {
} }
} }
post (url, parmas, channel) { post (url, parmas, channel,unLogin) {
if(!unLogin){
let baseUserInfo = wx2my.getStorageSync('_baseUserInfo').data let baseUserInfo = wx2my.getStorageSync('_baseUserInfo').data
if(baseUserInfo){ if(baseUserInfo){
return this.request({ return this.request({
...@@ -134,28 +135,19 @@ class Http { ...@@ -134,28 +135,19 @@ class Http {
}) })
} }
} }
// get(url, parmas) { else{
// return this.request({ return this.request({
// url, url,
// method: 'GET', method: 'POST',
// header: { header: {
// 'buyer-token': this.getToken() // 'tunnel-token': 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', // 测试
// }, 'tunnel-token' : '4c8d641cb2b8a576317ee5f6ead1f36474463041d61fb5d4289364565b0c6c63', // 生产 2711
// data: parmas },
// }); data: parmas,
// } channel: channel
})
// post(url, parmas, channel) { }
// return this.request({ }
// url,
// method: 'POST',
// header: {
// 'buyer-token': this.getToken()
// },
// data: parmas,
// channel: channel
// });
// }
checkStatus(resp) { checkStatus(resp) {
let status = resp.statusCode; let status = resp.statusCode;
......
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