浏览代码

页面样式修改

wangxiaoming 7 年之前
父节点
当前提交
29c76f3f47

+ 1 - 1
watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/noreasonBackMapper.xml

@@ -152,7 +152,7 @@
       #{noreasonBackBackTel,jdbcType=CHAR}, #{noreasonBackBackLogisticsCompany,jdbcType=VARCHAR}, 
       #{noreasonBackBackTel,jdbcType=CHAR}, #{noreasonBackBackLogisticsCompany,jdbcType=VARCHAR}, 
       #{noreasonBackBackLogisticsNo,jdbcType=VARCHAR}, #{noreasonBackBackPostage,jdbcType=INTEGER}, 
       #{noreasonBackBackLogisticsNo,jdbcType=VARCHAR}, #{noreasonBackBackPostage,jdbcType=INTEGER}, 
       #{noreasonBackBackMachineNo,jdbcType=VARCHAR}, #{noreasonBackDesc,jdbcType=VARCHAR}, 
       #{noreasonBackBackMachineNo,jdbcType=VARCHAR}, #{noreasonBackDesc,jdbcType=VARCHAR}, 
-      #{noreasonBackState,jdbcType=BIT}, #{noreasonBackAlipay,jdbcType=VARCHAR}, #{noreasonBackIsTransfer,jdbcType=BIT}
+      #{noreasonBackState,jdbcType=BIT}, #{noreasonBackAlipay,jdbcType=VARCHAR},#{noreasonBackAlipayName,jdbcType=VARCHAR}, #{noreasonBackIsTransfer,jdbcType=BIT}
       )
       )
   </insert>
   </insert>
 
 

+ 4 - 6
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_list.ftl

@@ -37,16 +37,15 @@
 <div class="page-container">
 <div class="page-container">
     <div class="text-c">
     <div class="text-c">
         <form action="${path}/admin/customer/select_customer_list" method="post">
         <form action="${path}/admin/customer/select_customer_list" method="post">
-            <button type="button" style="cursor:pointer; float: left;height: 35px;" class="my-btn-search" onclick="toAddCustomer();">新建客诉</button>
+            <button type="button" style="cursor:pointer; float: left;height: 35px;margin-right: 30px;" class="my-btn-search" onclick="toAddCustomer();">新建客诉</button>
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px; margin-left: -65px;" value="${customerInfo.customerId!}" placeholder="客诉编号" id="customerId" name="customerId">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px; margin-left: -65px;" value="${customerInfo.customerId!}" placeholder="客诉编号" id="customerId" name="customerId">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.sendLogisticsNo!}" placeholder="物流编号" id="sendLogisticsNo" name="sendLogisticsNo">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.sendLogisticsNo!}" placeholder="物流编号" id="sendLogisticsNo" name="sendLogisticsNo">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerName!}" placeholder="请输入姓名" id="customerName" name="customerName">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerName!}" placeholder="请输入姓名" id="customerName" name="customerName">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerTel!}" placeholder="请输入电话号码" id="customerTel" name="customerTel">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerTel!}" placeholder="请输入电话号码" id="customerTel" name="customerTel">
-            <input type="text" style="width:150px;height:36px;margin-right: 0px;" name="startTime" id="startTime" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="${(customerInfo.startTime?string("yyyy-MM-dd"))!''}" readonly="readonly"/>-
-            <input type="text" style="width:150px;height:36px;margin-right: 0px;" name="endTime" id="endTime" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="${(customerInfo.endTime?string("yyyy-MM-dd"))!''}" readonly="readonly"/>
+            <input type="text" style="width:90px;height:36px;margin-right: 0px;" name="startTime" id="startTime" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="${(customerInfo.startTime?string("yyyy-MM-dd"))!''}" readonly="readonly"/>-
+            <input type="text" style="width:90px;height:36px;margin-right: 0px;" name="endTime" id="endTime" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="${(customerInfo.endTime?string("yyyy-MM-dd"))!''}" readonly="readonly"/>
 
 
             <#--<input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.describeTitle!}" placeholder="请输入问题描述" id="describeTitle" name="describeTitle">-->
             <#--<input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.describeTitle!}" placeholder="请输入问题描述" id="describeTitle" name="describeTitle">-->
