积分和店长专区调整

pages/areacart/areacart.js

@@ -46,6 +46,22 @@ Page({
 //	this.getCartList();
   },
   onShow: function () {
+	this.setData({
+	  count:1,
+	  cartList:[],
+	  cartCount:0,
+	  cartTotal:0,
+	  checkeditems:'',
+	  checkeditemsnum:'',
+	  checkedtotal:0,
+	  selectedall:false,
+	  submitlock:false,
+	  x:0,
+	  currentX: 0,
+	  perpage:10,
+	  nowpage:1,
+	  cartMore:true
+	})
   	this.getCartList();
   	this.setData({submitlock: false});
   	this.setData({selectedall: false});
@@ -397,5 +413,11 @@ Page({
 		    }
 		  })
   	}
+  },
+  toProject:function(val){
+	  var id = val.currentTarget.dataset.val
+	  wx.navigateTo({
+	    url: '/pages/projects/project-detail/project-detail?id=' + id + '&read=1'
+	  })
   }
 })

pages/areacart/areacart.wxml

@@ -57,7 +57,7 @@
 						      </view>
 						      <view class="cartlist_info">
 						        <view class="cartlist_title">{{item.name}} <span wx:if="{{item.color_name || item.size_name}}">|</span> {{item.color_name}} {{item.size_name}}</view>
-						        <view class="cartlist_type">---</view>
+						        <view class="cartlist_type">零售价：<currency symbol="￥" value="{{item.user_sale_price}}" /> </view>
 						        <currency class="cartlist_price" symbol="￥" value="{{item.price}}" />
 						        <view class="cartlist_num">
 						        	<button bindtap="mius" data-id='{{item.id}}' data-count="{{item.count}}" data-index="{{index}}" class="mius">-</button>
@@ -65,6 +65,7 @@
 						        	<button bindtap="add" data-id='{{item.id}}' data-count="{{item.count}}" data-index="{{index}}" class="add">+</button>
 						        </view>
 						      </view>
+							  <button class="xqbtn" bindtap="toProject" data-val="{{item.id}}">查看详情 ></button> 
 						      <view class='clear'></view>
 						  </view>
 		          </view>

pages/areacart/areacart.wxss

@@ -470,6 +470,7 @@ color:#666;
 color: #999;
 margin: 5px 0;
 font-size:12px;
