Browse Source

upload

dev_czc
HolyKnightIX 2 years ago
parent
commit
cf660fbb8b
4 changed files with 31 additions and 34 deletions
  1. +3
    -2
      common/common.js
  2. +12
    -15
      ext.json
  3. +15
    -16
      pages/transaction/transaction.js
  4. +1
    -1
      pages/writeoffPage/writeoffPage.js

+ 3
- 2
common/common.js View File

@@ -246,7 +246,7 @@ const func = {
/** /**
* 券核销 * 券核销
*/ */
couponOrderVerify: function (couponOrderId, verifyRemark) {
couponOrderVerify: function (couponOrderId, couponTenantId, verifyRemark) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
tt.request({ tt.request({
url: config.api.couponOrderVerify, url: config.api.couponOrderVerify,
@@ -256,7 +256,8 @@ const func = {
}, },
data: { data: {
couponOrderId: couponOrderId, couponOrderId: couponOrderId,
verifyRemark: verifyRemark,
couponTenantId: couponTenantId,
verifyRemark: verifyRemark
}, },
method: "POST", method: "POST",
success: function (res) { success: function (res) {


+ 12
- 15
ext.json View File

@@ -4,26 +4,23 @@
"configUrl": "https://btest.malls.iformall.com", "configUrl": "https://btest.malls.iformall.com",
"datatowerurl": "https://mobile.malls.iformall.com" "datatowerurl": "https://mobile.malls.iformall.com"
}, },
"name": "福喵商户端",
"name": "富茂券券集团商户端",
"weappId": "tt60d3166effed27cc01", "weappId": "tt60d3166effed27cc01",
"appVersion": "Btest.5.1.0" "appVersion": "Btest.5.1.0"
}, },
"debug": false, "debug": false,
"tabBar": { "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", "color": "#9F9F9F",
"selectedColor": "#52a0fd", "selectedColor": "#52a0fd",
"backgroundColor": "#fff" "backgroundColor": "#fff"


+ 15
- 16
pages/transaction/transaction.js View File

@@ -37,23 +37,23 @@ Page({
pageSize: 8, pageSize: 8,
}, (res) => { }, (res) => {
console.log(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 => { res.data && res.data.list.list.map(file => {
file.expiredTime = format.formatTime(file.expiredTime, 'yyyy-MM-dddd hh:mm:ss') 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.createDate = format.formatTime(file.createDate, 'yyyy-MM-dddd hh:mm:ss')
file.updateDate = format.formatTime(file.updateDate, '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) dataList.push(file)
}) })
} }
console.log(dataList,"dataList");
console.log(dataList, "dataList");
this.setData({ this.setData({
list: dataList, list: dataList,
hide: res.data.list.list == 0 ? true : false hide: res.data.list.list == 0 ? true : false
}) })
console.log(this.data.list) console.log(this.data.list)
resolve(res) resolve(res)
}) })
@@ -67,16 +67,16 @@ Page({
pageSize: 10, pageSize: 10,
}, (res) => { }, (res) => {
console.log(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 => { res.data && res.data.list.list.map(file => {
file.expiredTime = format.formatTime(file.expiredTime, 'yyyy-MM-dddd hh:mm:ss') 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.createDate = format.formatTime(file.createDate, 'yyyy-MM-dddd hh:mm:ss')
file.updateDate = format.formatTime(file.updateDate, '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) dataList.push(file)
}) })
} }
this.setData({ this.setData({
list: dataList, list: dataList,
hide: res.data.list.list == 0 ? true : false hide: res.data.list.list == 0 ? true : false
@@ -100,7 +100,7 @@ Page({
nowDateTime: nowTime nowDateTime: nowTime
}) })
this.getList(e.type, page, nowTime) this.getList(e.type, page, nowTime)
if (e.type == '0') { // 交易流水
if (e.type == '0') { // 交易流水
this.setData({ this.setData({
flag: true, flag: true,
text: '未核销', text: '未核销',
@@ -111,8 +111,7 @@ Page({
tt.setNavigationBarTitle({ tt.setNavigationBarTitle({
title: '交易记录', title: '交易记录',
}) })
}
else { // 核销
} else { // 核销
this.setData({ this.setData({
flag: false, flag: false,
text: '已核销', text: '已核销',
@@ -154,7 +153,7 @@ Page({
// 退券退款申请成功 // 退券退款申请成功
tt.showToast({ tt.showToast({
title: res.message, title: res.message,
image:'../../static/images/success.png'
image: '../../static/images/success.png'
}) })
setTimeout(() => { setTimeout(() => {
tt.switchTab({ tt.switchTab({
@@ -165,10 +164,10 @@ Page({
tt.showModal({ tt.showModal({
title: '错误', title: '错误',
content: res.message, content: res.message,
showCancel:false
showCancel: false
}) })
} }
}, (err) =>{
}, (err) => {
console.log("err", err) console.log("err", err)
tt.showModal({ tt.showModal({
title: '错误', title: '错误',
@@ -186,7 +185,7 @@ Page({
this.setData({ this.setData({
dateTime: e.detail.value, dateTime: e.detail.value,
dataList: [], dataList: [],
list:[]
list: []
}) })
page = 1 page = 1
this.setData({ this.setData({


+ 1
- 1
pages/writeoffPage/writeoffPage.js View File

@@ -102,7 +102,7 @@ Page({
user() { user() {
console.log(tt.getStorageSync("verifyRemark")) console.log(tt.getStorageSync("verifyRemark"))
// return // return
Common.couponOrderVerify(this.data.couponOrderId, tt.getStorageSync("verifyRemark"))
Common.couponOrderVerify(this.data.couponOrderId, this.data.couponTenantId, tt.getStorageSync("verifyRemark"))
.then(res => { .then(res => {
console.log(res) console.log(res)
if (res.code == 200) { if (res.code == 200) {


Loading…
Cancel
Save