From d17ac6727f04a983b6c1c845ab1c401297243ac0 Mon Sep 17 00:00:00 2001
From: lqmac <lqmac@qq.com>
Date: Wed, 13 Mar 2024 20:53:29 +0800
Subject: [PATCH] 1

---
 .gitignore                                            | 3 ++-
 application/database.php                              | 2 +-
 application/merchant/view/special/task/add_source.php | 1 +
 application/wap/model/special/Lecturer.php            | 2 +-
 application/wap/model/special/LecturerInstitution.php | 2 +-
 application/wap/model/store/StoreCart.php             | 2 +-
 application/web/model/special/Lecturer.php            | 2 +-
 extend/basic/WapBasic.php                             | 7 +++++--
 8 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0df477fb..1c975851 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@
 /.env
 *.pid
 /public/public/qrcode
-/vendor/workerman/_www_wwwroot_zhishi.tczxkj.com_think.pid
\ No newline at end of file
+/vendor/workerman/_www_wwwroot_zhishi.tczxkj.com_think.pid
+sftp-config.json
\ No newline at end of file
diff --git a/application/database.php b/application/database.php
index 75b460b2..25d468e2 100755
--- a/application/database.php
+++ b/application/database.php
@@ -32,7 +32,7 @@ return [
     // 数据库表前缀
     'prefix'          => 'tc_',
     // 数据库调试模式
-    'debug'           => false,
+    'debug'           => true,
     // 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器)
     'deploy'          => 0,
     // 数据库读写是否分离 主从式有效
diff --git a/application/merchant/view/special/task/add_source.php b/application/merchant/view/special/task/add_source.php
index 5015f87a..091bd1bf 100755
--- a/application/merchant/view/special/task/add_source.php
+++ b/application/merchant/view/special/task/add_source.php
@@ -397,6 +397,7 @@
                 },
                 confirmAdd: function () {
                     if (this.link) {
+                        var that = this;
                         if (/^https?:\/\/(.+\/)+.+(\.(m3u8|mp4|mp3))$/i.test(this.link)) {
                             that.is_upload = true;
                             that.uploadVideo();
diff --git a/application/wap/model/special/Lecturer.php b/application/wap/model/special/Lecturer.php
index 4fe15b0f..7150c4d4 100755
--- a/application/wap/model/special/Lecturer.php
+++ b/application/wap/model/special/Lecturer.php
@@ -67,7 +67,7 @@ class Lecturer extends ModelBasic
         if (!$mer_id) return null;
         $lecturer_id = Merchant::where('id', $mer_id)->value('lecturer_id');
         $details = self::where(['is_del' => 0, 'is_show' => 1])->where('id', $lecturer_id)
-            ->field('id,lecturer_name,lecturer_head,label')->find();
+            ->field('id,lecturer_name,lecturer_head,label,introduction,explain')->find();
         if ($details) {
             $details['label'] = json_decode($details['label']);
             return $details;
diff --git a/application/wap/model/special/LecturerInstitution.php b/application/wap/model/special/LecturerInstitution.php
index ded3e01c..adc0c43d 100755
--- a/application/wap/model/special/LecturerInstitution.php
+++ b/application/wap/model/special/LecturerInstitution.php
@@ -67,7 +67,7 @@ class LecturerInstitution extends ModelBasic
         if (!$mer_id) return null;
         $lecturer_id = Institution::where('id', $mer_id)->value('lecturer_id');
         $details = self::where(['is_del' => 0, 'is_show' => 1])->where('id', $lecturer_id)
-            ->field('id,lecturer_name,lecturer_head,label')->find();
+            ->field('id,lecturer_name,lecturer_head,label,introduction')->find();
         if ($details) {
             $details['label'] = json_decode($details['label']);
             return $details;
diff --git a/application/wap/model/store/StoreCart.php b/application/wap/model/store/StoreCart.php
index fe5e2209..849e45d0 100755
--- a/application/wap/model/store/StoreCart.php
+++ b/application/wap/model/store/StoreCart.php
@@ -122,7 +122,7 @@ class StoreCart extends ModelBasic
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function getUserProductCartList($uid, $cartIds = '', $status = 0, $is_vip)
+    public static function getUserProductCartList($uid, $cartIds = '', $status = 0, $is_vip = 0)
     {
         $productInfoField = 'id,image,slider_image,price,cost,ot_price,vip_price,postage,mer_id,give_gold_num,free_shipping,cate_id,sales,stock,store_name,unit_name,is_show,is_del,is_postage';
         $model = new self();
diff --git a/application/web/model/special/Lecturer.php b/application/web/model/special/Lecturer.php
index e33737f2..9c14d066 100755
--- a/application/web/model/special/Lecturer.php
+++ b/application/web/model/special/Lecturer.php
@@ -67,7 +67,7 @@ class Lecturer extends ModelBasic
     {
         $lecturer_id = Merchant::where('id', $mer_id)->value('lecturer_id');
         $details = self::where(['is_del' => 0, 'is_show' => 1])->where('id', $lecturer_id)
-            ->field('id,lecturer_name,lecturer_head,label,explain')->find();
+            ->field('id,lecturer_name,lecturer_head,label,explain,introduction')->find();
         if ($details) {
             $details['label'] = json_decode($details['label']);
             return $details;
diff --git a/extend/basic/WapBasic.php b/extend/basic/WapBasic.php
index 55e58a83..e50dc6cd 100755
--- a/extend/basic/WapBasic.php
+++ b/extend/basic/WapBasic.php
@@ -241,8 +241,11 @@ class WapBasic extends Controller
             ['currentAvatar', ''],
         ], $request, true);
 
-        if (!$ucode)
-            throw new ValidateException('授权失败,参数有误');
+        if (!$ucode){
+            return;
+        }
+        //throw new ValidateException('授权失败,参数有误');
+        
         try {
             $userInfoCong = MiniProgramService::getUserInfo($ucode);
             $session_key = $userInfoCong['session_key'];