刘朕 / qiaohu · 提交

转到一个项目

作者 刘朕
提交 0b3e0d346209e73d449f0f6b3e1c7558d5d9ba96 2 个父辈 5fdaeee9 6aa1abb6
1 个管道 的构建 通过 耗费 1 秒

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

底部公司名称位置修改



查看合并请求 !239
内嵌 并排对比
正在显示 14 个修改的文件 包含 140 行增加 和 198 行删除
@@ -10,40 +10,33 @@ @@ -10,40 +10,33 @@
10 <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/write/deal_list.css" /> 10 <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/write/deal_list.css" />
11 <title>已提交订单</title> 11 <title>已提交订单</title>
12 <style type="text/css"> 12 <style type="text/css">
13 - .foot_icon{  
14 - display: flex;  
15 - justify-content: center;  
16 - /* position: absolute; */  
17 - position: fixed;  
18 - bottom: 0.2rem;  
19 - left: 0;  
20 - right: 0;  
21 - } 13 +
22 </style> 14 </style>
23 </head> 15 </head>
24 16
25 <body> 17 <body>
26 -<div class="header"> 18 +<div class="content_height">
  19 + <div class="header">
27 <div class="return"> 20 <div class="return">
28 <span class="back_href"> 21 <span class="back_href">
29 <i class="iconfont icon-jiantou-copy"></i>返回 22 <i class="iconfont icon-jiantou-copy"></i>返回
30 </span> 23 </span>
31 </div> 24 </div>
32 已提交订单 25 已提交订单
33 -</div>  
34 -<div class="test_num"></div>  
35 -<div class="header_place"></div> 26 + </div>
  27 + <div class="test_num"></div>
  28 + <div class="header_place"></div>
36 29
37 -<div class="tab_tit"> 30 + <div class="tab_tit">
38 <p class="tab_item write_order">填写电子订单</p> 31 <p class="tab_item write_order">填写电子订单</p>
39 <p class="tab_item active">查看已提交订单</p> 32 <p class="tab_item active">查看已提交订单</p>
40 -</div> 33 + </div>
41 34
42 -<div class="choose_time"> 35 + <div class="choose_time">
43 <i class="iconfont icon-rili"></i>选择提交时间 36 <i class="iconfont icon-rili"></i>选择提交时间
44 -</div> 37 + </div>
45 38
46 -<div class="deal_list"> 39 + <div class="deal_list">
47 <volist name="orderList" id="vo"> 40 <volist name="orderList" id="vo">
48 <div class="list_style" data-href="{:url('detail',['id'=>$sort_id,'order_id'=>$vo['id']])}"> 41 <div class="list_style" data-href="{:url('detail',['id'=>$sort_id,'order_id'=>$vo['id']])}">
49 <div class="style_one"> 42 <div class="style_one">
@@ -67,20 +60,10 @@ @@ -67,20 +60,10 @@
67 </eq> 60 </eq>
68 </div> 61 </div>
69 </volist> 62 </volist>
  63 + </div>
70 </div> 64 </div>
71 65
72 -<!--<div class="list_style">-->  
73 - <!--<div class="style_one">-->  
74 - <!--<p class="style_text">-->  
75 - <!--订单类型：<span class="font_weight">新规</span>-->  
76 - <!--</p>-->  
77 - <!--<p class="no_pay">未支付</p>-->  
78 - <!--</div>-->  
79 - <!--<p class="order_num">订单编号：1822 3766 4456 8888</p>-->  
80 - <!--<p class="order_data">提交时间：2018-04-10</p>-->  
81 -<!--</div>-->  
82 -  
83 -<div class="footstyle bottom_icon"> 66 +<div class="bottom_icon">
84 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" /> 67 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" />
85 <p class="bottom_text">{$site_info.site_name}</p> 68 <p class="bottom_text">{$site_info.site_name}</p>
86 </div> 69 </div>
@@ -200,15 +183,15 @@ @@ -200,15 +183,15 @@
200 } 183 }
201 184
202 //固定公司底部的名字 185 //固定公司底部的名字
203 - var h=$(".deal_list").height();  
204 - if(h>445){  
205 - $(".footstyle").addClass("bottom_icon");  
206 - $(".footstyle").removeClass("foot_icon");  
207 -  
208 - }else if(h<=445){  
209 - $(".footstyle").addClass("foot_icon");  
210 - $(".footstyle").removeClass("bottom_icon");  
211 - } 186 + // var h=$(".deal_list").height();
  187 + // if(h>445){
  188 + // $(".footstyle").addClass("bottom_icon");
  189 + // $(".footstyle").removeClass("foot_icon");
  190 + //
  191 + // }else if(h<=445){
  192 + // $(".footstyle").addClass("foot_icon");
  193 + // $(".footstyle").removeClass("bottom_icon");
  194 + // }
