刘朕 / qiaohu · 提交

转到一个项目

作者 刘朕
提交 cfd34218979d2b72597898d85c4729f5c98a2dec 2 个父辈 ace75265 865034f5
1 个管道 的构建 通过 耗费 0 秒

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

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



查看合并请求 !67
内嵌 并排对比
正在显示 4 个修改的文件 包含 83 行增加 和 49 行删除
... ... @@ -366,10 +366,10 @@ class OrderController extends AdminBaseController
->setCellValue('M1', '小朋友姓名')
->setCellValue('N1', '小朋友性别')
->setCellValue('O1', '小朋友生日')
->setCellValue('P1', '订购人姓名')
->setCellValue('P1', '家长姓名')
->setCellValue('Q1', '家长身份')
->setCellValue('R1', '其他身份')
->setCellValue('S1', '订购人电话')
->setCellValue('S1', '家长电话')
->setCellValue('T1', '手机备用电话')
->setCellValue('U1', '座机备用电话')
->setCellValue('V1', '地址')
... ...
... ... @@ -235,7 +235,7 @@ class MemberSalesController extends HomeBaseController
];
$url = url('portal/Order/to_pay',[],true,true);
$short_url = json_decode(file_get_contents('http://suo.im/api.php?format=json&url='.urlencode($url)),true)['url'];
$text = '订单确认码：'.Session::get('user_sale.number').'.点击 '.$short_url.' 或关注【宛林游乐】完成支付.详询4001107575.';
$text = '订单确认码：'.Session::get('user_sale.number').'.点击 '.$short_url.' 或关注【宛林儿童游乐】支付.详询4001107575.';
$this->sendSMSS($mobile,$text);
$numberList = $this->order_model->where($order_where)->column('number');
Cache::set('number',$numberList);
... ... @@ -279,10 +279,12 @@ class MemberSalesController extends HomeBaseController
$user_id = cmf_get_current_user_sale_id();
$order_where = [
'o.user_id' => $user_id,
'o.create_time' => ['between',strtotime($date).','.strtotime("$date +1 day")],
'o.is_stop' => 0,
'o.delete_time' => 0
];
if($date) {
$order_where['o.create_time'] = ['between',strtotime($date).','.strtotime("$date +1 day")];
}
$orderList = $this->order_model
->alias('o')
->field(['o.id,o.order_sn,o.status,o.create_time,o.over_time,os.name'])
... ...
... ... @@ -23,6 +23,7 @@
</div>
已提交订单
</div>
<div class="test_num"></div>
<div class="header_place"></div>
<div class="tab_tit">
... ... @@ -95,54 +96,20 @@
date: date,
sort_id: "{$sort_id}"
};
$.ajax({
url: "{:url('choosetime_detail')}",
type: "POST",
data: data,
dataType: "JSON",
success: function (res) {
console.log(res);
if (res.code == 1) {
if(res.data.length == 0) {
$('.deal_list').html('');
} else {
html = '';
$(res.data).each(function(index,element){
var status = `<p class="order_state">未支付</p>`;
var change = `<div class="change_btn" data-href="${element.edit_url}">修改</div>`;
if(element.status == 1) {
status = `<p class="no_pay">已支付</p>`;
change = '';
}
html += `<div class="list_style" data-href="${element.detail_url}">
<div class="style_one">
<p class="style_text">
订单类型：<span class="font_weight">${element.name}</span>
</p>
${status}
</div>
<p class="order_num">订单编号：${element.order_sn}</p>
<p class="order_data" id="change_time">提交时间：${element.create_time}</p>
${change}
</div>`;
});
$('.deal_list').html(html);
}
} else {
_error(res.msg);
}
},
error: function(XHR,errorMsg,errorType) {
_error(errorMsg);
},
complete: function(XHR,TS) {
}
});
list(data);
},
id: 'datePicker'
});
});
$('body').on('click','.weui-picker__action',function() {
if($(this).data('action') == 'cancel') {
$('.choose_time').html(`<i class="iconfont icon-rili"></i>选择提交时间`);
list({
date: '',
sort_id: "{$sort_id}"
});
}
});
$('.deal_list').on('click','.change_btn',function(event){
event.stopPropagation();
location.href = $(this).data('href');
... ... @@ -154,6 +121,71 @@
$('.tab_tit').on('click','.write_order',function(){
location.href = "{$orderUrl}";
});
// ajax数据渲染
function list(data) {
$.ajax({
url: "{:url('choosetime_detail')}",
type: "POST",
data: data,
dataType: "JSON",
success: function (res) {
console.log(res);
if (res.code == 1) {
if(res.data.length == 0) {
$('.deal_list').html('');
} else {
html = '';
$(res.data).each(function(index,element){
var status = `<p class="order_state">未支付</p>`;
var change = `<div class="change_btn" data-href="${element.edit_url}">修改</div>`;
if(element.status == 1) {
status = `<p class="no_pay">已支付</p>`;
change = '';
}
html += `<div class="list_style" data-href="${element.detail_url}">
<div class="style_one">
<p class="style_text">
订单类型：<span class="font_weight">${element.name}</span>
</p>
${status}
</div>
<p class="order_num">订单编号：${element.order_sn}</p>
<p class="order_data" id="change_time">提交时间：${element.create_time}</p>
${change}
</div>`;
});
$('.deal_list').html(html);
}
} else {
_error(res.msg);
}
},
error: function(XHR,errorMsg,errorType) {
_error(errorMsg);
},
complete: function(XHR,TS) {
}
});
}
// 弹窗提示
var popup_switch = true;
function _error(test) {
if(popup_switch) {
popup_switch = false;
$('.test_num').html(test);
$('.test_num').removeClass('Augly-fadeout');
$('.test_num').addClass('Augly-fadein');
$('.test_num').show();
setTimeout(function() {
$('.test_num').removeClass('Augly-fadein');
$('.test_num').addClass('Augly-fadeout');
popup_switch = true
}, 1500)
} else {
popup_switch = true
}
}
</script>
</body>
... ...
... ... @@ -103,7 +103,7 @@ class BaseController extends Controller
$username = config('cmf_sms_user');//用户名
$password = config('cmf_sms_password');//原密码
$data = array(
'content' => "【天津巧虎】短信验证码：".$content."。10分钟内有效，请尽快登录。更多资讯及功能请关注服务号“宛林游乐”。详询400-110-7575。",//短信内容
'content' => "【天津巧虎】短信验证码：".$content."。10分钟内有效，请尽快登录。更多资讯及功能请关注服务号【宛林儿童游乐】。详询400-110-7575。",//短信内容
'mobile' => $mobile,//手机号码
'productid' => '676767',//产品id
'xh' => ''//小号
... ...