From a9bf0763c7ca865adffbb2c742dc23f603035a2b Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Fri, 28 Jun 2019 23:10:59 +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 --- application/service/UserService.php | 2 +- public/appmini/old/alipay/app.js | 28 ++++++++++++------- public/appmini/old/alipay/pages/cart/cart.js | 4 +-- .../pages/goods-category/goods-category.json | 5 +--- .../appmini/old/alipay/pages/index/index.acss | 4 +-- .../appmini/old/alipay/pages/login/login.js | 7 +++-- public/appmini/old/alipay/pages/user/user.js | 3 +- public/appmini/old/weixin/app.js | 13 +++++++-- .../appmini/old/weixin/pages/index/index.wxss | 4 +-- .../appmini/old/weixin/pages/login/login.js | 7 +++-- 10 files changed, 48 insertions(+), 29 deletions(-) mode change 100755 => 100644 public/appmini/old/alipay/pages/cart/cart.js mode change 100755 => 100644 public/appmini/old/alipay/pages/goods-category/goods-category.json mode change 100755 => 100644 public/appmini/old/alipay/pages/user/user.js diff --git a/application/service/UserService.php b/application/service/UserService.php index 51c0a5960..ff33c05c8 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -1832,7 +1832,7 @@ class UserService } } else { $data['upd_time'] = time(); - if(Db::name('User')->where($where)->update($data)) + if(Db::name('User')->where(['id'=>$temp_user['id']])->update($data)) { $user_id = $temp_user['id']; } diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js index 1b1ffe9d1..1adc45243 100644 --- a/public/appmini/old/alipay/app.js +++ b/public/appmini/old/alipay/app.js @@ -222,11 +222,7 @@ App({ * auth_data 授权数据 */ 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); var $this = this; - // 加载loding my.showLoading({ content: "授权中..." }); @@ -238,10 +234,7 @@ App({ my.request({ url: $this.get_request_url("alipayuserauth", "user"), method: "POST", - data: { - authcode: res.authCode, - referrer: referrer - }, + data: {authcode: res.authCode}, dataType: "json", headers: { 'content-type': 'application/x-www-form-urlencoded' }, success: res => { @@ -252,8 +245,18 @@ App({ data: res.data.data }); - my.navigateTo({ - url: "/pages/login/login" + my.confirm({ + title: '温馨提示', + content: '授权用户信息', + confirmButtonText: '确认', + cancelButtonText: '暂不', + success: (result) => { + if (result.confirm) { + my.navigateTo({ + url: "/pages/login/login" + }); + } + } }); } else { my.showToast({ @@ -309,9 +312,14 @@ App({ * auth_data 授权数据 */ get_user_login_info(object, method, openid, userinfo) { + // 邀请人参数 + var params = my.getStorageSync({key: this.data.cache_launch_info_key}); + + // 请求数据 my.showLoading({ content: "授权中..." }); var $this = this; userinfo['openid'] = openid; + userinfo['referrer'] = (params.data == null) ? 0 : (params.data.referrer || 0); my.request({ url: $this.get_request_url('alipayuserinfo', 'user'), method: 'POST', diff --git a/public/appmini/old/alipay/pages/cart/cart.js b/public/appmini/old/alipay/pages/cart/cart.js old mode 100755 new mode 100644 index e5d482fc8..dae0e4b31 --- a/public/appmini/old/alipay/pages/cart/cart.js +++ b/public/appmini/old/alipay/pages/cart/cart.js @@ -18,13 +18,13 @@ Page({ init(e) { var user = app.get_user_info(this, "init"); + console.log(user) if (user != false) { // 用户未绑定用户则转到登录页面 - var msg = (user == false) ? '授权用户信息' : '绑定手机号码'; if (app.user_is_need_login(user)) { my.confirm({ title: '温馨提示', - content: msg, + content: '绑定手机号码', confirmButtonText: '确认', cancelButtonText: '暂不', success: (result) => { diff --git a/public/appmini/old/alipay/pages/goods-category/goods-category.json b/public/appmini/old/alipay/pages/goods-category/goods-category.json old mode 100755 new mode 100644 index d381efdd2..ed3a57db1 --- a/public/appmini/old/alipay/pages/goods-category/goods-category.json +++ b/public/appmini/old/alipay/pages/goods-category/goods-category.json @@ -1,6 +1,3 @@ { - "usingComponents": { - "vtabs": "mini-antui/es/vtabs/index", - "vtab-content": "mini-antui/es/vtabs/vtab-content/index" - } + "pullRefresh": true } \ No newline at end of file diff --git a/public/appmini/old/alipay/pages/index/index.acss b/public/appmini/old/alipay/pages/index/index.acss index b1051a2df..44e9d5df1 100644 --- a/public/appmini/old/alipay/pages/index/index.acss +++ b/public/appmini/old/alipay/pages/index/index.acss @@ -34,7 +34,7 @@ position: relative; } .floor-list .word { - padding: 20rpx 20rpx 0 20rpx; + padding: 30rpx 20rpx 0 20rpx; } .floor-list .word .vice-name { color: #fff; @@ -45,7 +45,7 @@ -webkit-line-clamp: 3; -webkit-box-orient: vertical; text-align: center; - padding: 20rpx; + padding: 30rpx; } .floor-list .word .word-icon { margin: 10rpx; diff --git a/public/appmini/old/alipay/pages/login/login.js b/public/appmini/old/alipay/pages/login/login.js index 758976045..3936d7d7c 100644 --- a/public/appmini/old/alipay/pages/login/login.js +++ b/public/appmini/old/alipay/pages/login/login.js @@ -133,7 +133,10 @@ Page({ * 表单提交 */ formSubmit(e) - { + { + // 邀请人参数 + var params = my.getStorageSync({key: this.data.cache_launch_info_key}); + // 数据验证 var validation = [ {fields: 'mobile', msg: '请填写手机号码'}, @@ -146,8 +149,8 @@ Page({ e.detail.value['province'] = this.data.user.province; e.detail.value['city'] = this.data.user.city; e.detail.value['gender'] = this.data.user.gender; - e.detail.value['referrer'] = this.data.user.referrer; e.detail.value['app_type'] = 'alipay'; + e.detail.value['referrer'] = (params.data == null) ? (this.data.user.referrer || 0) : (params.data.referrer || 0); if(app.fields_check(e.detail.value, validation)) { my.showLoading({content: '处理中...'}); diff --git a/public/appmini/old/alipay/pages/user/user.js b/public/appmini/old/alipay/pages/user/user.js old mode 100755 new mode 100644 index 7545d4c63..c872adcff --- a/public/appmini/old/alipay/pages/user/user.js +++ b/public/appmini/old/alipay/pages/user/user.js @@ -56,11 +56,10 @@ Page({ self = this; if (user != false) { // 用户未绑定用户则转到登录页面 - var msg = (user == false) ? '授权用户信息' : '绑定手机号码'; if (app.user_is_need_login(user)) { my.confirm({ title: '温馨提示', - content: msg, + content: '绑定手机号码', confirmButtonText: '确认', cancelButtonText: '暂不', success: (result) => { diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index 52b340553..4a4590310 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -265,12 +265,21 @@ App({ * auth_data 授权数据 */ get_user_login_info(object, method, openid, auth_data) { - var $this = this; + // 邀请人参数 + var params = my.getStorageSync(this.data.cache_launch_info_key); + var referrer = (params.data == null) ? 0 : (params.data.referrer || 0); + // 远程解密数据 + var $this = this; wx.request({ url: $this.get_request_url('wechatuserinfo', 'user'), method: 'POST', - data: { encrypted_data: auth_data.encryptedData, iv: auth_data.iv, openid: openid }, + data: { + "encrypted_data": auth_data.encryptedData, + "iv": auth_data.iv, + "openid": openid, + "referrer": referrer + }, dataType: 'json', header: { 'content-type': 'application/x-www-form-urlencoded' }, success: (res) => { diff --git a/public/appmini/old/weixin/pages/index/index.wxss b/public/appmini/old/weixin/pages/index/index.wxss index b1051a2df..44e9d5df1 100755 --- a/public/appmini/old/weixin/pages/index/index.wxss +++ b/public/appmini/old/weixin/pages/index/index.wxss @@ -34,7 +34,7 @@ position: relative; } .floor-list .word { - padding: 20rpx 20rpx 0 20rpx; + padding: 30rpx 20rpx 0 20rpx; } .floor-list .word .vice-name { color: #fff; @@ -45,7 +45,7 @@ -webkit-line-clamp: 3; -webkit-box-orient: vertical; text-align: center; - padding: 20rpx; + padding: 30rpx; } .floor-list .word .word-icon { margin: 10rpx; diff --git a/public/appmini/old/weixin/pages/login/login.js b/public/appmini/old/weixin/pages/login/login.js index bc57d9a5b..a95f05bb2 100755 --- a/public/appmini/old/weixin/pages/login/login.js +++ b/public/appmini/old/weixin/pages/login/login.js @@ -133,7 +133,10 @@ Page({ * 表单提交 */ formSubmit(e) - { + { + // 邀请人参数 + var params = my.getStorageSync(this.data.cache_launch_info_key); + // 数据验证 var validation = [ {fields: 'mobile', msg: '请填写手机号码'}, @@ -146,8 +149,8 @@ Page({ e.detail.value['province'] = this.data.user.province; e.detail.value['city'] = this.data.user.city; e.detail.value['gender'] = this.data.user.gender; - e.detail.value['referrer'] = this.data.user.referrer; e.detail.value['app_type'] = 'weixin'; + e.detail.value['referrer'] = (params.data == null) ? (this.data.user.referrer || 0) : (params.data.referrer || 0); if(app.fields_check(e.detail.value, validation)) { wx.showLoading({title: '处理中...'}); -- GitLab