1.优化2.0 合并问题 修改问题

master
杨杰 2 years ago
parent 766cf84c5f
commit a328ef6454
  1. 28
      high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue
  2. 8
      high-unionPay/pages/goods/goods-list/goods-list.vue
  3. 12
      high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
  4. 8
      high-unionPay/pages/order/confirmation.vue
  5. 2
      high-unionPay/pages/pay/success/success.vue
  6. 2
      high-unionPay/pages/tabBar/category/category.vue
  7. 53
      high-unionPay/pages/tabBar/home/home.vue
  8. 997
      high-unionPay/pages/tabBar/user/user.vue
  9. 2
      high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue
  10. 5
      high-unionPay/pages/unionPay/recharge/recharge.vue
  11. 195
      high-unionPay/pages/user/deposit/deposit.vue
  12. 2140
      high-unionPay/pages/user/order_details/order_details.vue
  13. 36
      high-unionPay/pages/user/order_list/order_list.vue
  14. 2
      high-unionPay/qianzhu-KFC/confirmOrder/confirmOrder.vue
  15. BIN
      high-unionPay/static/img/Vip.png
  16. BIN
      high-unionPay/static/img/ghk.png
  17. BIN
      high-unionPay/static/img/home/home3.png
  18. BIN
      high-unionPay/static/img/home/home4.png
  19. BIN
      high-unionPay/static/img/home/home5.png
  20. BIN
      high-unionPay/static/img/home/home6.png
  21. BIN
      high-unionPay/static/img/home/home7.png
  22. BIN
      high-unionPay/static/img/order2.png
  23. BIN
      high-unionPay/static/img/order3.png
  24. BIN
      high-unionPay/static/img/order4.png
  25. BIN
      high-unionPay/static/img/order5.png
  26. BIN
      high-unionPay/static/img/order6.png
  27. BIN
      high-unionPay/static/img/order7.png
  28. BIN
      high-unionPay/static/img/order8.png
  29. BIN
      high-unionPay/static/img/order9.png
  30. BIN
      high-unionPay/static/img/unioncard.png
  31. BIN
      high-unionPay/static/img/xbk.png
  32. 62
      high-unionPay/subPages/coupon-comfirmation/coupon-comfirmation.vue
  33. 6
      high-unionPay/subPages/coupon-package/coupon-package.vue

@ -173,7 +173,8 @@
findUser, findUser,
unionPay, unionPay,
cardPay, cardPay,
getUserOrderPreList, getUserOrderPreList,
cancel,
getRebateIntegral getRebateIntegral
} from '../../Utils/Api.js'; } from '../../Utils/Api.js';
let app = getApp(); let app = getApp();
@ -234,7 +235,7 @@
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 => {
@ -531,13 +532,15 @@
icon: 'none', icon: 'none',
title: '工会卡余额不足', title: '工会卡余额不足',
duration: 2000, duration: 2000,
}); });
that.cancel();
return; return;
} }
if (!that.user.isSetPayPwd) { if (!that.user.isSetPayPwd) {
uni.navigateTo({ uni.navigateTo({
url: '../../pages/login/updatePas/updatePas' url: '../../pages/login/updatePas/updatePas'
}) })
that.cancel();
return; return;
} }
if (!that.user.isSetHltCard) { if (!that.user.isSetHltCard) {
@ -552,7 +555,8 @@
}) })
}, 1000) }, 1000)
} }
}); });
that.cancel();
return; return;
} }
that.$refs.paymentPassword.modalFun('show'); that.$refs.paymentPassword.modalFun('show');
@ -589,6 +593,17 @@
} }
}); });
}); });
},
//
cancel() {
let params = {
orderNo: this.orderId,
}
cancel(params).then(res => {
if (res.return_code == '000000') {
this.orderId = '';
}
})
}, },
submitHandle(e) { submitHandle(e) {
uni.showLoading({ uni.showLoading({
@ -640,7 +655,8 @@
title: res.return_msg, title: res.return_msg,
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}); });
that.cancel();
}) })
return; return;
} }

@ -99,14 +99,14 @@
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({
title: '积分列表' title: '积分列表'
}); });
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({
@ -124,7 +124,7 @@
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: '优选商品' title: '优选商品'
}); });
this.getCmsContent('CMS_PRE_LIST'); this.getCmsContent('CMS_DISCOUNT_PACKAGE_BANNER');
this.getBrandCouponList(); this.getBrandCouponList();
} }
}, },
@ -176,7 +176,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;
} }
}); });
}, },

