1.6

application/admin/view/default/appconfig/index.html

@@ -29,6 +29,14 @@
 					{{/foreach}}
 				</select>
 			</div>
+			<div class="am-form-group">
+				<label>{{$data.common_user_is_mandatory_bind_mobile.name}}<span class="am-form-group-label-tips">{{$data.common_user_is_mandatory_bind_mobile.describe}}</span></label>
+				<select name="{{$data.common_user_is_mandatory_bind_mobile.only_tag}}" class="am-radius chosen-select c-p" data-validation-message="{{$data.common_user_is_mandatory_bind_mobile.error_tips}}" required>
+					{{foreach $common_is_text_list as $v}}
+						<option value="{{$v.id}}" {{if isset($data['common_user_is_mandatory_bind_mobile']['value']) and $data['common_user_is_mandatory_bind_mobile']['value'] eq $v['id']}}selected{{/if}}>{{$v.name}}</option>
+					{{/foreach}}
+				</select>
+			</div>
 			<div class="am-form-group">
 				<label>{{$data.common_app_customer_service_tel.name}}</label>
 				<input type="text" name="{{$data.common_app_customer_service_tel.only_tag}}" placeholder="{{$data.common_app_customer_service_tel.name}}" data-validation-message="{{$data.common_app_customer_service_tel.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_app_customer_service_tel.value}}"{{/if}} />

application/api/controller/Goods.php

@@ -79,12 +79,16 @@ class Goods extends Common
             $search = [
                 '<img ',
                 '<section',
-                '/section>'
+                '/section>',
+                '<p>',
+                '<div>',
             ];
             $replace = [
                 '<img style="max-width:100%;margin:0;display:block;" ',
                 '<div',
                 '/div>',
+                '<p style="margin:0;">',
+                '<div style="margin:0;">',
             ];
             $ret['data'][0]['content_web'] = str_replace($search, $replace, $ret['data'][0]['content_web']);
         }

application/api/controller/User.php

