作者 刘朕
1 个管道 的构建 通过 耗费 0 秒

合并分支 '1iuzhen' 到 'master'

表单文字修改、筛选日期取消功能、短信模板修改



查看合并请求 !67
@@ -366,10 +366,10 @@ class OrderController extends AdminBaseController @@ -366,10 +366,10 @@ class OrderController extends AdminBaseController
366 ->setCellValue('M1', '小朋友姓名') 366 ->setCellValue('M1', '小朋友姓名')
367 ->setCellValue('N1', '小朋友性别') 367 ->setCellValue('N1', '小朋友性别')
368 ->setCellValue('O1', '小朋友生日') 368 ->setCellValue('O1', '小朋友生日')
369 - ->setCellValue('P1', '订购人姓名') 369 + ->setCellValue('P1', '家长姓名')
370 ->setCellValue('Q1', '家长身份') 370 ->setCellValue('Q1', '家长身份')
371 ->setCellValue('R1', '其他身份') 371 ->setCellValue('R1', '其他身份')
372 - ->setCellValue('S1', '订购人电话') 372 + ->setCellValue('S1', '家长电话')
373 ->setCellValue('T1', '手机备用电话') 373 ->setCellValue('T1', '手机备用电话')
374 ->setCellValue('U1', '座机备用电话') 374 ->setCellValue('U1', '座机备用电话')
375 ->setCellValue('V1', '地址') 375 ->setCellValue('V1', '地址')
@@ -235,7 +235,7 @@ class MemberSalesController extends HomeBaseController @@ -235,7 +235,7 @@ class MemberSalesController extends HomeBaseController
235 ]; 235 ];
236 $url = url('portal/Order/to_pay',[],true,true); 236 $url = url('portal/Order/to_pay',[],true,true);
237 $short_url = json_decode(file_get_contents('http://suo.im/api.php?format=json&url='.urlencode($url)),true)['url']; 237 $short_url = json_decode(file_get_contents('http://suo.im/api.php?format=json&url='.urlencode($url)),true)['url'];
238 - $text = '订单确认码:'.Session::get('user_sale.number').'.点击 '.$short_url.' 或关注【宛林游乐】完成支付.详询4001107575.'; 238 + $text = '订单确认码:'.Session::get('user_sale.number').'.点击 '.$short_url.' 或关注【宛林儿童游乐】支付.详询4001107575.';
239 $this->sendSMSS($mobile,$text); 239 $this->sendSMSS($mobile,$text);
240 $numberList = $this->order_model->where($order_where)->column('number'); 240 $numberList = $this->order_model->where($order_where)->column('number');
241 Cache::set('number',$numberList); 241 Cache::set('number',$numberList);
@@ -279,10 +279,12 @@ class MemberSalesController extends HomeBaseController @@ -279,10 +279,12 @@ class MemberSalesController extends HomeBaseController
279 $user_id = cmf_get_current_user_sale_id(); 279 $user_id = cmf_get_current_user_sale_id();
280 $order_where = [ 280 $order_where = [
281 'o.user_id' => $user_id, 281 'o.user_id' => $user_id,
282 - 'o.create_time' => ['between',strtotime($date).','.strtotime("$date +1 day")],  
283 'o.is_stop' => 0, 282 'o.is_stop' => 0,
284 'o.delete_time' => 0 283 'o.delete_time' => 0
285 ]; 284 ];
  285 + if($date) {
  286 + $order_where['o.create_time'] = ['between',strtotime($date).','.strtotime("$date +1 day")];
  287 + }
286 $orderList = $this->order_model 288 $orderList = $this->order_model
287 ->alias('o') 289 ->alias('o')
288 ->field(['o.id,o.order_sn,o.status,o.create_time,o.over_time,os.name']) 290 ->field(['o.id,o.order_sn,o.status,o.create_time,o.over_time,os.name'])
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
23 </div> 23 </div>
24 已提交订单 24 已提交订单
25 </div> 25 </div>
  26 +<div class="test_num"></div>
26 <div class="header_place"></div> 27 <div class="header_place"></div>
27 28
28 <div class="tab_tit"> 29 <div class="tab_tit">
@@ -95,54 +96,20 @@ @@ -95,54 +96,20 @@
95 date: date, 96 date: date,
96 sort_id: "{$sort_id}" 97 sort_id: "{$sort_id}"
97 }; 98 };
98 - $.ajax({  
99 - url: "{:url('choosetime_detail')}",  
100 - type: "POST",  
101 - data: data,  
102 - dataType: "JSON",  
103 - success: function (res) {  
104 - console.log(res);  
105 - if (res.code == 1) {  
106 - if(res.data.length == 0) {  
107 - $('.deal_list').html('');  
108 - } else {  
109 - html = '';  
110 - $(res.data).each(function(index,element){  
111 - var status = `<p class="order_state">未支付</p>`;  
112 - var change = `<div class="change_btn" data-href="${element.edit_url}">修改</div>`;  
113 - if(element.status == 1) {  
114 - status = `<p class="no_pay">已支付</p>`;  
115 - change = '';  
116 - }  
117 - html += `<div class="list_style" data-href="${element.detail_url}">  
118 - <div class="style_one">  
119 - <p class="style_text">  
120 - 订单类型:<span class="font_weight">${element.name}</span>  
121 - </p>  
122 - ${status}  
123 - </div>  
124 - <p class="order_num">订单编号:${element.order_sn}</p>  
125 - <p class="order_data" id="change_time">提交时间:${element.create_time}</p>  
126 - ${change}  
127 - </div>`;  
128 - });  
129 - $('.deal_list').html(html);  
130 - }  
131 - } else {  
132 - _error(res.msg);  
133 - }  
134 - },  
135 - error: function(XHR,errorMsg,errorType) {  
136 - _error(errorMsg);  
137 - },  
138 - complete: function(XHR,TS) {  
139 -  
140 - }  
141 - }); 99 + list(data);
142 }, 100 },
143 id: 'datePicker' 101 id: 'datePicker'
144 }); 102 });
145 }); 103 });
  104 + $('body').on('click','.weui-picker__action',function() {
  105 + if($(this).data('action') == 'cancel') {
  106 + $('.choose_time').html(`<i class="iconfont icon-rili"></i>选择提交时间`);
  107 + list({
  108 + date: '',
  109 + sort_id: "{$sort_id}"
  110 + });
  111 + }
  112 + });
