yangjie
/
high-mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
yj-dev
杨杰 2 years ago
parent fb445b4b4f
commit 851a905cb3
9 changed files with 327 additions and 245 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      App.vue
  2. 172
      Utils/Api.js
  3. 12
      pages/goods/goods-list/goods-list.vue
  4. 167
      pages/order/confirmation.vue
  5. 179
      pages/tabBar/home/home.vue
  6. 12
      pages/user/mineCouponsDestails/mineCouponsDestails.vue
  7. 12
      subPages/coupon-package/coupon-package.vue
  8. 12
      subPages/recharge/recharge.vue
  9. 4
      subPages/unionComfirmation/unionComfirmation.vue

2
App.vue
Unescape View File

@ -7,6 +7,7 @@
//正式 //正式
// url: 'https://hsg.dctpay.com/crest', // url: 'https://hsg.dctpay.com/crest',
// v1url:'https://hsg.dctpay.com/v1', // v1url:'https://hsg.dctpay.com/v1',
// orderurl:' https://hsg.dctpay.com/order',
// imgUrl: 'https://hsg.dctpay.com/filesystem/', // imgUrl: 'https://hsg.dctpay.com/filesystem/',
// brestUrl: 'https://hsg.dctpay.com/brest', // brestUrl: 'https://hsg.dctpay.com/brest',
// imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/', // imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
@ -14,6 +15,7 @@
//测试 //测试
url: 'https://hsgcs.dctpay.com/crest', url: 'https://hsgcs.dctpay.com/crest',
v1url: 'https://hsgcs.dctpay.com/v1', v1url: 'https://hsgcs.dctpay.com/v1',
orderurl:' https://hsgcs.dctpay.com/order',
brestUrl: 'https://hsgcs.dctpay.com/brest', brestUrl: 'https://hsgcs.dctpay.com/brest',
imgUrl: 'https://hsgcs.dctpay.com/filesystem/', imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/', imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',

172
Utils/Api.js
Unescape View File