@@ -76,7 +76,7 @@ class User extends Common
     }
 
     /**
-     * [GetAlipayUserInfo 获取支付宝用户信息]
+     * [GetAlipayUserInfo 支付宝用户授权]
      * @author   Devil
      * @blog     http://gong.gg/
      * @version  1.0.0
@@ -87,21 +87,82 @@ class User extends Common
         // 参数
         if(empty($this->data_post['authcode']))
         {
-            return DataReturn('授权码不能为空', -1);
+            return DataReturn('授权码为空', -1);
         }
 
         // 授权
-        $ret = (new \base\AlipayAuth())->GetAlipayUserInfo($this->data_post['authcode'], MyC('common_app_mini_alipay_appid'));
-        if($ret['status'] != 0)
+        $result = (new \base\AlipayAuth())->GetAuthCode(MyC('common_app_mini_alipay_appid'), $this->data_post['authcode']);
+        if($result['status'] == 0)
+        {
+            return DataReturn('授权登录成功', 0, $result['data']['user_id']);
+        }
+        return DataReturn($result['msg'], -100);
+
+
+
+
+        // // 参数
+        // if(empty($this->data_post['authcode']))
+        // {
+        //     return DataReturn('授权码不能为空', -1);
+        // }
+
+        // // 授权
+        // $ret = (new \base\AlipayAuth())->GetAuthCode($this->data_post['authcode'], MyC('common_app_mini_alipay_appid'));
+        // if($ret['status'] != 0)
+        // {
+        //     return DataReturn($ret['msg'], -10);
+        // } else {
+        //     $data = $ret['data'];
+        //     $data['gender'] = empty($data['gender']) ? 0 : ($data['gender'] == 'm') ? 2 : 1;
+        //     $data['openid'] = $data['user_id'];
+        //     $data['referrer']= isset($this->data_post['referrer']) ? $this->data_post['referrer'] : 0;
+        //     return UserService::AuthUserProgram($data, 'alipay_openid');
+        // }
+    }
+
+    /**
+     * 支付宝小程序获取用户信息
+     * @author   Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2018-11-06
+     * @desc    description
+     */
+    public function AlipayUserInfo()
+    {
+        // 参数校验
+        $p = [
+            [
+                'checked_type'      => 'empty',
+                'key_name'          => 'openid',
+                'error_msg'         => 'openid为空',
+            ],
+            [
+                'checked_type'      => 'empty',
+                'key_name'          => 'userinfo',
+                'error_msg'         => '用户数据为空',
+            ],
+        ];
+        $ret = ParamsChecked($this->data_post, $p);
+        if($ret !== true)
         {
-            return DataReturn($ret['msg'], -10);
+            return DataReturn($ret, -1);
+        }
+
+        // 先从数据库获取用户信息
+        $user = UserService::UserInfo('alipay_openid', $this->data_post['openid']);
+        if(empty($user))
+        {
+            $result = $this->data_post;
+            $result['nick_name'] = isset($result['nickName']) ? $result['nickName'] : '';
+            $result['gender'] = empty($result['gender']) ? 0 : ($result['gender'] == 'f') ? 1 : 2;
+            return UserService::AuthUserProgram($result, 'alipay_openid');
         } else {
-            $data = $ret['data'];
-            $data['gender'] = empty($data['gender']) ? 0 : ($data['gender'] == 'm') ? 2 : 1;
-            $data['openid'] = $data['user_id'];
-            $data['referrer']= isset($this->data_post['referrer']) ? intval($this->data_post['referrer']) : 0;
-            return UserService::AuthUserProgram($data, 'alipay_openid');
+            $user['is_mandatory_bind_mobile'] = intval(MyC('common_user_is_mandatory_bind_mobile'));
+            return DataReturn('授权成功', 0, $user);
         }
+        return DataReturn(empty($result) ? '获取用户信息失败' : $result, -100);
     }
 
     /**
@@ -179,6 +240,7 @@ class User extends Common
                 return UserService::AuthUserProgram($result, 'weixin_openid');
             }
         } else {
+            $user['is_mandatory_bind_mobile'] = intval(MyC('common_user_is_mandatory_bind_mobile'));
             return DataReturn('授权成功', 0, $user);
         }
         return DataReturn(empty($result) ? '获取用户信息失败' : $result, -100);
@@ -200,7 +262,7 @@ class User extends Common
         $result = (new \Library\BaiduAuth())->GetAuthUserInfo($_POST);
         if($result['status'] == 0)
         {
-            return UserService::AuthUserProgram($result, 'alipay_openid');
+            return UserService::AuthUserProgram($result, 'baidu_openid');
         }
         return DataReturn($result['msg'], -10);
     }

application/service/UserService.php

@@ -1587,21 +1587,39 @@ class UserService
      */
     public static function AuthUserProgram($params, $field)
     {
+        // 是否强制绑定手机号码
+        $is_mandatory_bind_mobile = intval(MyC('common_user_is_mandatory_bind_mobile'));
+
+        // 用户信息
         $data = [
             $field              => $params['openid'],
             'nickname'          => empty($params['nick_name']) ? '' : $params['nick_name'],
             'avatar'            => empty($params['avatar']) ? '' : $params['avatar'],
-            'gender'            => empty($params['gender']) ? 0 : ($params['gender'] == 'm') ? 2 : 1,
+            'gender'            => empty($params['gender']) ? 0 : intval($params['gender']),
             'province'          => empty($params['province']) ? '' : $params['province'],
             'city'              => empty($params['city']) ? '' : $params['city'],
-            'referrer'          => isset($params['referrer']) ? intval($params['referrer']) : 0,
+            'referrer'          => isset($params['referrer']) ? $params['referrer'] : 0,
         ];
         $user = self::UserInfo($field, $params['openid']);
         if(!empty($user))
         {
             $data = $user;
+        } else {
+            if($is_mandatory_bind_mobile != 1)
+            {
+                $ret = self::UserInsert($data, $params);
+                if($ret['code'] == 0)
+                {
+                    $data = self::UserInfo('id', $ret['data']['user_id']);
+                } else {
+                    return $ret;
+                }
+            }
         }
 
+        // 是否强制绑定手机号码
+        $data['is_mandatory_bind_mobile'] = $is_mandatory_bind_mobile;
+
         // 返回成功
         return DataReturn('授权成功', 0, $data);
     }

