1.修改合并代码问题

2.新增图片显示分类
yj-dev
杨杰 2 years ago
parent afdda8d36e
commit d2047af37f
  1. 2
      member-Recharge/rec-confirmation/rec-confirmation.vue
  2. 10
      pages/goods/goods-list/goods-list.vue
  3. 4
      pages/goods/refuel-confirm/refuel-confirm.vue
  4. 4
      pages/order/confirmation.vue
  5. 10
      pages/tabBar/home/home.vue
  6. 24
      pages/tabBar/user/user.vue
  7. 29
      pages/user/order_details/order_details.vue
  8. 36
      pages/user/order_list/order_list.vue
  9. 2
      pages/userLogin/userLogin.vue
  10. 2
      qianzhu-KFC/confirmOrder/confirmOrder.vue
  11. 22
      qianzhu-KFC/order-details/order-details.vue
  12. 2
      qianzhu-KFC/payment-method/payment-method.vue
  13. BIN
      static/img/Vip.png
  14. BIN
      static/img/ghk.png
  15. BIN
      static/img/home/home3.png
  16. BIN
      static/img/home/home4.png
  17. BIN
      static/img/home/home5.png
  18. BIN
      static/img/home/home6.png
  19. BIN
      static/img/home/home7.png
  20. BIN
      static/img/order2.png
  21. BIN
      static/img/order3.png
  22. BIN
      static/img/order4.png
  23. BIN
      static/img/order5.png
  24. BIN
      static/img/order6.png
  25. BIN
      static/img/order7.png
  26. BIN
      static/img/order8.png
  27. BIN
      static/img/order9.png
  28. BIN
      static/img/unioncard.png
  29. BIN
      static/img/xbk.png
  30. 4
      subPages/coupon-package/coupon-package.vue
  31. 4
      subPages/recharge/recharge.vue

@ -243,7 +243,7 @@
// #endif // #endif
let datas = { let datas = {
platformId: this.showType, platformId: this.showType,
regionId: app.globalData.cityId, "companyId": app.globalData.companyId,
productType: 3 productType: 3
} }
getThirdPartyByDetail(datas).then(res => { getThirdPartyByDetail(datas).then(res => {

@ -108,7 +108,7 @@
title: '商品列表' title: '商品列表'
}); });
this.getCouponListArea(); this.getCouponListArea();
this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST'); this.getCmsContent('CMS_BANNER_COUPON');
} }
if (option.id == 2) { if (option.id == 2) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
@ -119,7 +119,7 @@
} else { } else {
this.getCouponListArea(); this.getCouponListArea();
} }
this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST'); this.getCmsContent('CMS_BANNER_COUPON');
} }
if (option.id == 5) { if (option.id == 5) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
@ -130,13 +130,13 @@
} else { } else {
this.getCouponListArea(); this.getCouponListArea();
} }
this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST'); this.getCmsContent('CMS_BANNER_COUPON');
} }
if (option.id == 3) { if (option.id == 3) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: '优选商品' title: '优选商品'
}); });
this.getCmsContent('CMS_PRE_LIST'); this.getCmsContent('CMS_DISCOUNT_PACKAGE_BANNER');
this.getBrandCouponList(); this.getBrandCouponList();
} }
}, },
@ -200,7 +200,7 @@
} }
getCmsContent(params).then(res => { getCmsContent(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.swiperList = res.return_data; this.swiperList = res.return_data.childCategory;
} }
}); });
}, },

