diff --git a/pages/invoice/editset.vue b/pages/invoice/editset.vue
index 77703ae..f8928b4 100644
--- a/pages/invoice/editset.vue
+++ b/pages/invoice/editset.vue
@@ -13,7 +13,7 @@
发票类型:
- 请选择发票类型
+ 请选择发票类型
{{ array[index] }}
@@ -87,7 +87,7 @@
content: "确认您的发票信息无误后再提交",
show: true,
toggleIndex: true,
- index: null,
+ index: -1,
array: ['普通增值税发票'],
tabIndex: 1,
sourcePage: 0,
@@ -109,7 +109,7 @@
onLoad(op) {
if (op.detailObj && op.detailObj != 'null') {
let end = JSON.parse(op.detailObj)
- this.index = 0
+ this.index = -1
if (end.source == 1) {
this.tabIndex = 1
} else {
@@ -130,7 +130,8 @@
},
async addInvoice(canReset = false) {
const app = this
- if (app.index == null || !app.obj.source) {
+ console.log(app.index,app.obj.source)
+ if (app.index == -1) {
uni.showToast({
title: '请选择发票类型',
icon: 'none',
@@ -164,7 +165,7 @@
icon: 'none',
duration: 2000
})
- app.index = null
+ app.index = -1
app.tabIndex = 1
app.obj = app.$options.data().obj;
uni.redirectTo({
@@ -174,7 +175,7 @@
},
async editeInvoice() {
const app = this
- if (app.index == null || !app.obj.source) {
+ if (app.index == -1) {
uni.showToast({
title: '请选择发票类型',
icon: 'none',
@@ -192,7 +193,7 @@
}
if (app.tabIndex == 2 && !app.obj.duty_no) {
uni.showToast({
- title: '请输入抬头',
+ title: '请输入纳税人识别号',
icon: 'none',
duration: 2000
})
@@ -208,7 +209,7 @@
icon: 'none',
duration: 2000
})
- app.index = null
+ app.index = -1
app.tabIndex = 1
app.obj = app.$options.data().obj;
uni.redirectTo({
diff --git a/pages/invoice/index.vue b/pages/invoice/index.vue
index bf863aa..633b71d 100644
--- a/pages/invoice/index.vue
+++ b/pages/invoice/index.vue
@@ -58,7 +58,7 @@
content: '确认删除了吗?',
success(o) {
if (o.confirm) {
- InvoiceApi.invoicingDel(Id)
+ InvoiceApi.invoicingDelNew({id:Id})
.then(result => {
// 显示成功信息
app.$success(result.message)
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 253de46..8be0c1a 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -265,7 +265,7 @@
-
@@ -24,7 +24,8 @@
-
+
{{item.storeInfo.store_name}}
更多
- 核销码
立即支付
- 查看物流
{
- item.menushow = false;
- idList.push(item.response.data.fileInfo.file_id)
+ this.list.forEach((item, ind) => {
+ if (ind == index) {
+ item.menushow = item.menushow == false ? true : false
+ } else {
+ item.menushow = false;
+ }
});
- this.list[index].menushow = !this.list[index].menushow
},
toggleImage() {
this.isToggle = !this.isToggle
@@ -282,7 +286,6 @@
if (options.dataType) {
const index = app.tabs.findIndex(item => item.value == options.dataType)
app.current = index > -1 ? index : 0
- console.log(app.current, 'KKKKKKK')
}
},
@@ -315,7 +318,7 @@
},
// 切换标签项
- onChangeTab(item,index) {
+ onChangeTab(item, index) {
const app = this
app.list = []
// 设置当前选中的标签
@@ -498,6 +501,7 @@
white-space: nowrap;
width: 100%;
height: 100rpx;
+
.list {
position: relative;
display: inline-block;
@@ -539,9 +543,10 @@
}
.order {
- .order-list{
+ .order-list {
margin-top: 20rpx;
}
+
.receive {
width: 100%;
background: #F8F8F8;