gxwebsoft/gxtyzx-uniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

已支付订单列表：where.payStatus = 1;

Browse Source
This commit is contained in:
赵忠林
2024-07-10 23:02:47 +08:00
parent 1311eb03b8
commit 82985f5e3c
9 changed files with 23 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2
View File
@@ -1 +1,3 @@
/node_modules/
/dist/
/.hbuilderx/
src/package/admin/index.vue
+16 -16
View File
@@ -209,24 +209,24 @@ export default {
return false;
} else {
if (item.path === '/package/admin/order-scan') {
uni.showModal({
title: '直接使用微信扫一扫功能完成核销'
});
return false;
// 允许从相机和相册扫码
// uni.scanCode({
// success: function (res) {
// app.scanType = res.scanType
// app.scanResult = res.result
// if(res.scanType){
// console.log('/package/admin/order-scan?orderNo=' + app.orderNo);
// uni.redirectTo({
// url: '/package/admin/order-scan?orderNo=' + app.orderNo
// })
// }
// }
// uni.showModal({
// title: '直接使用微信扫一扫功能完成核销'
// });
// return false;
// 允许从相机和相册扫码
uni.scanCode({
success: function (res) {
app.scanType = res.scanType
app.scanResult = res.result
if(res.scanType){
// console.log('/package/admin/order-scan?orderNo=' + app.orderNo);
uni.redirectTo({
url: '/package/admin/order-scan?orderNo=' + app.orderNo
})
}
}
});
// return false;
} else {
openUrl(item);
}
src/package/card/index.vue
-1
View File
@@ -142,7 +142,6 @@ export default {
Api.pageCard(where)
.then((res) => {
const list = res.list.map((d) => {
console.log(d);
return d;
});
if (app.cardList.length < res.count) {
src/package/goods/order.vue
-1
View File
@@ -178,7 +178,6 @@ export default {
OrderApi.pageOrder(where)
.then((res) => {
const list = res.list.map((d) => {
console.log(d);
return d;
});
if (app.orderList.length < res.count) {
src/package/user/card.vue
-1
View File
@@ -148,7 +148,6 @@ export default {
.then((res) => {
console.log('res: ', res);
const list = res.list.map((d) => {
console.log(d);
return d;
});
if (app.cardList.length < res.count) {
src/package/user/coupon.vue
+2 -3
View File
@@ -124,7 +124,6 @@
})
CouponApi.pageUserCoupon(where).then(res => {
const list = res.list.map(d => {
console.log(d);
return d;
});
if (app.list.length < res.count) {
@@ -277,7 +276,7 @@
line-height: 2rem;
}
}
.save-btn{
// margin-right: 20rpx;
}
@@ -344,4 +343,4 @@
font-size: 30rpx !important;
}
}
</style>
</style>
src/package/user/invoice-show.vue
+1 -63
View File
@@ -73,82 +73,20 @@ export default {
onDown(text) {
const app = this;
// 复制发票
console.log(text);
uni.setClipboardData({
data: app.pdfUrl,
success: function () {
console.log('success');
},
complete: function (res) {
console.log(1, res);
}
complete: function (res) {}
});
uni.getClipboardData({
success: function (res) {
console.log(2, res.data);
},
complete: function (res) {
console.log(3, res);
}
});
//
// wx.setClipboardData({
// data: 'data',
// success(res) {
// console.log('复制发票333: ',res);
// wx.getClipboardData({
// success(res) {
// console.log(res.data); // data
// }
// });
// }
// });
console.log('复制发票222', app.pdfUrl);
// uniCopy({
// content: `${app.pdfUrl}`,
// success: (res) => {
// uni.showToast({
// title: res,
// icon: 'none'
// });
// },
// error: (e) => {
// uni.showToast({
// title: e,
// icon: 'none',
// duration: 3000
// });
// }
// });
// uni.setClipboardData({
// data: app.pdfUrl, //text是要复制的文本
// success: function (res) {
// console.log(res, '收拾收拾');
// uni.getClipboardData({
// //这个api是把拿到的数据放到剪切板中的
// success: function (res) {
// uni.showModal({
// title: '提示',
// content: '发票地址复制成功，请在浏览器中粘贴进行下载'
// });
// }
// });
// },
// error(e) {
// console.log('e: ', e);
// }
// });
// uni.downloadFile({
// url: this.pdfUrl,
// success: (res) => {
// if (res.statusCode === 200) {
// var tempFilePath = res.tempFilePath;
// app.saveFile(tempFilePath);
// console.log('下载成功');
// }
// }
// });
},
saveFile(tempFilePath) {
//保存到本地
src/pages.json
+1 -8
View File
@@ -286,8 +286,7 @@
"path": "admin/field",
"style": {
"navigationBarTitleText": "场地管理",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
"enablePullDownRefresh": false
}
},
{
@@ -352,12 +351,6 @@
"selectedIconPath": "static/tabbar/shop-active.png",
"text": "商城"
},
// {
// "pagePath": "pages/order/order",
// "iconPath": "static/tabbar/notice.png",
// "selectedIconPath": "static/tabbar/notice-active.png",
// "text": "运动卡"
// },
{
"pagePath": "pages/order/order",
"iconPath": "static/tabbar/order.png",
src/pages/order/order.vue
+1 -2
View File
@@ -143,7 +143,7 @@
// 判断是否登录
this.openLogin()
// 加载数据
// this.reload()
this.reload()
// if(option.isRefresh){
// this.isRefresh = true
// }
@@ -182,7 +182,6 @@
app.loadMore = 'loading'
OrderApi.pageOrder(where).then(res => {
const list = res.list.map(d => {
console.log(d);
return d;
});
if (app.orderList.length < res.count) {