diff --git a/common/css/lib.css b/common/css/lib.css index 63cb5b95..d0345615 100644 --- a/common/css/lib.css +++ b/common/css/lib.css @@ -537,6 +537,9 @@ /** * 行间距 */ +.lh-il { + line-height: initial; +} .lh-0 { line-height: 0 !important; } diff --git a/components/realstore-cart/realstore-cart.vue b/components/realstore-cart/realstore-cart.vue index 6587dc72..b9cd7d57 100644 --- a/components/realstore-cart/realstore-cart.vue +++ b/components/realstore-cart/realstore-cart.vue @@ -113,12 +113,12 @@ {{item.name}} - + - + diff --git a/components/share-popup/share-popup.vue b/components/share-popup/share-popup.vue index 02891269..f07f8b0b 100644 --- a/components/share-popup/share-popup.vue +++ b/components/share-popup/share-popup.vue @@ -8,12 +8,6 @@ - - - - 点击复制地址分享给好友、群聊 - - @@ -50,6 +44,12 @@ + + + + 点击复制地址分享给好友、群聊 + + 生成海报,分享到朋友圈、好友及群聊 @@ -140,8 +140,8 @@ }); }, - // h5分享 - share_h5_event() { + // url链接地址复制分享 + share_url_copy_event() { app.globalData.text_copy_event(app.globalData.get_page_url()); }, diff --git a/manifest.json b/manifest.json index 80a73383..4b56776f 100644 --- a/manifest.json +++ b/manifest.json @@ -80,7 +80,11 @@ "qq" : { "appid" : "102076195", "UniversalLinks" : "https://d1.shopxo.vip/.well-known/" - } + }, + "google" : { + "clientid" : "510187709509-fq3t5grcfh81t4ub491tiadrtfjbaes1.apps.googleusercontent.com" + }, + "univerify" : {} }, "maps" : { "amap" : { @@ -167,19 +171,18 @@ } }, "__usePrivacyCheck__" : true, - "plugins" : { - // 直播(需要到小程序后台设置->第三方设置->插件管理里面添加【小程序直播组件】插件,教程 https://mp.weixin.qq.com/wxopen/pluginbasicprofile?action=intro&appid=wx2b03c6e691cd7370) - // "live-player-plugin" : { - // "version" : "1.3.5", - // "provider" : "wx2b03c6e691cd7370" - // }, - // 腾讯地图路线规划插件(需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件,教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a) - // "routePlan" : { - // "version" : "1.0.19", - // "provider" : "wx50b5593e81dd937a" - // } - } + "plugins" : {} }, + // 直播(需要到小程序后台设置->第三方设置->插件管理里面添加【小程序直播组件】插件,教程 https://mp.weixin.qq.com/wxopen/pluginbasicprofile?action=intro&appid=wx2b03c6e691cd7370) + // "live-player-plugin" : { + // "version" : "1.3.5", + // "provider" : "wx2b03c6e691cd7370" + // }, + // 腾讯地图路线规划插件(需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件,教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a) + // "routePlan" : { + // "version" : "1.0.19", + // "provider" : "wx50b5593e81dd937a" + // } "mp-alipay" : { "usingComponents" : true, "appid" : "2021001173639600" diff --git a/pages/login/login.css b/pages/login/login.css index b525cea0..c764a33b 100644 --- a/pages/login/login.css +++ b/pages/login/login.css @@ -97,7 +97,7 @@ page { width: 50rpx !important; height: 50rpx !important; } -.plugins-thirdpartylogin .item:last-of-type image { +.plugins-thirdpartylogin .item.more-submit image { width: 76rpx !important; height: 76rpx !important; } diff --git a/pages/login/login.vue b/pages/login/login.vue index e1ca3cd9..cf690405 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -297,7 +297,7 @@ - +