From f85321e9e636717f00f1cb59007028fd67fa922a Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Fri, 15 Dec 2023 11:45:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=EF=BC=8C=E8=B0=B7=E6=AD=8C?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/lib.css                           |  3 ++
 components/realstore-cart/realstore-cart.vue |  4 +--
 components/share-popup/share-popup.vue       | 16 +++++------
 manifest.json                                | 29 +++++++++++---------
 pages/login/login.css                        |  2 +-
 pages/login/login.vue                        |  2 +-
 6 files changed, 31 insertions(+), 25 deletions(-)

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 @@
                                 <image class="left-icon dis-inline-block va-m" :src="static_url+'buy_use_type/'+item.key+'.png'" mode="aspectFit"></image>
                                 <text class="cr-black text-size-sm va-m margin-left-sm">{{item.name}}</text>
                                 <view class="right-arrow pa top-0 right-xxxxl">
-                                    <iconfont name="icon-qiandao-jiantou2" size="24rpx" propClass="lh-xs" color="#333"></iconfont>
+                                    <iconfont name="icon-qiandao-jiantou2" size="24rpx" propClass="lh-il" color="#333"></iconfont>
                                 </view>
                             </view>
                             <!-- #ifndef H5 -->
                             <view v-if="item.index == 0" class="scan-item border-radius-main tc pa right-0 top-0" :data-index="index" @tap="search_icon_event">
-                                <iconfont name="icon-mendian-sousuosm" size="36rpx" propClass="lh-lg" color="#02b3c2"></iconfont>
+                                <iconfont name="icon-mendian-sousuosm" size="36rpx" propClass="lh-il va-m" color="#02b3c2"></iconfont>
                             </view>
                             <!-- #endif -->
                         </view>
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 @@
                     </view>
                 </view>
                 <view class="share-popup-content">
-                    <!-- #ifdef H5 -->
-                    <view class="share-items oh cp" @tap="share_h5_event">
-                        <image :src="common_static_url + 'share-user-icon.png'" mode="scaleToFill"></image>
-                        <text class="cr-grey text-size-xs single-text">点击复制地址分享给好友、群聊</text>
-                    </view>
-                    <!-- #endif -->
                     <!-- #ifdef MP-ALIPAY -->
                     <view class="share-items oh cp" @tap="share_base_event">
                         <image :src="common_static_url + 'share-user-icon.png'" mode="scaleToFill"></image>
@@ -50,6 +44,12 @@
                         </view>
                     </block>
                     <!-- #endif -->
+                    <!-- #ifdef H5 || APP -->
+                    <view class="share-items oh cp" @tap="share_url_copy_event">
+                        <image :src="common_static_url + 'share-user-icon.png'" mode="scaleToFill"></image>
+                        <text class="cr-grey text-size-xs single-text">点击复制地址分享给好友、群聊</text>
+                    </view>
+                    <!-- #endif -->
                     <view v-if="is_goods_poster == 1 && (goods_id || 0) != 0" class="share-items oh cp" @tap="poster_event">
                         <image :src="common_static_url + 'share-poster-icon.png'" mode="scaleToFill"></image>
                         <text class="cr-grey text-size-xs single-text">生成海报，分享到朋友圈、好友及群聊</text>
@@ -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 @@
                                             <image :src="item.icon" mode="aspectFit" class="dis-block auto"></image>
                                         </view>
                                     </block>
-                                    <view v-if="Object.keys(plugins_thirdpartylogin_data).length > 3" class="item dis-inline-block round" @tap="popup_login_open_event">
+                                    <view v-if="Object.keys(plugins_thirdpartylogin_data).length > 3" class="item dis-inline-block round more-submit" @tap="popup_login_open_event">
                                         <image :src="login_static_url + 'more.png'" mode="aspectFit" class="dis-block auto"></image>
                                     </view>
                                 </view>