Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/stock_new into dev

application/admin/controller/Config.php

@@ -170,7 +170,7 @@ class Config extends Admin
             $config  = ConfigModel::where('id', $id)->find();
             $details = '原数据：分组('.$config['group'].')、类型('.$config['type'].')、标题('.$config['title'].')、名称('.$config['name'].')';
 
-            if ($config == ConfigModel::update($data)) {
+            if (ConfigModel::update($data)) {
                 cache('system_config', null);
                 $forward = $this->request->param('_pop') == 1 ? null : cookie('__forward__');
                 // 记录行为

application/config.php

@@ -54,7 +54,7 @@ return [
     // +----------------------------------------------------------------------
 
     // 应用调试模式
-    'app_debug'              => ture,
+    'app_debug'              => true,
     // 应用Trace
     'app_trace'              => false,
     // 应用模式状态

application/market/home/Index.php

@@ -82,6 +82,7 @@ class Index extends Common
     {
         $req = request();
         $code = $req::instance()->param('code');
+        $uid = $req::instance()->param('uid');
         if ($code === null) {
             return json(['data' => null, 'status' => 0, 'message' => '缺少参数code，操作失败']);
         }
@@ -92,6 +93,13 @@ class Index extends Common
         $p_range = $data['currency'] - $data['yesterday_price'];
         $data['price_range'] = round($p_range,2);
         $data['price_rate'] = round(($p_range/$data['yesterday_price']*100),2);
+        $self = new StockSubAccountSelf();
+        $ret = $self->myadd($uid, $code);//查找是否存在
+        if ($ret) {
+            $data['myselect'] = 1;
+        }else{
+            $data['myselect'] = 0;
+        }
 
         return json(['data' => $data, 'status' => 1, 'message' => '操作成功']);
 

application/money/model/Recharge.php

@@ -86,7 +86,8 @@ class Recharge extends Model
                         /*$content = \think\Config::get('sms_template')['stock_offline_auditing_success'];
                         $content = str_replace(array("#var#","#amount#"),array($user_mobile,money_convert($charge['money'])), $content);
                         $res = sendsms_mandao('',$content,'');*/
-                        self::sms_recharge('stock_offline_auditing_success',$user_mobile,$charge['money']);
+                        //暂时取消后台短信通知用户充值成功,twj,20240618
+                        //self::sms_recharge('stock_offline_auditing_success',$user_mobile,$charge['money']);
                         break;
                     case 2:
                         self::sms_recharge('stock_offline_auditing_fail',$user_mobile,$charge['money']);