-            <br>
             <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="height: 36px;width: 100px;margin: 0px;padding: 6px 10px 6px 15px;">
             <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="height: 36px;width: 100px;margin: 0px;padding: 6px 10px 6px 15px;">
                 <option value="">处理结果</option>
                 <option value="">处理结果</option>
                 <option value="1" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 1 >selected="selected"</#if></#if>>已解决</option>
                 <option value="1" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 1 >selected="selected"</#if></#if>>已解决</option>
@@ -102,8 +101,7 @@
                     </#list>
                     </#list>
                 </#if>
                 </#if>
             </select>
             </select>
-            <br>
-            <button type="submit" class="btn" style="background: #32a3d8;color: #fff;height: 35px;margin-top: 10px;" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
+            <button type="submit" class="btn" style="background: #32a3d8;color: #fff;height: 35px; id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
         </form>
         </form>
     </div>
     </div>
 
 

+ 22 - 12
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_back_goods.ftl

@@ -72,8 +72,8 @@
                     <div class="formControls col-2 col-sm-2 text-r">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄回信息</strong>
                         <strong>寄回信息</strong>
                     </div>
                     </div>
-                    <div class="formControls col-10 col-sm-10">
-                        <div style="width: 120px;display: inline-block;margin-right: 10px;">
+                    <div class="formControls col-4 col-sm-4">
+                        <div style="">
                             <span class="select-box">
                             <span class="select-box">
                                 <select name="backGoodsBackLogisticsCompany" id="backGoodsBackLogisticsCompany" class="select" seleType="send">
                                 <select name="backGoodsBackLogisticsCompany" id="backGoodsBackLogisticsCompany" class="select" seleType="send">
                                     <option value="">物流公司</option>
                                     <option value="">物流公司</option>
@@ -95,18 +95,20 @@
                                 </select>
                                 </select>
                             </span>
                             </span>
                         </div>
                         </div>
-                        <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="backGoodsBackLogisticsNo" name="backGoodsBackLogisticsNo" seleType="send">
+                    </div>
+                    <div class="formControls col-4 col-sm-4">
+                        <input style="" type="text" class="input-text" value="" placeholder="请输入快递单号" id="backGoodsBackLogisticsNo" name="backGoodsBackLogisticsNo" seleType="send">
                     </div>
                     </div>
                 </div>
                 </div>
 
 
-                <div class="row cl" style="position: relative;display: none;" id="backUserInfo">
+                <div class="row cl" style="" id="backUserInfo">
                     <div class="formControls col-2 col-sm-2 text-r">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄件信息</strong>
                         <strong>寄件信息</strong>
                     </div>
                     </div>
-                    <div class="formControls col-5 col-sm-5">
+                    <div class="formControls col-4 col-sm-4">
                         <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="backGoodsBackName" name="backGoodsBackName" seleType="send">
                         <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="backGoodsBackName" name="backGoodsBackName" seleType="send">
                     </div>
                     </div>
-                    <div class="formControls col-5 col-sm-5">
+                    <div class="formControls col-4 col-sm-4">
                         <input type="text" class="input-text" value="" placeholder="寄件人电话" id="backGoodsBackTel" name="backGoodsBackTel" seleType="send">
                         <input type="text" class="input-text" value="" placeholder="寄件人电话" id="backGoodsBackTel" name="backGoodsBackTel" seleType="send">
                     </div>
                     </div>
                 </div>
                 </div>
@@ -129,11 +131,11 @@
              <#--</div>-->
              <#--</div>-->
 
 
        <div class="tabCon">
        <div class="tabCon">
-            <div class="row cl" id="backTransferInfo" style="display: none">
+            <div class="row cl" id="backTransferInfo" style="">
                 <div class="formControls col-2 col-sm-2 text-r">
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>邮费处理</strong>
                     <strong>邮费处理</strong>
                 </div>
                 </div>
-                <div class="formControls col-10 col-sm-10 skin-minimal">
+                <div class="formControls col-9 col-sm-9 skin-minimal">
                     <div class="radio-box">
                     <div class="radio-box">
                         <input type="radio" id="tel-6" name="backGoodsIsTransfer" value="0" seleType="postage">
                         <input type="radio" id="tel-6" name="backGoodsIsTransfer" value="0" seleType="postage">
                         <label for="tel-6">不需要转账</label>
                         <label for="tel-6">不需要转账</label>
