刘朕 / qiaohu · 提交

转到一个项目

作者 刘朕
提交 5fdaeee9c51f1e530930458e89cd458433624f75 2 个父辈 d6a6c9c7 948fbd0d
1 个管道 的构建 通过 耗费 0 秒

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

订单确认码、填写订单页面问题修复



查看合并请求 !238
内嵌 并排对比
正在显示 4 个修改的文件 包含 30 行增加 和 26 行删除
... ... @@ -80,13 +80,13 @@ class MemberSalesController extends HomeBaseController
</div>';
$this->sort_model[10] = '<div class="text_item no_margin form_options" data-validate="{validate}" data-type="10">
<p class="text_tit"><span class=" _validate">{name}</span>{must}</p>
<input type="text" name="" id="birthday" readonly="readonly" value="{value}" class="baby_input" placeholder="请选择{name}" />
<input type="text" name="" readonly="readonly" value="{value}" class="baby_input birthday" placeholder="请选择{name}" />
<img src="__TMPL__/public/mobile/images/youjiantou.png" class="jiantou" />
</div>';
$this->sort_model[11] = '<div class="text_item form_options" data-validate="{validate}" data-type="11">
<p class="text_tit"><span class=" _validate">{name}</span>{must}</p>
<weui-distpicker province="广东省" city="广州市" area="海珠区"></weui-distpicker>
<input type="text" name="" id="address" readonly="readonly" value="{value}" class="baby_input" placeholder="请输入{name}" />
<input type="text" name="" readonly="readonly" value="{value}" class="baby_input address" placeholder="请输入{name}" />
<img src="__TMPL__/public/mobile/images/youjiantou.png" class="jiantou" />
</div>';
$this->sort_model[12] = '<div class="text_item form_options" data-validate="{validate}" data-type="12">
... ...
... ... @@ -160,6 +160,7 @@
});
$('#birthday').click(function() {
var obj = $(this);
weui.datePicker({
start: 2000,
end: 2030,
... ... @@ -169,18 +170,18 @@
// $('.#birthday_input').val(result)
},
onConfirm: function(result) {
var birthday = result[0].label + result[1].label + result[2].label
console.log(birthday)
$('#birthday').val(birthday)
var birthday = result[0].label + result[1].label + result[2].label;
obj.val(birthday)
},
id: 'datePicker'
});
});
$('#address').click(function() {
$('.address').click(function() {
var obj = $(this);
weui.picker(rawCitiesData, {
onConfirm: function(result) {
$('#address').val(result[0].label + '-' + result[1].label + '-' + result[2].label);
obj.val(result[0].label + '-' + result[1].label + '-' + result[2].label);
}
});
});
... ...
... ... @@ -161,7 +161,8 @@
$(this).addClass('add_active').siblings().removeClass('add_active')
});
$('#birthday').click(function() {
$('.birthday').click(function() {
var obj = $(this);
weui.datePicker({
start: 2000,
end: 2030,
... ... @@ -171,18 +172,18 @@
// $('.#birthday_input').val(result)
},
onConfirm: function(result) {
var birthday = result[0].label + result[1].label + result[2].label
// console.log(birthday)
$('#birthday').val(birthday)
var birthday = result[0].label + result[1].label + result[2].label;
obj.val(birthday)
},
id: 'datePicker'
});
});
$('#address').click(function() {
$('.address').click(function() {
var obj = $(this);
weui.picker(rawCitiesData, {
onConfirm: function(result) {
$('#address').val(result[0].label + '-' + result[1].label + '-' + result[2].label);
obj.val(result[0].label + '-' + result[1].label + '-' + result[2].label);
}
});
});
... ...
... ... @@ -28,20 +28,22 @@
<div class="header_place"></div>
<div class="test_num"></div>
<!--基本信息-->
<div class="order_item">
<div class="item_tit">
<i class="iconfont icon-icon-test1"></i>基本信息
<notempty name="orderInfo.groupA">
<!--基本信息-->
<div class="order_item">
<div class="item_tit">
<i class="iconfont icon-icon-test1"></i>基本信息
</div>
<volist name="orderInfo.groupA" id="vo">
<notempty name="vo.user_choose">
<div class="item_info">
<p class="info_item">{$vo.name}</p>
<p>{$vo.user_choose}</p>
</div>
</notempty>
</volist>
</div>
<volist name="orderInfo.groupA" id="vo">
<notempty name="vo.user_choose">
<div class="item_info">
<p class="info_item">{$vo.name}</p>
<p>{$vo.user_choose}</p>
</div>
</notempty>
</volist>
</div>
</notempty>
<notempty name="orderInfo.groupB">
<!--订购人信息-->
... ...