@ -155,7 +155,7 @@
<view class="line1" v-if="item == 4"></view> <view class="line1" v-if="item == 4"></view>
<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 4" @tap="paytype='4'"> <view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 4" @tap="paytype='4'">
<view class="width60 flleft font14"> <view class="width60 flleft font16">
银联支付 银联支付
</view> </view>
<view class="flright width30 fotct" v-if="isUse"> <view class="flright width30 fotct" v-if="isUse">
@ -165,7 +165,7 @@
<view class="line1" v-if="item == 6"></view> <view class="line1" v-if="item == 6"></view>
<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 6" @tap="paytype='6'"> <view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 6" @tap="paytype='6'">
<view class="width60 flleft font14"> <view class="width60 flleft font16">
油卡支付<text class="font14 fcor666 margle">余额: {{oilPirce}}</text> 油卡支付<text class="font14 fcor666 margle">余额: {{oilPirce}}</text>
</view> </view>
<view class="flright width30 fotct" v-if="isUse"> <view class="flright width30 fotct" v-if="isUse">
@ -175,7 +175,7 @@
<view class="line1" v-if="item == 3"></view> <view class="line1" v-if="item == 3"></view>
<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 3" @tap="paytype='3'"> <view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 3" @tap="paytype='3'">
<view class="width60 flleft font14"> <view class="width60 flleft font16">
汇联通工会卡<text class="font14 fcor666 margle">余额: {{tongCardPrice}}</text> 汇联通工会卡<text class="font14 fcor666 margle">余额: {{tongCardPrice}}</text>
</view> </view>
<view class="flright width30 fotct" v-if="isUse"> <view class="flright width30 fotct" v-if="isUse">
@ -530,7 +530,8 @@
"saleCount": 1, "saleCount": 1,
}], }],
"payGold": this.priceValue[1], "payGold": this.priceValue[1],
"promoteCode": this.identificationCode, "promoteCode": this.identificationCode,
"companyId": app.globalData.companyId,
"payPwd": this.PaymentPassword "payPwd": this.PaymentPassword
} }
create(goods).then(res => { create(goods).then(res => {
@ -694,7 +695,8 @@
}], }],
"payGold": this.priceValue[1], "payGold": this.priceValue[1],
"promoteCode": this.identificationCode, "promoteCode": this.identificationCode,
"payPwd": this.PaymentPassword, "payPwd": this.PaymentPassword,
"companyId": app.globalData.companyId,
"memDiscountId": this.memDiscountId "memDiscountId": this.memDiscountId
} }
create(goods).then(res => { create(goods).then(res => {

@ -161,7 +161,7 @@
</view> </view>
<view class="width100 height60"></view> <view class="width100 height110"></view>
<view class="footer"> <view class="footer">
<view class="settlement"> <view class="settlement">
<view class="sum">实付:<view class="money">{{paytheprice}}</view> <view class="sum">实付:<view class="money">{{paytheprice}}</view>
@ -526,7 +526,8 @@
"payGold": this.priceValue[1], "payGold": this.priceValue[1],
"promoteCode": this.identificationCode, "promoteCode": this.identificationCode,
memDiscountId: this.memDiscountId, memDiscountId: this.memDiscountId,
"storeId": this.storeId, "storeId": this.storeId,
"companyId": app.globalData.companyId,
"postData": { "postData": {
"address": this.contactAddress, "address": this.contactAddress,
"user": this.contactPepole, "user": this.contactPepole,
@ -687,7 +688,8 @@
}], }],
"payGold": this.priceValue[1], "payGold": this.priceValue[1],
"promoteCode": this.identificationCode, "promoteCode": this.identificationCode,
"payPwd": this.PaymentPassword, "payPwd": this.PaymentPassword,
"companyId": app.globalData.companyId,
memDiscountId: this.memDiscountId memDiscountId: this.memDiscountId
} }
create(goods).then(res => { create(goods).then(res => {

@ -57,7 +57,7 @@
<view class="mart20 fotct fcorred font15 marb20" <view class="mart20 fotct fcorred font15 marb20"
v-if="!couponDesInfo.couponInfo.reserveStatus && coupstus != 0 && couponDesInfo.couponInfo.couponSource != 3 && couponDesInfo.couponInfo.couponSource != 5"> v-if="!couponDesInfo.couponInfo.reserveStatus && coupstus != 0 && couponDesInfo.couponInfo.couponSource != 3 && couponDesInfo.couponInfo.couponSource != 5">
请告知加油员用码商支付</view> 请告知加油员用码商支付</view>
<view class="width90 mart20 fotct" v-if="couponDesInfo.couponInfo.reserveStatus"> <view class="width90 mart20 fotct" v-if="couponDesInfo.highUserCoupon.qrCodeImg">
<image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.highUserCoupon.qrCodeImg"> <image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.highUserCoupon.qrCodeImg">
</image> </image>
</view> </view>

@ -272,7 +272,7 @@
}, },
// //
playPhone() { playPhone() {
let cont = "本服务由惠兑礼品提供\n400-678-738"; let cont = "本服务由惠兑礼品提供\n400-678-0738";
let content = cont.replace(/<br>/g,"\n"); let content = cont.replace(/<br>/g,"\n");
uni.showModal({ uni.showModal({
title: '客服', title: '客服',

@ -5,7 +5,10 @@
<lottie :options="defaultOptions" :height="200" :width="200" <lottie :options="defaultOptions" :height="200" :width="200"
@animCreated="handleAnimation" /> @animCreated="handleAnimation" />
</view> --> </view> -->
<!-- <view class="status"></view> --> <!-- <view class="status"></view> -->
<view v-if="isdisplay">
<image :src="imagewxUrl+imgadres5" class="widthw30 mart110" mode="widthFix"></image>
</view>
<view v-for="(item,index) in homeCateList" :key="index"> <view v-for="(item,index) in homeCateList" :key="index">
<view class="height90 backcorltop" v-if="item.type == 1"> <view class="height90 backcorltop" v-if="item.type == 1">
<view class="category-list"> <view class="category-list">
@ -22,7 +25,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">
@ -42,7 +45,7 @@
<view class="paddleft10 font14 fcor666 text1 width70"> <view class="paddleft10 font14 fcor666 text1 width70">
{{item.childDate[0].title}} {{item.childDate[0].title}}
</view> </view>
<view class="width25 font13 fcor999">{{swipers.timeData}}</view> <view class="width25 font13 fcor999">{{item.childDate[0].timeData}}</view>
</view> </view>
<view class="width20 alijus"> <view class="width20 alijus">
<image class="icon15" mode="widthFix" src="../../../static/img/jt.png"></image> <image class="icon15" mode="widthFix" src="../../../static/img/jt.png"></image>
@ -84,22 +87,26 @@
</view> </view>
<view class="width30 font14 fotrt fcor666">更多</view> <view class="width30 font14 fotrt fcor666">更多</view>
</view> </view>
<view class="width94 alijus mart20" v-if="item.type == 6 "> <view class="width94 alijusnostart mart20" v-if="item.type == 6 ">
<view class="backcorfff spcarea" v-for="(goods,index) in item.childDate" :key="index"> <view class="backcorfff spcarea border-r" v-for="(goods,index1) in item.childDate" :key="index1"
<image mode="widthFix" class="width100" :src="imageUrl+goods.couponImg"></image> @click="toGoods(item.detailJumpUrl,goods.id)">
<image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0"
:src="imageUrl+goods.couponImg"></image>
<view class="width96 fcor333 font15 fontwig6">{{goods.couponName}}</view> <view class="width96 fcor333 font15 fontwig6">{{goods.couponName}}</view>
<view class="width96 fcor999 font11">{{goods.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}} <!-- <view class="width96 fcor999 font11">{{goods.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view> </view> -->
<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.salesPrice}}</view> <view class="width94 fcoreb5 font15 fontwig6">¥{{goods.salesPrice}}</view>
</view> </view>
</view> </view>
<view class="width94 alijus mart20" v-if="item.type == 9 "> <view class="width94 alijusnostart mart20" v-if="item.type == 9 ">
<view class="backcorfff spcarea" v-for="(goods,index) in item.childDate" :key="index"> <view class="backcorfff spcarea border-r" v-for="(goods,index2) in item.childDate" :key="index2"
<image mode="widthFix" class="width100" :src="imageUrl+goods.listImg"></image> @click="toGoods(item.detailJumpUrl,goods.id)">
<image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0"
: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"> <!-- <view class="width96 fcor999 font11" v-if="goods.effectiveTiem">
{{goods.effectiveTiem | timeFormat('yyyy-mm-dd hh:mm:ss')}} {{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>
</view> </view>
@ -156,7 +163,8 @@
imgadres: '/home/home1.png', imgadres: '/home/home1.png',
imgadres1: '/home/home2.png', imgadres1: '/home/home2.png',
imgadres2: 'jt.png', imgadres2: 'jt.png',
imgadres5: 'unionarea.png', // imgadres5: 'unionarea.png',
imgadres5: 'loading.gif',
imgadres3: '', imgadres3: '',
imgadres4: 'cusservice.png', imgadres4: 'cusservice.png',
webUrl: '', webUrl: '',
@ -170,7 +178,6 @@
pageSize: 6, pageSize: 6,
homeCateList: [], homeCateList: [],
// //
cpStuats: 1,
jumpType: '', jumpType: '',
isdisplay: true // isdisplay: true //
}; };
@ -285,8 +292,8 @@
app.globalData.cityId = res.return_data.regionId; app.globalData.cityId = res.return_data.regionId;
// app.globalData.cityId = '520000'; // app.globalData.cityId = '520000';
app.globalData.companyId = res.return_data.companyId; app.globalData.companyId = res.return_data.companyId;
this.getCmsContentcmsContent();
this.getCmsAactibity(); this.getCmsAactibity();
this.getCmsContentcmsContent();
} }
}); });
}, },
@ -295,7 +302,7 @@
let params = { let params = {
companyId: app.globalData.companyId, companyId: app.globalData.companyId,
platform: 3, platform: 3,
categoryCode: 'CMS_HOME' categoryCode: 'CMS_HOME_POPOVER'
} }
getCmsContent(params).then(res => { getCmsContent(params).then(res => {
this.isdisplay = false; this.isdisplay = false;
@ -312,7 +319,7 @@
let params = { let params = {
companyId: app.globalData.companyId, companyId: app.globalData.companyId,
platform: 3, platform: 3,
categoryCode: 'CMS_UNIONPAY_ALERT' categoryCode: 'CMS_HOME_POPOVER'
} }
getCmsContent(params).then(res => { getCmsContent(params).then(res => {
uni.hideLoading(); uni.hideLoading();
@ -368,10 +375,10 @@
}) })
}, },
// //
toGoods(e) { toGoods(e, id) {
uni.navigateTo({ uni.navigateTo({
url: '../../goods/goods?id=' + e url: e + id
}); });
}, },
// //
getCouponListgold() { getCouponListgold() {
@ -700,4 +707,4 @@
border-radius: 50%; border-radius: 50%;
} }
} }
</style> </style>