extend/base/AlipayAuth.php

@@ -93,7 +93,6 @@ class AlipayAuth
 
             // 执行请求
             $result = $this->HttpRequest('https://openapi.alipay.com/gateway.do', $param);
-
             if(!empty($result['alipay_user_info_share_response']['code']) && $result['alipay_user_info_share_response']['code'] == 10000)
             {
                 // 验证签名正确则存储缓存返回数据
@@ -110,6 +109,10 @@ class AlipayAuth
             }
 
             $msg = empty($result['error_response']['sub_msg']) ? '授权失败' : $result['error_response']['sub_msg'];
+            if(!empty($result['alipay_user_info_share_response']['sub_msg']))
+            {
+                $msg = $result['alipay_user_info_share_response']['sub_msg'];
+            }
             return ['status'=>-1, 'msg'=>$msg];
         } else {
             return $auth;
@@ -152,14 +155,12 @@ class AlipayAuth
      * @version  1.0.0
      * @datetime 2017-09-24T21:55:45+0800
      * @param    [string]            $app_id        [应用appid]
-     * @param    [string]            $key           [缓存key]
      * @param    [string]            $authcode      [用户授权码]
-     * @param    [string]            $refresh_token [刷新授权token]
      * @return   [array|boolean]                    [失败false, 用户授权信息]
      */
-    private function GetAuthCode($app_id, $key, $authcode = '', $refresh_token = '')
+    public function GetAuthCode($app_id, $authcode = '')
     {
-        if(empty($app_id) || empty($key) || (empty($authcode) && empty($refresh_token)))
+        if(empty($app_id) || empty($authcode))
         {
             return ['status'=>-1, 'msg'=>'参数有误'];
         }
@@ -173,18 +174,10 @@ class AlipayAuth
             'sign_type'         =>  'RSA2',
             'timestamp'         =>  date('Y-m-d H:i:s'),
             'version'           =>  '1.0',
+            'code'              =>  $authcode,
+            'grant_type'        =>  'authorization_code',
             'biz_content'       =>  'mini-authcode',
         ];
-        if(!empty($authcode))
-        {
-            $param['code'] = $authcode;
-            $param['grant_type'] = 'authorization_code';
-        }
-        if(!empty($refresh_token))
-        {
-            $param['refresh_token'] = $refresh_token;
-            $param['grant_type'] = 'refresh_token';
-        }
 
         // 生成签名参数+签名
         $p = $this->GetParamSign($param);
@@ -202,8 +195,6 @@ class AlipayAuth
                 return ['status'=>-1, 'msg'=>'签名验证失败'];
             }
 
-            // 存储缓存
-            SS($key, $result['alipay_system_oauth_token_response']);
             return ['status'=>0, 'msg'=>'success', 'data'=>$result['alipay_system_oauth_token_response']];
         }
         $msg = empty($result['error_response']['sub_msg']) ? '授权失败' : $result['error_response']['sub_msg'];