@@ -153,10 +155,18 @@
                 <div class="formControls col-2 col-sm-2 text-r">
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>邮费信息</strong>
                     <strong>邮费信息</strong>
                 </div>
                 </div>
-                <div class="formControls col-2 col-sm-2 text-r">
-                    <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="backGoodsBackPostage" name="backGoodsBackPostage" seleType="postage">
-                    <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="backGoodsAlipay" name="backGoodsAlipay" seleType="postage">
-                    <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="backGoodsAlipayName" name="backGoodsAlipayName" seleType="postage">
+                <div class="formControls col-9 col-sm-9 text-r">
+                    <div class="formControls col-4 col-sm-4 text-r" style="padding-left: 0px;">
+                        <input  type="text" class="input-text" value="" placeholder="寄回邮费" id="backGoodsBackPostage" name="backGoodsBackPostage" seleType="postage">
+                    </div>
+
+                    <div class="formControls col-4 col-sm-4 text-r" style="padding-left: 0px;">
+                        <input  type="text" class="input-text" value="" placeholder="用户支付宝账户" id="backGoodsAlipay" name="backGoodsAlipay" seleType="postage">
+                    </div>
+
+                    <div class="formControls col-4 col-sm-4 text-r" style="padding-left: 0px;">
+                        <input  type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="backGoodsAlipayName" name="backGoodsAlipayName" seleType="postage">
+                    </div>
                 </div>
                 </div>
             </div>
             </div>
 
 

+ 24 - 13
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_noreason_back.ftl

@@ -45,7 +45,7 @@
                     <div class="formControls col-2 col-sm-2 text-r">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>产品寄回</strong>
                         <strong>产品寄回</strong>
                     </div>
                     </div>
-                    <div class="formControls col-10 col-sm-10 skin-minimal">
+                    <div class="formControls col-8 col-sm-8 skin-minimal">
                         <div class="radio-box">
                         <div class="radio-box">
                             <input type="radio" id="tel-3" name="noreasonBackBackStatus" value="1" seleType="send">
                             <input type="radio" id="tel-3" name="noreasonBackBackStatus" value="1" seleType="send">
                             <label for="tel-3">未寄回</label>
                             <label for="tel-3">未寄回</label>
@@ -65,8 +65,8 @@
                     <div class="formControls col-2 col-sm-2 text-r">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄回信息</strong>
                         <strong>寄回信息</strong>
                     </div>
                     </div>
-                    <div class="formControls col-10 col-sm-10">
-                        <div style="width: 120px;display: inline-block;margin-right: 10px;">
+                    <div class="formControls col-4 col-sm-4">
+                        <div style="width:  100%;display: inline-block;margin-right: 10px;">
                             <span class="select-box">
                             <span class="select-box">
                                 <select name="noreasonBackBackLogisticsCompany" id="noreasonBackBackLogisticsCompany" class="select" seleType="send">
                                 <select name="noreasonBackBackLogisticsCompany" id="noreasonBackBackLogisticsCompany" class="select" seleType="send">
                                     <option value="">物流公司</option>
                                     <option value="">物流公司</option>
@@ -88,18 +88,21 @@
                                 </select>
                                 </select>
                             </span>
                             </span>
                         </div>
                         </div>
-                        <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="noreasonBackBackLogisticsNo" name="noreasonBackBackLogisticsNo" seleType="send">
+                    </div>
+
+                    <div class="formControls col-4 col-sm-4">
+                        <input style="" type="text" class="input-text" value="" placeholder="请输入快递单号" id="noreasonBackBackLogisticsNo" name="noreasonBackBackLogisticsNo" seleType="send">
                     </div>
                     </div>
                 </div>
                 </div>
 
 
-                <div class="row cl" style="position: relative;display: none;" id="backUserInfo">
+                <div class="row cl"  id="backUserInfo">
                     <div class="formControls col-2 col-sm-2 text-r">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄件信息</strong>
                         <strong>寄件信息</strong>
                     </div>
                     </div>
-                    <div class="formControls col-5 col-sm-5">
+                    <div class="formControls col-4 col-sm-4">
                         <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="noreasonBackBackName" name="noreasonBackBackName" seleType="send">
                         <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="noreasonBackBackName" name="noreasonBackBackName" seleType="send">
                     </div>
                     </div>
