qiubinghui
/
zhywpt-sp
Obserwuj 1
Gwiazdka 0
Forkuj 0
Kod Problemy 0 Pull Requests 0 Wydania 0 Wiki Aktywność
Przeglądaj źródła

权益

master
wangxyi 2 miesięcy temu
rodzic
6236192c55
commit
e31b4ef44d
4 zmienionych plików z 178 dodań i 174 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 144
    144
      subpackage/service/equity/equity.vue
  2. 26
    19
      subpackage/service/equityInfo/equityInfo.vue
  3. 4
    7
      subpackage/service/equityList/equityList.vue
  4. 4
    4
      utils/network/api.js

+ 144
- 144
subpackage/service/equity/equity.vue Wyświetl plik

@@ -3,18 +3,27 @@
<view class="item" v-for="(item, index) in exchangeCodes" :key="index" @click.stop="click(item)">
<view class="top">
<view>
<view style="display: flex;align-items: center;line-height: 58rpx;" v-if="item.vehiclePlate">
<image class="car" :src="`${$imgUrl}equity-car.png`" mode=""></image>
<text class="car-num">{{item.vehiclePlate}}</text>
<view style="display: flex;align-items: center;line-height: 58rpx;">
<image class="car" :src="`${$imgUrl}myImage/etcOrder.png`" mode=""></image>
<text class="car-num">{{item.orderNo}}</text>
</view>
<view class="youxiao">有效期：{{ item.periodOfValidity }}</view>
<view class="youxiao">有效期：{{ item.validEndTime }}</view>
</view>
<view class="activate" :style="{'--bgimg':`url(${$imgUrl}equity-bg3.png)`}">{{item.getStatus}}</view>
<view class="activate" :style="{'--bgimg':`url(${$imgUrl}equity-bg3.png)`}">{{functBackName(item.status) == 'WAIT_ACTIVATED' ? '已领取' : functBackName(item.status) == 'WAIT_GET' ? '待领取' : functBackName(item.status) == 'EXPIRED' ? '已失效' : ''}}</view>
</view>
<view v-for="(list, index) in item.equityInfoItems">
<view class="go">
<view>
<view class="title">权益名称：{{item.equityName}}</view>
<view class="title"><text style="color: #01243A;">卡卷状态：{{functBackName(item.status) == 'WAIT_ACTIVATED' ? '已领取' : functBackName(item.status) == 'WAIT_GET' ? '待领取' : functBackName(item.status) == 'EXPIRED' ? '已失效' : ''}}</text></view>
</view>
<view class="btn" data-code="{{item}}"
@click.stop="copyCode(item)">{{functBackName(item.status) == 'WAIT_ACTIVATED' ? '复制' : functBackName(item.status) == 'WAIT_GET' ? '立即领取' :
functBackName(item.status) == 'EXPIRED' ? '已失效' : ''}}</view>
</view>
<!-- <view v-for="(list, index) in item.equityInfoItems">
<view class="go" v-if="list.equityType == 'COUPONS'">
<view>
<view class="title">权益名称：{{list.productName}}</view>
<view class="title">权益名称：{{list.equityName}}</view>
<view class="title"><text style="color: #01243A;">卡卷状态：{{functBackName(list) == 'WAIT_ACTIVATED' ? '待激活' : functBackName(list) == 'WAIT_USE' ? '待领取' : functBackName(list) == 'USED' ? '已领取' : '已失效'}}</text></view>
</view>
<view class="btn" data-code="{{item}}"
@@ -28,12 +37,12 @@
</view>
<view class="btn" data-code="{{item}}" @click.stop="copyCode(list,'EXPIRED',null)">去使用</view>
</view>
</view>
</view> -->
</view>
<view class="item" v-for="(item, index) in alonePurchaseData" :key="index" @click.stop="click(item)">
<!-- <view class="item" v-for="(item, index) in alonePurchaseData" :key="index" @click.stop="click(item)">
<view class="top">
<view>
<view style="display: flex;align-items: center;line-height: 58rpx;" v-if="item.vehiclePlate">
@@ -60,7 +69,7 @@
</view>
<view class="btn" data-code="{{item}}" @click.stop="copyCode(item,'EXPIRED',item['couponInfoItem'])">去使用</view>
</view>
</view>
</view> -->
</view>
</template>
@@ -98,101 +107,101 @@
requestNew(couponQuery, {
type: 2,
data: {
mobile: getItem('mobile') + "",
// mobile: getItem('mobile') + "",
loginSource: getItem("loginSource"),
singleEquityId: singleEquityId.value,
// singleEquityId: singleEquityId.value,
equityId: singleEquityId.value,
couponAgencyType: couponAgencyType.value,
couponId: couponId.value,
purchasedEquityId:purchasedEquityId.value
// couponAgencyType: couponAgencyType.value,
// couponId: couponId.value,
// purchasedEquityId:purchasedEquityId.value
},
method: "POST",
showLoading: true,
}).then((item) => {
let res = item
console.log("res===", res)
let newCodes = res.data.orderItems;
let alonePurchase = res.data.alonePurchase;
let newCodes = res.result;
// let alonePurchase = res.data.alonePurchase;
if (newCodes) {
console.log(res, '111=========', newCodes);
let newCodesNew = []
newCodes.forEach(item => {
//1 不能领取 0 可以领取 1(不能领取原因 notUseCase)
// item.equityInfoItems[0].equityType
// WAIT_GET
item.status =
item.equityInfoItems[0].isUse == '0' && item.equityInfoItems[0].couponStatus ==
'WAIT_GET' ? 'WAIT_USE' :
item.equityInfoItems[0].isUse == '1' && item.equityInfoItems[0].couponStatus ==
'WAIT_GET' ? 'WAIT_ACTIVATED' : item.equityInfoItems[0].couponStatus == 'USED' ?
'USED' : '';
//WAIT_ACTIVATED(待激活) WAIT_USE(待领取使用) USED(已使用) EXPIRED(已过期) OUINGSYNREE
console.log(item.equityInfoItems[0].periodOfValidity,
item.equityInfoItems[0].isUse, item.equityInfoItems[0].notUseCase,
item.status, item.equityInfoItems[0].couponStatus, '=================',
item.vehiclePlate);
// functBackName(list) = item.equityInfoItems[0].couponStatus == 'WAIT_GET' ? 'WAIT_ACTIVATED' : item.equityInfoItems[0].couponStatus
item.getStatus = getStatusValue(item.status)
console.log("item.getStatus===",item.getStatus)
item.redeemCodeStr = item.equityInfoItems[0].couponInfoItem && desensitize(item
.equityInfoItems[0].couponInfoItem.redeemCode)
item.periodOfValidity = item.equityInfoItems[0].periodOfValidity ? item
.equityInfoItems[0].periodOfValidity.split('T')[0] : '激活领取后展示'
item.redeemCode = item.equityInfoItems[0].couponInfoItem && item
.equityInfoItems[0].couponInfoItem.redeemCode
item.drawTime = item.equityInfoItems[0].drawTime && item.equityInfoItems[0]
.drawTime.split('T')[0]
console.log("item", item.equityInfoItems)
// 不展示付宝数据
for (var k = 0; k < item.equityInfoItems.length; k++) {
if (item.equityInfoItems[k]['equityType'] != "ZFB") {
console.log("alonePurchase1111", alonePurchase)
newCodesNew.push(item)
}
}
exchangeCodes.value = newCodes
// let newCodesNew = []
// newCodes.forEach(item => {
// //1 不能领取 0 可以领取 1(不能领取原因 notUseCase)
// // item.equityInfoItems[0].equityType
// // WAIT_GET
// item.status =
// item.equityInfoItems[0].isUse == '0' && item.equityInfoItems[0].couponStatus ==
// 'WAIT_GET' ? 'WAIT_USE' :
// item.equityInfoItems[0].isUse == '1' && item.equityInfoItems[0].couponStatus ==
// 'WAIT_GET' ? 'WAIT_ACTIVATED' : item.equityInfoItems[0].couponStatus == 'USED' ?
// 'USED' : '';
// //WAIT_ACTIVATED(待激活) WAIT_USE(待领取使用) USED(已使用) EXPIRED(已过期) OUINGSYNREE
// console.log(item.equityInfoItems[0].periodOfValidity,
// item.equityInfoItems[0].isUse, item.equityInfoItems[0].notUseCase,
// item.status, item.equityInfoItems[0].couponStatus, '=================',
// item.vehiclePlate);
// // functBackName(list) = item.equityInfoItems[0].couponStatus == 'WAIT_GET' ? 'WAIT_ACTIVATED' : item.equityInfoItems[0].couponStatus
// item.getStatus = getStatusValue(item.status)
// console.log("item.getStatus===",item.getStatus)
// item.redeemCodeStr = item.equityInfoItems[0].couponInfoItem && desensitize(item
// .equityInfoItems[0].couponInfoItem.redeemCode)
// item.periodOfValidity = item.equityInfoItems[0].periodOfValidity ? item
// .equityInfoItems[0].periodOfValidity.split('T')[0] : '激活领取后展示'
// item.redeemCode = item.equityInfoItems[0].couponInfoItem && item
// .equityInfoItems[0].couponInfoItem.redeemCode
// item.drawTime = item.equityInfoItems[0].drawTime && item.equityInfoItems[0]
// .drawTime.split('T')[0]
// console.log("item", item.equityInfoItems)
// // 不展示付宝数据
// for (var k = 0; k < item.equityInfoItems.length; k++) {
// if (item.equityInfoItems[k]['equityType'] != "ZFB") {
// console.log("alonePurchase1111", alonePurchase)
// newCodesNew.push(item)
// }
// }

});
exchangeCodes.value = newCodesNew
// });
// exchangeCodes.value = newCodesNew

// 购买的权益产品展示
console.log("exchangeCodes.value", exchangeCodes.value);
// console.log("exchangeCodes.value", exchangeCodes.value);
}
let newAlonePurchase = []
if (alonePurchase) {
console.log("alonePurchase", alonePurchase)
alonePurchase.forEach(item => {
console.log("index", item.equityType == "ZFB")
//1 不能领取 0 可以领取 1(不能领取原因 notUseCase)
// item.equityInfoItems[0].equityType
// WAIT_GET
item.status =item.isUse == 0 && item.couponStatus ==
'WAIT_GET' ? 'WAIT_USE' :
item.isUse == 1 && item.couponStatus ==
'WAIT_GET' ? 'WAIT_ACTIVATED' : item.couponStatus == 'USED' ?
'USED' : '';
//WAIT_ACTIVATED(待激活) WAIT_USE(待领取使用) USED(已使用) EXPIRED(已过期) OUINGSYNREE
console.log(item.periodOfValidity,
item.isUse, item.notUseCase,
item.status, item.couponStatus, '=================',
item.vehiclePlate);
item.getStatus = getStatusValue(item.status)
item.redeemCodeStr = item.couponInfoItem && desensitize(item
.couponInfoItem.redeemCode)
item.periodOfValidity = item.periodOfValidity ? item
.periodOfValidity.split('T')[0] : '激活领取后展示'
item.redeemCode = item.couponInfoItem && item
.couponInfoItem.redeemCode
item.drawTime = item.drawTime && item
.drawTime.split('T')[0]
// 不展示付宝数据
if (item.equityType != "ZFB") {
console.log("alonePurchase1111", alonePurchase)
newAlonePurchase.push(item)
}
});
// let newAlonePurchase = []
// if (alonePurchase) {
// console.log("alonePurchase", alonePurchase)
// alonePurchase.forEach(item => {
// console.log("index", item.equityType == "ZFB")
// //1 不能领取 0 可以领取 1(不能领取原因 notUseCase)
// // item.equityInfoItems[0].equityType
// // WAIT_GET
// item.status =item.isUse == 0 && item.couponStatus ==
// 'WAIT_GET' ? 'WAIT_USE' :
// item.isUse == 1 && item.couponStatus ==
// 'WAIT_GET' ? 'WAIT_ACTIVATED' : item.couponStatus == 'USED' ?
// 'USED' : '';
// //WAIT_ACTIVATED(待激活) WAIT_USE(待领取使用) USED(已使用) EXPIRED(已过期) OUINGSYNREE
// console.log(item.periodOfValidity,
// item.isUse, item.notUseCase,
// item.status, item.couponStatus, '=================',
// item.vehiclePlate);
// item.getStatus = getStatusValue(item.status)
// item.redeemCodeStr = item.couponInfoItem && desensitize(item
// .couponInfoItem.redeemCode)
// item.periodOfValidity = item.periodOfValidity ? item
// .periodOfValidity.split('T')[0] : '激活领取后展示'
// item.redeemCode = item.couponInfoItem && item
// .couponInfoItem.redeemCode
// item.drawTime = item.drawTime && item
// .drawTime.split('T')[0]
// // 不展示付宝数据
// if (item.equityType != "ZFB") {
// console.log("alonePurchase1111", alonePurchase)
// newAlonePurchase.push(item)
// }
// });

alonePurchaseData.value = newAlonePurchase
}
// alonePurchaseData.value = newAlonePurchase
// }
})
}

