From 45f42201c8c493b0cfbcdc9342f9f9025406a856 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Fri, 28 Jun 2019 18:34:05 +0800
Subject: [PATCH] 1.6

---
 application/service/UserService.php                       | 8 ++++++--
 .../appmini/old/alipay/pages/goods-detail/goods-detail.js | 3 +++
 public/appmini/old/weixin/app.js                          | 2 +-
 .../appmini/old/weixin/pages/goods-detail/goods-detail.js | 3 +++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/application/service/UserService.php b/application/service/UserService.php
index 7737c656d..51c0a5960 100755
--- a/application/service/UserService.php
+++ b/application/service/UserService.php
@@ -1791,8 +1791,12 @@ class UserService
         );
 
         // 获取用户信息
-        $where = ['mobile'=>$data['mobile'], 'is_delete_time'=>0];
-        $temp_user = Db::name('User')->where($where)->find();
+        $where = ['is_delete_time' => 0];
+        $accounts_where = [
+            ['mobile', '=', $data['mobile']],
+            [$accounts_field, '=', $params[$accounts_field]],
+        ];
+        $temp_user = Db::name('User')->where($where)->whereOr($accounts_where)->find();
 
         // 额外信息
         if(empty($temp_user['nickname']) && !empty($params['nickname']))
diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
index 1e5837254..26be83d48 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
@@ -104,6 +104,9 @@ Page({
               is_use_mobile_detail: data.is_use_mobile_detail || 0,
             });
 
+            // 标题
+            my.setNavigationBar({title: data.goods.title});
+
             // web内容转化
             if((data.goods.content_web || null) != null)
             {
diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js
index 6bf1c1791..52b340553 100755
--- a/public/appmini/old/weixin/app.js
+++ b/public/appmini/old/weixin/app.js
@@ -61,7 +61,7 @@ App({
     // 请求地址
     // request_url: "{{request_url}}",
     request_url: 'http://tp5-dev.com/',
-    //request_url: 'https://test.shopxo.net/',
+    request_url: 'https://test.shopxo.net/',
 
     // 基础信息
     application_title: "{{application_title}}",
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
index 738cc4e60..52ec52847 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
@@ -104,6 +104,9 @@ Page({
               is_use_mobile_detail: data.is_use_mobile_detail || 0,
             });
 
+            // 标题
+            wx.setNavigationBarTitle({ title: data.goods.title });
+
             // 不能选择规格处理
             this.goods_specifications_choose_handle_dont(0);
 
-- 
GitLab