-                    <div class="formControls col-5 col-sm-5">
+                    <div class="formControls col-4 col-sm-4">
                         <input type="text" class="input-text" value="" placeholder="寄件人电话" id="noreasonBackBackTel" name="noreasonBackBackTel" seleType="send">
                         <input type="text" class="input-text" value="" placeholder="寄件人电话" id="noreasonBackBackTel" name="noreasonBackBackTel" seleType="send">
                     </div>
                     </div>
                 </div>
                 </div>
@@ -114,11 +117,11 @@
             </div>
             </div>
 
 
             <div class="tabCon">
             <div class="tabCon">
-                <div class="row cl" id="backTransferInfo" style="display: none">
+                <div class="row cl" id="backTransferInfo" >
                     <div class="formControls col-2 col-sm-2 text-r">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>邮费处理</strong>
                         <strong>邮费处理</strong>
                     </div>
                     </div>
-                    <div class="formControls col-10 col-sm-10 skin-minimal">
+                    <div class="formControls col-8 col-sm-8 skin-minimal">
                         <div class="radio-box">
                         <div class="radio-box">
                             <input type="radio" id="tel-6" name="noreasonBackIsTransfer" value="0" seleType="postage">
                             <input type="radio" id="tel-6" name="noreasonBackIsTransfer" value="0" seleType="postage">
                             <label for="tel-6">不需要转账</label>
                             <label for="tel-6">不需要转账</label>
@@ -138,10 +141,18 @@
                     <div class="formControls col-2 col-sm-2 text-r">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>邮费信息</strong>
                         <strong>邮费信息</strong>
                     </div>
                     </div>
-                    <div class="formControls col-2 col-sm-2 text-r">
-                        <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="noreasonBackBackPostage" name="noreasonBackBackPostage" seleType="postage">
-                        <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="noreasonBackAlipay" name="noreasonBackAlipay" seleType="postage">
-                        <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="noreasonBackAlipayName" name="noreasonBackAlipayName" seleType="postage">
+                    <div class="formControls col-9 col-sm-9 text-r">
+                        <div class="formControls col-4 col-sm-4 text-r" style="padding-left: 0px;">
+                            <input  type="text" class="input-text" value="" placeholder="寄回邮费" id="noreasonBackBackPostage" name="noreasonBackBackPostage" seleType="postage">
+                        </div>
+
+                        <div class="formControls col-4 col-sm-4 text-r" style="padding-left: 0px;">
+                            <input  type="text" class="input-text" value="" placeholder="用户支付宝账户" id="noreasonBackAlipay" name="noreasonBackAlipay" seleType="postage">
+                        </div>
+
+                        <div class="formControls col-4 col-sm-4 text-r" style="padding-left: 0px;">
+                            <input  type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="noreasonBackAlipayName" name="noreasonBackAlipayName" seleType="postage">
+                        </div>
                     </div>
                     </div>
                 </div>
                 </div>
 
 

+ 2 - 2
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_reissue.ftl

@@ -78,10 +78,10 @@
             <div class="formControls col-2 col-sm-2 text-r">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>用户信息</strong>
                 <strong>用户信息</strong>
             </div>
             </div>
-            <div class="formControls col-5 col-sm-5">
+            <div class="formControls col-4 col-sm-4">
                 <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="reissueSendName" name="reissueSendName" seleType="sendInformation">
                 <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="reissueSendName" name="reissueSendName" seleType="sendInformation">
             </div>
             </div>
-            <div class="formControls col-5 col-sm-5">
+            <div class="formControls col-4 col-sm-4">
                 <input type="text" class="input-text" value="" placeholder="填写收件人手机号" id="reissueSendTel" name="reissueSendTel" seleType="sendInformation">
                 <input type="text" class="input-text" value="" placeholder="填写收件人手机号" id="reissueSendTel" name="reissueSendTel" seleType="sendInformation">
             </div>
             </div>
         </div>
         </div>

+ 42 - 31
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_renewed.ftl

@@ -60,7 +60,7 @@
                 <div class="formControls col-2 col-sm-2 text-r">
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>产品寄回</strong>
                     <strong>产品寄回</strong>
                 </div>
                 </div>
