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

1.新增待支付 已完成 数量

Browse Source 
2.修改肯德基 星巴克问题
yj-dev
杨杰 2 years ago
parent d219029607
commit 13c94b00c6
11 changed files with 118 additions and 50 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. 16
      App.vue
  2. 5
      Utils/Api.js
  3. 6
      components/shopcart.vue
  4. 5
      pages/goods/refuel-details/refuel-details.vue
  5. 9
      pages/tabBar/user/user.vue
  6. 40
      pages/user/order_list/order_list.vue
  7. 8
      qianzhu-KFC/buffet-order/buffet-order.vue
  8. 29
      qianzhu-KFC/confirmOrder/confirmOrder.vue
  9. 7
      qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
  10. 9
      subPages/scancodeCoupons/scancodeCoupons.vue

16
App.vue
Unescape View File

@ -5,15 +5,15 @@
// brestUrl: 'http://192.168.3.4:9302/brest', // brestUrl: 'http://192.168.3.4:9302/brest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/', // imgUrl: 'https://192.168.3.4:9301/filesystem/',
//正式 //正式
// url: 'https://hsg.dctpay.com/crest', url: 'https://hsg.dctpay.com/crest',
// 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/',
//测试 //测试
url: 'https://hsgcs.dctpay.com/crest', // url: 'https://hsgcs.dctpay.com/crest',
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/',
userInfo: "", userInfo: "",
brestUserInfo : '', brestUserInfo : '',
bresthighAgent:'', bresthighAgent:'',

5
Utils/Api.js
Unescape View File