146 $('.deal_list').on('click','.change_btn',function(event){ 113 $('.deal_list').on('click','.change_btn',function(event){
147 event.stopPropagation(); 114 event.stopPropagation();
148 location.href = $(this).data('href'); 115 location.href = $(this).data('href');
@@ -154,6 +121,71 @@ @@ -154,6 +121,71 @@
154 $('.tab_tit').on('click','.write_order',function(){ 121 $('.tab_tit').on('click','.write_order',function(){
155 location.href = "{$orderUrl}"; 122 location.href = "{$orderUrl}";
156 }); 123 });
  124 + // ajax数据渲染
  125 + function list(data) {
  126 + $.ajax({
  127 + url: "{:url('choosetime_detail')}",
  128 + type: "POST",
  129 + data: data,
  130 + dataType: "JSON",
  131 + success: function (res) {
  132 + console.log(res);
  133 + if (res.code == 1) {
  134 + if(res.data.length == 0) {
  135 + $('.deal_list').html('');
  136 + } else {
  137 + html = '';
  138 + $(res.data).each(function(index,element){
  139 + var status = `<p class="order_state">未支付</p>`;
  140 + var change = `<div class="change_btn" data-href="${element.edit_url}">修改</div>`;
  141 + if(element.status == 1) {
  142 + status = `<p class="no_pay">已支付</p>`;
  143 + change = '';
  144 + }
  145 + html += `<div class="list_style" data-href="${element.detail_url}">
  146 + <div class="style_one">
  147 + <p class="style_text">
  148 + 订单类型:<span class="font_weight">${element.name}</span>
  149 + </p>
  150 + ${status}
  151 + </div>
  152 + <p class="order_num">订单编号:${element.order_sn}</p>
  153 + <p class="order_data" id="change_time">提交时间:${element.create_time}</p>
  154 + ${change}
  155 + </div>`;
  156 + });
  157 + $('.deal_list').html(html);
  158 + }
  159 + } else {
  160 + _error(res.msg);
  161 + }
  162 + },
  163 + error: function(XHR,errorMsg,errorType) {
  164 + _error(errorMsg);
  165 + },
  166 + complete: function(XHR,TS) {
  167 +
  168 + }
  169 + });
  170 + }
  171 + // 弹窗提示
  172 + var popup_switch = true;
  173 + function _error(test) {
  174 + if(popup_switch) {
  175 + popup_switch = false;
  176 + $('.test_num').html(test);
  177 + $('.test_num').removeClass('Augly-fadeout');
  178 + $('.test_num').addClass('Augly-fadein');
  179 + $('.test_num').show();
  180 + setTimeout(function() {
  181 + $('.test_num').removeClass('Augly-fadein');
  182 + $('.test_num').addClass('Augly-fadeout');
  183 + popup_switch = true
  184 + }, 1500)
  185 + } else {
  186 + popup_switch = true
  187 + }
  188 + }
157 </script> 189 </script>
158 </body> 190 </body>
159 191
@@ -103,7 +103,7 @@ class BaseController extends Controller @@ -103,7 +103,7 @@ class BaseController extends Controller
103 $username = config('cmf_sms_user');//用户名 103 $username = config('cmf_sms_user');//用户名
104 $password = config('cmf_sms_password');//原密码 104 $password = config('cmf_sms_password');//原密码
105 $data = array( 105 $data = array(
106 - 'content' => "【天津巧虎】短信验证码:".$content."。10分钟内有效,请尽快登录。更多资讯及功能请关注服务号“宛林游乐”。详询400-110-7575。",//短信内容 106 + 'content' => "【天津巧虎】短信验证码:".$content."。10分钟内有效,请尽快登录。更多资讯及功能请关注服务号【宛林儿童游乐】。详询400-110-7575。",//短信内容
107 'mobile' => $mobile,//手机号码 107 'mobile' => $mobile,//手机号码
108 'productid' => '676767',//产品id 108 'productid' => '676767',//产品id
109 'xh' => ''//小号 109 'xh' => ''//小号