-                <div class="formControls col-10 col-sm-10 skin-minimal">
+                <div class="formControls col-8 col-sm-8 skin-minimal">
                     <div class="radio-box">
                     <div class="radio-box">
                         <input type="radio" id="tel-3" name="renewedBackStatus" value="1" seleType="send">
                         <input type="radio" id="tel-3" name="renewedBackStatus" value="1" seleType="send">
                         <label for="tel-3">未寄回</label>
                         <label for="tel-3">未寄回</label>
@@ -80,30 +80,33 @@
                 <div class="formControls col-2 col-sm-2 text-r">
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>寄回信息</strong>
                     <strong>寄回信息</strong>
                 </div>
                 </div>
-                <div class="formControls col-10 col-sm-10">
-                    <div style="width: 120px;display: inline-block;margin-right: 10px;">
-			<span class="select-box">
-				<select name="renewedBackLogisticsCompany" id="renewedBackLogisticsCompany" class="select" seleType="send">
-                    <option value="">物流公司</option>
-					<option value="sto">申通快递</option>
-                    <option value="yto">圆通快递</option>
-                    <option value="sf">顺丰快递</option>
-                    <option value="ems">邮政EMS</option>
-                    <option value="zto">中通快递</option>
-                    <option value="zjs">宅急送</option>
-                    <option value="yunda">韵达快递</option>
-                    <option value="cces">cces快递</option>
-                    <option value="pick">上门提货</option>
-                    <option value="htky">汇通快递</option>
-                    <option value="ttkdex">天天快递</option>
-                    <option value="stars">星晨急便</option>
-                    <option value="jd">京东快递</option>
-                    <option value="01">其他</option>
-                    <option value="02">上门送货</option>
-				</select>
-			</span>
+                <div class="formControls col-4 col-sm-4">
+                    <div style="width: 100%;display: inline-block;margin-right: 10px;">
+                        <span class="select-box">
+                                <select name="renewedBackLogisticsCompany" id="renewedBackLogisticsCompany" class="select" seleType="send">
+                                    <option value="">物流公司</option>
+                                    <option value="sto">申通快递</option>
+                                    <option value="yto">圆通快递</option>
+                                    <option value="sf">顺丰快递</option>
+                                    <option value="ems">邮政EMS</option>
+                                    <option value="zto">中通快递</option>
+                                    <option value="zjs">宅急送</option>
+                                    <option value="yunda">韵达快递</option>
+                                    <option value="cces">cces快递</option>
+                                    <option value="pick">上门提货</option>
+                                    <option value="htky">汇通快递</option>
+                                    <option value="ttkdex">天天快递</option>
+                                    <option value="stars">星晨急便</option>
+                                    <option value="jd">京东快递</option>
+                                    <option value="01">其他</option>
+                                    <option value="02">上门送货</option>
+                                </select>
+                        </span>
                     </div>
                     </div>
-                    <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="renewedBackLogisticsNo" name="renewedBackLogisticsNo" seleType="send">
+                </div>
+
+                <div class="formControls col-4 col-sm-4">
+                    <input style="margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="renewedBackLogisticsNo" name="renewedBackLogisticsNo" seleType="send">
                     <#--<input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="renewedBackPostage" name="renewedBackPostage">
                     <#--<input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="renewedBackPostage" name="renewedBackPostage">
                     <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="renewedAlipay" name="renewedAlipay">-->
                     <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="renewedAlipay" name="renewedAlipay">-->
                 </div>
                 </div>
@@ -113,10 +116,10 @@
                 <div class="formControls col-2 col-sm-2 text-r">
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>寄件信息</strong>
                     <strong>寄件信息</strong>
                 </div>
                 </div>
-                <div class="formControls col-5 col-sm-5">
+                <div class="formControls col-4 col-sm-4">
                     <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="renewedBackName" name="renewedBackName" seleType="send">
                     <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="renewedBackName" name="renewedBackName" seleType="send">
                 </div>
                 </div>
-                <div class="formControls col-5 col-sm-5">
+                <div class="formControls col-4 col-sm-4">
                     <input type="text" class="input-text" value="" placeholder="寄件人电话" id="renewedBackTel" name="renewedBackTel" seleType="send">
                     <input type="text" class="input-text" value="" placeholder="寄件人电话" id="renewedBackTel" name="renewedBackTel" seleType="send">
                 </div>
                 </div>
             </div>
             </div>
@@ -134,7 +137,7 @@
                 <div class="formControls col-2 col-sm-2 text-r">
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>邮费处理</strong>
                     <strong>邮费处理</strong>
                 </div>
                 </div>