@ -132,6 +132,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 => {
return POST('GET', `${base}/highOrder/orderCheck`, params).then(res => res.data);
}
//获取商户列表 //获取商户列表
export const getMerchantList = params => { export const getMerchantList = params => {
return POST('GET', `${base}/highMerchantStore/getMerchantList`, params).then(res => res.data); return POST('GET', `${base}/highMerchantStore/getMerchantList`, params).then(res => res.data);

6
components/shopcart.vue
Unescape View File

@ -163,7 +163,11 @@
} }
}, },
buyList() { buyList() {
if (this.goods.length == 0) { let nums = 0;
this.goods.forEach((food) => {
nums += food.num
})
if (nums == 0) {
uni.showToast({ uni.showToast({
title: '请选择购买的商品', title: '请选择购买的商品',
duration: 2000, duration: 2000,

5
pages/goods/refuel-details/refuel-details.vue
Unescape View File

@ -219,6 +219,8 @@
if(app.globalData.gasKey){ if(app.globalData.gasKey){
this.store_key = app.globalData.gasKey; this.store_key = app.globalData.gasKey;
}else{
app.globalData.staffCode = '';
} }
// #ifdef H5 // #ifdef H5
if (app.globalData.accountType && app.globalData.accountType == '000000#/') { if (app.globalData.accountType && app.globalData.accountType == '000000#/') {
@ -371,10 +373,11 @@
changeValue(item) { changeValue(item) {
this.gunnumber = []; this.gunnumber = [];
this.oilNo = item.oilNoName; this.oilNo = item.oilNoName;
this.gunNo = '';
for (var i = 0; i < this.gasGunList.length; i++) { for (var i = 0; i < this.gasGunList.length; i++) {
if (this.oilNo == this.gasGunList[i].oilNoName) { if (this.oilNo == this.gasGunList[i].oilNoName) {
this.gunnumber.push(this.gasGunList[i]) this.gunnumber.push(this.gasGunList[i])
this.gunNo = this.gasGunList[i].gunNo; // this.gunNo = this.gasGunList[i].gunNo;
this.gasOilNo = this.gasGunList[i].oilNo; this.gasOilNo = this.gasGunList[i].oilNo;
} }
} }

9
pages/tabBar/user/user.vue
Unescape View File

@ -52,6 +52,11 @@
<view class="box" v-for="(row,index) in orderList" :key="index" @tap="toOrderList(index)"> <view class="box" v-for="(row,index) in orderList" :key="index" @tap="toOrderList(index)">
<uni-badge style="width: 20px;position: absolute; left: 15%;" v-if="row.text == '待支付' && therrNum " <uni-badge style="width: 20px;position: absolute; left: 15%;" v-if="row.text == '待支付' && therrNum "
:text="therrNum" type="error" size="normal"></uni-badge> :text="therrNum" type="error" size="normal"></uni-badge>
<uni-badge style="width: 20px;position: absolute; left: 52%;" v-if="row.text == '已完成' && whetherCheckNum " :text="whetherCheckNum"
type="error" size="normal"></uni-badge>
<uni-badge style="width: 20px;position: absolute; left: 33%;" v-if="row.text == '已支付' && orderPayNum " :text="orderPayNum"
type="error" size="normal"></uni-badge>
<view class="img"> <view class="img">
<view class="icon" :class="row.icon"></view> <view class="icon" :class="row.icon"></view>
</view> </view>
@ -162,6 +167,8 @@
textSend: '', textSend: '',
therrNum: '', therrNum: '',
rechargeOrderNum: '', //话费待支付 rechargeOrderNum: '', //话费待支付
whetherCheckNum: '', //未查看数量
orderPayNum:'', //支付订单数量
headerTop: null, headerTop: null,
statusTop: null, statusTop: null,
showHeader: true, showHeader: true,
@ -365,6 +372,8 @@
this.textnum = res.return_data.unusedCouponNum; this.textnum = res.return_data.unusedCouponNum;
this.textSend = res.return_data.unusedDiscount; this.textSend = res.return_data.unusedDiscount;
this.therrNum = res.return_data.unpaid; this.therrNum = res.return_data.unpaid;
this.whetherCheckNum = res.return_data.whetherCheckNum;
this.orderPayNum = res.return_data.orderPayNum;
this.rechargeOrderNum = res.return_data.rechargeOrderNum; this.rechargeOrderNum = res.return_data.rechargeOrderNum;
uni.setStorage({ uni.setStorage({
key: "user", key: "user",

40
pages/user/order_list/order_list.vue
Unescape View File

@ -18,55 +18,55 @@
v-if="row.highChildOrderList[0].goodsType == 1"> v-if="row.highChildOrderList[0].goodsType == 1">
<image src="../../../static/img/order2.png" class="marglerig" <image src="../../../static/img/order2.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
卡券订单 卡券订单 <view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 2"> v-if="row.highChildOrderList[0].goodsType == 2">
<image src="../../../static/img/order2.png" class="marglerig" <image src="../../../static/img/order2.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
积分充值 积分充值<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 7"> v-if="row.highChildOrderList[0].goodsType == 7">
<image src="../../../static/img/order9.png" class="marglerig" <image src="../../../static/img/order9.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
优惠券包 优惠券包<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 3"> v-if="row.highChildOrderList[0].goodsType == 3">
<image src="../../../static/img/order4.png" class="marglerig" <image src="../../../static/img/order4.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
团油订单 团油订单<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 5"> v-if="row.highChildOrderList[0].goodsType == 5">
<image src="../../../static/img/order5.png" class="marglerig" <image src="../../../static/img/order5.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
电影票 电影票<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 4"> v-if="row.highChildOrderList[0].goodsType == 4">
<image src="../../../static/img/order3.png" class="marglerig" <image src="../../../static/img/order3.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
KFC KFC<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 9"> v-if="row.highChildOrderList[0].goodsType == 9">
<image src="../../../static/img/xbk.png" class="marglerig" <image src="../../../static/img/xbk.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
星巴克 星巴克<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 10"> v-if="row.highChildOrderList[0].goodsType == 10">
<image src="../../../static/img/Vip.png" class="marglerig" <image src="../../../static/img/Vip.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
会员充值 会员充值<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flleft aliitem fotlt font16" <view class="width50 flleft aliitem fotlt font16"
v-if="row.highChildOrderList[0].goodsType == 8"> v-if="row.highChildOrderList[0].goodsType == 8">
<image src="../../../static/img/ghkpay.png" class="marglerig" <image src="../../../static/img/ghkpay.png" class="marglerig"
style="width: 50rpx;height: 50rpx;"></image> style="width: 50rpx;height: 50rpx;"></image>
工会卡充值 工会卡充值<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
</view> </view>
<view class="width50 flright fotrt fcor666 font15"> <view class="width50 flright fotrt fcor666 font15">
{{row.createTime | formatDate('-')}} {{row.createTime | formatDate('-')}}
@ -116,7 +116,8 @@
import { import {
getUserOrderList, getUserOrderList,
cancelOrder, cancelOrder,
thirdCancelOrder thirdCancelOrder,
orderCheck
} from '../../../Utils/Api.js'; } from '../../../Utils/Api.js';
let app = getApp() let app = getApp()
export default { export default {
@ -245,6 +246,7 @@
}, },
//跳转详情 //跳转详情
jumpDetails(item, e) { jumpDetails(item, e) {
this.orderCheck(e);
if (item == 4 || item == 9 || item == 10) { if (item == 4 || item == 9 || item == 10) {
uni.navigateTo({ uni.navigateTo({
url: '/qianzhu-KFC/order-details/order-details?id=' + e url: '/qianzhu-KFC/order-details/order-details?id=' + e
@ -254,6 +256,16 @@
uni.navigateTo({ uni.navigateTo({
url: '../order_details/order_details?id=' + e url: '../order_details/order_details?id=' + e
}) })
},
//查看状态
orderCheck(item) {
let datas = {
orderId: item
}
orderCheck(datas).then(res => {
});
}, },
showType(tbIndex) { showType(tbIndex) {
this.tabbarIndex = tbIndex; this.tabbarIndex = tbIndex;
@ -475,6 +487,14 @@
background-color: #fff; background-color: #fff;
margin-bottom: 20upx; margin-bottom: 20upx;
.unread {
width: 10px;
height: 10px;
background-color: #e75e58;
border-radius: 50%;
margin-top: -20px;
}
.type { .type {
font-size: 26upx; font-size: 26upx;
color: #0083f5; color: #0083f5;

8
qianzhu-KFC/buffet-order/buffet-order.vue
Unescape View File

@ -126,7 +126,9 @@
lon: app.globalData.longitude lon: app.globalData.longitude
} }
getStarbucksStore(datas).then(res => { getStarbucksStore(datas).then(res => {
uni.hideLoading(); setTimeout(() => {
uni.hideLoading();
}, 1000);
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.kcfShopList = res.return_data; this.kcfShopList = res.return_data;
} }
@ -144,7 +146,9 @@
lon: app.globalData.longitude lon: app.globalData.longitude
} }
getKfcStoresList(datas).then(res => { getKfcStoresList(datas).then(res => {
uni.hideLoading(); setTimeout(() => {
uni.hideLoading();
}, 1000);
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.kcfShopList = res.return_data; this.kcfShopList = res.return_data;
} }

29
qianzhu-KFC/confirmOrder/confirmOrder.vue
Unescape View File

@ -45,7 +45,8 @@
<view class="width20"> <view class="width20">
<view class="width100 fcor333 font12">¥<text class="fontwig6 font16">{{item.price}}</text> <view class="width100 fcor333 font12">¥<text class="fontwig6 font16">{{item.price}}</text>
</view> </view>
<view class="width100 fcor999 font12" v-if="item.price != item.oldprice" style="text-decoration: line-through;">¥{{item.oldprice}} <view class="width100 fcor999 font12" v-if="item.price != item.oldprice"
style="text-decoration: line-through;">¥{{item.oldprice}}
</view> </view>
</view> </view>
</view> </view>
@ -57,7 +58,10 @@
</view> </view>
</view> </view>
<view class="width94 concont mart10 backcorfff"> <view class="width94 concont mart10 backcorfff">
<view class="width92 alijusstart paddtop20"> <view class="Bubble alijusstart font14 fcor999">
选取: <text class="tests fotct font14 fcor089 paddleft5 paddtright5">{{priceValue[1]}}</text> 分
</view>
<view class="width92 alijusstart paddtop10">
<view class="width30 fcor333 fontwig6 font16"> <view class="width30 fcor333 fontwig6 font16">
积分抵扣 积分抵扣
</view> </view>
@ -224,7 +228,7 @@
showType: '', //支付方式 showType: '', //支付方式
memDiscountId: '', //优惠券id memDiscountId: '', //优惠券id
PaymentPassword: '', //支付密码 PaymentPassword: '', //支付密码
orderId:'' //订单id orderId: '' //订单id
} }
}, },
onLoad() { onLoad() {
@ -482,7 +486,7 @@
xbkaddOrder(datas).then(res => { xbkaddOrder(datas).then(res => {
uni.hideLoading(); uni.hideLoading();
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.orderId = res.return_data.id; this.orderId = res.return_data.id;
let params = { let params = {
"orderId": res.return_data.id, "orderId": res.return_data.id,
"openId": app.globalData.openId, "openId": app.globalData.openId,
@ -515,7 +519,8 @@
title: '支付成功' title: '支付成功'
}) })
uni.reLaunch({ uni.reLaunch({
url: '/qianzhu-KFC/order-details/order-details?id=' + that.orderId url: '/qianzhu-KFC/order-details/order-details?id=' +
that.orderId
}) })
}, },
fail: function(err) { fail: function(err) {
@ -717,7 +722,8 @@
title: '支付成功' title: '支付成功'
}) })
uni.reLaunch({ uni.reLaunch({
url: '/qianzhu-KFC/order-details/order-details?id=' + that.orderId url: '/qianzhu-KFC/order-details/order-details?id=' + that
.orderId
}) })
}, },
cancel: function(r) { cancel: function(r) {
@ -754,6 +760,17 @@
border-radius: 12px; border-radius: 12px;
} }
.Bubble {
margin-left: 50%;
padding-top: 15px;
}
.tests {
border-radius: 15px;
height: 22px;
line-height: 22px;
}
.jfrecharge { .jfrecharge {
padding: 3px 20rpx; padding: 3px 20rpx;
color: #fff; color: #fff;

7
qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
Unescape View File

@ -89,7 +89,7 @@
{{item.productName}} {{item.productName}}
</view> </view>
</view> </view>
<view class="height30"></view> <view class="height20"></view>
<view class="wybfot width100"> <view class="wybfot width100">
<view class="height50 pricefot alijusstart "> <view class="height50 pricefot alijusstart ">
<view class="width60 margle10"> <view class="width60 margle10">
@ -191,7 +191,7 @@
this.currentId = item.name; this.currentId = item.name;
let index = this.slist.findIndex(sitem => sitem.name == item.name); let index = this.slist.findIndex(sitem => sitem.name == item.name);
this.tabScrollTop = this.slist[index].top; this.tabScrollTop = this.slist[index].top;
}, 500); }, 1000);
}, },
//右侧栏滚动 //右侧栏滚动
asideScroll(e) { asideScroll(e) {
@ -277,6 +277,7 @@
good.num = 0 good.num = 0
} }
}) })
app.globalData.qianzhulist = '';
}, },
//弹出弹窗 //弹出弹窗
showPopups(item) { showPopups(item) {
@ -489,7 +490,7 @@
align-items: center; align-items: center;
display: flex; display: flex;
height: 70upx; height: 70upx;
padding-top: 8upx; // padding-top: 8upx;
font-size: 28upx; font-size: 28upx;
color: #333333; color: #333333;

9
subPages/scancodeCoupons/scancodeCoupons.vue
Unescape View File

@ -82,11 +82,16 @@
return `${year}${spe}${month}${spe}${day}`; return `${year}${spe}${month}${spe}${day}`;
} }
}, },
onShow() { onShow() {},
},
onLoad() { onLoad() {
this.getDiscountByCode(); this.getDiscountByCode();
}, },
onUnload() {
uni.removeStorage({
key: 'accountType'
})
app.globalData.accountType = '';
},
methods: { methods: {
//获取卡券详情 //获取卡券详情
getDiscountByCode() { getDiscountByCode() {

Write Preview
Loading…
Cancel
Save