212 // alert($(".deal_list").height()) 195 // alert($(".deal_list").height())
213 </script> 196 </script>
214 </body> 197 </body>
@@ -17,18 +17,19 @@ @@ -17,18 +17,19 @@
17 </head> 17 </head>
18 18
19 <body> 19 <body>
20 -<div class="header"> 20 +<div class="content_height">
  21 + <div class="header">
21 <div class="return"> 22 <div class="return">
22 <span class="back_href"> 23 <span class="back_href">
23 <i class="iconfont icon-jiantou-copy"></i>返回 24 <i class="iconfont icon-jiantou-copy"></i>返回
24 </span> 25 </span>
25 </div> 26 </div>
26 订单详情 27 订单详情
27 -</div>  
28 -<div class="header_place"></div> 28 + </div>
  29 + <div class="header_place"></div>
29 30
30 -<!--宝宝信息-->  
31 -<div class="order_item"> 31 + <!--宝宝信息-->
  32 + <div class="order_item">
32 <div class="item_tit"> 33 <div class="item_tit">
33 <i class="iconfont icon-icon-test1"></i>基本信息 34 <i class="iconfont icon-icon-test1"></i>基本信息
34 </div> 35 </div>
@@ -38,9 +39,9 @@ @@ -38,9 +39,9 @@
38 <p>{$vo.user_choose}</p> 39 <p>{$vo.user_choose}</p>
39 </div> 40 </div>
40 </volist> 41 </volist>
41 -</div> 42 + </div>
42 43
43 -<notempty name="orderInfo.groupB"> 44 + <notempty name="orderInfo.groupB">
44 <!--订购信息--> 45 <!--订购信息-->
45 <div class="order_item"> 46 <div class="order_item">
46 <div class="item_tit"> 47 <div class="item_tit">
@@ -53,9 +54,9 @@ @@ -53,9 +54,9 @@
53 </div> 54 </div>
54 </volist> 55 </volist>
55 </div> 56 </div>
56 -</notempty> 57 + </notempty>
57 58
58 -<notempty name="orderInfo.groupC"> 59 + <notempty name="orderInfo.groupC">
59 <!--收货信息--> 60 <!--收货信息-->
60 <div class="order_item"> 61 <div class="order_item">
61 <div class="item_tit"> 62 <div class="item_tit">
@@ -68,9 +69,9 @@ @@ -68,9 +69,9 @@
68 </div> 69 </div>
69 </volist> 70 </volist>
70 </div> 71 </div>
71 -</notempty> 72 + </notempty>
72 73
73 -<notempty name="orderInfo.groupD"> 74 + <notempty name="orderInfo.groupD">
74 <!--订购信息--> 75 <!--订购信息-->
75 <div class="order_item"> 76 <div class="order_item">
76 <div class="item_tit"> 77 <div class="item_tit">
@@ -80,7 +81,7 @@ @@ -80,7 +81,7 @@
80 <eq name="vo.type" value="8"> 81 <eq name="vo.type" value="8">
81 <div class="item_info"> 82 <div class="item_info">
82 <p class="info_item" style="display: flex;align-items: center;">{$vo.name}</p> 83 <p class="info_item" style="display: flex;align-items: center;">{$vo.name}</p>
83 - <p class="detail_image"><img src="{:cmf_get_asset_url($vo['user_choose'])}"/></p> 84 + <p class="detail_image"><notempty name="vo.user_choose"><img src="{:cmf_get_asset_url($vo['user_choose'])}"/></notempty></p>
84 </div> 85 </div>
85 <else/> 86 <else/>
86 <div class="item_info"> 87 <div class="item_info">
@@ -90,14 +91,14 @@ @@ -90,14 +91,14 @@
90 </eq> 91 </eq>
91 </volist> 92 </volist>
92 </div> 93 </div>
93 -</notempty> 94 + </notempty>
94 95
95 -<eq name="orderInfo.status" value="0"> 96 + <eq name="orderInfo.status" value="0">
96 <div class="btn"> 97 <div class="btn">
97 修 改 98 修 改
98 </div> 99 </div>
99 -</eq>  
100 - 100 + </eq>
  101 +</div>
