diff --git a/.gitignore b/.gitignore index 2ccbe46..e2f12cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /node_modules/ +/dist/ +/.hbuilderx/ diff --git a/src/package/admin/index.vue b/src/package/admin/index.vue index 959334c..851e7d3 100644 --- a/src/package/admin/index.vue +++ b/src/package/admin/index.vue @@ -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); } diff --git a/src/package/card/index.vue b/src/package/card/index.vue index 52e9540..4710579 100644 --- a/src/package/card/index.vue +++ b/src/package/card/index.vue @@ -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) { diff --git a/src/package/goods/order.vue b/src/package/goods/order.vue index bd030ae..bc4c47e 100644 --- a/src/package/goods/order.vue +++ b/src/package/goods/order.vue @@ -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) { diff --git a/src/package/user/card.vue b/src/package/user/card.vue index 9d45cc0..48f0c8d 100644 --- a/src/package/user/card.vue +++ b/src/package/user/card.vue @@ -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) { diff --git a/src/package/user/coupon.vue b/src/package/user/coupon.vue index f51c845..7681567 100644 --- a/src/package/user/coupon.vue +++ b/src/package/user/coupon.vue @@ -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; } } - \ No newline at end of file + diff --git a/src/package/user/invoice-show.vue b/src/package/user/invoice-show.vue index 1e44669..0006772 100644 --- a/src/package/user/invoice-show.vue +++ b/src/package/user/invoice-show.vue @@ -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) { //保存到本地 diff --git a/src/pages.json b/src/pages.json index 408fbb0..bd22bbc 100644 --- a/src/pages.json +++ b/src/pages.json @@ -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", diff --git a/src/pages/order/order.vue b/src/pages/order/order.vue index 6f5c287..c5c630b 100644 --- a/src/pages/order/order.vue +++ b/src/pages/order/order.vue @@ -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) {