From 0f4f3713733819a1a0fd0f5207134eae811ffd3f Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Fri, 15 May 2026 09:20:31 +0800
Subject: [PATCH 1/4] 1
---
pages/index/index.vue | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c0a88d1..6816d35 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -291,6 +291,9 @@
:style="{'background':checkYongjin==true?'linear-gradient(135deg, rgba(255, 247, 215, 0.95), rgba(166, 255, 234, 0.72))':'rgba(248, 255, 250, 0.86)','border':checkYongjin==true?'1px solid rgba(255, 188, 119, 0.72)':'1px solid rgba(166, 255, 234, 0.46)'}">
佣金
+
+ 刷新
+
\ No newline at end of file
From f7d067723994b75d8499966d7040b41575a66d50 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Fri, 15 May 2026 11:08:53 +0800
Subject: [PATCH 2/4] 1
---
components/tab-bar/delivery.vue | 12 ++++++------
components/tab-bar/myCenter.vue | 2 +-
components/tab-bar/tab-bar.vue | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/components/tab-bar/delivery.vue b/components/tab-bar/delivery.vue
index c05681c..ee938c5 100644
--- a/components/tab-bar/delivery.vue
+++ b/components/tab-bar/delivery.vue
@@ -561,7 +561,7 @@
that.totalPages = res.result.pages; // pages = 总页数
that.$forceUpdate();
} else {
- that.tui.toast(res.message, 1000);
+ that.tui.toast(res.message);
return;
}
uni.hideLoading();
@@ -672,7 +672,7 @@
},
openPopup() {
if (this.isOnLine != 1) {
- this.tui.toast('请先上线后配置', 1000);
+ this.tui.toast('请先上线后配置');
return;
}
let that = this
@@ -730,7 +730,7 @@
} */
this.$refs.carPopup.open()
} else {
- that.tui.toast(res.message, 1000)
+ that.tui.toast(res.message)
return
}
}).catch((res) => {})
@@ -814,9 +814,9 @@
worker.isOnLine = value;
this.isOnLine = value
uni.setStorageSync('worker', worker);
- this.tui.toast(res.message, 1000)
+ this.tui.toast(res.message)
} else {
- this.tui.toast(res.message, 1000)
+ this.tui.toast(res.message)
}
})
@@ -833,7 +833,7 @@
if (res.code == 200) {
} else {
- this.tui.toast(res.message, 1000)
+ this.tui.toast(res.message)
}
})
diff --git a/components/tab-bar/myCenter.vue b/components/tab-bar/myCenter.vue
index 1b11cc2..fb85d7b 100644
--- a/components/tab-bar/myCenter.vue
+++ b/components/tab-bar/myCenter.vue
@@ -162,7 +162,7 @@
url: url
})
} else {
- that.tui.toast(res.message,1000)
+ that.tui.toast(res.message)
return
}
uni.hideLoading()
diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue
index 12caf49..62aadac 100644
--- a/components/tab-bar/tab-bar.vue
+++ b/components/tab-bar/tab-bar.vue
@@ -142,7 +142,7 @@
}
that.$forceUpdate();
} else {
- that.tui.toast(res.message,1000);
+ that.tui.toast(res.message);
return;
}
uni.hideLoading();
From 593c64e484a6c2e09f25eee663b42925d06a7e74 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Fri, 15 May 2026 11:08:59 +0800
Subject: [PATCH 3/4] 1
---
package1/address/addressList.vue | 8 ++++----
package1/buyFood/buyFood.vue | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package1/address/addressList.vue b/package1/address/addressList.vue
index 3868d0b..94d47cc 100644
--- a/package1/address/addressList.vue
+++ b/package1/address/addressList.vue
@@ -205,11 +205,11 @@
this.addressForm.userId = uni.getStorageSync('id')
that.tui.request(url, "POST", this.addressForm, false, true).then((res) => {
if (res.code == 200) {
- that.tui.toast("保存成功");
+ that.tui.toast("保存成功",1000);
that.$refs.addBookPopup.close();
that.getAddressList();
} else {
- that.tui.toast(res.message);
+ that.tui.toast(res.message,1000);
}
}).catch(() => {});
},
@@ -222,10 +222,10 @@
if (res.confirm) {
that.tui.request("/app/userAddress/delById", "POST", {id: id}, false, true).then((res) => {
if (res.code == 200) {
- that.tui.toast("删除成功");
+ that.tui.toast("删除成功",1000);
that.getAddressList();
} else {
- that.tui.toast(res.message);
+ that.tui.toast(res.message,1000);
}
}).catch(() => {});
}
diff --git a/package1/buyFood/buyFood.vue b/package1/buyFood/buyFood.vue
index c435c26..1851027 100644
--- a/package1/buyFood/buyFood.vue
+++ b/package1/buyFood/buyFood.vue
@@ -804,7 +804,7 @@
},
fail: function(err) {
uni.redirectTo({
- url: '/package1/order/orderConfirm?id=' + this.currentOrderId + '&amount=' + this.backendTotalAmount
+ url: '/package1/order/orderDetail?id=' + that.currentOrderId
});
}
});
From 5edfb7edbe786f846425dcbb5789a9fc485c1a81 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Fri, 15 May 2026 11:09:06 +0800
Subject: [PATCH 4/4] 1
---
package2/group/groupBuyList.vue | 6 +++---
package2/group/groupBuySingle.vue | 12 ++++++------
package2/group/searchGroup.vue | 4 ++--
package2/group/shopEvaluate.vue | 4 ++--
package2/myCenter/addGoods.vue | 6 +++---
package2/myCenter/addType.vue | 2 +-
package2/myCenter/dataStatistics.vue | 2 +-
package2/myCenter/goodsList.vue | 4 ++--
package2/myCenter/partTimeJobRegister.vue | 4 ++--
package2/myCenter/wallet.vue | 4 ++--
package2/partTimeJob/partTimeJobCenter.vue | 2 +-
package2/shop/orderDetail.vue | 2 +-
package2/shop/shopOrderList.vue | 5 ++---
13 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/package2/group/groupBuyList.vue b/package2/group/groupBuyList.vue
index 50c9d29..5c7ea61 100644
--- a/package2/group/groupBuyList.vue
+++ b/package2/group/groupBuyList.vue
@@ -340,7 +340,7 @@
}
}
} else {
- that.tui.toast(res.message,1000)
+ that.tui.toast(res.message)
return
}
}).catch((res) => {})
@@ -358,7 +358,7 @@
}
}
} else {
- that.tui.toast(res.message,1000)
+ that.tui.toast(res.message)
return
}
}).catch((res) => {})
@@ -410,7 +410,7 @@
that.isArea = false
that.$forceUpdate()
} else {
- that.tui.toast(res.message,1000)
+ that.tui.toast(res.message)
return
}
uni.hideLoading()
diff --git a/package2/group/groupBuySingle.vue b/package2/group/groupBuySingle.vue
index 79dece2..041cc85 100644
--- a/package2/group/groupBuySingle.vue
+++ b/package2/group/groupBuySingle.vue
@@ -771,7 +771,7 @@
if (res.code == 200) {
this.tuanzhangOrder = res.result;
} else {
- that.tui.toast(res.message, 1000)
+ that.tui.toast(res.message)
return
}
uni.hideLoading()
@@ -951,7 +951,7 @@
that.pageNum = that.searchForm.pageNum;
that.$forceUpdate();
} else {
- that.tui.toast(res.message, 1000);
+ that.tui.toast(res.message);
return;
}
uni.hideLoading();
@@ -971,7 +971,7 @@
}
that.$forceUpdate()
} else {
- that.tui.toast(res.message, 1000)
+ that.tui.toast(res.message)
return
}
uni.hideLoading()
@@ -1132,7 +1132,7 @@
that.$forceUpdate();
} else {
- that.tui.toast(res.message, 1000);
+ that.tui.toast(res.message);
return;
}
uni.hideLoading();
@@ -1666,7 +1666,7 @@
});
},
fail: function(err) {
- that.tui.toast("支付失败或取消", 1000);
+ that.tui.toast("支付失败或取消");
}
});
} else {
@@ -1685,7 +1685,7 @@
}, 1500);
});
} else {
- that.tui.toast(res.message, 1000);
+ that.tui.toast(res.message);
}
}
})
diff --git a/package2/group/searchGroup.vue b/package2/group/searchGroup.vue
index 7ebeb36..ae573de 100644
--- a/package2/group/searchGroup.vue
+++ b/package2/group/searchGroup.vue
@@ -260,7 +260,7 @@
console.log(that.shopArea)
}
} else {
- that.tui.toast(res.message,1000)
+ that.tui.toast(res.message)
return
}
}).catch((res) => {})
@@ -294,7 +294,7 @@
that.isArea = false
that.$forceUpdate()
} else {
- that.tui.toast(res.message,1000)
+ that.tui.toast(res.message)
return
}
uni.hideLoading()
diff --git a/package2/group/shopEvaluate.vue b/package2/group/shopEvaluate.vue
index 9bd83b1..f8a23cf 100644
--- a/package2/group/shopEvaluate.vue
+++ b/package2/group/shopEvaluate.vue
@@ -231,7 +231,7 @@
that.menuList[0].num = res.result.total
}
} else {
- that.tui.toast(res.message,1000)
+ that.tui.toast(res.message)
return
}
uni.hideLoading()
@@ -267,7 +267,7 @@
this.back()
}, 1000)
} else {
- that.tui.toast(res.message,1000);
+ that.tui.toast(res.message);
}
uni.hideLoading();
}).catch((res) => {});
diff --git a/package2/myCenter/addGoods.vue b/package2/myCenter/addGoods.vue
index 099803a..9483193 100644
--- a/package2/myCenter/addGoods.vue
+++ b/package2/myCenter/addGoods.vue
@@ -225,7 +225,7 @@
},
fail() {
- this.tui.toast("您未授权，图片上传功能可能会出现错误",1000)
+ this.tui.toast("您未授权，图片上传功能可能会出现错误")
}
})
this.typeItem = JSON.parse(JSON.stringify(this.typeItem)) || ''
@@ -264,7 +264,7 @@
this.formData.categoryId = res.result.categoryId
this.edit(this.formData)
} else {
- this.tui.toast(res.message,1000)
+ this.tui.toast(res.message)
}
}).catch((res) => {})
}
@@ -380,7 +380,7 @@
}
} else {
- this.tui.toast(res.message,1000)
+ this.tui.toast(res.message)
}
}).catch((res) => {})
},
diff --git a/package2/myCenter/addType.vue b/package2/myCenter/addType.vue
index 54e4e2c..89fea63 100644
--- a/package2/myCenter/addType.vue
+++ b/package2/myCenter/addType.vue
@@ -107,7 +107,7 @@
if (res.code == 200) {
this.indexList = res.result;
} else {
- this.tui.toast(res.message,1000)
+ this.tui.toast(res.message)
}
}).catch(() => {});
},
diff --git a/package2/myCenter/dataStatistics.vue b/package2/myCenter/dataStatistics.vue
index aa7d1b7..ae530bc 100644
--- a/package2/myCenter/dataStatistics.vue
+++ b/package2/myCenter/dataStatistics.vue
@@ -146,7 +146,7 @@
if (res.code == 200) {
this.shopInfo = res.result
} else {
- this.tui.toast(res.message,1000)
+ this.tui.toast(res.message)
}
})
diff --git a/package2/myCenter/goodsList.vue b/package2/myCenter/goodsList.vue
index f27f145..87a5a4b 100644
--- a/package2/myCenter/goodsList.vue
+++ b/package2/myCenter/goodsList.vue
@@ -380,7 +380,7 @@
this.pages = res.result.pages
}
} else {
- this.tui.toast(res.message,1000)
+ this.tui.toast(res.message)
}
}).catch((res) => {})
},
@@ -417,7 +417,7 @@
this.categoryId = this.indexList[0].id
this.getShareList();
} else {
- this.tui.toast(res.message,1000)
+ this.tui.toast(res.message)
}
}).catch((res) => {})
},
diff --git a/package2/myCenter/partTimeJobRegister.vue b/package2/myCenter/partTimeJobRegister.vue
index a7490a3..e77169a 100644
--- a/package2/myCenter/partTimeJobRegister.vue
+++ b/package2/myCenter/partTimeJobRegister.vue
@@ -297,7 +297,7 @@
that.$forceUpdate();
}
} else {
- that.tui.toast(res.message, 1000)
+ that.tui.toast(res.message)
return
}
}).catch((res) => {})
@@ -313,7 +313,7 @@
}
}
} else {
- that.tui.toast(res.message, 1000)
+ that.tui.toast(res.message)
return
}
}).catch((res) => {})
diff --git a/package2/myCenter/wallet.vue b/package2/myCenter/wallet.vue
index 13e7bb6..f80d8e8 100644
--- a/package2/myCenter/wallet.vue
+++ b/package2/myCenter/wallet.vue
@@ -200,7 +200,7 @@
this.$refs.payPopup.close();
this.beginData();
} else {
- that.tui.toast(res.message,1000)
+ that.tui.toast(res.message)
return
}
uni.hideLoading()
@@ -231,7 +231,7 @@
}
that.$forceUpdate()
} else {
- that.tui.toast(res.message,1000)
+ that.tui.toast(res.message)
return
}
uni.hideLoading()
diff --git a/package2/partTimeJob/partTimeJobCenter.vue b/package2/partTimeJob/partTimeJobCenter.vue
index 680ee9b..f8e8a0b 100644
--- a/package2/partTimeJob/partTimeJobCenter.vue
+++ b/package2/partTimeJob/partTimeJobCenter.vue
@@ -199,7 +199,7 @@
}
that.$forceUpdate();
} else {
- that.tui.toast(res.message,1000);
+ that.tui.toast(res.message);
return;
}
uni.hideLoading();
diff --git a/package2/shop/orderDetail.vue b/package2/shop/orderDetail.vue
index c1bc529..f08544a 100644
--- a/package2/shop/orderDetail.vue
+++ b/package2/shop/orderDetail.vue
@@ -22,7 +22,7 @@
- {{data.deliveryType == 2?'自取订单':'配送订单'}}
+ {{data.deliveryType == 1?'配送订单':data.isPack == 1?'自取-打包':data.isPack == 0?'自取-堂食':'自取'}}
配送员：{{(data.deliveryInfo.workerName == 'null' || !data.deliveryInfo.workerName) ?"":data.deliveryInfo.workerName}}
diff --git a/package2/shop/shopOrderList.vue b/package2/shop/shopOrderList.vue
index 7a5e96f..f5281de 100644
--- a/package2/shop/shopOrderList.vue
+++ b/package2/shop/shopOrderList.vue
@@ -54,8 +54,8 @@
-
- {{item.deliveryType == 1?'配送':'自取'}}
+
+ {{item.deliveryType == 1?'配送':item.isPack == 1?'自取-打包':item.isPack == 0?'自取-堂食':'自取'}}
拼
@@ -259,7 +259,6 @@
if (that.currentIndex == 7) {
that.orderList[i].goodsList = that.orderList[i].items
}
- console.log('哈哈哈哈哈1',that.orderList)
that.orderList[i].goodsNum = 0
for (let m = 0; m < that.orderList[i].goodsList.length; m++) {
that.orderList[i].goodsNum += that.orderList[i].goodsList[m].quantity