101 <div class="bottom_icon"> 102 <div class="bottom_icon">
102 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" /> 103 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" />
103 <p class="bottom_text">{$site_info.site_name}</p> 104 <p class="bottom_text">{$site_info.site_name}</p>
@@ -15,23 +15,24 @@ @@ -15,23 +15,24 @@
15 </head> 15 </head>
16 16
17 <body> 17 <body>
18 -<div class="header"> 18 +<div class="content_height">
  19 + <div class="header">
19 <div class="return"> 20 <div class="return">
20 <span class="back_href"> 21 <span class="back_href">
21 <i class="iconfont icon-jiantou-copy"></i>返回 22 <i class="iconfont icon-jiantou-copy"></i>返回
22 </span> 23 </span>
23 </div> 24 </div>
24 填写电子订单 25 填写电子订单
25 -</div>  
26 -<div class="test_num"></div>  
27 -<div class="header_place"></div> 26 + </div>
  27 + <div class="test_num"></div>
  28 + <div class="header_place"></div>
28 29
29 -<div class="tab_tit"> 30 + <div class="tab_tit">
30 <p class="tab_item active">填写电子订单</p> 31 <p class="tab_item active">填写电子订单</p>
31 <p class="tab_item view_orders">查看已提交订单</p> 32 <p class="tab_item view_orders">查看已提交订单</p>
32 -</div> 33 + </div>
33 34
34 -<div class="form_data"> 35 + <div class="form_data">
35 <!--第一步--> 36 <!--第一步-->
36 <div class="write_one" style=""> 37 <div class="write_one" style="">
37 <div class="register_item baby_name"> 38 <div class="register_item baby_name">
@@ -104,8 +105,8 @@ @@ -104,8 +105,8 @@
104 </div> 105 </div>
105 </div> 106 </div>
106 </notempty> 107 </notempty>
  108 + </div>
107 </div> 109 </div>
108 -  
109 <div class="mask" style="display: none;"> 110 <div class="mask" style="display: none;">
110 <!--订单修改--> 111 <!--订单修改-->
111 <div class="order_change" style="display: block;"> 112 <div class="order_change" style="display: block;">
@@ -16,35 +16,36 @@ @@ -16,35 +16,36 @@
16 16
17 <body> 17 <body>
18 <div class="test_num"></div> 18 <div class="test_num"></div>
19 -<div class="header"> 19 +<div class="content_height">
  20 + <div class="header">
20 <div class="return"> 21 <div class="return">
21 <span class="back_href"> 22 <span class="back_href">
22 <i class="iconfont icon-jiantou-copy"></i>返回 23 <i class="iconfont icon-jiantou-copy"></i>返回
23 </span> 24 </span>
24 </div> 25 </div>
25 填写电子订单 26 填写电子订单
26 -</div>  
27 -<div class="header_place"></div> 27 + </div>
  28 + <div class="header_place"></div>
28 29
29 -<div class="pic_wrap"> 30 + <div class="pic_wrap">
30 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" /> 31 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" />
31 -</div> 32 + </div>
32 33
33 -<div class="text_item "> 34 + <div class="text_item ">
34 <p class="text_tit"><i class="iconfont icon-icon-test1"></i>销售代码</p> 35 <p class="text_tit"><i class="iconfont icon-icon-test1"></i>销售代码</p>
35 <input type="text" name="user_login" id="user_login" value="" class="baby_input" placeholder="请输入销售代码" /> 36 <input type="text" name="user_login" id="user_login" value="" class="baby_input" placeholder="请输入销售代码" />
36 -</div> 37 + </div>
37 38
38 -<div class="text_item "> 39 + <div class="text_item ">
39 <p class="text_tit"><i class="iconfont icon-mima"></i>密码</p> 40 <p class="text_tit"><i class="iconfont icon-mima"></i>密码</p>
40 <input type="password" name="user_pass" id="user_pass" value="" class="baby_input" placeholder="请输入密码" /> 41 <input type="password" name="user_pass" id="user_pass" value="" class="baby_input" placeholder="请输入密码" />
41 -</div> 42 + </div>
42 43
43 -<div class="btn"> 44 + <div class="btn">
44 确定 45 确定
  46 + </div>
