From 3dbb3102ea5aab9e4635f8522f5d9352a7f2a58c Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sat, 4 Mar 2023 09:39:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96:=E8=AE=A2=E5=8D=95=E5=8F=91?=
=?UTF-8?q?=E5=B8=83=E5=90=8E=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=88=91=E7=9A=84?=
=?UTF-8?q?=E5=94=AE=E5=87=BA=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=20?=
=?UTF-8?q?=E4=BC=98=E5=8C=96:=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E5=B7=B2=E5=94=AE=E5=87=BA=E7=8A=B6=E6=80=81=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=9C=86=E8=A7=92?=
=?UTF-8?q?=E8=83=8C=E6=99=AF=EF=BC=8C=E5=8F=96=E6=B6=88=E4=B8=8A=E6=96=B9?=
=?UTF-8?q?=E9=80=89=E9=A1=B9=E5=8D=A1=20=E4=BC=98=E5=8C=96:=E6=9C=AA?=
=?UTF-8?q?=E5=88=B0=E7=A7=92=E6=9D=80=E6=97=B6=E9=97=B4=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?banner=E8=A6=81=E6=98=BE=E7=A4=BA=EF=BC=8C=E4=B8=8D=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E4=BA=A7=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 2 +-
pages_promotion/futures/order.vue | 31 ++++-
pages_promotion/futures/order_details.vue | 21 +++-
pages_promotion/futures/seckill.vue | 5 +-
pages_promotion/message/index.vue | 142 +++++++++++++++++-----
5 files changed, 160 insertions(+), 41 deletions(-)
diff --git a/manifest.json b/manifest.json
index 04dd6a8..9da5b95 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "单商户V4",
- "appid" : "__UNI__460ACE5",
+ "appid" : "__UNI__E00B9A8",
"description" : "",
"versionName" : "5.1.2",
"versionCode" : "100",
diff --git a/pages_promotion/futures/order.vue b/pages_promotion/futures/order.vue
index c4495fb..237fc7c 100644
--- a/pages_promotion/futures/order.vue
+++ b/pages_promotion/futures/order.vue
@@ -2,14 +2,14 @@
-
+
-
+
{
if(parseInt(res.code) === 0){
@@ -235,9 +250,15 @@ export default {
color: #000000;
}
.right{
- line-height: 50rpx;
+ line-height: 40rpx;
font-size: 26rpx;
- color: #de6758;
+ //color: #de6758;
+ //border: 2rpx solid #de6758;
+ height: 40rpx;
+ padding: 0 10rpx;
+ border-radius: 10rpx;
+ background: #de6758;
+ color: #ffffff;
}
}
.block-content{
diff --git a/pages_promotion/futures/order_details.vue b/pages_promotion/futures/order_details.vue
index cf4e4d3..4d241ed 100644
--- a/pages_promotion/futures/order_details.vue
+++ b/pages_promotion/futures/order_details.vue
@@ -57,7 +57,7 @@
详情
-
+
@@ -80,9 +80,6 @@
-
-
-
@@ -224,10 +221,25 @@ export default {
if(_this.$refs.saleGoods) _this.$refs.saleGoods.close();
// 返回结果处理
if(parseInt(res.code) === -800){
+ // 需要拆单 确认后再次请求发布
this.split_message = res.message;
_this.$refs.splitConfirm.open();
}
+ else if(parseInt(res.code) === 0){
+ // 发布成功 跳转到已售出列表
+ _this.$util.showToast({
+ title: res.message,
+ mask: true,
+ duration: 2000,
+ success: function () {
+ setTimeout(() => {
+ _this.$util.redirectTo('/pages_promotion/futures/order', { status: 'release' });
+ }, 1000);
+ }
+ });
+ }
else{
+ // 失败
_this.$util.showToast({
title: res.message,
mask: true,
@@ -464,6 +476,5 @@ export default {
}
}
}
-
}
diff --git a/pages_promotion/futures/seckill.vue b/pages_promotion/futures/seckill.vue
index 84f2ae5..884b28f 100644
--- a/pages_promotion/futures/seckill.vue
+++ b/pages_promotion/futures/seckill.vue
@@ -2,7 +2,7 @@
-
+
距结束
@@ -327,4 +327,7 @@ export default {
}
}
}
+/deep/ .empty{
+ background: #fff;
+}
diff --git a/pages_promotion/message/index.vue b/pages_promotion/message/index.vue
index 8e18cf2..3c70cc2 100644
--- a/pages_promotion/message/index.vue
+++ b/pages_promotion/message/index.vue
@@ -9,28 +9,36 @@
-
-
+
+
+
+
+ {{ item.title }}
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 交易信息
+
+
+ 消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容消息内容
+
+
+ 查看详情
+ 2023-02-27 10:45
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
@@ -44,12 +52,12 @@ export default {
return {
// 顶部标题
titles:[
- { title: '交易信息', icon: 'public/static/img/futures/business.png' },
- { title: '系统消息', icon: 'public/static/img/futures/system.png' },
- { title: '通知消息', icon: 'public/static/img/futures/notice.png' },
- { title: '留言反馈', icon: 'public/static/img/futures/words.png' },
+ { title: '交易信息', icon: 'public/static/img/message/business.png' },
+ { title: '系统消息', icon: 'public/static/img/message/system.png' },
+ { title: '通知消息', icon: 'public/static/img/message/notice.png' },
+ { title: '留言反馈', icon: 'public/static/img/message/words.png' },
],
-
+ list: [],
@@ -63,13 +71,38 @@ export default {
onReady(){
// 判断是否登录
if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_promotion/message/index');
-
-
- if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
},
methods: {
+ // 获取消息列表 todo:这里是订单列表 修改修改为消息列表
+ getList(mescroll) {
+ this.$api.sendRequest({
+ url: '/futures/api/futures/myList',
+ data: {
+ page: mescroll.num || 1,
+ page_size: mescroll.size || 10,
+ status: this.tabs_active,
+ },
+ success: res => {
+ if(parseInt(res.code) === 0){
+ mescroll.endSuccess(Object.keys(res.data.list).length);
+ //设置列表数据
+ if (parseInt(mescroll.num) === 1){
+ this.list = []; //如果是第一页需手动制空列表
+ }
+ this.list = this.list.concat(res.data.list); //追加新数据
+ }else {
+ this.msg = res.message;
+ }
+ if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+ },
+ fail: res => {
+ mescroll.endErr();
+ if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+ }
+ });
+ },
@@ -92,13 +125,64 @@ export default {
min-height: 100vh;
.top{
-
- .top-image{}
+ width: 100vw;
+ height: 240rpx;
+ .top-image{
+ width: 100% !important;
+ height: 100% !important;
+ }
}
+ .message-content{
+ padding: 30rpx;
+ width: calc(100% - (30rpx * 2));
+ position: absolute;
+ top: 90rpx;
+
+ .titles{
+ width: calc(100% - (20rpx * 2));
+ display: inline-flex;
+ flex-direction: row;
+ flex-wrap: nowrap;
+ align-items: center;
+ justify-content: space-evenly;
+ align-content: center;
+ padding: 20rpx;
+ background-color: #FFFFFF;
+ border-radius: 20rpx;
+ .titles-block{
+ width: calc(100% / 4);
+ display: inline-flex;
+ flex-direction: column;
+ flex-wrap: wrap;
+ align-content: center;
+ justify-content: center;
+ align-items: center;
+ .titles-block-icon{
+ width: 60%;
+ .top-image{
+ width: 100% !important;
+ }
+ }
+ .titles-block-title{}
+ }
+ }
+
+ .message-list{
+ padding:0 20rpx;
+ background-color: red;
+
+ .message-block{
+
+
+ }
+ }
+
+
+ }
}