From 930cfd4886523dff5e5f6f6824beca296c8cae25 Mon Sep 17 00:00:00 2001
From: mixtan <424491071@qq.com>
Date: Sat, 20 Sep 2025 09:14:44 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E9=95=BF=E6=8C=89=E5=9B=BE=E7=89=87?=
=?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AE=9E=E7=8E=B0?=
=?UTF-8?q?=E8=AE=A2=E9=98=85=E6=B6=88=E6=81=AF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/themes/diy.vue | 89 ++++++++++++++++++++-----------------
member/order/detail.vue | 78 ++++++++++++++++++++++++--------
pages/checkout/checkout.vue | 9 ++--
3 files changed, 111 insertions(+), 65 deletions(-)
diff --git a/components/themes/diy.vue b/components/themes/diy.vue
index 5b7dc9c..d345119 100644
--- a/components/themes/diy.vue
+++ b/components/themes/diy.vue
@@ -169,9 +169,10 @@
}">
-
-
-
+
+
+
@@ -304,13 +305,14 @@
:style="{ 'font-size': '30px', color: item.eltm8.fontColor }">
-
+
{{ item.eltm9.tipText }}
@@ -333,7 +335,8 @@
-
+
+ }}
{{ items.name || __("请选择时间") }}
@@ -441,7 +444,7 @@
+ }}
@@ -568,7 +571,7 @@
@@ -606,7 +609,7 @@
+ }}
{{ __("已有") }}{{ items.OrderCount }} {{ __("人参加") }}
@@ -650,7 +653,7 @@
@@ -687,7 +690,7 @@
+ }}
{{ __("已有") }}{{ items.OrderCount }} {{
__("人参加") }}
@@ -735,7 +738,7 @@
+
@@ -977,9 +980,9 @@ export default {
return "diy";
},
},
- isLogin:{
- type:Boolean,
- default(){
+ isLogin: {
+ type: Boolean,
+ default() {
return false
}
}
@@ -1065,13 +1068,13 @@ export default {
this.showLoginPopup = false;
},
- getGoodsStatus (item){
+ getGoodsStatus(item) {
return item?.product_quantity == 0 || item?.item_quantity == 0
},
async addCart(item) {
- if (!this.hasLogin) {
+ if (!this.hasLogin) {
this.showLoginPopup = true;
return;
}
@@ -1138,21 +1141,25 @@ export default {
// return
// }
// }
-
+
var t = e.currentTarget.dataset;
//console.info(t);
+ console.log('=====',parseInt(t.type))
switch (parseInt(t.type)) {
case 0:
- uni.makePhoneCall({
- phoneNumber:
- typeof t.mobile != "undefined" ? t.mobile.toString() : "", //电话号码
- success: function (e) {
- console.log(e);
- },
- fail: function (e) {
- console.log(e);
- },
- });
+ if (typeof t.mobile != "undefined" || t.mobile != "") {
+ console.log('==进来了===')
+ uni.makePhoneCall({
+ phoneNumber:
+ typeof t.mobile != "undefined" ? t.mobile.toString() : "", //电话号码
+ success: function (e) {
+ console.log(e);
+ },
+ fail: function (e) {
+ console.log(e);
+ },
+ });
+ }
break;
case 1:
// this.$emit('buy', 'hello')
@@ -1532,14 +1539,14 @@ uni-page-body {
height: 100% !important;
}
-.mCS{
+.mCS {
position: initial;
}
.diyPage {
// padding-bottom: 8rpx;
- clear: both;
- overflow: hidden;
+ clear: both;
+ overflow: hidden;
}
.activity-info {
diff --git a/member/order/detail.vue b/member/order/detail.vue
index 65e476b..6d7b161 100644
--- a/member/order/detail.vue
+++ b/member/order/detail.vue
@@ -36,7 +36,8 @@
+ >
+
+ >
+
{{ __("售后详情") }}
+ >{{ __("售后详情") }}
+
@@ -841,7 +843,8 @@
lazy-load
src="/static/images/call.png"
style="width: 30rpx; height: 26rpx; margin-right: 10rpx"
- >
+ >
+
{{ OrderInfo.chain_mobile }}
@@ -1196,6 +1199,8 @@ export default {
_mapContext: null,
time: null,
isReminderOrder: false,
+ subscribe: 0,
+ tmplIds: ["kiDj_hSF_ASwD-Dlgxnypi6IJBQZ12a-hEpd3zZ-Uxc", "Lq6_OHOemtmBoWGrd9zvyJ3ultzXB5metmqPtYeV0pc"],
};
},
components: {
@@ -1219,7 +1224,12 @@ export default {
});
let that = this;
+ this.subscribe =
+ options.subscribe && options.subscribe == 1
+ ? options.subscribe
+ : this.subscribe;
that._mapContext = uni.createMapContext("map", this);
+
this.setData({
options: options,
discount: options.discount,
@@ -1230,20 +1240,48 @@ export default {
});
/* if (that.$.isNull(this.userInfo))
- {
+ {
that.forceUserInfo(function(user) {
that.InitPage(options)
});
- }
- else
- {
+ }
+ else
+ {
that.InitPage(options)
- } */
+ } */
this.notice.addNotification("RefreshMessage", this.RefreshMessage, this);
},
onShow: function () {
+ const _this = this
this.InitPage(this.options);
+
+ if (this.subscribe == 1) {
+ $.showModal({
+ title: "订阅提示",
+ content: "是否订阅活动消息通知？",
+ cancelText: "暂不订阅",
+ confirmText: "立即订阅",
+ success: function (n) {
+ if (n.confirm) {
+ wx.requestSubscribeMessage({
+ tmplIds: _this.tmplIds,
+ success(res) {
+ console.log("success res====", res);
+ uni.showToast({
+ title: "消息已订阅",
+ });
+ },
+ fail(res) {
+ uni.showToast({
+ title: "稍后再试",
+ });
+ },
+ });
+ }
+ },
+ });
+ }
},
onUnload: function () {
//移除通知
@@ -1803,9 +1841,9 @@ export default {
},
});
/* 红包活动分享 var t = {store_id: this.shopInfo.Id, sponsorId: this.userInfo.Id, order_id: options.on};
- that.$.xsr(that.$.makeUrl(orderapi.PrepareShareLuckyRedPacket, t), function (e) {
- that.setData({maxRPK: e.Info.LuckyOrder, ActivityGroupId: e.Info.LuckyRedPacketActivityGroupId})
- })*/
+ that.$.xsr(that.$.makeUrl(orderapi.PrepareShareLuckyRedPacket, t), function (e) {
+ that.setData({maxRPK: e.Info.LuckyOrder, ActivityGroupId: e.Info.LuckyRedPacketActivityGroupId})
+ })*/
},
applyCancelOrder: function (OrderInfo) {
let that = this;
@@ -1898,10 +1936,10 @@ export default {
}, 1500);
/*
- that.$.navigateBack(1, function() {
- var e = {};
- that.notice.postNotificationName("RefreshMessage", e)
- })
+ that.$.navigateBack(1, function() {
+ var e = {};
+ that.notice.postNotificationName("RefreshMessage", e)
+ })
*/
});
}
@@ -1939,7 +1977,7 @@ export default {
that.$.alert(that.__("收货成功！"), function () {
that.notice.postNotificationName("RefreshMessage", e);
});
- }
+ }
},
});
} else if (e.extraData.status === "fail") {
@@ -2053,7 +2091,7 @@ export default {
/*
that.$.navigateBack(1, function() {
var e = {};
- that.notice.postNotificationName("RefreshMessage", e)
+ that.notice.postNotificationName("RefreshMessage", e)
})
*/
});
@@ -2360,6 +2398,7 @@ export default {
padding: 6px 12px;
border-top-left-radius: 0 !important;
border-top-right-radius: 0 !important;
+
.order-name {
font-size: 30px;
font-weight: bold;
@@ -2417,6 +2456,7 @@ export default {
.move-area {
margin-top: 44px;
}
+
/* #endif */
.nav-title {
diff --git a/pages/checkout/checkout.vue b/pages/checkout/checkout.vue
index d50d055..445264d 100644
--- a/pages/checkout/checkout.vue
+++ b/pages/checkout/checkout.vue
@@ -1774,7 +1774,7 @@ export default {
} else {
const item = that.submitinfo.items[0].items[0];
if (item.payment_type_id === 1) {
- that.$.gotopage("/member/order/detail?on=" + that.order_id);
+ that.$.gotopage(`/member/order/detail?on=${that.order_id}&subscribe=1`);
} else {
that.gotopay();
}
@@ -1816,13 +1816,12 @@ export default {
that.returnUrl(param.order_id);
},
fail: function (n) {
- that.$.gotopage("/member/order/detail?on=" + param.order_id);
+ that.$.gotopage(`/member/order/detail?on=${param.order_id}&subscribe=1`);
that.isTmplMsg && that.sendMessage(param.order_id, 1);
},
complete: function (n) {
if (n.errMsg == "requestPayment:cancel") {
- that.$.gotopage("/member/order/detail?on=" + param.order_id);
-
+ that.$.gotopage(`/member/order/detail?on=${param.order_id}&subscribe=1`);
that.isTmplMsg && that.sendMessage(param.order_id, 1);
}
},
@@ -1956,7 +1955,7 @@ export default {
// 延时100毫秒等待异步队列setPaidYes的处理
setTimeout(function () {
that.$.gotopage(
- "/member/order/detail?on=" + e + "&init_pay_flag=true"
+ `/member/order/detail?on="${e}&init_pay_flag=true&subscribe=1`
);
}, 100);
}