From 332e49782cb15034f6e456d518a78d77bad81013 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Wed, 10 Jul 2019 23:42:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/view/default/appconfig/app.html | 9 ++ application/api/controller/Goods.php | 4 + application/api/controller/Index.php | 15 ++- application/common.php | 18 +++ public/appmini/old/alipay/app.js | 2 +- public/appmini/old/alipay/app.json | 0 .../pages/goods-detail/goods-detail.acss | 44 ++++++-- .../pages/goods-detail/goods-detail.axml | 27 +++-- .../appmini/old/alipay/pages/index/index.acss | 103 ++++++++++++++++++ .../appmini/old/alipay/pages/index/index.axml | 16 +-- .../appmini/old/alipay/pages/index/index.js | 66 ++++++++++- .../lib/limitedtimediscount/content.axml | 33 ++++++ .../lib/limitedtimediscount/nav-icon.png | Bin 0 -> 2808 bytes .../pages/goods-detail/goods-detail.wxml | 29 +++-- .../pages/goods-detail/goods-detail.wxss | 44 +++++--- .../appmini/old/weixin/pages/index/index.js | 13 ++- .../appmini/old/weixin/pages/index/index.wxml | 35 +----- .../appmini/old/weixin/pages/index/index.wxss | 5 +- .../lib/limitedtimediscount/content.wxml | 33 ++++++ .../lib/limitedtimediscount/nav-icon.png | Bin 0 -> 2808 bytes .../online-service/content.wxml} | 2 +- .../lib/online-service/icon.png} | Bin .../appmini/old/weixin/pages/user/user.wxml | 2 +- 23 files changed, 406 insertions(+), 94 deletions(-) mode change 100755 => 100644 public/appmini/old/alipay/app.json mode change 100755 => 100644 public/appmini/old/alipay/pages/goods-detail/goods-detail.acss create mode 100644 public/appmini/old/alipay/pages/lib/limitedtimediscount/content.axml create mode 100644 public/appmini/old/alipay/pages/lib/limitedtimediscount/nav-icon.png create mode 100644 public/appmini/old/weixin/pages/lib/limitedtimediscount/content.wxml create mode 100644 public/appmini/old/weixin/pages/lib/limitedtimediscount/nav-icon.png rename public/appmini/old/weixin/pages/{common/online_service.wxml => lib/online-service/content.wxml} (57%) rename public/appmini/old/weixin/{images/default-online-service-icon.png => pages/lib/online-service/icon.png} (100%) diff --git a/application/admin/view/default/appconfig/app.html b/application/admin/view/default/appconfig/app.html index 85dbb5f46..925783e04 100644 --- a/application/admin/view/default/appconfig/app.html +++ b/application/admin/view/default/appconfig/app.html @@ -78,6 +78,15 @@ +
+ + +
+
diff --git a/application/api/controller/Goods.php b/application/api/controller/Goods.php index 006021fbd..0d46c2dff 100755 --- a/application/api/controller/Goods.php +++ b/application/api/controller/Goods.php @@ -11,6 +11,7 @@ namespace app\api\controller; use app\service\GoodsService; +use app\service\GoodsCommentsService; /** * 商品 @@ -97,6 +98,9 @@ class Goods extends Common $ret_favor = GoodsService::IsUserGoodsFavor(['goods_id'=>$goods_id, 'user'=>$this->user]); $ret['data'][0]['is_favor'] = ($ret_favor['code'] == 0) ? $ret_favor['data'] : 0; + // 商品评价总数 + $ret['data'][0]['comments_count'] = GoodsCommentsService::GoodsCommentsTotal(['goods_id'=>$goods_id, 'is_show'=>1]); + // 商品访问统计 GoodsService::GoodsAccessCountInc(['goods_id'=>$goods_id]); diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php index 6c0ce9548..712b9cd8c 100755 --- a/application/api/controller/Index.php +++ b/application/api/controller/Index.php @@ -45,6 +45,10 @@ class Index extends Common */ public function Index() { + // 秒杀 + $common_app_is_limitedtimediscount = (int) MyC('common_app_is_limitedtimediscount'); + + // 返回数据 $result = [ 'navigation' => AppHomeNavService::AppHomeNav(), 'banner_list' => BannerService::Banner(), @@ -54,14 +58,17 @@ class Index extends Common 'common_app_is_enable_answer' => (int) MyC('common_app_is_enable_answer', 1), 'common_app_is_header_nav_fixed' => (int) MyC('common_app_is_header_nav_fixed', 0), 'common_app_is_online_service' => (int) MyC('common_app_is_online_service', 0), + 'common_app_is_limitedtimediscount' => $common_app_is_limitedtimediscount, ]; // 秒杀 - $plugins_class = 'app\plugins\limitedtimediscount\service\Service'; - if(class_exists($plugins_class)) + if($common_app_is_limitedtimediscount == 1) { - $ret = (new $plugins_class())->ApiHomeAd(); - $result['plugins_limitedtimediscount_data'] = $ret['data']; + $ret = CallPluginsMethod('app\plugins\limitedtimediscount\service\Service', 'ApiHomeAd'); + if($ret['code'] == 0) + { + $result['plugins_limitedtimediscount_data'] = $ret['data']; + } } // 返回数据 diff --git a/application/common.php b/application/common.php index 01ccac97c..abc557230 100755 --- a/application/common.php +++ b/application/common.php @@ -11,6 +11,24 @@ // 应用公共文件 +/** + * 调用插件方法 - 访问为静态 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-07-10T22:03:48+0800 + * @param [string] $plugins_class [类命名空间] + * @param [string] $method [方法名称] + */ +function CallPluginsMethod($plugins_class, $method) +{ + if(class_exists($plugins_class)) + { + return $plugins_class::$method(); + } + return DataReturn('类未定义', -1); +} + /** * 判断当前是否小程序环境中 * @author Devil diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js index 0741d5d79..2261e5e26 100644 --- a/public/appmini/old/alipay/app.js +++ b/public/appmini/old/alipay/app.js @@ -61,7 +61,7 @@ App({ // 请求地址 request_url: "{{request_url}}", request_url: 'http://tp5-dev.com/', - request_url: 'http://test.shopxo.net/', + //request_url: 'http://test.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/public/appmini/old/alipay/app.json b/public/appmini/old/alipay/app.json old mode 100755 new mode 100644 diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss old mode 100755 new mode 100644 index e334424a0..ccc5eb320 --- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss +++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss @@ -172,26 +172,52 @@ right: 0; } .goods-base .goods-title { - width: calc(100% - 100rpx); font-size: 32rpx; line-height: 44rpx; font-weight: 500; } +.goods-base .goods-share { + position: absolute; + top: 0; + right: 0; + padding: 0 20rpx; +} .goods-base .goods-share image { width: 50rpx; height: 50rpx; } .goods-base .goods-share button { - height: auto; - font-size: 26rpx; - border: 0; - min-width: initial; + height: auto; + font-size: 26rpx; + border: 0; + min-width: initial; +} +.goods-base .goods-share view { + line-height: 40rpx; } .goods-base .goods-price { - margin-top: 10rpx; - padding-right: 160rpx; - position: relative; - max-height: 68rpx; + margin-top: 10rpx; + padding-right: 100rpx; + position: relative; + min-height: 80rpx; +} +.goods-base .goods-price .original-price { + margin-top: 10rpx; + margin-left: 0; +} +.goods-base .base-grid { + margin-top: 15rpx; + padding-top: 15rpx; + border-top: 1px solid #f5f5f5; +} +.goods-base .base-grid view { + width: calc(33.33% - 1px); +} +.goods-base .base-grid view:not(:last-child) { + border-right: 1px solid #f5f5f5; +} +.goods-base .base-grid view .cr-main { + padding-left: 10rpx; } .page { padding-bottom: 100rpx; diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml index cc1f319dc..9106917ff 100644 --- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml +++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml @@ -17,21 +17,30 @@ - - {{goods.title}} - + {{goods.title}} + + - - {{show_field_price_text}} ￥{{goods.price}} - ￥{{goods.original_price}} - - 销量 {{goods.sales_count}} + ￥{{goods.original_price}} + + + + 累计销量 + {{goods.sales_count}} + + + 浏览次数 + {{goods.access_count}} + + + 累计评论 + {{goods.comments_count}} diff --git a/public/appmini/old/alipay/pages/index/index.acss b/public/appmini/old/alipay/pages/index/index.acss index 66b44bd35..8436c8107 100644 --- a/public/appmini/old/alipay/pages/index/index.acss +++ b/public/appmini/old/alipay/pages/index/index.acss @@ -99,4 +99,107 @@ } .floor-list .goods-list .goods-base .sales-price { font-size: 30rpx; +} + + +/* + * 限时秒杀 + */ + .limitedtimediscount { + background: #fff; + padding: 5rpx 10rpx 20rpx 10rpx; + margin-bottom: 20rpx; +} +.limitedtimediscount .nav-title { + overflow: hidden; + padding: 10rpx 0; +} +.limitedtimediscount .nav-title .nav-icon { + width: 45rpx; + height: 45rpx; + vertical-align: sub; + margin-right: 10rpx; +} +.limitedtimediscount .text-wrapper { + color: #d2364c; + font-size: 36rpx; + font-weight: bold; +} +.limitedtimediscount .countdown { + line-height: 50rpx; + float: right; +} +.limitedtimediscount .countdown view { + margin-right: 0; + float: right; +} +.limitedtimediscount .countdown .timer-title { + color: #666; + margin-right: 10rpx; +} +.limitedtimediscount .countdown .timer-hours { + padding: 0 12rpx; + -moz-border-radius: 8rpx; + border-radius: 8rpx; + background-color: #3A4145; + color: #fff; + min-width: 35rpx; + text-align: center; +} +.limitedtimediscount .countdown .ds { + color: #4B5459; + padding: 0 8rpx; + font-weight: 700; +} + +.limitedtimediscount .goods-list { + width: 100%; + white-space: nowrap; + box-sizing: border-box; + margin-top: 5rpx; +} +.limitedtimediscount .goods-list .item { + width: 460rpx; + height: 605rpx; + border: 1px solid #f5f5f5; + background: white; + display: inline-block; + position: relative; +} +.limitedtimediscount .goods-list .item:not(:last-child) { + margin-right: 10px; +} +.limitedtimediscount .goods-list .item image { + width: 460rpx; + height: 460rpx; +} +.limitedtimediscount .goods-list .item .goods-base { + padding: 0 10rpx; + margin-top: 10rpx; +} +.limitedtimediscount .goods-list .goods-base .goods-title { + font-size: 32rpx; + margin-bottom: 10rpx; +} +.limitedtimediscount .goods-list .goods-base .goods-price { + color: #f40; + font-weight: bold; + font-size: 32rpx; +} +.limitedtimediscount .goods-list .goods-base .goods-original-price { + color: #999; + text-decoration: line-through; + font-size: 24rpx; +} +.limitedtimediscount .goods-list .goods-base button { + background: #d2364c; + border: 0; + color: #fff; + padding: 0 30rpx; + line-height: 65rpx; + font-size: 30rpx; + border-radius: 6rpx; + position: absolute; + right: 15rpx; + bottom: 15rpx; } \ No newline at end of file diff --git a/public/appmini/old/alipay/pages/index/index.axml b/public/appmini/old/alipay/pages/index/index.axml index f5e666669..c71907105 100644 --- a/public/appmini/old/alipay/pages/index/index.axml +++ b/public/appmini/old/alipay/pages/index/index.axml @@ -12,15 +12,17 @@ {{common_shop_notice}} - - - - + + - - - + + + + + + + diff --git a/public/appmini/old/alipay/pages/index/index.js b/public/appmini/old/alipay/pages/index/index.js index 37bf845b3..5430b04f6 100644 --- a/public/appmini/old/alipay/pages/index/index.js +++ b/public/appmini/old/alipay/pages/index/index.js @@ -1,6 +1,7 @@ const app = getApp(); Page({ data: { + load_status: 0, data_list_loding_status: 1, data_bottom_line_status: false, data_list: [], @@ -10,7 +11,12 @@ Page({ common_app_is_enable_search: 1, common_app_is_enable_answer: 1, common_app_is_header_nav_fixed: 0, - load_status: 0, + + // 限时秒杀插件 + common_app_is_limitedtimediscount : 0, + plugins_limitedtimediscount_data: null, + plugins_limitedtimediscount_timer_title: '距离结束', + plugins_limitedtimediscount_is_show_time: true, }, onShow() { @@ -40,6 +46,7 @@ Page({ if (res.data.code == 0) { var data = res.data.data; self.setData({ + data_bottom_line_status: true, banner_list: data.banner_list || [], navigation: data.navigation || [], data_list: data.data_list || [], @@ -48,8 +55,15 @@ Page({ common_app_is_enable_answer: data.common_app_is_enable_answer, common_app_is_header_nav_fixed: data.common_app_is_header_nav_fixed, data_list_loding_status: data.data_list.length == 0 ? 0 : 3, - data_bottom_line_status: true, + common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0, + plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null, }); + + // 限时秒杀倒计时 + if (this.data.common_app_is_limitedtimediscount == 1 && this.data.plugins_limitedtimediscount_data != null) + { + this.plugins_limitedtimediscount_countdown(); + } } else { self.setData({ data_list_loding_status: 0, @@ -97,6 +111,54 @@ Page({ this.init(); }, + // 显示秒杀插件-倒计时 + plugins_limitedtimediscount_countdown() { + var hours = this.data.plugins_limitedtimediscount_data.time.hours || 0; + var minutes = this.data.plugins_limitedtimediscount_data.time.minutes || 0; + var seconds = this.data.plugins_limitedtimediscount_data.time.seconds || 0; + var self = this; + if (hours > 0 || minutes > 0 || seconds > 0) { + // 秒 + var timer = setInterval(function () { + if (seconds <= 0) { + if (minutes > 0) { + minutes--; + seconds = 59; + } else if (hours > 0) { + hours--; + minutes = 59; + seconds = 59; + } + } else { + seconds--; + } + + self.setData({ + 'plugins_limitedtimediscount_data.time.hours': (hours < 10) ? 0 + hours : hours, + 'plugins_limitedtimediscount_data.time.minutes': (minutes < 10) ? 0 + minutes : minutes, + 'plugins_limitedtimediscount_data.time.seconds': (seconds < 10) ? 0 + seconds : seconds, + }); + + if (hours <= 0 && minutes <= 0 && seconds <= 0) { + // 停止时间 + clearInterval(timer); + + // 活动已结束 + self.setData({ + plugins_limitedtimediscount_timer_title: '活动已结束', + plugins_limitedtimediscount_is_show_time: false, + }); + } + }, 1000); + } else { + // 活动已结束 + self.setData({ + plugins_limitedtimediscount_timer_title: '活动已结束', + plugins_limitedtimediscount_is_show_time: false, + }); + } + }, + // 自定义分享 onShareAppMessage() { return { diff --git a/public/appmini/old/alipay/pages/lib/limitedtimediscount/content.axml b/public/appmini/old/alipay/pages/lib/limitedtimediscount/content.axml new file mode 100644 index 000000000..d65ff05e2 --- /dev/null +++ b/public/appmini/old/alipay/pages/lib/limitedtimediscount/content.axml @@ -0,0 +1,33 @@ + \ No newline at end of file diff --git a/public/appmini/old/alipay/pages/lib/limitedtimediscount/nav-icon.png b/public/appmini/old/alipay/pages/lib/limitedtimediscount/nav-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..49b0f380cd79db390195e9d43cab7467360bb5f7 GIT binary patch literal 2808 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 KMNUMnLSTZ{cuq3_ literal 0 HcmV?d00001 diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml index 3dda25aa1..0619f743f 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml @@ -28,19 +28,28 @@ - - {{goods.title}} - + {{goods.title}} + + - 分享 + 分享 - - {{show_field_price_text}} ￥{{goods.price}} - ￥{{goods.original_price}} - - 销量 {{goods.sales_count}} + ￥{{goods.original_price}} + + + + 累计销量 + {{goods.sales_count}} + + + 浏览次数 + {{goods.access_count}} + + + 累计评论 + {{goods.comments_count}} @@ -182,6 +191,6 @@ - + \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss index b3f62ba47..7a08935cf 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss @@ -174,32 +174,50 @@ .goods-base button { background: #fff; } -.goods-base .goods-price .sales { - position: absolute; - top: 0; - right: 0; -} .goods-base .goods-title { - width: calc(100% - 100rpx); font-size: 32rpx; line-height: 44rpx; font-weight: 500; } .goods-base .goods-share { + position: absolute; + top: 0; + right: 0; padding: 0 20rpx; - margin-bottom: 10rpx; } .goods-base .goods-share image { - width: 50rpx; - height: 50rpx; + width: 50rpx; + height: 50rpx; +} +.goods-base .goods-share view { + line-height: 40rpx; } .goods-base .goods-price { - margin-top: 10rpx; - padding-right: 160rpx; - position: relative; + margin-top: 10rpx; + padding-right: 100rpx; + position: relative; + min-height: 80rpx; +} +.goods-base .goods-price .original-price { + margin-top: 8rpx; + margin-left: 0; +} +.goods-base .base-grid { + margin-top: 15rpx; + padding-top: 15rpx; + border-top: 1px solid #f5f5f5; +} +.goods-base .base-grid view { + width: calc(33.33% - 1px); +} +.goods-base .base-grid view:not(:last-child) { + border-right: 1px solid #f5f5f5; +} +.goods-base .base-grid view .cr-main { + padding-left: 10rpx; } .page { - padding-bottom: 100rpx; + padding-bottom: 100rpx; } /* diff --git a/public/appmini/old/weixin/pages/index/index.js b/public/appmini/old/weixin/pages/index/index.js index bfd7326e3..0b90bfeb6 100755 --- a/public/appmini/old/weixin/pages/index/index.js +++ b/public/appmini/old/weixin/pages/index/index.js @@ -14,7 +14,8 @@ Page({ common_app_is_online_service: 0, // 限时秒杀插件 - plugins_limitedtimediscount_data: [], + common_app_is_limitedtimediscount : 0, + plugins_limitedtimediscount_data: null, plugins_limitedtimediscount_timer_title: '距离结束', plugins_limitedtimediscount_is_show_time: true, }, @@ -55,11 +56,15 @@ Page({ common_app_is_header_nav_fixed: data.common_app_is_header_nav_fixed, data_list_loding_status: data.data_list.length == 0 ? 0 : 3, common_app_is_online_service: data.common_app_is_online_service || 0, - plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || [], + common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0, + plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null, }); - + // 限时秒杀倒计时 - this.plugins_limitedtimediscount_countdown(); + if (this.data.common_app_is_limitedtimediscount == 1 && this.data.plugins_limitedtimediscount_data != null) + { + this.plugins_limitedtimediscount_countdown(); + } } else { self.setData({ data_list_loding_status: 0, diff --git a/public/appmini/old/weixin/pages/index/index.wxml b/public/appmini/old/weixin/pages/index/index.wxml index cabfd6791..7a5c8819e 100755 --- a/public/appmini/old/weixin/pages/index/index.wxml +++ b/public/appmini/old/weixin/pages/index/index.wxml @@ -19,36 +19,9 @@ - - - - 限时秒杀 - - - {{plugins_limitedtimediscount_data.time.seconds}} - : - {{plugins_limitedtimediscount_data.time.minutes}} - : - {{plugins_limitedtimediscount_data.time.hours}} - - {{plugins_limitedtimediscount_timer_title}} - - - - - - - - - {{item.title}} - ￥{{item.price}} - ￥{{item.original_price}} - - - - - - + + + @@ -104,7 +77,7 @@ - + diff --git a/public/appmini/old/weixin/pages/index/index.wxss b/public/appmini/old/weixin/pages/index/index.wxss index 6fc3f62e9..a7c4a1408 100755 --- a/public/appmini/old/weixin/pages/index/index.wxss +++ b/public/appmini/old/weixin/pages/index/index.wxss @@ -122,7 +122,7 @@ .limitedtimediscount .nav-title .nav-icon { width: 45rpx; height: 45rpx; - vertical-align: top; + vertical-align: sub; margin-right: 10rpx; } .limitedtimediscount .text-wrapper { @@ -184,6 +184,7 @@ } .limitedtimediscount .goods-list .goods-base .goods-title { font-size: 32rpx; + margin-bottom: 10rpx; } .limitedtimediscount .goods-list .goods-base .goods-price { color: #f40; @@ -200,7 +201,7 @@ border: 0; color: #fff; padding: 0 30rpx; - line-height: 50rpx; + line-height: 65rpx; font-size: 30rpx; border-radius: 6rpx; position: absolute; diff --git a/public/appmini/old/weixin/pages/lib/limitedtimediscount/content.wxml b/public/appmini/old/weixin/pages/lib/limitedtimediscount/content.wxml new file mode 100644 index 000000000..9d1afaf42 --- /dev/null +++ b/public/appmini/old/weixin/pages/lib/limitedtimediscount/content.wxml @@ -0,0 +1,33 @@ + \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/lib/limitedtimediscount/nav-icon.png b/public/appmini/old/weixin/pages/lib/limitedtimediscount/nav-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..49b0f380cd79db390195e9d43cab7467360bb5f7 GIT binary patch literal 2808 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 KMNUMnLSTZ{cuq3_ literal 0 HcmV?d00001 diff --git a/public/appmini/old/weixin/pages/common/online_service.wxml b/public/appmini/old/weixin/pages/lib/online-service/content.wxml similarity index 57% rename from public/appmini/old/weixin/pages/common/online_service.wxml rename to public/appmini/old/weixin/pages/lib/online-service/content.wxml index acfb2f85d..8828928c3 100644 --- a/public/appmini/old/weixin/pages/common/online_service.wxml +++ b/public/appmini/old/weixin/pages/lib/online-service/content.wxml @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/public/appmini/old/weixin/images/default-online-service-icon.png b/public/appmini/old/weixin/pages/lib/online-service/icon.png similarity index 100% rename from public/appmini/old/weixin/images/default-online-service-icon.png rename to public/appmini/old/weixin/pages/lib/online-service/icon.png diff --git a/public/appmini/old/weixin/pages/user/user.wxml b/public/appmini/old/weixin/pages/user/user.wxml index b9d14c20a..5f1402ab3 100755 --- a/public/appmini/old/weixin/pages/user/user.wxml +++ b/public/appmini/old/weixin/pages/user/user.wxml @@ -79,7 +79,7 @@ - + -- GitLab