+text-decoration: line-through;
 }
 .cartlist_price{
 float: left;
@@ -543,7 +544,7 @@ movable-area {
  
 movable-view {
   width: calc(100% + 184rpx);
-  height: 210rpx;
+  height: 260rpx;
 }
  
 .main_item_content {
@@ -552,7 +553,7 @@ movable-view {
  
 .delete_btn {
   width: 184rpx;
-  height: 210rpx;
+  height: 260rpx;
   background-color: #f2f4f6;
   border-top-right-radius: 10px;
   border-bottom-right-radius: 10px;
@@ -560,4 +561,13 @@ movable-view {
   font-size: 28rpx;
   text-align: center;
   line-height: 210rpx;
+}
+
+.xqbtn{
+	float: right;
+	padding-right: 50rpx;
+	font-size: 30rpx;
+	color: #FF5722;
+	padding: 10rpx 50rpx 10rpx;
+	    line-height: 30rpx;
 }

pages/centcart/centcart.js

@@ -48,7 +48,22 @@ Page({
 //	this.getCartList();
   },
   onShow: function () {
-  	this.setData({cartList:[]})
+	  this.setData({
+	    count:1,
+	    cartList:[],
+	    cartCount:0,
+	    cartTotal:0,
+	    checkeditems:'',
+	    checkeditemsnum:'',
+	    checkedtotal:0,
+	    selectedall:false,
+	    submitlock:false,
+	    x:0,
+	    currentX: 0,
+	    perpage:10,
+	    nowpage:1,
+	    cartMore:true
+	  })
   	this.getCartList();
   	this.getBalanceInfo();
   	this.getCentAct();
@@ -432,5 +447,11 @@ Page({
 		    }
 		  })
   	}
+  },
+  toProject:function(val){
+  	  var id = val.currentTarget.dataset.val
+  	  wx.navigateTo({
+  	    url: '/pages/projects/project-detail/project-detail?id=' + id + '&read=1'
+  	  })
   }
 })

pages/centcart/centcart.wxml

@@ -28,7 +28,6 @@
 	  </view>
 	</view>
 	
-	<view style="height: 85rpx;"></view>
 	<!--购物车列表-->
 	<view class="cartlistbox">
 	<!--
@@ -68,7 +67,7 @@
 						      </view>
 						      <view class="cartlist_info">
 						        <view class="cartlist_title">{{item.name}} <span wx:if="{{item.color_name || item.size_name}}">|</span> {{item.color_name}} {{item.size_name}}</view>
-						        <view class="cartlist_type">---</view>
+						        <view class="cartlist_type">零售价：{{item.user_sale_price / 100}} 积分</view>
 						        <!--<currency class="cartlist_price" symbol="￥" value="{{item.price}}" />-->
 						        <text style="    color: #F44336;font-size: 32rpx;">{{item.price / 100}} 积分</text>
 						        <view class="cartlist_num">
@@ -77,6 +76,7 @@
 						        	<button bindtap="add" data-id='{{item.id}}' data-count="{{item.count}}" data-index="{{index}}" class="add">+</button>
 						        </view>
 						      </view>
+							  <button class="xqbtn" bindtap="toProject" data-val="{{item.id}}">查看详情 ></button> 
 						      <view class='clear'></view>
 						  </view>
 		          </view>

pages/centcart/centcart.wxss

@@ -168,7 +168,6 @@
   box-sizing: border-box;
   font-size: 28rpx;
   color: #4c4c4c;
-  position: fixed;
 	z-index: 99;
 	  
 }
@@ -468,7 +467,8 @@ color:#666;
 .cartlist_type{
 color: #999;
 margin: 5px 0;
-font-size:12px;
+font-size:24rpx;
+text-decoration: line-through;
 }
 .cartlist_price{
 float: left;
@@ -542,7 +542,7 @@ movable-area {
  
 movable-view {
   width: calc(100% + 184rpx);
-  height: 210rpx;
+  height: 260rpx;
 }
  
 .main_item_content {
@@ -551,7 +551,7 @@ movable-view {
  
 .delete_btn {
   width: 184rpx;
-  height: 210rpx;
+  height: 260rpx;
   background-color: #f2f4f6;
   border-top-right-radius: 10px;
   border-bottom-right-radius: 10px;
@@ -578,4 +578,13 @@ movable-view {
     color: #eab86a;
 }
 .overcent{color:#FFF;display:block}
-.overcent2{color:#F00;display: block;font-size: 25rpx;margin-top: 10rpx;}
+.overcent2{color:#F00;display: block;font-size: 25rpx;margin-top: 10rpx;}
+
+.xqbtn{
+	float: right;
+	padding-right: 50rpx;
+	font-size: 30rpx;
+	color: #FF5722;
+	padding: 10rpx 50rpx 10rpx;
+	    line-height: 30rpx;
+}

pages/projects/project-detail/project-detail.js

@@ -46,10 +46,14 @@ Page({
     canpay:true,
     checkbox:'',
     noproduct:false,
-    check:{}
+    check:{},
+	readOnly:0
   },
   onLoad: function (options) {
     this.data.productId = options.id;
+	this.setData({
+	  readOnly: options.read ? options.read : 0
+	})
     this.getBalanceInfo()
   },
   onShow: function () {

pages/projects/project-detail/project-detail.wxml

@@ -96,7 +96,7 @@
   </view>
 
 
-  <view class="detail-footer">
+  <view class="detail-footer" wx:if="{{readOnly == 0}}">
     <view class="detail-footer-bar" style="padding-bottom: {{value}}rpx;">
       <view class="detail-footer-item" style="flex: 0.18;">
         <navigator url="../../home/home" open-type="switchTab">
@@ -145,6 +145,7 @@
       </view>
     </view>
   </view>
+  
 </view>
 
 <view wx:if="{{showDialog}}">