45 </div> 47 </div>
46 -  
47 -<div class="bottom_icon position_a"> 48 +<div class="bottom_icon">
48 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" /> 49 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" />
49 <p class="bottom_text">{$site_info.site_name}</p> 50 <p class="bottom_text">{$site_info.site_name}</p>
50 </div> 51 </div>
@@ -20,16 +20,17 @@ @@ -20,16 +20,17 @@
20 </head> 20 </head>
21 21
22 <body> 22 <body>
23 -<div class="header"> 23 +<div class="content_height">
  24 + <div class="header">
24 <div class="return"> 25 <div class="return">
25 <span class="back_href"> 26 <span class="back_href">
26 <i class="iconfont icon-jiantou-copy"></i>返回 27 <i class="iconfont icon-jiantou-copy"></i>返回
27 </span> 28 </span>
28 </div> 29 </div>
29 选择订单类型 30 选择订单类型
30 -</div>  
31 -<div class="header_place"></div>  
32 -<div class="container"> 31 + </div>
  32 + <div class="header_place"></div>
  33 + <div class="container">
33 <p class="choose_style">选择订单类型</p> 34 <p class="choose_style">选择订单类型</p>
34 <p class="sytle_english">SELECT ORDER TYPE</p> 35 <p class="sytle_english">SELECT ORDER TYPE</p>
35 <div class="item_list"> 36 <div class="item_list">
@@ -42,8 +43,9 @@ @@ -42,8 +43,9 @@
42 </div> 43 </div>
43 </volist> 44 </volist>
44 </div> 45 </div>
  46 + </div>
45 </div> 47 </div>
46 -<div class="bottom_icon position_a"> 48 +<div class="bottom_icon">
47 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" /> 49 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" />
48 <p class="bottom_text">{$site_info.site_name}</p> 50 <p class="bottom_text">{$site_info.site_name}</p>
49 </div> 51 </div>
@@ -10,37 +10,29 @@ @@ -10,37 +10,29 @@
10 <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/write/write.css" /> 10 <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/write/write.css" />
11 <title>填写电子订单</title> 11 <title>填写电子订单</title>
12 <style type="text/css"> 12 <style type="text/css">
13 - .bottom_icont {  
14 - display: flex;  
15 - justify-content: center;  
16 - /* position: absolute; */  
17 - /*position: fixed;*/  
18 - bottom: 0.2rem;  
19 - left: 0;  
20 - right: 0;  
21 - margin: 0.42rem auto 0.34rem;  
22 - } 13 +
23 </style> 14 </style>
24 </head> 15 </head>
25 16
26 <body> 17 <body>
27 -<div class="header"> 18 +<div class="content_height">
  19 + <div class="header">
28 <div class="return"> 20 <div class="return">
29 <span class="back_href"> 21 <span class="back_href">
30 <i class="iconfont icon-jiantou-copy"></i>返回 22 <i class="iconfont icon-jiantou-copy"></i>返回
31 </span> 23 </span>
32 </div> 24 </div>
33 填写电子订单 25 填写电子订单
34 -</div>  
35 -<div class="test_num"></div>  
36 -<div class="header_place"></div> 26 + </div>
  27 + <div class="test_num"></div>
  28 + <div class="header_place"></div>
