From 3e1dc0c96edb80b631b69c8eb6d4593f3181d370 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Wed, 26 May 2021 19:52:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=9A=90=E7=A7=81=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sourcecode/alipay/default/app.acss            |  1 +
 sourcecode/alipay/default/app.js              | 10 +++++++-
 .../alipay/default/pages/login/login.acss     |  1 -
 .../alipay/default/pages/login/login.axml     | 12 ++++++++--
 .../alipay/default/pages/login/login.js       | 24 ++++++++++++++++++-
 sourcecode/baidu/default/app.css              |  1 +
 sourcecode/baidu/default/app.js               | 10 +++++++-
 .../baidu/default/pages/login/login.css       |  3 ---
 sourcecode/baidu/default/pages/login/login.js | 22 +++++++++++++++++
 .../baidu/default/pages/login/login.swan      | 12 ++++++++--
 sourcecode/qq/default/app.js                  | 10 +++++++-
 sourcecode/qq/default/app.qss                 |  1 +
 sourcecode/qq/default/pages/login/login.js    | 24 ++++++++++++++++++-
 sourcecode/qq/default/pages/login/login.qml   | 12 ++++++++--
 sourcecode/qq/default/pages/login/login.qss   |  3 ---
 sourcecode/toutiao/default/app.js             | 10 +++++++-
 sourcecode/toutiao/default/app.ttss           |  1 +
 .../toutiao/default/pages/login/login.js      | 24 ++++++++++++++++++-
 .../toutiao/default/pages/login/login.ttml    | 12 ++++++++--
 .../toutiao/default/pages/login/login.ttss    |  3 ---
 sourcecode/weixin/default/app.js              | 10 +++++++-
 sourcecode/weixin/default/app.wxss            |  1 +
 .../weixin/default/pages/login/login.js       | 22 +++++++++++++++++
 .../weixin/default/pages/login/login.wxml     | 12 ++++++++--
 .../weixin/default/pages/login/login.wxss     |  3 ---
 25 files changed, 213 insertions(+), 31 deletions(-)