-                <div class="formControls col-10 col-sm-10 skin-minimal">
+                <div class="formControls col-8 col-sm-8 skin-minimal">
                     <div class="radio-box">
                     <div class="radio-box">
                         <input type="radio" id="tel-6" name="renewedIsTransfer" value="0" seleType="postage">
                         <input type="radio" id="tel-6" name="renewedIsTransfer" value="0" seleType="postage">
                         <label for="tel-6">不需要转账</label>
                         <label for="tel-6">不需要转账</label>
@@ -153,10 +156,18 @@
                 <div class="formControls col-2 col-sm-2 text-r">
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>邮费信息</strong>
                     <strong>邮费信息</strong>
                 </div>
                 </div>
-                <div class="formControls col-2 col-sm-2 text-r">
-                    <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="renewedBackPostage" name="renewedBackPostage" seleType="postage">
-                    <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="renewedAlipay" name="renewedAlipay" seleType="postage">
-                    <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="renewedAlipayName" name="renewedAlipayName" seleType="postage">
+                <div class="formControls col-9 col-sm-9 text-r">
+                    <div class="formControls col-4 col-sm-4 text-r" style="padding-left: 0px;">
+                        <input  type="text" class="input-text" value="" placeholder="寄回邮费" id="renewedBackPostage" name="renewedBackPostage" seleType="postage">
+                    </div>
+
+                    <div class="formControls col-4 col-sm-4 text-r" style="padding-left: 0px;">
+                        <input  type="text" class="input-text" value="" placeholder="用户支付宝账户" id="renewedAlipay" name="renewedAlipay" seleType="postage">
+                    </div>
+
+                    <div class="formControls col-4 col-sm-4 text-r" style="padding-left: 0px;">
+                        <input  type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="renewedAlipayName" name="renewedAlipayName" seleType="postage">
+                    </div>
                 </div>
                 </div>
             </div>
             </div>
 
 

+ 41 - 31
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_repair.ftl

@@ -62,7 +62,7 @@
                     <div class="formControls col-2 col-sm-2 text-r">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>产品寄回</strong>
                         <strong>产品寄回</strong>
                     </div>
                     </div>
-                    <div class="formControls col-10 col-sm-10 skin-minimal">
+                    <div class="formControls col-8 col-sm-8 skin-minimal">
                         <div class="radio-box">
                         <div class="radio-box">
                             <input type="radio" id="tel-3" name="repairBackStatus" value="1" seleType="send">
                             <input type="radio" id="tel-3" name="repairBackStatus" value="1" seleType="send">
                             <label for="tel-3">未寄回</label>
                             <label for="tel-3">未寄回</label>
@@ -82,30 +82,32 @@
                     <div class="formControls col-2 col-sm-2 text-r">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄回信息</strong>
                         <strong>寄回信息</strong>
                     </div>
                     </div>
-                    <div class="formControls col-10 col-sm-10">
-                        <div style="width: 120px;display: inline-block;margin-right: 10px;">
-			<span class="select-box">
-				<select name="repairBackLogisticsCompany" id="repairBackLogisticsCompany" class="select" seleType="send">
-                    <option value="">物流公司</option>
-					<option value="sto">申通快递</option>
-                    <option value="yto">圆通快递</option>
-                    <option value="sf">顺丰快递</option>
-                    <option value="ems">邮政EMS</option>
-                    <option value="zto">中通快递</option>
-                    <option value="zjs">宅急送</option>
-                    <option value="yunda">韵达快递</option>
-                    <option value="cces">cces快递</option>
-                    <option value="pick">上门提货</option>
-                    <option value="htky">汇通快递</option>
-                    <option value="ttkdex">天天快递</option>
-                    <option value="stars">星晨急便</option>
-                    <option value="jd">京东快递</option>
-                    <option value="01">其他</option>
-                    <option value="02">上门送货</option>
-				</select>
-			</span>
+                    <div class="formControls col-4 col-sm-4">
+                        <div style="width:  100%;display: inline-block;margin-right: 10px;">
+                            <span class="select-box">
+                                <select name="repairBackLogisticsCompany" id="repairBackLogisticsCompany" class="select" seleType="send">
+                                    <option value="">物流公司</option>
+                                    <option value="sto">申通快递</option>
+                                    <option value="yto">圆通快递</option>
+                                    <option value="sf">顺丰快递</option>
+                                    <option value="ems">邮政EMS</option>
+                                    <option value="zto">中通快递</option>
+                                    <option value="zjs">宅急送</option>
+                                    <option value="yunda">韵达快递</option>
+                                    <option value="cces">cces快递</option>
+                                    <option value="pick">上门提货</option>
+                                    <option value="htky">汇通快递</option>
+                                    <option value="ttkdex">天天快递</option>
+                                    <option value="stars">星晨急便</option>
+                                    <option value="jd">京东快递</option>
+                                    <option value="01">其他</option>
+                                    <option value="02">上门送货</option>
+                                </select>
+                            </span>
                         </div>
                         </div>
