合并分支 'heshupeng' 到 'master'

店铺留言



查看合并请求 !386

@@ -448,7 +448,7 @@ class Hot extends Api
                     ];
                     ];
                     $store = $this->store_model->findOrFail($where_s,false,'id,store_name as nickname,store_icon as avatar');
                     $store = $this->store_model->findOrFail($where_s,false,'id,store_name as nickname,store_icon as avatar');
                     $v['nickname'] = $store['nickname'];
                     $v['nickname'] = $store['nickname'];
-                    $v['avatar'] = cdnurl($store['avatar']);
+                    $v['avatar'] = !empty($store['avatar']) ? cdnurl($store['avatar']) : request()->domain().'/assets/img/avatar.png';
                 }
                 }
             }
             }
 //            $list = array_sort($list,'id',SORT_ASC);
 //            $list = array_sort($list,'id',SORT_ASC);

@@ -1397,7 +1397,7 @@ class Store extends Api
                 "remark" => ['点击查看详情','#FF0000'],
                 "remark" => ['点击查看详情','#FF0000'],
             );
             );
             $openid = Db::name('third')->where('user_id',$msg['user_id'])->value('openid');
             $openid = Db::name('third')->where('user_id',$msg['user_id'])->value('openid');
-            $url = config('option.vue_url') . '/dianpuliuyan?is_template=1&id='.$msg['user_id'];
+            $url = config('option.vue_url') . '/dianpuliuyan?&id='.$msg['object_id'];
             (new \app\index\controller\Ajax)->wxsendmessage($openid,$send_data,config('option.template')['msg'],$url);
             (new \app\index\controller\Ajax)->wxsendmessage($openid,$send_data,config('option.template')['msg'],$url);
             Db::commit();
             Db::commit();
         } catch (PDOException $e) {
         } catch (PDOException $e) {