From 1106ff01c17493f415098fd98e69da24b89419e0 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 13 Apr 2023 15:05:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=AB=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/shopDetail/shopDetail.vue | 8 +++--
.../pages/careCenter/strategyDetail.vue | 7 +++++
.../pages/commonService/productDetail.vue | 6 ++--
pages/active/active.vue | 3 +-
pages/active/detail.vue | 29 +++++++++++++------
5 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/packages/packageBuy/pages/shopDetail/shopDetail.vue b/packages/packageBuy/pages/shopDetail/shopDetail.vue
index 0960b09..6ea2418 100644
--- a/packages/packageBuy/pages/shopDetail/shopDetail.vue
+++ b/packages/packageBuy/pages/shopDetail/shopDetail.vue
@@ -1067,8 +1067,9 @@
.banner {
display: block;
- width: 100%;
- height: 500rpx;
+ width: 100%;
+ height: 535rpx;
+ // height: 500rpx;
}
}
@@ -1199,7 +1200,8 @@
display: inline-block;
font-size: 36rpx;
font-weight: 500;
- color: #333333;
+ color: #333333;
+ width:90%;
}
.dataGroup {
diff --git a/packages/packageCarecenter/pages/careCenter/strategyDetail.vue b/packages/packageCarecenter/pages/careCenter/strategyDetail.vue
index 3de982e..a878c52 100644
--- a/packages/packageCarecenter/pages/careCenter/strategyDetail.vue
+++ b/packages/packageCarecenter/pages/careCenter/strategyDetail.vue
@@ -21,6 +21,13 @@
detail: {}
}
},
+ onShareAppMessage() {
+ return {
+ title: this.detail.name,
+ path: "packages/packageCarecenter/pages/careCenter/strategyDetail?id=" + this.detail.id,
+ imageUrl: this.img
+ }
+ },
methods: {
getDetail(id) {
weixin.request({
diff --git a/packages/packageCarecenter/pages/commonService/productDetail.vue b/packages/packageCarecenter/pages/commonService/productDetail.vue
index 0ca5885..20e4d03 100644
--- a/packages/packageCarecenter/pages/commonService/productDetail.vue
+++ b/packages/packageCarecenter/pages/commonService/productDetail.vue
@@ -103,7 +103,7 @@
-
+
@@ -150,7 +150,7 @@
toService(id) {
this.$u.throttle(() => {
uni.navigateTo({
- url: `/packages/packageCarecenter/pages/careCenter/serviceDetail?id=${id}`
+ url: `/packages/packageCarecenter/pages/commonService/serviceDetail?id=${id}`
})
})
},
diff --git a/pages/active/active.vue b/pages/active/active.vue
index 9d9609b..3517c8c 100644
--- a/pages/active/active.vue
+++ b/pages/active/active.vue
@@ -51,7 +51,8 @@
- {{item.address}}
+ {{item.address}}
+ 已报名数:{{item.start_member_sum+item.total}}
diff --git a/pages/active/detail.vue b/pages/active/detail.vue
index 2cac2b6..3e09de4 100644
--- a/pages/active/detail.vue
+++ b/pages/active/detail.vue
@@ -112,6 +112,15 @@
{{info.member_sum}}
+
+
+
+ 已报名数:
+
+
+
+ {{info.start_member_sum+info.total}}
+
报名信息:
@@ -392,7 +401,7 @@
onShareAppMessage() {
return {
title: this.info.name,
- path: "pages/active/detail/?id=" + this.info.id + "&promotion_id=" + this
+ path: "pages/active/detail?id=" + this.info.id + "&promotion_id=" + this
.user_info.id,
imageUrl: this.img
}
@@ -424,17 +433,17 @@
onLoad(options) {
var that = this;
this.id = options.id;
-
+ console.log("this.id",this.id)
const scene = decodeURIComponent(options.scene);
console.log(scene)
if (!weixin.isNull(scene)) {
- this.form.product_id = weixin.getParam(scene, "id");
+ this.form.active_id = weixin.getParam(scene, "id");
this.id = weixin.getParam(scene, "id");
this.form.promotion = this.promotion_id = weixin.getParam(scene, "promotion_id");
uni.setStorageSync("base_promotion_id", this.promotion_id);
}
if (!weixin.isNull(options.id))
- this.form.product_id = options.id;
+ this.form.active_id = options.id;
if (!weixin.isNull(options.promotion_id)) {
this.form.promotion = options.promotion_id;
@@ -593,7 +602,7 @@
url: this.baseUrl + '/api/member/get-wxa-qrcode',
method: 'GET',
data: {
- path: 'packages/packageBuy/pages/shopDetail/shopDetail',
+ path: 'pages/active/detail',
scene: 'id=' + this.info.id + '&promotion_id=' + this.user_info.id
},
success: r => {
@@ -645,9 +654,9 @@
// 绘制文字（参数：要写的字，x坐标，y坐标）
let packagesFirst = this.info
- ctx.fillText("¥" + this.info.money + "" + this.info.active_name, 40, (h + 50) * 0.5 + 20 + 30);
-
-
+ ctx.fillText("" + this.info.active_name, 40, (h + 50) * 0.5 + 20 + 30);
+ ctx.fillText("报名时间:" + this.info.apply_start, 40, (h + 50) * 0.5 + 50 + 50);
+ ctx.fillText("报名截止:" + this.info.apply_end, 40, (h + 50) * 0.5 + 60 + 60);
let user_info = uni.getStorageSync("user_info_yunyubang");
let userProfile = uni.getStorageSync('user_profile');
@@ -662,7 +671,7 @@
});
that.circleImg(ctx,
img,
- 40, h - 60 - w * 0.15,
+ 40, h - 50 - w * 0.15,
w * 0.15 / 2);
ctx.font = "12rpx normal";
@@ -843,6 +852,8 @@
this.form.merchant_id = this.info.shop_id
this.form.active_id = this.info.id
this.form.active_name = this.info.active_name
+ console.log(this.form)
+ return
weixin.request({
method: 'POST',
api: "/api/member/active-apply",