@ -368,8 +368,8 @@
// #endif // #endif
let datas = { let datas = {
platformId: this.showType, platformId: this.showType,
regionId: app.globalData.cityId, "companyId": app.globalData.companyId,
productType: 5 productType: 6
} }
getThirdPartyByDetail(datas).then(res => { getThirdPartyByDetail(datas).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {

@ -344,8 +344,8 @@
// #endif // #endif
let datas = { let datas = {
platformId: this.showType, platformId: this.showType,
regionId: app.globalData.cityId, "companyId": app.globalData.companyId,
productType: 4, productType: 5,
productId: this.couponList.couponSource productId: this.couponList.couponSource
} }
getThirdPartyByDetail(datas).then(res => { getThirdPartyByDetail(datas).then(res => {

@ -52,7 +52,7 @@
<image class="width100" mode="widthFix" :src="imagewxUrl+imgadres" v-if="item.type == 8"></image> <image class="width100" mode="widthFix" :src="imagewxUrl+imgadres" v-if="item.type == 8"></image>
<!-- 顶部菜单 --> <!-- 顶部菜单 -->
<view class="category-list backcorfff" style="margin-top: -5px;" v-if="item.type == 7"> <view class="category-list backcorfff" style="margin-top: -7px;" v-if="item.type == 7">
<view class="category" style="width: 20%;" v-for="(row, indexc) in item.childCategory" :key="indexc" <view class="category" style="width: 20%;" v-for="(row, indexc) in item.childCategory" :key="indexc"
@click="toCategory(row)"> @click="toCategory(row)">
<view class="img"> <view class="img">
@ -375,15 +375,15 @@
let params = { let params = {
companyId: app.globalData.companyId, companyId: app.globalData.companyId,
platform: code, platform: code,
categoryCode: '' categoryCode: 'CMS_HOME_POPOVER'
} }
getCmsContent(params).then(res => { getCmsContent(params).then(res => {
if (res.return_code == '000000' && res.return_data != '') { if (res.return_code == '000000' && res.return_data != '') {
//广 //广
this.showPopup(); this.showPopup();
this.imgadres3 = res.return_data[0].imgData; this.imgadres3 = res.return_data.childCategory[0].imgData;
this.webUrl = res.return_data[0].ext1; this.webUrl = res.return_data.childCategory[0].ext1;
this.jumpType = res.return_data[0].jumpType; this.jumpType = res.return_data.childCategory[0].jumpType;
} }
}); });
}, },

@ -65,9 +65,27 @@
</view> </view>
<view class="width90 mart10 height60" v-if="nopaylist != ''"> <view class="width90 mart10 height60" v-if="nopaylist != ''">
<swiper circular="true" interval="3000" autoplay="true" @change="swiperChange"> <swiper circular="true" interval="3000" autoplay="true" @change="swiperChange">
<swiper-item v-for="(swiper,index) in nopaylist" :key="index" @click="jumpDetails(swiper.orderNo,swiper.productType)"> <swiper-item v-for="(swiper,index) in nopaylist" :key="index"
@click="jumpDetails(swiper.orderNo,swiper.productType)">
<view class="alijusstart border-8r backcor9 height60 "> <view class="alijusstart border-8r backcor9 height60 ">
<image mode="widthFix" class="icon40 margle10" src="../../../static/img/user/user5.png"> <image mode="widthFix" class="icon40 margle10" src="../../../static/img/order7.png"
v-if="swiper.productType== 1"></image>
<image mode="widthFix" class="icon40 margle10" src="../../../static/img/order9.png"
v-if="swiper.productType== 2"></image>
<image mode="widthFix" class="icon40 margle10" src="../../../static/img/order3.png"
v-if="swiper.productType== 3"></image>
<image mode="widthFix" class="icon40 margle10" src="../../../static/img/order2.png"
v-if="swiper.productType== 4"></image>
<image mode="widthFix" class="icon40 margle10" src="../../../static/img/order5.png"
v-if="swiper.productType== 5"></image>
<image mode="widthFix" class="icon40 margle10" src="../../../static/img/order4.png"
v-if="swiper.productType== 6"></image>
<image mode="widthFix" class="icon40 margle10" src="../../../static/img/order8.png"
v-if="swiper.productType== 7"></image>
<image mode="widthFix" class="icon40 margle10" src="../../../static/img/unioncard.png"
v-if="swiper.productType== 8"></image>
<image mode="widthFix" class="icon40 margle10" src="../../../static/img/order6.png"
v-if="swiper.productType== 9">
</image> </image>
<view class="width50 margle10"> <view class="width50 margle10">
<view class="font15 fcor333 fontspec">等待付款</view> <view class="font15 fcor333 fontspec">等待付款</view>
@ -481,7 +499,7 @@
} }
// #ifdef H5 // #ifdef H5
let cont = "本服务由惠兑礼品提供\n400-678-738"; let cont = "本服务由惠兑礼品提供\n400-678-738";
let content = cont.replace(/<br>/g,"\n"); let content = cont.replace(/<br>/g, "\n");
if (item == '客服') { if (item == '客服') {
uni.showModal({ uni.showModal({
title: '客服', title: '客服',

@ -51,8 +51,10 @@
<view class="mart15 alijusstart font14 width94" v-if="recinfo.payType"> <view class="mart15 alijusstart font14 width94" v-if="recinfo.payType">
<view class="width20 fcor777">支付方式</view> <view class="width20 fcor777">支付方式</view>
<view class="width80p fotrt fcor333" v-if="recinfo.payType == 1">支付宝</view> <view class="width80p fotrt fcor333" v-if="recinfo.payType == 1">支付宝</view>
<view class="width80p fotrt fcor333" v-if="recinfo.payType == 2">微信</view> <view class="width80p fotrt fcor333" v-if="recinfo.payType == 2">微信支付</view>
<view class="width80p fotrt fcor333" v-if="recinfo.payType == 3">积分兑换</view>
<view class="width80p fotrt fcor333" v-if="recinfo.payType == 4">汇联通工会卡</view> <view class="width80p fotrt fcor333" v-if="recinfo.payType == 4">汇联通工会卡</view>
<view class="width80p fotrt fcor333" v-if="recinfo.payType == 4">汇联通银联支付工会卡</view>
</view> </view>
<view class="mart15 alijusstart font14 width94" v-if="recinfo.productType == 6"> <view class="mart15 alijusstart font14 width94" v-if="recinfo.productType == 6">
<view class="width20 fcor777">地址</view> <view class="width20 fcor777">地址</view>
@ -95,6 +97,19 @@
<view class="width50 fcor777">加油金额</view> <view class="width50 fcor777">加油金额</view>
<view class="width50 fotrt fcor333">¥{{oilList.gasRefuelPrice}}</view> <view class="width50 fotrt fcor333">¥{{oilList.gasRefuelPrice}}</view>
</view> </view>
<view class="mart15 alijusstart font14 width94" v-if="materialData">
<view class="width50 fcor777">联系人</view>
<view class="width50 fotrt fcor333">¥{{materialData.user}}</view>
</view>
<view class="mart15 alijusstart font14 width94" v-if="materialData">
<view class="width50 fcor777">联系电话</view>
<view class="width50 fotrt fcor333">¥{{materialData.phone}}</view>
</view>
<view class="mart15 alijusstart font14 width94" v-if="materialData">
<view class="width50 fcor777">联系地址</view>
<view class="width50 fotrt fcor333">¥{{materialData.address}}</view>
</view>
</view> </view>
<!-- 支付信息 --> <!-- 支付信息 -->
@ -459,7 +474,7 @@
<view class="height50 width100"></view> <view class="height50 width100"></view>
<view class="bottomstu backcorfff width100 height50 alijusend"> <view class="bottomstu backcorfff width100 height50 alijusend">
<button open-type="contact" class="cusservice font12 fcor666">联系客服</button> <button open-type="contact" class="cusservice font12 fcor666">联系客服</button>
<view class="buybtn font12 fcorfff">再来一单</view> <!-- <view class="buybtn font12 fcorfff">再来一单</view> -->
</view> </view>
</view> </view>
</template> </template>
@ -725,7 +740,7 @@
// '&goodsType=' + this.recinfo.highChildOrderList[0].goodsType // '&goodsType=' + this.recinfo.highChildOrderList[0].goodsType
// }) // })
uni.redirectTo({ uni.redirectTo({
url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.recinfo.id + '&amount=' + this.recinfo url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.recinfo.orderNo + '&amount=' + this.recinfo
.payPrice + '&productType=' + this.recinfo.productType .payPrice + '&productType=' + this.recinfo.productType
}) })
}, },
@ -1038,20 +1053,20 @@
.borderleft { .borderleft {
background-image: radial-gradient(10px at bottom left, #f0f0f0 10px, #ffffff); background-image: -webkit-radial-gradient(10px at bottom left, #f0f0f0 10px, #ffffff);
} }
.bordertopleft { .bordertopleft {
background-image: radial-gradient(10px at top left, #f0f0f0 10px, #ffffff); background-image: -webkit-radial-gradient(10px at top left, #f0f0f0 10px, #ffffff);
} }
.concont { .concont {
border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0;
background-image: radial-gradient(10px at bottom right, #f0f0f0 10px, #ffffff); background-image: -webkit-radial-gradient(10px at bottom right, #f0f0f0 10px, #ffffff);
} }
.gooddes { .gooddes {
border-radius: 0 0 8px 8px; border-radius: 0 0 8px 8px;
background-image: radial-gradient(10px at top right, #f0f0f0 10px, #ffffff); background-image: -webkit-radial-gradient(10px at top right, #f0f0f0 10px, #ffffff);
} }
</style> </style>

@ -46,8 +46,24 @@
<view class="width96 height22 mart10"> <view class="width96 height22 mart10">
<view class="width70 flleft fotlt "> <view class="width70 flleft fotlt ">
<view class="font16 fontwig6 fcor333 alijusstart"> <view class="font16 fontwig6 fcor333 alijusstart">
<image src="../../../static/img/order5.png" class="marglerig" <image mode="widthFix" src="../../../static/img/order2.png" v-if="row.productType == 4"
style="width: 50rpx;height: 50rpx;"></image> class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image mode="widthFix" src="../../../static/img/order3.png" v-if="row.productType == 3"
class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image mode="widthFix" src="../../../static/img/order4.png" v-if="row.productType == 6"
class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image mode="widthFix" src="../../../static/img/order5.png" v-if="row.productType == 5"
class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image mode="widthFix" src="../../../static/img/order6.png" v-if="row.productType == 9"
class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image mode="widthFix" src="../../../static/img/order8.png" v-if="row.productType == 7"
class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image mode="widthFix" src="../../../static/img/order7.png" v-if="row.productType == 1"
class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image mode="widthFix" src="../../../static/img/unioncard.png" v-if="row.productType == 8"
class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<image mode="widthFix" src="../../../static/img/order9.png" v-if="row.productType == 2"
class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
<view class="width100 text1">{{row.title}}</view> <view class="width100 text1">{{row.title}}</view>
</view> </view>
</view> </view>
@ -106,12 +122,12 @@
headerswper: '120px', headerswper: '120px',
typeText: { typeText: {
1: '等待付款', 1: '等待付款',
2: '订单已支付', 2: '已支付',
3: '订单已完成', 3: '已完成',
4: '订单已退款', 4: '已退款',
5: '订单已取消', 5: '已取消',
6: '订单退款中', 6: '退款中',
7: '订单退款失败' 7: '退款失败'
}, },
// 退 // 退
orderType: ['全部', '待支付', '已支付', '已完成', '已退款'], orderType: ['全部', '待支付', '已支付', '已完成', '已退款'],
@ -344,7 +360,7 @@
payTypes = 2; payTypes = 2;
} }
uni.redirectTo({ uni.redirectTo({
url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + row.id + '&amount=' + row url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + row.orderNo + '&amount=' + row
.payPrice + '&productType=' + row.productType .payPrice + '&productType=' + row.productType
}) })
} }
@ -627,7 +643,7 @@
} }
.orderlabel { .orderlabel {
width: 50px; width: 60px;
border-radius: 5px; border-radius: 5px;
height: 22px; height: 22px;
line-height: 22px; line-height: 22px;

@ -100,7 +100,7 @@
getCodeText: '获取验证码', getCodeText: '获取验证码',
getCodeisWaiting: false, getCodeisWaiting: false,
type: 1, // type: 1, //
disabled: false, disabled: true ,
} }
}, },
onLoad() { onLoad() {

@ -372,7 +372,7 @@
} }
let datas = { let datas = {
platformId: this.showType, platformId: this.showType,
regionId: app.globalData.cityId, "companyId": app.globalData.companyId,
productType: this.productType productType: this.productType
} }
getThirdPartyByDetail(datas).then(res => { getThirdPartyByDetail(datas).then(res => {

@ -38,9 +38,9 @@
</view> </view>
</view> </view>
<view class="font12 width90 fcor666 mart10 marb10 fotlt">订单已准备完毕喜欢您再来</view> <view class="font12 width90 fcor666 mart10 marb10 fotlt" v-if="recinfo.list">订单已准备完毕喜欢您再来</view>
<view class="width90 height70 backcorfff border-r alijusstart paddbotm10"> <view class="width90 height70 backcorfff border-r alijusstart paddbotm10" v-if="recinfo.list">
<view class="width70 fotlt"> <view class="width70 fotlt">
<view class="width94 fcor333 font14">请至柜台凭取餐码取餐</view> <view class="width94 fcor333 font14">请至柜台凭取餐码取餐</view>
<view class="width94 fcor666 font12 mart5">如有询问手机尾号请点击右侧按钮查看</view> <view class="width94 fcor666 font12 mart5">如有询问手机尾号请点击右侧按钮查看</view>
@ -64,7 +64,8 @@
v-for="(item,index) in recinfo.object.orderItems" :key='index'>{{item.code}}</view> v-for="(item,index) in recinfo.object.orderItems" :key='index'>{{item.code}}</view>
</view> </view>
<view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && !recinfo.list"> <view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && !recinfo.list">
{{recinfo.statusDesc}} <!-- {{recinfo.statusDesc}} -->
{{typeText[orderList.orderStatus]}}
</view> </view>
<view class="fotct font20 width100 mart10 color2f6f43" <view class="fotct font20 width100 mart10 color2f6f43"
v-if="typeid == 9 && !recinfo.object.orderItems[0].code">{{recinfo.statusDesc}}</view> v-if="typeid == 9 && !recinfo.object.orderItems[0].code">{{recinfo.statusDesc}}</view>
@ -76,7 +77,8 @@
充值明细 充值明细
</view> </view>
<view class="width94 paddtop15 font16 fontwig6 alijusstart" v-else> <view class="width94 paddtop15 font16 fontwig6 alijusstart" v-else>
<image src="../static/imgs/desloca.png" mode="widthFix" class="icon20 marglerig"></image> {{orderList.highChildOrderList[0].storeName}} <image src="../static/imgs/desloca.png" mode="widthFix" class="icon20 marglerig"></image>
{{orderList.highChildOrderList[0].storeName}}
</view> </view>
<view class="width100 mart5"> <view class="width100 mart5">
<view class="width90 alijusstart mart15" v-for="(item,index) in orderList.highChildOrderList" <view class="width90 alijusstart mart15" v-for="(item,index) in orderList.highChildOrderList"
@ -161,9 +163,9 @@
</view> </view>
<view class="width94 alijusstart mart20 font14 fcor666" v-if="orderList.payType"> <view class="width94 alijusstart mart20 font14 fcor666" v-if="orderList.payType">
<view class="width30">支付方式</view> <view class="width30">支付方式</view>
<view class="width70 fcor333 fotrt" v-if="orderList.payType == 2">微信</view> <view class="width70 fcor333 fotrt" v-if="orderList.payType == 2">微信支付</view>
<view class="width70 fcor333 fotrt" v-if="orderList.payType == 3">积分</view> <view class="width70 fcor333 fotrt" v-if="orderList.payType == 3">积分兑换</view>
<view class="width70 fcor333 fotrt" v-if="orderList.payType == 4">工会卡</view> <view class="width70 fcor333 fotrt" v-if="orderList.payType == 4">汇联通工会卡</view>
<view class="width70 fcor333 fotrt" v-if="orderList.payType == 5">银联支付</view> <view class="width70 fcor333 fotrt" v-if="orderList.payType == 5">银联支付</view>
</view> </view>
<view class="width94 alijusstart mart20 font14 fcor666" v-if="typeid == 10"> <view class="width94 alijusstart mart20 font14 fcor666" v-if="typeid == 10">
@ -182,7 +184,7 @@
<view class="height50 width100"></view> <view class="height50 width100"></view>
<view class="bottomstu backcorfff width100 height50 alijusend" v-if="orderList.orderStatus == 3"> <view class="bottomstu backcorfff width100 height50 alijusend" v-if="orderList.orderStatus == 3">
<button open-type="contact" class="cusservice font12 fcor666">联系客服</button> <button open-type="contact" class="cusservice font12 fcor666">联系客服</button>
<view class="buybtn font12 fcorfff">再来一单</view> <!-- <view class="buybtn font12 fcorfff">再来一单</view> -->
</view> </view>
</view> </view>
@ -217,7 +219,7 @@
6: '退款中', 6: '退款中',
7: '退款失败' 7: '退款失败'
}, },
phonestu: 1 ,// phonestu: 1, //
recinfo: [], // recinfo: [], //
} }
}, },
@ -342,7 +344,7 @@
// //
jumppay() { jumppay() {
uni.redirectTo({ uni.redirectTo({
url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.orderList.id + '&amount=' + url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.orderList. orderNo+ '&amount=' +
this.orderList.payPrice + '&productType=' + this.orderList.productType this.orderList.payPrice + '&productType=' + this.orderList.productType
}) })
}, },

@ -127,7 +127,7 @@
// #endif // #endif
let datas = { let datas = {
platformId: this.showType, platformId: this.showType,
regionId: app.globalData.cityId, "companyId": app.globalData.companyId,
productType: this.productType productType: this.productType
} }
getThirdPartyByDetail(datas).then(res => { getThirdPartyByDetail(datas).then(res => {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 154 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

@ -79,7 +79,7 @@
title: '优惠券包列表' title: '优惠券包列表'
}); });
this.getDiscountPackageList(); this.getDiscountPackageList();
this.getCmsContent('CMS_DISCOUNT_BANNER'); this.getCmsContent('CMS_DISCOUNT_PACKAGE_BANNER');
}, },
onPageScroll(e) { onPageScroll(e) {
@ -105,7 +105,7 @@
} }
getCmsContent(params).then(res => { getCmsContent(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.swiperList = res.return_data; this.swiperList = res.return_data.childCategory;
} }
}); });
}, },

@ -49,12 +49,12 @@
let params = { let params = {
companyId: app.globalData.companyId, companyId: app.globalData.companyId,
platform: code, platform: code,
categoryCode: 'CMS_TELEPHONE_POP_UP' categoryCode: 'CMS_RECHARGE_POPOVER'
} }
getCmsContent(params).then(res => { getCmsContent(params).then(res => {
if (res.return_code == '000000' && res.return_data != '') { if (res.return_code == '000000' && res.return_data != '') {
//广 //广
this.imgadres1 = res.return_data[0].imgData; this.imgadres1 = res.return_data.childCategory[0].imgData;
this.showPopup(); this.showPopup();
} }
}); });

Loading…
Cancel
Save