新增免费领取充电器

tooth/css/iconfont.css

@@ -1,5 +1,5 @@
 @font-face {font-family: "iconfont";
-  src: url('../fonts/iconfont.ttf?t=1515658169779') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+  src: url('../fonts/iconfont.ttf?t=1520475482908') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
 }
 
 .iconfont {
@@ -53,3 +53,5 @@
 
 .icon-guanbi:before { content: "\e6e1"; }
 
+.icon-mianfeilingqu:before { content: "\e6e2"; }
+

tooth/css/main.css

@@ -142,7 +142,7 @@ p{color: #999;}
 .add_gwc:active{color: #fff;background-color:#ff1b68;}
 .gwc_null {padding: 12% 0 8% 0;text-align: center;display: none;}
 .tb-clearing {width: 100%;background-color: #fff;border-top: 1px solid rgba(0,0,0,.1);}
-.tb-clearing tr td:first-child {width: 22%;text-align: right;min-width: 3.5em;}
+.tb-clearing tr td:first-child {width: 22%;text-align: center;min-width: 3.5em;}
 .shopping-box{margin-bottom: 55px;}
 .quanxuan {position: relative;}
 .tb-clearing tr td:nth-of-type(2) {width: 50%;}
@@ -151,6 +151,7 @@ p{color: #999;}
 .wh-100 img {height: 100%;}
 .count_price_box {color: #e4004d;}
 .cl-red{color: #f16071;}
+.receive-null{padding-top: 100px;text-align: center;display: none;}
 .gift{padding-top: 5px;margin-bottom: 0;font-size: 12px;}
 .clearing-box{margin: 14px;}
 .clearing-box .center{margin-left: 35%;}
@@ -251,7 +252,7 @@ input[name=radio]:checked {
 .address-cantainner .mui-table-view-cell{background-color: #f3f3f3;border-radius: 5px;padding: 11px 8px;}
 .address-cantainner .mui-table-view-cell.mui-active{background-color: #f3f3f3;}
 .address-cantainner .mui-table{max-height: 80px;min-height: 42px;}
-.address-cantainner .add-address{height: 20px;position: relative;width: 150px; margin: 0 auto;}
+.address-cantainner .add-address{height: 20px;position: relative;width: 120px; margin: 0 auto;}
 .address-cantainner .icon-jia{position: absolute;left:0%;top: 0;font-size: 20px;}
 .address-cantainner p{font-size: 12px;}
 .btn-youhuiquan:after{right: 0;}
@@ -421,7 +422,12 @@ h4{color: #333;font-weight: 500;}
 .user-name{font-size: 16px;padding: 10px 0;}
 .my-center-no:after,.my-center-no:before{display: none;}
 .my-center-no .mui-table-view-cell{color: #666;padding: 15px;}
-.my-center-no .mui-table-view-cell:nth-of-type(5){padding-top: 25px;}
+/*.my-center-no .mui-table-view-cell:nth-of-type(5){padding-top: 25px;}*/
+.my-card-content{padding-top: 10px;}
+.status-radius{border-radius: 50%;width: 60px;height: 60px;display: inline-block;position: absolute;left: 15px;top: 0px;background-color: #f8f8f7;padding: 10px;}
+.my-card-content .mui-col-xs-6>div:first-child{padding-top: 8px;}
+.middle-top{vertical-align: top;}
+.my-btn-link {padding-top: 6px;padding-bottom: 6px;color: #29b8f7;border: 0;background-color: transparent;text-decoration: underline;}
 .my-center-no .mui-table-view-cell .mui-icon{color: #666;}
 .my-center-no .mui-table-view-cell .iconfont{color: #333;margin-right: 10px;float: left;}
 .my-center-no .mui-table-view-cell:after{right: 14px;}

tooth/js/main.js

@@ -1,5 +1,5 @@
-var domanUrl = "https://" + window.location.host;
-var base_path = "https://w.iamberry.com/tooth";
+var domanUrl = "//" + window.location.host;
+var base_path = "//w.iamberry.com/tooth";
 //var base_path = domanUrl+"/tooth";
 
 //ajax loading

tooth/my-center.html

@@ -67,13 +67,13 @@
 			<div class="jifen-box">
 				<div id="jifen-menu-nav" class="mui-segmented-control">
 					<a class="mui-control-item mui-active" status="1">可用积分
-						<div></div>
+						<div>0</div>
 					</a>
 					<a class="mui-control-item" status="3">待入积分
-						<div></div>
+						<div>0</div>
 					</a>
 					<a class="mui-control-item" status="2">累计积分
-						<div></div>
+						<div>0</div>
 					</a>
 				</div>
 			</div>
@@ -140,6 +140,16 @@
 						</div>
 					</div>
 				</li>
+				<li class="mui-table-view-cell" id="receive-charger">
+					<div class="mui-table">
+						<div class="mui-table-cell mui-col-xs-5">
+							<span class="iconfont icon-mianfeilingqu"></span>免费领取充电器
+						</div>
+						<div class="mui-table-cell mui-col-xs-5 mui-text-right">
+							<span class="mui-icon mui-icon-arrowright"></span>
+						</div>
+					</div>
+				</li>
 			</ul>
 			<div class="mui-content-padded mui-text-center">客服电话：
 				<a class="tel" href="tel:4006781860">400-6781860</a>
@@ -296,7 +306,7 @@
 											$(".userIdentity").text("微信用户");//不是会员时显示微信用户
 										}
 										$("#my-toothbrush").hide();//隐藏我的牙刷
-										$(".jifen-box").hide();//隐藏积分
+										//$(".jifen-box").hide();//隐藏积分
 										$(".progressbar-box").hide();//隐藏进度条
 										$(".user-leave").hide();//隐藏会员等级
 //										$(".my-badge-danger").hide();
@@ -377,7 +387,6 @@
 			$(document).on('tap', '#jifen-menu-nav>a', function() {
 				var status = $(this).attr("status");
 				location.href = 'integral-log.html?integralStatus='+status;
-				console.log(status);
 			});	
 			
 			/*我的券包跳转*/
@@ -396,6 +405,9 @@
 			$(document).on('tap', '#jifen-shopping', function() {
 				mui.alert("敬请期待！");
 			});
+			$(document).on('tap', '#receive-charger', function() {
+				location.href = 'receive-charger.html';
+			});
 			
 		</script>
 	</body>

tooth/shopping-cart.html

@@ -44,7 +44,7 @@
 		<!--底部菜单结束-->
 		<div class="mui-content">
 			<div class="gwc_null">
-				<img width="130px" src="images/cart-null.png">
+				<img width="100px" src="images/cart-null.png">
 				<h4 style="margin: 10px 0 20px 0;">购物车还是空的</h4>
 				<a href="javascript:;" class="mui-btn my-btn-danger order_operate go_web_shop" style="    color: #000; border-radius: 0px; border: 1px solid #000; padding: 7px 0px 7px 0px; width: 100px;font-family: 微软雅黑; font-size: 16px;">立即选购</a>
 			</div>
@@ -87,7 +87,7 @@
 				}
 			});
 			mui.ready(function() {
-							$.ajax(base_path + '/wechat/cart/selectCartByOpenId?dates=' + new Date().getTime(), {
+				$.ajax(base_path + '/wechat/cart/selectCartByOpenId?dates=' + new Date().getTime(), {
 					data: {},
 					dataType: 'json',
 					xhrFields: {