diff --git a/common/common.js b/common/common.js index 50955d7..11e9372 100644 --- a/common/common.js +++ b/common/common.js @@ -246,7 +246,7 @@ const func = { /** * 券核销 */ - couponOrderVerify: function (couponOrderId, verifyRemark) { + couponOrderVerify: function (couponOrderId, couponTenantId, verifyRemark) { return new Promise((resolve, reject) => { tt.request({ url: config.api.couponOrderVerify, @@ -256,7 +256,8 @@ const func = { }, data: { couponOrderId: couponOrderId, - verifyRemark: verifyRemark, + couponTenantId: couponTenantId, + verifyRemark: verifyRemark }, method: "POST", success: function (res) { diff --git a/ext.json b/ext.json index 03e8654..7a5df93 100644 --- a/ext.json +++ b/ext.json @@ -4,26 +4,23 @@ "configUrl": "https://btest.malls.iformall.com", "datatowerurl": "https://mobile.malls.iformall.com" }, - "name": "福喵商户端", + "name": "富茂券券集团商户端", "weappId": "tt60d3166effed27cc01", "appVersion": "Btest.5.1.0" }, "debug": false, "tabBar": { - "list": [ - { - "text": "首页", - "iconPath": "assets/images/home-n.png", - "pagePath": "pages/main/main", - "selectedIconPath": "assets/images/home-y.png" - }, - { - "text": "我的", - "iconPath": "assets/images/user-n.png", - "pagePath": "pages/user/user", - "selectedIconPath": "assets/images/user-y.png" - } - ], + "list": [{ + "text": "首页", + "iconPath": "assets/images/home-n.png", + "pagePath": "pages/main/main", + "selectedIconPath": "assets/images/home-y.png" + }, { + "text": "我的", + "iconPath": "assets/images/user-n.png", + "pagePath": "pages/user/user", + "selectedIconPath": "assets/images/user-y.png" + }], "color": "#9F9F9F", "selectedColor": "#52a0fd", "backgroundColor": "#fff" diff --git a/pages/transaction/transaction.js b/pages/transaction/transaction.js index ccbf150..c8e6f77 100644 --- a/pages/transaction/transaction.js +++ b/pages/transaction/transaction.js @@ -37,23 +37,23 @@ Page({ pageSize: 8, }, (res) => { console.log(res) - if(res.data.list &&res.data.list.list.length &&res.data.list.list.length > 0){ + if (res.data.list && res.data.list.list.length && res.data.list.list.length > 0) { res.data && res.data.list.list.map(file => { file.expiredTime = format.formatTime(file.expiredTime, 'yyyy-MM-dddd hh:mm:ss') file.createDate = format.formatTime(file.createDate, 'yyyy-MM-dddd hh:mm:ss') file.updateDate = format.formatTime(file.updateDate, 'yyyy-MM-dddd hh:mm:ss') - file.ids = file.id.slice(0,4)+`******`+file.id.slice(14) + file.ids = file.id.slice(0, 4) + `******` + file.id.slice(14) dataList.push(file) }) - + } - console.log(dataList,"dataList"); - + console.log(dataList, "dataList"); + this.setData({ list: dataList, hide: res.data.list.list == 0 ? true : false }) - + console.log(this.data.list) resolve(res) }) @@ -67,16 +67,16 @@ Page({ pageSize: 10, }, (res) => { console.log(res) - if(res.data.list &&res.data.list.list.length &&res.data.list.list.length > 0){ + if (res.data.list && res.data.list.list.length && res.data.list.list.length > 0) { res.data && res.data.list.list.map(file => { file.expiredTime = format.formatTime(file.expiredTime, 'yyyy-MM-dddd hh:mm:ss') file.createDate = format.formatTime(file.createDate, 'yyyy-MM-dddd hh:mm:ss') file.updateDate = format.formatTime(file.updateDate, 'yyyy-MM-dddd hh:mm:ss') - file.ids = file.id.slice(0,4)+`******`+file.id.slice(14) + file.ids = file.id.slice(0, 4) + `******` + file.id.slice(14) dataList.push(file) }) } - + this.setData({ list: dataList, hide: res.data.list.list == 0 ? true : false @@ -100,7 +100,7 @@ Page({ nowDateTime: nowTime }) this.getList(e.type, page, nowTime) - if (e.type == '0') { // 交易流水 + if (e.type == '0') { // 交易流水 this.setData({ flag: true, text: '未核销', @@ -111,8 +111,7 @@ Page({ tt.setNavigationBarTitle({ title: '交易记录', }) - } - else { // 核销 + } else { // 核销 this.setData({ flag: false, text: '已核销', @@ -154,7 +153,7 @@ Page({ // 退券退款申请成功 tt.showToast({ title: res.message, - image:'../../static/images/success.png' + image: '../../static/images/success.png' }) setTimeout(() => { tt.switchTab({ @@ -165,10 +164,10 @@ Page({ tt.showModal({ title: '错误', content: res.message, - showCancel:false + showCancel: false }) } - }, (err) =>{ + }, (err) => { console.log("err", err) tt.showModal({ title: '错误', @@ -186,7 +185,7 @@ Page({ this.setData({ dateTime: e.detail.value, dataList: [], - list:[] + list: [] }) page = 1 this.setData({ diff --git a/pages/writeoffPage/writeoffPage.js b/pages/writeoffPage/writeoffPage.js index 22f3b9d..5e78108 100644 --- a/pages/writeoffPage/writeoffPage.js +++ b/pages/writeoffPage/writeoffPage.js @@ -102,7 +102,7 @@ Page({ user() { console.log(tt.getStorageSync("verifyRemark")) // return - Common.couponOrderVerify(this.data.couponOrderId, tt.getStorageSync("verifyRemark")) + Common.couponOrderVerify(this.data.couponOrderId, this.data.couponTenantId, tt.getStorageSync("verifyRemark")) .then(res => { console.log(res) if (res.code == 200) {