37 29
38 -<div class="tab_tit"> 30 + <div class="tab_tit">
39 <p class="tab_item active">填写电子订单</p> 31 <p class="tab_item active">填写电子订单</p>
40 <p class="tab_item view_orders">查看已提交订单</p> 32 <p class="tab_item view_orders">查看已提交订单</p>
41 -</div> 33 + </div>
42 34
43 -<div class="form_data"> 35 + <div class="form_data">
44 <!--第一步--> 36 <!--第一步-->
45 <div class="write_one" style="display: ;"> 37 <div class="write_one" style="display: ;">
46 <div class="register_item baby_name"> 38 <div class="register_item baby_name">
@@ -113,8 +105,8 @@ @@ -113,8 +105,8 @@
113 </div> 105 </div>
114 </div> 106 </div>
115 </notempty> 107 </notempty>
  108 + </div>
116 </div> 109 </div>
117 -  
118 <div class="mask" style="display: none;"> 110 <div class="mask" style="display: none;">
119 <!--订单修改--> 111 <!--订单修改-->
120 <div class="order_change" style="display: block;"> 112 <div class="order_change" style="display: block;">
@@ -130,7 +122,7 @@ @@ -130,7 +122,7 @@
130 </div> 122 </div>
131 </div> 123 </div>
132 124
133 -<div class="bottom_icont"> 125 +<div class="bottom_icon">
134 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" /> 126 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" />
135 <p class="bottom_text">{$site_info.site_name}</p> 127 <p class="bottom_text">{$site_info.site_name}</p>
136 </div> 128 </div>
@@ -16,19 +16,19 @@ @@ -16,19 +16,19 @@
16 <div class="notice" style="position: fixed;top: 0;display: none;z-index: 1000;height: 100%;" onclick="$(this).hide()"> 16 <div class="notice" style="position: fixed;top: 0;display: none;z-index: 1000;height: 100%;" onclick="$(this).hide()">
17 <img src="__TMPL__/public/mobile/images/2.png"/> 17 <img src="__TMPL__/public/mobile/images/2.png"/>
18 </div> 18 </div>
19 -  
20 -<div class="header"> 19 +<div class="content_height">
  20 + <div class="header">
21 <div class="return"> 21 <div class="return">
22 <span class="back_href"> 22 <span class="back_href">
23 <i class="iconfont icon-jiantou-copy"></i>返回 23 <i class="iconfont icon-jiantou-copy"></i>返回
24 </span> 24 </span>
25 </div> 25 </div>
26 订单确认 26 订单确认
27 -</div>  
28 -<div class="header_place"></div> 27 + </div>
  28 + <div class="header_place"></div>
29 29
30 -<div class="test_num"></div>  
31 -<notempty name="orderInfo.groupA"> 30 + <div class="test_num"></div>
  31 + <notempty name="orderInfo.groupA">
32 <!--基本信息--> 32 <!--基本信息-->
33 <div class="order_item"> 33 <div class="order_item">
34 <div class="item_tit"> 34 <div class="item_tit">
@@ -43,9 +43,9 @@ @@ -43,9 +43,9 @@
43 </notempty> 43 </notempty>
44 </volist> 44 </volist>
45 </div> 45 </div>
46 -</notempty> 46 + </notempty>
47 47
48 -<notempty name="orderInfo.groupB"> 48 + <notempty name="orderInfo.groupB">
49 <!--订购人信息--> 49 <!--订购人信息-->
50 <div class="order_item"> 50 <div class="order_item">
51 <div class="item_tit"> 51 <div class="item_tit">
@@ -60,9 +60,9 @@ @@ -60,9 +60,9 @@
60 </notempty> 60 </notempty>
61 </volist> 61 </volist>
62 </div> 62 </div>
63 -</notempty> 63 + </notempty>
64 64
65 -<notempty name="orderInfo.groupC"> 65 + <notempty name="orderInfo.groupC">
66 <!--收货信息--> 66 <!--收货信息-->
67 <div class="order_item"> 67 <div class="order_item">
68 <div class="item_tit"> 68 <div class="item_tit">
@@ -77,9 +77,9 @@ @@ -77,9 +77,9 @@
77 </notempty> 77 </notempty>
78 </volist> 78 </volist>
79 </div> 79 </div>
80 -</notempty> 80 + </notempty>
81 81
82 -<notempty name="orderInfo.groupD"> 82 + <notempty name="orderInfo.groupD">
83 <!--订购信息--> 83 <!--订购信息-->
84 <div class="order_item"> 84 <div class="order_item">
85 <div class="item_tit"> 85 <div class="item_tit">
@@ -99,10 +99,11 @@ @@ -99,10 +99,11 @@
99 </notempty> 99 </notempty>
100 </volist> 100 </volist>
101 </div> 101 </div>
102 -</notempty> 102 + </notempty>
103 103
104 -<div class="btn"> 104 + <div class="btn">
105 确定，去支付 105 确定，去支付
  106 + </div>