@@ -209,48 +218,48 @@
// url: '/subpackage/service/equityInfo/equityInfo?singleEquityId=' + singleEquityId.value +
// "&couponAgencyType=" + couponAgencyType.value + "&couponId=" + couponId.value,
// })
// }
// }
console.log("item",item)
uni.navigateTo({
url: '/subpackage/service/equityInfo/equityInfo?singleEquityId=' + item.singleEquityId +
"&couponAgencyType=" + couponAgencyType.value + "&couponId=" + item.couponId,
url: '/subpackage/service/equityInfo/equityInfo?validEndTime=' + item.validEndTime +
"&fee=" + item.fee+"&equityName=" + item.equityName,
})
}

function functBackName(item) {
return item.isUse == '0' && item.couponStatus == 'WAIT_GET' ? 'WAIT_USE' :
item.isUse == '1' && item.couponStatus == 'WAIT_GET' ? 'WAIT_ACTIVATED' : item.couponStatus == 'USED' ?
'USED' : '';
// return item.isUse == '0' && item.couponStatus == 'WAIT_GET' ? 'WAIT_USE' :
// item.isUse == '1' && item.couponStatus == 'WAIT_GET' ? 'WAIT_ACTIVATED' : item.couponStatus == 'USED' ?
// 'USED' : '';
return item
}

