From db9e77940d93e317931075759082f026ef224b03 Mon Sep 17 00:00:00 2001
From: syt <854400391@qq.com>
Date: Sat, 23 Mar 2024 23:10:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/goods/detail.vue | 1 +
pages/order/detail.vue | 8 +++++---
pages/user/index.vue | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 74b441a..39b0e62 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -758,6 +758,7 @@
}
info.content = info.content
.replace(/style=""/g, '')
+ .replace(/
{
if (!isCur) {
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 2490539..695514c 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -492,7 +492,7 @@
数据统计
-
From 2706b512d10a6bc3c0c44dff2f87df61dd644fa3 Mon Sep 17 00:00:00 2001
From: syt <854400391@qq.com>
Date: Sun, 24 Mar 2024 13:52:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/login/index.vue | 4 +---
pages/news1/setting.vue | 31 ++++++++++++++++++++++++++++++-
pages/order/detail.vue | 20 ++++++++++----------
pages/order/index.vue | 2 +-
4 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/pages/login/index.vue b/pages/login/index.vue
index e630e43..e30a2d7 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -114,9 +114,7 @@ export default {
that.showCountDown = !that.showCountDown;
CaptchaApi.sendSmsCaptcha({
- form: {
- mobile: that.phoneNum,
- },
+ mobile: that.phoneNum
}).then((res) => {
if (res.status == 200) {
that.countDownFun = setInterval(() => {
diff --git a/pages/news1/setting.vue b/pages/news1/setting.vue
index 0e3f4cc..e2d21fe 100644
--- a/pages/news1/setting.vue
+++ b/pages/news1/setting.vue
@@ -65,13 +65,20 @@
-
+
注销账号
+
+
+
+ 退出登录
+
+
+
@@ -187,6 +194,28 @@ export default {
resolve()
}
})
+ },
+ onOut1() {
+ uni.showModal({
+ title: '您是否要退出登录？',
+ content: '',
+ success(o) {
+ if (o.confirm) {
+ uni.showToast({
+ title: '退出成功',
+ icon: 'none',
+ duration: 2000
+ })
+ uni.clearStorage()
+ uni.clearStorageSync()
+ setTimeout(function () {
+ uni.navigateBack({
+ delta: 1
+ })
+ }, 2000);
+ }
+ }
+ });
},
onOut() {
uni.showModal({
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 4d67ab8..320de1d 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -321,7 +321,7 @@
@click="handleTargetComment(order.order_id)">
评价
-->
-
复制订单详情
@@ -474,16 +474,16 @@
8.收件人电话:
9.收件人地址:
*/
- let goods_no = "";
- if(obj.goods && obj.goods.length > 0){
- obj.goods.map(a=>{
- goods_no+=`商品型号: ${(a.goods_sku_id !=0?a.goods_sku_id:'无')};商品编码: ${a.goods_no?a.goods_no:'无编码'};商品单价: ￥${a.goods_price}元;商品数量: ${a.total_num};商品总价: ￥${a.total_price}元`
- })
- }
- const str =`订单编号：${obj.order_no};${goods_no};收件人名字：${obj.address.name};收件人电话：${obj.address.phone};收件人地址：${obj.address.region.province+obj.address.region.city+obj.address.region.region+obj.address.detail};`
- console.log(str)
+ // let goods_no = "";
+ // if(obj.goods && obj.goods.length > 0){
+ // obj.goods.map(a=>{
+ // goods_no+=`商品型号: ${(a.goods_sku_id !=0?a.goods_sku_id:'无')};商品编码: ${a.goods_no?a.goods_no:'无编码'};商品单价: ￥${a.goods_price}元;商品数量: ${a.total_num};商品总价: ￥${a.total_price}元`
+ // })
+ // }
+ // const str =`订单编号：${obj.order_no};${goods_no};收件人名字：${obj.address.name};收件人电话：${obj.address.phone};收件人地址：${obj.address.region.province+obj.address.region.city+obj.address.region.region+obj.address.detail};`
+ // console.log(str)
uni.setClipboardData({
- data: str,
+ data: obj,
success() {
uni.getClipboardData({
success() {
diff --git a/pages/order/index.vue b/pages/order/index.vue
index b60d048..bc75a97 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -24,7 +24,7 @@
-
+
{{item.storeInfo.store_name}}