合并分支 'wangxiaogang' 到 'master'

Wangxiaogang



查看合并请求 !73

@@ -243,21 +243,21 @@ $configs = [
 //        'AppKey' => 'f84c7071-a6c7-48ce-8fe0-11b719d88a1d',
     ],
     //快递鸟预约取件接口寄件人参数
-//    'sender'=>[
-//        'Name' => "姚先生",
-//        'Mobile' => "15300350084",
-//        'ProvinceName' => "河北省",
-//        'CityName' => "石家庄市",
-//        'ExpAreaName' => "新华区",
-//        'Address' => "学府路121号",
-//    ],
     'sender'=>[
-        'Name' => "安先生",
-        'Mobile' => "18602699971",
-        'ProvinceName' => "天津市",
-        'CityName' => "天津市",
-        'ExpAreaName' => "西青区",
-        'Address' => "鑫茂科技园F座416室",
+        'Name' => "姚鹏程",
+        'Mobile' => "15300350084",
+        'ProvinceName' => "河北省",
+        'CityName' => "石家庄市",
+        'ExpAreaName' => "新华区",
+        'Address' => "学府路121号",
     ],
+//    'sender'=>[
+//        'Name' => "安先生",
+//        'Mobile' => "18602699971",
+//        'ProvinceName' => "天津市",
+//        'CityName' => "天津市",
+//        'ExpAreaName' => "西青区",
+//        'Address' => "鑫茂科技园F座416室",
+//    ],
 ];
 return array_merge($configs, $runtimeConfig,$wechatConfig);
\ No newline at end of file

@@ -80,7 +80,7 @@ class PersonalcenterController extends WeChatBaseController{
      * 显示个人中心页
      */
     public function personal_center(){
-
+        send_sms();
         $uid = cmf_get_current_user_id();
         $my_user_status = Db::name('my_user') -> where('uid',$uid) -> find();
         $weixin = Db::name('user') -> where('id',$uid) -> find();

@@ -25,7 +25,34 @@
                 <div class="log_detailTxt">
                     <h1 class="one-txt-cut">{$indent.indent_goods.0.book_name}</h1>
                     <p>运单号：{$indent.logistic_code}</p>
-                    <p>信息来源：顺丰快递</p>
+                    <p>
+                        信息来源：
+                        <if condition="$indent.logistic_code eq SF">
+                            顺丰快递
+                            <elseif condition="YTO"/>
+                            圆通快递
+                            <elseif condition="ZTO"/>
+                            中通快递
+                            <elseif condition="STO"/>
+                            申通快递
+                            <elseif condition="YD"/>
+                            韵达快递
+                            <elseif condition="HHTT"/>
+                            天天快递
+                            <elseif condition="HTKY"/>
+                            百世快递
+                            <elseif condition="YZPY"/>
+                            邮政快递包裹
+                            <elseif condition="EMS"/>
+                            EMS
+                            <elseif condition="DBL"/>
+                            德邦快递
+                            <elseif condition="ZJS"/>
+                            宅急送
+                            <elseif condition="TNT"/>
+                            TNT快递
+                        </if>
+                    </p>
                 </div>
             </div>
 

@@ -74,7 +74,7 @@
                 <div class="three_model_school_data" style="display: block;">
                     <div class="three_model_school_name" data-name="SF">顺丰快递</div>
                     <div class="three_model_school_name" data-name="YTO">圆通快递</div>
-                    <div class="three_model_school_name" data-name="STO">中通快递</div>
+                    <div class="three_model_school_name" data-name="ZTO">中通快递</div>
                     <div class="three_model_school_name there_unActive" data-name="STO">申通快递</div>
                     <div class="three_model_school_name" data-name="YD">韵达快递</div>
                     <div class="three_model_school_name" data-name="HHTT">天天快递</div>

@@ -103,7 +103,7 @@
                 <div class="three_model_school_data" style="display: block;">
                     <div class="three_model_school_name" data-name="SF">顺丰快递</div>
                     <div class="three_model_school_name" data-name="YTO">圆通快递</div>
-                    <div class="three_model_school_name" data-name="STO">中通快递</div>
+                    <div class="three_model_school_name" data-name="ZTO">中通快递</div>
                     <div class="three_model_school_name there_unActive" data-name="STO">申通快递</div>
                     <div class="three_model_school_name" data-name="YD">韵达快递</div>
                     <div class="three_model_school_name" data-name="HHTT">天天快递</div>

@@ -45,7 +45,7 @@
             </div>
         </div>
     </a>
-    <a href="log_three.html">
+    <a href="{:url('OrderSalesman/get_all')}">
         <div class="log_one_list_one">
             <div class="log_one_list_left">
                 <div class="log_one_list_img">