function copyCode(e, start, items) {
console.log("e====",e,start,items)
let item = e;
function copyCode(item) {
// let item = e;
// // 复制兑换码到剪贴板
if (item.equityType == 'ZFB') {
uni.navigateTo({
url: `/subpackage/service/zfbqy/zfbqy`
})
return
}else{
let code = e.redeemCode ? e.redeemCode : items.redeemCode;
console.log(item, "===e===", e.equityType, items, start);
if (start == 'WAIT_ACTIVATED') { //待激活
uni.showModal({
title: '温馨提示',
content: "激活后，可领取卡卷",
confirmText: "去激活",
success: function(res) {
if (res.confirm) {
uni.navigateTo({
url: '/subpackage/personal-center/install-activation-order',
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
} else if (start == 'WAIT_USE') { //待领取使用
// if (item.equityType == 'ZFB') {
// uni.navigateTo({
// url: `/subpackage/service/zfbqy/zfbqy`
// })
// return
// }else{
let code = item.redeemCode;
// if (start == 'WAIT_ACTIVATED') { //待激活
// uni.showModal({
// title: '温馨提示',
// content: "激活后，可领取卡卷",
// confirmText: "去激活",
// success: function(res) {
// if (res.confirm) {
// uni.navigateTo({
// url: '/subpackage/personal-center/install-activation-order',
// })
// } else if (res.cancel) {
// console.log('用户点击取消');
// }
// }
// });
// } else
if (item.status == 'WAIT_GET') { //待领取使用
uni.showModal({
title: '温馨提示',
content: "请在领取后120天内使用，超期失效",
@@ -259,31 +268,22 @@
requestNew(couponActivate, {
type: 2,
data: {
mobile: getItem('mobile') + "",
notificationType: 'USE',
cardIds: [items.id],
couponId: couponId.value,
equityId: item.singleEquityId,
orderId: items.orderId ? items.orderId : items.purchasedEquityId
id:item.id,
// mobile: getItem('mobile') + "",
// notificationType: 'USE',
// cardIds: [items.id],
// couponId: couponId.value,
// equityId: item.singleEquityId,
// orderId: items.orderId ? items.orderId : items.purchasedEquityId
},
method: "POST",
showLoading: true,
}).then((item) => {
// uni.setClipboardData({
// data: code,
// success: function() {
// uni.showToast({
// title: '已复制兑换码',
// icon: 'success',
// });
// },
// });
loadExchangeCodes();
uni.showToast({
title: '领取成功',
icon: 'success',
});
// uni.navigateBack();
loadExchangeCodes();
})
} else if (res.cancel) {
console.log('用户点击取消');
@@ -292,7 +292,7 @@
});
// 已使用 USED
// 已过期 EXPIRED
} else if (start == 'USED') { //已使用
} else if (item.status == 'WAIT_ACTIVATED') { //已领取
console.log("已复制兑换码1111", code)
uni.setClipboardData({
data: code,
@@ -304,10 +304,10 @@
});
},
});
} else if (start == 'EXPIRED') { //已过期
} else if (item.status == 'EXPIRED') { //已过期
}
}
// }
}


+ 26
- 19
subpackage/service/equityInfo/equityInfo.vue Wyświetl plik

@@ -5,10 +5,10 @@
<view style="background-color:#E9EDF0;overflow: hidden;min-height: 100vh;font-size: 28rpx;">
<view class="title" :style="{'--bgimg':`url(${$imgUrl}equiet-bg2.png)`}">
<view class="name">
<text>{{params.productName}}</text>
<view><text>￥</text><text class="money">{{params.discountPrice/100}}</text></view>
<text>{{equityName}}</text>
<view><text>￥</text><text class="money">{{fee/100}}</text></view>
</view>
<view class="date">有效期至{{params.endDate}}</view>
<view class="date">有效期至{{validEndTime}}</view>
</view>
<view class="explain">
<view class="use">使用说明</view>
@@ -63,27 +63,34 @@ import { singleEquityDetail } from "@/utils/network/api.js";
let singleEquityId = ref('')
let couponAgencyType = ref('')
let couponId = ref('')
let equityName = ref('')
let fee = ref('')
let validEndTime = ref('')
let params = ref('')

onLoad((options) => {
console.log("参数",options)
singleEquityId.value = options.singleEquityId
couponAgencyType.value = options.couponAgencyType
equityName.value = options.equityName
fee.value = options.fee
validEndTime.value = options.validEndTime
// singleEquityId.value = options.singleEquityId
// couponAgencyType.value = options.couponAgencyType

//卡券渠道类型获取单项权益列表
requestNew(singleEquityDetail, {
type: 2,
data: {
singleEquityId: singleEquityId.value
},
method: "POST",
showLoading: true,
}).then((item) => {
let res = item
console.log(res, '=========');
richText.value = res.productIntro
couponId.value = res.couponId
params.value=res
})
// requestNew(singleEquityDetail, {
// type: 2,
// data: {
// singleEquityId: singleEquityId.value
// },
// method: "POST",
// showLoading: true,
// }).then((item) => {
// let res = item
// console.log(res, '=========');
// richText.value = res.productIntro
// couponId.value = res.couponId
// params.value=res
// })
})
</script>
<style lang='scss' scoped>

+ 4
- 7
subpackage/service/equityList/equityList.vue Wyświetl plik

@@ -5,7 +5,7 @@
<view class="list" :style="{'--bgimg':`url(${$imgUrl}equiet-bg1.png)`}" v-for="(item, index) in listData" :key="index" @click="onClick(item)" :data-code="item">
<image class="name" :src="`${$imgUrl}equity-name.png`"></image>
<view class="right-content">
<view>{{item.productName}}</view>
<view>{{item.EQUITYNAME}}</view>
<image class="icon-back" src="/static/image/icon-back.png" mode=""></image>
</view>
</view>
@@ -39,22 +39,19 @@
//卡券渠道类型获取单项权益列表
requestNew(queryuserallequity, {
type: 2,
data: {
couponAgencyType: ['TUHU', 'ZFB'],
mobile: getItem('mobile').toString()
},
method: "POST",
showLoading: true,
}).then((item) => {
let res = item
console.log(res, '=========');
listData.value = res.data
listData.value = res.mapList
})
}
function onClick(singId: any) {
console.log("singId", singId)
uni.navigateTo({
url: '/subpackage/service/equity/equity?singleEquityId=' + singId.singleEquityId +
url: '/subpackage/service/equity/equity?singleEquityId=' + singId.EQUITYID +
'&couponAgencyType=' + singId.couponAgencyType + '&couponId=' + singId.couponId + '&equityId=' + singId.equityId+ '&purchasedEquityId=' + singId.eporderId,
})
}

+ 4
- 4
utils/network/api.js Wyświetl plik

@@ -359,9 +359,9 @@ export const equitypurchase = "/iaw/app/issue/quanyi/equitypurchase" //全部权
export const payequitydetection = "/iaw/app/issue/quanyi/payequitydetection" //权益支付检测
export const paymentequityapplyapp = "/iaw/app/issue/quanyi/paymentequityapplyapp" //权益支付下单
export const equitypurchasepage = "/iaw/app/issue/quanyi/equitypurchasepage" //购买权益列表
export const queryuserallequity = "/iaw/ass/equity/queryuserallequity" //查询用户所有权益
export const couponActivate = "/iaw/app/issue/coupon/activate" //卡卷激活
export const couponQuery = "/iaw/app/issue/coupon/query" //根据手机号权益编号查询所属订单及卡卷
export const queryuserallequity = "/iaw/issue/equityLink/groupQuery" //查询用户所有权益
export const couponActivate = "/iaw/issue/equityLink/equityReceive" //卡卷激活
export const couponQuery = "/iaw/issue/equityLink/pageEquityDetail" //根据手机号权益编号查询所属订单及卡卷
//激活服务查询
export const queryActiveInfo = "/iaw/api/secondActive/queryActiveInfo" //查询激活信息

@@ -415,7 +415,7 @@ export const infoQuery = "/iaw/api/promptText/query"; //8.212.文本信息查询
export const querySwiper = "/iaw/api/flash/querySlideShow"; //MTS-轮播图查询所有启用信息
export const queryHighMsg = "/iaw/api/address/highspeednewsflashqiery" //高速快讯查询接口
//字典
export const queryKey = '/iaw/api/afterSale/comm/listDict' //全量KEY
export const queryKey = '/iaw/api/dic/itemGetAll' //全量KEY
export const outletList = '/iaw/api/afterSale/comm/queryServiceHall'; //根据机构号获取服务网点信息
// 登录模块
export const login = "/iaw/portal/login"; //统一会员平台个人账号手机号密码登录

Napisz Podgląd
Ładowanie…
Anuluj
Zapisz