106 </div> 107 </div>
107 108
108 <div class="bottom_icon"> 109 <div class="bottom_icon">
@@ -8,9 +8,7 @@ @@ -8,9 +8,7 @@
8 <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/augly.css" /> 8 <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/augly.css" />
9 <title>物流单号查询</title> 9 <title>物流单号查询</title>
10 <style type="text/css"> 10 <style type="text/css">
11 - html,body {  
12 - height: 100%;  
13 - } 11 +
14 </style> 12 </style>
15 </head> 13 </head>
16 14
@@ -28,31 +28,32 @@ @@ -28,31 +28,32 @@
28 </head> 28 </head>
29 29
30 <body> 30 <body>
31 -<div class="header"> 31 +<div class="content_height">
  32 + <div class="header">
32 <div class="return"> 33 <div class="return">
33 <span class="back_href"> 34 <span class="back_href">
34 <i class="iconfont icon-jiantou-copy"></i>返回 35 <i class="iconfont icon-jiantou-copy"></i>返回
35 </span> 36 </span>
36 </div> 37 </div>
37 我要支付 38 我要支付
38 -</div>  
39 -<div class="test_num"></div>  
40 -<div class="header_place"></div>  
41 -<!--banner-->  
42 -<div class="banner"> 39 + </div>
  40 + <div class="test_num"></div>
  41 + <div class="header_place"></div>
  42 + <!--banner-->
  43 + <div class="banner">
43 <img src="{:cmf_get_asset_url($slide['image'])}" /> 44 <img src="{:cmf_get_asset_url($slide['image'])}" />
44 -</div> 45 + </div>
45 46
46 -<div class="see_order"> 47 + <div class="see_order">
47 <div class="public_title">感谢选择巧虎!</div> 48 <div class="public_title">感谢选择巧虎!</div>
48 <div class="public_word">您的订单已生成</div> 49 <div class="public_word">您的订单已生成</div>
49 50
50 <div class="btn"> 51 <div class="btn">
51 返回首页 52 返回首页
52 </div> 53 </div>
  54 + </div>
53 </div> 55 </div>
54 -  
55 -<div class="bottom_icon position_a"> 56 +<div class="bottom_icon">
56 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" /> 57 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" />
57 <p class="bottom_text">{$site_info.site_name}</p> 58 <p class="bottom_text">{$site_info.site_name}</p>
58 </div> 59 </div>
@@ -7,32 +7,25 @@ @@ -7,32 +7,25 @@
7 <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/augly.css" /> 7 <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/augly.css" />
8 <title>查询结果</title> 8 <title>查询结果</title>
9 <style type="text/css"> 9 <style type="text/css">
10 - .bottom_icon {  
11 - display: flex;  
12 - justify-content: center;  
13 - position:fixed;  
14 - bottom: 0.2rem;  
15 - left: 0;  
16 - right: 0;  
17 - /*margin: 0.42rem auto 0.34rem;*/  
18 - } 10 +
19 </style> 11 </style>
20 </head> 12 </head>
21 <body> 13 <body>
22 <div class="test_num"> 14 <div class="test_num">
23 已复制 15 已复制
24 </div> 16 </div>
25 -<div class="header"> 17 +<div class="content_height">
  18 + <div class="header">
26 <div class="return"> 19 <div class="return">
27 <span class="back_href"> 20 <span class="back_href">
28 <i class="iconfont icon-jiantou-copy"></i>返回 21 <i class="iconfont icon-jiantou-copy"></i>返回
29 </span> 22 </span>
30 </div> 23 </div>
31 查询结果 24 查询结果
32 -</div>  
33 -<div class="header_place"></div>  
34 -<p class="order_tit">最近三次物流单号</p>  
35 -<volist name="list" id="vo"> 25 + </div>
  26 + <div class="header_place"></div>
  27 + <p class="order_tit">最近三次物流单号</p>
  28 + <volist name="list" id="vo">