diff --git a/sourcecode/alipay/default/app.acss b/sourcecode/alipay/default/app.acss
index bd7e10034..7a1418083 100644
--- a/sourcecode/alipay/default/app.acss
+++ b/sourcecode/alipay/default/app.acss
@@ -94,6 +94,7 @@ textarea {
 .oh { overflow: hidden; }
 .dis-none { display: none; }
 .dis-block { display: block; }
+.dis-inline { display: inline; }
 
 .cr-main { color: #d2364c; }
 .cr-666 { color: #666; }
diff --git a/sourcecode/alipay/default/app.js b/sourcecode/alipay/default/app.js
index ae4d1405a..1f4dbd8d5 100644
--- a/sourcecode/alipay/default/app.js
+++ b/sourcecode/alipay/default/app.js
@@ -565,7 +565,7 @@ App({
         switch(type) {
           // web
           case 0 :
-            my.navigateTo({url: '/pages/web-view/web-view?url='+encodeURIComponent(value)});
+            this.open_web_view(value);
             break;
 
           // 内部页面
@@ -601,6 +601,14 @@ App({
       }
     },
 
+    /**
+   * 打开 webview页面
+   * value    [string]  url地址
+   */
+  open_web_view(value) {
+    my.navigateTo({url: '/pages/web-view/web-view?url='+encodeURIComponent(value)});
+  },
+
   /**
    * 是否需要绑定手机号码
    */
diff --git a/sourcecode/alipay/default/pages/login/login.acss b/sourcecode/alipay/default/pages/login/login.acss
index 759d398f3..2ae01e9ac 100644
--- a/sourcecode/alipay/default/pages/login/login.acss
+++ b/sourcecode/alipay/default/pages/login/login.acss
@@ -55,7 +55,6 @@ page{
   padding-top: 30%;
 }
 .user-login button {
-  margin-top: 30rpx;
   padding: 0 30rpx;
   height: 65rpx;
   line-height: 65rpx;
diff --git a/sourcecode/alipay/default/pages/login/login.axml b/sourcecode/alipay/default/pages/login/login.axml
index 6bb3bbe63..a007b7d66 100644
--- a/sourcecode/alipay/default/pages/login/login.axml
+++ b/sourcecode/alipay/default/pages/login/login.axml
@@ -10,6 +10,14 @@
 </view>
 
 <view a:if="{{user == null}}" class="user-login tc">
-  <view class="cr-888 fs-12">确认登录授权，为您提供更优质的服务</view>
-  <button type="primary" size="mini" open-type="getAuthorize" scope="userInfo" onGetAuthorize="get_user_info_event">授权登录</button>
+  <view>确认登录授权，为您提供更优质的服务</view>
+  <view class="margin-top-sm padding-bottom-xxl">
+    阅读并同意 《<span class="cr-main" onTap="agreement_event" data-value="userregister">服务协议</span>》 与 《<span class="cr-main" onTap="agreement_event" data-value="userprivacy">隐私政策</span>》
+  </view>
+  <view class="margin-top-xxl">
+    <navigator open-type="navigateBack" hover-class="none" class="dis-inline margin-right-lg">
+      <button type="default" size="mini" class="cr-888 br" hover-class="none">取消</button>
+    </navigator>
+    <button type="primary" size="mini" open-type="getAuthorize" scope="userInfo" onGetAuthorize="get_user_info_event" class="margin-left-lg">同意授权登录</button>
+  </view>
 </view>
diff --git a/sourcecode/alipay/default/pages/login/login.js b/sourcecode/alipay/default/pages/login/login.js
index eb2baf2c0..3b9635603 100644
--- a/sourcecode/alipay/default/pages/login/login.js
+++ b/sourcecode/alipay/default/pages/login/login.js
@@ -189,6 +189,28 @@ Page({
         }
       });
     }
-  }
+  },
+
+  // 协议事件
+  agreement_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value == null)
+    {
+      app.showToast('协议类型有误');
+      return false;
+    }
+
+    // 是否存在协议 url 地址
+    var key = 'agreement_'+value+'_url';
+    var url = app.get_config('config.'+key) || null;
+    if(url == null)
+    {
+      app.showToast('协议url地址有误');
+      return false;
+    }
+
+    // 打开 webview
+    app.open_web_view(url);
+  },
 
 });
