diff --git a/.DS_Store b/.DS_Store
index a10dabb..9aa1d95 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/packages/packageBuy/pages/detail/detail.vue b/packages/packageBuy/pages/detail/detail.vue
index 5224f64..e2d5ffb 100644
--- a/packages/packageBuy/pages/detail/detail.vue
+++ b/packages/packageBuy/pages/detail/detail.vue
@@ -376,8 +376,8 @@
// 设置颜色
ctx.fillStyle = "#000";
// 绘制文字（参数：要写的字，x坐标，y坐标）
- if (!weixin.isNull(user_info.name))
- ctx.fillText(user_info.name,
+ if (!weixin.isNull(this.user_info.name))
+ ctx.fillText(this.user_info.name,
40, h - 40);
else
ctx.fillText("",
diff --git a/packages/packageBuy/pages/packageInfo/index.vue b/packages/packageBuy/pages/packageInfo/index.vue
index 2f76580..c125fec 100644
--- a/packages/packageBuy/pages/packageInfo/index.vue
+++ b/packages/packageBuy/pages/packageInfo/index.vue
@@ -285,7 +285,7 @@
// 设置颜色
ctx.fillStyle = "#000";
// 绘制文字（参数：要写的字，x坐标，y坐标）
- ctx.fillText(user_info.name,
+ ctx.fillText(this.user_info.name,
40, h - 40);
this.circleImg(ctx, res.path, w - 40 - w * 0.2, h - 40 -
diff --git a/packages/packageBuy/pages/shopDetail/shopDetail.vue b/packages/packageBuy/pages/shopDetail/shopDetail.vue
index dc7b8c9..6b12094 100644
--- a/packages/packageBuy/pages/shopDetail/shopDetail.vue
+++ b/packages/packageBuy/pages/shopDetail/shopDetail.vue
@@ -538,7 +538,8 @@
this.$refs.shareCode.open();
this.getPoster();
},
- draw: function() {
+ draw: function() {
+
var that = this;
uni.request({
url: this.baseUrl + '/api/member/get-wxa-qrcode',
@@ -603,7 +604,6 @@
let user_info = uni.getStorageSync("user_info_yunyubang");
let userProfile = uni.getStorageSync('user_profile');
-
var img = this.imgAvatar;
uni.getImageInfo({
src: userProfile.avatarUrl, // 头像
@@ -621,8 +621,8 @@
// 设置颜色
ctx.fillStyle = "#000";
// 绘制文字（参数：要写的字，x坐标，y坐标）
- if (!weixin.isNull(user_info.name))
- ctx.fillText(user_info.name,
+ if (!weixin.isNull(this.user_info.name))
+ ctx.fillText(this.user_info.name,
40, h - 40);
else
ctx.fillText("",
diff --git a/packages/packageBuy/pages/shopList/shopList.vue b/packages/packageBuy/pages/shopList/shopList.vue
index 22cc321..2afe27f 100644
--- a/packages/packageBuy/pages/shopList/shopList.vue
+++ b/packages/packageBuy/pages/shopList/shopList.vue
@@ -36,7 +36,7 @@
{{item.product_type.name}}
- {{item.sortnumber}}{{item.name}}
+ {{item.name}}
diff --git a/packages/packageCarecenter/pages/careCenter/serviceDetail.vue b/packages/packageCarecenter/pages/careCenter/serviceDetail.vue
index ef93acb..af8c380 100644
--- a/packages/packageCarecenter/pages/careCenter/serviceDetail.vue
+++ b/packages/packageCarecenter/pages/careCenter/serviceDetail.vue
@@ -527,8 +527,8 @@
// 设置颜色
ctx.fillStyle = "#000";
// 绘制文字（参数：要写的字，x坐标，y坐标）
- if (!weixin.isNull(user_info.name))
- ctx.fillText(user_info.name,
+ if (!weixin.isNull(this.user_info.name))
+ ctx.fillText(this.user_info.name,
40, h - 40);
else
ctx.fillText("",
diff --git a/packages/packageCarecenter/pages/commonService/serviceDetail.vue b/packages/packageCarecenter/pages/commonService/serviceDetail.vue
index 32f64f2..df4d9f4 100644
--- a/packages/packageCarecenter/pages/commonService/serviceDetail.vue
+++ b/packages/packageCarecenter/pages/commonService/serviceDetail.vue
@@ -505,8 +505,8 @@
// 设置颜色
ctx.fillStyle = "#000";
// 绘制文字（参数：要写的字，x坐标，y坐标）
- if (!weixin.isNull(user_info.name))
- ctx.fillText(user_info.name,
+ if (!weixin.isNull(this.user_info.name))
+ ctx.fillText(this.user_info.name,
40, h - 40);
else
ctx.fillText("",
diff --git a/pages/active/detail.vue b/pages/active/detail.vue
index 9a969e8..3e232ee 100644
--- a/pages/active/detail.vue
+++ b/pages/active/detail.vue
@@ -68,7 +68,7 @@
-
+
@@ -155,6 +155,85 @@
+
+
+
+
+
+ 活动信息:
+
+
+
+
+
+ 开始时间：
+
+
+
+ {{$u.timeFormat(new Date(info.start_date.replace(/-/g,'/')), 'yyyy年mm月dd日')}} {{info.start_time}}
+
+
+
+
+ 结束时间：
+
+
+
+ {{$u.timeFormat(new Date(info.end_date), 'yyyy年mm月dd日')}} {{info.end_time}}
+
+
+
+
+ 活动地点:
+
+
+
+ {{info.address}}
+
+
+
+
+ 活动人数:
+
+
+
+ {{info.member_sum}}
+
+
+
+
+ 已报名数:
+
+
+
+ {{info.start_member_sum+info.total}}
+
+
+
+ 报名信息:
+
+
+
+
+
+ 开始时间：
+
+
+
+ {{$u.timeFormat(new Date(info.apply_start.replace(/-/g,'/')), 'yyyy年mm月dd日 hh:MM:ss')}}
+
+
+
+
+ 截止时间：
+
+
+
+ {{$u.timeFormat(new Date(info.apply_end.replace(/-/g,'/')), 'yyyy年mm月dd日 hh:MM:ss')}}
+
+
+
+