36 <div class="order_item"> 29 <div class="order_item">
37 <div class="copy_wrap" data-index='{$key}' data-order_num='{$vo.express}' data-clipboard-target="num_detail" onclick=""> 30 <div class="copy_wrap" data-index='{$key}' data-order_num='{$vo.express}' data-clipboard-target="num_detail" onclick="">
38 <i class="iconfont icon-wendang"></i>复制 31 <i class="iconfont icon-wendang"></i>复制
@@ -45,36 +38,10 @@ @@ -45,36 +38,10 @@
45 <div class="order_data"><span>发货日期</span> <span class="data_detail">{:date('Y-m-d',strtotime($vo['send_time']))}</span><span class="data_month">{$vo.version}</span></div> 38 <div class="order_data"><span>发货日期</span> <span class="data_detail">{:date('Y-m-d',strtotime($vo['send_time']))}</span><span class="data_month">{$vo.version}</span></div>
46 </div> 39 </div>
47 </div> 40 </div>
48 -</volist>  
49 -  
50 -<!--<div class="order_item">-->  
51 - <!--<div class="copy_wrap" data-index='2' data-order_num='2819 3847 4488 5778'>-->  
52 - <!--<i class="iconfont icon-wendang"></i> 复制-->  
53 - <!--</div>-->  
54 - <!--<div class="order_num">-->  
55 - <!--<div class="num_wrap">-->  
56 - <!--<p class="num_detail" id="current2" data-clipboard-text="num_detail">2819 3847 4488 5778</p>-->  
57 - <!--<p class="num_text">运单号</p>-->  
58 - <!--</div>-->  
59 - <!--<div class="order_data">发货日期 <span class="data_detail">2018-7-10</span><span class="data_month">12月龄版</span></div>-->  
60 - <!--</div>-->  
61 -<!--</div>-->  
62 -  
63 -<!--<div class="order_item">-->  
64 - <!--<div class="copy_wrap" data-index='3'>-->  
65 - <!--<i class="iconfont icon-wendang"></i> 复制-->  
66 -  
67 - <!--</div>-->  
68 - <!--<div class="order_num">-->  
69 - <!--<div class="num_wrap">-->  
70 - <!--<p class="num_detail" id="current3">2819 3847 4488 5779</p>-->  
71 - <!--<p class="num_text">运单号</p>-->  
72 - <!--</div>-->  
73 - <!--<div class="order_data">发货日期 <span class="data_detail">2018-7-10</span><span class="data_month">12月龄版</span></div>-->  
74 - <!--</div>-->  
75 -<!--</div>--> 41 + </volist>
  42 +</div>
76 43
77 -<div class="bottom_icon position_a"> 44 +<div class="bottom_icon">
78 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" /> 45 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" />
79 <p class="bottom_text">{$site_info.site_name}</p> 46 <p class="bottom_text">{$site_info.site_name}</p>
80 </div> 47 </div>
@@ -8,29 +8,28 @@ @@ -8,29 +8,28 @@
8 <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/pay/my_pay.css" /> 8 <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/pay/my_pay.css" />
9 <title>我要支付</title> 9 <title>我要支付</title>
10 <style type="text/css"> 10 <style type="text/css">
11 - html,body {  
12 - height: 100%;  
13 - } 11 +
14 </style> 12 </style>
15 </head> 13 </head>
16 14
17 <body> 15 <body>
18 -<div class="header"> 16 +<div class="content_height">
  17 + <div class="header">
19 <div class="return"> 18 <div class="return">
20 <span class="back_href"> 19 <span class="back_href">
21 <i class="iconfont icon-jiantou-copy"></i>返回 20 <i class="iconfont icon-jiantou-copy"></i>返回
22 </span> 21 </span>
23 </div> 22 </div>
24 我要支付 23 我要支付
25 -</div>  
26 -<div class="test_num"></div>  
27 -<div class="header_place"></div>  
28 -<!--banner-->  
29 -<div class="banner"> 24 + </div>
  25 + <div class="test_num"></div>
  26 + <div class="header_place"></div>
  27 + <!--banner-->
  28 + <div class="banner">