diff --git a/sourcecode/baidu/default/app.css b/sourcecode/baidu/default/app.css
index cb765414a..00105491b 100755
--- a/sourcecode/baidu/default/app.css
+++ b/sourcecode/baidu/default/app.css
@@ -101,6 +101,7 @@ textarea {
 .oh { overflow: hidden; }
 .dis-none { display: none; }
 .dis-block { display: block; }
+.dis-inline { display: inline; }
 
 .cr-main { color: #d2364c; }
 .cr-666 { color: #666; }
diff --git a/sourcecode/baidu/default/app.js b/sourcecode/baidu/default/app.js
index 9ebdaffde..113df6368 100755
--- a/sourcecode/baidu/default/app.js
+++ b/sourcecode/baidu/default/app.js
@@ -515,7 +515,7 @@ App({
       switch (type) {
         // web
         case 0:
-          swan.navigateTo({ url: '/pages/web-view/web-view?url=' + encodeURIComponent(value) });
+          this.open_web_view(value);
           break;
 
         // 内部页面
@@ -551,6 +551,14 @@ App({
     }
   },
 
+  /**
+   * 打开 webview页面
+   * value    [string]  url地址
+   */
+  open_web_view(value) {
+    swan.navigateTo({ url: '/pages/web-view/web-view?url=' + encodeURIComponent(value) });
+  },
+
   /**
    * 默认弱提示方法
    * msg    [string]  提示信息
diff --git a/sourcecode/baidu/default/pages/login/login.css b/sourcecode/baidu/default/pages/login/login.css
index 033924088..7cf1052d8 100755
--- a/sourcecode/baidu/default/pages/login/login.css
+++ b/sourcecode/baidu/default/pages/login/login.css
@@ -58,9 +58,6 @@ page{
 .user-login {
   padding-top: 30%;
 }
-.user-login button {
-  margin-top: 30rpx;
-}
 
 /**
  * 登录确认
diff --git a/sourcecode/baidu/default/pages/login/login.js b/sourcecode/baidu/default/pages/login/login.js
index 978ca2360..97ee4a29b 100755
--- a/sourcecode/baidu/default/pages/login/login.js
+++ b/sourcecode/baidu/default/pages/login/login.js
@@ -252,4 +252,26 @@ Page({
     this.setData({login_type_status: 1});
   },
 
+  // 协议事件
+  agreement_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value == null)
+    {
+      app.showToast('协议类型有误');
+      return false;
+    }
+
+    // 是否存在协议 url 地址
+    var key = 'agreement_'+value+'_url';
+    var url = app.get_config('config.'+key) || null;
+    if(url == null)
+    {
+      app.showToast('协议url地址有误');
+      return false;
+    }
+
+    // 打开 webview
+    app.open_web_view(url);
+  },
+
 });
\ No newline at end of file
diff --git a/sourcecode/baidu/default/pages/login/login.swan b/sourcecode/baidu/default/pages/login/login.swan
index 5f05d0e58..577ae59a9 100755
--- a/sourcecode/baidu/default/pages/login/login.swan
+++ b/sourcecode/baidu/default/pages/login/login.swan
@@ -22,6 +22,14 @@
 
 <!-- 获取用户信息授权 -->
 <view s-else class="user-login tc">
-  <view class="cr-888 fs-12">确认登录授权，为您提供更优质的服务</view>
-  <button type="primary" size="mini" open-type="getUserInfo" bindgetuserinfo="get_user_info_event">授权登录</button>
+  <view>确认登录授权，为您提供更优质的服务</view>
+  <view class="margin-top-sm padding-bottom-xxl">
+    阅读并同意 《<span class="cr-main" bindtap="agreement_event" data-value="userregister">服务协议</span>》 与 《<span class="cr-main" bindtap="agreement_event" data-value="userprivacy">隐私政策</span>》
+  </view>
+  <view class="margin-top-xxl">
+    <navigator open-type="navigateBack" hover-class="none" class="dis-inline margin-right-lg">
+      <button type="default" size="mini" class="cr-888 br" hover-class="none">取消</button>
+    </navigator>
+    <button type="primary" size="mini" open-type="getUserInfo" bindgetuserinfo="get_user_info_event" class="margin-left-lg">同意授权登录</button>
+  </view>
 </view>
diff --git a/sourcecode/qq/default/app.js b/sourcecode/qq/default/app.js
index 9d559b910..8e2ae4a75 100755
--- a/sourcecode/qq/default/app.js
+++ b/sourcecode/qq/default/app.js
@@ -511,7 +511,7 @@ App({
       switch (type) {
         // web
         case 0:
-          qq.navigateTo({ url: '/pages/web-view/web-view?url=' + encodeURIComponent(value) });
+          this.open_web_view(value);
           break;
 
         // 内部页面
@@ -548,6 +548,14 @@ App({
     }
   },
 
+  /**
+   * 打开 webview页面
+   * value    [string]  url地址
+   */
+  open_web_view(value) {
+    qq.navigateTo({ url: '/pages/web-view/web-view?url=' + encodeURIComponent(value) });
+  },
+
   /**
    * 默认弱提示方法
    * msg    [string]  提示信息
diff --git a/sourcecode/qq/default/app.qss b/sourcecode/qq/default/app.qss
index e5a9efddf..6f60afd54 100755
--- a/sourcecode/qq/default/app.qss
+++ b/sourcecode/qq/default/app.qss
@@ -101,6 +101,7 @@ textarea {
 .oh { overflow: hidden; }
 .dis-none { display: none; }
 .dis-block { display: block; }
+.dis-inline { display: inline; }
 
 .cr-main { color: #d2364c; }
 .cr-666 { color: #666; }
diff --git a/sourcecode/qq/default/pages/login/login.js b/sourcecode/qq/default/pages/login/login.js
index 2a4929d41..5f670abaf 100755
--- a/sourcecode/qq/default/pages/login/login.js
+++ b/sourcecode/qq/default/pages/login/login.js
@@ -190,6 +190,28 @@ Page({
         }
       });
     }
-  }
+  },
+
+  // 协议事件
+  agreement_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value == null)
+    {
+      app.showToast('协议类型有误');
+      return false;
+    }
+
+    // 是否存在协议 url 地址
+    var key = 'agreement_'+value+'_url';
+    var url = app.get_config('config.'+key) || null;
+    if(url == null)
+    {
+      app.showToast('协议url地址有误');
+      return false;
+    }
+
+    // 打开 webview
+    app.open_web_view(url);
+  },
 
 });
diff --git a/sourcecode/qq/default/pages/login/login.qml b/sourcecode/qq/default/pages/login/login.qml
index 0b7d11235..32760cb75 100755
--- a/sourcecode/qq/default/pages/login/login.qml
+++ b/sourcecode/qq/default/pages/login/login.qml
@@ -10,6 +10,14 @@
 </view>
 
 <view qq:if="{{user == null}}" class="user-login tc">
-  <view class="cr-888 fs-12">确认登录授权，为您提供更优质的服务</view>
-  <button type="primary" size="mini" open-type="getUserInfo" bindgetuserinfo="get_user_info_event">授权登录</button>
+  <view>确认登录授权，为您提供更优质的服务</view>
+  <view class="margin-top-sm padding-bottom-xxl">
+    阅读并同意 《<span class="cr-main" bindtap="agreement_event" data-value="userregister">服务协议</span>》 与 《<span class="cr-main" bindtap="agreement_event" data-value="userprivacy">隐私政策</span>》
+  </view>
+  <view class="margin-top-xxl">
+    <navigator open-type="navigateBack" hover-class="none" class="dis-inline margin-right-lg">
+      <button type="default" size="mini" class="cr-888 br" hover-class="none">取消</button>
+    </navigator>
+    <button type="primary" size="mini" open-type="getUserInfo" bindgetuserinfo="get_user_info_event" class="margin-left-lg">同意授权登录</button>
+  </view>
 </view>
diff --git a/sourcecode/qq/default/pages/login/login.qss b/sourcecode/qq/default/pages/login/login.qss
index 7dfa0b8e9..c405f15db 100755
--- a/sourcecode/qq/default/pages/login/login.qss
+++ b/sourcecode/qq/default/pages/login/login.qss
@@ -57,7 +57,4 @@ page{
 */
 .user-login {
   padding-top: 30%;
-}
-.user-login button {
-  margin-top: 30rpx;
 }
\ No newline at end of file
diff --git a/sourcecode/toutiao/default/app.js b/sourcecode/toutiao/default/app.js
index 17176212b..8a46c68f1 100755
--- a/sourcecode/toutiao/default/app.js
+++ b/sourcecode/toutiao/default/app.js
@@ -518,7 +518,7 @@ App({
       switch (type) {
         // web
         case 0:
-          tt.navigateTo({ url: '/pages/web-view/web-view?url=' + encodeURIComponent(value) });
+          this.open_web_view(value);
           break;
 
         // 内部页面
@@ -554,6 +554,14 @@ App({
     }
   },
 
+  /**
+   * 打开 webview页面
+   * value    [string]  url地址
+   */
+  open_web_view(value) {
+    tt.navigateTo({ url: '/pages/web-view/web-view?url=' + encodeURIComponent(value) });
+  },
+
   /**
    * 默认弱提示方法
    * msg    [string]  提示信息
diff --git a/sourcecode/toutiao/default/app.ttss b/sourcecode/toutiao/default/app.ttss
index 672644197..89d765f1f 100755
--- a/sourcecode/toutiao/default/app.ttss
+++ b/sourcecode/toutiao/default/app.ttss
@@ -102,6 +102,7 @@ textarea {
 .oh { overflow: hidden; }
 .dis-none { display: none; }
 .dis-block { display: block; }
+.dis-inline { display: inline; }
 
 .cr-main { color: #d2364c; }
 .cr-666 { color: #666; }
diff --git a/sourcecode/toutiao/default/pages/login/login.js b/sourcecode/toutiao/default/pages/login/login.js
index 74ce5e8e3..2f27d30ec 100755
--- a/sourcecode/toutiao/default/pages/login/login.js
+++ b/sourcecode/toutiao/default/pages/login/login.js
@@ -221,6 +221,28 @@ Page({
         }
       });
     }
-  }
+  },
+
+  // 协议事件
+  agreement_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value == null)
+    {
+      app.showToast('协议类型有误');
+      return false;
+    }
+
+    // 是否存在协议 url 地址
+    var key = 'agreement_'+value+'_url';
+    var url = app.get_config('config.'+key) || null;
+    if(url == null)
+    {
+      app.showToast('协议url地址有误');
+      return false;
+    }
+
+    // 打开 webview
+    app.open_web_view(url);
+  },
 
 });
diff --git a/sourcecode/toutiao/default/pages/login/login.ttml b/sourcecode/toutiao/default/pages/login/login.ttml
index 6c3b12fee..62961c9c1 100755
--- a/sourcecode/toutiao/default/pages/login/login.ttml
+++ b/sourcecode/toutiao/default/pages/login/login.ttml
@@ -10,6 +10,14 @@
 </view>
 
 <view tt:if="{{user == null}}" class="user-login tc">
-  <view class="cr-888 fs-12">确认登录授权，为您提供更优质的服务</view>
-  <button type="primary" size="mini" bindtap="get_user_info_event">授权登录</button>
+  <view>确认登录授权，为您提供更优质的服务</view>
+  <view class="margin-top-sm padding-bottom-xxl">
+    阅读并同意 《<span class="cr-main" bindtap="agreement_event" data-value="userregister">服务协议</span>》 与 《<span class="cr-main" bindtap="agreement_event" data-value="userprivacy">隐私政策</span>》
+  </view>
+  <view class="margin-top-xxl">
+    <navigator open-type="navigateBack" hover-class="none" class="dis-inline margin-right-lg">
+      <button type="default" size="mini" class="cr-888 br" hover-class="none">取消</button>
+    </navigator>
+    <button type="primary" size="mini" bindtap="get_user_info_event" class="margin-left-lg">同意授权登录</button>
+  </view>
 </view>
diff --git a/sourcecode/toutiao/default/pages/login/login.ttss b/sourcecode/toutiao/default/pages/login/login.ttss
index c899160a2..2131da1e1 100755
--- a/sourcecode/toutiao/default/pages/login/login.ttss
+++ b/sourcecode/toutiao/default/pages/login/login.ttss
@@ -57,7 +57,4 @@ page{
 */
 .user-login {
   padding-top: 30%;
-}
-.user-login button {
-  margin-top: 30rpx;
 }
\ No newline at end of file
diff --git a/sourcecode/weixin/default/app.js b/sourcecode/weixin/default/app.js
index 72fd46850..42a8c949e 100755
--- a/sourcecode/weixin/default/app.js
+++ b/sourcecode/weixin/default/app.js
@@ -516,7 +516,7 @@ App({
       switch (type) {
         // web
         case 0:
-          wx.navigateTo({ url: '/pages/web-view/web-view?url=' + encodeURIComponent(value) });
+          this.open_web_view(value);
           break;
 
         // 内部页面
@@ -552,6 +552,14 @@ App({
     }
   },
 
+  /**
+   * 打开 webview页面
+   * value    [string]  url地址
+   */
+  open_web_view(value) {
+    wx.navigateTo({ url: '/pages/web-view/web-view?url=' + encodeURIComponent(value) });
+  },
+
   /**
    * 默认弱提示方法
    * msg    [string]  提示信息
diff --git a/sourcecode/weixin/default/app.wxss b/sourcecode/weixin/default/app.wxss
index 6c21ecf93..2be7a7cf8 100755
--- a/sourcecode/weixin/default/app.wxss
+++ b/sourcecode/weixin/default/app.wxss
@@ -101,6 +101,7 @@ textarea {
 .oh { overflow: hidden; }
 .dis-none { display: none; }
 .dis-block { display: block; }
+.dis-inline { display: inline; }
 
 .cr-main { color: #d2364c; }
 .cr-666 { color: #666; }
diff --git a/sourcecode/weixin/default/pages/login/login.js b/sourcecode/weixin/default/pages/login/login.js
index cd9f117d5..f5d9087a0 100755
--- a/sourcecode/weixin/default/pages/login/login.js
+++ b/sourcecode/weixin/default/pages/login/login.js
@@ -278,4 +278,26 @@ Page({
     this.setData({login_type_status: 1});
   },
 
+  // 协议事件
+  agreement_event(e) {
+    var value = e.currentTarget.dataset.value || null;
+    if(value == null)
+    {
+      app.showToast('协议类型有误');
+      return false;
+    }
+
+    // 是否存在协议 url 地址
+    var key = 'agreement_'+value+'_url';
+    var url = app.get_config('config.'+key) || null;
+    if(url == null)
+    {
+      app.showToast('协议url地址有误');
+      return false;
+    }
+
+    // 打开 webview
+    app.open_web_view(url);
+  },
+
 });
diff --git a/sourcecode/weixin/default/pages/login/login.wxml b/sourcecode/weixin/default/pages/login/login.wxml
index 77fb37921..0add7484a 100755
--- a/sourcecode/weixin/default/pages/login/login.wxml
+++ b/sourcecode/weixin/default/pages/login/login.wxml
@@ -22,6 +22,14 @@
 
 <!-- 获取用户信息授权 -->
 <view wx:else class="user-login tc">
-  <view class="cr-888 fs-12">确认登录授权，为您提供更优质的服务</view>
-  <button type="primary" size="mini" bindtap="get_user_info_event">授权登录</button>
+  <view>确认登录授权，为您提供更优质的服务</view>
+  <view class="margin-top-sm padding-bottom-xxl">
+    阅读并同意 《<span class="cr-main" bindtap="agreement_event" data-value="userregister">服务协议</span>》 与 《<span class="cr-main" bindtap="agreement_event" data-value="userprivacy">隐私政策</span>》
+  </view>
+  <view class="margin-top-xxl">
+    <navigator open-type="navigateBack" hover-class="none" class="dis-inline margin-right-lg">
+      <button type="default" size="mini" class="cr-888 br" hover-class="none">取消</button>
+    </navigator>
+    <button type="primary" size="mini" bindtap="get_user_info_event" class="margin-left-lg">同意授权登录</button>
+  </view>
 </view>
diff --git a/sourcecode/weixin/default/pages/login/login.wxss b/sourcecode/weixin/default/pages/login/login.wxss
index 343e0e160..f33dc75c3 100755
--- a/sourcecode/weixin/default/pages/login/login.wxss
+++ b/sourcecode/weixin/default/pages/login/login.wxss
@@ -58,9 +58,6 @@ page{
 .user-login {
   padding-top: 30%;
 }
-.user-login button {
-  margin-top: 30rpx;
-}
 
 /**
  * 登录确认