-                        <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="repairBackLogisticsNo" name="repairBackLogisticsNo" seleType="send">
+                    </div>
+                    <div class="formControls col-4 col-sm-4">
+                        <input style="margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="repairBackLogisticsNo" name="repairBackLogisticsNo" seleType="send">
                     <#--<input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="repairBackPostage" name="repairBackPostage">
                     <#--<input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="repairBackPostage" name="repairBackPostage">
                     <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="repairAlipay" name="repairAlipay">-->
                     <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="repairAlipay" name="repairAlipay">-->
                     </div>
                     </div>
@@ -115,10 +117,10 @@
                     <div class="formControls col-2 col-sm-2 text-r">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄件信息</strong>
                         <strong>寄件信息</strong>
                     </div>
                     </div>
-                    <div class="formControls col-5 col-sm-5">
+                    <div class="formControls col-4 col-sm-4">
                         <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="repairBackName" name="repairBackName" seleType="send">
                         <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="repairBackName" name="repairBackName" seleType="send">
                     </div>
                     </div>
-                    <div class="formControls col-5 col-sm-5">
+                    <div class="formControls col-4 col-sm-4">
                         <input type="text" class="input-text" value="" placeholder="寄件人电话" id="repairBackTel" name="repairBackTel" seleType="send">
                         <input type="text" class="input-text" value="" placeholder="寄件人电话" id="repairBackTel" name="repairBackTel" seleType="send">
                     </div>
                     </div>
                 </div>
                 </div>
@@ -136,7 +138,7 @@
                     <div class="formControls col-2 col-sm-2 text-r">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>邮费处理</strong>
                         <strong>邮费处理</strong>
                     </div>
                     </div>
-                    <div class="formControls col-10 col-sm-10 skin-minimal">
+                    <div class="formControls col-8 col-sm-8 skin-minimal">
                         <div class="radio-box">
                         <div class="radio-box">
                             <input type="radio" id="tel-6" name="repairIsTransfer" value="0" seleType="postage">
                             <input type="radio" id="tel-6" name="repairIsTransfer" value="0" seleType="postage">
                             <label for="tel-6">不需要转账</label>
                             <label for="tel-6">不需要转账</label>
@@ -155,10 +157,18 @@
                     <div class="formControls col-2 col-sm-2 text-r">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>邮费信息</strong>
                         <strong>邮费信息</strong>
                     </div>
                     </div>
-                    <div class="formControls col-2 col-sm-2 text-r">
-                        <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="repairBackPostage" name="repairBackPostage" seleType="postage">
-                        <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="repairAlipay" name="repairAlipay" seleType="postage">
-                        <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="repairAlipayName" name="repairAlipayName" seleType="postage">
+                    <div class="formControls col-9 col-sm-9 text-r">
+                        <div class="formControls col-4 col-sm-4 text-r" style="padding-left: 0px;">
+                            <input style="" type="text" class="input-text" value="" placeholder="寄回邮费" id="repairBackPostage" name="repairBackPostage" seleType="postage">
+                        </div>
+
+                        <div class="formControls col-4 col-sm-4 text-r" style="padding-left: 0px;">
+                            <input  type="text" class="input-text" value="" placeholder="用户支付宝账户" id="repairAlipay" name="repairAlipay" seleType="postage">
+                        </div>
+
+                        <div class="formControls col-4 col-sm-4 text-r" style="padding-left: 0px;">
+                            <input  type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="repairAlipayName" name="repairAlipayName" seleType="postage">
+                        </div>
                     </div>
                     </div>
                 </div>
                 </div>