@ -6,19 +6,20 @@ import {
} from "./bRequest.js"; } from "./bRequest.js";
let app = getApp(); let app = getApp();
let base = app.globalData.url; let base = app.globalData.url;
let orderbase = app.globalData.orderurl;
let v1base = app.globalData.v1url; let v1base = app.globalData.v1url;
let brestBase = app.globalData.brestUrl; let brestBase = app.globalData.brestUrl;
//公众号获取跳小程序参数 //公众号获取跳小程序参数
export const verifyWx = params => { export const verifyWx = params => {
return POST('GET', `${v1base}/wxMsg/verifyWx`, params).then(res => res.data); return POST('GET', `${v1base}/wxMsg/verifyWx`, params).then(res => res.data);
} }
//公众号获取跳转小程序地址 //公众号获取跳转小程序地址
export const getScheme = params => { export const getScheme = params => {
return POST('GET', `${v1base}/wxMsg/getScheme`, params).then(res => res.data); return POST('GET', `${v1base}/wxMsg/getScheme`, params).then(res => res.data);
} }
//根据code获取openId //根据code获取openId
export const HandleCode = params => { export const HandleCode = params => {
return POST('GET', `${base}/wechat/handleCode`, params).then(res => res.data); return POST('GET', `${base}/wechat/handleCode`, params).then(res => res.data);
@ -119,11 +120,11 @@ export const orderToGoldPay = params => {
//查询用户积分使用情况 //查询用户积分使用情况
export const getUserGoldRecList = params => { export const getUserGoldRecList = params => {
return POST('GET', `${base}/highGoldRec/getUserGoldRecList`, params).then(res => res.data); return POST('GET', `${base}/highGoldRec/getUserGoldRecList`, params).then(res => res.data);
} }
//查询积分7天过期 //查询积分7天过期
export const selectByExpiringSoon = params => { export const selectByExpiringSoon = params => {
return POST('GET', `${base}/highGoldRec/selectByExpiringSoon`, params).then(res => res.data); return POST('GET', `${base}/highGoldRec/selectByExpiringSoon`, params).then(res => res.data);
} }
//获取用户卡券 //获取用户卡券
export const getUserCouponList = params => { export const getUserCouponList = params => {
return POST('GET', `${base}/coupon/getUserCouponList`, params).then(res => res.data); return POST('GET', `${base}/coupon/getUserCouponList`, params).then(res => res.data);
@ -137,9 +138,9 @@ export const getUserNewCouponDetail = params => {
return POST('GET', `${base}/coupon/getUserNewCouponDetail`, params).then(res => res.data); return POST('GET', `${base}/coupon/getUserNewCouponDetail`, params).then(res => res.data);
} }
//获取订单信息 //获取订单信息
export const getUserOrderList = params => { // export const getUserOrderList = params => {
return POST('GET', `${base}/highOrder/getUserOrderList`, params).then(res => res.data); // return POST('GET', `${base}/highOrder/getUserOrderList`, params).then(res => res.data);
} // }
//取消订单 //取消订单
export const cancelOrder = params => { export const cancelOrder = params => {
return POST('GET', `${base}/highOrder/cancelOrder`, params).then(res => res.data); return POST('GET', `${base}/highOrder/cancelOrder`, params).then(res => res.data);
@ -147,11 +148,11 @@ export const cancelOrder = params => {
//订单查询详情 //订单查询详情
export const getOrderById = params => { export const getOrderById = params => {
return POST('GET', `${base}/highOrder/getOrderById`, params).then(res => res.data); return POST('GET', `${base}/highOrder/getOrderById`, params).then(res => res.data);
} }
//已完成未查看 //已完成未查看
export const orderCheck = params => { export const orderCheck = params => {
return POST('GET', `${base}/highOrder/orderCheck`, params).then(res => res.data); return POST('GET', `${base}/highOrder/orderCheck`, params).then(res => res.data);
} }
//获取商户列表 //获取商户列表
export const getMerchantList = params => { export const getMerchantList = params => {
@ -173,18 +174,18 @@ export const getUserOrderPreList = params => {
//领取优惠券 //领取优惠券
export const receiveDiscount = params => { export const receiveDiscount = params => {
return POST('POST', `${base}/userDiscount/receiveDiscount`, params).then(res => res.data); return POST('POST', `${base}/userDiscount/receiveDiscount`, params).then(res => res.data);
} }
//领取优惠券 //领取优惠券
export const receive = params => { export const receive = params => {
return POST('POST', `${base}/userDiscount/receive`, params).then(res => res.data); return POST('POST', `${base}/userDiscount/receive`, params).then(res => res.data);
} }
//根据code查询优惠券 //根据code查询优惠券
export const getDiscountByCode = params => { export const getDiscountByCode = params => {
return POST('GET', `${base}/discount/getDiscountByCode`, params).then(res => res.data); return POST('GET', `${base}/discount/getDiscountByCode`, params).then(res => res.data);
} }
// 根据优惠券查卡券 // 根据优惠券查卡券
export const getCouponByDiscount = params => { export const getCouponByDiscount = params => {
@ -233,11 +234,11 @@ export const oilPriceCompute = params => {
//团油计算新价格 //团油计算新价格
export const oilPriceDiscountCompute = params => { export const oilPriceDiscountCompute = params => {
return POST('GET', `${base}/highGas/oilPriceDiscountCompute`, params).then(res => res.data); return POST('GET', `${base}/highGas/oilPriceDiscountCompute`, params).then(res => res.data);
} }
//在线加油优惠券 //在线加油优惠券
export const canUseDiscount = params => { export const canUseDiscount = params => {
return POST('POST', `${base}/userDiscount/canUseDiscount`, params).then(res => res.data); return POST('POST', `${base}/userDiscount/canUseDiscount`, params).then(res => res.data);
} }
//查询卡数据字典 //查询卡数据字典
export const getDictionaryByCodeType = params => { export const getDictionaryByCodeType = params => {
return POST('GET', `${base}/common/getDictionaryByCodeType`, params).then(res => res.data); return POST('GET', `${base}/common/getDictionaryByCodeType`, params).then(res => res.data);
@ -351,11 +352,11 @@ export const getWinLotteryList = params => {
//跳转是否赠券 //跳转是否赠券
export const getMembershipLevel = params => { export const getMembershipLevel = params => {
return POST('GET', `${base}/highUser/GetMembershipLevel`, params).then(res => res.data); return POST('GET', `${base}/highUser/GetMembershipLevel`, params).then(res => res.data);
} }
//查询配置方式 //查询配置方式
export const getThirdPartyByDetail = params => { export const getThirdPartyByDetail = params => {
return POST('GET', `${base}/highThirdParty/getThirdPartyByDetail`, params).then(res => res.data); return POST('GET', `${base}/highThirdParty/getThirdPartyByDetail`, params).then(res => res.data);
} }
/** /**
* 肯德基地址 * 肯德基地址
*/ */
@ -365,29 +366,29 @@ export const getTPigKFCToken = params => {
//查询城市列表 //查询城市列表
export const getAllCity = params => { export const getAllCity = params => {
return POST('GET', `${base}/highThirdParty/getAllCity`, params).then(res => res.data); return POST('GET', `${base}/highThirdParty/getAllCity`, params).then(res => res.data);
} }
//首页城市选择 //首页城市选择
export const findCompanyByCityName = params => { export const findCompanyByCityName = params => {
return POST('GET', `${base}/common/findCompanyByCityName`, params).then(res => res.data); return POST('GET', `${base}/common/findCompanyByCityName`, params).then(res => res.data);
} }
//查询肯德基门店列表 //查询肯德基门店列表
export const getKfcStoresList = params => { export const getKfcStoresList = params => {
return POST('GET', `${base}/highThirdParty/getKfcStoresList`, params).then(res => res.data); return POST('GET', `${base}/highThirdParty/getKfcStoresList`, params).then(res => res.data);
} }
//肯德基商品详情 //肯德基商品详情
export const listByStoreCode = params => { export const listByStoreCode = params => {
return POST('GET', `${base}/highThirdParty/listByStoreCode`, params).then(res => res.data); return POST('GET', `${base}/highThirdParty/listByStoreCode`, params).then(res => res.data);
} }
//肯德基订单详情 //肯德基订单详情
export const getThirdOrderByOrderId = params => { export const getThirdOrderByOrderId = params => {
return POST('GET', `${base}/highThirdParty/getThirdOrderByOrderId`, params).then(res => res.data); return POST('GET', `${base}/highThirdParty/getThirdOrderByOrderId`, params).then(res => res.data);
} }
//肯德基,星巴克取消订单 //肯德基,星巴克取消订单
export const thirdCancelOrder = params => { export const thirdCancelOrder = params => {
return POST('GET', `${base}/highThirdParty/thirdCancelOrder`, params).then(res => res.data); return POST('GET', `${base}/highThirdParty/thirdCancelOrder`, params).then(res => res.data);
} }
//电影票 //电影票
@ -403,40 +404,40 @@ export const getStarbucksStore = params => {
export const getStarbucksProducts = params => { export const getStarbucksProducts = params => {
return POST('GET', `${base}/highThirdParty/getStarbucksProducts`, params).then(res => res.data); return POST('GET', `${base}/highThirdParty/getStarbucksProducts`, params).then(res => res.data);
} }
//微信支付千猪 //微信支付千猪
export const qianzhuorderToPayByWx = params => { export const qianzhuorderToPayByWx = params => {
return POST('POST', `${base}/thirdOrder/orderToPayByWx`, params).then(res => res.data); return POST('POST', `${base}/thirdOrder/orderToPayByWx`, params).then(res => res.data);
} }
//星巴克下单 //星巴克下单
export const xbkaddOrder = params => { export const xbkaddOrder = params => {
return POST('POST', `${base}/highThirdParty/addOrder`, params).then(res => res.data); return POST('POST', `${base}/highThirdParty/addOrder`, params).then(res => res.data);
} }
//会员充值产品 //会员充值产品
export const getMemberProducts = params => { export const getMemberProducts = params => {
return POST('GET', `${base}/highThirdParty/getMemberProducts`, params).then(res => res.data); return POST('GET', `${base}/highThirdParty/getMemberProducts`, params).then(res => res.data);
} }
//分销统计数据 //分销统计数据
export const userDistributionStatistics = params => { export const userDistributionStatistics = params => {
return POST('GET', `${base}/highUser/userDistributionStatistics`, params).then(res => res.data); return POST('GET', `${base}/highUser/userDistributionStatistics`, params).then(res => res.data);
} }
//邀请列表 //邀请列表
export const distributionInviteList = params => { export const distributionInviteList = params => {
return POST('GET', `${base}/highUser/distributionInviteList`, params).then(res => res.data); return POST('GET', `${base}/highUser/distributionInviteList`, params).then(res => res.data);
} }
//分销用户积分列表 //分销用户积分列表
export const distributionOrderList = params => { export const distributionOrderList = params => {
return POST('GET', `${base}/highUser/distributionOrderList`, params).then(res => res.data); return POST('GET', `${base}/highUser/distributionOrderList`, params).then(res => res.data);
} }
//分销用户积分列表 //分销用户积分列表
export const promoteOrderList = params => { export const promoteOrderList = params => {
return POST('GET', `${base}/highUser/promoteOrderList`, params).then(res => res.data); return POST('GET', `${base}/highUser/promoteOrderList`, params).then(res => res.data);
} }
//生成海报 //生成海报
export const promotionalPosters = params => { export const promotionalPosters = params => {
return POST('GET', `${base}/highUser/promotionalPosters`, params).then(res => res.data); return POST('GET', `${base}/highUser/promotionalPosters`, params).then(res => res.data);
} }
export const qzOrderToPay = params => { export const qzOrderToPay = params => {
return POST('POST', `${base}/order/qzOrderToPay`, params).then(res => res.data); return POST('POST', `${base}/order/qzOrderToPay`, params).then(res => res.data);
@ -449,25 +450,25 @@ export const getGatewayToken = params => {
export const cancelOrderByOrderNo = params => { export const cancelOrderByOrderNo = params => {
return POST('GET', `${base}/highOrder/cancelOrderByOrderNo`, params).then(res => res.data); return POST('GET', `${base}/highOrder/cancelOrderByOrderNo`, params).then(res => res.data);
} }
//中石油生成二维码 //中石油生成二维码
export const getVerifyQRCode = params => { export const getVerifyQRCode = params => {
return POST('GET', `${base}/coupon/getVerifyQRCode`, params).then(res => res.data); return POST('GET', `${base}/coupon/getVerifyQRCode`, params).then(res => res.data);
} }
/** /**
* H5 获取用户信息 * H5 获取用户信息
*/ */
//判断是否有手机号 //判断是否有手机号
export const getH5AccessByOpenId = params => { export const getH5AccessByOpenId = params => {
return POST('GET', `${base}/wechat/getH5AccessByOpenId`, params).then(res => res.data); return POST('GET', `${base}/wechat/getH5AccessByOpenId`, params).then(res => res.data);
} }
//h5静默登陆 //h5静默登陆
export const loginBySilence = params => { export const loginBySilence = params => {
return POST('GET', `${base}/wechat/loginBySilence`, params).then(res => res.data); return POST('GET', `${base}/wechat/loginBySilence`, params).then(res => res.data);
} }
export const getH5UserInfo = params => { export const getH5UserInfo = params => {
return POST('GET', `${base}/wechat/getH5UserInfo`, params).then(res => res.data); return POST('GET', `${base}/wechat/getH5UserInfo`, params).then(res => res.data);
@ -515,8 +516,8 @@ export const getCodeListByAgentCoupon = params => {
// 生成二维码 // 生成二维码
export const generateCode = params => { export const generateCode = params => {
return POSTBREST('POST', `${brestBase}/highCouponAgent/generateCode`, params).then(res => res.data); return POSTBREST('POST', `${brestBase}/highCouponAgent/generateCode`, params).then(res => res.data);
} }
// 兑换码填写备注 // 兑换码填写备注
export const highremark = params => { export const highremark = params => {
@ -604,17 +605,36 @@ export const orderToPayByWx = params => {
//工会卡支付 //工会卡支付
export const hltUnionCardPayghk = params => { export const hltUnionCardPayghk = params => {
return POST('POST', `${base}/czOrder/hltUnionCardPay`, params).then(res => res.data); return POST('POST', `${base}/czOrder/hltUnionCardPay`, params).then(res => res.data);
} }
export const czhltUnionCardPay = params => { export const czhltUnionCardPay = params => {
return POST('POST', `${base}/thirdOrder/hltUnionCardPay`, params).then(res => res.data); return POST('POST', `${base}/thirdOrder/hltUnionCardPay`, params).then(res => res.data);
} }
//话费列表 //话费列表
export const getUserOrderListhuafei = params => { export const getUserOrderListhuafei = params => {
return POST('GET', `${base}/outRechargeOrder/getUserOrderList`, params).then(res => res.data); return POST('GET', `${base}/outRechargeOrder/getUserOrderList`, params).then(res => res.data);
} }
//肯德基返利 //肯德基返利
export const getRebateIntegral = params => { export const getRebateIntegral = params => {
return POST('POST', `${base}/common/getRebateIntegral`, params).then(res => res.data); return POST('POST', `${base}/common/getRebateIntegral`, params).then(res => res.data);
}
// -----------订单新接口------------
//新建订单
export const create = params => {
return POST('POST', `${orderbase}/create`, params).then(res => res.data);
}
//获取订单列表
export const getUserOrderList = params => {
return POST('GET', `${orderbase}/getUserOrderList`, params).then(res => res.data);
}
//订单详情
export const getDetailByOrderNo = params => {
return POST('GET', `${orderbase}/getDetailByOrderNo`, params).then(res => res.data);
}
//取消订单
export const cancel = params => {
return POST('POST', `${orderbase}/cancel`, params).then(res => res.data);
} }

12
pages/goods/goods-list/goods-list.vue
Unescape View File

@ -185,9 +185,17 @@
this.getCouponListArea(); this.getCouponListArea();
}, },
//获取弹出或者弹窗 //获取弹出或者弹窗
getCmsContent(item) { getCmsContent(item) {
let code;
// #ifdef H5
code = '2'
// #endif
// #ifdef MP
code = '1'
// #endif
let params = { let params = {
regionId: app.globalData.cityId, companyId: app.globalData.companyId,
platform: code,
categoryCode: item categoryCode: item
} }
getCmsContent(params).then(res => { getCmsContent(params).then(res => {

167
pages/order/confirmation.vue
Unescape View File

@ -95,7 +95,55 @@
</view> </view>
</view> </view>
<view class="width94 comorder mart10"> <view class="width94 comorder mart10">
<view class="width92 alijusstart paddtop20">
<view class="width30 fcor333 fontwig6 font16">
积分抵扣
</view>
<view class="cj-slider">
<view class="flleft fotct font14 fcor666" style="width: 15%;">0</view>
<cj-slider style="width: 60%; float:left;" v-if="isDiscount" v-model="priceValue" :min="0"
:max="availIntegal" :step="1" :blockWidth="40" @start="blockStart" @moving="blockMoving"
@end="blockEnd" />
<!-- <cj-slider style="width: 60%; float:left;" v-if="isDiscount == 2" v-model="priceValue" :min="0"
:max="availIntegal" :step="1" :blockWidth="40" @start="blockStart" @moving="blockMoving"
@end="blockEnd" /> -->
<view class="flright fotrt font14 fcor666" style="width: 25%;">{{availIntegal}}</view>
</view>
</view>
<view class="width94 line1 mart15 marb5"></view>
<view class="height50 width100 backcorfff">
<view class="width70 flleft fcor333 fontwig6 font16 text1" style="padding-left: 4%;">
抵扣金额
</view>
<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
style="align-items: center;">
¥{{priceValue[1] / 100}}
</view>
</view>
<view class="width94 line1 mart5 marb5"></view>
<view class="height40 width100 backcorfff">
<view class="width40 flleft fcor666 font15 fontwig6 text1 alijusstart" style="padding-left: 2%;">
<image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
<text>下单返积分</text>
</view>
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 1"
style="align-items: center;">
返{{rebateIntegral}}积分
</view>
<view class="width50 flright fotrt paddtright10 font15 colore95 alijun" v-if="Integrastu == 2"
style="align-items: center;">
{{rebateIntegral}}
</view>
</view>
<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
<text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text>
</view>
<view class="height50 width100 backcorfff"> <view class="height50 width100 backcorfff">
<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;"> <view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
支付方式: <text class="jfrecharge" @click="jumpdeposits" 支付方式: <text class="jfrecharge" @click="jumpdeposits"
@ -194,17 +242,21 @@
<script> <script>
import { import {
addOrder, addOrder,
create,
getCouponById, getCouponById,
loginByPhone, loginByPhone,
getUserNormalDiscountList, getUserNormalDiscountList,
orderToPay, orderToPay,
orderToGoldPay, orderToGoldPay,
findUser, findUser,
hltUnionCardPay, hltUnionCardPay,
getHuiLianTongCardBalance getRebateIntegral,
getHuiLianTongCardBalance,
findById
} from '../../Utils/Api.js'; } from '../../Utils/Api.js';
import wybPopup from '../../components/wyb-popup/wyb-popup.vue'; import wybPopup from '../../components/wyb-popup/wyb-popup.vue';
import cjSlider from '../../components/cj-slider/cj-slider.vue';
import ssPaymentPassword from '../../components/sanshui-payment-password' import ssPaymentPassword from '../../components/sanshui-payment-password'
let app = getApp(); let app = getApp();
// #ifdef H5 // #ifdef H5
@ -243,7 +295,15 @@
coupondiscountid: '', coupondiscountid: '',
orderDetails: '', //订单详情 orderDetails: '', //订单详情
payGold: '', //积分数 payGold: '', //积分数
identificationCode: '' //渠道商 identificationCode: '' ,//渠道商
paytypeList: [], //支付方式
priceValue: [0, 0], // 积分可以指定默认值
changePrice: '', //滑动值
isDiscount: true,
availIntegal: '', // 可用积分
isUse: true, // 是否禁用状态
rebateIntegral: '', //返回积分
Integrastu: 1 //返积分状态
}; };
}, },
onLoad(option) { onLoad(option) {
@ -289,24 +349,79 @@
return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`; return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
} }
}, },
methods: { methods: {
//查询详情
findById() {
uni.showLoading({
title: '加载中'
})
let showType;
// #ifdef H5
showType = 2;
// #endif
// #ifdef MP
showType = 1;
// #endif
let datas = {
platformId: showType,
id: this.objectId
}
findById(datas).then(res => {
if (res.return_code == '000000') {
uni.hideLoading();
this.rechargeDes = res.return_data;
this.paytypeList = res.return_data.productPayTypeString.split(',');
this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
let zkprice = parseFloat(res.return_data.integralDiscount / 100).toFixed(2);
let pprice = parseFloat(res.return_data.payPrice * 100).toFixed(0)
let payprice = parseFloat(res.return_data.payPrice * 100 * zkprice).toFixed(
0);
if (payprice > this.user.gold) {
this.availIntegal = this.user.gold;
} else {
this.availIntegal = payprice;
}
}
});
},
//查询积分 //查询积分
findUser() { findUser() {
let params; let params;
findUser(params).then(res => { findUser(params).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
app.globalData.userInfo = res.return_data; app.globalData.userInfo = res.return_data;
this.user = res.return_data; this.user = res.return_data;
this.availIntegal = res.return_data.gold;
this.findById();
if (this.user.hltCardNo) { if (this.user.hltCardNo) {
this.getHuiLianTongCardBalance(); this.getHuiLianTongCardBalance();
} }
this.getUserNormalDiscountList(); this.getUserNormalDiscountList();
this.getRebateIntegral();
uni.setStorage({ uni.setStorage({
key: "user", key: "user",
data: res.return_data data: res.return_data
}) })
} }
}); });
},
//支付返利积分
getRebateIntegral() {
let datas = {
"companyId": app.globalData.companyId,
"price": this.paytheprice,
"productId": 1,
"type": 1,
}
getRebateIntegral(datas).then(res => {
if (res.return_code == '000000') {
this.rebateIntegral = res.return_data;
this.Integrastu = 1;
} else {
this.rebateIntegral = res.return_msg;
this.Integrastu = 2;
}
})
}, },
//查询卡券详情 //查询卡券详情
getCouponById() { getCouponById() {
@ -833,7 +948,31 @@
duration: 4000 duration: 4000
}); });
}); });
}, },
blockStart() {},
blockMoving() {
// console.log('正在滑动中')
},
//滑动结束
blockEnd() {
this.isDiscount = 1;
if (this.deductionPrice == 0) {
this.payPrice = parseFloat(this.saveprice - parseFloat(this.priceValue[1] / 100).toFixed(2)).toFixed(
2);
} else {
this.payPrice = parseFloat(this.orderPrice - parseFloat(this.priceValue[1] / 100).toFixed(2) - this
.deductionPrice).toFixed(2);
}
if (this.payPrice == 0) {
this.isUse = false;
this.paytype = '';
} else {
this.isUse = true;
}
this.getRebateIntegral();
},
//跳转积分充值 //跳转积分充值
jumpdeposits() { jumpdeposits() {
uni.navigateTo({ uni.navigateTo({
@ -859,6 +998,12 @@
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
margin-top: 30rpx; margin-top: 30rpx;
}
.cj-slider {
width: 100%;
align-items: center;
display: flex;
} }
.goodsimg { .goodsimg {

179
pages/tabBar/home/home.vue
Unescape View File

@ -35,8 +35,8 @@
<view v-for="(item,index) in homeCateList" :key="index"> <view v-for="(item,index) in homeCateList" :key="index">
<view class="height90 backcorltop mart50" v-if="item.type == 1"> <view class="height90 backcorltop mart50" v-if="item.type == 1">
<view class="category-list"> <view class="category-list">
<view class="category" style="width: 25%;" v-for="(row, index) in item.childCategory" :key="index" <view class="category" style="width: 25%;" v-for="(row, indexs) in item.childCategory" :key="indexs"
@tap="toCategory(row)"> @click="toCategory(row)">
<view class="img"> <view class="img">
<image :src="imageUrl+row.imgData"></image> <image :src="imageUrl+row.imgData"></image>
</view> </view>
@ -49,8 +49,8 @@
<!-- 顶部菜单 --> <!-- 顶部菜单 -->
<view class="category-list backcorfff" style="margin-top: -5px;" v-if="item.type == 7"> <view class="category-list backcorfff" style="margin-top: -5px;" v-if="item.type == 7">
<view class="category" style="width: 20%;" v-for="(row, index) in item.childCategory" :key="index" <view class="category" style="width: 20%;" v-for="(row, indexc) in item.childCategory" :key="indexc"
@tap="toCategory(row)"> @click="toCategory(row)">
<view class="img"> <view class="img">
<image :src="imageUrl+row.imgData"></image> <image :src="imageUrl+row.imgData"></image>
</view> </view>
@ -89,7 +89,8 @@
</view> </view>
</view> </view>
<!-- 加油专区 ,天天好券--> <!-- 加油专区 ,天天好券-->
<view class="width90 mart20 alijusstart" v-if="item.type == 6 || item.type == 9" @click="goGoodsList(item.jumpUrl)"> <view class="width90 mart20 alijusstart" v-if="item.type == 6 || item.type == 9"
@click="goGoodsList(item.jumpUrl)">
<view class="width70 font18 fcor333"> <view class="width70 font18 fcor333">
{{item.name}} {{item.name}}
</view> </view>
@ -108,7 +109,8 @@
<view class="backcorfff spcarea" v-for="(goods,index) in item.childDate" :key="index"> <view class="backcorfff spcarea" v-for="(goods,index) in item.childDate" :key="index">
<image mode="widthFix" class="width100" :src="imageUrl+goods.listImg"></image> <image mode="widthFix" class="width100" :src="imageUrl+goods.listImg"></image>
<view class="width96 fcor333 font15 fontwig6">{{goods.title}}</view> <view class="width96 fcor333 font15 fontwig6">{{goods.title}}</view>
<view class="width96 fcor999 font11" v-if="goods.effectiveTiem">{{goods.effectiveTiem | timeFormat('yyyy-mm-dd hh:mm:ss')}} <view class="width96 fcor999 font11" v-if="goods.effectiveTiem">
{{goods.effectiveTiem | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view> </view>
<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.price}}</view> <view class="width94 fcoreb5 font15 fontwig6">¥{{goods.price}}</view>
</view> </view>
@ -120,11 +122,15 @@
</view> </view>
</view> </view>
<image class="width90 mart10" mode="widthFix" v-if="item.type == 5" <image class="width90 mart10" mode="widthFix" v-if="item.type == 5"
:src="imageUrl+item.childCategory[0].imgData" @click="goGoodsList(imageUrl+item.childCategory[0].jumpUrl)"></image> :src="imageUrl+item.childCategory[0].imgData"
@click="goGoodsList(item.childCategory[0].jumpUrl)"></image>
<view class="width90 alijusstart mart10" v-if="item.type == 5"> <view class="width90 alijusstart mart10" v-if="item.type == 5">
<image :src="imageUrl+item.childCategory[1].imgData" mode="widthFix" class="width31" @click="goGoodsList(imageUrl+item.childCategory[1].jumpUrl)"></image> <image :src="imageUrl+item.childCategory[1].imgData" mode="widthFix" class="width31"
<image :src="imageUrl+item.childCategory[2].imgData" mode="widthFix" class="width31" @click="goGoodsList(imageUrl+item.childCategory[2].jumpUrl)"></image> @click="goGoodsList(item.childCategory[1].jumpUrl)"></image>
<image :src="imageUrl+item.childCategory[3].imgData" mode="widthFix" class="width31" @click="goGoodsList(imageUrl+item.childCategory[3].jumpUrl)"></image> <image :src="imageUrl+item.childCategory[2].imgData" mode="widthFix" class="width31"
@click="goGoodsList(item.childCategory[2].jumpUrl)"></image>
<image :src="imageUrl+item.childCategory[3].imgData" mode="widthFix" class="width31"
@click="goGoodsList(item.childCategory[3].jumpUrl)"></image>
</view> </view>
<!-- 天天好券 --> <!-- 天天好券 -->
<!-- <view class="width90 mart20 alijusstart" v-if="item.type == 6"> <!-- <view class="width90 mart20 alijusstart" v-if="item.type == 6">
@ -213,18 +219,10 @@
img: 'banner3.png' img: 'banner3.png'
} }
], ],
//猜你喜欢列表
productList: [],
productListleg: '',
goldproductList: [],
goldproductListleg: '',
unioncardproductList: [],
unioncardproductListleg: '',
loadingText: '正在加载...', loadingText: '正在加载...',
pageNum: 1, pageNum: 1,
pageSize: 6, pageSize: 6,
// 分类菜单 // 分类菜单
categoryList: [],
homeCateList: [], homeCateList: [],
//切换状态 //切换状态
cpStuats: 1, cpStuats: 1,
@ -236,11 +234,6 @@
onShow() { onShow() {
if (app.globalData.cityName != '') { if (app.globalData.cityName != '') {
this.city = app.globalData.qianzhuCityName; this.city = app.globalData.qianzhuCityName;
// this.getCouponListArea();
// this.getCouponListgold();
// this.getunioncardCouponListgold();
// this.getCmsContent();
// this.getCmsContentcmshome();
this.getCmsContentcmsContent(); this.getCmsContentcmsContent();
// if (app.globalData.userInfo.phone) { // if (app.globalData.userInfo.phone) {
// this.getMembershipLevel(); // this.getMembershipLevel();
@ -336,12 +329,7 @@
that.city = '重庆市'; that.city = '重庆市';
app.globalData.cityName = '重庆市'; app.globalData.cityName = '重庆市';
app.globalData.cityId = '500000'; app.globalData.cityId = '500000';
// that.getCouponListArea();
// that.getCouponListgold();
// that.getunioncardCouponListgold();
// that.getCmsContent();
// that.getCmsAactibity(); // that.getCmsAactibity();
// that.getCmsContentcmshome();
that.getCmsContentcmsContent(); that.getCmsContentcmsContent();
} }
); );
@ -404,50 +392,20 @@
regionId: app.globalData.cityId regionId: app.globalData.cityId
} }
getMembershipLevel(params).then(res => {}); getMembershipLevel(params).then(res => {});
}, },
//获取首页菜单 //弹窗
getCmsContentcmshome() {
let code;
// #ifdef H5
code = 'CMS_H5_FAST'
// #endif
// #ifdef MP
code = 'CMS_HOME_NAV'
// #endif
let params = {
regionId: app.globalData.cityId,
categoryCode: code
}
getCmsContent(params).then(res => {
if (res.return_code == '000000') {
this.categoryList = res.return_data;
}
});
},
//获取弹出或者弹窗
getCmsContent() {
let params = {
regionId: app.globalData.cityId,
categoryCode: 'CMS_WX_APPLETS_HOME_SLIDESHOW'
}
getCmsContent(params).then(res => {
if (res.return_code == '000000') {
this.swiperList = res.return_data;
}
});
},
getCmsAactibity() { getCmsAactibity() {
let code; let code;
// #ifdef H5 // #ifdef H5
code = 'CMS_H5_ALERT' code = '2'
// #endif // #endif
// #ifdef MP // #ifdef MP
code = 'CMS_WX_APPLETS_HOME_ACTIVITY' code = '1'
// #endif // #endif
let params = { let params = {
regionId: app.globalData.cityId, companyId: app.globalData.companyId,
categoryCode: code platform: code,
categoryCode: ''
} }
getCmsContent(params).then(res => { getCmsContent(params).then(res => {
if (res.return_code == '000000' && res.return_data != '') { if (res.return_code == '000000' && res.return_data != '') {
@ -570,12 +528,7 @@
}) })
// app.globalData.cityId = '500103'; // app.globalData.cityId = '500103';
if (res.return_data.regionId) { if (res.return_data.regionId) {
// that.getCouponListArea();
// that.getCouponListgold();
// that.getunioncardCouponListgold();
// that.getCmsContent();
// that.getCmsAactibity(); // that.getCmsAactibity();
// that.getCmsContentcmshome();
that.getCmsContentcmsContent(); that.getCmsContentcmsContent();
} }
uni.getStorage({ uni.getStorage({
@ -699,72 +652,7 @@
url: '../../goods/goods?id=' + e url: '../../goods/goods?id=' + e
}); });
}, },
//赠券卡券列表
getCouponListArea() {
let params = {
regionId: app.globalData.cityId,
pageNum: this.pageNum,
pageSize: this.pageSize,
displayArea: 1
}
getCouponList(params).then(res => {
if (res.return_code == '000000' && res.return_data.list) {
this.productList = res.return_data.list;
if (res.return_data.total > 4) {
this.productListleg = 4;
return;
}
this.productListleg = res.return_data.total;
} else {
this.productList = [];
}
})
},
//积分卡券列表
getCouponListgold() {
let params = {
regionId: app.globalData.cityId,
pageNum: this.pageNum,
pageSize: this.pageSize,
displayArea: 2
}
getCouponList(params).then(res => {
if (res.return_code == '000000' && res.return_data.list) {
this.goldproductList = res.return_data.list;
this.goldproductListleg = res.return_data.total;
if (res.return_data.total > 4) {
this.goldproductListleg = 4;
return;
}
this.goldproductListleg = res.return_data.total;
} else {
this.productList = [];
}
})
},
//工会卡卡券列表
getunioncardCouponListgold() {
let params = {
regionId: app.globalData.cityId,
pageNum: this.pageNum,
pageSize: this.pageSize,
displayArea: 5
}
getCouponList(params).then(res => {
if (res.return_code == '000000' && res.return_data.list) {
this.unioncardproductList = res.return_data.list;
this.unioncardproductListleg = res.return_data.total;
if (res.return_data.total > 4) {
this.unioncardproductListleg = 4;
return;
}
this.unioncardproductListleg = res.return_data.total;
} else {
this.unioncardproductList = [];
}
})
},
//轮播图指示器 //轮播图指示器
swiperChange(event) { swiperChange(event) {
this.currentSwiper = event.detail.current; this.currentSwiper = event.detail.current;
@ -834,7 +722,6 @@
} }
}) })
}, },
//跳转菜单 //跳转菜单
toCategory(item) { toCategory(item) {
uni.navigateTo({ uni.navigateTo({
@ -850,16 +737,10 @@
} }
}, },
//单独跳转话费充值 //跳转商品列表
jumphuafei(item) {
uni.navigateTo({
url: item.ext1
})
},
//调整商品列表
goGoodsList(item) { goGoodsList(item) {
uni.navigateTo({ uni.navigateTo({
url: item url: item
// '/pages/goods/goods-list/goods-list?id=' + item // '/pages/goods/goods-list/goods-list?id=' + item
}) })
}, },

12
pages/user/mineCouponsDestails/mineCouponsDestails.vue
Unescape View File

@ -111,9 +111,17 @@
}, },
methods: { methods: {
//获取视频资料 //获取视频资料
getCmsContentvideo() { getCmsContentvideo() {
let code;
// #ifdef H5
code = '2'
// #endif
// #ifdef MP
code = '1'
// #endif
let params = { let params = {
regionId: app.globalData.cityId, companyId: app.globalData.companyId,
platform: code,
categoryCode: 'CMS_H5_VIDEO' categoryCode: 'CMS_H5_VIDEO'
} }
getCmsContent(params).then(res => { getCmsContent(params).then(res => {

12
subPages/coupon-package/coupon-package.vue
Unescape View File

@ -90,9 +90,17 @@
}, },
methods: { methods: {
//获取弹出或者弹窗 //获取弹出或者弹窗
getCmsContent(item) { getCmsContent(item) {
let code;
// #ifdef H5
code = '2'
// #endif
// #ifdef MP
code = '1'
// #endif
let params = { let params = {
regionId: app.globalData.cityId, companyId: app.globalData.companyId,
platform: code,
categoryCode: item categoryCode: item
} }
getCmsContent(params).then(res => { getCmsContent(params).then(res => {

12
subPages/recharge/recharge.vue
Unescape View File

@ -38,9 +38,17 @@
}) })
}, },
//查询弹窗 //查询弹窗
getCmsAactibity() { getCmsAactibity() {
let code;
// #ifdef H5
code = '2'
// #endif
// #ifdef MP
code = '1'
// #endif
let params = { let params = {
regionId: app.globalData.cityId, companyId: app.globalData.companyId,
platform: code,
categoryCode: 'CMS_TELEPHONE_POP_UP' categoryCode: 'CMS_TELEPHONE_POP_UP'
} }
getCmsContent(params).then(res => { getCmsContent(params).then(res => {

4
subPages/unionComfirmation/unionComfirmation.vue
Unescape View File

@ -306,7 +306,9 @@
app.globalData.userInfo = res.return_data; app.globalData.userInfo = res.return_data;
this.user = res.return_data; this.user = res.return_data;
this.findById(); this.findById();
this.getHuiLianTongCardBalance(); if (this.user.hltCardNo) {
this.getHuiLianTongCardBalance();
}
this.getRebateIntegral(); this.getRebateIntegral();
uni.setStorage({ uni.setStorage({
key: "user", key: "user",

Write Preview
Loading…
Cancel
Save