30 <img src="{:cmf_get_asset_url($slide['image'])}" /> 29 <img src="{:cmf_get_asset_url($slide['image'])}" />
31 -</div> 30 + </div>
32 31
33 -<div class="see_order"> 32 + <div class="see_order">
34 <div class="public_input"> 33 <div class="public_input">
35 <p class="public_tit">订单确认码</p> 34 <p class="public_tit">订单确认码</p>
36 <input type="text" name="number" id="number" value="" class="public_detail" placeholder="请输入订单确认码" /> 35 <input type="text" name="number" id="number" value="" class="public_detail" placeholder="请输入订单确认码" />
@@ -39,8 +38,8 @@ @@ -39,8 +38,8 @@
39 <div class="btn"> 38 <div class="btn">
40 确认支付 39 确认支付
41 </div> 40 </div>
  41 + </div>
42 </div> 42 </div>
43 -  
44 <div class="bottom_icon position_a"> 43 <div class="bottom_icon position_a">
45 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" /> 44 <img src="__TMPL__/public/mobile/images/biglogo@2x.png" class="bottom_img" />
46 <p class="bottom_text">{$site_info.site_name}</p> 45 <p class="bottom_text">{$site_info.site_name}</p>
@@ -45,7 +45,7 @@ html, @@ -45,7 +45,7 @@ html,
45 body { 45 body {
46 /*position: relative;*/ 46 /*position: relative;*/
47 width: 100%; 47 width: 100%;
48 - /*height: 100%;*/ 48 + height: 100%;
49 padding: 0; 49 padding: 0;
50 margin: 0; 50 margin: 0;
51 background-color: #F8F8F8; 51 background-color: #F8F8F8;
@@ -92,6 +92,11 @@ textarea { @@ -92,6 +92,11 @@ textarea {
92 height: 100%; 92 height: 100%;
93 } 93 }
94 94
  95 +.content_height {
  96 + box-sizing: border-box;/*为元素指定的任何内边距和边框都将在已设定的宽度和高度内进行绘制*/
  97 + min-height: 100%;
  98 + padding-bottom: 1rem;
  99 +}
95 .container{ -webkit-overflow-scrolling:touch;} 100 .container{ -webkit-overflow-scrolling:touch;}
96 101
97 102
@@ -223,11 +228,13 @@ span.back_href { @@ -223,11 +228,13 @@ span.back_href {
223 .bottom_icon { 228 .bottom_icon {
224 display: flex; 229 display: flex;
225 justify-content: center; 230 justify-content: center;
  231 + height: .7rem;
  232 + margin-top: -0.7rem;
226 /*position: absolute;*/ 233 /*position: absolute;*/
227 - position:fixed;  
228 - bottom: 0.2rem;  
229 - left: 0;  
230 - right: 0; 234 + /*position:fixed;*/
  235 + /*bottom: 0.2rem;*/
  236 + /*left: 0;*/
  237 + /*right: 0;*/
231 /*margin: 0.42rem auto 0.34rem;*/ 238 /*margin: 0.42rem auto 0.34rem;*/
232 } 239 }
233 .bottom_img{ 240 .bottom_img{
1 -.container{  
2 - margin-top: -1rem;  
3 - padding-top: 1rem; 1 +.content_height {
4 background: url(../../images/bg.png)center no-repeat; 2 background: url(../../images/bg.png)center no-repeat;
5 background-size: 100% 100%; 3 background-size: 100% 100%;
6 } 4 }
@@ -91,12 +91,3 @@ html, body { @@ -91,12 +91,3 @@ html, body {
91 background-color: #FEFBF3; 91 background-color: #FEFBF3;
92 color: #EAA512; 92 color: #EAA512;
93 } 93 }
94 -.bottom_icon {  
95 - display: flex;  
96 - justify-content: center;  
97 - position: relative;  
98 - bottom: 0;  
99 - left: 0;  
100 - right: 0;  
101 - padding: 0.42rem 0 0.34rem;  
102 -}