V1.4.18

yiqing-95 · Feb 28, 2023 · 3f8cfbd · 3f8cfbd
1 parent 41675c7
commit 3f8cfbd
Show file tree

Hide file tree

Showing 91 changed files with 209 additions and 55 deletions.
diff --git a/applet/app.zip b/applet/app.zip
diff --git a/components/ComPromoter.php b/components/ComPromoter.php
@@ -201,10 +201,12 @@ public function setLevel($uid_list, $type)
         if (!empty($check_list)) {
             $level1_data = [];
             foreach ($check_list as $value) {
-                array_push($level1_data, $value['UID']);
-                if ($value['level'] != 1) {
-                    $type = 2;
-                    array_push($log_row, [$value['UID'],$value['level'],$level_name[$value['level']]['name'],1,$level_name[1]['name'],$type,$time]);
+                if ($value['start_level'] == 1) {
+                    array_push($level1_data, $value['UID']);
+                    if ($value['level'] != 1) {
+                        $type = 2;
+                        array_push($log_row, [$value['UID'],$value['level'],$level_name[$value['level']]['name'],1,$level_name[1]['name'],$type,$time]);
+                    }
                 }
             }
             //最后都没有找到符合的,等级归为初始1级

diff --git a/modules/setting/app/IndexController.php b/modules/setting/app/IndexController.php
@@ -50,8 +50,12 @@ public function actionDelete()
     public function actionIndex()
     {
         $data = StoreSetting();
+        $privateKey = ['sms_setting', 'crontab_access_token', 'apikey_99', 'kb_express_setting', 'storage_setting', 'mysql_version', 'leadshop_identified_by'];
         $new_data = [];
-        foreach ($data as $value) {
+        foreach ($data as $key => $value) {
+            if (in_array($key, $privateKey)) {
+                continue;
+            }
             $new_data[$value['keyword']] = str2url($value['content']);
         }
         return $new_data;

diff --git a/modules/users/app/LoginController.php b/modules/users/app/LoginController.php
@@ -60,9 +60,15 @@ public function actionCreateorupdate()
         if (!$user->nickname) {
             $user->nickname = '用户_' . mt_rand(10000,99999);
         }
+        if (isset($userInfo->nickname) && !empty($userInfo->nickname)) {
+            $user->nickname = $userInfo->nickname;
+        }
         if (!$user->avatar) {
             $user->avatar = \Yii::$app->request->hostInfo . \Yii::$app->request->baseUrl . '/static/images/user-default-avatar.png';
         }
+        if (isset($userInfo->avatar) && !empty($userInfo->avatar)) {
+            $user->avatar = $userInfo->avatar;
+        }
         $user->gender   = 0;
         $user->AppID    = \Yii::$app->params['AppID'];
         if (!$user->save()) {

diff --git a/sql.txt b/sql.txt
@@ -1 +1 @@
-ALTER TABLE `heshop_initialize_prefix_user` ADD COLUMN `is_edit` tinyint(1) NOT NULL DEFAULT 1 COMMENT '0:未编辑 1:已编辑' AFTER `wechat`;
+ALTER TABLE `heshop_initialize_prefix_task_user` ADD INDEX `uid`(`UID`);
diff --git a/views/admin/css/goods/createGoods.d48ec978.css b/views/admin/css/goods/createGoods.d48ec978.css
diff --git a/views/admin/index.html b/views/admin/index.html
diff --git a/views/admin/js/app.9e66fa0e.js b/views/admin/js/app.9e66fa0e.js
diff --git a/views/admin/js/channel/appletsInfo.737ecba1.js b/views/admin/js/channel/appletsInfo.737ecba1.js
diff --git a/views/admin/js/channel/appletsPay.15e976a4.js b/views/admin/js/channel/appletsPay.15e976a4.js
diff --git a/views/admin/js/channel/weChatDeploy.e5464f4f.js b/views/admin/js/channel/weChatDeploy.e5464f4f.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ALTER TABLE `heshop_initialize_prefix_user` ADD COLUMN `is_edit` tinyint(1) NOT NULL DEFAULT 1 COMMENT '0:未编辑 1:已编辑' AFTER `wechat`;
		ALTER TABLE `heshop_initialize_prefix_task_user` ADD INDEX `uid`(`UID`);