anyv / xkeasy · 提交

转到一个项目

作者 王晓刚
提交 d70f42fd97f93ee0a0a888c922ef01a527f05abf 2 个父辈 6bca74f5 f2ce7f0e
1 个管道 的构建 通过 耗费 0 秒

合并分支 'wangxiaogang' 到 'master' 

Wangxiaogang



查看合并请求 !73
内嵌 并排对比
正在显示 6 个修改的文件 包含 46 行增加 和 19 行删除
@@ -243,21 +243,21 @@ $configs = [ @@ -243,21 +243,21 @@ $configs = [
243 // 'AppKey' => 'f84c7071-a6c7-48ce-8fe0-11b719d88a1d', 243 // 'AppKey' => 'f84c7071-a6c7-48ce-8fe0-11b719d88a1d',
244 ], 244 ],
245 //快递鸟预约取件接口寄件人参数 245 //快递鸟预约取件接口寄件人参数
246 -// 'sender'=>[  
247 -// 'Name' => "姚先生",  
248 -// 'Mobile' => "15300350084",  
249 -// 'ProvinceName' => "河北省",  
250 -// 'CityName' => "石家庄市",  
251 -// 'ExpAreaName' => "新华区",  
252 -// 'Address' => "学府路121号",  
253 -// ],  
254 'sender'=>[ 246 'sender'=>[
255 - 'Name' => "安先生",  
256 - 'Mobile' => "18602699971",  
257 - 'ProvinceName' => "天津市",  
258 - 'CityName' => "天津市",  
259 - 'ExpAreaName' => "西青区",  
260 - 'Address' => "鑫茂科技园F座416室", 247 + 'Name' => "姚鹏程",
  248 + 'Mobile' => "15300350084",
  249 + 'ProvinceName' => "河北省",
  250 + 'CityName' => "石家庄市",
  251 + 'ExpAreaName' => "新华区",
  252 + 'Address' => "学府路121号",
261 ], 253 ],
  254 +// 'sender'=>[
  255 +// 'Name' => "安先生",
  256 +// 'Mobile' => "18602699971",
  257 +// 'ProvinceName' => "天津市",
  258 +// 'CityName' => "天津市",
  259 +// 'ExpAreaName' => "西青区",
  260 +// 'Address' => "鑫茂科技园F座416室",
  261 +// ],
262 ]; 262 ];
263 return array_merge($configs, $runtimeConfig,$wechatConfig); 263 return array_merge($configs, $runtimeConfig,$wechatConfig);
@@ -80,7 +80,7 @@ class PersonalcenterController extends WeChatBaseController{ @@ -80,7 +80,7 @@ class PersonalcenterController extends WeChatBaseController{
80 * 显示个人中心页 80 * 显示个人中心页
81 */ 81 */
82 public function personal_center(){ 82 public function personal_center(){
83 - 83 + send_sms();
84 $uid = cmf_get_current_user_id(); 84 $uid = cmf_get_current_user_id();
85 $my_user_status = Db::name('my_user') -> where('uid',$uid) -> find(); 85 $my_user_status = Db::name('my_user') -> where('uid',$uid) -> find();
86 $weixin = Db::name('user') -> where('id',$uid) -> find(); 86 $weixin = Db::name('user') -> where('id',$uid) -> find();
@@ -25,7 +25,34 @@ @@ -25,7 +25,34 @@
25 <div class="log_detailTxt"> 25 <div class="log_detailTxt">
26 <h1 class="one-txt-cut">{$indent.indent_goods.0.book_name}</h1> 26 <h1 class="one-txt-cut">{$indent.indent_goods.0.book_name}</h1>
27 <p>运单号：{$indent.logistic_code}</p> 27 <p>运单号：{$indent.logistic_code}</p>
28 - <p>信息来源：顺丰快递</p> 28 + <p>
  29 + 信息来源：
  30 + <if condition="$indent.logistic_code eq SF">
  31 + 顺丰快递
  32 + <elseif condition="YTO"/>
  33 + 圆通快递
  34 + <elseif condition="ZTO"/>
  35 + 中通快递
  36 + <elseif condition="STO"/>
  37 + 申通快递
  38 + <elseif condition="YD"/>
  39 + 韵达快递
  40 + <elseif condition="HHTT"/>
  41 + 天天快递
  42 + <elseif condition="HTKY"/>
  43 + 百世快递
  44 + <elseif condition="YZPY"/>
  45 + 邮政快递包裹
  46 + <elseif condition="EMS"/>
  47 + EMS
  48 + <elseif condition="DBL"/>
  49 + 德邦快递
  50 + <elseif condition="ZJS"/>
  51 + 宅急送
  52 + <elseif condition="TNT"/>
  53 + TNT快递
  54 + </if>
  55 + </p>
29 </div> 56 </div>
30 </div> 57 </div>
31 58
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 <div class="three_model_school_data" style="display: block;"> 74 <div class="three_model_school_data" style="display: block;">
75 <div class="three_model_school_name" data-name="SF">顺丰快递</div> 75 <div class="three_model_school_name" data-name="SF">顺丰快递</div>
76 <div class="three_model_school_name" data-name="YTO">圆通快递</div> 76 <div class="three_model_school_name" data-name="YTO">圆通快递</div>
77 - <div class="three_model_school_name" data-name="STO">中通快递</div> 77 + <div class="three_model_school_name" data-name="ZTO">中通快递</div>
78 <div class="three_model_school_name there_unActive" data-name="STO">申通快递</div> 78 <div class="three_model_school_name there_unActive" data-name="STO">申通快递</div>
79 <div class="three_model_school_name" data-name="YD">韵达快递</div> 79 <div class="three_model_school_name" data-name="YD">韵达快递</div>
80 <div class="three_model_school_name" data-name="HHTT">天天快递</div> 80 <div class="three_model_school_name" data-name="HHTT">天天快递</div>
@@ -103,7 +103,7 @@ @@ -103,7 +103,7 @@
103 <div class="three_model_school_data" style="display: block;"> 103 <div class="three_model_school_data" style="display: block;">
104 <div class="three_model_school_name" data-name="SF">顺丰快递</div> 104 <div class="three_model_school_name" data-name="SF">顺丰快递</div>
105 <div class="three_model_school_name" data-name="YTO">圆通快递</div> 105 <div class="three_model_school_name" data-name="YTO">圆通快递</div>
106 - <div class="three_model_school_name" data-name="STO">中通快递</div> 106 + <div class="three_model_school_name" data-name="ZTO">中通快递</div>
107 <div class="three_model_school_name there_unActive" data-name="STO">申通快递</div> 107 <div class="three_model_school_name there_unActive" data-name="STO">申通快递</div>
108 <div class="three_model_school_name" data-name="YD">韵达快递</div> 108 <div class="three_model_school_name" data-name="YD">韵达快递</div>
109 <div class="three_model_school_name" data-name="HHTT">天天快递</div> 109 <div class="three_model_school_name" data-name="HHTT">天天快递</div>
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 </div> 45 </div>
46 </div> 46 </div>
47 </a> 47 </a>
48 - <a href="log_three.html"> 48 + <a href="{:url('OrderSalesman/get_all')}">
49 <div class="log_one_list_one"> 49 <div class="log_one_list_one">
50 <div class="log_one_list_left"> 50 <div class="log_one_list_left">
51 <div class="log_one_list_img"> 51 <div class="log_one_list_img">