合并分支 'wangxiaogang' 到 'master'

跳了好多东西



查看合并请求 !96

@@ -142,7 +142,7 @@
                 <div class="log_three_model_one logistic">
                 <div class="log_three_model_one logistic">
                     <div class="log_three_model_left">选择快递</div>
                     <div class="log_three_model_left">选择快递</div>
                     <div class="log_psong log_psong_select">
                     <div class="log_psong log_psong_select">
-                        <div class="log_ps_title">请选择</div>
+                        <div class="log_ps_title">请选择快递公司</div>
                         <div class="log_ps_img">
                         <div class="log_ps_img">
                             <img src="__TMPL__/public/assets/images/29.png"/>
                             <img src="__TMPL__/public/assets/images/29.png"/>
                             <input type="hidden" id="logistic_name" placeholder="请选择快递公司"/>
                             <input type="hidden" id="logistic_name" placeholder="请选择快递公司"/>

@@ -73,7 +73,7 @@
                 <div class="log_three_model_one logistic">
                 <div class="log_three_model_one logistic">
                     <div class="log_three_model_left">选择快递</div>
                     <div class="log_three_model_left">选择快递</div>
                     <div class="log_psong log_psong_select">
                     <div class="log_psong log_psong_select">
-                        <div class="log_ps_title">请选择</div>
+                        <div class="log_ps_title">请选择快递公司</div>
                         <div class="log_ps_img">
                         <div class="log_ps_img">
                             <img src="__TMPL__/public/assets/images/29.png"/>
                             <img src="__TMPL__/public/assets/images/29.png"/>
                             <input type="hidden" id="logistic_name" placeholder="请选择快递公司"/>
                             <input type="hidden" id="logistic_name" placeholder="请选择快递公司"/>

@@ -519,7 +519,7 @@
 }
 }
 
 
 .log_three_model_left {
 .log_three_model_left {
-	width: 1.28rem;
+	width: 1.58rem;
 	font-size: 0.32rem;
 	font-size: 0.32rem;
 	font-weight: 400;
 	font-weight: 400;
 	color: rgba(51, 51, 51, 1);
 	color: rgba(51, 51, 51, 1);

@@ -204,8 +204,8 @@ class WeChatBaseController extends BaseController
      */
      */
     public function checkWeChatUserLogin()
     public function checkWeChatUserLogin()
     {
     {
-       /*$user = Db::name('user')->where('id',5)->find();
-        cmf_update_current_user($user);*/
+//        $user = Db::name('user')->where('id',5)->find();
+//        cmf_update_current_user($user);
         $userId = cmf_get_current_user_id();
         $userId = cmf_get_current_user_id();
         if (empty($userId)) {
         if (empty($userId)) {
             $config = [
             $config = [