File diff suppressed because it is too large Load Diff

@ -131,7 +131,7 @@
}) })
let params = { let params = {
operatorType: item, operatorType: item,
regionId: app.globalData.cityId, "companyId": app.globalData.companyId,
platformId: 3 platformId: 3
// rechargeType: this.swiperCurrent // rechargeType: this.swiperCurrent
} }

@ -42,8 +42,9 @@
// //
getCmsAactibity() { getCmsAactibity() {
let params = { let params = {
regionId: app.globalData.cityId, companyId: app.globalData.companyId,
categoryCode: 'CMS_TELEPHONE_POP_UP' platform: 3,
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 != '') {

@ -13,20 +13,20 @@
</view> </view>
<view class="content"> <view class="content">
<view class="amount"> <view class="amount">
<view class="list"> <view class="list">
<view class="box" v-for="(amount,index) in amountList" :key="index" @tap="select(amount)" <view class="box" v-for="(amount,index) in amountList" :key="index" @tap="select(amount)"
:class="{'on':amount == inputAmount}"> :class="{'on':amount == inputAmount}">
<view class="heTitle">{{amount}}</view> <view class="heTitle">{{amount}}</view>
<view class="font14">{{amount * 100}}</view> <view class="font14">{{amount * 100}}</view>
</view> </view>
</view> </view>
<view class="num"> <view class="num">
<view class="text font13"> <view class="text font13">
自定义充值金额(:{{inputAmount * 100}}) 自定义充值金额(:{{inputAmount * 100}})
</view> </view>
<view class="input"> <view class="input">
<input type="number" v-model="inputAmount" /> <input type="number" v-model="inputAmount" />
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -36,8 +36,8 @@
选择支付方式 选择支付方式
</view> </view>
<view class="content"> <view class="content">
<view class="pay-list"> <view class="pay-list" v-for="(item,index) in paytypeList" :key="index">
<view class="row" @tap="paytype='wxpay'"> <view class="row" @tap="paytype='4'" v-if="item == 4">
<view class="left"> <view class="left">
<image mode="widthFix" style="border-radius: 50%;" src="../../../static/img/unionpay.png"> <image mode="widthFix" style="border-radius: 50%;" src="../../../static/img/unionpay.png">
</image> </image>
@ -46,7 +46,7 @@
银联支付 银联支付
</view> </view>
<view class="right"> <view class="right">
<radio :checked="paytype=='wxpay'" color="#0083f5" /> <radio :checked="paytype=='4'" color="#0083f5" />
</view> </view>
</view> </view>
</view> </view>
@ -66,26 +66,43 @@
<script> <script>
let app = getApp() let app = getApp()
import { import {
addOrder, create,
orderToPay, unionPay,
unionPay getThirdPartyByDetail
} from "../../../Utils/Api.js"; } from "../../../Utils/Api.js";
export default { export default {
data() { data() {
return { return {
inputAmount: '', // inputAmount: '', //
amountList: [100, 200, 300, 500, 800, 1000], //3 amountList: [100, 200, 300, 500, 800, 1000], //3
paytype: 'wxpay', // paytype: '4', //
user: "", user: "",
imagewxUrl: app.globalData.imageWxImg, imagewxUrl: app.globalData.imageWxImg,
imgadres: 'wxpay.png' imgadres: 'wxpay.png',
paytypeList: [] //
}; };
}, },
onLoad() { onLoad() {
this.user = app.globalData.userInfo this.user = app.globalData.userInfo
},
onShow() {
this.getThirdPartyByDetail();
}, },
methods: { methods: {
//
getThirdPartyByDetail() {
let datas = {
platformId: 3,
"companyId": app.globalData.companyId,
productType: 4
}
getThirdPartyByDetail(datas).then(res => {
if (res.return_code == '000000') {
this.paytypeList = res.return_data.productPayType.split(',');
this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
}
});
},
select(amount) { select(amount) {
this.inputAmount = amount; this.inputAmount = amount;
}, },
@ -115,7 +132,8 @@
title: '正在提交订单...' title: '正在提交订单...'
}) })
let goods = { let goods = {
"identificationCode": app.globalData.identificationCode, "identificationCode": app.globalData.identificationCode,
"companyId": app.globalData.companyId,
"highChildOrderList": [{ "highChildOrderList": [{
"goodsType": 2, "goodsType": 2,
"goodsId": app.globalData.userInfo.id, "goodsId": app.globalData.userInfo.id,
@ -123,11 +141,11 @@
"goodsPrice": this.inputAmount "goodsPrice": this.inputAmount
}] }]
} }
addOrder(goods).then(res => { create(goods).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
/// ///
this.unionPay(res.return_data.id); this.unionPay(res.return_data.orderNo);
} else { } else {
uni.showToast({ uni.showToast({
title: res.return_msg title: res.return_msg
@ -138,7 +156,7 @@
// //
unionPay(item) { unionPay(item) {
let goods = { let goods = {
"orderId": item "orderNo": item
} }
unionPay(goods).then(res => { unionPay(goods).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
@ -203,69 +221,70 @@
.amount { .amount {
width: 100%; width: 100%;
.list { .list {
width: 94%; width: 94%;
margin-left: 3%; margin-left: 3%;
display: flow-root; display: flow-root;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 20upx 0; padding: 20upx 0;
.box { .box {
width: 30%; width: 30%;
margin-left: 1%; margin-left: 1%;
margin-right: 2%; margin-right: 2%;
margin-top: 20upx; margin-top: 20upx;
float: left; float: left;
height: 120upx; height: 120upx;
// line-height: 120upx; // line-height: 120upx;
display: inline-grid; display: inline-grid;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
text-align: center; text-align: center;
box-shadow: 0upx 0upx 4upx #666666; box-shadow: 0upx 0upx 4upx #666666;
font-size: 36upx; font-size: 36upx;
color: #089bf5; color: #089bf5;
background-color: #f1f1f1; background-color: #f1f1f1;
&.on {
background-color: #089bf5; &.on {
color: #ffffff; background-color: #089bf5;
} color: #ffffff;
} }
}
.heTitle {
width: 100%; .heTitle {
font-size: 15px; width: 100%;
} font-size: 15px;
}
} }
.num { .num {
margin-top: 20upx; margin-top: 20upx;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
.text { .text {
padding-right: 10upx; padding-right: 10upx;
font-size: 40upx; font-size: 40upx;
} }
.input { .input {
width: 28.2vw; width: 28.2vw;
border-bottom: solid 2upx #999; border-bottom: solid 2upx #999;
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
input { input {
margin: 0 20upx; margin: 0 20upx;
height: 60upx; height: 60upx;
font-size: 40upx; font-size: 40upx;
color: #0083f5; color: #0083f5;
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
} }
} }
} }
} }

File diff suppressed because it is too large Load Diff

@ -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: ['全部', '待支付', '已支付', '已完成', '已退款'],
@ -340,7 +356,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
}) })
} }
@ -623,7 +639,7 @@
} }
.orderlabel { .orderlabel {
width: 50px; width: 60px;
border-radius: 5px; border-radius: 5px;
height: 22px; height: 22px;
line-height: 22px; line-height: 22px;

@ -358,7 +358,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 => {

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

@ -22,13 +22,13 @@
{{couponList.packageDetail.price}} {{couponList.packageDetail.price}}
</view> </view>
</view> </view>
</view> </view>
<view class="width94 backcorfff mart10"> <view class="width94 backcorfff mart10">
<view class="width94 alijusstart height50 font14 fcor666"> <view class="width94 alijusstart height50 font14 fcor666">
<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">邀请码</view> <view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">邀请码</view>
<input class="width60 fotrt font15" v-model="identificationCode" placeholder="请输入邀请码" /> <input class="width60 fotrt font15" v-model="identificationCode" placeholder="请输入邀请码" />
</view> </view>
</view> </view>
<view class="width94 comorder mart10"> <view class="width94 comorder mart10">
@ -37,14 +37,16 @@
支付方式 支付方式
</view> </view>
</view> </view>
<view class="width94 line1 mart5 marb5"></view> <view class="width100" v-for="(item,index) in paytypeList" :key="index">
<view class="height50 width100 backcorfff" @tap="paytype='unionPay'"> <view class="width94 line1 mart5 marb5" v-if="item == 4"></view>
<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;"> <view class="height50 width100 backcorfff" @tap="paytype='4'" v-if="item == 4">
银联支付 <view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
</view> 银联支付
<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun" </view>
style="align-items: center;"> <view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
<radio :checked="paytype=='unionPay'" color="#0083f5" /> style="align-items: center;">
<radio :checked="paytype=='4'" color="#0083f5" />
</view>
</view> </view>
</view> </view>
</view> </view>
@ -69,7 +71,8 @@
unionPay, unionPay,
findUser, findUser,
cardPay, cardPay,
getHuiLianTongCardBalance getHuiLianTongCardBalance,
getThirdPartyByDetail
} from '../../Utils/Api.js'; } from '../../Utils/Api.js';
import ssPaymentPassword from '../../components/sanshui-payment-password' import ssPaymentPassword from '../../components/sanshui-payment-password'
let app = getApp(); let app = getApp();
@ -101,9 +104,8 @@
jumpType: '', jumpType: '',
tongCardPrice: 0, tongCardPrice: 0,
storeId: '', storeId: '',
isDiscont: false, identificationCode: '', //
identificationCode: '' // paytypeList: [] //
}; };
}, },
onLoad(option) { onLoad(option) {
@ -114,7 +116,8 @@
let that = this; let that = this;
that.paytype = ''; that.paytype = '';
that.user = app.globalData.userInfo; that.user = app.globalData.userInfo;
that.findUser(); that.findUser();
that.getThirdPartyByDetail();
}, },
onHide() { onHide() {
@ -143,7 +146,21 @@
return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`; return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
} }
}, },
methods: { methods: {
//
getThirdPartyByDetail() {
let datas = {
platformId: 3,
"companyId": app.globalData.companyId,
productType: 7
}
getThirdPartyByDetail(datas).then(res => {
if (res.return_code == '000000') {
this.paytypeList = res.return_data.productPayType.split(',');
this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
}
});
},
// //
findUser() { findUser() {
let params; let params;
@ -258,7 +275,8 @@
"goodsType": 7, "goodsType": 7,
"saleCount": 1, "saleCount": 1,
}], }],
"promoteCode": this.identificationCode "promoteCode": this.identificationCode,
"companyId": app.globalData.companyId
} }
create(goods).then(res => { create(goods).then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {

@ -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) {
@ -92,12 +92,12 @@
// //
getCmsContent(item) { getCmsContent(item) {
let params = { let params = {
regionId: app.globalData.cityId, companyId: app.globalData.companyId,
categoryCode: item categoryCode: item
} }
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;
} }
}); });
}, },

Loading…
Cancel
Save