public/appmini/old/alipay/app.js

 App({
   data: {
+    // 用户登录缓存key
+    cache_user_login_key: "cache_user_login_key",
+
     // 用户信息缓存key
     cache_user_info_key: "cache_shop_user_info_key",
 
@@ -167,7 +170,7 @@ App({
     if (params != "" && params.substr(0, 1) != "&") {
       params = "&" + params;
     }
-    var user = this.GetUserCacheInfo();
+    var user = this.get_user_cache_info();
     var app_client_user_id = user == false ? "" : user.alipay_openid;
     var user_id = user == false ? 0 : user.id;
     return (
@@ -188,11 +191,11 @@ App({
    * method     回调操作对象的函数
    * return     有用户数据直接返回, 则回调调用者
    */
-  GetUserInfo(object, method) {
-    var user = this.GetUserCacheInfo();
+  get_user_info(object, method) {
+    var user = this.get_user_cache_info();
     if (user == false) {
       // 唤醒用户授权
-      this.UserAuthCode(object, method);
+      this.user_login(object, method);
 
       return false;
     } else {
@@ -203,7 +206,7 @@ App({
   /**
    * 从缓存获取用户信息
    */
-  GetUserCacheInfo() {
+  get_user_cache_info() {
     var user = my.getStorageSync({ key: this.data.cache_user_info_key });
     if ((user.data || null) == null) {
       return false;
@@ -215,8 +218,9 @@ App({
    * 用户授权
    * object     回调操作对象
    * method     回调操作对象的函数
+   * auth_data  授权数据
    */
-  UserAuthCode(object, method) {
+  user_login(object, method, auth_data) {
     // 邀请人参数
     var params = my.getStorageSync({key: this.data.cache_launch_info_key});
     var referrer = (params.data == null) ? 0 : (params.data.referrer || 0);
@@ -241,13 +245,13 @@ App({
               my.hideLoading();
               if (res.data.code == 0) {
                 my.setStorage({
-                  key: this.data.cache_user_info_key,
+                  key: this.data.cache_user_login_key,
                   data: res.data.data
                 });
-
-                if (typeof object === "object" && (method || null) != null) {
-                  object[method]();
-                }
+                
+                my.navigateTo({
+                  url: "/pages/login/login"
+                });
               } else {
                 my.showToast({
                   type: "fail",
@@ -280,6 +284,77 @@ App({
     });
   },
 
+  /**
+   * 用户登录
+   * object     回调操作对象
+   * method     回调操作对象的函数
+   * auth_data  授权数据
+   */
+  user_auth_login(object, method, auth_data) {
+    my.showLoading({ content: "授权中..." });
+    var openid = my.getStorageSync({key: this.data.cache_user_login_key});
+    if ((openid || null) == null)
+    {
+      this.user_login(object, method, auth_data);
+    } else {
+      this.get_user_login_info(object, method, openid, auth_data);
+    }
+  },
+
+  /**
+   * 获取用户授权信息
+   * object     回调操作对象
+   * method     回调操作对象的函数
+   * openid     用户openid
+   * auth_data  授权数据
+   */
+  get_user_login_info(object, method, openid, userinfo) {
+    // 远程解密数据
+    var $this = this;
+    my.request({
+      url: $this.get_request_url('alipayuserinfo', 'user'),
+      method: 'POST',
+      data: { userinfo: userinfo, openid: openid },
+      dataType: 'json',
+      header: { 'content-type': 'application/x-www-form-urlencoded' },
+      success: (res) => {
+        my.hideLoading();
+        if (res.data.code == 0) {
+          my.setStorage({
+            key: $this.data.cache_user_info_key,
+            data: res.data.data,
+            success: (res) => {
+              if (typeof object === 'object' && (method || null) != null) {
+                object[method]();
+              }
+            },
+            fail: () => {
+              my.showToast({
+                type: "fail",
+                content: "用户信息缓存失败",
+                duration: 3000
+              });
+            }
+          });
+        } else {
+          my.showToast({
+            type: "fail",
+            content: res.data.msg,
+            duration: 3000
+          });
+        }
+      },
+      fail: () => {
+        wx.hideLoading();
+        my.showToast({
+          type: "fail",
+          content: "服务器请求出错",
+          duration: 3000
+        });
+      },
+    });
+  },
+
   /**
    * 获取位置权限
    * object     回调操作对象
@@ -512,4 +587,20 @@ App({
         }
       }
     },
+
+  /**
+   * 是否需要绑定手机号码
+   */
+  user_is_need_login(user) {
+    // 是否需要绑定手机号码
+    if ((user.is_mandatory_bind_mobile || 0) == 1)
+    {
+      if ((user.mobile || null) == null)
+      {
+        return true;
+      }
+    }
+    return false;
+  },
+
 });

public/appmini/old/alipay/pages/answer-form/answer-form.js

@@ -16,10 +16,10 @@ Page({
 
   // 初始化
   init() {
-    var user = app.GetUserInfo(this, "init");
+    var user = app.get_user_info(this, "init");
     if (user != false) {
       // 用户未绑定用户则转到登录页面
-      if ((user.mobile || null) == null) {
+      if (app.user_is_need_login(user)) {
         my.redirectTo({
           url: "/pages/login/login?event_callback=init"
         });

public/appmini/old/alipay/pages/cart/cart.js

@@ -17,11 +17,11 @@ Page({
   },
 
   init(e) {
-    var user = app.GetUserInfo(this, "init");
+    var user = app.get_user_info(this, "init");
     if (user != false) {
       // 用户未绑定用户则转到登录页面
       var msg = (user == false) ? '授权用户信息' : '绑定手机号码';
-      if ((user.mobile || null) == null) {
+      if (app.user_is_need_login(user)) {
         my.confirm({
           title: '温馨提示',
           content: msg,

public/appmini/old/alipay/pages/goods-detail/goods-detail.js

@@ -103,14 +103,17 @@ Page({
               is_use_mobile_detail: data.is_use_mobile_detail || 0,
             });
 
-            parse(data.goods.content_web, (err, nodes) => {
-              if (!err) {
-                this.setData({
-                  'goods.content_web': nodes,
-                });
-                console.log(this.data.goods.content_web);
-              }
-            })
+            // web内容转化
+            if((data.goods.content_web || null) != null)
+            {
+              parse(data.goods.content_web, (err, nodes) => {
+                if (!err) {
+                  this.setData({
+                    'goods.content_web': nodes,
+                  });
+                }
+              });
+            }
 
             // 不能选择规格处理
             this.goods_specifications_choose_handle_dont(0);
@@ -223,10 +226,10 @@ Page({
   // 收藏事件
   goods_favor_event(e)
   {
-    var user = app.GetUserInfo(this, 'goods_favor_event');
+    var user = app.get_user_info(this, 'goods_favor_event');
     if (user != false) {
       // 用户未绑定用户则转到登录页面
-      if ((user.mobile || null) == null) {
+      if (app.user_is_need_login(user)) {
         my.navigateTo({
           url: "/pages/login/login?event_callback=init"
         });
@@ -275,10 +278,10 @@ Page({
 
   // 加入购物车事件
   goods_cart_event(e, spec) {
-    var user = app.GetUserInfo(this, 'goods_cart_event');
+    var user = app.get_user_info(this, 'goods_cart_event');
     if (user != false) {
       // 用户未绑定用户则转到登录页面
-      if ((user.mobile || null) == null) {
+      if (app.user_is_need_login(user)) {
         my.navigateTo({
           url: "/pages/login/login?event_callback=init"
         });
@@ -558,10 +561,10 @@ Page({
 
   // 确认
   goods_buy_confirm_event(e) {
-    var user = app.GetUserInfo(this, 'goods_buy_confirm_event');
+    var user = app.get_user_info(this, 'goods_buy_confirm_event');
     if (user != false) {
       // 用户未绑定用户则转到登录页面
-      if ((user.mobile || null) == null) {
+      if (app.user_is_need_login(user)) {
         my.navigateTo({
           url: "/pages/login/login?event_callback=init"
         });

public/appmini/old/alipay/pages/login/login.acss

@@ -46,4 +46,14 @@ page{
     bottom: 34rpx;
     height: 90rpx;
     line-height: 90rpx;
+}
+
+/**
+  授权登录
+*/
+.user-login {
+  padding-top: 30%;
+}
+.user-login button {
+  margin-top: 30rpx;
 }
\ No newline at end of file

public/appmini/old/alipay/pages/login/login.axml

-<view class="content">
+<view a:if="{{user != null}}" class="content">
   <form onSubmit="formSubmit">
     <input type="number" placeholder="输入手机号码" maxlength="11" name="mobile" onInput="bind_key_input" class="mobile" />
     <view class="code clearfix">
@@ -7,4 +7,9 @@
     </view>
     <button type="default" formType="submit" hover-class="none" plain loading="{{form_submit_loading}}" disabled="{{form_submit_loading}}" class="submit {{form_submit_loading ? 'my-btn-gray' : 'my-btn-default'}}">确认绑定</button>
   </form>
-</view>
+</view>
\ No newline at end of file
+
+<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>

public/appmini/old/alipay/pages/login/login.js

@@ -20,9 +20,44 @@ Page({
     my.setNavigationBar({title: '手机绑定'});
 
     // 设置用户信息
-    this.setData({params: option, user: app.GetUserCacheInfo()});
+    this.setData({params: option, user: app.get_user_cache_info() || null});
   },
 
+  /**
+   * 登录授权事件
+   */
+  get_user_info_event(e) {
+    this.user_auth_code(null, null, e.detail);
+  },
+
+  /**
+   * 用户授权
+   * object     回调操作对象
+   * method     回调操作对象的函数
+   * auth_data  授权数据
+   */
+  user_auth_code(object, method, auth_data) {
+    my.getOpenUserInfo({
+      success: (userinfo) => {
+        console.log(userinfo)
+        app.user_auth_login($this, 'user_auth_back_event', userinfo);
+      }
+    });
+  },
+
+  /**
+   * 授权返回事件
+   */
+  user_auth_back_event() {
+    var user = app.get_user_cache_info();
+    this.setData({user: user || null});
+    if (app.user_is_need_login(user) == false)
+    {
+      my.navigateBack();
+    }
+  },
+
+
   /**
    * 输入手机号码事件
    */

public/appmini/old/alipay/pages/message/message.js

@@ -14,10 +14,10 @@ Page({
   },
 
   init() {
-    var user = app.GetUserInfo(this, "init");
+    var user = app.get_user_info(this, "init");
     if (user != false) {
       // 用户未绑定用户则转到登录页面
-      if ((user.mobile || null) == null) {
+      if (app.user_is_need_login(user)) {
         my.redirectTo({
           url: "/pages/login/login?event_callback=init"
         });

public/appmini/old/alipay/pages/user-address-save/user-address-save.js

@@ -36,10 +36,10 @@ Page({
   },
 
   init() {
-    var user = app.GetUserInfo(this, "init");
+    var user = app.get_user_info(this, "init");
     if (user != false) {
       // 用户未绑定用户则转到登录页面
-      if ((user.mobile || null) == null) {
+      if (app.user_is_need_login(user)) {
         my.redirectTo({
           url: "/pages/login/login?event_callback=init"
         });

public/appmini/old/alipay/pages/user-address/user-address.js

@@ -19,10 +19,10 @@ Page({
 
   // 初始化
   init() {
-    var user = app.GetUserInfo(this, "init");
+    var user = app.get_user_info(this, "init");
     if (user != false) {
       // 用户未绑定用户则转到登录页面
-      if ((user.mobile || null) == null) {
+      if (app.user_is_need_login(user)) {
         my.redirectTo({
           url: "/pages/login/login?event_callback=init"
         });

public/appmini/old/alipay/pages/user-answer-list/user-answer-list.js

@@ -16,10 +16,10 @@ Page({
   },
 
   init() {
-    var user = app.GetUserInfo(this, "init");
+    var user = app.get_user_info(this, "init");
     if (user != false) {
       // 用户未绑定用户则转到登录页面
-      if ((user.mobile || null) == null) {
+      if (app.user_is_need_login(user)) {
         my.redirectTo({
           url: "/pages/login/login?event_callback=init"
         });

public/appmini/old/alipay/pages/user-faovr/user-faovr.js

@@ -14,10 +14,10 @@ Page({
   },
 
   init() {
-    var user = app.GetUserInfo(this, "init");
+    var user = app.get_user_info(this, "init");
     if (user != false) {
       // 用户未绑定用户则转到登录页面
-      if ((user.mobile || null) == null) {
+      if (app.user_is_need_login(user)) {
         my.redirectTo({
           url: "/pages/login/login?event_callback=init"
         });

public/appmini/old/alipay/pages/user-goods-browse/user-goods-browse.js

@@ -14,10 +14,10 @@ Page({
   },
 
   init() {
-    var user = app.GetUserInfo(this, "init");
+    var user = app.get_user_info(this, "init");
     if (user != false) {
       // 用户未绑定用户则转到登录页面
-      if ((user.mobile || null) == null) {
+      if (app.user_is_need_login(user)) {
         my.redirectTo({
           url: "/pages/login/login?event_callback=init"
         });

public/appmini/old/alipay/pages/user-integral/user-integral.js

@@ -14,10 +14,10 @@ Page({
   },
 
   init() {
-    var user = app.GetUserInfo(this, "init");
+    var user = app.get_user_info(this, "init");
     if (user != false) {
       // 用户未绑定用户则转到登录页面
-      if ((user.mobile || null) == null) {
+      if (app.user_is_need_login(user)) {
         my.redirectTo({
           url: "/pages/login/login?event_callback=init"
         });

public/appmini/old/alipay/pages/user-order/user-order.js

@@ -49,10 +49,10 @@ Page({
   },
 
   init() {
-    var user = app.GetUserInfo(this, "init");
+    var user = app.get_user_info(this, "init");
     if (user != false) {
       // 用户未绑定用户则转到登录页面
-      if ((user.mobile || null) == null) {
+      if (app.user_is_need_login(user)) {
         my.redirectTo({
           url: "/pages/login/login?event_callback=init"
         });

public/appmini/old/alipay/pages/user/user.js

@@ -52,12 +52,12 @@ Page({
   },
 
   init(e) {
-    var user = app.GetUserInfo(this, "init"),
+    var user = app.get_user_info(this, "init"),
       self = this;
     if (user != false) {
       // 用户未绑定用户则转到登录页面
       var msg = (user == false) ? '授权用户信息' : '绑定手机号码';
-      if ((user.mobile || null) == null) {
+      if (app.user_is_need_login(user)) {
         my.confirm({
           title: '温馨提示',
           content: msg,

public/appmini/old/weixin/app.js

@@ -487,6 +487,29 @@ App({
         duration: 3000
       });
     }
+  },
+
+  /**
+   * 是否需要登录
+   * 是否需要绑定手机号码
+   */
+  user_is_need_login(user) {
+    // 用户信息是否正确
+    if (user == false)
+    {
+      return true;
+    }
+
+    // 是否需要绑定手机号码
+    if ((user.is_mandatory_bind_mobile || 0) == 1)
+    {
+      if ((user.mobile || null) == null)
+      {
+        return true;
+      }
+    }
+    
+    return false;
   }
 
 });
\ No newline at end of file

public/appmini/old/weixin/pages/answer-form/answer-form.js

@@ -15,7 +15,7 @@ Page({
   init() {
     var user = app.get_user_cache_info(this, "init");
     // 用户未绑定用户则转到登录页面
-    if (user == false || ((user.mobile || null) == null)) {
+    if (app.user_is_need_login(user)) {
       wx.redirectTo({
         url: "/pages/login/login?event_callback=init"
       });

public/appmini/old/weixin/pages/cart/cart.js

@@ -20,7 +20,7 @@ Page({
     var user = app.get_user_cache_info(this, "init");
     // 用户未绑定用户则转到登录页面
     var msg = (user == false) ? '授权用户信息' : '绑定手机号码';
-    if (user == false || ((user.mobile || null) == null)) {
+    if (app.user_is_need_login(user)) {
       wx.showModal({
         title: '温馨提示',
         content: msg,

public/appmini/old/weixin/pages/goods-detail/goods-detail.js

@@ -213,7 +213,7 @@ Page({
   {
     var user = app.get_user_cache_info(this, 'goods_favor_event');
     // 用户未绑定用户则转到登录页面
-    if (user == false || (user.mobile || null) == null) {
+    if (app.user_is_need_login(user)) {
       wx.navigateTo({
         url: "/pages/login/login?event_callback=init"
       });
@@ -254,7 +254,7 @@ Page({
   goods_cart_event(e, spec) {
     var user = app.get_user_cache_info(this, 'goods_cart_event');
     // 用户未绑定用户则转到登录页面
-    if (user == false || (user.mobile || null) == null) {
+    if (app.user_is_need_login(user)) {
       wx.navigateTo({
         url: "/pages/login/login?event_callback=init"
       });
@@ -514,7 +514,7 @@ Page({
   goods_buy_confirm_event(e) {
     var user = app.get_user_cache_info(this, 'goods_buy_confirm_event');
     // 用户未绑定用户则转到登录页面
-    if (user == false || (user.mobile || null) == null) {
+    if (app.user_is_need_login(user)) {
       wx.navigateTo({
         url: "/pages/login/login?event_callback=init"
       });

public/appmini/old/weixin/pages/login/login.js

@@ -60,10 +60,9 @@ Page({
    * 授权返回事件
    */
   user_auth_back_event() {
-    this.setData({
-      user: app.get_user_cache_info() || null
-    });
-    if((this.data.user.mobile || null) != null)
+    var user = app.get_user_cache_info();
+    this.setData({user: user || null});
+    if (app.user_is_need_login(user) == false)
     {
       wx.navigateBack();
     }

public/appmini/old/weixin/pages/login/login.wxml

@@ -9,7 +9,7 @@
   </form>
 </view>
 
-<view wx:if="{{user == null}}" class="wx-login tc">
+<view wx: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>

public/appmini/old/weixin/pages/login/login.wxss

@@ -55,9 +55,9 @@ page{
 /**
   授权登录
 */
-.wx-login {
+.user-login {
   padding-top: 30%;
 }
-.wx-login button {
+.user-login button {
   margin-top: 30rpx;
 }
\ No newline at end of file

public/appmini/old/weixin/pages/message/message.js

@@ -16,7 +16,7 @@ Page({
   init() {
     var user = app.get_user_cache_info(this, "init");
     // 用户未绑定用户则转到登录页面
-    if (user == false || ((user.mobile || null) == null)) {
+    if (app.user_is_need_login(user)) {
       wx.redirectTo({
         url: "/pages/login/login?event_callback=init"
       });

public/appmini/old/weixin/pages/user-address-save/user-address-save.js

@@ -39,7 +39,7 @@ Page({
   init() {
     var user = app.get_user_cache_info(this, "init");
     // 用户未绑定用户则转到登录页面
-    if (user == false || ((user.mobile || null) == null)) {
+    if (app.user_is_need_login(user)) {
       wx.redirectTo({
         url: "/pages/login/login?event_callback=init"
       });

public/appmini/old/weixin/pages/user-answer-list/user-answer-list.js

@@ -18,7 +18,7 @@ Page({
   init() {
     var user = app.get_user_cache_info(this, "init");
     // 用户未绑定用户则转到登录页面
-    if (user == false || ((user.mobile || null) == null)) {
+    if (app.user_is_need_login(user)) {
       wx.redirectTo({
         url: "/pages/login/login?event_callback=init"
       });

public/appmini/old/weixin/pages/user-faovr/user-faovr.js

@@ -16,7 +16,7 @@ Page({
   init() {
     var user = app.get_user_cache_info(this, "init");
     // 用户未绑定用户则转到登录页面
-    if (user == false || ((user.mobile || null) == null)) {
+    if (app.user_is_need_login(user)) {
       wx.redirectTo({
         url: "/pages/login/login?event_callback=init"
       });

public/appmini/old/weixin/pages/user-goods-browse/user-goods-browse.js

@@ -16,7 +16,7 @@ Page({
   init() {
     var user = app.get_user_cache_info(this, "init");
     // 用户未绑定用户则转到登录页面
-    if (user == false || ((user.mobile || null) == null)) {
+    if (app.user_is_need_login(user)) {
       wx.redirectTo({
         url: "/pages/login/login?event_callback=init"
       });

public/appmini/old/weixin/pages/user-integral/user-integral.js

@@ -16,7 +16,7 @@ Page({
   init() {
     var user = app.get_user_cache_info(this, "init");
     // 用户未绑定用户则转到登录页面
-    if (user == false || ((user.mobile || null) == null)) {
+    if (app.user_is_need_login(user)) {
       wx.redirectTo({
         url: "/pages/login/login?event_callback=init"
       });

public/appmini/old/weixin/pages/user-order/user-order.js

@@ -51,7 +51,7 @@ Page({
   init() {
     var user = app.get_user_cache_info(this, "init");
     // 用户未绑定用户则转到登录页面
-    if (user == false || ((user.mobile || null) == null)) {
+    if (app.user_is_need_login(user)) {
       wx.redirectTo({
         url: "/pages/login/login?event_callback=init"
       });

public/appmini/old/weixin/pages/user/user.js

@@ -56,7 +56,7 @@ Page({
         self = this;
     // 用户未绑定用户则转到登录页面
     var msg = (user == false) ? '授权用户信息' : '绑定手机号码';
-    if (user == false || ((user.mobile || null) == null)) {
+    if (app.user_is_need_login(user)) {
       wx.showModal({
         title: '温馨提示',
         content: msg,