csj 7 years ago
parent
commit
8484f2fa32
4 changed files with 38 additions and 3 deletions
  1. 28 0
      .project
  2. 1 1
      tooth/order-details.html
  3. 1 2
      tooth/order-list.html
  4. 8 0
      tooth/pro-details.html

+ 28 - 0
.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>static</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1516362938868</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

+ 1 - 1
tooth/order-details.html

@@ -15,7 +15,7 @@
 	<body>
 		<!--底部菜单开始-->
 		<footer class="mui-bar mui-bar-tab" id="footer-bar-tab">
-			<a class="mui-tab-item mui-active">
+			<a class="mui-tab-item ">
 				<span class="iconfont icon-shouye"></span>
 				<span class="mui-tab-label">首页</span>
 			</a>

+ 1 - 2
tooth/order-list.html

@@ -77,9 +77,8 @@
 			var pageNumber = 0,
 				pagesize = 10; //pageNumber第几页,pagesize每页条数
 
-			var orderDesc = '<button type="button" class="my-order-btn order_operate order_desc" fixedStatus="desc" orderId>订单详情</button>';
 			var orderStatus = {
-				1: orderDesc+'<button type="button" class="my-order-btn order_operate pay_order" fixedStatus="pay" orderId>立即支付</button>',
+				1:'<button type="button" class="my-order-btn order_operate pay_order" fixedStatus="pay" orderId>立即支付</button><button type="button" class="my-order-btn order_operate order_desc" fixedStatus="desc" orderId>订单详情</button>',
 				3: '<button type="button" class="my-order-btn order_operate cancel_apply_refund" fixedStatus="3" orderId>取消申请</button>', //退款申请中
 				7: '<button type="button" class="my-order-btn order_operate cancel_product_return" fixedStatus="1" orderId>取消退货</button>', //退货中
 				11: '<button type="button" class="my-order-btn order_operate cancel_apply_exchange" fixedStatus="1" orderId>取消申请</button>' //申请换货中

+ 8 - 0
tooth/pro-details.html

@@ -174,6 +174,7 @@
 			});
 			//加入购物车弹出层
 			var btnTap = '';
+			var cartStatus="";
 			$(document).on('tap', '.mui-bar-tab .div-btn-buy-cart,.mui-bar-tab .div-btn-buy-know,.select-color', function() {
 				if($(".my-picker").length > 0) { //判断是否已有弹窗
 					var th = $(this);
@@ -187,8 +188,10 @@
 						$(".my-picker>.mui-table .mui-col-xs-12").removeClass("mui-hidden");
 						if(th.hasClass("div-btn-buy-cart")) {
 							btnTap = 'addCart';
+							cartStatus = null;
 						} else {
 							btnTap = 'buyknow';
+							cartStatus = 1;
 						}
 					}
 					$(".my-picker").addClass("active"); //显示颜色列表弹窗
@@ -218,8 +221,13 @@
 			//弹窗的确定
 			$(document).on('tap', '.my-picker .mui-col-xs-12 .my-btn-buy-know', function() {
 				add();
+//				mui.toast('加入购物车成功!');
+			if(cartStatus == null){
 				mui.toast('加入购物车成功!');
+			}
 			});
+			
+			
 			//判断是加减删,ajax分别调用不同的URL
 			function add() {
 				var parameter = {}; //ajax参数json集合